From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F0107C5DF60 for ; Thu, 7 Nov 2019 16:52:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D0C802077C for ; Thu, 7 Nov 2019 16:52:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389404AbfKGQwY (ORCPT ); Thu, 7 Nov 2019 11:52:24 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50932 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729692AbfKGQwW (ORCPT ); Thu, 7 Nov 2019 11:52:22 -0500 Received: from mail-lj1-f198.google.com (mail-lj1-f198.google.com [209.85.208.198]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id F15715945B for ; Thu, 7 Nov 2019 16:52:21 +0000 (UTC) Received: by mail-lj1-f198.google.com with SMTP id l12so622317lji.10 for ; Thu, 07 Nov 2019 08:52:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:cc:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=BDBuQGGuryZdFC2mytmeTsDW60yIijvjdJ6tk9Q7yvk=; b=gFwBqa3lqRykMPOlyzuNB26ebmgciN62ueOEM9EjSYGCLj7gTWsi9yE0xIneL4AfaM c+DZJvQzCE4Nt9u/QnAnqBMZvySG45l63EJ1uCpmIkCvzlkTkDQtsRKZa3M0e/nyjQ5v N3/lNRBKAC4hznph0NC+N2o2Mx1G3jN08c0XDHk1Z86wQk+PLgYgxo/fXrRqY2jAlPVA wKh7Hv/S+8lbWJxUGAxOu48UC/UsjEomylilS1NbKEZxkugYfmeHBVQj+WW/GMmoxst/ GUv3PgkMAfrYpg7oXxq7TJZ3DBAwYUJ/i89cRkW8l4EcP3XWM5tOUAoFeW+5x8eWJyvj dGuA== X-Gm-Message-State: APjAAAWH3Zrd1LfTaz5/dZ27WF3FWQEoE1jPh3fB2BM5GZ3YBcjcl6DC i9EaKeC+IAuldME4Mt8wrYnDk+O9IF2N4HjtA6z1Q9tqs6xDmC8RTKTyhpqFuxbIo92/5gbwJxH 6ch5VXF4xTIDz3e6X X-Received: by 2002:ac2:4357:: with SMTP id o23mr3114244lfl.51.1573145540512; Thu, 07 Nov 2019 08:52:20 -0800 (PST) X-Google-Smtp-Source: APXvYqyztUwKn0ZDDZvELT03Vq3JsK1NYnSFM8mYV+q5H4jaBst6pLfxQpAN2R7xa9dkCing0MwB8w== X-Received: by 2002:ac2:4357:: with SMTP id o23mr3114231lfl.51.1573145540322; Thu, 07 Nov 2019 08:52:20 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id m26sm1373508lfc.7.2019.11.07.08.52.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Nov 2019 08:52:19 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id 42C881818B6; Thu, 7 Nov 2019 17:52:19 +0100 (CET) Subject: [PATCH bpf-next 1/6] libbpf: Unpin auto-pinned maps if loading fails From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= To: Daniel Borkmann Cc: Alexei Starovoitov , Martin KaFai Lau , Song Liu , Yonghong Song , Jesper Dangaard Brouer , Andrii Nakryiko , David Miller , netdev@vger.kernel.org, bpf@vger.kernel.org Date: Thu, 07 Nov 2019 17:52:19 +0100 Message-ID: <157314553913.693412.16341111239421040141.stgit@toke.dk> In-Reply-To: <157314553801.693412.15522462897300280861.stgit@toke.dk> References: <157314553801.693412.15522462897300280861.stgit@toke.dk> User-Agent: StGit/0.20 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Toke Høiland-Jørgensen Since the automatic map-pinning happens during load, it will leave pinned maps around if the load fails at a later stage. Fix this by unpinning any pinned maps on cleanup. To avoid unpinning pinned maps that were reused rather than newly pinned, add a new boolean property on struct bpf_map to keep track of whether that map was reused or not; and only unpin those maps that were not reused. Fixes: 57a00f41644f ("libbpf: Add auto-pinning of maps when loading BPF objects") Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index be4af95d5a2c..cea61b2ec9d3 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -229,6 +229,7 @@ struct bpf_map { enum libbpf_map_type libbpf_type; char *pin_path; bool pinned; + bool was_reused; }; struct bpf_secdata { @@ -1995,6 +1996,7 @@ int bpf_map__reuse_fd(struct bpf_map *map, int fd) map->def.map_flags = info.map_flags; map->btf_key_type_id = info.btf_key_type_id; map->btf_value_type_id = info.btf_value_type_id; + map->was_reused = true; return 0; @@ -4007,15 +4009,18 @@ bpf_object__open_buffer(const void *obj_buf, size_t obj_buf_sz, return bpf_object__open_mem(obj_buf, obj_buf_sz, &opts); } -int bpf_object__unload(struct bpf_object *obj) +static int __bpf_object__unload(struct bpf_object *obj, bool unpin) { size_t i; if (!obj) return -EINVAL; - for (i = 0; i < obj->nr_maps; i++) + for (i = 0; i < obj->nr_maps; i++) { zclose(obj->maps[i].fd); + if (unpin && obj->maps[i].pinned && !obj->maps[i].was_reused) + bpf_map__unpin(&obj->maps[i], NULL); + } for (i = 0; i < obj->nr_programs; i++) bpf_program__unload(&obj->programs[i]); @@ -4023,6 +4028,11 @@ int bpf_object__unload(struct bpf_object *obj) return 0; } +int bpf_object__unload(struct bpf_object *obj) +{ + return __bpf_object__unload(obj, false); +} + int bpf_object__load_xattr(struct bpf_object_load_attr *attr) { struct bpf_object *obj; @@ -4047,7 +4057,7 @@ int bpf_object__load_xattr(struct bpf_object_load_attr *attr) return 0; out: - bpf_object__unload(obj); + __bpf_object__unload(obj, true); pr_warn("failed to load object '%s'\n", obj->path); return err; }