Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933777Ab1CaBdi (ORCPT ); Wed, 30 Mar 2011 21:33:38 -0400 Received: from mail-ww0-f42.google.com ([74.125.82.42]:45260 "EHLO mail-ww0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755502Ab1CaBdh (ORCPT ); Wed, 30 Mar 2011 21:33:37 -0400 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=CwfWV9c8pJQ1k3OBrZp8oa6nd/GX5lgqywNZVf8viGRLHCzutCWmzAuYFar5CY0gNY NAQT3cw/zTFI9VZtXwfGbAecdRc4XG1WTgWIQpYdJq+7ROTn5g0mziNN9T2oRhgNlnOe 51nDbxaUfyk2EYVcvd/P1mAglWZcpUHoRjf7s= From: Frederic Weisbecker To: Peter Zijlstra Cc: LKML , Frederic Weisbecker , Stable , Ingo Molnar , Arnaldo Carvalho de Melo , Paul Mackerras , Stephane Eranian Subject: [PATCH 1/2 v2] perf: Rebase max unprivileged mlock threshold on top of page size Date: Thu, 31 Mar 2011 03:33:29 +0200 Message-Id: <1301535209-9679-1-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.7.3.2 In-Reply-To: <1301496028.4859.183.camel@twins> References: <1301496028.4859.183.camel@twins> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1300 Lines: 37 Ensure we allow 512 kiB + 1 page for user control without assuming a 4096 page size. Reported-by: Peter Zijlstra Signed-off-by: Frederic Weisbecker Cc: Stable Cc: Ingo Molnar Cc: Arnaldo Carvalho de Melo Cc: Paul Mackerras Cc: Stephane Eranian --- kernel/perf_event.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/perf_event.c b/kernel/perf_event.c index c75925c..2616909 100644 --- a/kernel/perf_event.c +++ b/kernel/perf_event.c @@ -145,8 +145,8 @@ static struct srcu_struct pmus_srcu; */ int sysctl_perf_event_paranoid __read_mostly = 1; -/* Minimum for 128 pages + 1 for the user control page */ -int sysctl_perf_event_mlock __read_mostly = 516; /* 'free' kb per user */ +/* Minimum for 512 kiB + 1 user control page */ +int sysctl_perf_event_mlock __read_mostly = 512 + (PAGE_SIZE / 1024); /* 'free' kiB per user */ /* * max perf event sample rate -- 1.7.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/