From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756000AbbLDKJ6 (ORCPT ); Fri, 4 Dec 2015 05:09:58 -0500 Received: from mail-bn1bon0076.outbound.protection.outlook.com ([157.56.111.76]:49184 "EHLO na01-bn1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755177AbbLDKJy (ORCPT ); Fri, 4 Dec 2015 05:09:54 -0500 Authentication-Results: spf=none (sender IP is 165.204.84.221) smtp.mailfrom=amd.com; amacapital.net; dkim=none (message not signed) header.d=none;amacapital.net; dmarc=permerror action=none header.from=amd.com; X-WSS-ID: 0NYTW8C-07-CIH-02 X-M-MSG: From: Huang Rui To: Peter Zijlstra , Borislav Petkov , "Ingo Molnar" , Arnaldo Carvalho de Melo , Stephane Eranian , Andy Lutomirski , Thomas Gleixner , Dasaratharaman Chandramouli , Robert Richter CC: , , Fengguang Wu , Tony Li , Huang Rui Subject: [PATCH] x86: perf: rapl: use unified perf_event_sysfs_show instead of special interface Date: Fri, 4 Dec 2015 18:07:41 +0800 Message-ID: <1449223661-2437-1-git-send-email-ray.huang@amd.com> X-Mailer: git-send-email 2.1.4 MIME-Version: 1.0 Content-Type: text/plain X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:165.204.84.221;CTRY:US;IPV:NLI;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(2980300002)(428002)(199003)(189002)(87936001)(47776003)(1220700001)(77096005)(5003600100002)(586003)(11100500001)(86362001)(5008740100001)(50466002)(48376002)(1096002)(53416004)(33646002)(229853001)(97736004)(189998001)(106466001)(5003940100001)(50986999)(5001770100001)(19580395003)(50226001)(101416001)(105586002)(92566002)(19580405001)(36756003);DIR:OUT;SFP:1101;SCL:1;SRVR:BY2PR12MB0710;H:atltwp01.amd.com;FPR:;SPF:None;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;2:LoCOVxyo9+bjsoMO0YwTUXPY29ZsD4L3CweB8eArrCw1fDlIvWG23OkzP+Sc11dKKo7hQ0R74fB0WU68hAHSHHRnZj7iIf7s1HKVxO6PNkZ9DIcNqWQvZD+RFVsMcCX9gseKZDiYW6wjxs7DfDmhsQ==;3:NewnJOWC6Rf3BXVMG+Wtbas1B9XxUbaPOG9A5ZF1H3RjqjHyLun27/54KnkVAAPcDU6ocZxGbpJbvb/weUy3T214KyLwT0yc9Qjozp90M2djiOzpQZ+5VStlKxuTT2BQMgPiM+SyoTQ73ABvR3DmXVE1iJCccEiU23EklWD2QlDjHl5wHDsSHzYTghHDTBD+FpN2XhUXgEzijgOFV8+4nRzqL12qAvFB0CtEiMoIE8k=;25:KEs4/TAF0h6ctTLBKTZ+5ZvBGcPo4o3wxVENvkZLkEjuJpfna4xFuNvM1ifF74hHk8BanAu2TWaIp7xGOiRnOWhS7V9pcwl786aK+bXJcgfJVWaMfMWHjHtluo2S8tNV2HFBLZoRWTCOVXBEIUT5toP0MM/WtpdqCl1/EX0IDGVSN5ArCQKXT+1lLatrO4UoCQKzp8bHJzcSVuGhBhTzcec8dERWtr421XwsTonaWM264bU+dyt+LD5Il4dYRuIn X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0710; X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;20:Sq5GV3qcZEokXSAXN4hVNzkSRSNvBL7By5pLHXvKRXwIhrFOCSjI1XAbLACA5qRBJQLuI0dExtcohWr1puBoYUoEtCdRPLcOV32qxLtyo4d+AkCuWQz3ZZXIi5EWsjyzCde6w3WwPhhpshGx1g2W7l5yJke7hlLqGxUYV06K8Vp/CeP1MiPuVGqwC+so0RD3o8WYfz9p65WHZslydfg/IOuv2dV6nhcJ8sIB8yas54AM4/ey3bbAUk8EunjISnwr7rDenIrBHWxxNJtCIX7zwlE1Z6aMc3N97B1lxfUl4LY1VO8MFIKudFXDBs8vbgxE6KFieScNJyoUJa4Qcw0pbmo5Ij9HBTXUoQ3V03WVc3kzUg74myXDhrmQUnEzbNBxPLgGjMriLxm+lkx0tfR4VxsrOL89/T8xIXbVSYbIuRicvkLBt9GTPPZIxNjDZ7YTBGDR/Cg6nTu/r28HQ2UWX4gR2121iYAv/vQZyZh4Oon6msm1VKzknNu4SJsabqT5;4:VA1NFdKU/FNHr58A7SeLl/v19E9hIZ+lnwXbw3s37xJvHlDxkVTfXS8Z9EH7/8AgALjbd2EJuxzsAcWI6pS6WvGWzkIrI7ia+Em4P7oXlU//aeRH8Vtsk/A60wMzpYi6hkxjrfLEMEGYH/RsfBg2LmaOZRoGAN6DA1kyUd+5wPXRv7e+kBK5jqSOgEqReTVUPTLCi9bLQI2fkWeEegvyR1QgFG6aPB5PsW4lZxEDC1h22jte4GFcjl8yin1oa4vV3depFhtYrjKFlvLtzmDlK5tK34ACwkRBLMxU2YxlMtLBI/x/Dex3kVuV5M+ZCSNnQCM5AVBu9+fYFfadhOESJsfld6v6aCFY7qB6YChp6C3ZAdKW17OFvjWPrp57Lg0dQCYvxT/IgJl2KfueimZjg41Rj8Z64O3/wH19I/3M0bo= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(767451399110); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(8121501046)(520078)(5005006)(3002001)(10201501046);SRVR:BY2PR12MB0710;BCL:0;PCL:0;RULEID:;SRVR:BY2PR12MB0710; X-Forefront-PRVS: 07807C55DC X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;23:xGAAKbq0b42dN4Ec6w6XIyihtH+OYHhzVOnISo/6KLv6I1S3a4VO75dImVdluzIFAlQn+Az2TK36Z54Ce7Ac2RTOhuoFTAPuYzbDuYaob6U0Yqvrfu3xL4Cy/xzGLKmvexF1ssv/a+kXAlFvhTwqpezg71w3DAHOGybGKDy1Y8lFLlvaRYweaBp5hWMdo23DeibsuuqlJYlw2LLflLMXuWgdbehkjesqrz3Ezr7DT9Wgc6V6aRmD+trgtBFCzm8Ln+GpT8dleCShf5O1XHT8b8TrLYvPcNCbLuaQIW4G2ZupylcLybM3IzvSOCRI5Tq23BCOyVkog9E35viWQNyXBThhuWkcoAC7CsT+HNVfYnqc2TBlpsZv20YETrIm2lqMpJ0GQw84z17bm+8VSDH5FtWRaDO1rK5vO149NxIAwRn5WjAsfB2Om8IND/j6KJ8S0XOnALcGl3WrV0dZDDQVZv3EcGJlS41qmDwYFLidFL1J6CW/lo+FP3s1a46KdwZSKENqfr6LN/YzdlQKNxcoANZWgyR03q6YuIBCUaIhiditJ9+bbaQWg80S/SvI4fFVehD0Bv58RoNW3T6vVUnlhpWI/D4Fm42TwdSWvnBpbwiazUnSrCz51HuGFkYdBan2Bp7Gn+zuchMdxEItP/o6kX73ZcPfBQBOcDcohKnkPWHK4642XbIYUSZzuCjn5zi/kY5GBhOCaDj6jSgXpCX6jQRSeMXFGnTnOrQII9+ovKNP9viGvSpbTZB5bdo90fXOyhsJCoP7vByGzS1FpSpK9udtfK7AXr7vQ2LwNBTB5P+pPxCDPGC1LwmsxDSN20HSgyrSK4xz91R+l2JoLkf4jM7DJltrcOgJ7+HwIHkQRTDLBtHduZitJnL3eZVKxhhHce+FY/i3qGYZDiFr86j9n2mx+RTAOOAfn2RUVR93ERg= X-Microsoft-Exchange-Diagnostics: 1;BY2PR12MB0710;5:0R4Afg3edeqLQnANXFrQfHiABzBibtK2fJR5vJ4GkL2oVqKM6uSyTmFDz+2kFHROPgOmG0mniBxSP7kZ9WMGiGqyHoiMW5nG43VOYvMxCJ0EX9Ac5VoeZUmLKHkq4YCBC7Rxn85ulTZm38l7iPU0Gw==;24:Oj2fc77RIDUYopsSQhF3TxxDeyuyGGW7i9FA0fJK9bmnCzbUo/mH79Fec5VDb9exQC84nyhdL3QD+7b+qBrKjHkc/CIFQS/460OBOVvdfTY=;20:WCg25YiLaJrar7d7R2PB239BlFBlMKP3GcIHEO02YqBghHxjUDM++wm8E+XP/O9qWGcn+SsyzZigCTaWP8/xiHa4xqERLSZDysqhPaz87BZIE3U/e6AzLFCL6C1QcGP2tWRwfTNS02Uqyw+MVby+IcP5o4GQlaGgy44bbNQ00aPJdningXN5L+IGhenbRCAqINtqNNt0OW4rYD9Wb6wgubBoBRgs+B+4B+Wogq/niDB68b4KKwwAik7zF92kfWbJ SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: amd.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2015 10:09:48.6738 (UTC) X-MS-Exchange-CrossTenant-Id: 3dd8961f-e488-4e60-8e11-a82d994e183d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=3dd8961f-e488-4e60-8e11-a82d994e183d;Ip=[165.204.84.221];Helo=[atltwp01.amd.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR12MB0710 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Actually, rapl_sysfs_show is a duplicate of perf_event_sysfs_show. We prefer to use the unified interface. Signed-off-by: Huang Rui --- arch/x86/kernel/cpu/perf_event_intel_rapl.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/arch/x86/kernel/cpu/perf_event_intel_rapl.c b/arch/x86/kernel/cpu/perf_event_intel_rapl.c index ed446bd..6a32df4 100644 --- a/arch/x86/kernel/cpu/perf_event_intel_rapl.c +++ b/arch/x86/kernel/cpu/perf_event_intel_rapl.c @@ -109,11 +109,11 @@ static struct kobj_attribute format_attr_##_var = \ #define RAPL_CNTR_WIDTH 32 /* 32-bit rapl counters */ -#define RAPL_EVENT_ATTR_STR(_name, v, str) \ -static struct perf_pmu_events_attr event_attr_##v = { \ - .attr = __ATTR(_name, 0444, rapl_sysfs_show, NULL), \ - .id = 0, \ - .event_str = str, \ +#define RAPL_EVENT_ATTR_STR(_name, v, str) \ +static struct perf_pmu_events_attr event_attr_##v = { \ + .attr = __ATTR(_name, 0444, perf_event_sysfs_show, NULL), \ + .id = 0, \ + .event_str = str, \ }; struct rapl_pmu { @@ -405,19 +405,6 @@ static struct attribute_group rapl_pmu_attr_group = { .attrs = rapl_pmu_attrs, }; -static ssize_t rapl_sysfs_show(struct device *dev, - struct device_attribute *attr, - char *page) -{ - struct perf_pmu_events_attr *pmu_attr = \ - container_of(attr, struct perf_pmu_events_attr, attr); - - if (pmu_attr->event_str) - return sprintf(page, "%s", pmu_attr->event_str); - - return 0; -} - RAPL_EVENT_ATTR_STR(energy-cores, rapl_cores, "event=0x01"); RAPL_EVENT_ATTR_STR(energy-pkg , rapl_pkg, "event=0x02"); RAPL_EVENT_ATTR_STR(energy-ram , rapl_ram, "event=0x03"); -- 2.1.4