{"id":1238827,"url":"http://patchwork.ozlabs.org/api/patches/1238827/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-15-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-15-jolsa@kernel.org>","list_archive_url":null,"date":"2020-02-16T19:30:01","name":"[14/18] bpf: Add dispatchers to kallsyms","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"f0ee0c3f38ec03812a2e6469bd702fd610ae57e3","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-15-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/1238827/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1238827/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 48LHL452Xcz9sP7\n\tfor ;\n\tMon, 17 Feb 2020 06:31:40 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1728021AbgBPTbj convert rfc822-to-8bit (ORCPT\n\t);\n\tSun, 16 Feb 2020 14:31:39 -0500","from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:48864 \"EHLO\n\tus-smtp-1.mimecast.com\" rhost-flags-OK-OK-OK-FAIL) by\n\tvger.kernel.org with ESMTP id S1727957AbgBPTbj (ORCPT\n\t); Sun, 16 Feb 2020 14:31:39 -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-15-nDO0ajQrNV-e2dsolwyg1w-1; Sun, 16 Feb 2020 14:31:34 -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 8122E1007268;\n\tSun, 16 Feb 2020 19:31:32 +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 7E8C48574E;\n\tSun, 16 Feb 2020 19:31: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 14/18] bpf: Add dispatchers to kallsyms","Date":"Sun, 16 Feb 2020 20:30:01 +0100","Message-Id":"<20200216193005.144157-15-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":"nDO0ajQrNV-e2dsolwyg1w-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 dispatchers to kallsyms. It's displayed as\n bpf_dispatcher_\n\nwhere NAME is the name of dispatcher.\n\nSigned-off-by: Jiri Olsa \n---\n include/linux/bpf.h | 19 ++++++++++++-------\n kernel/bpf/dispatcher.c | 9 ++++++++-\n 2 files changed, 20 insertions(+), 8 deletions(-)","diff":"diff --git a/include/linux/bpf.h b/include/linux/bpf.h\nindex c216af89254f..4ae2273112ba 100644\n--- a/include/linux/bpf.h\n+++ b/include/linux/bpf.h\n@@ -520,6 +520,7 @@ struct bpf_dispatcher {\n \tint num_progs;\n \tvoid *image;\n \tu32 image_off;\n+\tstruct bpf_ksym ksym;\n };\n \n static __always_inline unsigned int bpf_dispatcher_nop_func(\n@@ -535,13 +536,17 @@ struct bpf_trampoline *bpf_trampoline_lookup(u64 key);\n int bpf_trampoline_link_prog(struct bpf_prog *prog);\n int bpf_trampoline_unlink_prog(struct bpf_prog *prog);\n void bpf_trampoline_put(struct bpf_trampoline *tr);\n-#define BPF_DISPATCHER_INIT(name) {\t\t\t\\\n-\t.mutex = __MUTEX_INITIALIZER(name.mutex),\t\\\n-\t.func = &name##_func,\t\t\t\t\\\n-\t.progs = {},\t\t\t\t\t\\\n-\t.num_progs = 0,\t\t\t\t\t\\\n-\t.image = NULL,\t\t\t\t\t\\\n-\t.image_off = 0\t\t\t\t\t\\\n+#define BPF_DISPATCHER_INIT(_name) {\t\t\t\t\\\n+\t.mutex = __MUTEX_INITIALIZER(_name.mutex),\t\t\\\n+\t.func = &_name##_func,\t\t\t\t\t\\\n+\t.progs = {},\t\t\t\t\t\t\\\n+\t.num_progs = 0,\t\t\t\t\t\t\\\n+\t.image = NULL,\t\t\t\t\t\t\\\n+\t.image_off = 0,\t\t\t\t\t\t\\\n+\t.ksym = {\t\t\t\t\t\t\\\n+\t\t.name = #_name,\t\t\t\t\\\n+\t\t.lnode = LIST_HEAD_INIT(_name.ksym.lnode),\t\\\n+\t},\t\t\t\t\t\t\t\\\n }\n \n #define DEFINE_BPF_DISPATCHER(name)\t\t\t\t\t\\\ndiff --git a/kernel/bpf/dispatcher.c b/kernel/bpf/dispatcher.c\nindex 3a5871bbd6d0..74060c92b2f3 100644\n--- a/kernel/bpf/dispatcher.c\n+++ b/kernel/bpf/dispatcher.c\n@@ -154,7 +154,14 @@ void bpf_dispatcher_change_prog(struct bpf_dispatcher *d, struct bpf_prog *from,\n \tif (!changed)\n \t\tgoto out;\n \n-\tbpf_dispatcher_update(d, prev_num_progs);\n+\tif (!bpf_dispatcher_update(d, prev_num_progs)) {\n+\t\tif (!prev_num_progs)\n+\t\t\tbpf_image_ksym_add(d->image, &d->ksym);\n+\n+\t\tif (!d->num_progs)\n+\t\t\tbpf_image_ksym_del(&d->ksym);\n+\t}\n+\n out:\n \tmutex_unlock(&d->mutex);\n }\n","prefixes":["14/18"]}