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=ham 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 5D0B7C17441 for ; Sat, 9 Nov 2019 00:01:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 387F8206C3 for ; Sat, 9 Nov 2019 00:01:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726307AbfKIAA7 (ORCPT ); Fri, 8 Nov 2019 19:00:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43436 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727233AbfKIAA7 (ORCPT ); Fri, 8 Nov 2019 19:00:59 -0500 Received: from mail-lj1-f197.google.com (mail-lj1-f197.google.com [209.85.208.197]) (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 A5CE236830 for ; Sat, 9 Nov 2019 00:00:58 +0000 (UTC) Received: by mail-lj1-f197.google.com with SMTP id r13so1590457ljk.18 for ; Fri, 08 Nov 2019 16:00:58 -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=20AKLAE94/qKVgi0tHebMZo1VYkzyGlF9GnXfKUXVeg=; b=GckeidU2szymAmSkfC5YQRbyDF+YNTzet7DTCrULyXzds03b31UuhO677xgJCTNy62 KRNkmZIe8tPxpwV0GBahZUVdB50ZkroV02g5mjLxZt/WrXiBnEYtWADcsCgjTIOltXWX NFekeXBUUkH+OKvcsLV6Xe6ZxTPNqg3a4YOF/FNQ6RRaHFnnFKwCFDzq0llCvVqSukCn 4uDvthALayk5Lg/49Ag5Gom4vk8/n4jfAXFhQRGkAEeIqWnUh6TDLYjqot0xy6N0hLdZ FcnR0p8mIxictBOzvhg2tShgJmoIGVoLx23m3uVnnRwLq/Mc4Hqu5y8narKSoGbGJuvC f2Ag== X-Gm-Message-State: APjAAAV7s0xQthyzvtrSPFU87hFYC1t9ns2kPL1dHAhEs9jlh0xrBRai YbB96lFdDQ/cRYyD9SEhq6U7Rfm2AKUr1Xf95mFHAxfzvMPSoZpCQnc9xSNE/2VLbztwhiVROvc jgooo35El4zo/l/uJ X-Received: by 2002:a2e:9695:: with SMTP id q21mr5343106lji.206.1573257657183; Fri, 08 Nov 2019 16:00:57 -0800 (PST) X-Google-Smtp-Source: APXvYqzxNqebQ4/h7kuRCjbMEruO8XhbCQpmYwygPiHeJfrC+8cHtOivuhVctp5qfTWG65CPumGL1w== X-Received: by 2002:a2e:9695:: with SMTP id q21mr5343095lji.206.1573257657007; Fri, 08 Nov 2019 16:00:57 -0800 (PST) Received: from alrua-x1.borgediget.toke.dk ([2a00:7660:6da:443::2]) by smtp.gmail.com with ESMTPSA id t12sm3042374lfc.73.2019.11.08.16.00.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 08 Nov 2019 16:00:56 -0800 (PST) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id D5EE51800CE; Sat, 9 Nov 2019 01:00:55 +0100 (CET) Subject: [PATCH bpf-next v3 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: Sat, 09 Nov 2019 01:00:55 +0100 Message-ID: <157325765579.27401.11576433476621158813.stgit@toke.dk> In-Reply-To: <157325765467.27401.1930972466188738545.stgit@toke.dk> References: <157325765467.27401.1930972466188738545.stgit@toke.dk> User-Agent: StGit/0.21 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") Acked-by: David S. Miller Acked-by: Song Liu Signed-off-by: Toke Høiland-Jørgensen --- tools/lib/bpf/libbpf.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index be4af95d5a2c..a70ade546a73 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 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->reused = true; return 0; @@ -4026,7 +4028,7 @@ int bpf_object__unload(struct bpf_object *obj) int bpf_object__load_xattr(struct bpf_object_load_attr *attr) { struct bpf_object *obj; - int err; + int err, i; if (!attr) return -EINVAL; @@ -4047,6 +4049,11 @@ int bpf_object__load_xattr(struct bpf_object_load_attr *attr) return 0; out: + /* unpin any maps that were auto-pinned during load */ + for (i = 0; i < obj->nr_maps; i++) + if (obj->maps[i].pinned && !obj->maps[i].reused) + bpf_map__unpin(&obj->maps[i], NULL); + bpf_object__unload(obj); pr_warn("failed to load object '%s'\n", obj->path); return err;