From patchwork Fri Feb 1 00:19:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1034533 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="aBqAVfh4"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43rHn033jDz9sMx for ; Fri, 1 Feb 2019 11:20:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728515AbfBAAUT (ORCPT ); Thu, 31 Jan 2019 19:20:19 -0500 Received: from mail-lj1-f193.google.com ([209.85.208.193]:33168 "EHLO mail-lj1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728173AbfBAAUR (ORCPT ); Thu, 31 Jan 2019 19:20:17 -0500 Received: by mail-lj1-f193.google.com with SMTP id v1-v6so4327929ljd.0 for ; Thu, 31 Jan 2019 16:20:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=txn3Eqx1pKvpe5j+zMtDH9kEzFonEjH89ekPTdnfEZY=; b=aBqAVfh4XDKKkOETt55LZrrdrYGmy6J2B9AzauuNPh3YJuWhRpOj+cdOGG8svn0/rN NmhUI7b0N5o3DOtKk8IfrlKDj1tpA7CxjBd+54V3fIUth0lLFRBndG3k8cQsNIwmA1v6 DIHz50uZxZDBruc2b0wlMT4YtbGMHGs4/v0P9BPZ8/xMOb0AtuQjJMH2AgzzIzkOVNWw WHHMM4TdiE2AtzMzpY9H420xZycUj4eg0iL4fKgsSGkEGz7h+fVIipc7OgzVAaNgdT5E prrzvVmW8gyGXf0x49Ukfrc8tngm6y+kCPj7fHxoPGgmQKXoxKSHZdbC/SjfSW2Sq67o 0p0w== 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; bh=txn3Eqx1pKvpe5j+zMtDH9kEzFonEjH89ekPTdnfEZY=; b=L/sp11NG6ce8RhjxIHqnOx9a2CmgHfRjG4j9AxZgbBkIGc6HH9kDyx7a69VZ2/Dd6D T8eumbARGkMmCkeRobjW6/fAkxSkg3qWu83LXyDxrkIIw8bdc9Pn0Tea0A7UYKn1nYwa ukA8WWVEmnf3bPJrrD/m8COxgJ0HNFO+xO0alUFpi2q9ZDK8Wo7TYoYevYgXQcWjRdoQ xjJKdL9qQKgHo9EBaK1wBmRh9iuCWs11la8jcuzxYTt7Urh7IyvR7ACE3ciniezuQDMj Bq+shx1Hz9HESJ7qEOUNycqbEa/jNcm4wVnZjJ6HkS1zd41xcs/B7oTXXlkoCtG1wpaD Z0Mw== X-Gm-Message-State: AJcUukd4AUnv1fkWCEfwFqxTOtjs5uTdekAEZAvP/O9XMSUBxTk2Ok92 xdd6+Hq0P3Poz10fo/w1nU0= X-Google-Smtp-Source: ALg8bN48JKPbQb1aZMJCODVJysqz3jtEcYnoqN8iJJrpUqHu0KWG5IocNrO5gw+vxxVTzQ1rcIn+Cw== X-Received: by 2002:a2e:5152:: with SMTP id b18-v6mr29029040lje.88.1548980415794; Thu, 31 Jan 2019 16:20:15 -0800 (PST) Received: from localhost.localdomain (host-185-93-94-63.ip-point.pl. [185.93.94.63]) by smtp.gmail.com with ESMTPSA id j18-v6sm1005495ljc.52.2019.01.31.16.20.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 31 Jan 2019 16:20:15 -0800 (PST) From: Maciej Fijalkowski X-Google-Original-From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com, brouer@redhat.com, john.fastabend@gmail.com Subject: [PATCH bpf-next v5 1/8] libbpf: Add a helper for retrieving a map fd for a given name Date: Fri, 1 Feb 2019 01:19:47 +0100 Message-Id: <20190201001954.4130-2-maciej.fijalkowski@intel.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20190201001954.4130-1-maciej.fijalkowski@intel.com> References: <20190201001954.4130-1-maciej.fijalkowski@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org XDP samples are mostly cooperating with eBPF maps through their file descriptors. In case of a eBPF program that contains multiple maps it might be tiresome to iterate through them and call bpf_map__fd for each one. Add a helper mostly based on bpf_object__find_map_by_name, but instead of returning the struct bpf_map pointer, return map fd. Suggested-by: Jakub Kicinski Signed-off-by: Maciej Fijalkowski Reviewed-by: Jakub Kicinski Acked-by: John Fastabend --- tools/lib/bpf/libbpf.c | 6 ++++++ tools/lib/bpf/libbpf.h | 3 +++ tools/lib/bpf/libbpf.map | 1 + 3 files changed, 10 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 2ccde17957e6..03bc01ca2577 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2884,6 +2884,12 @@ bpf_object__find_map_by_name(struct bpf_object *obj, const char *name) return NULL; } +int +bpf_object__find_map_fd_by_name(struct bpf_object *obj, const char *name) +{ + return bpf_map__fd(bpf_object__find_map_by_name(obj, name)); +} + struct bpf_map * bpf_object__find_map_by_offset(struct bpf_object *obj, size_t offset) { diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 62ae6cb93da1..931be6f3408c 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -264,6 +264,9 @@ struct bpf_map; LIBBPF_API struct bpf_map * bpf_object__find_map_by_name(struct bpf_object *obj, const char *name); +LIBBPF_API int +bpf_object__find_map_fd_by_name(struct bpf_object *obj, const char *name); + /* * Get bpf_map through the offset of corresponding struct bpf_map_def * in the BPF object file. diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 266bc95d0142..b183c6c3b990 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -130,4 +130,5 @@ LIBBPF_0.0.2 { bpf_probe_helper; bpf_probe_map_type; bpf_probe_prog_type; + bpf_object__find_map_fd_by_name; } LIBBPF_0.0.1;