From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751293AbdBXJ0R (ORCPT ); Fri, 24 Feb 2017 04:26:17 -0500 Received: from mail-bl2nam02on0078.outbound.protection.outlook.com ([104.47.38.78]:45402 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751173AbdBXJ0K (ORCPT ); Fri, 24 Feb 2017 04:26:10 -0500 Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Suravee.Suthikulpanit@amd.com; From: Suravee Suthikulpanit To: , CC: , , , , Suravee Suthikulpanit , Suravee Suthikulpanit Subject: [PATCH v11 01/10] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Date: Fri, 24 Feb 2017 02:48:13 -0600 Message-ID: <1487926102-13073-2-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487926102-13073-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1487926102-13073-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: HK2PR02CA0037.apcprd02.prod.outlook.com (10.163.104.175) To CY4PR12MB1447.namprd12.prod.outlook.com (10.172.71.139) X-MS-Office365-Filtering-Correlation-Id: 3c3e2583-4ac6-4db6-c5b7-08d45c91fce2 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;3:0tavrmVr6ZSr6J7DVjuuts9aZh2cM3niJhYK6rhgzMCAIo+5w9KtzFM7WC+TbFZYBPKD3WX5Of6hZZxx5Yr11eub3qdSXVZNAZivtTdw4uUVNhr3hqN7uFjqzBnb452k3wSRlo+B1r/wAjNViIP5/ADUkKREgJlKKYnmWQS9+8tIL2rOAEjagaXz+Ejc8CTBLPxeXSa7D7JqwQPHS399/bTJmRNFnruZqZDrrdVpx7CVEwn4e95qA+eAv8ngUmSg5VztZyownYaHsmjwKSEVKdJJwDJ3uzyJecFq56/ZOnQ=;25:PJ9m02Unsv0oz71q+A4FoOM5EldMt8wAcl95mGUXXXiVZe2Vi9S5JvIuYx0lJhz3mPihN62IIZw1fb7fEz9nQ2XnCqnUJMAPZRDNRoPseYimlHfJDSd87L9POpbep+kqTsj2Gv8kQ0AMV/KAftLlNy5zGz0mdOyl+Lir6RxSN2DJpQZq41DXjovRWhoKN/GAaRtCRlUyDTl2ijnAyDQaFp1zbWg5kMZQ1+T/yyi3vUWwgXdl8B24lOk9+yLTYV7kG2nC+1WMi+RHfG9Zzb2ufcqtgbIKifh17H77l/lJJthngOCWXaiKEqNTF609Z8aaaBPES/P2Sk1gChC4ORB+wbcnjmCBHYgUNuF5cDpmJgSU7WGjE/iqIsajn9qDLLeMUNUApXKoBLOKF8zDYUlRCk6qFW2TGUlnzjQtI1zmeckP2oIgoEJVRaz45iGx/j+Zybz4jl2qPBytr1BVQDgQ1A== X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;31:SuX00aARO8gC6g8ts2y5u1iFLpvFtzXPfKf2DAski+CPFssc4FKUtc1aEsj84r4GQCDvEbQT5OFQ871hxTTx8RS9EmLOU0VcTH4Xb/JWZ5g2xgF+4Qb9mAm5d7kjWJs2BjsF314f68WOvMW6e5BcnCnHiR2QR9H0o6Qqs4T6weBXu4xCW1f6ltPIhK0oJYI/pTgErg07ik6bD4rqL3LFKVOtUxQFohSqUR8WBStrakZV1qkkxv76fvjovQV1A0Gw;20:boNEYV3y+nDcx/T043hIpkLu/k+bL3U/gofU7zluG5EKVNLwbPSZ2rl5XvF2uFHvFr9PYlXh7DR3W2O7jgIA8Ey5V4Vet0B1OpGPfWMRb7DiscS+tt0vOrEOTZfo8endp/5d00b6MaoZiGBsk+V/DwvIVJhNU4zK7f1z6/4bdd+5hnzOHdp3/PN2Hi/zqVwdeJNU8YrLkZrQVOVvzkw8L/7H6jiGaUQnBqg+TM9mrYJI4OPjHFxIntFDJWxH77l1T80TRWmKRd5GFUfiY8GcKotkm+Z2AGCENOoOxDma+gMM/yKSxvvoCyvF7OrPlyFsT2AzKjevDV0xLzMhcb6K8x44M3o78li/xKAPF+fIeY/UAgo1Y8WpEcEXLhgYFz/R0qRcUXFz2xebxSU4AJN9z1eTrWS7uVbUUiiCwVI3t/c3if3KI/ebBEX+bLlVhjzUyCiRTCtt5EUKgi5U+d+LpO0UHbx5vPJduMQBWVxHI/gNUcY2pn1vcJMod9PqjzkH 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)(8121501046)(5005006)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123564025)(20161123560025)(20161123555025)(20161123562025)(6072148);SRVR:CY4PR12MB1447;BCL:0;PCL:0;RULEID:;SRVR:CY4PR12MB1447; X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;4:+8fqLCKweMdaQWTZkYhlLyElbxUR0gJxfdf1y+AbhRwZsfSXiAXSwQ7vOUX7/633SXM1Dd/q4tfuUeCyCLeVMlq8funIUwbzGVtm9EEW+/9U6bDEc5e0QZlrnMtaGCApDS0E1orovNvROL+lfdWd9hFWdQo5rOr1KIqyQoxrPpSRCVBrTeyMDM26lZ/tKtgr4ZfmH7PScT7CM9e015ZFLDN0GNgvOzEcFO7OI2dA7FTux50FOjQ3iEzpqaVkmvCijSfKRO8Ccj7NQ+/LceaTLch6aBwpB9NnTEeKq5B8apT57PdTl/ZyJyL3gds676jgIy/nux8k4+3MyWAP7XChyyA4d5Yw53tXGDfXC0YGO+GJFVbu1QQq/s+mw8CQLDG/r0apJbNkyI7yEoChDH4m561m+pcrcBRbX/LvcaBREhQzW1RyeQA8IrM7giW+xcQgolebs6q859+yMkVjVPIcx0n10CjcLUgmp9f4wLZwee9aSNL0sqEyEdERTQW03Elv4WDnkkm3VuVkvnCv28emy8SkQAbELgGz0oh7j0gqAFLCAcQhv/K6G1KOr3LSLeF1jDv3zVddJKu2pk45ua+Wg4BPxdR0r+kWCDvdQDmIixSV0GO+r+mJKPz/KzzV3f0++7BBTiaJFc7QSpg8+Ch1gaxYdFgnFwx2ab4v2HW30QM= X-Forefront-PRVS: 0228DDDDD7 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39860400002)(39850400002)(39410400002)(39840400002)(39450400003)(189002)(199003)(3846002)(4326007)(105586002)(47776003)(6116002)(76176999)(305945005)(36756003)(86362001)(50986999)(6506006)(101416001)(106356001)(38730400002)(53936002)(6486002)(7736002)(66066001)(68736007)(25786008)(8676002)(48376002)(5660300001)(5003940100001)(54906002)(92566002)(2906002)(189998001)(50466002)(6666003)(81156014)(2950100002)(4720700003)(50226002)(6512007)(81166006)(97736004)(42186005)(2004002);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:/AHE2VS/kAUm6yMMrsoIyEGzhpLDWfwJ8vaf8oqsj?= =?us-ascii?Q?1wt+hhbAOCIKBzVHgUSzqQouYRwl2S67PzKkiJU3/uNACXsBwPLGm0v2gVxT?= =?us-ascii?Q?avYgkEuJV0xYIHmPfYWXS+aNs/791ZEHoyuyqzcEj4/EQCq0x09MaU8JfWyN?= =?us-ascii?Q?V1fjFbyU29nbxl8sNHawDlsV9+7lNNKLEYViY+y8v7Om/NMJbr1qM9qpwsmP?= =?us-ascii?Q?v+NTd4FXJKlg76R/NHYZdDMHbfNJdBBpePiCfsyvXe2lAV9HK6TCOrs/1zY9?= =?us-ascii?Q?Z9ViX52M9ocq8Siqz6kErnqiSfh85ebM74KqWB84OAfKNF3oRBTdkXrsJNWi?= =?us-ascii?Q?XhWqemP4na2TVQ2zQkYpHy2Fz+NnfRUPOQoAjtQp+r/4Ftf5KdwAlkN2AXyf?= =?us-ascii?Q?j518f2bnBgkFRKqsmJ/Bu/XrjyBSTPn/EnRoXxf9XNqn/rSqtY7XRIJOMSHp?= =?us-ascii?Q?Oko55URubTEg5+TVdO+LFEVB+z6zvpZbHJhK9alFxJzQzHXrdZ9ByQW1Funp?= =?us-ascii?Q?4ODJ86onHDh0SzrzKWwWQ8MpW9uNhmlbd3ruEtbEll5RKnB6fkOJ2MuEDvC/?= =?us-ascii?Q?ZzfPp9GNhshd4wUxeDG8QX5qL2oc7fJkTOFARLp61HHzk/jepK6gpEHEBFwh?= =?us-ascii?Q?DFSfoSvchuuXOu8sZ07XGG/cTdvjwlv/DPMr4G778IK5YAYDgv/buP6G9wlM?= =?us-ascii?Q?6JxnWewYT8MQdhKOVFhRsPsi4bD7CdTMcMJB/aWurph+eBgDIoUizWdtfJCF?= =?us-ascii?Q?ozjszBaOBzdKpJ8k9czBWtaTFSiwV71WygtvFIrJEUbfOrsgqTFM4NQ+iAth?= =?us-ascii?Q?kT8saiw+58A7WLP+vxPBykweM1cBu2azaIWGNGMyxHu36OFNau+K4Y72YDJh?= =?us-ascii?Q?/V80Tgk+oWVjRCd8ZIHEblBi9Rb3NTiSEbnF0yAMWKekvHnjrW9O9ntSTryL?= =?us-ascii?Q?1Kw4hSdqm8NloOTQRFDgxi0U4C5DMOikB+YT2gLhxWLZZ3luAVXr6mnSMREo?= =?us-ascii?Q?HSGFck2lOPsgIXQMP+Ms6xTE7J3GFjGsBUhVVt88WeQOBFjljGg1iOSFON1a?= =?us-ascii?Q?Kq2VFeAD4P321sjHcrvM5NJqLSmeedf1F2Q2OWkT8l8rAsGJ09xJWVBP/FSR?= =?us-ascii?Q?Dr+xKxG+aoziEfoRlJkBk1YHGbUv2xAiebsZk4YXAiaNaOxtLz5PRgpX+Ynh?= =?us-ascii?Q?esPueTwSMX6vI8HpSIG0TKwKNOn6ZUERUvf?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;6:kcaLt6ThHrOiGe0WKVpHitSJkq8wZasYmxEcWoo7XNQYYL2ijaenmOJ9rpaxGVNTmnwdvq23ULlTpqYllDJ1BsO8mVt/GeTVEY5BJfU1IefPFbR8zjBVJLOitx5sry5a+CBflbc4kYT48pHavhXpejVJFBkt3BwML5rJ+ZKRpcNeqGTtHC0YyanzWDWPn7O7b4XYfsOMc9/+Kwgj6+hDWHsutv0eWKB33fG+x3uWLa0+wv//j10r/efYqrVB+VQ6Fi7gv+ZG8FYiw0/vC4QqkwohRt8+bSIdrIOsrxn0NrygR6QWh0matHFqpIPHsfIHid5Keo2FIW8NSN7qZdv+sTCdpqfLznwdmT45xO83/yrvxJnJ6ZEitG/lURHg086l5B1b8KJBWsL+0qppClUpSCPUxgZYdneScDXdtVmFToc=;5:fCLrV7/FMlvA8G2mlCoeRU5O4EtJcnjI2wh+PpBJZN0Bl+MYQV+59b7fzgf5f53kpvmicc8w7nd2fhhnGQZJLlUNkE03PudoADSUOp50DZgeruYI+haWnMvMAjxCTb7DF195/VtTS2w71I4J2VDzyX0trNTjlqEQrT+8lcZrSMc=;24:VOr28+X1cQK+Bf5yYyxGOxrpIsDIvSnXL5GWfG3XYjugd6H5L1ZfQPAuTYsgPhu/MrYd7eRt/Hbc03mRPiPHYMDQ41KHWvJSsn9vLjoYS6Q= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CY4PR12MB1447;7:DH5mjel5//OudNk+1YJz+s8o6z0CHGdNheZPWeYGg8fS0K6xPPcv8Zd+APEuo4QZlZFBlflWPKdAam/CYf7LsE61R8T72pVnhPmiZuyHhgI/pN9c4mzQDpCVw7ZCzW9RaaOH/sJmCmw//ymPgLB8++qt0AYErHbDI56Y7OLGiZu/OfHTOvV2SD01ymJXwR1BLssmmr//aLBeY7vlTc7FLcdovl0Wzg0fTHB1shKKquLNOSF6xhvHDD5oWyDC98Msd5ASHdkoWI3ty01RH45rpkNmwZjhJsp+o2jnVdPHQGrBwZ3da2BEFjSDLRSWmO8SIPXQM5HAJch8+sqvd24T+A==;20:IoI6nO2R6aZv1D3AjXY7LlsdmALMIvaQfn2AkNo12zkD9dvqNvW/0tgXFR2wqs4CjVJpOTIiqoQ6PUD9ws5IsYfkt0rUrjVDezeygA3h7kHu1HHNifVIZBJTHrYAidCdZenFYw1v2XgSTw4/86jq97NVFqdaCTjSUtKjRjABXNT7kOaUt8zM+5klwrpS5QTfpHWssVq0GRd3GkfK6PMy6G+pxL6xho/AnA6DDbmP2qAkRcM91S+bv1vMYzPoESyV X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Feb 2017 08:48:57.1941 (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 Declare pr_fmt for perf/amd_iommu and remove unnecessary pr_debug. Also check return value when _init_events_attrs fails. Cc: Peter Zijlstra Cc: Borislav Petkov Signed-off-by: Suravee Suthikulpanit --- arch/x86/events/amd/iommu.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index b28200d..8d8ed40 100644 --- a/arch/x86/events/amd/iommu.c +++ b/arch/x86/events/amd/iommu.c @@ -11,6 +11,8 @@ * published by the Free Software Foundation. */ +#define pr_fmt(fmt) "perf/amd_iommu: " fmt + #include #include #include @@ -298,7 +300,6 @@ static void perf_iommu_start(struct perf_event *event, int flags) { struct hw_perf_event *hwc = &event->hw; - pr_debug("perf: amd_iommu:perf_iommu_start\n"); if (WARN_ON_ONCE(!(hwc->state & PERF_HES_STOPPED))) return; @@ -323,7 +324,6 @@ static void perf_iommu_read(struct perf_event *event) u64 prev_raw_count = 0ULL; u64 delta = 0ULL; 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), @@ -349,8 +349,6 @@ static void perf_iommu_stop(struct perf_event *event, int flags) struct hw_perf_event *hwc = &event->hw; u64 config; - pr_debug("perf: amd_iommu:perf_iommu_stop\n"); - if (hwc->state & PERF_HES_UPTODATE) return; @@ -372,7 +370,6 @@ static int perf_iommu_add(struct perf_event *event, int flags) struct perf_amd_iommu *perf_iommu = container_of(event->pmu, struct perf_amd_iommu, pmu); - pr_debug("perf: amd_iommu:perf_iommu_add\n"); event->hw.state = PERF_HES_UPTODATE | PERF_HES_STOPPED; /* request an iommu bank/counter */ @@ -393,7 +390,6 @@ static void perf_iommu_del(struct perf_event *event, int flags) struct perf_amd_iommu *perf_iommu = container_of(event->pmu, struct perf_amd_iommu, pmu); - pr_debug("perf: amd_iommu:perf_iommu_del\n"); perf_iommu_stop(event, PERF_EF_UPDATE); /* clear the assigned iommu bank/counter */ @@ -444,27 +440,27 @@ static __init int _init_perf_amd_iommu( raw_spin_lock_init(&perf_iommu->lock); - /* Init format attributes */ 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; - /* Init events attributes */ - if (_init_events_attrs(perf_iommu) != 0) - pr_err("perf: amd_iommu: Only support raw events.\n"); + ret = _init_events_attrs(perf_iommu); + if (ret) { + pr_err("Error initializing AMD IOMMU perf events.\n"); + return ret; + } - /* Init null attributes */ perf_iommu->null_group = NULL; perf_iommu->pmu.attr_groups = perf_iommu->attr_groups; ret = perf_pmu_register(&perf_iommu->pmu, name, -1); if (ret) { - pr_err("perf: amd_iommu: Failed to initialized.\n"); + pr_err("Error initializing AMD IOMMU perf counters.\n"); amd_iommu_pc_exit(); } else { - pr_info("perf: amd_iommu: Detected. (%d banks, %d counters/bank)\n", + pr_info("Detected AMD IOMMU (%d banks, %d counters/bank).\n", amd_iommu_pc_get_max_banks(IOMMU_BASE_DEVID), amd_iommu_pc_get_max_counters(IOMMU_BASE_DEVID)); } -- 1.8.3.1