From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751439AbdAPHYV (ORCPT ); Mon, 16 Jan 2017 02:24:21 -0500 Received: from mail-bn3nam01on0089.outbound.protection.outlook.com ([104.47.33.89]:22499 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750981AbdAPHYS (ORCPT ); Mon, 16 Jan 2017 02:24:18 -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 v8 1/9] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Date: Mon, 16 Jan 2017 01:23:28 -0600 Message-ID: <1484551416-5440-2-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1484551416-5440-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1484551416-5440-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: KL1PR0201CA0003.apcprd02.prod.outlook.com (10.167.53.141) To BN6PR12MB1443.namprd12.prod.outlook.com (10.172.24.20) X-MS-Office365-Filtering-Correlation-Id: 79a7f16b-df14-4d51-ffc4-08d43de0ad00 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001);SRVR:BN6PR12MB1443; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;3:1JPUIrN72mKOxQWryIy8eeEqN4JZ9rpbgARM99/YmgoPwgErDFWKeo4fT9nT+G8pKS1uH6sV04Gy6TpANHePJUHtnt0kWnsgRjTEwTSPLEmuYlkk1+CpxrsSYQP+IEUvciI09s9F799c/3wM3u99ssdLnYw8Fhj/pC/Lq1wsYvgIGyoWjA43wrQe6HCzB+2CfnYxJvvIu2dJ2j0wOaU49/iexES7lBwg/4N+v3tQ+NEmA6h+7G2VzPEN+14+Jlt7iLet2/cB0yVkSWet9DXIOQ==;25:1afRMtBgri7UeZNgSYhDtob2y2JZhhHpEGJrzxm0uNvAgH2/QidxdoTxZk5+b6wFb5qYT31cqosrJFCS5m5YxOYzp1Vca9T1vqj7YS5IIyrZ+DjYtfD3tL8cBH1/p9T1M9dZZJ2P1iT3GX35yAMUhQU8QV+dtStrj5BRemSkLnD5NOxTIbEi3aCELVywe+h8QZ2iusVmqj6fkvI4hk+Ytw/sxrl051AH3BRzcMmtbZ6YP5HYoJj7/rSJ2OdyRTAVS3e5I/OfhjFhVXmflp7toUq+gtEH8PpADxlN0gIGaa0eoutkc5orgETfg+huA7//lSjCoN2ffGEq637DQxy5N5yg6RZFckQVueIsU1tTg8zaKPIVwocSSKb0SWoRXLRif6wMM3fGqCh0xD/BvBkcVZUCRnXinAYWaOMZdkmyh5VOECSh/PMPjbNv0vvTmPj+Uaq47YEzv15UWsp6XJl1Rw== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;31:2hatEA2PIiwVCqS3H1OMinRZFbUs6Je3zKiJcfCY+cO/1gId328kzlsHDQTsWFnFSntgEFn0wJnJNJDkUPNxMnumqze8Jykd1bDzH1YLI15sVyw6hgTh9UJWhe/hL9yEj5RUsRhSDGbkVxniiOz8FywXDMA+pEhW4M5c3JvdMQE8mPBLGBhU7x9cEbFVjEvNLozrF4PjV/miXjwF8S2DI2F5X93zM0NTg14a/w4ua4c1x9YuIZ19rEoxKnVlx2v7;20:I6UfIwDjv2B97RH6/oYXWD89VGwZw3BZBK5WKUeW2EFhxs3znGTWZK5xgiylneB7EhbSVfhCMwr1hfjmP58SFRXHBhPusQEh102onXbPZgXxdHfh4xanxXywgjIrpQ+6OG38AN6trD816rw2oaWErllQR0AG2WwI4BJM5CWyuIKm6vRBQvlwC68BOmfvu1XyAZQ8kjVeY5sbs0aS1DzsK70feS8a/dlkW0zVCJLGez95OGoGXqVtFytnudh2Kk5SVT91posl7RyvE7Gdndu147aT+cV8f2921bf+RO25oxCVkm7/VYiCiipry/VzobfJTtVzzAimUMJ/uYUR4vYo9SbsRabKlN6BLs48Xy8NL/jMN9N29ZaBODa85b3a8+cEIUL05IqV/Cfy6khjZGZQ5yBfeyqcxaMAgRpFFUn/VmtGEDIjX7LiVUlyo0/yLKaf3O1+KOKZjvs25FPLsiwom9hqvM7NzykPsTfEH11/nWtPSB/gudlyymlL/QFIeV6r 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)(10201501046)(3002001)(6055026)(6041248)(20161123555025)(20161123564025)(20161123562025)(20161123560025)(6072148);SRVR:BN6PR12MB1443;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1443; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;4:FMzxB5TcQVIKtXezkjCp4rQ8x1jWixTDSmuADMgPC/SdNTQaWoVvxXAHax1bSqYh2KBG9OF2iPHNhv0O+yNYKDI54tmwjA7hQPqFXCsTWuU8NkIu4GFsv4qbjAwX2GxT4H0wDNUCu+ptXFoRhqApDLJaUGN8ErRtMsHHiGhkqFJ5s4YuHrWafCGbWdV+JJfAAek7qJgLwehqJutqa4FmO8jhv8eQBNL6ifGCG580DelCFT46fbZRBX0PzZhcSaKq/I3RrTZOA2h6Q5TyvD0kiK8KxAUnCb4sHP1tTB06Pyw53G0Yd9xXwLaqVRici+uI+VMxINItpV7QuBikMN6eq2i+NfhsJAUJTFWaC17cB/MLls6JSCZvykhq2jvVNpV/ExxI1Pfhh243Sewd3EYlsN5yGh8m5nf2lIqvvk5iJyqkSC68JsZlYSF5lsGtN0IH0LoNlKaybsBqpo2Ratutvs8Z7i4bo2xRS5SmiBwX8L/3TXzs0OD99MxGL1o857Sxvv7IGB11y1INxAXxP9eQd1P8xV/aL1N2Sv5Q4Z62kR1u3wPggKiIXrNmu3crXOmWjIAQg5CYCDXybD0rio2fl/o2EcZYJiI0JvMG5kD9cyzTRGCOLK711Crh3s9Uw7fu X-Forefront-PRVS: 01894AD3B8 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39840400002)(39860400002)(39410400002)(39850400002)(39450400003)(199003)(189002)(2906002)(6116002)(5001770100001)(86362001)(189998001)(92566002)(66066001)(68736007)(97736004)(3846002)(6512007)(305945005)(7736002)(4326007)(27001)(42186005)(8676002)(2950100002)(81156014)(81166006)(50226002)(6666003)(106356001)(5003940100001)(105586002)(50986999)(48376002)(38730400001)(101416001)(25786008)(6486002)(5660300001)(6506006)(4720700003)(76176999)(47776003)(54906002)(36756003)(50466002)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1443;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN6PR12MB1443;23:UQEbbRfC9/gmI1Nhp72TbBIceXPNyP2olt0AMIVdE?= =?us-ascii?Q?vqsgtNel81E/l6Ytww3aNXBX2XSWgMp5vj1Ntxw2LNCt897DcwjBCAwxjvhA?= =?us-ascii?Q?ZqAU5sKwol7/u42vDVY4XuAgbEYrOp1cIGnW2xbSb777DOo4zfY277ieZxWB?= =?us-ascii?Q?H4HzwHJc0t4KNq+6CLHyRNsi8se4TJUPjlzjsFxkTG/sAN3s1ckzTi/A+xHs?= =?us-ascii?Q?kBysPjZv7sJ+QxySd7aFsfJ1JlwRtlvXKkKtVKrQ8Nm17pcbiReF+XDnirly?= =?us-ascii?Q?BM91Fe+dkpaBlj5BURmzkMjsl7ncyLLKm3mB3xm5XwplO5RjRnlujZBzlPnG?= =?us-ascii?Q?dJjvfQpsuQLWxAzYIx0VrG9TYffNMTEfpUzeQXHAJUNpfxz3WPNJZVJ9XpA9?= =?us-ascii?Q?XkuQXF4Vr/gq32j/bd2SS1Sd2W25A8j1HhmSXKmfWjR3fCd0nABx2N1JkS8u?= =?us-ascii?Q?UR0g2js3xc2N5CzVQMyn2g12AS7EZ9iK/wlEnF4DNYZTNP/DHglgxay8O7Ud?= =?us-ascii?Q?TIdGaKd7TTHzLG7iDvJTM47/9ENb9VpJHv1vy6oF5oYvKnf+qonvadSYKRvw?= =?us-ascii?Q?W4z7+OdXHOqa5wrqpVKHl+reBoP1Sxb1O+2Mvpe60CoDRREjzWGk/yx6FnsJ?= =?us-ascii?Q?jnMGxUdDkQSpxIGgAGeGYMRX6fRcUQh0pm+0TIxTd3PoIlzsT1ZEtwWTDN9Y?= =?us-ascii?Q?l4Q2V45eCfb6rRw+VGtlrOnu0ltUheKmNpxUK+T8sqTpIak75FAyFVhlszII?= =?us-ascii?Q?g0+dHXIgtN24rzhnXCaE+506v3P/QCnHnlXsaQsL9caDkEeOTpgEE3+OQGdI?= =?us-ascii?Q?CPqWk018Byv8rDxFFob8IPuBoxo4+aQUTj6L7l8FusbenrZIdwEwWC81jNmn?= =?us-ascii?Q?XN0ex1iSC/oc7PIf6itS5yAkyKsStCKd2KjYo/SSpvORvJsBYxsKfo4eaqWm?= =?us-ascii?Q?pER+RfiAag8uMpBtJRN6S+RIVQr3cON6Ss7drIC7iEIy058mgxrP40S2Shbw?= =?us-ascii?Q?HTG8C3/xj8qLCbqCeJolWXPEfAUKOrExu2XwLnJs9gus6yHCtvw6o2ApP8gZ?= =?us-ascii?Q?6dTZku4kh9rKDTgb+2DKdb5doS1lnDxVAjXFCqVPgRlX43RIeLuMOEAm/X+7?= =?us-ascii?Q?i7BFS/5D9LYTyNsw794vXYPk63t9LDygFlDVclP5wrvayrjDhSR81Eg8Q18O?= =?us-ascii?Q?IW53fXEr1uwcE0TJeVZil4TvEKOUT3yuwOdJu/wkiBsgCsXSM05/qFOHA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;6:EufGYmT+svh61aGsspqtZZNmZhUsTWrigkKwGtRS0KBJ6xIjrvEmk09h+LMV+6canNQPuzCD2RbsZRDjSNTZvtqDIuuVRj8wytjDerfMQ/BHkBITUpb2EKA0fczwtXRf2HjQVux3i+kifSqPl5ZfoIHa1WHi/WdkV+7RyEMUfp9p85AqSWIntdvyKV7Fxb8SiKbH8WojjTayi96SNls4pDo+NSmJD+V9FRc4WUt0y77RcczffSLL+QHUk2cS3Hj/qkQkJoctEYLzKf6AxcuH7kFsB2IG8qrMXwbtF7YBwF9VVtMLvG7fEtxfwoOW7/D/PoN3EN6d83sWv2GOUu6PWegFvzpp8zwBGWcuv6vJS7PIgtl9Xqmw1qwByDL+UEVT2CivE1hUk1GQJQnmzHEFCYccHphlUrGpcOWObrWuGxvZhqEeELZxW6jQGIma3Y2FCtiejgbvHLn3+80bto2O4w==;5:6oNUEFNsR0mzb8L1K1btkecvRbCkajrtM3nyYXTfC1KY62FYUGfccSiSMTvMem7BQ4rY/NxZosxVNZM4e3qCSBWs4qMM9Rv7Znh+31UriLNviFp/kG7Wz/H+ebYShr8+LELKLnsATO1swOH4x6+71BXMCcY1LUa8uqPyxjqMDW8=;24:66GDtF9oktz3g1luRy6dlXgNCqkbalmNrQW6WR2m3eKPui7ay4IwDVxiv63LedPLW675SEvBNO5jHm/O7Q5MWc0EWkw1k7QiY1cQafnxYWI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1443;7:mNIHuSHyo7ymY0H04l8vAkzVhygLozH50oxYXaSHETCV1EpQDmK7uPlc+Q4KakQqbNCRTIwawTySLgZjW99RTSOWpQmunR327P6tZInTRJpCoX1mr93xSUA0vu9q8+gctDqN64h0SHn4T1Y4pkTufk93+O5dgbdJSi/KwO0kqmMUNx/XP9SUqWxqRd0R0leacRfV/+ZIosFQxpNoSp0sBTHlPk7uz9zvbLk1YbgJx1fPkj0eD3g2akM5ZsosnS9fhiXnjBV6892bQaOskm4j8xV/h/CbfCwOQk9wstqT3FHkA1FbRa4x+X0yuRZHrkQ/cXM9nnu8P6g/zbIV4SWVACb+ajZkkrD1mybNONke17isuOux92m2YTLc5VTZIa2uEr/OyYHuisZoB3Vd7XdZwUdfpQlXdasDTvii7dEK6w/J6amaIgqOh1bZYSeEd+yjoXWebevqthdonvZscGfBjw==;20:qPYQWP+hLgLCslqszjHlKeBnotHeaO0NDgQZdpbISyjQUnVZgQogfH1w9H532iXevw7+cMBttqJGOcrS0ocT/skffkYtPyIGEr/GDq12yyxnpEqaHVO9ir8Orel/ctq/nBL0IMi8orCKtAdm5e1rQPVbKg2z/P7aSpZTHo4/pQ1igDRJLbOml+vFPGqQUIkRTjlHJpQpXfu7oZ7yBqnGlz3yrRyD6636rMbT/iXpxbNq5LOQQCDF5pKchLQ7gvm0 X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Jan 2017 07:24:07.0768 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1443 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 | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/arch/x86/events/amd/iommu.c b/arch/x86/events/amd/iommu.c index b28200d..44638d0 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,24 +440,24 @@ 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", -- 1.8.3.1