From: Stanislav Fomichev <sdf@google•com>
To: netdev@vger•kernel.org, linux-kselftest@vger•kernel.org,
ast@kernel•org, daniel@iogearbox•net, shuah@kernel•org,
jakub.kicinski@netronome•com, quentin.monnet@netronome•com
Cc: guro@fb•com, jiong.wang@netronome•com, sdf@google•com,
bhole_prashant_q7@lab•ntt.co.jp, john.fastabend@gmail•com,
jbenc@redhat•com, treeze.taeung@gmail•com, yhs@fb•com,
osk@fb•com, sandipan@linux•vnet.ibm.com
Subject: [PATCH bpf-next 2/3] libbpf: cleanup after partial failure in bpf_object__pin
Date: Wed, 7 Nov 2018 14:43:55 -0800 [thread overview]
Message-ID: <20181107224356.73080-3-sdf@google.com> (raw)
In-Reply-To: <20181107224356.73080-1-sdf@google.com>
bpftool will use bpf_object__pin in the next commit to pin all programs
and maps from the file; in case of a partial failure, we need to get
back to the clean state (undo previous program/map pins).
Signed-off-by: Stanislav Fomichev <sdf@google•com>
---
tools/lib/bpf/libbpf.c | 58 ++++++++++++++++++++++++++++++++++--------
1 file changed, 48 insertions(+), 10 deletions(-)
diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c
index d6e62e90e8d4..309abe7196f3 100644
--- a/tools/lib/bpf/libbpf.c
+++ b/tools/lib/bpf/libbpf.c
@@ -1803,14 +1803,17 @@ int bpf_object__pin(struct bpf_object *obj, const char *path)
len = snprintf(buf, PATH_MAX, "%s/%s", path,
bpf_map__name(map));
- if (len < 0)
- return -EINVAL;
- else if (len >= PATH_MAX)
- return -ENAMETOOLONG;
+ if (len < 0) {
+ err = -EINVAL;
+ goto err_unpin_maps;
+ } else if (len >= PATH_MAX) {
+ err = -ENAMETOOLONG;
+ goto err_unpin_maps;
+ }
err = bpf_map__pin(map, buf);
if (err)
- return err;
+ goto err_unpin_maps;
}
bpf_object__for_each_program(prog, obj) {
@@ -1819,17 +1822,52 @@ int bpf_object__pin(struct bpf_object *obj, const char *path)
len = snprintf(buf, PATH_MAX, "%s/%s", path,
prog->section_name);
- if (len < 0)
- return -EINVAL;
- else if (len >= PATH_MAX)
- return -ENAMETOOLONG;
+ if (len < 0) {
+ err = -EINVAL;
+ goto err_unpin_programs;
+ } else if (len >= PATH_MAX) {
+ err = -ENAMETOOLONG;
+ goto err_unpin_programs;
+ }
err = bpf_program__pin(prog, buf);
if (err)
- return err;
+ goto err_unpin_programs;
}
return 0;
+
+err_unpin_programs:
+ bpf_object__for_each_program(prog, obj) {
+ char buf[PATH_MAX];
+ int len;
+
+ len = snprintf(buf, PATH_MAX, "%s/%s", path,
+ prog->section_name);
+ if (len < 0)
+ continue;
+ else if (len >= PATH_MAX)
+ continue;
+
+ unlink(buf);
+ }
+
+err_unpin_maps:
+ bpf_map__for_each(map, obj) {
+ char buf[PATH_MAX];
+ int len;
+
+ len = snprintf(buf, PATH_MAX, "%s/%s", path,
+ bpf_map__name(map));
+ if (len < 0)
+ continue;
+ else if (len >= PATH_MAX)
+ continue;
+
+ unlink(buf);
+ }
+
+ return err;
}
void bpf_object__close(struct bpf_object *obj)
--
2.19.1.930.g4563a0d9d0-goog
next prev parent reply other threads:[~2018-11-08 8:16 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-07 22:43 [PATCH v2 bpf-next 0/3] bpftool: support loading flow dissector Stanislav Fomichev
2018-11-07 22:43 ` [PATCH bpf-next 1/3] selftests/bpf: rename flow dissector section to flow_dissector Stanislav Fomichev
2018-11-07 22:43 ` Stanislav Fomichev [this message]
2018-11-07 22:56 ` [PATCH bpf-next 2/3] libbpf: cleanup after partial failure in bpf_object__pin Jakub Kicinski
2018-11-07 23:00 ` Stanislav Fomichev
2018-11-07 23:06 ` Jakub Kicinski
2018-11-07 23:25 ` Stanislav Fomichev
2018-11-07 23:38 ` Jakub Kicinski
2018-11-07 22:43 ` [PATCH bpf-next 3/3] bpftool: support loading flow dissector Stanislav Fomichev
2018-11-07 23:09 ` Jakub Kicinski
2018-11-07 23:13 ` Stanislav Fomichev
2018-11-07 23:29 ` Jakub Kicinski
2018-11-07 23:34 ` Stanislav Fomichev
2018-11-07 23:41 ` Jakub Kicinski
2018-11-08 0:40 ` Stanislav Fomichev
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=20181107224356.73080-3-sdf@google.com \
--to=sdf@google$(echo .)com \
--cc=ast@kernel$(echo .)org \
--cc=bhole_prashant_q7@lab$(echo .)ntt.co.jp \
--cc=daniel@iogearbox$(echo .)net \
--cc=guro@fb$(echo .)com \
--cc=jakub.kicinski@netronome$(echo .)com \
--cc=jbenc@redhat$(echo .)com \
--cc=jiong.wang@netronome$(echo .)com \
--cc=john.fastabend@gmail$(echo .)com \
--cc=linux-kselftest@vger$(echo .)kernel.org \
--cc=netdev@vger$(echo .)kernel.org \
--cc=osk@fb$(echo .)com \
--cc=quentin.monnet@netronome$(echo .)com \
--cc=sandipan@linux$(echo .)vnet.ibm.com \
--cc=shuah@kernel$(echo .)org \
--cc=treeze.taeung@gmail$(echo .)com \
--cc=yhs@fb$(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