From patchwork Tue Jun 11 16:42:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 17889 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-fa0-f69.google.com (mail-fa0-f69.google.com [209.85.161.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 4F0E025DF1 for ; Thu, 13 Jun 2013 10:56:55 +0000 (UTC) Received: by mail-fa0-f69.google.com with SMTP id a11sf6414127fad.4 for ; Thu, 13 Jun 2013 03:56:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:resent-from:resent-date:resent-message-id:resent-to :sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-google-group-id:list-post :list-help:list-archive:list-unsubscribe; bh=vQ1LgLcAHD2dkeMe5C64ViSGy+9HrpIqACaFDsYrdGc=; b=owlEANTg35+5c5VcFR0NW8f93RODmunqWjnrD+K1Rz41epShv0IhV1Jl0Dipq95O2/ b72Jck0VbkejWEgcjx2L6t7P3b7XHloOgOMLxU74PbxR9Vjvvf63USeKAlN4rrUeRF/x mOpp9xhR114U57kISX5aWphn9pMBx2x6FuFU5oDvbMowMn+doo54GIOQ7B6+MN25x0yl uryNjwzOM+s6QwfsCEfrIwqZE4A7XcINGRKgNN6KR99qar4Dykmznje8/klcFKe0vl4R tNQarrj7sMjUfboUp0PJw41oQcEz581/GN43PyewI3KKNAP6gailjL0BHmi+7CJNjtOh yaGQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-beenthere:x-forwarded-to:x-forwarded-for :delivered-to:resent-from:resent-date:resent-message-id:resent-to :sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=vQ1LgLcAHD2dkeMe5C64ViSGy+9HrpIqACaFDsYrdGc=; b=AP9z/DzlWqeBT993slhJyIMoLt14xe7EHlb3iiI01KBbVTpbWci5kmSVpjhhL9n+eS 7aMqHfg4BRGoV8zY/NZLeUt2SPQMsX4obsk/50M2O9R9Wr5lh6dAUJrYHx4cetYBBman pR1wtkNp67iGU3j2e038Hgf5+5d9iuO0pwqhk+H8N5r/pni8dlmsKx2y5PPfF8Hik/yE iLvaqHTTBAJKrffku5EtcjYoI61shMuAQ5RHxRQcgxIamRNUjQtxEaJ/bUtAvMlZptrp uAF6Ikk46cEKbOYJyoHNGp/XuvQ7gaMtaY3B1RTs0cEyMGi605ClyazxssyITG/ErKGD 9d+w== X-Received: by 10.180.160.212 with SMTP id xm20mr6034717wib.0.1371121014075; Thu, 13 Jun 2013 03:56:54 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.36.201 with SMTP id s9ls419946wij.43.gmail; Thu, 13 Jun 2013 03:56:53 -0700 (PDT) X-Received: by 10.181.12.1 with SMTP id em1mr7297107wid.4.1371121013935; Thu, 13 Jun 2013 03:56:53 -0700 (PDT) Received: from mail-ve0-x236.google.com (mail-ve0-x236.google.com [2607:f8b0:400c:c01::236]) by mx.google.com with ESMTPS id w15si8541889wie.10.2013.06.13.03.56.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 03:56:53 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c01::236; Received: by mail-ve0-f182.google.com with SMTP id ox1so7624091veb.27 for ; Thu, 13 Jun 2013 03:56:52 -0700 (PDT) X-Received: by 10.220.192.138 with SMTP id dq10mr114656vcb.23.1371121012772; Thu, 13 Jun 2013 03:56:52 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.191.99 with SMTP id gx3csp16596vec; Thu, 13 Jun 2013 03:56:52 -0700 (PDT) X-Received: by 10.205.118.201 with SMTP id fr9mr60548bkc.84.1371121011674; Thu, 13 Jun 2013 03:56:51 -0700 (PDT) Received: from mail-bk0-x235.google.com (mail-bk0-x235.google.com [2a00:1450:4008:c01::235]) by mx.google.com with ESMTPS id tq10si3541932bkb.55.2013.06.13.03.56.51 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 03:56:51 -0700 (PDT) Received-SPF: pass (google.com: domain of rric.net@gmail.com designates 2a00:1450:4008:c01::235 as permitted sender) client-ip=2a00:1450:4008:c01::235; Received: by mail-bk0-f53.google.com with SMTP id e11so4448063bkh.26 for ; Thu, 13 Jun 2013 03:56:51 -0700 (PDT) X-Received: by 10.204.232.75 with SMTP id jt11mr63465bkb.70.1371121011111; Thu, 13 Jun 2013 03:56:51 -0700 (PDT) Received: from rric.localhost (g224198135.adsl.alicedsl.de. [92.224.198.135]) by mx.google.com with ESMTPSA id ok9sm3054015bkb.8.2013.06.13.03.56.50 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Jun 2013 03:56:50 -0700 (PDT) Resent-From: Robert Richter Resent-Date: Thu, 13 Jun 2013 12:56:47 +0200 Resent-Message-ID: <20130613105647.GC12218@rric.localhost> Resent-To: linaro-kernel@lists.linaro.org, patches@linaro.org Received: from rric.localhost (f053086247.adsl.alicedsl.de. [78.53.86.247]) by mx.google.com with ESMTPSA id b12sm6160884bkz.0.2013.06.11.09.42.52 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Jun 2013 09:42:53 -0700 (PDT) Sender: Robert Richter From: Robert Richter To: Borislav Petkov Cc: Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Jiri Olsa , linux-kernel@vger.kernel.org, Borislav Petkov , Robert Richter , Robert Richter Subject: [PATCH v2 02/14] perf: Add persistent events Date: Tue, 11 Jun 2013 18:42:28 +0200 Message-Id: <1370968960-22527-3-git-send-email-rric@kernel.org> X-Mailer: git-send-email 1.8.1.1 In-Reply-To: <1370968960-22527-1-git-send-email-rric@kernel.org> References: <1370968960-22527-1-git-send-email-rric@kernel.org> X-Gm-Message-State: ALoCoQnj6BWxPJjpncen0a3Dxl4U4d3iHbMdt+C1yGVb4cmcm2wlLHaaqgiLERddF3OZM1VNNcmK X-Original-Sender: rric.net@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::236 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org; dkim=pass header.i=@gmail.com Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Borislav Petkov Add the needed pieces for persistent events which makes them process-agnostic. Also, make their buffers read-only when mmaping them from userspace. While at it, do not return a void function, as caught by Fengguang's build robot. Changes made by Robert Richter : * mmap should return EACCES error if fd can not be opened writable. This error code also helps userland to map buffers readonly on failure. Signed-off-by: Borislav Petkov [ Return -EACCES if mapped buffers must be readonly ] Signed-off-by: Robert Richter Signed-off-by: Robert Richter --- include/uapi/linux/perf_event.h | 3 ++- kernel/events/core.c | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/include/uapi/linux/perf_event.h b/include/uapi/linux/perf_event.h index fb104e5..6032361 100644 --- a/include/uapi/linux/perf_event.h +++ b/include/uapi/linux/perf_event.h @@ -272,8 +272,9 @@ struct perf_event_attr { exclude_callchain_kernel : 1, /* exclude kernel callchains */ exclude_callchain_user : 1, /* exclude user callchains */ + persistent : 1, /* always-on event */ - __reserved_1 : 41; + __reserved_1 : 40; union { __u32 wakeup_events; /* wakeup every n events */ diff --git a/kernel/events/core.c b/kernel/events/core.c index b790ab6..a13e457 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3713,6 +3713,11 @@ static void perf_mmap_close(struct vm_area_struct *vma) { struct perf_event *event = vma->vm_file->private_data; + if (event->attr.persistent) { + atomic_dec(&event->mmap_count); + return; + } + if (atomic_dec_and_mutex_lock(&event->mmap_count, &event->mmap_mutex)) { unsigned long size = perf_data_size(event->rb); struct user_struct *user = event->mmap_user; @@ -3756,9 +3761,12 @@ static int perf_mmap(struct file *file, struct vm_area_struct *vma) if (event->cpu == -1 && event->attr.inherit) return -EINVAL; - if (!(vma->vm_flags & VM_SHARED)) + if (!(vma->vm_flags & VM_SHARED) && !event->attr.persistent) return -EINVAL; + if (event->attr.persistent && (vma->vm_flags & VM_WRITE)) + return -EACCES; + vma_size = vma->vm_end - vma->vm_start; nr_pages = (vma_size / PAGE_SIZE) - 1;