Patch "selftests/bpf: Skip module_fentry_shadow test when bpf_testmod is not available" has been added to the 6.5-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    selftests/bpf: Skip module_fentry_shadow test when bpf_testmod is not available

to the 6.5-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     selftests-bpf-skip-module_fentry_shadow-test-when-bp.patch
and it can be found in the queue-6.5 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit d91b79664a8022073cca41bf9499e205e6fc8719
Author: Artem Savkov <asavkov@xxxxxxxxxx>
Date:   Thu Sep 14 14:49:28 2023 +0200

    selftests/bpf: Skip module_fentry_shadow test when bpf_testmod is not available
    
    [ 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 <asavkov@xxxxxxxxxx>
    Signed-off-by: Andrii Nakryiko <andrii@xxxxxxxxxx>
    Link: https://lore.kernel.org/bpf/20230914124928.340701-1-asavkov@xxxxxxxxxx
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

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,
 	);