{"id":1238821,"url":"http://patchwork.ozlabs.org/api/patches/1238821/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-12-jolsa@kernel.org/","project":{"id":7,"url":"http://patchwork.ozlabs.org/api/projects/7/?format=json","name":"Linux network development","link_name":"netdev","list_id":"netdev.vger.kernel.org","list_email":"netdev@vger.kernel.org","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20200216193005.144157-12-jolsa@kernel.org>","list_archive_url":null,"date":"2020-02-16T19:29:58","name":"[11/18] bpf: Rename bpf_tree to bpf_progs_tree","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"644204d147dba12ebdb13c89ba8829d0fe13f759","submitter":{"id":73687,"url":"http://patchwork.ozlabs.org/api/people/73687/?format=json","name":"Jiri Olsa","email":"jolsa@kernel.org"},"delegate":{"id":77147,"url":"http://patchwork.ozlabs.org/api/users/77147/?format=json","username":"bpf","first_name":"BPF","last_name":"Maintainers","email":"bpf@iogearbox.net"},"mbox":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-12-jolsa@kernel.org/mbox/","series":[{"id":158829,"url":"http://patchwork.ozlabs.org/api/series/158829/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/list/?series=158829","date":"2020-02-16T19:29:47","name":"bpf: Add trampoline and dispatcher to /proc/kallsyms","version":1,"mbox":"http://patchwork.ozlabs.org/series/158829/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1238821/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1238821/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming-bpf@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming-bpf@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org; spf=none (no SPF record)\n\tsmtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67;\n\thelo=vger.kernel.org; envelope-from=bpf-owner@vger.kernel.org;\n\treceiver=)","ozlabs.org;\n\tdmarc=fail (p=none dis=none) header.from=kernel.org"],"Received":["from vger.kernel.org (vger.kernel.org [209.132.180.67])\n\tby ozlabs.org (Postfix) with ESMTP id 48LHKn1vMMz9sPk\n\tfor ;\n\tMon, 17 Feb 2020 06:31:25 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1727845AbgBPTbY convert rfc822-to-8bit (ORCPT\n\t);\n\tSun, 16 Feb 2020 14:31:24 -0500","from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:36038 \"EHLO\n\tus-smtp-1.mimecast.com\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1727742AbgBPTbY (ORCPT ); \n\tSun, 16 Feb 2020 14:31:24 -0500","from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n\t[209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n\tus-mta-176-T303t3FyO4WLu373FX9xNA-1; Sun, 16 Feb 2020 14:31:19 -0500","from smtp.corp.redhat.com\n\t(int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11])\n\t(using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8CE4A1007268;\n\tSun, 16 Feb 2020 19:31:17 +0000 (UTC)","from krava.redhat.com (ovpn-204-28.brq.redhat.com [10.40.204.28])\n\tby smtp.corp.redhat.com (Postfix) with ESMTP id 9A5008574E;\n\tSun, 16 Feb 2020 19:31:11 +0000 (UTC)"],"From":"Jiri Olsa ","To":"Alexei Starovoitov ,\n\tDaniel Borkmann ","Cc":"netdev@vger.kernel.org, bpf@vger.kernel.org, Andrii Nakryiko\n\t, Yonghong Song , Song Liu\n\t, Martin KaFai Lau ,\n\tJakub Kicinski , David Miller ,\n\t=?utf-8?b?QmrDtnJuIFTDtnBlbA==?= ,\n\tJohn Fastabend , Jesper Dangaard Brouer\n\t, Arnaldo Carvalho de Melo ","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","X-Scanned-By":"MIMEDefang 2.79 on 10.5.11.11","X-MC-Unique":"T303t3FyO4WLu373FX9xNA-1","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"kernel.org","Content-Type":"text/plain; charset=WINDOWS-1252","Content-Transfer-Encoding":"8BIT","Sender":"bpf-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"bpf@vger.kernel.org"},"content":"Renaming bpf_tree to bpf_progs_tree and bpf_tree_ops\nto bpf_progs_tree_ops to better capture the usage of\nthe tree which is for the bpf_prog objects only.\n\nSigned-off-by: Jiri Olsa \n---\n kernel/bpf/core.c | 24 ++++++++++++++----------\n 1 file changed, 14 insertions(+), 10 deletions(-)","diff":"diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c\nindex a0feba447e5d..2f857bbfe05c 100644\n--- a/kernel/bpf/core.c\n+++ b/kernel/bpf/core.c\n@@ -580,13 +580,14 @@ bpf_get_prog_addr_start(struct latch_tree_node *n)\n \treturn aux->ksym.start;\n }\n \n-static __always_inline bool bpf_tree_less(struct latch_tree_node *a,\n-\t\t\t\t\t struct latch_tree_node *b)\n+static __always_inline bool\n+bpf_progs_tree_less(struct latch_tree_node *a,\n+\t\t struct latch_tree_node *b)\n {\n \treturn bpf_get_prog_addr_start(a) < bpf_get_prog_addr_start(b);\n }\n \n-static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n)\n+static __always_inline int bpf_progs_tree_comp(void *key, struct latch_tree_node *n)\n {\n \tunsigned long val = (unsigned long)key;\n \tconst struct bpf_prog_aux *aux;\n@@ -601,9 +602,9 @@ static __always_inline int bpf_tree_comp(void *key, struct latch_tree_node *n)\n \treturn 0;\n }\n \n-static const struct latch_tree_ops bpf_tree_ops = {\n-\t.less\t= bpf_tree_less,\n-\t.comp\t= bpf_tree_comp,\n+static const struct latch_tree_ops bpf_progs_tree_ops = {\n+\t.less\t= bpf_progs_tree_less,\n+\t.comp\t= bpf_progs_tree_comp,\n };\n \n static unsigned long\n@@ -646,7 +647,7 @@ static const struct latch_tree_ops bpf_ksym_tree_ops = {\n static DEFINE_SPINLOCK(bpf_lock);\n static LIST_HEAD(bpf_kallsyms);\n static struct latch_tree_root bpf_ksym_tree __cacheline_aligned;\n-static struct latch_tree_root bpf_tree __cacheline_aligned;\n+static struct latch_tree_root bpf_progs_tree __cacheline_aligned;\n \n static void __bpf_ksym_add(struct bpf_ksym *ksym)\n {\n@@ -706,7 +707,8 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp)\n \tbpf_get_prog_name(fp);\n \n \tspin_lock_bh(&bpf_lock);\n-\tlatch_tree_insert(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);\n+\tlatch_tree_insert(&fp->aux->ksym_tnode, &bpf_progs_tree,\n+\t\t\t &bpf_progs_tree_ops);\n \t__bpf_ksym_add(&fp->aux->ksym);\n \tspin_unlock_bh(&bpf_lock);\n }\n@@ -717,7 +719,8 @@ void bpf_prog_kallsyms_del(struct bpf_prog *fp)\n \t\treturn;\n \n \tspin_lock_bh(&bpf_lock);\n-\tlatch_tree_erase(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);\n+\tlatch_tree_erase(&fp->aux->ksym_tnode, &bpf_progs_tree,\n+\t\t\t &bpf_progs_tree_ops);\n \t__bpf_ksym_del(&fp->aux->ksym);\n \tspin_unlock_bh(&bpf_lock);\n }\n@@ -726,7 +729,8 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)\n {\n \tstruct latch_tree_node *n;\n \n-\tn = latch_tree_find((void *)addr, &bpf_tree, &bpf_tree_ops);\n+\tn = latch_tree_find((void *)addr, &bpf_progs_tree,\n+\t\t\t &bpf_progs_tree_ops);\n \treturn n ?\n \t container_of(n, struct bpf_prog_aux, ksym_tnode)->prog :\n \t NULL;\n","prefixes":["11/18"]}