From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7B902C4BA12 for ; Wed, 26 Feb 2020 13:04:27 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 529C52467B for ; Wed, 26 Feb 2020 13:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1582722267; bh=2nlmGBampwZ8rYu9B29sLZEw1IOL9Oj7wH832NEBdKc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ziHPltKG79ksCWhQ1oYD7/3tXLitHYCKrasa3Yy4Oq2QpyZn0vXGpayLt7177gDgr Bkha9oKXuQjHXfp/ul0Zss2C+cIz1POuytGJN5a/u14rrpDHpzgI1yfcZjRLhg0/rD XM+HtMIaWf9R+uG+gDa/EBKdVSWsYxyRHCDcPxtc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727190AbgBZNE0 convert rfc822-to-8bit (ORCPT ); Wed, 26 Feb 2020 08:04:26 -0500 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:54818 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727158AbgBZNE0 (ORCPT ); Wed, 26 Feb 2020 08:04:26 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-379-fefz4ma4MgWgwrncMWIMPw-1; Wed, 26 Feb 2020 08:04:21 -0500 X-MC-Unique: fefz4ma4MgWgwrncMWIMPw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 240E5801FA3; Wed, 26 Feb 2020 13:04:19 +0000 (UTC) Received: from krava.redhat.com (unknown [10.43.17.9]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4063319C7F; Wed, 26 Feb 2020 13:04:16 +0000 (UTC) From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Andrii Nakryiko , Yonghong Song , Song Liu , Martin KaFai Lau , Jakub Kicinski , David Miller , =?UTF-8?q?Bj=C3=B6rn=20T=C3=B6pel?= , John Fastabend , Jesper Dangaard Brouer , Arnaldo Carvalho de Melo Subject: [PATCH 08/18] bpf: Separate kallsyms add/del functions Date: Wed, 26 Feb 2020 14:03:35 +0100 Message-Id: <20200226130345.209469-9-jolsa@kernel.org> In-Reply-To: <20200226130345.209469-1-jolsa@kernel.org> References: <20200226130345.209469-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 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 Moving bpf_prog_ksym_node_add/del to __bpf_ksym_add/del and changing the argument to 'struct bpf_ksym' object. Signed-off-by: Jiri Olsa --- kernel/bpf/core.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index cdff3e4b207c..a8a4000f5ca8 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -644,20 +644,20 @@ static LIST_HEAD(bpf_kallsyms); static struct latch_tree_root bpf_ksym_tree __cacheline_aligned; static struct latch_tree_root bpf_tree __cacheline_aligned; -static void bpf_prog_ksym_node_add(struct bpf_prog_aux *aux) +static void __bpf_ksym_add(struct bpf_ksym *ksym) { - WARN_ON_ONCE(!list_empty(&aux->ksym.lnode)); - list_add_tail_rcu(&aux->ksym.lnode, &bpf_kallsyms); - latch_tree_insert(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops); + WARN_ON_ONCE(!list_empty(&ksym->lnode)); + list_add_tail_rcu(&ksym->lnode, &bpf_kallsyms); + latch_tree_insert(&ksym->tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops); } -static void bpf_prog_ksym_node_del(struct bpf_prog_aux *aux) +static void __bpf_ksym_del(struct bpf_ksym *ksym) { - if (list_empty(&aux->ksym.lnode)) + if (list_empty(&ksym->lnode)) return; - latch_tree_erase(&aux->ksym.tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops); - list_del_rcu(&aux->ksym.lnode); + latch_tree_erase(&ksym->tnode, &bpf_ksym_tree, &bpf_ksym_tree_ops); + list_del_rcu(&ksym->lnode); } static bool bpf_prog_kallsyms_candidate(const struct bpf_prog *fp) @@ -682,7 +682,7 @@ void bpf_prog_kallsyms_add(struct bpf_prog *fp) spin_lock_bh(&bpf_lock); latch_tree_insert(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops); - bpf_prog_ksym_node_add(fp->aux); + __bpf_ksym_add(&fp->aux->ksym); spin_unlock_bh(&bpf_lock); } @@ -693,7 +693,7 @@ void bpf_prog_kallsyms_del(struct bpf_prog *fp) spin_lock_bh(&bpf_lock); latch_tree_erase(&fp->aux->ksym_tnode, &bpf_tree, &bpf_tree_ops); - bpf_prog_ksym_node_del(fp->aux); + __bpf_ksym_del(&fp->aux->ksym); spin_unlock_bh(&bpf_lock); } -- 2.24.1