From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755409Ab3FKQqj (ORCPT ); Tue, 11 Jun 2013 12:46:39 -0400 Received: from mail-bk0-f42.google.com ([209.85.214.42]:44536 "EHLO mail-bk0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755298Ab3FKQnA (ORCPT ); Tue, 11 Jun 2013 12:43:00 -0400 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 05/14] perf, persistent: Rework struct pers_event_desc Date: Tue, 11 Jun 2013 18:42:31 +0200 Message-Id: <1370968960-22527-6-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> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Robert Richter Struct pers_event_desc is only used in kernel/events/persistent.c. Moving it there. Also, removing attr member as this is a copy of event->attr. Signed-off-by: Robert Richter Signed-off-by: Robert Richter --- include/linux/perf_event.h | 7 ------- kernel/events/persistent.c | 12 ++++++++---- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index d2a42b7..dc72c93 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -518,13 +518,6 @@ struct perf_output_handle { int page; }; -struct pers_event_desc { - struct perf_event_attr *attr; - struct perf_event *event; - struct list_head plist; - int fd; -}; - #ifdef CONFIG_PERF_EVENTS extern int perf_pmu_register(struct pmu *pmu, char *name, int type); diff --git a/kernel/events/persistent.c b/kernel/events/persistent.c index 53411b4..d7aaf95 100644 --- a/kernel/events/persistent.c +++ b/kernel/events/persistent.c @@ -8,6 +8,12 @@ /* 512 kiB: default perf tools memory size, see perf_evlist__mmap() */ #define CPU_BUFFER_NR_PAGES ((512 * 1024) / PAGE_SIZE) +struct pers_event_desc { + struct perf_event *event; + struct list_head plist; + int fd; +}; + static DEFINE_PER_CPU(struct list_head, pers_events); static struct perf_event * @@ -33,7 +39,6 @@ add_persistent_event_on_cpu(unsigned int cpu, struct perf_event_attr *attr, rcu_assign_pointer(event->rb, buf); desc->event = event; - desc->attr = attr; INIT_LIST_HEAD(&desc->plist); list_add_tail(&desc->plist, &per_cpu(pers_events, cpu)); @@ -59,7 +64,7 @@ static void del_persistent_event(int cpu, struct perf_event_attr *attr) struct perf_event *event = NULL; list_for_each_entry_safe(desc, tmp, &per_cpu(pers_events, cpu), plist) { - if (desc->attr->config == attr->config) { + if (desc->event->attr.config == attr->config) { event = desc->event; break; } @@ -78,7 +83,6 @@ static void del_persistent_event(int cpu, struct perf_event_attr *attr) perf_event_release_kernel(event); put_unused_fd(desc->fd); - kfree(desc->attr); kfree(desc); } @@ -165,7 +169,7 @@ int perf_get_persistent_event_fd(unsigned cpu, struct perf_event_attr *attr) return -EINVAL; list_for_each_entry(desc, &per_cpu(pers_events, cpu), plist) - if (desc->attr->config == attr->config) + if (desc->event->attr.config == attr->config) return __alloc_persistent_event_fd(desc); return -ENODEV; -- 1.8.1.1