From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S942915AbdAJDgH (ORCPT ); Mon, 9 Jan 2017 22:36:07 -0500 Received: from mail-by2nam01on0069.outbound.protection.outlook.com ([104.47.34.69]:53808 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S942847AbdAJDev (ORCPT ); Mon, 9 Jan 2017 22:34:51 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit Subject: [PATCH v7 2/7] perf/amd/iommu: Modify functions to query max banks and counters Date: Mon, 9 Jan 2017 21:33:42 -0600 Message-ID: <1484019227-11473-3-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit@amd.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [114.109.128.54] X-ClientProxiedBy: SG2PR04CA0045.apcprd04.prod.outlook.com (10.169.49.141) To CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) X-MS-Office365-Filtering-Correlation-Id: 53b27c62-8b8c-4664-65c7-08d439099fb5 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;3:lsr6sFGOxLLyueYk3/BjDxyeLUJD+78i5IpPbkkPLMbpkliXA5ID919zAZqDptnIhTy1jjZ4DIK8YTBNws59aeBaFRX6SdYOG58QOT6rn4qVM5mJRK7IcmYje5B9Qh6kUGcEEJgev+mrhQw8elwv8mcJp39+wMHUB7cwMLXs5mMA10iLC9JKgWm2jhJ6HmX5ORwUVMXDYALKLZeOKyw2+3yVIhSmwsDmICcM21xTopvU6BvIB8HjxQmfmbBzg9urU07IdEo3WijEsYQylRHP+g==;25:ix0fOR/yntiDNdJQXUbETv02M0FWdT6UV/GU35RVJNdI0VVgmNXGORdnJbVLnGiquPy8iAhTmHp5PcD6XNNtVlURyk76sN/b7nwnsTgsjw9Iare8Pjl7t7M4d/5TJSpWZf40i898MtyprexqiFoDbboJRMOaD2fuHXBWWzRAQUv06tQXGQWKkZwVfnRnRMXElmltQ/dZxH/QHJWesnY9OIiqoQfShLPDKUDPdcpkRNrkMzn8xS3IqDezob+eiZp9YjFZ1AiD7UMEaDVv4DNhvEXKkLiy9OrLdsgMQjGYTBExvJWmK8ug2tfWbYLhcqHYEZKzDkRsRh/mSyX7DOLO0hQa9lX4LBTS9K1aB8ErJAkKb4K8oQ2h7EWkq6StfM4QO8PVmrfx4Sq6aZkIlJccla7vfj9c7ssnFQ8jYnaTE9f041py9wb5/wsPOyCz83CWvPFh3qGBjYCOy16ULwxCpg== X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;31:Na7x24j5KWZ6Gmn3++Atn06dX6AaCEKM10kAhD0ZQ9l/1iWQ8xASUq+dEZG7kBYm4bqH6qhK1AEnwqcl5cEugEYEGxzVl8KrRr9URTJsSWvSw9EsZ1Nedk/GXGcOxiTHtsLqj9aZ8CC9YfVLokotG7nnR9BZmF89QfbUCTddJCtwXsjB2YgqZ7itDaXhrSSDRUoYGnlfb04skxvKiLZJ5Lf0ujNmALi2SmRo6oITpk/hiHD3SdyIxgDOtQ1fXmiv;20:6yrCDrWY9pOHoqU75HQuWbbFCxN94gxpWWR8IicRkdS8xtPIy8uqwUcrmfxhPk6KNge+NuW7oCDKTQX3leiQknnKbSQ9PGvlBeEHs1c9KpfiXbDUY9DzGeF4sHM8IIvTyMOkVbgiwqKq+bbHc9Nx1SqhBOM7YINQddDh9fCG7UpVLNmGibB2wGdH6ngr7tA1x2bHcYy7JtfXUeC/Lh7wyYJnfRmh68v4lI7eYJooHARflOhc0bpKoggCMwvvbaTbHna+po0yRO0qED5wDctK4mubbZPqybQr5JUhy7TI6ZMKIU+70v+2BO0gxEzPEkfxPJhrwECnZh0UuJnoi+aI8LCL3a6309fCH46qXfy2dCVLRCZ4j1epDuXXRGCKPN7pbCCP9a3wc6Uv3u2i9wI5+ahwVjsHvn9xvrU9d5U0bseTy/MqHJAEgGF4o1ClvU38CtGcMB/DlsNT8txUv5dJBKgE4Lm1+GQA+X+ORbPq7MAUZ9TS4j/5aLt4GBBA4X1Z X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040375)(601004)(2401047)(5005006)(8121501046)(3002001)(10201501046)(6055026)(6041248)(20161123560025)(20161123558021)(20161123555025)(20161123562025)(20161123564025)(6072148);SRVR:CY4PR12MB1447;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;4:jYvZdzhKHI1SeNjk9bT0b6iPUkULtsh4skVabe1elNfVPK2bpkLPKkrsp4ELQfYa1hAV2apiZYri0Coh+SgAXOnHBon7CmPGxAXwQphBuLejHkVLa94FINgF1V8PdidzUwNzXhOdkompJ8gQJ0DQ+cf49fskv5qU3ABEighfsv4Mx8smaUvXo3p3kETV3OBHunEA71mxf3rC/yG+4wTHDHqC0nC8SUJu9DT6qQSQr/pU70jUwT78f9FWt0e0E7u91I3hHwUeiENu79CDHxc1K5OS3P+kSzBqSfIFzUVYqCW+UO+J4SzKtHuovG0Ebq+9VY32ss14WaRuyhpvSUzOavn6euob3DTAn0pf+QEQtj3GOWBCfCcn24HJGYh6B10YZO9z9W1naWUm8+uw3aPqsA7aCGoQA96aTCqIioqDZR9bUy5nHBi830AQL7/1duWjH/rKB8Af46SbaNYCYEWQ43MfJ7xMmcE52v76Fhm8WE3BIaKI+FNQcNCya0WQ1p//h7lZcYrqSRjqhSSnw5OTrb2Vt6QfhbFAon4mOWvWqjB7FzB1hm69KISuDIpJYhfgoEnLzIwzjgYHy3fYA4OMMkMRiSOG6Us8snjr9PzTazhoCCM9anmrQm8Hz7NuLKJdyp3Q7+4lBGUw0KjurwqObw8nBWEBNhFWPsL+KIUIFHM= X-Forefront-PRVS: 01834E39B7 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39410400002)(39850400002)(39840400002)(39860400002)(39450400003)(189002)(199003)(38730400001)(86362001)(54906002)(48376002)(50466002)(25786008)(305945005)(7736002)(189998001)(6486002)(6506006)(97736004)(68736007)(4720700003)(5001770100001)(5660300001)(6512007)(101416001)(66066001)(15650500001)(92566002)(6116002)(3846002)(47776003)(2906002)(50986999)(2950100002)(76176999)(42186005)(8676002)(81156014)(5003940100001)(81166006)(36756003)(50226002)(105586002)(106356001)(4326007);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR12MB1447;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR12MB1447;23:fxpGlma14kQoaTZOh8iI722UAlz6uxZNyvOLMk5q4?= =?us-ascii?Q?Ri56Iv5ZlnVmiDSrIH83SjCZYAwjxuAHJVoqxeV0tND8nXH0ecgPkC+97kFD?= =?us-ascii?Q?IJVGvkzL/rOns1pBw9dsOu3kLHyO0E6WYuPTQDtViKOnk+btqE714ySsi5Yf?= =?us-ascii?Q?KOrNDviAc3fsj5xG0eSmaJIbpfRJCwy1wY7yjxc5adtG2crZezS3wLmPFmhU?= =?us-ascii?Q?NDW3Z6peVY7E4xICOh7ebtXbRVWML7Tmd6xsyGy352POrIZWHaXbpODdmDbp?= =?us-ascii?Q?/IUAEY6YMSj4QABdqwYOdcZKn1F78zH4bPVIpuCF+IzU3bbzMe7upTI1Tvno?= =?us-ascii?Q?Dx/pPiFUbNCXx5HSev8ImYGisWkN32xN0k0X6izCjUyqWkCZSVXkwT5NTOAq?= =?us-ascii?Q?6VO0qaPfbuCK1EfBMHO5MNSsTrA0CRFBjGRkyIdxSM8r3I6A9vQHZ8E3of7t?= =?us-ascii?Q?NdshmuvUIXCUirIgfuLg9bk3mM1jZXwKh7yM4KrOPAh/f6sFc0enhViVTLN5?= =?us-ascii?Q?GOuidGTh85gkLnjOiECouMREZKfT7XUlv65PXRgQ2ddhVx3f6Kf2IQhzKuHP?= =?us-ascii?Q?HCSjOWDKU55DW/Im+0TncaRlG2VKsSS0agB2IW5jxfRpNnu3cVS6c6T1bsh+?= =?us-ascii?Q?E4YVWzTVbggjA3n8u1hMOkeQD5Y7O1XHTi439X6Oh6ChmZbabw4KLUlh5u8K?= =?us-ascii?Q?LK8Z+MzzFPzIvIIRO28z4aMMSeecHuxpA84D4h/sbZGXYTuUouW6b36qWFGJ?= =?us-ascii?Q?EHw1M2P8wCuNfNQSB5m3vxyuu2wKVy2ge0jOKyrnxCe7gGc0TaezMRBcnkjZ?= =?us-ascii?Q?Ga6nB5XbdsH3IgeNY126oE8KTbMxZsjENCKUvpBp0NDWpC7vNA6v/RQAaFoV?= =?us-ascii?Q?2qPZL8+UciKockfm3B+ZcvueWwY+EeEGAcZYnd+LWIY6tk/yszQSj7ZPJPXf?= =?us-ascii?Q?NqIGs50FQ6LOL5VeLfH7yaByjDrc99gZeLUaPuHE83Y1RUdqLLa0vTKXRGd3?= =?us-ascii?Q?S1/+2Zq/vwHgwk3IJoWdZfThlovTv1tXgKZ8qsm8j9aLa81+rb2mhJldZt0O?= =?us-ascii?Q?U7W9Bs+bZ+qSsvn7thWH7e5J4Re6aEVO5BVUWlaU0VnFVc4b1lADeIEjDK+C?= =?us-ascii?Q?MRVr6MKBGvAbADN+5ax7YwxBnyTjBYLuD0AGbNRDEWfqwfBM0/89n+ifn5NE?= =?us-ascii?Q?xxpdK07bCE8TDQ/YNJE9vQ0ILmasbEQJYAd?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;6:XN8vTzH+X1nsqWm1lXmUwkZD2owY5+VLc0q+mrK4A0MeFPluB7bYmaw2NK7gZM3mE7+ieSAcWgIJQLfe3huvGoIplcw/6eynoM/Ja6E9zlbU9i5Lt6v1JyLr8LzY8bZ5fNelYC8tFxN+VvAGx2xMoJ76whxUKb5uR94T0QogzZ94XkV9bZehU3HzdyR+CmcXnsI2YYutVnZ32mxvSJXZ5FGOSR3zNNh5ynHUmrGC1fwHuQCgS+yH7ekX6INZaXyT9vfM6gyaUXSqMgFEpl9HYEJuWKZPx+UyniZutZd8o/gVjLHqEjYIn+0Nn2mnynNh66NjU6X8o1CaBB48ujtg5iN/jiTxN+5Y8Q0VFDK27vC1seZa/Ci99F+gvoNGCV5VUXuy8qlgiso993b3aLRqwHmQW35jUAI/5KyJlJxj3mEpnIER10h2Vvpm3lEKhECdhmfkicQtbxK1QZFH6OhAZA==;5:sBI6SAo6uIa7gc04Mld94l+EtD0pGRrdCKQU7aq3j4MBqs48SQXEykZlgbyTiMXD2KF8JmcC/ziGLG7S1SXAl5c7aC9zU7LkB0s+gcUQbTdmLFxDudtidgeT8wDlKHwwCxAJq+t2n/DtjSp5hQ8dVGaUOjNJamsUKHzKZ9kgdMg=;24:bFpOJK/PO0MVkZi+bo6sjCNYzREfDJGoGFDomZmaOJGSgM5wM/0Dy2fY0djpY6ZQ66Oq+C9jU4y4Yu/DODEXTrpT2la6LcClzCygXpCjRJc= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;7:2i2w68+wkxkLJAUA3EjFD19nqsWOdexHxGGHECxCBacKxufQdU2uIZE0Kwm1CJ9OsY+/3jjr0Jxlu7IxQeKrRwbhibHnPV8Dh6qMw54MTsUdavAvfAq9kbBzbAmVbGSQvwsdj+A3si3PspdvVRjbTFdToYWphSpa1VwDP7tp6evWCQbMe+SjiSUxNQS6A2QicQMDrJf61/VTzyWhduoe7Tewbsdqs3g0xmh5LOI8l1vokci9k+NAho4jpiiO4g+42IhExsipEDPPNPnfSzlOZnc6/sZKiUVl77gOLvKSEpFbIpO+1DioTZNv4DF8nbYhr7enXSAoL+TfQxFeoLAWUYVNp4/335/OTzlxyNBiWJB0YrMZMHeRrds191BZfzRN4Rr4/p4dQFkVPwJuaPKPn5FsocZmKagmi3RSum7cPfrqObup5lU05SSIUIdpp3R8R58RuUbW4DMOZJnDYOMhqQ==;20:vi9qD85xbeMHEvN9FBq1RLVvY65HJ79B8KEfQSE3P2L+HdVw+7FzhzVhFFQZAl7oSVj9aCKwLHVeHY98QSgNshU5asntBj0b8rraMaHdrK1/00Xcvr0UoNVAUqfodz3nkEK3xFQ0uHjgKC5cNWdOfXLvQC/PnpJkq0X/F/48AcAg6R1MUb4y+a5t1ql+jLNRckcF1bed7vS3MsBws+FkWIqOtMH5QP9DwHWD5mWcK4m7/eTjfSfSftmnn7LyKKeE X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Jan 2017 03:34:44.0047 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR12MB1447 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently, amd_iommu_pc_get_max_[banks|counters]() use end-point device ID to locate an IOMMU and check the reported max banks/counters. The logic assumes that the IOMMU_BASE_DEVID belongs to the first IOMMU, and uses it to acquire a reference to the first IOMMU, which does not work on certain systems. Instead, we modify the function to take IOMMU index, and use it to query the corresponded AMD IOMMU instance. Note that we currently hard-code the IOMMU index to 0, since the current AMD IOMMU perf implementation only supports single IOMMU. Subsequent patch will add support for multi-IOMMU, and will use proper IOMMU index. This patch also removes unnecessary function declaration in amd_iommu_proto.h. Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Joerg Roedel Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 17 +++++++---------- arch/x86/events/amd/iommu.h | 7 ++----- drivers/iommu/amd_iommu_init.c | 35 +++++++++++++++++++++-------------- drivers/iommu/amd_iommu_proto.h | 2 -- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index f387baf..cf94f48 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -237,14 +237,6 @@ static int perf_iommu_event_init(struct perf_event *event) return -EINVAL; } - /* integrate with iommu base devid (0000), assume one iommu */ - perf_iommu->max_banks = - amd_iommu_pc_get_max_banks(IOMMU_BASE_DEVID); - perf_iommu->max_counters = - amd_iommu_pc_get_max_counters(IOMMU_BASE_DEVID); - if ((perf_iommu->max_banks == 0) || (perf_iommu->max_counters == 0)) - return -EINVAL; - /* update the hw_perf_event struct with the iommu config data */ hwc->config = config; hwc->extra_reg.config = config1; @@ -456,6 +448,11 @@ static __init int _init_perf_amd_iommu( if (_init_events_attrs(perf_iommu) != 0) pr_err("perf: amd_iommu: Only support raw events.\n"); + 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; + /* Init null attributes */ perf_iommu->null_group = NULL; perf_iommu->pmu.attr_groups = perf_iommu->attr_groups; @@ -466,8 +463,8 @@ static __init int _init_perf_amd_iommu( amd_iommu_pc_exit(); } else { pr_info("perf: amd_iommu: Detected. (%d banks, %d counters/bank)\n", - amd_iommu_pc_get_max_banks(IOMMU_BASE_DEVID), - amd_iommu_pc_get_max_counters(IOMMU_BASE_DEVID)); + amd_iommu_pc_get_max_banks(0), + amd_iommu_pc_get_max_counters(0)); } return ret; diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h index 845d173..432d867 100644 --- a/arch/x86/events/amd/iommu.h +++ b/arch/x86/events/amd/iommu.h @@ -24,15 +24,12 @@ #define PC_MAX_SPEC_BNKS 64 #define PC_MAX_SPEC_CNTRS 16 -/* iommu pc reg masks*/ -#define IOMMU_BASE_DEVID 0x0000 - /* amd_iommu_init.c external support functions */ extern bool amd_iommu_pc_supported(void); -extern u8 amd_iommu_pc_get_max_banks(u16 devid); +extern u8 amd_iommu_pc_get_max_banks(uint idx); -extern u8 amd_iommu_pc_get_max_counters(u16 devid); +extern u8 amd_iommu_pc_get_max_counters(uint idx); extern int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, u64 *value, bool is_write); diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 157e934..a7e756b 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2706,6 +2706,19 @@ bool amd_iommu_v2_supported(void) } EXPORT_SYMBOL(amd_iommu_v2_supported); +static struct amd_iommu *get_amd_iommu(uint idx) +{ + uint i = 0; + struct amd_iommu *iommu = NULL; + + for_each_iommu(iommu) { + if (i == idx) + break; + i++; + } + return iommu; +} + /**************************************************************************** * * IOMMU EFR Performance Counter support functionality. This code allows @@ -2713,17 +2726,14 @@ bool amd_iommu_v2_supported(void) * ****************************************************************************/ -u8 amd_iommu_pc_get_max_banks(u16 devid) +u8 amd_iommu_pc_get_max_banks(uint idx) { - struct amd_iommu *iommu; - u8 ret = 0; + struct amd_iommu *iommu = get_amd_iommu(idx); - /* locate the iommu governing the devid */ - iommu = amd_iommu_rlookup_table[devid]; if (iommu) - ret = iommu->max_banks; + return iommu->max_banks; - return ret; + return 0; } EXPORT_SYMBOL(amd_iommu_pc_get_max_banks); @@ -2733,17 +2743,14 @@ bool amd_iommu_pc_supported(void) } EXPORT_SYMBOL(amd_iommu_pc_supported); -u8 amd_iommu_pc_get_max_counters(u16 devid) +u8 amd_iommu_pc_get_max_counters(uint idx) { - struct amd_iommu *iommu; - u8 ret = 0; + struct amd_iommu *iommu = get_amd_iommu(idx); - /* locate the iommu governing the devid */ - iommu = amd_iommu_rlookup_table[devid]; if (iommu) - ret = iommu->max_counters; + return iommu->max_counters; - return ret; + return 0; } EXPORT_SYMBOL(amd_iommu_pc_get_max_counters); diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h index 7eb60c1..60f2eef 100644 --- a/drivers/iommu/amd_iommu_proto.h +++ b/drivers/iommu/amd_iommu_proto.h @@ -58,8 +58,6 @@ extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid, /* IOMMU Performance Counter functions */ extern bool amd_iommu_pc_supported(void); -extern u8 amd_iommu_pc_get_max_banks(u16 devid); -extern u8 amd_iommu_pc_get_max_counters(u16 devid); extern int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, u64 *value, bool is_write); -- 1.8.3.1 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Suravee Suthikulpanit Subject: [PATCH v7 2/7] perf/amd/iommu: Modify functions to query max banks and counters Date: Mon, 9 Jan 2017 21:33:42 -0600 Message-ID: <1484019227-11473-3-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit@amd.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1484019227-11473-1-git-send-email-Suravee.Suthikulpanit-5C7GfCeVMHo@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, iommu-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Cc: peterz-wEGCiKHe2LqWVfeAwA7xHQ@public.gmane.org, mingo-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org, bp-Gina5bIWoIWzQB+pC5nmwQ@public.gmane.org List-Id: iommu@lists.linux-foundation.org Currently, amd_iommu_pc_get_max_[banks|counters]() use end-point device ID to locate an IOMMU and check the reported max banks/counters. The logic assumes that the IOMMU_BASE_DEVID belongs to the first IOMMU, and uses it to acquire a reference to the first IOMMU, which does not work on certain systems. Instead, we modify the function to take IOMMU index, and use it to query the corresponded AMD IOMMU instance. Note that we currently hard-code the IOMMU index to 0, since the current AMD IOMMU perf implementation only supports single IOMMU. Subsequent patch will add support for multi-IOMMU, and will use proper IOMMU index. This patch also removes unnecessary function declaration in amd_iommu_proto.h. Cc: Peter Zijlstra Cc: Borislav Petkov Cc: Joerg Roedel Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 17 +++++++---------- arch/x86/events/amd/iommu.h | 7 ++----- drivers/iommu/amd_iommu_init.c | 35 +++++++++++++++++++++-------------- drivers/iommu/amd_iommu_proto.h | 2 -- 4 files changed, 30 insertions(+), 31 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index f387baf..cf94f48 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -237,14 +237,6 @@ static int perf_iommu_event_init(struct perf_event *event) return -EINVAL; } - /* integrate with iommu base devid (0000), assume one iommu */ - perf_iommu->max_banks = - amd_iommu_pc_get_max_banks(IOMMU_BASE_DEVID); - perf_iommu->max_counters = - amd_iommu_pc_get_max_counters(IOMMU_BASE_DEVID); - if ((perf_iommu->max_banks == 0) || (perf_iommu->max_counters == 0)) - return -EINVAL; - /* update the hw_perf_event struct with the iommu config data */ hwc->config = config; hwc->extra_reg.config = config1; @@ -456,6 +448,11 @@ static __init int _init_perf_amd_iommu( if (_init_events_attrs(perf_iommu) != 0) pr_err("perf: amd_iommu: Only support raw events.\n"); + 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; + /* Init null attributes */ perf_iommu->null_group = NULL; perf_iommu->pmu.attr_groups = perf_iommu->attr_groups; @@ -466,8 +463,8 @@ static __init int _init_perf_amd_iommu( amd_iommu_pc_exit(); } else { pr_info("perf: amd_iommu: Detected. (%d banks, %d counters/bank)\n", - amd_iommu_pc_get_max_banks(IOMMU_BASE_DEVID), - amd_iommu_pc_get_max_counters(IOMMU_BASE_DEVID)); + amd_iommu_pc_get_max_banks(0), + amd_iommu_pc_get_max_counters(0)); } return ret; diff --git a/arch/x86/events/amd/iommu.h b/arch/x86/events/amd/iommu.h index 845d173..432d867 100644 --- a/arch/x86/events/amd/iommu.h +++ b/arch/x86/events/amd/iommu.h @@ -24,15 +24,12 @@ #define PC_MAX_SPEC_BNKS 64 #define PC_MAX_SPEC_CNTRS 16 -/* iommu pc reg masks*/ -#define IOMMU_BASE_DEVID 0x0000 - /* amd_iommu_init.c external support functions */ extern bool amd_iommu_pc_supported(void); -extern u8 amd_iommu_pc_get_max_banks(u16 devid); +extern u8 amd_iommu_pc_get_max_banks(uint idx); -extern u8 amd_iommu_pc_get_max_counters(u16 devid); +extern u8 amd_iommu_pc_get_max_counters(uint idx); extern int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, u64 *value, bool is_write); diff --git a/drivers/iommu/amd_iommu_init.c b/drivers/iommu/amd_iommu_init.c index 157e934..a7e756b 100644 --- a/drivers/iommu/amd_iommu_init.c +++ b/drivers/iommu/amd_iommu_init.c @@ -2706,6 +2706,19 @@ bool amd_iommu_v2_supported(void) } EXPORT_SYMBOL(amd_iommu_v2_supported); +static struct amd_iommu *get_amd_iommu(uint idx) +{ + uint i = 0; + struct amd_iommu *iommu = NULL; + + for_each_iommu(iommu) { + if (i == idx) + break; + i++; + } + return iommu; +} + /**************************************************************************** * * IOMMU EFR Performance Counter support functionality. This code allows @@ -2713,17 +2726,14 @@ bool amd_iommu_v2_supported(void) * ****************************************************************************/ -u8 amd_iommu_pc_get_max_banks(u16 devid) +u8 amd_iommu_pc_get_max_banks(uint idx) { - struct amd_iommu *iommu; - u8 ret = 0; + struct amd_iommu *iommu = get_amd_iommu(idx); - /* locate the iommu governing the devid */ - iommu = amd_iommu_rlookup_table[devid]; if (iommu) - ret = iommu->max_banks; + return iommu->max_banks; - return ret; + return 0; } EXPORT_SYMBOL(amd_iommu_pc_get_max_banks); @@ -2733,17 +2743,14 @@ bool amd_iommu_pc_supported(void) } EXPORT_SYMBOL(amd_iommu_pc_supported); -u8 amd_iommu_pc_get_max_counters(u16 devid) +u8 amd_iommu_pc_get_max_counters(uint idx) { - struct amd_iommu *iommu; - u8 ret = 0; + struct amd_iommu *iommu = get_amd_iommu(idx); - /* locate the iommu governing the devid */ - iommu = amd_iommu_rlookup_table[devid]; if (iommu) - ret = iommu->max_counters; + return iommu->max_counters; - return ret; + return 0; } EXPORT_SYMBOL(amd_iommu_pc_get_max_counters); diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h index 7eb60c1..60f2eef 100644 --- a/drivers/iommu/amd_iommu_proto.h +++ b/drivers/iommu/amd_iommu_proto.h @@ -58,8 +58,6 @@ extern int amd_iommu_domain_set_gcr3(struct iommu_domain *dom, int pasid, /* IOMMU Performance Counter functions */ extern bool amd_iommu_pc_supported(void); -extern u8 amd_iommu_pc_get_max_banks(u16 devid); -extern u8 amd_iommu_pc_get_max_counters(u16 devid); extern int amd_iommu_pc_get_set_reg_val(u16 devid, u8 bank, u8 cntr, u8 fxn, u64 *value, bool is_write); -- 1.8.3.1