Received: by 2002:a25:b794:0:0:0:0:0 with SMTP id n20csp126578ybh; Fri, 2 Aug 2019 19:36:09 -0700 (PDT) X-Google-Smtp-Source: APXvYqw1JkptQFFgVTB60yP41KVwv8pEiSFMXe5EYHn9r7ShmOrCAJ868Lz1Wzilj1mEIAXYCsV3 X-Received: by 2002:a17:90a:db52:: with SMTP id u18mr7237727pjx.107.1564799769500; Fri, 02 Aug 2019 19:36:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564799769; cv=none; d=google.com; s=arc-20160816; b=Io3U1ew385wqPx/mpQRTFksnfIoVcbAoazkrzaFxD8HuXQZ/YltRAGRSTql/+RrtuT VSXHe+aG1C8J2DsDfx1mdmN8owZRJBALBB47hslqJhxAuHEVQhYCUH0CnEf3WFCRCxVP CQPZ3tbibqqxKFWVM/urvU8h7sApG3aculaMO1gNQzdqryhLXPzK/N2SPPJeZmtOUpTm 41Eb3tHNDTkC9K8Xp7sVAVJCZzFljjaTFhkigQl/vrJowOY5qDxPfvoJCBSpl8Ijwe3o 424ktu2uyNYnUWKgmmoyNfSaw+ucF6Pe1/N38YQu/Q0D+XVYBf9nmjcU9Y8LJEHU6+d5 OvQA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=RLC9Pvgsv+FEbUHMMx+/ta+CkskBk3qw77kQU8OX6g4=; b=FEY2F40Kr4ak2EUYpuTHEG1XwAT40BHAIeF93dMmlJSYObdXUVpMJ29wFWEfJty0wb XHL2L8P8+BmgXBc53iB1KsaoAY1iA+JgKquzROuKXOHagKBAURwZ/GhAso6/X/gFCvrh r4ON2CB3fJAu2krJXKSzAnJ1QrwRxOHIwE+WOutz+GD8mX4jJ73CELUQ28iSSUiNGeHC HeKqgrxn6AvxOcIa8V3KCP4q1i0LPl9wLMJTOKoZ/dWMVLnd/nzvO4+sXggu1ZPbUQNQ xfNgk8CPDrdrcPnR5jm7prrB6o5vg5cO9yzTY2mxdW5INjxl41ZZ57CqfSaKbTgL+lL7 UvwQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0H0DhqL4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id p1si43791625pff.250.2019.08.02.19.35.54; Fri, 02 Aug 2019 19:36:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0H0DhqL4; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404313AbfHBNa5 (ORCPT + 99 others); Fri, 2 Aug 2019 09:30:57 -0400 Received: from mail.kernel.org ([198.145.29.99]:35068 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391007AbfHBNYT (ORCPT ); Fri, 2 Aug 2019 09:24:19 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9CA8B2182B; Fri, 2 Aug 2019 13:24:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564752259; bh=k6TQx6bLxozyYUaY1iC9e7S1UT4ztpVBJ0ouMvqc9pI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0H0DhqL4xLxSd9Jd8iPa5wXeLmhHyDnKSybcIaJuBGN8V7pV24fpfLa6rM0+2WULb M46e88F6N86GsKxx5FDU+oxrNnlmwzmAUIK9VGXcRQWmj6J5mGX4rJH9JHkpqVXLCg Kp8MnVT2VGZwc5XmWxjexOUL+EIaxWnGbZCJGnIo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Leonard Crestez , Peter Zijlstra , Mark Rutland , Alexander Shishkin , Arnaldo Carvalho de Melo , Frank Li , Jiri Olsa , Linus Torvalds , Namhyung Kim , Thomas Gleixner , Will Deacon , Ingo Molnar , Sasha Levin Subject: [PATCH AUTOSEL 4.19 41/42] perf/core: Fix creating kernel counters for PMUs that override event->cpu Date: Fri, 2 Aug 2019 09:23:01 -0400 Message-Id: <20190802132302.13537-41-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190802132302.13537-1-sashal@kernel.org> References: <20190802132302.13537-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Leonard Crestez [ Upstream commit 4ce54af8b33d3e21ca935fc1b89b58cbba956051 ] Some hardware PMU drivers will override perf_event.cpu inside their event_init callback. This causes a lockdep splat when initialized through the kernel API: WARNING: CPU: 0 PID: 250 at kernel/events/core.c:2917 ctx_sched_out+0x78/0x208 pc : ctx_sched_out+0x78/0x208 Call trace: ctx_sched_out+0x78/0x208 __perf_install_in_context+0x160/0x248 remote_function+0x58/0x68 generic_exec_single+0x100/0x180 smp_call_function_single+0x174/0x1b8 perf_install_in_context+0x178/0x188 perf_event_create_kernel_counter+0x118/0x160 Fix this by calling perf_install_in_context with event->cpu, just like perf_event_open Signed-off-by: Leonard Crestez Signed-off-by: Peter Zijlstra (Intel) Reviewed-by: Mark Rutland Cc: Alexander Shishkin Cc: Arnaldo Carvalho de Melo Cc: Frank Li Cc: Jiri Olsa Cc: Linus Torvalds Cc: Namhyung Kim Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Will Deacon Link: https://lkml.kernel.org/r/c4ebe0503623066896d7046def4d6b1e06e0eb2e.1563972056.git.leonard.crestez@nxp.com Signed-off-by: Ingo Molnar Signed-off-by: Sasha Levin --- kernel/events/core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index e8979c72514be..7ca44b8523c81 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -10957,7 +10957,7 @@ perf_event_create_kernel_counter(struct perf_event_attr *attr, int cpu, goto err_unlock; } - perf_install_in_context(ctx, event, cpu); + perf_install_in_context(ctx, event, event->cpu); perf_unpin_context(ctx); mutex_unlock(&ctx->mutex); -- 2.20.1