From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752158AbdBOU46 (ORCPT ); Wed, 15 Feb 2017 15:56:58 -0500 Received: from mail-bn3nam01on0081.outbound.protection.outlook.com ([104.47.33.81]:60480 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751338AbdBOU44 (ORCPT ); Wed, 15 Feb 2017 15:56:56 -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 v10 1/9] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Date: Wed, 15 Feb 2017 14:56:17 -0600 Message-ID: <1487192185-31272-2-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487192185-31272-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1487192185-31272-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: SG2PR01CA0102.apcprd01.prod.exchangelabs.com (10.170.138.156) To BN6PR12MB1444.namprd12.prod.outlook.com (10.172.24.21) X-MS-Office365-Filtering-Correlation-Id: 3fb3ea68-8a14-4818-ea9a-08d455e52bba X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:BN6PR12MB1444; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;3:IcFwIWATiTEGfERgQJHuqp7RVSqC6FdlntDhpPRX9NxfM1BpM8pVsFO8KFctujuP4/4jLPGjGkNELNM3DlW0/F26daUqE0NR59S58zAK7I4dl+BKmlLUaJZbV9Nm5fzD0QPSZFYvopaAhUl6f5I1+Iwt/mkA+TPYDUzcr36A8L0o2prINcFQJbSo4BLRK4Ejpf8ikt3X6hmGOaByt6CP8EyzSoY+9pTRw3OjE3mq9fJXxpTnH5A752anm6Ww9DDyiNPCj0nHP6Io7CzLwr/gSMmQloW3NyFU4TBwbgjHb9s=;25:o4I6KvGC7s8w2gQHi96fsmqRmjz3mv/lLyuLRKED8S9yksm9i7OYjync2ZqMhnEborrN0VM9GXNISBRDcZpf3EhqfYHWb99XHtFJteHffNy7f2Ii/760FU9dv5ST8Qyv5qJj36v8BxTz58g+t7uFjnzfKDxtUbp1GFQGnmf3KYLwxaQKcvgY0rsMaXpiqwsUz/QKmnVLK3tl+9TSveB4V4GOvPq+gWsOpIOAG2kJoBrrphAbpvGosLd+N91EyyXMAVz+QixAVDbot0bXqEjOv4PCg8QA+v53Vhe6ylIHwfsBNWCK3VMNZSzlrDv5g8A7rMQ3YTsyEoiNtW1CKic+G9q5FMTBVnfmV0kk0DJlfHWVIKKVPR52q7hGM5wY4DUOGObJmhyKiO8ehesuY63g18scNA4BthTO21p7Isq++Eqr6g3XPHa2rbf0JqhLvtN5bpYXVOQSRL3Hfd0pr0HmmA== X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;31:xWsinqUHe5jA3w9THZUwAepWnAdMlnuNGC+3/Rx9JU7AHQmzx/zidQfCrNFTjOPUFMjsBqhKimAasGAUBNrDMBY/vGOSHlTOhX/sxpZZfWYiKaBbBpTga3sstmCFEtS+NOYcq4+P20lqBOFcPIY5IXSOUI8KDFCuPS4xp2zvACI5AdO3cxkbpOv0COJKGdfkdpGyZEaT+n3ezq++FzVXXvYncMdPOSo6AnIMCW/cGQM=;20:O1xfYIrFsbtZyC574bkmeGdEnszwOhdm23nz7fgJdw7O3hCPQ33HZz0QmESjb71Z7cA5o2mDGQGpZtbfQxG/A6AIoW9ZqQimJEYs1vHHQackn8DaPiFh9zsF98+7WGDq2mmn5Wum0LdvBL2NnebsGN592l370uklbSMYvEHRqQdbvYVIjMPssIlYVR+ptJt18CRMorpYnpMhDsyl309GPQXXCksiWtCgH8LlTQ0jBxGMURGcG9WwqfroqmBr1OnVIlnV1yRdyemj/mcLezMO/knSL0bZTLP9BEpkVOrDVCLDSvZc0UFY/WdO9OVxo1Ll0dgs9lzMXFePLWBg+KTSVMxRm+Bw5oVX9edRrmu2RNx8xPNcJbEkDclkPY1aywD3G7TSaCgWTUyzsMbTixYImoZak2c3wOUD8krqxHRFTvZbF3hYkX44ZTDVjvYKZ6HZ+m28vLfsk5oUAylWMUZ0rBvJAz5n+c9LF3KjAq+gMHz5KnkcIMuOAAGtYN1ilxBX 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)(20161123564025)(20161123562025)(20161123558025)(20161123560025)(20161123555025)(6072148);SRVR:BN6PR12MB1444;BCL:0;PCL:0;RULEID:;SRVR:BN6PR12MB1444; X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;4:kh5T2m7ljmbZKsDyYEM+BfrmIvA9qzVaoo9wcaGF6gDpFa9p0JSwgVkd0yfs3BJL+w6NV8DLJZTCeBE353wzSLX9zRv9H1xw+wmpBmzF/yScF6lb2PWVTx8NqZnsX6Ie2sWlT3+Fy2SgRumG4Ljr7pbowSa+1VdEQ/tjEVjx1SMmYk8ZOttmrnvY35UC5iBZMhtldOa91ef834VFXFXG2n8ZRMqR88C6hj5L0SQ/QG83wbSC/DXohq8ra16hDbGdSB5FPAJElogYlm7l0WddIcZSnOyEbGCY+CI9gJ48XfbhcDowUetJuKH6Sdf/Ziw8+CUEE3TNNxc4XVUM9cpI8EdvbNkHUN8I+x2OeVsuMgkQjsmdfilGUH7Ut4Jlq7/3JKs07R4HKwcNj4iQOgUWi3ijUmBiJqqu4/HoO3InNvkuWWTknPnuz5AQluery57F6XEZuo/YTUp6e4EjhAj7hn0jxtzMfU/+6GiZAmxFP4AJtrUAQxluuIPBAJaDRrwRztDrvJSdBPspafmgE8k+DJIQuCq2rzrPdG0zLPR2wcltbRMrlnuj01oNT3iicA5DJDqBeuxXT/heWwahBb302v9hMsZXxjw1yg+B2U/V7K1nb6ETqn0X8FuNMDZ92dfI4AI0oLP8iZ9Uxspwe26Ql6HfcJkI8AbLr/yAtVXqBjA= X-Forefront-PRVS: 021975AE46 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39840400002)(39450400003)(39860400002)(39850400002)(39410400002)(189002)(199003)(6486002)(50986999)(54906002)(38730400002)(53936002)(86362001)(305945005)(48376002)(25786008)(5003940100001)(7736002)(389900002)(42186005)(106356001)(2950100002)(4720700003)(5660300001)(76176999)(105586002)(6666003)(6512007)(189998001)(68736007)(47776003)(50226002)(97736004)(101416001)(50466002)(81166006)(66066001)(81156014)(8676002)(36756003)(6506006)(2906002)(3846002)(4326007)(92566002)(6116002)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:BN6PR12MB1444;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BN6PR12MB1444;23:JSxFVxIK0a77XRTc+GpDtFEENrnaJbv3Ud+geyD+e?= =?us-ascii?Q?qwRyPY3al+bCflOkvy6mun2UoFjajuWeffqcOStJLPS4FxEKZtaANXn3Hq3D?= =?us-ascii?Q?7hGe7rblkXUVGQGDsadQdjdxHzrgu2cU0CH7pr6w3Amm5bJ4Er6g0v3TNq6j?= =?us-ascii?Q?wxg/JeVYthzpn7uxr3Acg218xdOY5Wz1R831F4ZXACd9kdTKYFDuBaemzL1r?= =?us-ascii?Q?gOSD+bWAtEObjE70JZJxlfWR0tvTbVSy9tqnG8vLif86WZjChqLiAvgCdY3Y?= =?us-ascii?Q?sMVstQ4XOEXkRJ8eRrgKU1abCi6lTSQYwjzktEubPI77BSYWCN/mF9ZauZwx?= =?us-ascii?Q?JifzIad8/Q4KUW7qvnHcz/m4a0y428rptTnxeBWOJMDxdup1TEUk7gvRPZqo?= =?us-ascii?Q?D+1XrDLhKE4B/0LQ0ZACJsDyGniVcPXka0fxdimygvlepE0EK89aREsuEmUA?= =?us-ascii?Q?QkLRR9HIj9PCxjb75IES36Z7ZVNtr+vBpnw+NFT7WKnA+uVQQVF84GhloIA/?= =?us-ascii?Q?I20L60Ud5WFj5CicOQ6Z7G2FHgMydUyluv/hItbc8qh5U2IMvfeoR3lTLxzV?= =?us-ascii?Q?KaSAQt6xVfKODlKwtHckj6eHuGdpBxWTBqUAsMTWWzZZHksq5GUF2Jm2YlZ0?= =?us-ascii?Q?x2QHhtAwGtRnO0vpT2jl20MCOVfjA2/pKXt/nu/eXiQdMlJCzQHHkNsLq49r?= =?us-ascii?Q?PZEhgiuT1QMz1bLD++hEux1Uyg9SzBznyH6OqZEMThyUEIXJuZpiomZKYDeN?= =?us-ascii?Q?O0Q3lGA64AYAeleerzmYiAmzKWb5kdC5rAWEp5mT/5ylPfIwm51QZH9pXBrT?= =?us-ascii?Q?a+2IKuehgj0US8O5zr5p2EGoI6SyfrTjgYFVkE6vEhGzP6+txN9ziZLou29m?= =?us-ascii?Q?+OIBVHgstwPN1CxHX7MDFODWCKvxRmpOj/gk4oI7dU3719YumUshoh+VsA8A?= =?us-ascii?Q?NlOylzOM022r8j/dnx5WHFLoGXhN5zXyJyrmnsWg4Am7LPd4p/o2OsREvAf/?= =?us-ascii?Q?qXrbZSYsjjD/9s/vAXxeg3HN7XbheCO31SEoXjRRO3CM7KH2WZ6oU3Ei6u8l?= =?us-ascii?Q?vQB1yA9rrXubtpNUkROhLLn1KSnunEUpSTzWF0jlcdw1jVh6kK5M4JcYD65o?= =?us-ascii?Q?RjkySW4Noev2y92zgE1jUckQgCGDAFwd20Pw+ZYxYz9T6VDO644ZoYqF4uLc?= =?us-ascii?Q?0knO3txQkUlqvmBwLRZ71NgTN4xKg83o1t1IxKf3EMd9OFxs64Ar6WdNA=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;6:ELtnw54Fjijyn5LRGpD/Atm+256uFM5tIikIWGCzwDCUhS+qC49FL+VhoSeLBc6bkCeoAyykwCM8taUzo50c/Mab1X0KsLgQmFJMZo3neEhN4kB3qFGbTpD91lXKUh6mHnL4gyJNjipqUd0EsSRehE8ZOiChdkR8JbrRldCcEl6qp01sJDGA2uu8lon9lkW7B+MX6EfsDiLsFRs4256y8iVbVlVjk3IQJwa5sUWud6fEVaHDM2X9gDSefTWttvZjvpzU3Qexv79gryAYkcXCWGckkcVxnPO0n+kSBRuXTYPcE+VNSneIqx+AMyag8H6CJZe6vVL8CVmXWK6KZLmuEyOCj+kKF1e3RpXBbTmHzqo/vX+EHpR8O8Uyfhi0M0mLFPDbG9ZR5W9ohM1+0b0cwHWWKY+9yH7wV1nhv8XGMbI=;5:Xo/PqtDMDMYJ4dqwqr0dJPKxQgGClGahpr6GNBPVk9pwsOuFAa10VA/WccvuEZpatTe37s+i1KmubgUQccqs9WNr0xW5ujlx4tKEIwQYY3r2LJdRuu9xqTWZUdkgC/2wVJ81undqa9DUL5B0FNbMmw==;24:6l6Lgb2LC73YrxRavnQHQL+AnfVvA1pQx00Gsult0maLHr96asKIi6CZ8IFN44A6ZLwSj8+P64SlQhc3ObrelwkZL4aaU9J46KhfdHY3ucQ= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BN6PR12MB1444;7:JQ5CrN4QX/a2vrixvpHqaJef7+hcCpvQ6UX26eiyQhYF/u56smh8IxM+bkPpCRxbyj8rQNaUiXzXKKum0brk2tzjhlMleczq6WG9Qozl6EazFWktXp/gmLtYQ8gcH/QzyYWH3r+3UeIO6amjlZvAay3J5oqBzWHUwIgATw1+7Xoqhpwcu6n9jssSZMHsxQySsKpP55h6UXo4tRLhfp++OWPs95BMEWr9t3MCy6RnlONRxGt42oiUK0Ojdpw2stcSNSI158js9zBbiiNRHAq1p/+U/JBf8ORA5Y6cPrp0GgWPprf+IPaYtRXgKzn6BlO3+44zOXyrAX5YqtdWRCnP6g==;20:ofotAZ6LyXzmjPHFySOdl2CXCZOYoRc7JROqEn31PA5is20Yvci2BidzNyW133/WzjNEVPdgkbQMQHp2g7z35tSo8E9DaR4U4L9aMBibX1GNOBVsP0ocGtqUzZddaFVt9CK97wlcW9VLtzO0PQ8FqCZkjsJOyvz/ndZiiH1nTQYi7NJVd4gU9UbPgfafGclOoJ1Lwu5jKhxUU5BqoK/qbeR77o08cM3psmgXFJA35r20OmgVHsNv/wEcg0KsXG5S X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2017 20:56:45.6008 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN6PR12MB1444 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