From patchwork Thu Jan 24 21:47:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1030696 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="RpCiq5+w"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43lwkS1GSHz9s7T for ; Fri, 25 Jan 2019 08:48:00 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728084AbfAXVr5 (ORCPT ); Thu, 24 Jan 2019 16:47:57 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:41841 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727064AbfAXVr5 (ORCPT ); Thu, 24 Jan 2019 16:47:57 -0500 Received: by mail-lf1-f66.google.com with SMTP id c16so5458378lfj.8 for ; Thu, 24 Jan 2019 13:47:56 -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=TGPRs8RlLy6PHvot69TplciACNxfE6hrFi9Z6rdzfGQ=; b=RpCiq5+wm8mmE+vn3POJrAGYtbZUOEKiycZ9pjjYr6MMYWLPPCZnGNPtpCGzTvNmW0 AzN3nZWYm3XptNLHGpotiHVv2wBDsFc/PEEeOevFn528+H6TV6qVxGKetdjt2wPTE2Qs HnrkndGloYB0gxiiOCjzPFwaXX1TlAW88EFnpVB6s/eJ9EUvtTHuvsK0I3Z5xw2XNbQk pD8AetujH611kMR9x2PGF60z6dx86yPxIP6z/VNAZj+md5Ux+EcZds3bJ0AP1yhgLYxm hlmLwvj0w51Ny9pGC1H6GbQjyP7wEbvUoVrqDAN+ZkBv0/vncdfH+gG+iys2aKZ5cgJ8 SADg== 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=TGPRs8RlLy6PHvot69TplciACNxfE6hrFi9Z6rdzfGQ=; b=jUQMTo09n0KscxCHtre4bPxWOnjcKH6Dyj+2MhcsVWlPnLWJLO50evqpIZFCIHrMRC eODS/BOgNHENbJ/EZTm21FZLr/9vivRMOUo3DmAAXKvWdAWG35sxRwuEqEXnd4z8C7WV SpXxekpmiZ0tDe7i76Q1fG/9CmINuAxSDcXGuUKf/uP9vdGU1goCap3r9cy3nfi56wG1 CNyevONA7OTkIshlvIKx2u2HgHYOngxsn62G4NO3Wga07dZFXIXlTKlIKhwUNxg6FIxK 4LHfGprWbr/UEpux4wz7LcpS4UDx2Uyn+bIkjQR2jNy/CuxJRFx72s06Nmi87ygnPQ2G LUWg== X-Gm-Message-State: AJcUukdV8D58sFNohySNM/QR6xU9T1t2N+AEZ/076SLIPwY/oGumSWJd b3gVWZFgMbKp0ohdk1Bhzl0= X-Google-Smtp-Source: ALg8bN4sHyLieKmu7r42V6NN5+Ln+znYx2wAumWGcr7kMB6XsS3lXNnoySEIkF3l/qUs9iK2x9gJrQ== X-Received: by 2002:ac2:50c4:: with SMTP id h4mr6873732lfm.81.1548366475658; Thu, 24 Jan 2019 13:47:55 -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 w4sm1136285lfk.83.2019.01.24.13.47.54 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 24 Jan 2019 13:47:55 -0800 (PST) From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com, brouer@redhat.com Subject: [PATCH bpf-next v3 1/7] libbpf: Add a helper for retrieving a map fd for a given name Date: Thu, 24 Jan 2019 22:47:41 +0100 Message-Id: <20190124214747.6986-2-maciejromanfijalkowski@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20190124214747.6986-1-maciejromanfijalkowski@gmail.com> References: <20190124214747.6986-1-maciejromanfijalkowski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Maciej Fijalkowski 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 --- 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;