From patchwork Tue Nov 20 05:16:17 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: 1000275 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="Rb4V2DCY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42zZKm0gr0z9s3C for ; Tue, 20 Nov 2018 16:40:12 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731615AbeKTQH0 (ORCPT ); Tue, 20 Nov 2018 11:07:26 -0500 Received: from mail-pf1-f193.google.com ([209.85.210.193]:44671 "EHLO mail-pf1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726883AbeKTQH0 (ORCPT ); Tue, 20 Nov 2018 11:07:26 -0500 Received: by mail-pf1-f193.google.com with SMTP id u6so423627pfh.11 for ; Mon, 19 Nov 2018 21:40:09 -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=KtsyjbqwDlqZ2aJSvyrYvmWi7F+Qo8t87yaohI1nhJA=; b=Rb4V2DCY7PDAzvjY1Etld8XYIgLyvuU5EjGV54lBGGPC14YSs0BtibVujsLAIJsVOw A5dgFrM5FDYDQKajcg5knSGnCHd6H98fZ6GrkvkhmcL1Y/CQX41DZju27bHOGHRDGS7E bi/hNH2ssEXU8/oDwjdtuk7/lfpSVofbX3K50/odEzWDJLRrQiiAySAoAzJGyUl17PUX H7drKZDt7L51rnPCCWyBBrKJp8H1UOu6Dls0wFPY7T/Dq2VZQO7d0/VwMxbXVqId//sg UIWXwL1MqsrJxNghtwQ2KGC5cckzWdPuFxBzOMQ6wGL+lnvoYxn0Hi+WJPVIFxxaWjU5 5IZA== 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=KtsyjbqwDlqZ2aJSvyrYvmWi7F+Qo8t87yaohI1nhJA=; b=NnCcwWGr2pa1zIqrqPbdw6JvUiD5nK1vN+ahfaxHEyDmzzfkRyjSd/8xjOoB+qnPqz GdKa5f8MBj31QxODBijrl9pvkZ/RHlvkIiAC1T27fX5vgehut9+zhgn6uLWt9ubhxrjl ZpFtKME/cyS6TkWL7i/xfEUjl1QmtBOFUbHiOu73ZDk7ugmEasxh9cs3d5RXr78+Dyo9 vtasovOZBpTKk4isCsJg/HX39dqn6ok+vBAZC8Rp9QZp5u2snVZF0wuATZN6RPRZLu1/ pBvSCLdXL8pQQxZL4hh1Lc+Rd/zTSrTSGtqDKlvlx2pYxOYjKIrdMtlqtW9Y9GDqVd+f Voyg== X-Gm-Message-State: AGRZ1gJSUTanRj2+Bfe+bRmUGa2giL/k0OJq3P9Z6TtDiyoVK5jlLe2C 6ybf4yT3WYYIRK8wPNrERXB1H8Q+a5Oidg== X-Google-Smtp-Source: AJdET5chAWcsXm0kLJlx12kLyayJ1/ybAU8nLcPS6497KXc/8+E3eK2cvn+E5xI2wXk3TTSeFJzARQ== X-Received: by 2002:a62:51c1:: with SMTP id f184-v6mr786964pfb.101.1542692408932; Mon, 19 Nov 2018 21:40:08 -0800 (PST) Received: from maindev.thefacebook.com ([199.201.64.4]) by smtp.gmail.com with ESMTPSA id n186sm6248388pfn.137.2018.11.19.21.40.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 21:40:08 -0800 (PST) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski , Y Song Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH v2 bpf-next 1/2] bpf: adding support for map in map in libbpf Date: Mon, 19 Nov 2018 21:16:17 -0800 Message-Id: <20181120051618.3189-2-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20181120051618.3189-1-tehnerd@tehnerd.com> References: <20181120051618.3189-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 asidef from (hash|array) of maps Signed-off-by: Nikita V. Shirokov --- tools/lib/bpf/libbpf.c | 7 +++++++ tools/lib/bpf/libbpf.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index a01eb9584e52..0e229ab037dc 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; @@ -1146,6 +1147,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 +2564,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 { From patchwork Tue Nov 20 05:16:18 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: 1000276 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="aM6eZm/u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 42zZKn3Bwqz9s3C for ; Tue, 20 Nov 2018 16:40:13 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731684AbeKTQH2 (ORCPT ); Tue, 20 Nov 2018 11:07:28 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:42937 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726883AbeKTQH1 (ORCPT ); Tue, 20 Nov 2018 11:07:27 -0500 Received: by mail-pf1-f194.google.com with SMTP id 64so426175pfr.9 for ; Mon, 19 Nov 2018 21:40:10 -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=cK+0OBMzHm2tQ3CXlo6mjJ17Z02HDQOWl/8sa//jRqs=; b=aM6eZm/ukofyxFjiQ/a5yUcvC4YIBTA8Ggrl09YBLDecpkcTOA7H0yU1m0x5v/dG1a dSGUf6FXlxuAIN+Dp2uNq0dMYiutQb7Cc7o/OqYSHXEYwcuYHqzo0IJU5Ji1qlsXiSJS llvuEUCd98xLow98FNYZSnfOIlCodsr0hagutPeh0AWBA/xfG1ddNq61IKQnA4qNdaBD par6kpbcneB/BClDlP+MtQuCPKgt0B5hjh9Jv8ZMVFbK6Ja7qpNftQnlrm8TTt+Srd2g aXewrDEdas+C22ulfgY7eslHnhX1pMLc2rRROwikQ1QQKAoZJyndJbiZl7xIdpXKQGGN TkoQ== 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=cK+0OBMzHm2tQ3CXlo6mjJ17Z02HDQOWl/8sa//jRqs=; b=nKR1AIDRE6RZkMWQ5aIqbWfd4OU20qNXCPFJjAmRC/RRGXxEEII2+cl0FbtXEY4tpn 8IZJZJBxRGVvjNf4M7FBT+mS8AiUMCubt9ILjMXTix9DkH4H4xVr+l+966wUOmhBve8s o8onq/08ldFmjbQH3GKQvCZG4yrSLV/veWFIanlklx+fAZo3etYrY1NHLYq+c/DFxYDH SVQbUe7BKt20ZYgHlHeXCKpZGPGOptq3S85CoqrPS/2RrVPvqao350ND5MYV2cSiQv3I x1mXNcDV1Be6lh4Y/gMQuvdqYb5aaSuPHw7BPyKFbyLcpHvWDEEdHMLr5Yi5sxbjcog+ b9ug== X-Gm-Message-State: AGRZ1gLGQDOXmHE/qFjMSW33itVElIES7L8dPZr4cvDKswEotshogqJ7 lCmsh6vFFX2nX2jQCuC7deYrlrpnsoSKhA== X-Google-Smtp-Source: AJdET5f0ViSYP0IImMSJGE32xR6VS4fdAwbGXAte9SS+WEGKJ3mILiITmoBJBz+xTcAU2GaZ916giQ== X-Received: by 2002:a62:3101:: with SMTP id x1-v6mr822309pfx.204.1542692410438; Mon, 19 Nov 2018 21:40:10 -0800 (PST) Received: from maindev.thefacebook.com ([199.201.64.4]) by smtp.gmail.com with ESMTPSA id n186sm6248388pfn.137.2018.11.19.21.40.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 19 Nov 2018 21:40:09 -0800 (PST) From: "Nikita V. Shirokov" To: Alexei Starovoitov , Daniel Borkmann , Jakub Kicinski , Y Song Cc: netdev@vger.kernel.org, "Nikita V. Shirokov" Subject: [PATCH v2 bpf-next 2/2] bpf: adding tests for mapinmap helpber in libbpf Date: Mon, 19 Nov 2018 21:16:18 -0800 Message-Id: <20181120051618.3189-3-tehnerd@tehnerd.com> X-Mailer: git-send-email 2.15.1 In-Reply-To: <20181120051618.3189-1-tehnerd@tehnerd.com> References: <20181120051618.3189-1-tehnerd@tehnerd.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org adding test/example of bpf_map__add_inner_map_fd usage Signed-off-by: Nikita V. Shirokov --- tools/testing/selftests/bpf/Makefile | 3 +- tools/testing/selftests/bpf/test_mapinmap.c | 49 +++++++++++++++++ tools/testing/selftests/bpf/test_maps.c | 82 +++++++++++++++++++++++++++++ 3 files changed, 133 insertions(+), 1 deletion(-) create mode 100644 tools/testing/selftests/bpf/test_mapinmap.c diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 57b4712a6276..a3ea69dc9bdf 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -38,7 +38,8 @@ TEST_GEN_FILES = test_pkt_access.o test_xdp.o test_l4lb.o test_tcp_estats.o test test_lwt_seg6local.o sendmsg4_prog.o sendmsg6_prog.o test_lirc_mode2_kern.o \ get_cgroup_id_kern.o socket_cookie_prog.o test_select_reuseport_kern.o \ test_skb_cgroup_id_kern.o bpf_flow.o netcnt_prog.o \ - test_sk_lookup_kern.o test_xdp_vlan.o test_queue_map.o test_stack_map.o + test_sk_lookup_kern.o test_xdp_vlan.o test_queue_map.o test_stack_map.o \ + test_mapinmap.o # Order correspond to 'make run_tests' order TEST_PROGS := test_kmod.sh \ diff --git a/tools/testing/selftests/bpf/test_mapinmap.c b/tools/testing/selftests/bpf/test_mapinmap.c new file mode 100644 index 000000000000..ce923e67e08e --- /dev/null +++ b/tools/testing/selftests/bpf/test_mapinmap.c @@ -0,0 +1,49 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2018 Facebook */ +#include +#include +#include +#include "bpf_helpers.h" + +struct bpf_map_def SEC("maps") mim_array = { + .type = BPF_MAP_TYPE_ARRAY_OF_MAPS, + .key_size = sizeof(int), + /* must be sizeof(__u32) for map in map */ + .value_size = sizeof(__u32), + .max_entries = 1, + .map_flags = 0, +}; + +struct bpf_map_def SEC("maps") mim_hash = { + .type = BPF_MAP_TYPE_HASH_OF_MAPS, + .key_size = sizeof(int), + /* must be sizeof(__u32) for map in map */ + .value_size = sizeof(__u32), + .max_entries = 1, + .map_flags = 0, +}; + +SEC("xdp_mimtest") +int xdp_mimtest0(struct xdp_md *ctx) +{ + int value = 123; + int key = 0; + void *map; + + map = bpf_map_lookup_elem(&mim_array, &key); + if (!map) + return XDP_DROP; + + bpf_map_update_elem(map, &key, &value, 0); + + map = bpf_map_lookup_elem(&mim_hash, &key); + if (!map) + return XDP_DROP; + + bpf_map_update_elem(map, &key, &value, 0); + + return XDP_PASS; +} + +int _version SEC("version") = 1; +char _license[] SEC("license") = "GPL"; diff --git a/tools/testing/selftests/bpf/test_maps.c b/tools/testing/selftests/bpf/test_maps.c index 4db2116e52be..b84f069c2aa9 100644 --- a/tools/testing/selftests/bpf/test_maps.c +++ b/tools/testing/selftests/bpf/test_maps.c @@ -1080,6 +1080,86 @@ static void test_sockmap(int tasks, void *data) exit(1); } +#define MAPINMAP_PROG "./test_mapinmap.o" +static void test_mapinmap(void) +{ + int mim_fd, fd, test_fd, err; + struct bpf_program *prog; + struct bpf_object *obj; + struct bpf_map *map; + int pos = 0; + + obj = bpf_object__open(MAPINMAP_PROG); + + fd = bpf_create_map(BPF_MAP_TYPE_HASH, sizeof(int), sizeof(int), + 2, 0); + if (fd < 0) { + printf("Failed to create hashmap '%s'!\n", strerror(errno)); + exit(1); + } + + map = bpf_object__find_map_by_name(obj, "mim_array"); + if (IS_ERR(map)) { + printf("Failed to load array of maps from test prog\n"); + goto out_mapinmap; + } + bpf_map__add_inner_map_fd(map, fd); + + map = bpf_object__find_map_by_name(obj, "mim_hash"); + if (IS_ERR(map)) { + printf("Failed to load hash of maps from test prog\n"); + goto out_mapinmap; + } + bpf_map__add_inner_map_fd(map, fd); + + bpf_object__for_each_program(prog, obj) { + bpf_program__set_xdp(prog); + } + bpf_object__load(obj); + + map = bpf_object__find_map_by_name(obj, "mim_array"); + if (IS_ERR(map)) { + printf("Failed to load array of maps from test prog\n"); + goto out_mapinmap; + } + mim_fd = bpf_map__fd(map); + if (mim_fd < 0) { + printf("Failed to get descriptor for array of maps\n"); + goto out_mapinmap; + } + + err = bpf_map_update_elem(mim_fd, &pos, &fd, 0); + if (err) { + printf("Failed to update array of maps\n"); + goto out_mapinmap; + } + + map = bpf_object__find_map_by_name(obj, "mim_hash"); + if (IS_ERR(map)) { + printf("Failed to load hash of maps from test prog\n"); + goto out_mapinmap; + } + mim_fd = bpf_map__fd(map); + if (mim_fd < 0) { + printf("Failed to get descriptor for hash of maps\n"); + goto out_mapinmap; + } + + err = bpf_map_update_elem(mim_fd, &pos, &fd, 0); + if (err) { + printf("Failed to update hash of maps\n"); + goto out_mapinmap; + } + + close(fd); + bpf_object__close(obj); + return; + +out_mapinmap: + close(fd); + exit(1); +} + #define MAP_SIZE (32 * 1024) static void test_map_large(void) @@ -1554,6 +1634,8 @@ static void run_all_tests(void) test_queuemap(0, NULL); test_stackmap(0, NULL); + + test_mapinmap(); } int main(void)