From: Greg Kroah-Hartman Date: Wed, 8 Jun 2022 12:06:21 +0000 (+0200) Subject: drop queue-5.10/selftests-bpf-fix-vfs_link-kprobe-definition.patch X-Git-Tag: v5.10.121~5 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7dd2ebf990a7f5008031a964ec8f59d75228a26f;p=thirdparty%2Fkernel%2Fstable-queue.git drop queue-5.10/selftests-bpf-fix-vfs_link-kprobe-definition.patch --- diff --git a/queue-5.10/selftests-bpf-fix-vfs_link-kprobe-definition.patch b/queue-5.10/selftests-bpf-fix-vfs_link-kprobe-definition.patch deleted file mode 100644 index 429b9efe30a..00000000000 --- a/queue-5.10/selftests-bpf-fix-vfs_link-kprobe-definition.patch +++ /dev/null @@ -1,43 +0,0 @@ -From f0421509a4290e0814316285aad743fd00379929 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 31 Mar 2022 17:09:49 +0300 -Subject: selftests/bpf: Fix vfs_link kprobe definition - -From: Nikolay Borisov - -[ Upstream commit e299bcd4d16ff86f46c48df1062c8aae0eca1ed8 ] - -Since commit 6521f8917082 ("namei: prepare for idmapped mounts") -vfs_link's prototype was changed, the kprobe definition in -profiler selftest in turn wasn't updated. The result is that all -argument after the first are now stored in different registers. This -means that self-test has been broken ever since. Fix it by updating the -kprobe definition accordingly. - -Signed-off-by: Nikolay Borisov -Signed-off-by: Andrii Nakryiko -Link: https://lore.kernel.org/bpf/20220331140949.1410056-1-nborisov@suse.com -Signed-off-by: Sasha Levin ---- - tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/tools/testing/selftests/bpf/progs/profiler.inc.h b/tools/testing/selftests/bpf/progs/profiler.inc.h -index 4896fdf816f7..92331053dba3 100644 ---- a/tools/testing/selftests/bpf/progs/profiler.inc.h -+++ b/tools/testing/selftests/bpf/progs/profiler.inc.h -@@ -826,8 +826,9 @@ int kprobe_ret__do_filp_open(struct pt_regs* ctx) - - SEC("kprobe/vfs_link") - int BPF_KPROBE(kprobe__vfs_link, -- struct dentry* old_dentry, struct inode* dir, -- struct dentry* new_dentry, struct inode** delegated_inode) -+ struct dentry* old_dentry, struct user_namespace *mnt_userns, -+ struct inode* dir, struct dentry* new_dentry, -+ struct inode** delegated_inode) - { - struct bpf_func_stats_ctx stats_ctx; - bpf_stats_enter(&stats_ctx, profiler_bpf_vfs_link); --- -2.35.1 -