From: Yonghong Song <yhs@fb.com>
To: Andrii Nakryiko <andriin@fb.com>, <bpf@vger.kernel.org>,
Martin KaFai Lau <kafai@fb.com>, <netdev@vger.kernel.org>
Cc: Alexei Starovoitov <ast@fb.com>,
Daniel Borkmann <daniel@iogearbox.net>, <kernel-team@fb.com>
Subject: [PATCH bpf-next v2 04/20] bpf: support bpf tracing/iter programs for BPF_LINK_UPDATE
Date: Sun, 3 May 2020 23:25:51 -0700 [thread overview]
Message-ID: <20200504062551.2047712-1-yhs@fb.com> (raw)
In-Reply-To: <20200504062547.2047304-1-yhs@fb.com>
Added BPF_LINK_UPDATE support for tracing/iter programs.
This way, a file based bpf iterator, which holds a reference
to the link, can have its bpf program updated without
creating new files.
Signed-off-by: Yonghong Song <yhs@fb.com>
---
kernel/bpf/bpf_iter.c | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/kernel/bpf/bpf_iter.c b/kernel/bpf/bpf_iter.c
index cc0e205fb8c5..05ae04ac1eca 100644
--- a/kernel/bpf/bpf_iter.c
+++ b/kernel/bpf/bpf_iter.c
@@ -23,6 +23,9 @@ struct bpf_iter_link {
static struct list_head targets = LIST_HEAD_INIT(targets);
static DEFINE_MUTEX(targets_mutex);
+/* protect bpf_iter_link changes */
+static DEFINE_MUTEX(link_mutex);
+
int bpf_iter_reg_target(struct bpf_iter_reg *reg_info)
{
struct bpf_iter_target_info *tinfo;
@@ -86,9 +89,37 @@ static void bpf_iter_link_dealloc(struct bpf_link *link)
kfree(iter_link);
}
+static int bpf_iter_link_replace(struct bpf_link *link,
+ struct bpf_prog *new_prog,
+ struct bpf_prog *old_prog)
+{
+ int ret = 0;
+
+ mutex_lock(&link_mutex);
+ if (old_prog && link->prog != old_prog) {
+ ret = -EPERM;
+ goto out_unlock;
+ }
+
+ if (link->prog->type != new_prog->type ||
+ link->prog->expected_attach_type != new_prog->expected_attach_type ||
+ link->prog->aux->attach_btf_id != new_prog->aux->attach_btf_id) {
+ ret = -EINVAL;
+ goto out_unlock;
+ }
+
+ old_prog = xchg(&link->prog, new_prog);
+ bpf_prog_put(old_prog);
+
+out_unlock:
+ mutex_unlock(&link_mutex);
+ return ret;
+}
+
static const struct bpf_link_ops bpf_iter_link_lops = {
.release = bpf_iter_link_release,
.dealloc = bpf_iter_link_dealloc,
+ .update_prog = bpf_iter_link_replace,
};
int bpf_iter_link_attach(const union bpf_attr *attr, struct bpf_prog *prog)
--
2.24.1
next prev parent reply other threads:[~2020-05-04 6:25 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-04 6:25 [PATCH bpf-next v2 00/20] bpf: implement bpf iterator for kernel data Yonghong Song
2020-05-04 6:25 ` [PATCH bpf-next v2 01/20] bpf: implement an interface to register bpf_iter targets Yonghong Song
2020-05-05 21:19 ` Andrii Nakryiko
2020-05-04 6:25 ` [PATCH bpf-next v2 02/20] bpf: allow loading of a bpf_iter program Yonghong Song
2020-05-05 21:29 ` Andrii Nakryiko
2020-05-06 0:07 ` Yonghong Song
2020-05-04 6:25 ` [PATCH bpf-next v2 03/20] bpf: support bpf tracing/iter programs for BPF_LINK_CREATE Yonghong Song
2020-05-05 21:30 ` Andrii Nakryiko
2020-05-06 0:14 ` Yonghong Song
2020-05-06 0:54 ` Alexei Starovoitov
2020-05-06 3:09 ` Andrii Nakryiko
2020-05-06 18:08 ` Alexei Starovoitov
2020-05-04 6:25 ` Yonghong Song [this message]
2020-05-05 21:32 ` [PATCH bpf-next v2 04/20] bpf: support bpf tracing/iter programs for BPF_LINK_UPDATE Andrii Nakryiko
2020-05-04 6:25 ` [PATCH bpf-next v2 05/20] bpf: implement bpf_seq_read() for bpf iterator Yonghong Song
2020-05-05 19:56 ` Andrii Nakryiko
2020-05-05 19:57 ` Alexei Starovoitov
2020-05-05 20:25 ` Yonghong Song
2020-05-05 21:08 ` Andrii Nakryiko
2020-05-04 6:25 ` [PATCH bpf-next v2 06/20] bpf: create anonymous " Yonghong Song
2020-05-05 20:11 ` Andrii Nakryiko
2020-05-05 20:28 ` Yonghong Song
2020-05-04 6:25 ` [PATCH bpf-next v2 07/20] bpf: create file " Yonghong Song
2020-05-05 20:15 ` Andrii Nakryiko
2020-05-04 6:25 ` [PATCH bpf-next v2 08/20] bpf: implement common macros/helpers for target iterators Yonghong Song
2020-05-05 20:25 ` Andrii Nakryiko
2020-05-05 20:30 ` Yonghong Song
2020-05-05 21:10 ` Andrii Nakryiko
2020-05-04 6:25 ` [PATCH bpf-next v2 09/20] bpf: add bpf_map iterator Yonghong Song
2020-05-06 5:11 ` Andrii Nakryiko
2020-05-04 6:25 ` [PATCH bpf-next v2 10/20] net: bpf: add netlink and ipv6_route bpf_iter targets Yonghong Song
2020-05-06 5:21 ` Andrii Nakryiko
2020-05-06 17:32 ` Yonghong Song
2020-05-04 6:25 ` [PATCH bpf-next v2 11/20] bpf: add task and task/file iterator targets Yonghong Song
2020-05-06 7:30 ` Andrii Nakryiko
2020-05-06 18:24 ` Yonghong Song
2020-05-06 20:51 ` Andrii Nakryiko
2020-05-06 21:20 ` Yonghong Song
2020-05-04 6:26 ` [PATCH bpf-next v2 12/20] bpf: add PTR_TO_BTF_ID_OR_NULL support Yonghong Song
2020-05-05 20:27 ` Andrii Nakryiko
2020-05-04 6:26 ` [PATCH bpf-next v2 13/20] bpf: add bpf_seq_printf and bpf_seq_write helpers Yonghong Song
2020-05-06 17:37 ` Andrii Nakryiko
2020-05-06 21:42 ` Yonghong Song
2020-05-08 18:15 ` Andrii Nakryiko
2020-05-04 6:26 ` [PATCH bpf-next v2 14/20] bpf: handle spilled PTR_TO_BTF_ID properly when checking stack_boundary Yonghong Song
2020-05-06 17:38 ` Andrii Nakryiko
2020-05-06 21:47 ` Yonghong Song
2020-05-04 6:26 ` [PATCH bpf-next v2 15/20] bpf: support variable length array in tracing programs Yonghong Song
2020-05-06 17:40 ` Andrii Nakryiko
2020-05-04 6:26 ` [PATCH bpf-next v2 16/20] tools/libbpf: add bpf_iter support Yonghong Song
2020-05-06 5:44 ` Andrii Nakryiko
2020-05-04 6:26 ` [PATCH bpf-next v2 17/20] tools/bpftool: add bpf_iter support for bptool Yonghong Song
2020-05-04 6:26 ` [PATCH bpf-next v2 18/20] tools/bpf: selftests: add iterator programs for ipv6_route and netlink Yonghong Song
2020-05-06 6:01 ` Andrii Nakryiko
2020-05-07 1:09 ` Yonghong Song
2020-05-08 18:17 ` Andrii Nakryiko
2020-05-06 6:04 ` Andrii Nakryiko
2020-05-06 23:07 ` Yonghong Song
2020-05-04 6:26 ` [PATCH bpf-next v2 19/20] tools/bpf: selftests: add iter progs for bpf_map/task/task_file Yonghong Song
2020-05-06 6:14 ` Andrii Nakryiko
2020-05-04 6:26 ` [PATCH bpf-next v2 20/20] tools/bpf: selftests: add bpf_iter selftests Yonghong Song
2020-05-06 6:39 ` Andrii Nakryiko
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=20200504062551.2047712-1-yhs@fb.com \
--to=yhs@fb.com \
--cc=andriin@fb.com \
--cc=ast@fb.com \
--cc=bpf@vger.kernel.org \
--cc=daniel@iogearbox.net \
--cc=kafai@fb.com \
--cc=kernel-team@fb.com \
--cc=netdev@vger.kernel.org \
/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).