{"id":1238811,"url":"http://patchwork.ozlabs.org/api/patches/1238811/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-7-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-7-jolsa@kernel.org>","list_archive_url":null,"date":"2020-02-16T19:29:53","name":"[06/18] bpf: Add bpf_ksym_tree tree","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"e1bc64ed4c0d9a17e247dd49b8ef3ad4b391fd00","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-7-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/1238811/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1238811/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"patchwork-incoming-netdev@ozlabs.org","Delivered-To":"patchwork-incoming-netdev@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;\n\tenvelope-from=netdev-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 48LHK74Bfhz9sPK\n\tfor ;\n\tMon, 17 Feb 2020 06:30:51 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1727838AbgBPTau convert rfc822-to-8bit (ORCPT\n\t);\n\tSun, 16 Feb 2020 14:30:50 -0500","from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49799 \"EHLO\n\tus-smtp-1.mimecast.com\" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org\n\twith ESMTP id S1726036AbgBPTau (ORCPT\n\t); Sun, 16 Feb 2020 14:30:50 -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-148-bRWT7XxEOe64Mn7ymjQNhw-1; Sun, 16 Feb 2020 14:30:44 -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 1D5AD8017CC;\n\tSun, 16 Feb 2020 19:30:42 +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 EFEB38574E;\n\tSun, 16 Feb 2020 19:30:38 +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 06/18] bpf: Add bpf_ksym_tree tree","Date":"Sun, 16 Feb 2020 20:29:53 +0100","Message-Id":"<20200216193005.144157-7-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":"bRWT7XxEOe64Mn7ymjQNhw-1","X-Mimecast-Spam-Score":"0","X-Mimecast-Originator":"kernel.org","Content-Type":"text/plain; charset=WINDOWS-1252","Content-Transfer-Encoding":"8BIT","Sender":"netdev-owner@vger.kernel.org","Precedence":"bulk","List-ID":"","X-Mailing-List":"netdev@vger.kernel.org"},"content":"The bpf_tree is used both for kallsyms iterations and searching\nfor exception tables of bpf programs, which is needed only for\nbpf programs.\n\nAdding bpf_ksym_tree that will hold symbols for all bpf_prog\nbpf_trampoline and bpf_dispatcher objects and keeping bpf_tree\nonly for bpf_prog objects to keep it fast.\n\nSigned-off-by: Jiri Olsa \n---\n include/linux/bpf.h | 1 +\n kernel/bpf/core.c | 60 ++++++++++++++++++++++++++++++++++++++++-----\n 2 files changed, 55 insertions(+), 6 deletions(-)","diff":"diff --git a/include/linux/bpf.h b/include/linux/bpf.h\nindex f1174d24c185..5d6649cdc3df 100644\n--- a/include/linux/bpf.h\n+++ b/include/linux/bpf.h\n@@ -468,6 +468,7 @@ struct bpf_ksym {\n \tunsigned long\t\t end;\n \tchar\t\t\t name[KSYM_NAME_LEN];\n \tstruct list_head\t lnode;\n+\tstruct latch_tree_node\t tnode;\n };\n \n enum bpf_tramp_prog_type {\ndiff --git a/kernel/bpf/core.c b/kernel/bpf/core.c\nindex 604093d2153a..9fb08b4d01f7 100644\n--- a/kernel/bpf/core.c\n+++ b/kernel/bpf/core.c\n@@ -606,8 +606,46 @@ static const struct latch_tree_ops bpf_tree_ops = {\n \t.comp\t= bpf_tree_comp,\n };\n \n+static unsigned long\n+bpf_get_ksym_start(struct latch_tree_node *n)\n+{\n+\tconst struct bpf_ksym *ksym;\n+\n+\tksym = container_of(n, struct bpf_ksym, tnode);\n+\treturn ksym->start;\n+}\n+\n+static bool\n+bpf_ksym_tree_less(struct latch_tree_node *a,\n+\t\t struct latch_tree_node *b)\n+{\n+\treturn bpf_get_ksym_start(a) < bpf_get_ksym_start(b);\n+}\n+\n+static int\n+bpf_ksym_tree_comp(void *key, struct latch_tree_node *n)\n+{\n+\tunsigned long val = (unsigned long)key;\n+\tconst struct bpf_ksym *ksym;\n+\n+\tksym = container_of(n, struct bpf_ksym, tnode);\n+\n+\tif (val < ksym->start)\n+\t\treturn -1;\n+\tif (val >= ksym->end)\n+\t\treturn 1;\n+\n+\treturn 0;\n+}\n+\n+static const struct latch_tree_ops bpf_ksym_tree_ops = {\n+\t.less\t= bpf_ksym_tree_less,\n+\t.comp\t= bpf_ksym_tree_comp,\n+};\n+\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 \n static void bpf_prog_ksym_node_add(struct bpf_prog_aux *aux)\n@@ -615,6 +653,7 @@ static void bpf_prog_ksym_node_add(struct bpf_prog_aux *aux)\n \tWARN_ON_ONCE(!list_empty(&aux->ksym.lnode));\n \tlist_add_tail_rcu(&aux->ksym.lnode, &bpf_kallsyms);\n \tlatch_tree_insert(&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);\n+\tlatch_tree_insert(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);\n }\n \n static void bpf_prog_ksym_node_del(struct bpf_prog_aux *aux)\n@@ -623,6 +662,7 @@ static void bpf_prog_ksym_node_del(struct bpf_prog_aux *aux)\n \t\treturn;\n \n \tlatch_tree_erase(&aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);\n+\tlatch_tree_erase(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);\n \tlist_del_rcu(&aux->ksym.lnode);\n }\n \n@@ -671,19 +711,27 @@ static struct bpf_prog *bpf_prog_kallsyms_find(unsigned long addr)\n \t NULL;\n }\n \n+static struct bpf_ksym *bpf_ksym_find(unsigned long addr)\n+{\n+\tstruct latch_tree_node *n;\n+\n+\tn = latch_tree_find((void *)addr, &bpf_ksym_tree, &bpf_ksym_tree_ops);\n+\treturn n ? container_of(n, struct bpf_ksym, tnode) : NULL;\n+}\n+\n const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,\n \t\t\t\t unsigned long *off, char *sym)\n {\n-\tstruct bpf_prog *prog;\n+\tstruct bpf_ksym *ksym;\n \tchar *ret = NULL;\n \n \trcu_read_lock();\n-\tprog = bpf_prog_kallsyms_find(addr);\n-\tif (prog) {\n-\t\tunsigned long symbol_start = prog->aux->ksym.start;\n-\t\tunsigned long symbol_end = prog->aux->ksym.end;\n+\tksym = bpf_ksym_find(addr);\n+\tif (ksym) {\n+\t\tunsigned long symbol_start = ksym->start;\n+\t\tunsigned long symbol_end = ksym->end;\n \n-\t\tstrncpy(sym, prog->aux->ksym.name, KSYM_NAME_LEN);\n+\t\tstrncpy(sym, ksym->name, KSYM_NAME_LEN);\n \n \t\tret = sym;\n \t\tif (size)\n","prefixes":["06/18"]}