From patchwork Fri Nov 9 00:22:09 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 10675179 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 337A91057 for ; Fri, 9 Nov 2018 00:22:37 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 249CE2E8FF for ; Fri, 9 Nov 2018 00:22:37 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 226872E8E2; Fri, 9 Nov 2018 00:22:37 +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=-7.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI 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 BA7BB2E945 for ; Fri, 9 Nov 2018 00:22:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727529AbeKIKA1 (ORCPT ); Fri, 9 Nov 2018 05:00:27 -0500 Received: from mail-pl1-f194.google.com ([209.85.214.194]:37256 "EHLO mail-pl1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727715AbeKIKA0 (ORCPT ); Fri, 9 Nov 2018 05:00:26 -0500 Received: by mail-pl1-f194.google.com with SMTP id p6-v6so69363pll.4 for ; Thu, 08 Nov 2018 16:22:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fomichev-me.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pWCaszsAdCBoBdg5GlrXFpzHo/aljxL3Lfvuxw9+2Oo=; b=Z6NWMNFO89U3Uo09eEv6GU+rKT/MNzLMpnbxREdb7K+exM/4B7KoakESTZjypHjQQV 8svPc9XZ+kFawHDED5PqlYMs5A+FKQsxjN9Ynjj4NX4opAPVRWqfZ1llrM8R0jMYi1q5 wwjDrN+KaGKDH1JJ/ZC1yO3MRUQZ2uc4gQr5qwxfv2Ls0SSh18UIzuY+Whth8VxXOGup omLlTArRScFq7693HjIARfP2jRywIdeMDVKkogwyScvrxVkNyBldpftN7RkjMskGsncK rYI/RdDX4C/2VILjJKhXgNl1veBISnfQ1CWWyVW28bBNy0XV/vwX/lfN5Wy1BA8nQfHY oIIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pWCaszsAdCBoBdg5GlrXFpzHo/aljxL3Lfvuxw9+2Oo=; b=plcs4pBlBNh7ZHZmyDCR11AnavaKcmMao98Uayezer6acsCIiKbRlJFb2Zx1bNLsvZ /U0FcM3FWkmyZP5KW4kbK3jARz4E9/YCJcPf6Asy7epZlt1pTX5YBpssUg8fbk+pbcoc MpK+K6RlXD798YAG9nK6+6VnIkPwPJo4tB7W29pyzzRpZ9uHYVBPF5tTl6o2hXCPJkUQ oykaOMDJ4rWGkv1YipeauVAKRLMC/rSO0uKeV9p3hytTiCjz4erQb1nGAsjPBsY8bF+X p6XVSjD2Kng69U7VRuGIrA0IjIR1n/VxpC49P0vJd6nLch5QWvXVVr6HznLF3APtHctd c0mQ== X-Gm-Message-State: AGRZ1gJeBWfm0v1Y+BpR6jVtsJvlzLiyTOWtweZhlOUkW3e31okKtgpi BkZwq3X4SMbK73Mj3BCLy4Y8qQ== X-Google-Smtp-Source: AJdET5e88cxDsRXn3NHtw5YytPISLtGuXEG9pRIa52IBe7QZZ6PiMEUf1/GdEBexGXLvBOS/eldL1w== X-Received: by 2002:a17:902:4324:: with SMTP id i33-v6mr6807177pld.253.1541722942621; Thu, 08 Nov 2018 16:22:22 -0800 (PST) Received: from mini-arch.hsd1.ca.comcast.net (c-98-210-199-22.hsd1.ca.comcast.net. [98.210.199.22]) by smtp.gmail.com with ESMTPSA id g21-v6sm4918955pgh.82.2018.11.08.16.22.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 08 Nov 2018 16:22:21 -0800 (PST) From: Stanislav Fomichev X-Google-Original-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 Subject: [PATCH v4 bpf-next 3/7] libbpf: bpf_program__pin: add special case for instances.nr == 1 Date: Thu, 8 Nov 2018 16:22:09 -0800 Message-Id: <20181109002213.5914-4-s@fomichev.me> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20181109002213.5914-1-s@fomichev.me> References: <20181109002213.5914-1-s@fomichev.me> MIME-Version: 1.0 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 From: Stanislav Fomichev When bpf_program has only one instance, don't create a subdirectory with per-instance pin files (/0). Instead, just create a single pin file for that single instance. This simplifies object pinning by not creating unnecessary subdirectories. This can potentially break existing users that depend on the case where '/0' is always created. However, I couldn't find any serious usage of bpf_program__pin inside the kernel tree and I suppose there should be none outside. Signed-off-by: Stanislav Fomichev --- tools/lib/bpf/libbpf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index f8590490a9dd..cfa269c91e11 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -1761,6 +1761,11 @@ int bpf_program__pin(struct bpf_program *prog, const char *path) return -EINVAL; } + if (prog->instances.nr == 1) { + /* don't create subdirs when pinning single instance */ + return bpf_program__pin_instance(prog, path, 0); + } + err = make_dir(path); if (err) return err; @@ -1823,6 +1828,11 @@ int bpf_program__unpin(struct bpf_program *prog, const char *path) return -EINVAL; } + if (prog->instances.nr == 1) { + /* don't create subdirs when pinning single instance */ + return bpf_program__unpin_instance(prog, path, 0); + } + for (i = 0; i < prog->instances.nr; i++) { char buf[PATH_MAX]; int len;