From patchwork Tue Nov 20 06:42:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Nikita V. Shirokov" X-Patchwork-Id: 1000691 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=none (p=none dis=none) header.from=tehnerd.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=tehnerd-com.20150623.gappssmtp.com header.i=@tehnerd-com.20150623.gappssmtp.com header.b="udRTHbob"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42zxpJ6TY7z9s9G for ; Wed, 21 Nov 2018 07:17:44 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726064AbeKUGsh (ORCPT ); Wed, 21 Nov 2018 01:48:37 -0500 Received: from mail-io1-f66.google.com ([209.85.166.66]:37858 "EHLO mail-io1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725865AbeKUGsg (ORCPT ); Wed, 21 Nov 2018 01:48:36 -0500 Received: by mail-io1-f66.google.com with SMTP id a3so2360933ioc.4 for ; Tue, 20 Nov 2018 12:17:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tehnerd-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=uAwQAzj7m9JKIDJPmR7AzJ1zO0bKvpynLiKcBbFc3Dw=; b=udRTHbobKVVlYkOShK8W9VVV6P9uHFDqNnK5Z6LaQvdHnmqw7Vh+SIw7BQaazr5GNQ lDg3kaUR3knIwAd50peVyowpVCufTuna2VXJSO1/RF8RG6nYMU1/7IM50Z1LPG+BY1S1 dId2w+UCg2XdekmDX3dwU9L6AnUfY2fa4PCkFxYnoM30N5sMRQMVyUtETkXVjZX66Rsw osEQrA2oYHFYeQd8DX13ba/X7wER//nMMtHuSFDQOU9RS7GbFa+Iyj9YnYaxWCS+DEvI xso4r4AUm5U45saOIAVBA5CQUKaMNtlcg4XGCdSJoI56fit8kLRiTdPuhGtvdW15eeWv uOLg== 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=uAwQAzj7m9JKIDJPmR7AzJ1zO0bKvpynLiKcBbFc3Dw=; b=am29bLjssh1oeVEF8FEHoPHw4eyhpcydvoIlDtgSmEBCYpevdIOn0LtohcMqW+EgUF D/dRFfMRQFu9yJ9MLc3cEVtvPYyVvIOmLH0mRlIaEM3029cBn4qJsyxJqow/ewFxWW7X 9VYb37inRfh4uJVh6oCMdELkpS6hlrrFmCuXBfMkEGA56n7QgSlQr3Yu98Tz/DbLcywn k8KcUt3OdN6bo7fy3PxK02KvSL4Md5MoPfEXS2kZ7ErnyaqNX5cVk4oxR104aekUXE6Y NcBFur14Z5/ojH8V+3uiuYsLIsUwAFTkXai/DH17cpbhAw/lbKdVOfhmO7KyJ+6ZpYvh w4MA== X-Gm-Message-State: AA+aEWYf9XbpjZ0dBiY5NeX6L7CnTpC1ZX9zyIagAgNdYXHl1CYPiLny lVKNbDfna5T3w9hb3smpzdWl/g== X-Google-Smtp-Source: AFSGD/VRArCXwGTH/z6z3mxU+9BZ9sv7+MOAeADBVKydemxNjF6WJpBasYnWSZWWRPl7DSU/IF9rbQ== X-Received: by 2002:a6b:6919:: with SMTP id e25mr2552551ioc.119.1542745061414; Tue, 20 Nov 2018 12:17:41 -0800 (PST) Received: from maindev.thefacebook.com ([199.201.64.4]) by smtp.gmail.com with ESMTPSA id z186-v6sm14042000itd.43.2018.11.20.12.17.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 20 Nov 2018 12:17:40 -0800 (PST) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH v3 bpf-next 1/2] bpf: adding support for map in map in libbpf Date: Mon, 19 Nov 2018 22:42:21 -0800 Message-Id: <20181120064222.5606-2-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20181120064222.5606-1-tehnerd@tehnerd.com> References: <20181120064222.5606-1-tehnerd@tehnerd.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org idea is pretty simple. for specified map (pointed by struct bpf_map) we would provide descriptor of already loaded map, which is going to be used as a prototype for inner map. proposed workflow: 1) open bpf's object (bpf_object__open) 2) create bpf's map which is going to be used as a prototype 3) find (by name) map-in-map which you want to load and update w/ descriptor of inner map w/ a new helper from this patch 4) load bpf program w/ bpf_object__load inner_map_fd is ignored by any other maps aside from (hash|array) of maps Signed-off-by: Nikita V. Shirokov Acked-by: Yonghong Song --- tools/lib/bpf/libbpf.c | 11 ++++++++++- tools/lib/bpf/libbpf.h | 2 ++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index a01eb9584e52..7e130e0c8fc9 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -163,6 +163,7 @@ struct bpf_map { char *name; size_t offset; int map_ifindex; + int inner_map_fd; struct bpf_map_def def; __u32 btf_key_type_id; __u32 btf_value_type_id; @@ -653,8 +654,10 @@ bpf_object__init_maps(struct bpf_object *obj, int flags) * fd (fd=0 is stdin) when failure (zclose won't close * negative fd)). */ - for (i = 0; i < nr_maps; i++) + for (i = 0; i < nr_maps; i++) { obj->maps[i].fd = -1; + obj->maps[i].inner_map_fd = -1; + } /* * Fill obj->maps using data in "maps" section. @@ -1146,6 +1149,7 @@ bpf_object__create_maps(struct bpf_object *obj) create_attr.btf_fd = 0; create_attr.btf_key_type_id = 0; create_attr.btf_value_type_id = 0; + create_attr.inner_map_fd = map->inner_map_fd; if (obj->btf && !bpf_map_find_btf_info(map, obj->btf)) { create_attr.btf_fd = btf__fd(obj->btf); @@ -2562,6 +2566,11 @@ void bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex) map->map_ifindex = ifindex; } +void bpf_map__add_inner_map_fd(struct bpf_map *map, int fd) +{ + map->inner_map_fd = fd; +} + static struct bpf_map * __bpf_map__iter(struct bpf_map *m, struct bpf_object *obj, int i) { diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index b1686a787102..0a0b7e0ed554 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -293,6 +293,8 @@ LIBBPF_API void bpf_map__set_ifindex(struct bpf_map *map, __u32 ifindex); LIBBPF_API int bpf_map__pin(struct bpf_map *map, const char *path); LIBBPF_API int bpf_map__unpin(struct bpf_map *map, const char *path); +LIBBPF_API void bpf_map__add_inner_map_fd(struct bpf_map *map, int fd); + LIBBPF_API long libbpf_get_error(const void *ptr); struct bpf_prog_load_attr {