From patchwork Wed Nov 7 22:43:55 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 10673199 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 86FF113A4 for ; Wed, 7 Nov 2018 22:44:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A1D12D353 for ; Wed, 7 Nov 2018 22:44:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6D82B2D3FA; Wed, 7 Nov 2018 22:44:11 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C76A2BE12 for ; Wed, 7 Nov 2018 22:44:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727525AbeKHIQj (ORCPT ); Thu, 8 Nov 2018 03:16:39 -0500 Received: from mail-qk1-f201.google.com ([209.85.222.201]:48040 "EHLO mail-qk1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726896AbeKHIQj (ORCPT ); Thu, 8 Nov 2018 03:16:39 -0500 Received: by mail-qk1-f201.google.com with SMTP id f81-v6so34063420qkb.14 for ; Wed, 07 Nov 2018 14:44:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=ITaH908544W3r0Lffx6rTGx68a49RgNIMs0BR9o+fME=; b=fcFkjL4hFUI+iNHSp5fM8ZeOXJvyrEKIYTKu0ut3yk5Q7B1RRSSDFrKLSwFT5h/klG rz6ZRGFsaTPQd+f9Zgw7jz6XDRK17qVaQVJ2iy2qt8mO9iPABtsFimHhRWIilZ24ntkh ZBu186PNaDoxDxf+ge6C+guB9eJmi2MBro7wm57pjbzLRVmY+4S1GBbZ8y2Fa3xiYXV8 WmCMl+OkcJ60WmXWJmMxDbnzkLm0ce5OsonYc4+Zd18tViy41VcU3TAVnWnv8QaW8BKH IeuIcg+p6q7ewVVg5EEMbU0uD5P2N+36zyKNN+rqyN2mS83HRjaweloI+wp1M2LeYeo9 PYLw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=ITaH908544W3r0Lffx6rTGx68a49RgNIMs0BR9o+fME=; b=FVQQA37fFcbn9L6LlERg73x/oU/z7QIlwGI40DaWD3J6gLdDJf0U9SkFokheBqT2qP kEsfJPJN2L7iRuwoXVyBZDeNTtIKFml9/LwITwjwJY7dVumk4yLqz6FBw7W6ouaCf1RD Xxe4Q/sZP+YRXj/izDABNVVKNiOhDZ6aVharzPFfO1U+/DHgm2ndsI1G9cJD2j3qXvoC xSanxYOAZ5+tLr+ut68MayOE6hVmbzJI1FxhkEC++r68eO46AeVgDYrmqrcYB+SSz44T RqPKKnUkTw3/RZ9wcPc56xZ2dUW20FjkC5LQ0PrLv4IDAV5j0Sel4FoUz2/XAfgfUhrY 4Abw== X-Gm-Message-State: AGRZ1gK7gWOmeZ7f0tP0sVBei0pXevpbARHHtn1rcj++IAWqHA2S9rlf Gblqo/aAvwXUUI4YbcThT9muPEI= X-Google-Smtp-Source: AJdET5cNPJMRNbbViifIchMoL3ETzZP0pvJDEumxT27Sfjv8b/X497dNQymCCn7ihTf/ugN7GPiy8js= X-Received: by 2002:ac8:2aa5:: with SMTP id b34mr1460681qta.36.1541630648791; Wed, 07 Nov 2018 14:44:08 -0800 (PST) Date: Wed, 7 Nov 2018 14:43:55 -0800 In-Reply-To: <20181107224356.73080-1-sdf@google.com> Message-Id: <20181107224356.73080-3-sdf@google.com> Mime-Version: 1.0 References: <20181107224356.73080-1-sdf@google.com> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog Subject: [PATCH bpf-next 2/3] libbpf: cleanup after partial failure in bpf_object__pin From: Stanislav Fomichev 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 Sender: linux-kselftest-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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 --- 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)