From patchwork Tue Jun 11 16:42:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robert Richter X-Patchwork-Id: 17894 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 176C025DF1 for ; Thu, 13 Jun 2013 10:57:12 +0000 (UTC) Received: by mail-wi0-f199.google.com with SMTP id hq4sf1858110wib.10 for ; Thu, 13 Jun 2013 03:57:11 -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=Up7FVa18Nti2qMAYMPmw5H+5/hgiEcmV5BzB0glnL9E=; b=1F9+vPiMMlvLoKB4fqQmkgd4B/UVItwlEHgNiRn8qYQ9xJAdU2A/sHyw/30zzfi2+z eda3Ws0h1g558I6osw+RLg8SSVOwWA7ob1N9ZblQFCrpxjI9Q0W33hMVDnGh9MBQ/ZAC KNG2rfPAXWKYFYAS442RaOK8yBZpJzORXMAdwxxpP/gmNZDtK8k9MnxjWusNCyORA1bd UOXVIQH+cgduLzrwIkRa5VZ+btXSHWk/FzMZY5izP6dT8nPVjIs6l7UGXq3BmDJqXFbz 5Usj3anPPIWXL/lO+Xuc63Hb67ZwaDkMh12LlRtoQR9B5nBfPh9ryExVGkFaFx8eUSss 5HAQ== 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=Up7FVa18Nti2qMAYMPmw5H+5/hgiEcmV5BzB0glnL9E=; b=RHsWuheQsBcfYcIO30ZrxelJkmTKRrkcR60IEUJYsZpvy8bzLvFNG2U3iu/qP2eSc0 G4HCcZ3A+ZFlaT/xHsX4GvcFcApCxMiU7Qn6tC0k2JqY8NQDe48QGIg13fFFfb7xfpo9 sWBHwwdbyIp0GPGGA82+KVTyrsWa/C/yh/4ZDVnmdI07efrL8I2GlCB5DlkdQLB/2vdI zWxq5zpyljXm/mUIAcdnr/4RL7eIPQBFHf6YzpUGOHW/7tOB89nh6Ng1vwfPlvFKljk0 TjfBykVCy/u9hhYeLJKf3TPPPWyusKanx+d2HsFwIQ2u4j694+YmShegxiRcWC11pv6t 9G1w== X-Received: by 10.180.37.229 with SMTP id b5mr6030136wik.4.1371121031061; Thu, 13 Jun 2013 03:57:11 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.180.103.67 with SMTP id fu3ls412549wib.11.canary; Thu, 13 Jun 2013 03:57:10 -0700 (PDT) X-Received: by 10.180.83.200 with SMTP id s8mr150778wiy.48.1371121030951; Thu, 13 Jun 2013 03:57:10 -0700 (PDT) Received: from mail-ve0-x22b.google.com (mail-ve0-x22b.google.com [2607:f8b0:400c:c01::22b]) by mx.google.com with ESMTPS id m7si6288366wiz.65.2013.06.13.03.57.10 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 03:57:10 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c01::22b 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::22b; Received: by mail-ve0-f171.google.com with SMTP id b10so7513149vea.16 for ; Thu, 13 Jun 2013 03:57:09 -0700 (PDT) X-Received: by 10.52.155.67 with SMTP id vu3mr71982vdb.94.1371121029780; Thu, 13 Jun 2013 03:57:09 -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 gx3csp16608vec; Thu, 13 Jun 2013 03:57:09 -0700 (PDT) X-Received: by 10.204.60.142 with SMTP id p14mr78358bkh.11.1371121028678; Thu, 13 Jun 2013 03:57:08 -0700 (PDT) Received: from mail-bk0-x229.google.com (mail-bk0-x229.google.com [2a00:1450:4008:c01::229]) by mx.google.com with ESMTPS id pm6si3532629bkb.204.2013.06.13.03.57.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Jun 2013 03:57:08 -0700 (PDT) Received-SPF: pass (google.com: domain of rric.net@gmail.com designates 2a00:1450:4008:c01::229 as permitted sender) client-ip=2a00:1450:4008:c01::229; Received: by mail-bk0-f41.google.com with SMTP id jc3so5117134bkc.14 for ; Thu, 13 Jun 2013 03:57:08 -0700 (PDT) X-Received: by 10.205.0.194 with SMTP id nn2mr72528bkb.40.1371121028041; Thu, 13 Jun 2013 03:57:08 -0700 (PDT) Received: from rric.localhost (g224198135.adsl.alicedsl.de. [92.224.198.135]) by mx.google.com with ESMTPSA id kz11sm4001500bkb.11.2013.06.13.03.57.06 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 13 Jun 2013 03:57:07 -0700 (PDT) Resent-From: Robert Richter Resent-Date: Thu, 13 Jun 2013 12:57:04 +0200 Resent-Message-ID: <20130613105704.GH12218@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.43.00 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 11 Jun 2013 09:43:01 -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, Robert Richter , Robert Richter Subject: [PATCH v2 07/14] perf, persistent: Introduce get_persistent_event() Date: Tue, 11 Jun 2013 18:42:33 +0200 Message-Id: <1370968960-22527-8-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: ALoCoQnoKTWmiK5/Auo1IqvdaD28Uvze6FSW+xOpO6tLEvtGiS87vBNvXIl1lZ3zGB5HvS6Qaoxq X-Original-Sender: rric.net@gmail.com X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c01::22b 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: Robert Richter Reducing duplicate code by introducing function get_persistent_event() to get the descriptor of an persistent event. Signed-off-by: Robert Richter Signed-off-by: Robert Richter --- kernel/events/persistent.c | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/kernel/events/persistent.c b/kernel/events/persistent.c index e6a7664..7d91871 100644 --- a/kernel/events/persistent.c +++ b/kernel/events/persistent.c @@ -16,6 +16,19 @@ struct pers_event_desc { static DEFINE_PER_CPU(struct list_head, pers_events); +static struct pers_event_desc +*get_persistent_event(int cpu, struct perf_event_attr *attr) +{ + struct pers_event_desc *desc; + + list_for_each_entry(desc, &per_cpu(pers_events, cpu), plist) { + if (desc->event->attr.config == attr->config) + return desc; + } + + return NULL; +} + static struct perf_event * add_persistent_event_on_cpu(unsigned int cpu, struct perf_event_attr *attr, unsigned nr_pages) @@ -58,18 +71,13 @@ out: static void del_persistent_event(int cpu, struct perf_event_attr *attr) { - struct pers_event_desc *desc, *tmp; - struct perf_event *event = NULL; - - list_for_each_entry_safe(desc, tmp, &per_cpu(pers_events, cpu), plist) { - if (desc->event->attr.config == attr->config) { - event = desc->event; - break; - } - } + struct pers_event_desc *desc; + struct perf_event *event; - if (!event) + desc = get_persistent_event(cpu, attr); + if (!desc) return; + event = desc->event; list_del(&desc->plist); @@ -161,11 +169,11 @@ int perf_get_persistent_event_fd(unsigned cpu, struct perf_event_attr *attr) if (cpu >= (unsigned)nr_cpu_ids) return -EINVAL; - list_for_each_entry(desc, &per_cpu(pers_events, cpu), plist) - if (desc->event->attr.config == attr->config) - return __alloc_persistent_event_fd(desc); + desc = get_persistent_event(cpu, attr); + if (!desc) + return -ENODEV; - return -ENODEV; + return __alloc_persistent_event_fd(desc); }