{"id":1238814,"url":"http://patchwork.ozlabs.org/api/patches/1238814/?format=json","web_url":"http://patchwork.ozlabs.org/project/netdev/patch/20200216193005.144157-9-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-9-jolsa@kernel.org>","list_archive_url":null,"date":"2020-02-16T19:29:55","name":"[08/18] bpf: Separate kallsyms add/del functions","commit_ref":null,"pull_url":null,"state":"changes-requested","archived":false,"hash":"e1a761839f74eb89b8ce0a235fbe39a4c4f8105c","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-9-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/1238814/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1238814/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 48LHKL1qdQz9sP7\n\tfor ;\n\tMon, 17 Feb 2020 06:31:02 +1100 (AEDT)","(majordomo@vger.kernel.org) by vger.kernel.org via listexpand\n\tid S1727742AbgBPTbB convert rfc822-to-8bit (ORCPT\n\t);\n\tSun, 16 Feb 2020 14:31:01 -0500","from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:37457 \"EHLO\n\tus-smtp-1.mimecast.com\" rhost-flags-OK-OK-OK-FAIL) by\n\tvger.kernel.org\n\twith ESMTP id S1726962AbgBPTbB (ORCPT ); \n\tSun, 16 Feb 2020 14:31:01 -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-269-iy3PiN6ZM_qoik-rHy94ow-1; Sun, 16 Feb 2020 14:30:56 -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 B4BE58017CC;\n\tSun, 16 Feb 2020 19:30:54 +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 8061D8574E;\n\tSun, 16 Feb 2020 19:30:46 +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 08/18] bpf: Separate kallsyms add/del functions","Date":"Sun, 16 Feb 2020 20:29:55 +0100","Message-Id":"<20200216193005.144157-9-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":"iy3PiN6ZM_qoik-rHy94ow-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":"Moving bpf_prog_ksym_node_add/del to __bpf_ksym_add/del\nand changing the argument to 'struct bpf_ksym' object.\n\nSigned-off-by: Jiri Olsa \n---\n kernel/bpf/core.c | 20 ++++++++++----------\n 1 file changed, 10 insertions(+), 10 deletions(-)","diff":"diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c\nindex 2fc6b28291cf..f361cfdf8d9e 100644\n--- a/kernel/bpf/core.c\n+++ b/kernel/bpf/core.c\n@@ -648,20 +648,20 @@ 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+static void __bpf_ksym_add(struct bpf_ksym *ksym)\n {\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_ksym_tree, &bpf_ksym_tree_ops);\n+\tWARN_ON_ONCE(!list_empty(&ksym->lnode));\n+\tlist_add_tail_rcu(&ksym->lnode, &bpf_kallsyms);\n+\tlatch_tree_insert(&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+static void __bpf_ksym_del(struct bpf_ksym *ksym)\n {\n-\tif (list_empty(&aux->ksym.lnode))\n+\tif (list_empty(&ksym->lnode))\n \t\treturn;\n \n-\tlatch_tree_erase(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);\n-\tlist_del_rcu(&aux->ksym.lnode);\n+\tlatch_tree_erase(&ksym->tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops);\n+\tlist_del_rcu(&ksym->lnode);\n }\n \n static bool bpf_prog_kallsyms_candidate(const struct bpf_prog *fp)\n@@ -686,7 +686,7 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp)\n \n \tspin_lock_bh(&bpf_lock);\n \tlatch_tree_insert(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);\n-\tbpf_prog_ksym_node_add(fp->aux);\n+\t__bpf_ksym_add(&fp->aux->ksym);\n \tspin_unlock_bh(&bpf_lock);\n }\n \n@@ -697,7 +697,7 @@ void bpf_prog_kallsyms_del(struct bpf_prog *fp)\n \n \tspin_lock_bh(&bpf_lock);\n \tlatch_tree_erase(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops);\n-\tbpf_prog_ksym_node_del(fp->aux);\n+\t__bpf_ksym_del(&fp->aux->ksym);\n \tspin_unlock_bh(&bpf_lock);\n }\n \n","prefixes":["08/18"]}