| Message ID | 20201103153132.2717326-7-kpsingh@chromium.org (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | BPF |
| Headers | show |
| Series | Implement task_local_storage | expand |
> On Nov 3, 2020, at 7:31 AM, KP Singh <kpsingh@chromium.org> wrote: > > From: KP Singh <kpsingh@google.com> > > With the fixing of BTF pruning of embedded types being fixed, the test > can be simplified to use vmlinux.h > > Signed-off-by: KP Singh <kpsingh@google.com> Acked-by: Song Liu <songliubraving@fb.com> > --- > .../selftests/bpf/progs/local_storage.c | 20 +------------------ > 1 file changed, 1 insertion(+), 19 deletions(-) > > diff --git a/tools/testing/selftests/bpf/progs/local_storage.c b/tools/testing/selftests/bpf/progs/local_storage.c > index 09529e33be98..ef3822bc7542 100644 > --- a/tools/testing/selftests/bpf/progs/local_storage.c > +++ b/tools/testing/selftests/bpf/progs/local_storage.c > @@ -4,9 +4,8 @@ > * Copyright 2020 Google LLC. > */ > > +#include "vmlinux.h" > #include <errno.h> > -#include <linux/bpf.h> > -#include <stdbool.h> > #include <bpf/bpf_helpers.h> > #include <bpf/bpf_tracing.h> > > @@ -36,23 +35,6 @@ struct { > __type(value, struct dummy_storage); > } sk_storage_map SEC(".maps"); > > -/* TODO Use vmlinux.h once BTF pruning for embedded types is fixed. > - */ > -struct sock {} __attribute__((preserve_access_index)); > -struct sockaddr {} __attribute__((preserve_access_index)); > -struct socket { > - struct sock *sk; > -} __attribute__((preserve_access_index)); > - > -struct inode {} __attribute__((preserve_access_index)); > -struct dentry { > - struct inode *d_inode; > -} __attribute__((preserve_access_index)); > -struct file { > - struct inode *f_inode; > -} __attribute__((preserve_access_index)); > - > - > SEC("lsm/inode_unlink") > int BPF_PROG(unlink_hook, struct inode *dir, struct dentry *victim) > { > -- > 2.29.1.341.ge80a0c044ae-goog >
diff --git a/tools/testing/selftests/bpf/progs/local_storage.c b/tools/testing/selftests/bpf/progs/local_storage.c index 09529e33be98..ef3822bc7542 100644 --- a/tools/testing/selftests/bpf/progs/local_storage.c +++ b/tools/testing/selftests/bpf/progs/local_storage.c @@ -4,9 +4,8 @@ * Copyright 2020 Google LLC. */ +#include "vmlinux.h" #include <errno.h> -#include <linux/bpf.h> -#include <stdbool.h> #include <bpf/bpf_helpers.h> #include <bpf/bpf_tracing.h> @@ -36,23 +35,6 @@ struct { __type(value, struct dummy_storage); } sk_storage_map SEC(".maps"); -/* TODO Use vmlinux.h once BTF pruning for embedded types is fixed. - */ -struct sock {} __attribute__((preserve_access_index)); -struct sockaddr {} __attribute__((preserve_access_index)); -struct socket { - struct sock *sk; -} __attribute__((preserve_access_index)); - -struct inode {} __attribute__((preserve_access_index)); -struct dentry { - struct inode *d_inode; -} __attribute__((preserve_access_index)); -struct file { - struct inode *f_inode; -} __attribute__((preserve_access_index)); - - SEC("lsm/inode_unlink") int BPF_PROG(unlink_hook, struct inode *dir, struct dentry *victim) {