From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932863AbcEKOFr (ORCPT ); Wed, 11 May 2016 10:05:47 -0400 Received: from mail-am1on0109.outbound.protection.outlook.com ([157.56.112.109]:16256 "EHLO emea01-am1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932162AbcEKOFq (ORCPT ); Wed, 11 May 2016 10:05:46 -0400 Authentication-Results: linutronix.de; dkim=none (message not signed) header.d=none;linutronix.de; dmarc=none action=none header.from=virtuozzo.com; From: Andrey Ryabinin To: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , , Peter Zijlstra CC: Jim Cromie , Imre Palik , , Andrey Ryabinin Subject: [PATCH] perf/x86: fix undefined shift on 32-bit kernels Date: Wed, 11 May 2016 16:51:51 +0300 Message-ID: <1462974711-10037-1-git-send-email-aryabinin@virtuozzo.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [195.214.232.10] X-ClientProxiedBy: AM3PR07CA0023.eurprd07.prod.outlook.com (10.141.45.151) To VI1PR0801MB1311.eurprd08.prod.outlook.com (10.167.197.149) X-MS-Office365-Filtering-Correlation-Id: 177d687a-649d-42f9-9472-08d379a355d4 X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;2:o60ohVUzbOInTxF7rORfSZg8h4/GObQLh2cBBk/DwwbIE9HYay7XF9ItUnSufDQY8iIkTjqoioRtCmohiVeMNMCDXtU6UtTg5EgY6JO/7sCVQk+q64EOhXAYOVugGgfi1Hp/pPwos+dGq4HS6U58IXvn0GMmm1wgIaWdeezZrv88wFc8TXjV4J+N6/dqwtRm;3:Qd/gwsvVuRbtNqd1nF8ktjURUXNh4vt/Dt0z4HBM4r19+7B5MGWBNXHkVlAHJxpF7u/UtChuvlCeAdwx8/3kCl3tqwdiMvzDSq0tCb64eZ4rGkRu0Ej2rSPenMUbe6bE;25:6+pqJtKP+Jc79BQBDqeZbVGkHzaiOOpMWP+TurIH6VU7cCFLnfCo5ePBLvsvAfWRlkcpNFVQIiucwOKMeoAdxEnvhoMaWCZ261J6VjoOWKsUY2X/JOcqSlEAwpEGtPfh+ObXaPuoVos4h3YU+Qll35SUqxarn97EdTqllB4CM4bC58j6Z/hHBN1rIAI6fDq112yEiCu0ZAZtjfZyxcR4fUkMZJmNZDewvRuvawzf7FznVK49dJsySrz0PoPPAtyMottZiU7S/K93dAeXzq4n3JT7KrSDOK6WJO5DF3sG42584QlTLSibL4onQsyXvK4Wt1+oAWdSEUI9FXkChtpumX7Ru9NUOTEDJ2Q70HMjA90AGBcrTLdX0QsumjPi1uZZpHV0BCTytlPFUxr+HQjgrQ+QdIPP79sy2ffiZsYfwwUlCYk1xriF8XVPMfCz0VQb X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1311; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(6040130)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6041072)(6043046);SRVR:VI1PR0801MB1311;BCL:0;PCL:0;RULEID:;SRVR:VI1PR0801MB1311; X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;4:mNzx0gbWukzW5U3RpIDLHmFD05EgLaigS9ho5oKX02JaXr8/jvFXL595rl8f2bzjmEkSnRZNu6OpjAKBxWJj5w2G9Vmcmov38WqVjCdx7mNw5HrkV7LKh8iyWlOsxoQtG4dwIf/V85kio4tuvmygQ5BjuGMN6IE1hi1xlUJVVUQpIvQ9RBPw84uX/jolqZ3Qo3QqX0lGryPqIGt6vys1hr/SeqHUClldXmuOz/KfqszewToCbCWhlofjh2NC/ih8kYS0PShXXY4lO72XBKczdlDtRYfGtyukaPvF0emjWg2ChA0NRWcpPbOfhlqmQg4rX8/lZu8dOFSG4uucqI68PuDmOwmSyuSEC6hdcP5XEKgJeA9YCtRg7PrU+cwrev890JZ/eWJVqM5k8jtzWO+kt3AaDUfYo0te6vRjkl4s/Ew= X-Forefront-PRVS: 0939529DE2 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(4630300001)(6009001)(5003940100001)(4001430100002)(19580405001)(2950100001)(19580395003)(107886002)(47776003)(2906002)(81166006)(5008740100001)(66066001)(76176999)(5001770100001)(4326007)(50986999)(5004730100002)(33646002)(586003)(53416004)(50466002)(76506005)(42186005)(36756003)(50226002)(3846002)(6116002)(189998001)(77096005)(229853001)(86362001)(92566002)(48376002);DIR:OUT;SFP:1102;SCL:1;SRVR:VI1PR0801MB1311;H:localhost.sw.ru;FPR:;SPF:None;MLV:sfv;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;VI1PR0801MB1311;23:amKHU0yoZjirNyg8/vAIRddlbIYYg1KtXc4Zj0m?= =?us-ascii?Q?DIfAgLnMDvQv7wimSuEXDYC7wjL22Lk0ywgRzMrJ1noPTlwsHnf0/mCbsIq1?= =?us-ascii?Q?OyoO6werrGCWUXX2T8tL1r1Ct2mKVakJ15rnuR8IRL10mH5okdPgXaOVdcCz?= =?us-ascii?Q?OsiWI3WyvIwhPu/P8+1wxOZY8l3pr8yM2P1WjR5zhG3KV6d9eUNrfx1dmqVh?= =?us-ascii?Q?pA1Sc1iosaNQurhSQCFke+9IiKoBYw9zu/EYYVZO2ynqwMvYPZ5AcuAd38Wx?= =?us-ascii?Q?Zd0+DbAWs03UrTAbI0GPfQKt+eqKcgVSIpZpCdwFuRJZfle8Gp+sjl5sH3cP?= =?us-ascii?Q?Ht5T4mUA6P3oSvOscNUefrLZTjACe8OEt/zdOztJbWszp4IyZ0+wJMQIBS2d?= =?us-ascii?Q?ivSFdw5RNg5OnTaMSdjB7XNCHmoutJ6+P25Aw4IsYZFNQDbCcc3aZQB7ygAx?= =?us-ascii?Q?QvfojSzcy5uq5TTxeJzB+cpVFtN2aWLBhE+XQ5ekPzJz3pZcymdp08xgaxNq?= =?us-ascii?Q?e63jlb+Api424ONkPHLl5mEWlMnb3C7N5ekP9SFQwvB6hnCAoeYtUHvsGmGN?= =?us-ascii?Q?a54sae19ujRhQugFb0pHc5bMCelXXmKQLWi5ELMwxyvSLN1hlOiA69FNL/+T?= =?us-ascii?Q?RM+HU8DUnELwNSo+i39rp818gFcq/ByOToMFvmcE5RccgC+bRvIwEtnd1qnk?= =?us-ascii?Q?IYfeAoubXEWvMxJT7Y38wBdokDpsPv+Kzzxxw8bLmtjcpWgig42jmsdU2g64?= =?us-ascii?Q?0Z89v2daafN1/iYEcoWCgUuS7MR9S9nJVcWLITqbVqrogjZas2E4OGiDhjdJ?= =?us-ascii?Q?t6iGi5edsN/6OfR8vP5TW7Dh5GJzPjN7Vqm0a4tjZrjb9Mx7Lckx3KoeecP8?= =?us-ascii?Q?5yfVJjrsUaH7FdxQKxnwACGeU1SPIYDh7eVuMOs6IaXn20gCgKwsgHUFvYCP?= =?us-ascii?Q?M1PTC4GAMNQC3eRKMhoeCpfsIuy2q5W7rgTpjxAsF1Q=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;VI1PR0801MB1311;5:1+bb1H8rmACdKfu4oE4LgTbDUo5TTVRcC7RY9OReREtTfz10j6qS7BzzwlOOl4NTxREaybw4CTjIVt6Qnn0vHTBN5OsKoFQpier5IMhW+E7G+JeBM6KGscFikKF4NBwQJQUdc/NGSxomyx5cU8Uq0w==;24:O7C21Ug7jXzad1qLe+X+VaNiv3NfGAWSrWRyU/uywruV9hch831vEn/9bu1FhI1yGb6LxWEivtpPI9ez3aq0hyHDv8IX6mXrObYJwJu+tFA=;7:15+D+sV75lEfy1y7wgMUVAH9RZfDhoKj+4FBKFUJb4swPFm9FOSbC+rfOsZMHgdRiSfcfyKIBjxs+hXC3vaIdv9wy7TpldgQ1P5fLRyxEvnG1PDK+zbtpQdYvDdYSN5vNNW874/xrgbB3Z+Q0Qej/sgv27Da0PmrwlFiBJ/tYjNARc2yY2641/S8V9J3OIQA;20:jARf3Ofj7p5IVnu4LWOWOoMIVsvCCoJvE2/bUftD9c4fpcIrwc7YCGgkA++nxTeFc9+K8XRpWKpCJbVH6x5aJW77zmlql6FABrS8w6r9esoniGouYh+qg4TJZmWHip+Fh7vUDi6dIvQmiKlzDfZm8dguyjCgsyblbohqoNapf9U= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 May 2016 13:51:20.7246 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR0801MB1311 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Jim reported: UBSAN: Undefined behaviour in arch/x86/events/intel/core.c:3708:12 shift exponent 35 is too large for 32-bit type 'long unsigned int' The use of 'unsigned long' type obviously is not correct here, make it 'unsigned long long' instead. Fixes: 2c33645d366d ("perf/x86: Honor the architectural performance monitoring version") Reported-by: Jim Cromie Signed-off-by: Andrey Ryabinin --- arch/x86/events/intel/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index a6fd4db..5210eaa 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3708,7 +3708,7 @@ __init int intel_pmu_init(void) c->idxmsk64 |= (1ULL << x86_pmu.num_counters) - 1; } c->idxmsk64 &= - ~(~0UL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed)); + ~(~0ULL << (INTEL_PMC_IDX_FIXED + x86_pmu.num_counters_fixed)); c->weight = hweight64(c->idxmsk64); } } -- 2.7.3