From: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
To: <linux-kernel@vger.kernel.org>, <iommu@lists.linux-foundation.org>
Cc: <joro@8bytes.org>, <bp@alien8.de>, <peterz@infradead.org>,
<mingo@redhat.com>,
Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>,
Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
Subject: [PATCH v8 8/9] perf/amd/iommu: Fix sysfs perf attribute groups
Date: Mon, 16 Jan 2017 01:23:35 -0600 [thread overview]
Message-ID: <1484551416-5440-9-git-send-email-Suravee.Suthikulpanit@amd.com> (raw)
In-Reply-To: <1484551416-5440-1-git-send-email-Suravee.Suthikulpanit@amd.com>
From: Suravee Suthikulpanit <suravee.suthikulpanit@amd.com>
Introduce static amd_iommu_attr_groups to simplify the
sysfs attributes initialization code.
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Signed-off-by: Suravee Suthikulpanit <Suravee.Suthikulpanit@amd.com>
---
arch/x86/events/amd/iommu.c | 85 ++++++++++++++++++++-------------------------
1 file changed, 37 insertions(+), 48 deletions(-)
diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c
index cc7bea4..223c01d 100644
--- a/arch/x86/events/amd/iommu.c
+++ b/arch/x86/events/amd/iommu.c
@@ -43,14 +43,8 @@ struct perf_amd_iommu {
u8 max_counters;
u64 cntr_assign_mask;
raw_spinlock_t lock;
- const struct attribute_group *attr_groups[4];
};
-#define format_group attr_groups[0]
-#define cpumask_group attr_groups[1]
-#define events_group attr_groups[2]
-#define null_group attr_groups[3]
-
/*---------------------------------------------
* sysfs format attributes
*---------------------------------------------*/
@@ -81,6 +75,10 @@ struct perf_amd_iommu {
/*---------------------------------------------
* sysfs events attributes
*---------------------------------------------*/
+static struct attribute_group amd_iommu_events_group = {
+ .name = "events",
+};
+
struct amd_iommu_event_desc {
struct kobj_attribute attr;
const char *event;
@@ -388,76 +386,63 @@ static void perf_iommu_del(struct perf_event *event, int flags)
perf_event_update_userpage(event);
}
-static __init int _init_events_attrs(struct perf_amd_iommu *perf_iommu)
+static __init int _init_events_attrs(void)
{
- struct attribute **attrs;
- struct attribute_group *attr_group;
int i = 0, j;
+ struct attribute **attrs;
while (amd_iommu_v2_event_descs[i].attr.attr.name)
i++;
- attr_group = kzalloc(sizeof(struct attribute *)
- * (i + 1) + sizeof(*attr_group), GFP_KERNEL);
- if (!attr_group)
+ attrs = kzalloc(sizeof(struct attribute **) * (i + 1), GFP_KERNEL);
+ if (!attrs)
return -ENOMEM;
- attrs = (struct attribute **)(attr_group + 1);
for (j = 0; j < i; j++)
attrs[j] = &amd_iommu_v2_event_descs[j].attr.attr;
- attr_group->name = "events";
- attr_group->attrs = attrs;
- perf_iommu->events_group = attr_group;
-
+ amd_iommu_events_group.attrs = attrs;
return 0;
}
static __init void amd_iommu_pc_exit(void)
{
- if (__perf_iommu.events_group != NULL) {
- kfree(__perf_iommu.events_group);
- __perf_iommu.events_group = NULL;
+ if (amd_iommu_events_group.attrs) {
+ kfree(amd_iommu_events_group.attrs);
+ amd_iommu_events_group.attrs = NULL;
}
}
-static __init int _init_perf_amd_iommu(
- struct perf_amd_iommu *perf_iommu, char *name)
+const struct attribute_group *amd_iommu_attr_groups[] = {
+ &amd_iommu_format_group,
+ &amd_iommu_cpumask_group,
+ &amd_iommu_events_group,
+ NULL,
+};
+
+static __init int
+_init_perf_amd_iommu(struct perf_amd_iommu *perf_iommu, char *name)
{
int ret;
raw_spin_lock_init(&perf_iommu->lock);
- perf_iommu->format_group = &amd_iommu_format_group;
-
/* Init cpumask attributes to only core 0 */
cpumask_set_cpu(0, &iommu_cpumask);
- perf_iommu->cpumask_group = &amd_iommu_cpumask_group;
-
- ret = _init_events_attrs(perf_iommu);
- if (ret) {
- pr_err("Error initializing AMD IOMMU perf events.\n");
- return ret;
- }
perf_iommu->max_banks = amd_iommu_pc_get_max_banks(0);
perf_iommu->max_counters = amd_iommu_pc_get_max_counters(0);
if (!perf_iommu->max_banks || !perf_iommu->max_counters)
return -EINVAL;
- perf_iommu->null_group = NULL;
- perf_iommu->pmu.attr_groups = perf_iommu->attr_groups;
-
+ perf_iommu->pmu.attr_groups = amd_iommu_attr_groups;
ret = perf_pmu_register(&perf_iommu->pmu, name, -1);
- if (ret) {
+ if (ret)
pr_err("Error initializing AMD IOMMU perf counters.\n");
- amd_iommu_pc_exit();
- } else {
+ else
pr_info("perf: amd_iommu: Detected. (%d banks, %d counters/bank)\n",
amd_iommu_pc_get_max_banks(0),
amd_iommu_pc_get_max_counters(0));
- }
-
return ret;
}
@@ -471,24 +456,28 @@ static __init int _init_perf_amd_iommu(
.stop = perf_iommu_stop,
.read = perf_iommu_read,
},
- .max_banks = 0x00,
- .max_counters = 0x00,
- .cntr_assign_mask = 0ULL,
- .format_group = NULL,
- .cpumask_group = NULL,
- .events_group = NULL,
- .null_group = NULL,
};
static __init int amd_iommu_pc_init(void)
{
+ int ret;
+
/* Make sure the IOMMU PC resource is available */
if (!amd_iommu_pc_supported())
return -ENODEV;
- _init_perf_amd_iommu(&__perf_iommu, "amd_iommu");
+ ret = _init_events_attrs();
+ if (ret)
+ goto err_out;
- return 0;
+ ret = _init_perf_amd_iommu(&__perf_iommu, "amd_iommu");
+ if (ret)
+ goto err_out;
+
+ return ret;
+err_out:
+ amd_iommu_pc_exit();
+ return ret;
}
device_initcall(amd_iommu_pc_init);
--
1.8.3.1
next prev parent reply other threads:[~2017-01-16 7:25 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-16 7:23 [PATCH v8 0/9] perf/amd/iommu: Enable multi-IOMMU support Suravee Suthikulpanit
2017-01-16 7:23 ` [PATCH v8 1/9] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Suravee Suthikulpanit
2017-01-16 7:23 ` [PATCH v8 2/9] perf/amd/iommu: Clean up perf_iommu_enable_event Suravee Suthikulpanit
2017-01-18 18:20 ` Borislav Petkov
2017-01-16 7:23 ` [PATCH v8 3/9] perf/amd/iommu: Misc fix up perf_iommu_read Suravee Suthikulpanit
2017-01-19 10:01 ` Borislav Petkov
2017-01-23 12:33 ` Peter Zijlstra
2017-02-07 4:50 ` Suravee Suthikulpanit
2017-01-16 7:23 ` [PATCH v8 4/9] iommu/amd: Introduce amd_iommu_get_num_iommus() Suravee Suthikulpanit
2017-01-19 18:41 ` Borislav Petkov
2017-01-16 7:23 ` [PATCH v8 5/9] perf/amd/iommu: Modify functions to query max banks and counters Suravee Suthikulpanit
2017-01-22 19:53 ` Borislav Petkov
2017-01-16 7:23 ` [PATCH v8 6/9] perf/amd/iommu: Modify amd_iommu_pc_get_set_reg_val() API to allow specifying IOMMU index Suravee Suthikulpanit
2017-01-22 19:53 ` Borislav Petkov
2017-01-16 7:23 ` [PATCH v8 7/9] perf/amd/iommu: Check return value when set and get counter value Suravee Suthikulpanit
2017-01-22 19:53 ` Borislav Petkov
2017-01-23 12:31 ` Peter Zijlstra
2017-01-16 7:23 ` Suravee Suthikulpanit [this message]
2017-01-22 19:54 ` [PATCH v8 8/9] perf/amd/iommu: Fix sysfs perf attribute groups Borislav Petkov
2017-01-16 7:23 ` [PATCH v8 9/9] perf/amd/iommu: Enable support for multiple IOMMUs Suravee Suthikulpanit
2017-01-22 19:55 ` Borislav Petkov
2017-02-07 1:42 ` Suravee Suthikulpanit
2017-01-25 9:46 ` Peter Zijlstra
2017-01-25 9:55 ` Borislav Petkov
2017-02-07 1:58 ` Suravee Suthikulpanit
2017-02-07 1:57 ` Suravee Suthikulpanit
2017-02-14 12:31 ` Peter Zijlstra
2017-02-23 17:43 ` Suravee Suthikulpanit
2017-02-23 18:11 ` Peter Zijlstra
2017-02-23 18:20 ` Suravee Suthikulpanit
2017-01-17 15:36 ` [PATCH v8 0/9] perf/amd/iommu: Enable multi-IOMMU support Joerg Roedel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1484551416-5440-9-git-send-email-Suravee.Suthikulpanit@amd.com \
--to=suravee.suthikulpanit@amd.com \
--cc=bp@alien8.de \
--cc=iommu@lists.linux-foundation.org \
--cc=joro@8bytes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=peterz@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).