From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 23D054CEE53; Wed, 30 Sep 2026 17:24:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790789097; cv=none; b=L4vihHO2zNiGo4JYUtgO4dOD7YKMC5yy06O3DNOeqzjCjKKF5OTGD6XZPKd44MgVcfHiXQ3Ml8Cq8TQy8MbYsINGXzIU3zmDaAw8M6YIyBdAsWYbS60cc1jvwwdEDNwYoxm6Mqd5RATy8EsZNXQQlqGeFUx6q1Li7SSZsrtWmbQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790789097; c=relaxed/simple; bh=Py6qiZrJTCqVoORHfnJebZQ0NZns5udgT0KP9pNU6nI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DJVFFT3Xqmm5R/liJEuGZO5Eq+0wWkLuh2XMNqRszoJUrhGTgjiSxZhGfn5GgZZ7uAjNc6SIZVDxzN47ivpIDNffS0B6Vh0ULCisg3ulMtcdVZ1gbQeRNE45OcrWDTuA6TIh91rav/T4ixFJl0yacRQjeOfa3R3UtfUMGzCTcwA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=jyVvEOGS; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="jyVvEOGS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7FB7F1F000FF; Wed, 30 Sep 2026 17:24:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790789096; bh=LbwEC+/WOS984t+gs6m+rtRFWfNDuJJ5b6HzOlfHQaM=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=jyVvEOGS46LO7nA5qg8UPtAdmCwLPfZpPbTQyU4nn4qjs6xO91T7jBCYUWDcrhYXY TMnVyrdTvPCaKM0gLb7NCuadSiowfVOdvo0My8uP9Bss9MG/idGI1Ji3A3GIjmY38p /O9/MrQkOX5HlaNDPj7o/K6bw8WgxM1kM84Bd9Uw= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sven Schnelle , Steven Rostedt , "Masami Hiramatsu (Google)" , Sasha Levin Subject: [PATCH 6.12 303/877] selftests/ftrace: Fix unique symbol check in kprobe_non_uniq_symbol.tc Date: Wed, 30 Sep 2026 17:20:14 +0200 Message-ID: <20260930152421.238250850@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152414.738996857@linuxfoundation.org> References: <20260930152414.738996857@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Sven Schnelle [ Upstream commit d22c3e0088e85be8131f7a9283f759cdbb20726d ] The current regex also matches symbols in modules, which makes the test fail on s390 where name_show is present only once in the kernel, but also multiple times in modules: 000001b1401cdc20 t name_show 000001b0c05e6c40 t name_show [mdev] 000001b0c0495f30 t name_show [i2c_core] Fix this by changing the regular expression to only match the function name. Link: https://lore.kernel.org/all/20260909092954.2200558-1-svens@linux.ibm.com/ Fixes: 03b80ff8023a ("selftests/ftrace: Add new test case which checks non unique symbol") Signed-off-by: Sven Schnelle Reviewed-by: Steven Rostedt Signed-off-by: Masami Hiramatsu (Google) Signed-off-by: Sasha Levin --- .../selftests/ftrace/test.d/kprobe/kprobe_non_uniq_symbol.tc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_non_uniq_symbol.tc b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_non_uniq_symbol.tc index bc9514428dbaf..07b1177c16344 100644 --- a/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_non_uniq_symbol.tc +++ b/tools/testing/selftests/ftrace/test.d/kprobe/kprobe_non_uniq_symbol.tc @@ -6,7 +6,7 @@ SYMBOL='name_show' # We skip this test on kernel where SYMBOL is unique or does not exist. -if [ "$(grep -c -E "[[:alnum:]]+ t ${SYMBOL}" /proc/kallsyms)" -le '1' ]; then +if [ "$(grep -c -E "[[:alnum:]]+ t ${SYMBOL}$" /proc/kallsyms)" -le '1' ]; then exit_unsupported fi -- 2.53.0