{"id":1238807,"url":"http://patchwork.ozlabs.org/api/patches/1238807/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-5-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-5-jolsa@kernel.org>","list_archive_url":null,"date":"2020-02-16T19:29:51","name":"[04/18] bpf: Add name to struct bpf_ksym","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"aa90f8819cb6bebf9b4e794cf5c9fd5bacda0aed","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-5-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/1238807/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1238807/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 48LHJy6kn9z9sP7\n\tfor ;\n\tMon, 17 Feb 2020 06:30:42 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1727740AbgBPTak convert rfc822-to-8bit (ORCPT\n\t);\n\tSun, 16 Feb 2020 14:30:40 -0500","from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:51115 \"EHLO\n\tus-smtp-1.mimecast.com\" rhost-flags-OK-OK-OK-FAIL) by\n\tvger.kernel.org with ESMTP id S1726036AbgBPTak (ORCPT\n\t); Sun, 16 Feb 2020 14:30:40 -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-271-w98s-2XPNoWU9drIwNLkcg-1; Sun, 16 Feb 2020 14:30:37 -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 268471005516;\n\tSun, 16 Feb 2020 19:30:35 +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 AD5558AC5B;\n\tSun, 16 Feb 2020 19:30:28 +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 04/18] bpf: Add name to struct bpf_ksym","Date":"Sun, 16 Feb 2020 20:29:51 +0100","Message-Id":"<20200216193005.144157-5-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":"w98s-2XPNoWU9drIwNLkcg-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":"Adding name to 'struct bpf_ksym' object to carry the name\nof the symbol for bpf_prog, bpf_trampoline, bpf_dispatcher.\n\nThe current benefit is that name is now generated only when\nthe symbol is added to the list, so we don't need to generate\nit every time it's accessed.\n\nSigned-off-by: Jiri Olsa \n---\n include/linux/bpf.h | 2 ++\n include/linux/filter.h | 6 ------\n kernel/bpf/core.c | 8 +++++---\n kernel/events/core.c | 9 ++++-----\n 4 files changed, 11 insertions(+), 14 deletions(-)","diff":"diff --git a/include/linux/bpf.h b/include/linux/bpf.h\nindex 5ad8eea1cd37..e7b2e9fc256c 100644\n--- a/include/linux/bpf.h\n+++ b/include/linux/bpf.h\n@@ -18,6 +18,7 @@\n #include \n #include \n #include \n+#include \n \n struct bpf_verifier_env;\n struct bpf_verifier_log;\n@@ -465,6 +466,7 @@ void notrace __bpf_prog_exit(struct bpf_prog *prog, u64 start);\n struct bpf_ksym {\n \tunsigned long\t\t start;\n \tunsigned long\t\t end;\n+\tchar\t\t\t name[KSYM_NAME_LEN];\n };\n \n enum bpf_tramp_prog_type {\ndiff --git a/include/linux/filter.h b/include/linux/filter.h\nindex eafe72644282..a945c250ad53 100644\n--- a/include/linux/filter.h\n+++ b/include/linux/filter.h\n@@ -1062,7 +1062,6 @@ bpf_address_lookup(unsigned long addr, unsigned long *size,\n \n void bpf_prog_kallsyms_add(struct bpf_prog *fp);\n void bpf_prog_kallsyms_del(struct bpf_prog *fp);\n-void bpf_get_prog_name(const struct bpf_prog *prog, char *sym);\n \n #else /* CONFIG_BPF_JIT */\n \n@@ -1131,11 +1130,6 @@ static inline void bpf_prog_kallsyms_del(struct bpf_prog *fp)\n {\n }\n \n-static inline void bpf_get_prog_name(const struct bpf_prog *prog, char *sym)\n-{\n-\tsym[0] = '\\0';\n-}\n-\n #endif /* CONFIG_BPF_JIT */\n \n void bpf_prog_kallsyms_del_all(struct bpf_prog *fp);\ndiff --git a/kernel/bpf/core.c b/kernel/bpf/core.c\nindex 39a9e4184900..a7aaa81035b1 100644\n--- a/kernel/bpf/core.c\n+++ b/kernel/bpf/core.c\n@@ -535,8 +535,9 @@ bpf_get_prog_addr_region(const struct bpf_prog *prog)\n \tprog->aux->ksym.end = addr + hdr->pages * PAGE_SIZE;\n }\n \n-void bpf_get_prog_name(const struct bpf_prog *prog, char *sym)\n+static void bpf_get_prog_name(const struct bpf_prog *prog)\n {\n+\tchar *sym = prog->aux->ksym.name;\n \tconst char *end = sym + KSYM_NAME_LEN;\n \tconst struct btf_type *type;\n \tconst char *func_name;\n@@ -643,6 +644,7 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp)\n \t\treturn;\n \n \tbpf_get_prog_addr_region(fp);\n+\tbpf_get_prog_name(fp);\n \n \tspin_lock_bh(&bpf_lock);\n \tbpf_prog_ksym_node_add(fp->aux);\n@@ -681,7 +683,7 @@ const char *__bpf_address_lookup(unsigned long addr, unsigned long *size,\n \t\tunsigned long symbol_start = prog->aux->ksym.start;\n \t\tunsigned long symbol_end = prog->aux->ksym.end;\n \n-\t\tbpf_get_prog_name(prog, sym);\n+\t\tstrncpy(sym, prog->aux->ksym.name, KSYM_NAME_LEN);\n \n \t\tret = sym;\n \t\tif (size)\n@@ -738,7 +740,7 @@ int bpf_get_kallsym(unsigned int symnum, unsigned long *value, char *type,\n \t\tif (it++ != symnum)\n \t\t\tcontinue;\n \n-\t\tbpf_get_prog_name(aux->prog, sym);\n+\t\tstrncpy(sym, aux->ksym.name, KSYM_NAME_LEN);\n \n \t\t*value = (unsigned long)aux->prog->bpf_func;\n \t\t*type = BPF_SYM_ELF_TYPE;\ndiff --git a/kernel/events/core.c b/kernel/events/core.c\nindex 17f9a4a909eb..282da567526d 100644\n--- a/kernel/events/core.c\n+++ b/kernel/events/core.c\n@@ -8246,23 +8246,22 @@ static void perf_event_bpf_emit_ksymbols(struct bpf_prog *prog,\n \t\t\t\t\t enum perf_bpf_event_type type)\n {\n \tbool unregister = type == PERF_BPF_EVENT_PROG_UNLOAD;\n-\tchar sym[KSYM_NAME_LEN];\n \tint i;\n \n \tif (prog->aux->func_cnt == 0) {\n-\t\tbpf_get_prog_name(prog, sym);\n \t\tperf_event_ksymbol(PERF_RECORD_KSYMBOL_TYPE_BPF,\n \t\t\t\t (u64)(unsigned long)prog->bpf_func,\n-\t\t\t\t prog->jited_len, unregister, sym);\n+\t\t\t\t prog->jited_len, unregister,\n+\t\t\t\t prog->aux->ksym.name);\n \t} else {\n \t\tfor (i = 0; i < prog->aux->func_cnt; i++) {\n \t\t\tstruct bpf_prog *subprog = prog->aux->func[i];\n \n-\t\t\tbpf_get_prog_name(subprog, sym);\n \t\t\tperf_event_ksymbol(\n \t\t\t\tPERF_RECORD_KSYMBOL_TYPE_BPF,\n \t\t\t\t(u64)(unsigned long)subprog->bpf_func,\n-\t\t\t\tsubprog->jited_len, unregister, sym);\n+\t\t\t\tsubprog->jited_len, unregister,\n+\t\t\t\tprog->aux->ksym.name);\n \t\t}\n \t}\n }\n","prefixes":["04/18"]}