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 9C0BF381E09; Mon, 5 May 2025 23:09:33 +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=1746486574; cv=none; b=S/0gGQPjckHQ139zx4ykH4i5lJ5V0PemD5x0sk6yguxGZVc68tjWazzWb0oP2QTQPSXm5bwoD/MqoToA8L3Ahg8889LOc5AahxxIpJ9iCcy/iLAh3YqPni1q2GoblJJQyTuSyZFlRaqhLGwPKN1ZN0Ek2N6o1hElOM4ZPz+XisA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1746486574; c=relaxed/simple; bh=oyX9/AfUmDocp/oR7Rh75st60106+lIgEOrpdFkt5mo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=iXkZ1WN2ayqYHwndUP3lungFDATRaQxl5VvoGAbrletK0d2F6moqRodeVhWrA9Gqxb9prjxZ2ECL3V+AcVOlzROsz+HBo8X2RbIVIZ+6HTDnPNumERf5KVtp9PEabDBNAKcLyiGVJuYvz6L/hPSIcHZYHndoXaPw6zT8sReL/3U= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dOwGeF3Q; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dOwGeF3Q" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F3997C4CEF2; Mon, 5 May 2025 23:09:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1746486573; bh=oyX9/AfUmDocp/oR7Rh75st60106+lIgEOrpdFkt5mo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dOwGeF3QkiE1hUDtBWkQo05PmGZzjU94CVakPAxAQykQuLoFoElCHAwE1djqx2xVm PQ0xqLx4a8ncX/N9Ej9onrlZIAmThnPDhFvQlD62JNKQZYAAKN3+Eji43flu6CUHC1 xMbN7L3ofklBiO7ZJCX9FesM1WGLWZmW3CdfIWlj4hxKyeF24ssNWJhKDvC43mLOVm Jx1371zPZc5wQLey/7loK+ndN84AuBkGgtj4cezqoxBMHniMr2GsMCTX/KLFhW4twq WU9vmhq9Sk2f6kaDRK+FOGUc3ULN7idPR2/ZVfSfv2jBUJvhSjj42y2rXljZ5iG97r UWvRNJ0dy9txA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Saket Kumar Bhaskar , Ingo Molnar , Marco Elver , Dmitry Vyukov , Ian Rogers , Frederic Weisbecker , Sasha Levin , peterz@infradead.org, mingo@redhat.com, acme@kernel.org, namhyung@kernel.org, linux-perf-users@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 097/212] perf/hw_breakpoint: Return EOPNOTSUPP for unsupported breakpoint type Date: Mon, 5 May 2025 19:04:29 -0400 Message-Id: <20250505230624.2692522-97-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250505230624.2692522-1-sashal@kernel.org> References: <20250505230624.2692522-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.136 Content-Transfer-Encoding: 8bit From: Saket Kumar Bhaskar [ Upstream commit 061c991697062f3bf87b72ed553d1d33a0e370dd ] Currently, __reserve_bp_slot() returns -ENOSPC for unsupported breakpoint types on the architecture. For example, powerpc does not support hardware instruction breakpoints. This causes the perf_skip BPF selftest to fail, as neither ENOENT nor EOPNOTSUPP is returned by perf_event_open for unsupported breakpoint types. As a result, the test that should be skipped for this arch is not correctly identified. To resolve this, hw_breakpoint_event_init() should exit early by checking for unsupported breakpoint types using hw_breakpoint_slots_cached() and return the appropriate error (-EOPNOTSUPP). Signed-off-by: Saket Kumar Bhaskar Signed-off-by: Ingo Molnar Cc: Marco Elver Cc: Dmitry Vyukov Cc: Ian Rogers Cc: Frederic Weisbecker Link: https://lore.kernel.org/r/20250303092451.1862862-1-skb99@linux.ibm.com Signed-off-by: Sasha Levin --- kernel/events/hw_breakpoint.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kernel/events/hw_breakpoint.c b/kernel/events/hw_breakpoint.c index c3797701339cb..382a3b04f6d33 100644 --- a/kernel/events/hw_breakpoint.c +++ b/kernel/events/hw_breakpoint.c @@ -978,9 +978,10 @@ static int hw_breakpoint_event_init(struct perf_event *bp) return -ENOENT; /* - * no branch sampling for breakpoint events + * Check if breakpoint type is supported before proceeding. + * Also, no branch sampling for breakpoint events. */ - if (has_branch_stack(bp)) + if (!hw_breakpoint_slots_cached(find_slot_idx(bp->attr.bp_type)) || has_branch_stack(bp)) return -EOPNOTSUPP; err = register_perf_hw_breakpoint(bp); -- 2.39.5