From patchwork Mon Jul 10 08:13:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot2 for Thomas Gleixner X-Patchwork-Id: 117694 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9f45:0:b0:3ea:f831:8777 with SMTP id v5csp4865507vqx; Mon, 10 Jul 2023 01:17:04 -0700 (PDT) X-Google-Smtp-Source: APBJJlFVwPRApB7uJJet3Cpwyvfxxj5HE6+9TYvxy1XMqdVbYsJ6qvstpHQbcbJhGWXC58kDWl+H X-Received: by 2002:a17:906:15c:b0:978:8937:19ba with SMTP id 28-20020a170906015c00b00978893719bamr13310403ejh.44.1688977024200; Mon, 10 Jul 2023 01:17:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1688977024; cv=none; d=google.com; s=arc-20160816; b=CoB2XkmSq5mJ3bnXkPwFDd8/+nR0VfcG4e7JgR5BhrXhgcTmKStRwxnnAa70dI8EQA sZrfaVIjAHV/QG/sy/X+Rcddev+2k5CKLZc4Uu6jy+clhD9d4Dd4SS/RL42P1snU3tE+ 4CeJp+UkBxTALCko/P9RJH321r7DpB5RqRXjGj7/Qo9iyy5j74SEXRgPepw7/zE6gpW+ GuL9q1ijRY5Mk45zmEkuMBNDByCKsY3vOmHJc/oNaijSsEE+qUOiobhmGlmIF4F/sy8n xIVlynaNfRl58U/EtTqhOU2SxcsOqf3voALxzzSvRxmfoKswOa4izE5ik90AyiWLk1TD gmFg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:robot-unsubscribe :robot-id:message-id:mime-version:references:in-reply-to:cc:subject :to:reply-to:sender:from:dkim-signature:dkim-signature:date; bh=QmxEJkHfTKInkH+veC+TMsvNnEkLPnoWkAzHDAyTGxE=; fh=b47S4HEIXSqWsWnF2xmAu2S/A4RTPxVVD+sTclEPBh8=; b=XOKOPSnvCCxvly7EhZdvIZhTtaYUv/EtZDUU8GrUMwYXwBi/osk1fEBV0Si8v0A6ZK vx8Ig/kPTpyii+ISvMfdUxIiOprTH1CBJPHTUgp9cVbdzKGWAOyiPUHSLJOqZ6vyQi8V 0IfEcr3EXD3/MHzUEQEKUKxmPHBjrEN/EK3D5cdPSFizcnkDnrpZWvniZ43HgDrhWFVZ z/FiG3SG0pfvsmBsjK5oUDZsKLIpq4FrTpK+l1G/3VGtg+WJY2JJAR6aMivkMHrIAQdV 5PGFVSPSBWx1P4yw9KEDdI/oBzsH/SDOJ4ed5KggR2qMA9teGCR87ydZyZE2ItOxB/qu WASw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=46UHh6y3; dkim=neutral (no key) header.i=@linutronix.de header.b="0elY/nPt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id hb25-20020a170906b89900b00988ce92ef13si7389680ejb.205.2023.07.10.01.16.40; Mon, 10 Jul 2023 01:17:04 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linutronix.de header.s=2020 header.b=46UHh6y3; dkim=neutral (no key) header.i=@linutronix.de header.b="0elY/nPt"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=QUARANTINE dis=NONE) header.from=linutronix.de Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232650AbjGJINx (ORCPT + 99 others); Mon, 10 Jul 2023 04:13:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38516 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232825AbjGJINZ (ORCPT ); Mon, 10 Jul 2023 04:13:25 -0400 Received: from galois.linutronix.de (Galois.linutronix.de [IPv6:2a0a:51c0:0:12e:550::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E36CE7; Mon, 10 Jul 2023 01:13:24 -0700 (PDT) Date: Mon, 10 Jul 2023 08:13:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1688976802; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QmxEJkHfTKInkH+veC+TMsvNnEkLPnoWkAzHDAyTGxE=; b=46UHh6y3XrPRrKJ3SjGN0YUZY/84V1itqZ5EnhjPTfpHvW70onGukErJ7ewIKM5+w+a2WO z5YN1tKYAT7qWqoehvLfaZxAyQMrualGzO8cUK3QLkN23TMXFrSUFtc+OT8Cu1ocMg1EsR 3nHn7w3EvLG7c6yB+5L/0VBlwFo5LK4/9YDCRgkHCfXmpLDmozJ7JuwZpWoVb2p/SD6GBI m7BoqpGv1cMiwjFmdK8LUv1YZhqMXV3xFAHUhfwJnkcipaKevJoE9Yym6pLbml8O62UZNl DmmAF/x0NKHRj4wjKGvYRH6UnAVajYiNEesR8i5SKig4Uz0IyWH9rJtffzyy6g== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1688976802; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QmxEJkHfTKInkH+veC+TMsvNnEkLPnoWkAzHDAyTGxE=; b=0elY/nPtYviK9iAC+zRpm07pnu1+pEsxn8qE+5ZGzxFuFPjHqmPIeC9RgdbFntCMETSL+/ JJJMQfO4iuaX+RBg== From: "tip-bot2 for Namhyung Kim" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: perf/urgent] perf/x86: Fix lockdep warning in for_each_sibling_event() on SPR Cc: Greg Thelen , Namhyung Kim , "Peter Zijlstra (Intel)" , stable@vger.kernel.org, x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20230704181516.3293665-1-namhyung@kernel.org> References: <20230704181516.3293665-1-namhyung@kernel.org> MIME-Version: 1.0 Message-ID: <168897680188.404.3122821140126581927.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1770515718876617110 X-GMAIL-MSGID: 1771020772308314603 The following commit has been merged into the perf/urgent branch of tip: Commit-ID: 27c68c216ee1f1b086e789a64486e6511e380b8a Gitweb: https://git.kernel.org/tip/27c68c216ee1f1b086e789a64486e6511e380b8a Author: Namhyung Kim AuthorDate: Tue, 04 Jul 2023 11:15:15 -07:00 Committer: Peter Zijlstra CommitterDate: Mon, 10 Jul 2023 09:52:20 +02:00 perf/x86: Fix lockdep warning in for_each_sibling_event() on SPR On SPR, the load latency event needs an auxiliary event in the same group to work properly. There's a check in intel_pmu_hw_config() for this to iterate sibling events and find a mem-loads-aux event. The for_each_sibling_event() has a lockdep assert to make sure if it disabled hardirq or hold leader->ctx->mutex. This works well if the given event has a separate leader event since perf_try_init_event() grabs the leader->ctx->mutex to protect the sibling list. But it can cause a problem when the event itself is a leader since the event is not initialized yet and there's no ctx for the event. Actually I got a lockdep warning when I run the below command on SPR, but I guess it could be a NULL pointer dereference. $ perf record -d -e cpu/mem-loads/uP true The code path to the warning is: sys_perf_event_open() perf_event_alloc() perf_init_event() perf_try_init_event() x86_pmu_event_init() hsw_hw_config() intel_pmu_hw_config() for_each_sibling_event() lockdep_assert_event_ctx() We don't need for_each_sibling_event() when it's a standalone event. Let's return the error code directly. Fixes: f3c0eba28704 ("perf: Add a few assertions") Reported-by: Greg Thelen Signed-off-by: Namhyung Kim Signed-off-by: Peter Zijlstra (Intel) Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20230704181516.3293665-1-namhyung@kernel.org --- arch/x86/events/intel/core.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index a149faf..2a284ba 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -3993,6 +3993,13 @@ static int intel_pmu_hw_config(struct perf_event *event) struct perf_event *leader = event->group_leader; struct perf_event *sibling = NULL; + /* + * When this memload event is also the first event (no group + * exists yet), then there is no aux event before it. + */ + if (leader == event) + return -ENODATA; + if (!is_mem_loads_aux_event(leader)) { for_each_sibling_event(sibling, leader) { if (is_mem_loads_aux_event(sibling))