From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9606F175BF; Wed, 23 Apr 2025 14:55:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420155; cv=none; b=BvQaxufJ4m5g1xhZ5NQSBjZ5hHOhMmLLO1ZA4WXSndplVQO2EZK4hoZqvEAiXkpeUlPDt46LmZ0kUFTznsnrsviCtL2ZYu0zyoll/5cNRQY/wwS0lkxYnFZKEZHGNhjaex1izxDTeUlMVmrHgRPlpoON8bbkljQujRg3mydNiYY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1745420155; c=relaxed/simple; bh=NEltszxiG1DHgIQFp76zobX8cAdwrsvEDM2OIzPrwq0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SYTqilFph12HG3cxTiTwfQX0VCnVuc0iyUEZ2ZBED87z8MUb4NQQuPY4pWRZgFQ7jGLF7N2FJh+uaBJwytMQyNTzOhx30JQyNsg1JrJHZh2QeYJrNr+UiTuyI3eVcMxx+Lv+67bx8wLcKPfri5xJ1Ex4oZu8knzZAbii1/odhuQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1dkKBqeF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="1dkKBqeF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 279D3C4CEE8; Wed, 23 Apr 2025 14:55:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1745420155; bh=NEltszxiG1DHgIQFp76zobX8cAdwrsvEDM2OIzPrwq0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1dkKBqeFFpuZGmRlRLLiTsID2za6LgZ7oRz6Day/UD2RxCTziDhHbyRAJTWFuctkL tu1pbo6he8DZKkTdpwCvF7wtRUvFNRluZQzGhBftjixg8t3RKzw1cmgbuCmSBny5fy sGwcnpdCY+CbwR2c8WDYNk1xPqtmFC4+heeRejJw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mark Rutland , "Rob Herring (Arm)" , Anshuman Khandual , James Clark , Will Deacon , Sasha Levin Subject: [PATCH 6.6 043/393] perf: arm_pmu: Dont disable counter in armpmu_add() Date: Wed, 23 Apr 2025 16:38:59 +0200 Message-ID: <20250423142645.069549068@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250423142643.246005366@linuxfoundation.org> References: <20250423142643.246005366@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mark Rutland [ Upstream commit dcca27bc1eccb9abc2552aab950b18a9742fb8e7 ] Currently armpmu_add() tries to handle a newly-allocated counter having a stale associated event, but this should not be possible, and if this were to happen the current mitigation is insufficient and potentially expensive. It would be better to warn if we encounter the impossible case. Calls to pmu::add() and pmu::del() are serialized by the core perf code, and armpmu_del() clears the relevant slot in pmu_hw_events::events[] before clearing the bit in pmu_hw_events::used_mask such that the counter can be reallocated. Thus when armpmu_add() allocates a counter index from pmu_hw_events::used_mask, it should not be possible to observe a stale even in pmu_hw_events::events[] unless either pmu_hw_events::used_mask or pmu_hw_events::events[] have been corrupted. If this were to happen, we'd end up with two events with the same event->hw.idx, which would clash with each other during reprogramming, deletion, etc, and produce bogus results. Add a WARN_ON_ONCE() for this case so that we can detect if this ever occurs in practice. That possiblity aside, there's no need to call arm_pmu::disable(event) for the new event. The PMU reset code initialises the counter in a disabled state, and armpmu_del() will disable the counter before it can be reused. Remove the redundant disable. Signed-off-by: Mark Rutland Signed-off-by: Rob Herring (Arm) Reviewed-by: Anshuman Khandual Tested-by: James Clark Link: https://lore.kernel.org/r/20250218-arm-brbe-v19-v20-2-4e9922fc2e8e@kernel.org Signed-off-by: Will Deacon Signed-off-by: Sasha Levin --- drivers/perf/arm_pmu.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/drivers/perf/arm_pmu.c b/drivers/perf/arm_pmu.c index d712a19e47ac1..b3bb4d62f13dc 100644 --- a/drivers/perf/arm_pmu.c +++ b/drivers/perf/arm_pmu.c @@ -342,12 +342,10 @@ armpmu_add(struct perf_event *event, int flags) if (idx < 0) return idx; - /* - * If there is an event in the counter we are going to use then make - * sure it is disabled. - */ + /* The newly-allocated counter should be empty */ + WARN_ON_ONCE(hw_events->events[idx]); + event->hw.idx = idx; - armpmu->disable(event); hw_events->events[idx] = event; hwc->state = PERF_HES_STOPPED | PERF_HES_UPTODATE; -- 2.39.5