[v6,bpf-next,06/11] bpf: Remember BTF of inner maps.

Message ID	20210714010519.37922-7-alexei.starovoitov@gmail.com
State	Superseded
Headers	show Return-Path: <netdev-owner@kernel.org> From: Alexei Starovoitov <alexei.starovoitov@gmail.com> To: davem@davemloft.net Cc: daniel@iogearbox.net, andrii@kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, kernel-team@fb.com Subject: [PATCH v6 bpf-next 06/11] bpf: Remember BTF of inner maps. Date: Tue, 13 Jul 2021 18:05:14 -0700 Message-Id: <20210714010519.37922-7-alexei.starovoitov@gmail.com> In-Reply-To: <20210714010519.37922-1-alexei.starovoitov@gmail.com> References: <20210714010519.37922-1-alexei.starovoitov@gmail.com> Precedence: bulk
Series	bpf: Introduce BPF timers. \| expand [v6,bpf-next,00/11] bpf: Introduce BPF timers. [v6,bpf-next,01/11] bpf: Prepare bpf_prog_put() to be called from irq context. [v6,bpf-next,02/11] bpf: Factor out bpf_spin_lock into helpers. [v6,bpf-next,03/11] bpf: Introduce bpf timers. [v6,bpf-next,04/11] bpf: Add map side support for bpf timers. [v6,bpf-next,05/11] bpf: Prevent pointer mismatch in bpf_timer_init. [v6,bpf-next,06/11] bpf: Remember BTF of inner maps. [v6,bpf-next,07/11] bpf: Relax verifier recursion check. [v6,bpf-next,08/11] bpf: Implement verifier support for validation of async callbacks. [v6,bpf-next,09/11] bpf: Teach stack depth check about async callbacks. [v6,bpf-next,10/11] selftests/bpf: Add bpf_timer test. [v6,bpf-next,11/11] selftests/bpf: Add a test with bpf_timer in inner map.

Message ID

20210714010519.37922-7-alexei.starovoitov@gmail.com

State

Superseded

Headers

From: Alexei Starovoitov <alexei.starovoitov@gmail.com>
To: davem@davemloft.net
Cc: daniel@iogearbox.net, andrii@kernel.org, netdev@vger.kernel.org,
	bpf@vger.kernel.org, kernel-team@fb.com
Subject: [PATCH v6 bpf-next 06/11] bpf: Remember BTF of inner maps.
Date: Tue, 13 Jul 2021 18:05:14 -0700
Message-Id: <20210714010519.37922-7-alexei.starovoitov@gmail.com>
In-Reply-To: <20210714010519.37922-1-alexei.starovoitov@gmail.com>
References: <20210714010519.37922-1-alexei.starovoitov@gmail.com>
Precedence: bulk

Series

bpf: Introduce BPF timers. | expand

Commit Message

Alexei Starovoitov July 14, 2021, 1:05 a.m. UTC

From: Alexei Starovoitov <ast@kernel.org>

BTF is required for 'struct bpf_timer' to be recognized inside map value.
The bpf timers are supported inside inner maps.
Remember 'struct btf *' in inner_map_meta to make it available
to the verifier in the sequence:

struct bpf_map *inner_map = bpf_map_lookup_elem(&outer_map, ...);
if (inner_map)
    timer = bpf_map_lookup_elem(&inner_map, ...);

Signed-off-by: Alexei Starovoitov <ast@kernel.org>
Acked-by: Yonghong Song <yhs@fb.com>
Acked-by: Martin KaFai Lau <kafai@fb.com>
---
 kernel/bpf/map_in_map.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/kernel/bpf/map_in_map.c b/kernel/bpf/map_in_map.c
index 890dfe14e731..5cd8f5277279 100644
--- a/kernel/bpf/map_in_map.c
+++ b/kernel/bpf/map_in_map.c
@@ -3,6 +3,7 @@ 
  */
 #include <linux/slab.h>
 #include <linux/bpf.h>
+#include <linux/btf.h>
 
 #include "map_in_map.h"
 
@@ -51,6 +52,10 @@  struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)
 	inner_map_meta->max_entries = inner_map->max_entries;
 	inner_map_meta->spin_lock_off = inner_map->spin_lock_off;
 	inner_map_meta->timer_off = inner_map->timer_off;
+	if (inner_map->btf) {
+		btf_get(inner_map->btf);
+		inner_map_meta->btf = inner_map->btf;
+	}
 
 	/* Misc members not needed in bpf_map_meta_equal() check. */
 	inner_map_meta->ops = inner_map->ops;
@@ -66,6 +71,7 @@  struct bpf_map *bpf_map_meta_alloc(int inner_map_ufd)
 
 void bpf_map_meta_free(struct bpf_map *map_meta)
 {
+	btf_put(map_meta->btf);
 	kfree(map_meta);
 }

[v6,bpf-next,06/11] bpf: Remember BTF of inner maps.

Commit Message

Patch