From: KP Singh <kpsingh@chromium.org>
To: linux-kernel@vger.kernel.org, bpf@vger.kernel.org
Cc: Song Liu <songliubraving@fb.com>,
Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>,
Martin KaFai Lau <kafai@fb.com>, Paul Turner <pjt@google.com>,
Jann Horn <jannh@google.com>, Hao Luo <haoluo@google.com>
Subject: [PATCH bpf-next v6 7/9] bpf: Update selftests for local_storage to use vmlinux.h
Date: Fri, 6 Nov 2020 10:37:45 +0000 [thread overview]
Message-ID: <20201106103747.2780972-8-kpsingh@chromium.org> (raw)
In-Reply-To: <20201106103747.2780972-1-kpsingh@chromium.org>
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
Acked-by: Song Liu <songliubraving@fb.com>
Signed-off-by: KP Singh <kpsingh@google.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
next prev parent reply other threads:[~2020-11-06 10:38 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-06 10:37 [PATCH bpf-next v6 0/9] Implement task_local_storage KP Singh
2020-11-06 10:37 ` [PATCH bpf-next v6 1/9] bpf: Allow LSM programs to use bpf spin locks KP Singh
2020-11-06 16:30 ` patchwork-bot+netdevbpf
2020-11-06 10:37 ` [PATCH bpf-next v6 2/9] bpf: Implement task local storage KP Singh
2020-11-06 10:37 ` [PATCH bpf-next v6 3/9] libbpf: Add support for " KP Singh
2020-11-06 10:37 ` [PATCH bpf-next v6 4/9] bpftool: " KP Singh
2020-11-06 10:37 ` [PATCH bpf-next v6 5/9] bpf: Implement get_current_task_btf and RET_PTR_TO_BTF_ID KP Singh
2020-11-06 10:37 ` [PATCH bpf-next v6 6/9] bpf: Fix tests for local_storage KP Singh
2020-11-06 10:37 ` KP Singh [this message]
2020-11-06 10:37 ` [PATCH bpf-next v6 8/9] bpf: Add tests for task_local_storage KP Singh
2020-11-06 10:37 ` [PATCH bpf-next v6 9/9] bpf: Exercise syscall operations for inode and sk storage KP Singh
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201106103747.2780972-8-kpsingh@chromium.org \
--to=kpsingh@chromium.org \
--cc=ast@kernel.org \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=haoluo@google.com \
--cc=jannh@google.com \
--cc=kafai@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=pjt@google.com \
--cc=songliubraving@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).