From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-1372482-1517179959-2-3570430916029296619 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.001, RCVD_IN_DNSWL_HI -5, T_RP_MATCHES_RCVD -0.01, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='com', MailFrom='org', XOriginatingCountry='US' X-Spam-charsets: plain='iso-8859-1' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=arctest; t=1517179959; b=Rh6XkmldxzkEMn5rJAgUlYSSRUVmg0pwLqOBZBsPZ4g2zTy 6YhZAeYLEoWsI5P7C/sXjCvvQ20cbBfOepoGmQeHRB9ATiLNW2osyrL6uN7n9uBj qF5Cgt9tv3juGG34r2R9dUooOcTCbWz2NmlC3ZlseKY1Bil4fUJtkcjdfqAIonlt Dl7ijzcWhn1wS1mYkx38voQQ26L3vJXk6r91nGORLOCsKHdvsvoLlPky/pXu74O6 96Jr28WoZXiWECA8Dk8DM9RSyf/ENXEIJ06i6lJACSeJ9Xug8m/A8R9u8gpFONiH qGWc55Jz44Zbt9eRbZf63Wg9xnH553lBZ5yVRiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :references:in-reply-to:content-type:content-transfer-encoding :mime-version:sender:list-id; s=arctest; t=1517179959; bh=F9R9nB hvIgBw8gxQ9EASyr+9Cm1g9Y6CCkq/9rFhOvE=; b=kqEd7XNCejTjV8PgFAOWPR hzeZgKT/9s5BmZmT//g36wu7ksnFdOpPKV1VlLOvMbb9B/9+MFiCQr3qPElsP/eB Q9r5Pz1R+a5N0ADTD3WTezcZT/dJdzq8Wl9OspKgMlMxZNdn0Ax9/InNbH5PQ6KS N+Svf+dQ/smIKyivupRahuCdbG3ZQc0Zqf59f3LUlT1F+JvWFbReG3kPtdihZLl/ GM7vQjQ1v6IVcj3w9cACqnBm+RE+OSL9dDrimyBT0rjCJCwVJS1dplgLXz28Av9c +W4XThq4f+H3IH7o4GcvAizmqLvjcQ2vpI1zkD8FVawANJt50mUzmQjS7ebj7+3g == ARC-Authentication-Results: i=1; mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=PmHxDjJ1 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Authentication-Results: mx4.messagingengine.com; arc=none (no signatures found); dkim=pass (1024-bit rsa key sha256) header.d=microsoft.com header.i=@microsoft.com header.b=PmHxDjJ1 x-bits=1024 x-keytype=rsa x-algorithm=sha256 x-selector=selector1; dmarc=pass (p=reject,has-list-id=yes,d=none) header.from=microsoft.com; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=microsoft.com header.result=pass header_is_org_domain=yes Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932184AbeA1W2h (ORCPT ); Sun, 28 Jan 2018 17:28:37 -0500 Received: from mail-dm3nam03on0107.outbound.protection.outlook.com ([104.47.41.107]:53136 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S932166AbeA1W2g (ORCPT ); Sun, 28 Jan 2018 17:28:36 -0500 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Ravi Bangoria , Michael Ellerman , Sasha Levin Subject: [PATCH AUTOSEL for 4.9 20/49] powerpc/perf: Fix oops when grouping different pmu events Thread-Topic: [PATCH AUTOSEL for 4.9 20/49] powerpc/perf: Fix oops when grouping different pmu events Thread-Index: AQHTmIc6uvlJhFE6VkG0oqIPkZXUfw== Date: Sun, 28 Jan 2018 22:27:48 +0000 Message-ID: <20180128222727.22404-20-alexander.levin@microsoft.com> References: <20180128222727.22404-1-alexander.levin@microsoft.com> In-Reply-To: <20180128222727.22404-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;MW2PR2101MB1097;7:cMB1hEDH9V60klU90SIlh5IfNEXd7vp1w7YDEQuBvTHYQUhGjE9fCpa7gaxdTVAYEnoUQRw8Ct6Q/ZOfh3RDlD15LUFDWdjxcCl3YK6Vo9d/PdAn0sa94K6WKz2tc6ZR5LPAxW1H5T+5cvp7c6u5b7+xUbLFY6PkaeKlPF7Q4s8CvA8zsrS9OesCrKtlk44nKzr4fvQvfaU+ieuOpjm00YBSopy0B/l6E7rlfrZK6JH+vovMF/m6jda17LraqKkj x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 591db4a6-7ab1-41d7-32e8-08d5669e745f x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020);SRVR:MW2PR2101MB1097; x-ms-traffictypediagnostic: MW2PR2101MB1097: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(104084551191319); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(61425038)(6040501)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(10201501046)(3231101)(944501161)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123564045)(20161123558120)(20161123562045)(20161123560045)(6072148)(201708071742011);SRVR:MW2PR2101MB1097;BCL:0;PCL:0;RULEID:;SRVR:MW2PR2101MB1097; x-forefront-prvs: 05669A7924 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(366004)(39380400002)(39860400002)(396003)(376002)(199004)(189003)(72206003)(14454004)(3280700002)(106356001)(4326008)(478600001)(10290500003)(76176011)(102836004)(3660700001)(25786009)(6506007)(105586002)(316002)(6486002)(97736004)(22452003)(186003)(99286004)(110136005)(54906003)(107886003)(26005)(86362001)(8676002)(81156014)(2906002)(1076002)(81166006)(68736007)(3846002)(6116002)(305945005)(7736002)(36756003)(86612001)(10090500001)(6512007)(2950100002)(66066001)(5660300001)(53936002)(6666003)(8936002)(6436002)(2501003)(2900100001)(5250100002)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:MW2PR2101MB1097;H:MW2PR2101MB1034.namprd21.prod.outlook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; x-microsoft-antispam-message-info: tx4nkUwMGXtXdvdqCjLpglMe5fQThq7VJeILEQ1cGbo8umbFX88yFz4wKk9H0w5mgvjvHw5epsNk+WJB6HeUxA== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 591db4a6-7ab1-41d7-32e8-08d5669e745f X-MS-Exchange-CrossTenant-originalarrivaltime: 28 Jan 2018 22:27:48.8733 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: MW2PR2101MB1097 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: From: Ravi Bangoria [ Upstream commit 5aa04b3eb6fca63d2e9827be656dcadc26d54e11 ] When user tries to group imc (In-Memory Collections) event with normal event, (sometime) kernel crashes with following log: Faulting instruction address: 0x00000000 [link register ] c00000000010ce88 power_check_constraints+0x128/0x980 ... c00000000010e238 power_pmu_event_init+0x268/0x6f0 c0000000002dc60c perf_try_init_event+0xdc/0x1a0 c0000000002dce88 perf_event_alloc+0x7b8/0xac0 c0000000002e92e0 SyS_perf_event_open+0x530/0xda0 c00000000000b004 system_call+0x38/0xe0 'event_base' field of 'struct hw_perf_event' is used as flags for normal hw events and used as memory address for imc events. While grouping these two types of events, collect_events() tries to interpret imc 'event_base' as a flag, which causes a corruption resulting in a crash. Consider only those events which belongs to 'perf_hw_context' in collect_events(). Signed-off-by: Ravi Bangoria Reviewed-By: Madhavan Srinivasan Signed-off-by: Michael Ellerman Signed-off-by: Sasha Levin --- arch/powerpc/perf/core-book3s.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3= s.c index 083f92746951..bf949623de90 100644 --- a/arch/powerpc/perf/core-book3s.c +++ b/arch/powerpc/perf/core-book3s.c @@ -1381,7 +1381,7 @@ static int collect_events(struct perf_event *group, i= nt max_count, int n =3D 0; struct perf_event *event; =20 - if (!is_software_event(group)) { + if (group->pmu->task_ctx_nr =3D=3D perf_hw_context) { if (n >=3D max_count) return -1; ctrs[n] =3D group; @@ -1389,7 +1389,7 @@ static int collect_events(struct perf_event *group, i= nt max_count, events[n++] =3D group->hw.config; } list_for_each_entry(event, &group->sibling_list, group_entry) { - if (!is_software_event(event) && + if (event->pmu->task_ctx_nr =3D=3D perf_hw_context && event->state !=3D PERF_EVENT_STATE_OFF) { if (n >=3D max_count) return -1; --=20 2.11.0