From patchwork Tue Feb 23 14:12:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Suthikulpanit, Suravee" X-Patchwork-Id: 62716 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1857105lbl; Tue, 23 Feb 2016 06:21:25 -0800 (PST) X-Received: by 10.66.171.169 with SMTP id av9mr30028296pac.36.1456237285475; Tue, 23 Feb 2016 06:21:25 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p86si47656222pfa.161.2016.02.23.06.21.25; Tue, 23 Feb 2016 06:21:25 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753547AbcBWOVX (ORCPT + 30 others); Tue, 23 Feb 2016 09:21:23 -0500 Received: from mail-bl2on0085.outbound.protection.outlook.com ([65.55.169.85]:60688 "EHLO na01-bl2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753144AbcBWOOM (ORCPT ); Tue, 23 Feb 2016 09:14:12 -0500 Authentication-Results: 8bytes.org; dkim=none (message not signed) header.d=none; 8bytes.org; dmarc=none action=none header.from=amd.com; Received: from localhost.localdomain (124.121.8.20) by BLUPR12MB0436.namprd12.prod.outlook.com (10.162.92.141) with Microsoft SMTP Server (TLS) id 15.1.409.15; Tue, 23 Feb 2016 14:14:06 +0000 From: Suravee Suthikulpanit To: , , , , CC: , , , , , "Suravee Suthikulpanit" Subject: [PATCH V5 04/10] perf/amd/iommu: Modify IOMMU API to allow specifying IOMMU index Date: Tue, 23 Feb 2016 08:12:38 -0600 Message-ID: <1456236764-1569-5-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1456236764-1569-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1456236764-1569-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 X-Originating-IP: [124.121.8.20] X-ClientProxiedBy: HKNPR06CA0045.apcprd06.prod.outlook.com (10.141.16.35) To BLUPR12MB0436.namprd12.prod.outlook.com (25.162.92.141) X-MS-Office365-Filtering-Correlation-Id: d0884634-92bb-4381-1859-08d33c5b9962 X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0436; 2:a3zhEKnW8sf8JdxxcIQH5t/wUUb0ELtxmb/sFcNJvIUi57iqKq9I3wUjldsbQtWN5Fr8R1LeF2B0qIi/uE8NCTKVE68QOTwoNF5VHLx0mbN5ZrVY/pA+XPH2P3VkNW1AEiFLhI9k0DrDgQc3jVsrIkofGHU1Qu+2hOSESbwNnzNPN7QFyHedZELy7usfd/Dm; 3:UCnd/hOPoX1RilUzhlwh3emkHeFgGKSZXLmtMerczdUTMV8dztO0bC1gCYn/vpAj8Fw12q6Nu9aY9XYiZWHBCY19Oh92wD5/P0t5lwjdl2cqsej1iiTB4roWgOioJdVx; 25:BF8BIAMk/yyT6sAJAmUCGDhT7RU7W1iQJDJ/qGIGqk9q2muIVauzi0kynk8U7TX8Ot05t7uWDvx56aWsTsqkc7YZT/OZ7h1AKfTQTnapoo7UfIaaDBahxwLrBJwxzQaQkiU3Qy5noDOxpFozF1Lg6cIYweRCN+4MRMRmMbbkukYScrwBcXHFssMRFZfel1Z56ZmWFQF5kO3KwcIOhFae0YVm3h4tDk2/pf4vp+MS7r1EL9pM84DImtocJ6YVUfBSCsjEi/mPNMjTEjQ1nE2bV565kfm0kVMnensWNEGmCL/FsS12KQ7K5F/KY2O4zCaDtRIHIrOCl7M/ubMVKEXnlKtNgEILORrclgyrqXsW+dI= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR12MB0436; X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0436; 20:zKq72SVu3o61JqyPsZJayLTXfYjS72o/FJavuDfLsPI24KvPrpiyExWmIikqNfgXz+weBHas9PXXb4PGpyyohGsXWZv+9U/rwVpjXqki8eCTpaKyTFBC9lCS1Mr7S4tfsKHG6FgncukPs0hrev/wZlEYZUSsrscwgkX2SeCLaCcKcS2n9smfd5EULNoVh17CLitsBzOQY0AmVoxVoffyMxBeJyyEijaZFtZNnjEVV7Sdg4RIn6hI7oFLqH6vyBvZPpUrvJi8EwvBWJi0+GvzaA7Vvv3MbdWWcJgwASdTdOTYNlkyH1edwNL36J/D13dROZtf1660sukihmqHglTy5BF1uvPVGrsZ5EbBy8iVvOwt2ykBqSuNV3S9w+S8Oi8jo4Yhnwyw4OpNwHd59gFa+e/v4VUBHlTPQwyP6Ta4gma2KGGnChnP1/WTAxrhCfVKwjD+31mIYTaehLSpJjXLnyI+qzIOjsM/JBEJPHWso9QiO8UhW+a48bAkRsQRkboD; 4:sDQ6k3dMKgpFChkeFQ90LZ0tAcOKRAPkz1/hJ1o2APaJN8iQ6PqY2qU9Zp641G+Vf/4oC9IaDJ1brXyVE+HfaC2epNM0f6Zhkx1ICHaXsoZYq0Z58nyRFcHYt+txQlBtqN1UK59u96URK4sKbdePtY4KxX9n11/P/YAU3GzOsTDrKIkPfr1u3NiAvPepGpnt+nPNIVLxGZO6UTHv+JMRjF5YVAsGpkAuhX4KiW8dJRyVd1TrLRgAqz5D5XDy8G1rPmKHTMvg8EMFkZSSqEdjb62IDoplCvteg8jyzM8CL6h32R4OJTYvEKFn71mrQwKQFSy8ogmzv7a8lwaA+y5bPCEUF7ZP1bF2ZahDcR9pgZTaycOb0RevYiq2ics+s1rTXxBbAL+cl11g7NCZ6tbR0DSCAxn2JaGb896Jgwtg4vk= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001); SRVR:BLUPR12MB0436; BCL:0; PCL:0; RULEID:; SRVR:BLUPR12MB0436; X-Forefront-PRVS: 08617F610C X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(4630300001)(6009001)(6069001)(5004730100002)(48376002)(77096005)(4326007)(2950100001)(2906002)(3846002)(6116002)(42186005)(5008740100001)(19580405001)(1096002)(19580395003)(86362001)(40100003)(50466002)(586003)(122386002)(36756003)(76176999)(5001960100002)(47776003)(66066001)(50986999)(5001770100001)(189998001)(229853001)(50226001)(87976001)(92566002)(2201001)(217873001); DIR:OUT; SFP:1101; SCL:1; SRVR:BLUPR12MB0436; H:localhost.localdomain; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR12MB0436; 23:ocix+/MY90tt0TWfq9ISueIXDfcBclVB7Rsi5W4J1?= =?us-ascii?Q?TDfgx0DiBjo0W4E9lgW0Bkix+rUQoQJu5PJ8IcOeC9WgVO1BZBVcvgZZGd/g?= =?us-ascii?Q?l7yH263Rq8Jk2FWLABABUvQ/8Sq5NhW+c3WC2lUudy82GghElQPvLedTBStK?= =?us-ascii?Q?LbKZuI3iSiO8oAv+U9RFH/rphSUqhwyOwCAE4zGKTc12ocWHjx7yFIcuT0VS?= =?us-ascii?Q?/Tu7/nll8O3vhuVKw9b/AEzJnMoqmcnexbv8VRKFcHNPtPvdFsqsEExB5Hg7?= =?us-ascii?Q?M4szk1QKFe8qR9g+RJoDmLQAsplttKeVUlv5gJBh53I1xf/EfE+njFGeaA1k?= =?us-ascii?Q?bDb1IjnFXWjRHqmXegmETHe0/dN5ACL4nb1PcZI6dbkHWGvJz1if+VvguLGI?= =?us-ascii?Q?jEE/lY7d/SpUkp9rmJ82PCvphol86EwSIjfxBsLSHQgJTuPFFGD2DLlkoG39?= =?us-ascii?Q?3ZoO0Oy3eDnmQYPL+I91xIU1eCQWkNJ2S333nYL1Nsqpb6mTSsFVdCygX4uZ?= =?us-ascii?Q?iv91jyPdy3KMNu77Py/+xwii3YI/4RiGZuDeTxnn1WSc9WLHtz/b/Iqn8k/o?= =?us-ascii?Q?kM+f2OAa6bvkMLdSqi9ISMHZhwfzbtAupITYHDKiz+DnEj3KOHzhRCu4ZsYY?= =?us-ascii?Q?FpEhSsc5gb5vwYgszkW9Dd+DuPgs99g2bYQdGwG0AB5jYqItLKCKYlJy8WIi?= =?us-ascii?Q?u6c+yMt2cGBDPkoB+iPdQbISgsxsi2yNbe9BAKXRH/sIwnAVa+34EBEVuJHp?= =?us-ascii?Q?Y4/t7hzSCBVnk/YVEzFsvZx3YarRCPGhGIeVeG58i6TvUu7wAi31clDpnLZ3?= =?us-ascii?Q?kgv2HmXsEZTIbzGGYHEVgI3qVz/vFkJSmIXQNCbXUSHcqKNLEMH0tj6vlYHn?= =?us-ascii?Q?LrDzaDPi9LrDrLsTIjte0BDTGBf3kEhNZt/fMa3/IQIGo0eZn7NCuMvNOtjB?= =?us-ascii?Q?KZq6ss0/2FWN3CL78O5kvB8sietfRte0BsY3aAYxA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR12MB0436; 5:bbmv11N4hq9x2OwpB7GTkeu6uRFI4EfwMq5Qdm/2NvFiFWtmdjVPw/L4IRWEsR2eyDBcNoDU/dTHY6YmwwQVCsFWL1oolMKdYzRpnkECwayYVhH5R0XtGU/ko4TIkoRL8ShZ3BlRK3lN6F0nLt6Qtw==; 24:YdqAEnDbQT5QNc8+ZxYwsMqfZrreWQzt6p/tkDr0JwZanEh2redbIe1Yd2hitwvBMgXvz2jczxuc0kHT+ufFiJre+18ZD1LvdcFb2cUhTSs=; 20:3N6XmbhfCQr4H7pMOLh0CKHIy96xa7RxVTMiBx4B2RpbpFL2ynCWE2n/qpaqX4+0TBlKTMC1anPbHVWNAYqC1dWWce1sCz2JzEqKcMztMV/TgcpJx2u8ZKIltEZpXeRyg6JXU2ULdIyO0H52wwzs3iNcF+Tx3oczRBBD6RnuTZ/aevfH4efzoVXhq7VKCZ6SUe3ghqJuhNBqsZA5pnqTNfm6CR1EfB4clvIrnLdzKjsWsn5dtirpH1ZUK0Mry0CF X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 23 Feb 2016 14:14:06.2872 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR12MB0436 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The current amd_iommu_pc_set_reg_val() cann not support multi-IOMMU. So, this patch rename and modifies them to allow callers to specify IOMMU index. The function amd_iommu_pc_get_set_reg_val() is too confusing, and does not support multi-IOMMU. So, this patch breaks it down to amd_iommu_pc_[get|set]_counter(), and modifies them to allow callers to specify IOMMU index. Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 45 +++++++++++------------ arch/x86/include/asm/perf/amd/iommu.h | 8 +++-- drivers/iommu/amd_iommu_init.c | 67 ++++++++++++++++++++++++++++++----- 3 files changed, 84 insertions(+), 36 deletions(-) -- 1.9.1 diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index 67ff3f1..8a29754 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -243,46 +243,44 @@ static void perf_iommu_enable_event(struct perf_event *ev) { u8 csource = _GET_CSOURCE(ev); u16 devid = _GET_DEVID(ev); + u8 bank = _GET_BANK(ev); + u8 cntr = _GET_CNTR(ev); u64 reg = 0ULL; reg = csource; - amd_iommu_pc_get_set_reg_val(devid, - _GET_BANK(ev), _GET_CNTR(ev) , - IOMMU_PC_COUNTER_SRC_REG, ®, true); + amd_iommu_pc_set_reg(0, devid, bank, cntr, + IOMMU_PC_COUNTER_SRC_REG, ®); reg = 0ULL | devid | (_GET_DEVID_MASK(ev) << 32); if (reg) reg |= (1UL << 31); - amd_iommu_pc_get_set_reg_val(devid, - _GET_BANK(ev), _GET_CNTR(ev) , - IOMMU_PC_DEVID_MATCH_REG, ®, true); + amd_iommu_pc_set_reg(0, devid, bank, cntr, + IOMMU_PC_DEVID_MATCH_REG, ®); reg = 0ULL | _GET_PASID(ev) | (_GET_PASID_MASK(ev) << 32); if (reg) reg |= (1UL << 31); - amd_iommu_pc_get_set_reg_val(devid, - _GET_BANK(ev), _GET_CNTR(ev) , - IOMMU_PC_PASID_MATCH_REG, ®, true); + amd_iommu_pc_set_reg(0, devid, bank, cntr, + IOMMU_PC_PASID_MATCH_REG, ®); reg = 0ULL | _GET_DOMID(ev) | (_GET_DOMID_MASK(ev) << 32); if (reg) reg |= (1UL << 31); - amd_iommu_pc_get_set_reg_val(devid, - _GET_BANK(ev), _GET_CNTR(ev) , - IOMMU_PC_DOMID_MATCH_REG, ®, true); + amd_iommu_pc_set_reg(0, devid, bank, cntr, + IOMMU_PC_DOMID_MATCH_REG, ®); } static void perf_iommu_disable_event(struct perf_event *event) { u64 reg = 0ULL; - amd_iommu_pc_get_set_reg_val(_GET_DEVID(event), - _GET_BANK(event), _GET_CNTR(event), - IOMMU_PC_COUNTER_SRC_REG, ®, true); + amd_iommu_pc_set_reg(0, _GET_DEVID(event), _GET_BANK(event), + _GET_CNTR(event), IOMMU_PC_COUNTER_SRC_REG, ®); } static void perf_iommu_start(struct perf_event *event, int flags) { + u64 val; struct hw_perf_event *hwc = &event->hw; pr_debug("perf: amd_iommu:perf_iommu_start\n"); @@ -292,13 +290,13 @@ static void perf_iommu_start(struct perf_event *event, int flags) WARN_ON_ONCE(!(hwc->state & PERF_HES_UPTODATE)); hwc->state = 0; - if (flags & PERF_EF_RELOAD) { - u64 prev_raw_count = local64_read(&hwc->prev_count); - amd_iommu_pc_get_set_reg_val(_GET_DEVID(event), - _GET_BANK(event), _GET_CNTR(event), - IOMMU_PC_COUNTER_REG, &prev_raw_count, true); - } + if (!(flags & PERF_EF_RELOAD)) + goto enable; + + val = local64_read(&hwc->prev_count); + amd_iommu_pc_set_counter(0, _GET_BANK(event), _GET_CNTR(event), &val); +enable: perf_iommu_enable_event(event); perf_event_update_userpage(event); @@ -311,9 +309,8 @@ static void perf_iommu_read(struct perf_event *event) struct hw_perf_event *hwc = &event->hw; pr_debug("perf: amd_iommu:perf_iommu_read\n"); - amd_iommu_pc_get_set_reg_val(_GET_DEVID(event), - _GET_BANK(event), _GET_CNTR(event), - IOMMU_PC_COUNTER_REG, &count, false); + if (amd_iommu_pc_get_counter(0, _GET_BANK(event), _GET_CNTR(event), &cnt)) + return; /* IOMMU pc counter register is only 48 bits */ cnt &= GENMASK_ULL(48, 0); diff --git a/arch/x86/include/asm/perf/amd/iommu.h b/arch/x86/include/asm/perf/amd/iommu.h index 466be63..60ddfb6 100644 --- a/arch/x86/include/asm/perf/amd/iommu.h +++ b/arch/x86/include/asm/perf/amd/iommu.h @@ -31,9 +31,11 @@ u8 amd_iommu_pc_get_max_banks(int idx); u8 amd_iommu_pc_get_max_counters(int idx); -int amd_iommu_pc_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, u64 *value); +int amd_iommu_pc_set_reg(int idx, u16 devid, u8 bank, u8 cntr, + u8 fxn, u64 *value); -int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, - u64 *value, bool is_write); +int amd_iommu_pc_set_counter(int idx, u8 bank, u8 cntr, u64 *value); + +int amd_iommu_pc_get_counter(int idx, u8 bank, u8 cntr, u64 *value); #endif /*_PERF_EVENT_AMD_IOMMU_H_*/ diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index dde960f..b68a2d6 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -1133,6 +1133,8 @@ static int __init init_iommu_all(struct acpi_table_header *table) return 0; } +static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr, + u8 fxn, u64 *value, bool is_write); static void init_iommu_perf_ctr(struct amd_iommu *iommu) { @@ -1144,8 +1146,8 @@ static void init_iommu_perf_ctr(struct amd_iommu *iommu) amd_iommu_pc_present = true; /* Check if the performance counters can be written to */ - if ((0 != amd_iommu_pc_get_set_reg_val(0, 0, 0, 0, &val, true)) || - (0 != amd_iommu_pc_get_set_reg_val(0, 0, 0, 0, &val2, false)) || + if ((iommu_pc_get_set_reg(iommu, 0, 0, 0, &val, true)) || + (iommu_pc_get_set_reg(iommu, 0, 0, 0, &val2, false)) || (val != val2)) { pr_err("AMD-Vi: Unable to write to IOMMU perf counter.\n"); amd_iommu_pc_present = false; @@ -2292,10 +2294,9 @@ u8 amd_iommu_pc_get_max_counters(int idx) } EXPORT_SYMBOL(amd_iommu_pc_get_max_counters); -int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, - u64 *value, bool is_write) +static int iommu_pc_get_set_reg(struct amd_iommu *iommu, u8 bank, u8 cntr, + u8 fxn, u64 *value, bool is_write) { - struct amd_iommu *iommu; u32 offset; u32 max_offset_lim; @@ -2303,9 +2304,6 @@ int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, if (!amd_iommu_pc_present) return -ENODEV; - /* Locate the iommu associated with the device ID */ - iommu = amd_iommu_rlookup_table[devid]; - /* Check for valid iommu and pc register indexing */ if (WARN_ON((iommu == NULL) || (fxn > 0x28) || (fxn & 7))) return -ENODEV; @@ -2330,4 +2328,55 @@ int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, return 0; } -EXPORT_SYMBOL(amd_iommu_pc_get_set_reg_val); + +int amd_iommu_pc_set_reg(int idx, u16 devid, u8 bank, u8 cntr, + u8 fxn, u64 *value) +{ + struct amd_iommu *iommu = get_amd_iommu(idx); + + if (!iommu) + return -EINVAL; + + return iommu_pc_get_set_reg(iommu, bank, cntr, fxn, value, true); +} +EXPORT_SYMBOL(amd_iommu_pc_set_reg); + +int amd_iommu_pc_set_counter(int idx, u8 bank, u8 cntr, u64 *value) +{ + struct amd_iommu *iommu = get_amd_iommu(idx); + + if (!iommu) + return -EINVAL; + + return iommu_pc_get_set_reg(iommu, bank, cntr, + IOMMU_PC_COUNTER_REG, + value, true); +} +EXPORT_SYMBOL(amd_iommu_pc_set_counter); + +int amd_iommu_pc_get_counter(int idx, u8 bank, u8 cntr, u64 *value) +{ + struct amd_iommu *iommu = get_amd_iommu(idx); + int ret; + u64 tmp; + + if (!value || !iommu) + return -EINVAL; + /* + * Here, we read the specified counters on all IOMMUs, + * which should have been programmed the same way and + * aggregate the counter values. + */ + + ret = iommu_pc_get_set_reg(iommu, bank, cntr, + IOMMU_PC_COUNTER_REG, + &tmp, false); + if (ret) + return ret; + + /* IOMMU pc counter register is only 48 bits */ + *value = tmp & GENMASK_ULL(48, 0); + + return 0; +} +EXPORT_SYMBOL(amd_iommu_pc_get_counter);