From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 886A4C2BB3F for ; Wed, 15 Nov 2023 19:35:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234386AbjKOTfL (ORCPT ); Wed, 15 Nov 2023 14:35:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60104 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234390AbjKOTfK (ORCPT ); Wed, 15 Nov 2023 14:35:10 -0500 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C185319D for ; Wed, 15 Nov 2023 11:35:07 -0800 (PST) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 45AFDC433C7; Wed, 15 Nov 2023 19:35:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1700076907; bh=QEJOSx+gY5zZ19zWImquvQxIWfiwzyTmtY4+eSQg6Bs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TDX6kk+3BDlUC/S9mYjtRXj14zlozUKKm3ouhU/YQXF11o4XkMenIaK2iStcD0LYP dwIP3HdMvlkMX3fsEqH4j4fhFhIldUAavJIzHyPKM8lIPsExK8edvN/zFzCN2wuR51 kJ7c3jMtq88URhN+p7KUkjZ+lm5ZpacjPamErvsc= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Artem Savkov , Andrii Nakryiko , Sasha Levin Subject: [PATCH 6.6 063/603] selftests/bpf: Skip module_fentry_shadow test when bpf_testmod is not available Date: Wed, 15 Nov 2023 14:10:08 -0500 Message-ID: <20231115191617.490037287@linuxfoundation.org> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20231115191613.097702445@linuxfoundation.org> References: <20231115191613.097702445@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Artem Savkov [ Upstream commit 971f7c32147f2d0953a815a109b22b8ed45949d4 ] This test relies on bpf_testmod, so skip it if the module is not available. Fixes: aa3d65de4b900 ("bpf/selftests: Test fentry attachment to shadowed functions") Signed-off-by: Artem Savkov Signed-off-by: Andrii Nakryiko Link: https://lore.kernel.org/bpf/20230914124928.340701-1-asavkov@redhat.com Signed-off-by: Sasha Levin --- .../testing/selftests/bpf/prog_tests/module_fentry_shadow.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c b/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c index c7636e18b1ebd..aa9f67eb1c95b 100644 --- a/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c +++ b/tools/testing/selftests/bpf/prog_tests/module_fentry_shadow.c @@ -61,6 +61,11 @@ void test_module_fentry_shadow(void) int link_fd[2] = {}; __s32 btf_id[2] = {}; + if (!env.has_testmod) { + test__skip(); + return; + } + LIBBPF_OPTS(bpf_prog_load_opts, load_opts, .expected_attach_type = BPF_TRACE_FENTRY, ); -- 2.42.0