From: shaozhengchao <shaozhengchao@huawei•com>
To: "bpf@vger•kernel.org" <bpf@vger•kernel.org>,
"netdev@vger•kernel.org" <netdev@vger•kernel.org>,
"linux-kernel@vger•kernel.org" <linux-kernel@vger•kernel.org>,
"ast@kernel•org" <ast@kernel•org>,
"daniel@iogearbox•net" <daniel@iogearbox•net>,
"davem@davemloft•net" <davem@davemloft•net>,
"kuba@kernel•org" <kuba@kernel•org>,
"hawk@kernel•org" <hawk@kernel•org>,
"john.fastabend@gmail•com" <john.fastabend@gmail•com>,
"andrii@kernel•org" <andrii@kernel•org>,
"kafai@fb•com" <kafai@fb•com>,
"songliubraving@fb•com" <songliubraving@fb•com>,
"yhs@fb•com" <yhs@fb•com>,
"kpsingh@kernel•org" <kpsingh@kernel•org>,
"Toke Høiland-Jørgensen" <toke@kernel•org>
Cc: "weiyongjun (A)" <weiyongjun1@huawei•com>,
yuehaibing <yuehaibing@huawei•com>
Subject: 答复: [PATCH v3,bpf-next] samples/bpf: check detach prog exist or not in xdp_fwd
Date: Wed, 25 May 2022 03:27:33 +0000 [thread overview]
Message-ID: <eb8ee7fe2ffc477299eb2eceb622ca29@huawei.com> (raw)
In-Reply-To: <20220521043509.389007-1-shaozhengchao@huawei.com>
-----邮件原件-----
发件人: shaozhengchao
发送时间: 2022年5月21日 12:35
收件人: bpf@vger•kernel.org; netdev@vger•kernel.org; linux-kernel@vger•kernel.org; ast@kernel•org; daniel@iogearbox•net; davem@davemloft•net; kuba@kernel•org; hawk@kernel•org; john.fastabend@gmail•com; andrii@kernel•org; kafai@fb•com; songliubraving@fb•com; yhs@fb•com; kpsingh@kernel•org
抄送: weiyongjun (A) <weiyongjun1@huawei•com>; shaozhengchao <shaozhengchao@huawei•com>; yuehaibing <yuehaibing@huawei•com>
主题: [PATCH v3,bpf-next] samples/bpf: check detach prog exist or not in xdp_fwd
Before detach the prog, we should check detach prog exist or not.
Signed-off-by: Zhengchao Shao <shaozhengchao@huawei•com>
---
samples/bpf/xdp_fwd_user.c | 59 ++++++++++++++++++++++++++++++++------
1 file changed, 50 insertions(+), 9 deletions(-)
diff --git a/samples/bpf/xdp_fwd_user.c b/samples/bpf/xdp_fwd_user.c index 1828487bae9a..03a50f64e99a 100644
--- a/samples/bpf/xdp_fwd_user.c
+++ b/samples/bpf/xdp_fwd_user.c
@@ -47,17 +47,58 @@ static int do_attach(int idx, int prog_fd, int map_fd, const char *name)
return err;
}
-static int do_detach(int idx, const char *name)
+static int do_detach(int ifindex, const char *ifname, const char
+*app_name)
{
- int err;
+ LIBBPF_OPTS(bpf_xdp_attach_opts, opts);
+ struct bpf_prog_info prog_info = {};
+ char prog_name[BPF_OBJ_NAME_LEN];
+ __u32 info_len, curr_prog_id;
+ int prog_fd;
+ int err = 1;
+
+ if (bpf_xdp_query_id(ifindex, xdp_flags, &curr_prog_id)) {
+ printf("ERROR: bpf_xdp_query_id failed (%s)\n",
+ strerror(errno));
+ return err;
+ }
+
+ if (!curr_prog_id) {
+ printf("ERROR: flags(0x%x) xdp prog is not attached to %s\n",
+ xdp_flags, ifname);
+ return err;
+ }
- err = bpf_xdp_detach(idx, xdp_flags, NULL);
- if (err < 0)
- printf("ERROR: failed to detach program from %s\n", name);
+ info_len = sizeof(prog_info);
+ prog_fd = bpf_prog_get_fd_by_id(curr_prog_id);
+ if (prog_fd < 0) {
+ printf("ERROR: bpf_prog_get_fd_by_id failed (%s)\n",
+ strerror(errno));
+ return err;
+ }
+
+ err = bpf_obj_get_info_by_fd(prog_fd, &prog_info, &info_len);
+ if (err) {
+ printf("ERROR: bpf_obj_get_info_by_fd failed (%s)\n",
+ strerror(errno));
+ return err;
+ }
+ snprintf(prog_name, sizeof(prog_name), "%s_prog", app_name);
+ prog_name[BPF_OBJ_NAME_LEN - 1] = '\0';
+
+ if (strcmp(prog_info.name, prog_name)) {
+ printf("ERROR: %s isn't attached to %s\n", app_name, ifname);
+ err = 1;
+ } else {
+ opts.old_prog_fd = prog_fd;
+ err = bpf_xdp_detach(ifindex, xdp_flags, &opts);
+ if (err < 0)
+ printf("ERROR: failed to detach program from %s (%s)\n",
+ ifname, strerror(errno));
+ /* TODO: Remember to cleanup map, when adding use of shared map
+ * bpf_map_delete_elem((map_fd, &idx);
+ */
+ }
- /* TODO: Remember to cleanup map, when adding use of shared map
- * bpf_map_delete_elem((map_fd, &idx);
- */
return err;
}
@@ -169,7 +210,7 @@ int main(int argc, char **argv)
return 1;
}
if (!attach) {
- err = do_detach(idx, argv[i]);
+ err = do_detach(idx, argv[i], prog_name);
if (err)
ret = err;
} else {
--
2.17.1
Hi Toke,
Do you have any more feedback? Does it look better to you now?
next prev parent reply other threads:[~2022-05-25 3:27 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-05-21 4:35 [PATCH v3,bpf-next] samples/bpf: check detach prog exist or not in xdp_fwd Zhengchao Shao
2022-05-25 3:27 ` shaozhengchao [this message]
2022-05-25 11:16 ` 答复: " Toke Høiland-Jørgensen
2022-05-25 11:15 ` Toke Høiland-Jørgensen
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=eb8ee7fe2ffc477299eb2eceb622ca29@huawei.com \
--to=shaozhengchao@huawei$(echo .)com \
--cc=andrii@kernel$(echo .)org \
--cc=ast@kernel$(echo .)org \
--cc=bpf@vger$(echo .)kernel.org \
--cc=daniel@iogearbox$(echo .)net \
--cc=davem@davemloft$(echo .)net \
--cc=hawk@kernel$(echo .)org \
--cc=john.fastabend@gmail$(echo .)com \
--cc=kafai@fb$(echo .)com \
--cc=kpsingh@kernel$(echo .)org \
--cc=kuba@kernel$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=songliubraving@fb$(echo .)com \
--cc=toke@kernel$(echo .)org \
--cc=weiyongjun1@huawei$(echo .)com \
--cc=yhs@fb$(echo .)com \
--cc=yuehaibing@huawei$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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