From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753505AbdBGIlR (ORCPT ); Tue, 7 Feb 2017 03:41:17 -0500 Received: from mail-sn1nam02on0081.outbound.protection.outlook.com ([104.47.36.81]:38304 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751618AbdBGIlO (ORCPT ); Tue, 7 Feb 2017 03:41:14 -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 v9 1/8] perf/amd/iommu: Declare pr_fmt and remove unnecessary pr_debug Date: Tue, 7 Feb 2017 02:40:29 -0600 Message-ID: <1486456836-17428-2-git-send-email-Suravee.Suthikulpanit@amd.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1486456836-17428-1-git-send-email-Suravee.Suthikulpanit@amd.com> References: <1486456836-17428-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: SIXPR04CA0023.apcprd04.prod.outlook.com (10.162.171.13) To MWHPR12MB1455.namprd12.prod.outlook.com (10.172.55.136) X-MS-Office365-Filtering-Correlation-Id: 77f6fd79-23dc-4ef8-84b3-08d44f351181 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(48565401081);SRVR:MWHPR12MB1455; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;3:r1rsgJBfnUWqyoPrb0wviSkK7+Fuv1jXewu/U5oOA9e2Zve83TFWfKWEHI+YY9dcTIpn7uCJ+Pb/aBOhBxvxwtgh7HA9y/Uuy6KPU/FtEfXpV5z9qN5E0a4U9EWh0RiuLpWkvrMRGhg1c1x7/JnCiHPw7tlbeTLNsNY7WWI+6Q+1qmLQL/g608auZxjhcmIdi1kHsirnM/edvVZf2m/nBLNRbolI2281bFd3GY1SmFvOBe71tjfmktoqQIEYWg6AjZ5WuCfMBiKQQC7jjvIySKJxDkbY/bBt0Gs2mfjYlEs=;25:QfQNbrnF5yNXj02fnRblvRTXID7aloRIayG+l0A/RCaWnCFZBFM/GlTCipV8Um8iW5Bpd9YFhnmz5qKWJSxWO2lrkQndibFSuedBWs2wiEoX2qLmBgZvtfAxfisQkq+Ms9Sz6Xt7UVBfQvYOnrFEXb5LOqJy209ZOjJSml4JINa7HrOXti6dEqdSfbbw/J+kkqTAwkHt0XxksgjarF8+ekgnrQ3oZUpP9VPDgfdMa0kTHAnDMx2M4R8jDO02/Z+W7tqEoBM9b0VbEjIPLf794ZmZeqNW6lUSiuPiwctUyA2Vu/z+jLDatNUFvQOxrW1e4avjac150K1ZudHpVWKEHG+SfAK6vZ6ioXUieQ06tXvpn/LCHaTqi1berZ0kffJZHpo5JH5taV/15UavHNlMhl3+yrgIiUml6qCEcrSUW6Yvrd2X++loLHuK/RMgBzIGxi40pdgBTdvCzPEWEHLgig== X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;31:Kwk9z5Ea6JYOT4gRWinuNjqKj1+goMISbvhZ43A5jOoQWj7z8NlMvR+0d2L0TATaKQDZsNf3ob38mXJE1Ev76ZdztFBAFfBVX9ZtEmAqC3ApWO0+gNW6Cvsg1Ark8OBwrulNQTQJ65Y7VjinPpeI3/mwJ0zqkts+PINRJ+fNW5hMmcpW1y9RbUnl/bFTNqnXnRO87vXG1EqAG6KkguM7A37m1j4h9WV9Y5uRxrcJRhthCsHbzYkrdvtz46vx3QLp;20:4cGVuQNEsODEL1IeGaJQi+GGETzumVjxBdrMkvByhMF6fkqzJFXZ3gUcqBEIwBb6+e2Yr/nlUoO3lmTpkhTUfimwBL9Ca5twk1fIa/ITzX6ji5hQfDwryG1/xtadWe/0L3G73BEUSJE3wCJXvHEEdDVpbS6NCkTBBXMRsJwodZCB/x55ZkKb2JpgSuR2L9ESMeIOoQkHzxI6nIglQ0M+Wwp75l8B7e4XHWHY1TE4ew7dNAg7eLC+yf7i/vBaodxokRwxZVdgHA8Siiy7PH0bgNkvk/efvM4pUV7vv5BbE1W5jHwuNZFlwcbmID1gRqR8X4EELZLCBayq+/HK0Jz9HywrmtDnUTxmYyKqQgF1FPcjlOvaKOJW6D8H/Iyc50U1CWLbTixNYusXR2yuJRbEW/23Wq9+s/8HRPKr4w2oL0VzUXBi6x4S6N0rtk43Q5lgps/ouwVfQdQrpjOAt47ghd1Frzx75rCOilMmUbwbvklPRhGaG/kUWtgmjDtXe7mQ 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)(2017020603029)(8121501046)(5005006)(20170203043)(3002001)(10201501046)(6055026)(6041248)(20161123558025)(20161123562025)(20161123560025)(20161123555025)(20161123564025)(6072148);SRVR:MWHPR12MB1455;BCL:0;PCL:0;RULEID:;SRVR:MWHPR12MB1455; X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;4:v6KzlNCirT0XqI8t5mrIFJMVpycwBQgaQBj9GUZ3qGuXmAGcg4DA0hdYpzeoUnQ3nqtMlPlJUYDbaBdQjRU0AGiILFA03CKCAuSyEeIsSQmZX7zf8HXQVqJmXhFXt1uNhUB/Xt2PzXDdZWS7ohyhj/IxyroReLP1sAiKMkwPxkRpSHmTG7Yy45NZce9fr/02DxN4CU+RbqV6HwMG8I/vzVyINj0wN2MKx4Og7z0QxkML6A/xrcIAQ3mkPvDaw5pM8SHhz8rdlRWQ8QQdG0ojt6pLuPO+qUruOXpgxGx3tEnDUeBK6eACesYMnTLqstOmg8X822eTaU5tN0x4SvXsoESLtDsNwTQIZeA8jwhRcZYY1MRTY8LcrbMK5yoCq7dG5Npt+t4KZwYBDNs9yU4wQ08ylfmHBuwu5GGKhSufa0wDX4BbGbiIE7W9r26zlAPLjGuyhBGc0kveBzdnczUsuYVEG4zy/Ar4Wn66ns1WYIxiBY+Czagbfjf/r51n1JZuh92M4CXd3ol5dxcFHEB3mN/sF3N/Z6rqy14bLvmi4HGSabCa8+ZQqA07A3BH77mcp7kjR/T/eIyhPqRRyUF1FLa0FKVrE8ciCcYfW8cBGoP4CWbcHJfr7c8boa9FcadVIeyL5WCcMTjt1tOrpNkHbasgjtkPFjpIOqEuD6ID4vjVBoh7xJHfkFtTkWK2VMAvWiHmhOCJsLb2ZvJPxUFTlPlviI3sIUEJl+00nyq11Sc= X-Forefront-PRVS: 0211965D06 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10009020)(4630300001)(6009001)(7916002)(39850400002)(39840400002)(39860400002)(39450400003)(39410400002)(189002)(199003)(25786008)(38730400002)(5003940100001)(4326007)(6486002)(305945005)(105586002)(6506006)(7736002)(81156014)(92566002)(68736007)(2906002)(6512007)(54906002)(53936002)(8676002)(50466002)(81166006)(36756003)(42186005)(106356001)(47776003)(6116002)(66066001)(48376002)(3846002)(101416001)(6666003)(4720700003)(2950100002)(86362001)(97736004)(5660300001)(50986999)(76176999)(189998001)(50226002)(2004002);DIR:OUT;SFP:1101;SCL:1;SRVR:MWHPR12MB1455;H:ssuthiku-rhel73.localdomain;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;MWHPR12MB1455;23:pmqCKPpVeIs/JwBCE7mow59suW2tKqv7iFdBWN5MR?= =?us-ascii?Q?JgKTXD+XuuNdAqFd7aMHKKvuMOauSnZccwGJONuGE9qp9uLC/U9EuPZopVs+?= =?us-ascii?Q?iooP4ZU2lUzezVk3WEz0X33R+6rbhJx1p3FBfn9wIMJxcnTl0jkYD4LlkUBo?= =?us-ascii?Q?yrOe5CrTbSISSa7SaNndRayf5F6M+QsukW0h8rKu8xGiRUeIW8gEsqy307oF?= =?us-ascii?Q?hNo6jhD/2pS7F3qPEnJ8DXf+/8HGfkm8dDx/n9CjhTDF6Rn5w2zo9mTh9fCz?= =?us-ascii?Q?8Mxlt2bbYnwHBK2XtmAq4ZtVMcFlF2XtWfaJx1rEIX5tnEzOvVJs/5zqI6hM?= =?us-ascii?Q?uPRH8pNqWlTp+P18xtDs5dAM8vC3xkIAOKRGGKfQaxbyubFocgsNAjqdlL2u?= =?us-ascii?Q?GUOw6OLfAPiPSYF3zyi99K9a67xUb2WE8q5KrYADcnLNwA+sov3e2ws7S3f+?= =?us-ascii?Q?XU954dpXay7ZkW6Uu3JjQXOn4HxeVCY4cusfIsmpAxh6tt4dj7stCLHil8ER?= =?us-ascii?Q?sqv5xq4aXHjahqwLoTeYkGVpB5l4f43q2VSN6fFuLwJXpggXIqrrGGQQv+6j?= =?us-ascii?Q?bWHajpaRhQs7o3V9D5mPqlqRSw0Tf4rmO2JvDgQGUrFgxmWhis5GmskLt9Gr?= =?us-ascii?Q?PHbDEzfkxSgm0YhUl01WGtHtcx2ZS2LJ7HMjWxwGudage/ShDY2nP6agfwL2?= =?us-ascii?Q?fA50ekcwACg1kAK16JYiTc6CCLfO9dqLeKUJt1Ad2jFI5Yb5N1Jv0R2InWbJ?= =?us-ascii?Q?Iy0LhhWuIZf9FU/6LEh4kqr9tIn60WxzpCPdx9OTdoH713+ddiohk1n6zBfH?= =?us-ascii?Q?yC2xgpmc+xmPSF/KRcZGItThMJxdrQ3kDSGxO60J20N7yRuMY1w6kUIkHV91?= =?us-ascii?Q?rRbyb8yxHXJYIDhVX91MkGuvIYUpwzkBpiid8i1+vsokJFjYdzqPEx+S98Ze?= =?us-ascii?Q?1jqwe+LhxkNKnipnHad492q5Qt4BMpztY6M185fa1c44HneUGIcOUBknuo8/?= =?us-ascii?Q?/3Wp8gMrqnzU/QwOoKrmPj6F260XFFZEAcIU+h6f3GR9b0Xkq/ve8F+pfi1T?= =?us-ascii?Q?t6ZJM+TD5zPdqW4w22bUHubP/Po1/BfHEwTTBCXHf2QgQlc5CrXN4uDrirCZ?= =?us-ascii?Q?5euDdcXYk3DBDHMGFWdIxUY1BxqiNqQNhLOwpEpMlXS00mNIiOgKrzB2kt0Y?= =?us-ascii?Q?kVqZHu0bduqM9iVkS1/mT/4nM6+H9G949FF?= X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;6:D+D61RkcNvyf5XijqamYGO3dvbFxdu86BvbLeKKa7ohG5ERXAkuYhKMhBRTn1gaQ23M7ITJC38leAF+AfMJw+ebpqOMeUlk9yZW+P+Xdvdkyp1dcn+VToFfJtxn0GEBPaT0u8QEDKFIi4HL8RxssIn7/jBWfK5MkZFjJizT7IE5UVsngrp4Lr7/ZNuO6Iz7NKzjS/SKw0PP75HJZfI5ubIKfJnnjNzL2Qg3vujXE7MNW5B0mOEjvf4LTbOxtoABqOSYS/ZhyJ+7Z5CNsUMZz/DK3fRjVjwEyv5ztgg9wcGFn0pRlLFOna1ayGXCGOR+ku6JUzs0t7n8NL47pbSD3MPH+Xqceily0/jbU+omzHe0rOAGViNd4y9d7sBlzbZuKSBVdvozXWjTjD1+UPalYVIdUHHEO5SoRZAq3NsGV1cc=;5:ph1RqGF0SW908hqOEo/PSmwQYOrLNigxEiAaOzrVa31nK+RST59iel8DtUmbtU0cyMQ5VU27kL1/iThvwwMl8WsAyIIq1waqS25yBbLoFRpAM0rdbkbqaAIk4tYRYK/QMbt5buPcz19C9u2ghAkxQnEyzgL2kOTEkZ3MhXZYUQc=;24:qUgJMC5twtGrG53EUULaDHAdw9iFOdmiqMxwG8wrbEoco0ZKv9xP1R92xUw/O3BCMYdcdYJFKvI2eaX8MIfNh+psR8xTG2UtNRRRrFvZUgg= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;MWHPR12MB1455;7:t3kIMISpJAkrXvh2ArLThdS5sC3OKHG8rfu3I07vBcgXIvC0/iJSBHwJVX5X1sTH0a/egAY9oWznTkAbtUmYcpfNdK1QjNro8sy+Y3kI4Sgj7xbDW+7FnR5f1c9i4jfypE24MKHClemY5QX6uzHsxECVs2mXvISqMUMKdvVHUdGwfTx21+GvhiT24JJsKd+VUT3bIkApdaN+xOftJ5DfaK/ZxNzGxQ1XtYnfCZfQxn9mqsjzxVBlnyjp9jBGcgpExl0gR3HV+OtDqtftsWVgr1harDJRbftOxA1tth0lw7z+wmQKa/UKab08W8+G+wXIw9HZmOAeUc5dyuTDbytkfgRMurU6j1+kbThlCC3WZonyGDai+TKVLMxWY+Yc+ZMXtUhK4EbOslqULPz2MnrWzVX8bzeHyNaE73CytCm3muRCOnsWQR2stP1EtN7IdlUN+4usmePhLA7XUqcyFDNrYZVzrTWdzqYo0T5HafQwz5EfKrJR6T87koaCN2KELBKRi0uu8Nnh7WJrpqf4SyNlhw==;20:kvHoZTRzfWE6jwgzMQCCdNg5SOWUua2dx0+GV88TirI3v2RKuaqGTKzri1qMW6ZjdFdm27AO+7+szZotTivl207FWOFva67zs2KBJYjBMNCVR4zp9DzUaI5qxUuxlYKCo/VH/ztZeoWUwfJwPn895HZ6zK8lfmx2/ANa477HxRVvQK/waKKzYhmteemvzg/Pf+JaRs7sBnOnvXim3+KBkJEyL8+eGby31w5wM2DbsLM253PhOR/cSG0NCwIW8Y2G X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Feb 2017 08:41:03.8582 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR12MB1455 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