[08/18] bpf: Separate kallsyms add/del functions

Message ID	20200226130345.209469-9-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 08/18] bpf: Separate kallsyms add/del functions Date: Wed, 26 Feb 2020 14:03:35 +0100 Message-Id: <20200226130345.209469-9-jolsa@kernel.org> In-Reply-To: <20200226130345.209469-1-jolsa@kernel.org> References: <20200226130345.209469-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 [PATCHv3,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

20200226130345.209469-9-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 08/18] bpf: Separate kallsyms add/del functions
Date: Wed, 26 Feb 2020 14:03:35 +0100
Message-Id: <20200226130345.209469-9-jolsa@kernel.org>
In-Reply-To: <20200226130345.209469-1-jolsa@kernel.org>
References: <20200226130345.209469-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. 26, 2020, 1:03 p.m. UTC

Moving bpf_prog_ksym_node_add/del to __bpf_ksym_add/del
and changing the argument to 'struct bpf_ksym' object.

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

Comments

Song Liu Feb. 26, 2020, 11:14 p.m. UTC | #1

On Wed, Feb 26, 2020 at 5:05 AM Jiri Olsa <jolsa@kernel.org> wrote:
>
> Moving bpf_prog_ksym_node_add/del to __bpf_ksym_add/del
> and changing the argument to 'struct bpf_ksym' object.
>
> Signed-off-by: Jiri Olsa <jolsa@kernel.org>

Acked-by: Song Liu <songliubraving@fb.com>

diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c
index cdff3e4b207c..a8a4000f5ca8 100644
--- a/kernel/bpf/core.c
+++ b/kernel/bpf/core.c
@@ -644,20 +644,20 @@  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 void bpf_prog_ksym_node_add(struct bpf_prog_aux *aux)
+static void __bpf_ksym_add(struct bpf_ksym *ksym)
 {
-	WARN_ON_ONCE(!list_empty(&aux->ksym.lnode));
-	list_add_tail_rcu(&aux->ksym.lnode, &bpf_kallsyms);
-	latch_tree_insert(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);
+	WARN_ON_ONCE(!list_empty(&ksym->lnode));
+	list_add_tail_rcu(&ksym->lnode, &bpf_kallsyms);
+	latch_tree_insert(&ksym->tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);
 }
 
-static void bpf_prog_ksym_node_del(struct bpf_prog_aux *aux)
+static void __bpf_ksym_del(struct bpf_ksym *ksym)
 {
-	if (list_empty(&aux->ksym.lnode))
+	if (list_empty(&ksym->lnode))
 		return;
 
-	latch_tree_erase(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);
-	list_del_rcu(&aux->ksym.lnode);
+	latch_tree_erase(&ksym->tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);
+	list_del_rcu(&ksym->lnode);
 }
 
 static bool bpf_prog_kallsyms_candidate(const struct bpf_prog *fp)
@@ -682,7 +682,7 @@  void bpf_prog_kallsyms_add(struct bpf_prog *fp)
 
 	spin_lock_bh(&bpf_lock);
 	latch_tree_insert(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
-	bpf_prog_ksym_node_add(fp->aux);
+	__bpf_ksym_add(&fp->aux->ksym);
 	spin_unlock_bh(&bpf_lock);
 }
 
@@ -693,7 +693,7 @@  void bpf_prog_kallsyms_del(struct bpf_prog *fp)
 
 	spin_lock_bh(&bpf_lock);
 	latch_tree_erase(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);
-	bpf_prog_ksym_node_del(fp->aux);
+	__bpf_ksym_del(&fp->aux->ksym);
 	spin_unlock_bh(&bpf_lock);
 }

[08/18] bpf: Separate kallsyms add/del functions

Commit Message

Comments

Patch