[11/18] bpf: Rename bpf_tree to bpf_progs_tree

Message ID	20200216193005.144157-12-jolsa@kernel.org
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> From: Jiri Olsa <jolsa@kernel.org> To: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net> Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Andrii Nakryiko <andriin@fb.com>, Yonghong Song <yhs@fb.com>, Song Liu <songliubraving@fb.com>, Martin KaFai Lau <kafai@fb.com>, Jakub Kicinski <kuba@kernel.org>, David Miller <davem@redhat.com>, =?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.com>, John Fastabend <john.fastabend@gmail.com>, Jesper Dangaard Brouer <hawk@kernel.org>, Arnaldo Carvalho de Melo <acme@redhat.com> Subject: [PATCH 11/18] bpf: Rename bpf_tree to bpf_progs_tree Date: Sun, 16 Feb 2020 20:29:58 +0100 Message-Id: <20200216193005.144157-12-jolsa@kernel.org> In-Reply-To: <20200216193005.144157-1-jolsa@kernel.org> References: <20200216193005.144157-1-jolsa@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	bpf: Add trampoline and dispatcher to /proc/kallsyms \| expand [PATCHv2,00/18] bpf: Add trampoline and dispatcher to /proc/kallsyms [01/18] x86/mm: Rename is_kernel_text to __is_kernel_text [02/18] bpf: Add bpf_trampoline_ name prefix for DECLARE_BPF_DISPATCHER [03/18] bpf: Add struct bpf_ksym [04/18] bpf: Add name to struct bpf_ksym [05/18] bpf: Add lnode list node to struct bpf_ksym [06/18] bpf: Add bpf_ksym_tree tree [07/18] bpf: Move bpf_tree add/del from bpf_prog_ksym_node_add/del [08/18] bpf: Separate kallsyms add/del functions [09/18] bpf: Add bpf_ksym_add/del functions [10/18] bpf: Re-initialize lnode in bpf_ksym_del [11/18] bpf: Rename bpf_tree to bpf_progs_tree [12/18] bpf: Add trampolines to kallsyms [13/18] bpf: Return error value in bpf_dispatcher_update [14/18] bpf: Add dispatchers to kallsyms [15/18] bpf: Sort bpf kallsyms symbols [16/18] perf tools: Synthesize bpf_trampoline/dispatcher ksymbol event [17/18] perf tools: Set ksymbol dso as loaded on arrival [18/18] perf annotate: Add base support for bpf_image

Message ID

20200216193005.144157-12-jolsa@kernel.org

State

Changes Requested

Delegated to:

BPF Maintainers

Headers

From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
	Daniel Borkmann <daniel@iogearbox.net>
Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Andrii Nakryiko
	<andriin@fb.com>, Yonghong Song <yhs@fb.com>, Song Liu
	<songliubraving@fb.com>,         Martin KaFai Lau <kafai@fb.com>,
	Jakub Kicinski <kuba@kernel.org>, David Miller <davem@redhat.com>,
	=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.com>,
	John Fastabend <john.fastabend@gmail.com>, Jesper Dangaard Brouer
	<hawk@kernel.org>,         Arnaldo Carvalho de Melo <acme@redhat.com>
Subject: [PATCH 11/18] bpf: Rename bpf_tree to bpf_progs_tree
Date: Sun, 16 Feb 2020 20:29:58 +0100
Message-Id: <20200216193005.144157-12-jolsa@kernel.org>
In-Reply-To: <20200216193005.144157-1-jolsa@kernel.org>
References: <20200216193005.144157-1-jolsa@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=WINDOWS-1252
Content-Transfer-Encoding: 8BIT
Sender: bpf-owner@vger.kernel.org
Precedence: bulk

Series

bpf: Add trampoline and dispatcher to /proc/kallsyms | expand

Commit Message

Jiri Olsa Feb. 16, 2020, 7:29 p.m. UTC

Renaming bpf_tree to bpf_progs_tree and bpf_tree_ops
to bpf_progs_tree_ops to better capture the usage of
the tree which is for the bpf_prog objects only.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 kernel/bpf/core.c | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index a0feba447e5d..2f857bbfe05c 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -580,13 +580,14 @@  bpf_get_prog_addr_start(struct latch_tree_node *n)
 	return aux->ksym.start;
 }
 
-static __always_inline bool bpf_tree_less(struct latch_tree_node *a,
-					  struct latch_tree_node *b)
+static __always_inline bool
+bpf_progs_tree_less(struct latch_tree_node *a,
+		    struct latch_tree_node *b)
 {
 	return bpf_get_prog_addr_start(a) < bpf_get_prog_addr_start(b);
 }
 
-static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n)
+static __always_inline int bpf_progs_tree_comp(void *key, struct latch_tree_node *n)
 {
 	unsigned long val = (unsigned long)key;
 	const struct bpf_prog_aux *aux;
@@ -601,9 +602,9 @@  static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n)
 	return 0;
 }
 
-static const struct latch_tree_ops bpf_tree_ops = {
-	.less	= bpf_tree_less,
-	.comp	= bpf_tree_comp,
+static const struct latch_tree_ops bpf_progs_tree_ops = {
+	.less	= bpf_progs_tree_less,
+	.comp	= bpf_progs_tree_comp,
 };
 
 static unsigned long
@@ -646,7 +647,7 @@  static const struct latch_tree_ops bpf_ksym_tree_ops = {
 static DEFINE_SPINLOCK(bpf_lock);
 static LIST_HEAD(bpf_kallsyms);
 static struct latch_tree_root bpf_ksym_tree __cacheline_aligned;
-static struct latch_tree_root bpf_tree __cacheline_aligned;
+static struct latch_tree_root bpf_progs_tree __cacheline_aligned;
 
 static void __bpf_ksym_add(struct bpf_ksym *ksym)
 {
@@ -706,7 +707,8 @@  void bpf_prog_kallsyms_add(struct bpf_prog *fp)
 	bpf_get_prog_name(fp);
 
 	spin_lock_bh(&bpf_lock);
-	latch_tree_insert(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
+	latch_tree_insert(&fp->aux->ksym_tnode, &bpf_progs_tree,
+			  &bpf_progs_tree_ops);
 	__bpf_ksym_add(&fp->aux->ksym);
 	spin_unlock_bh(&bpf_lock);
 }
@@ -717,7 +719,8 @@  void bpf_prog_kallsyms_del(struct bpf_prog *fp)
 		return;
 
 	spin_lock_bh(&bpf_lock);
-	latch_tree_erase(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
+	latch_tree_erase(&fp->aux->ksym_tnode, &bpf_progs_tree,
+			 &bpf_progs_tree_ops);
 	__bpf_ksym_del(&fp->aux->ksym);
 	spin_unlock_bh(&bpf_lock);
 }
@@ -726,7 +729,8 @@  static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)
 {
 	struct latch_tree_node *n;
 
-	n = latch_tree_find((void *)addr, &bpf_tree, &bpf_tree_ops);
+	n = latch_tree_find((void *)addr, &bpf_progs_tree,
+			    &bpf_progs_tree_ops);
 	return n ?
 	       container_of(n, struct bpf_prog_aux, ksym_tnode)->prog :
 	       NULL;

[11/18] bpf: Rename bpf_tree to bpf_progs_tree

Commit Message

Patch