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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id E58ADCDB474 for ; Fri, 20 Oct 2023 13:31:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3D1598D00D3; Fri, 20 Oct 2023 09:31:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 37EF28D00BC; Fri, 20 Oct 2023 09:31:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 21FDB8D00D3; Fri, 20 Oct 2023 09:31:08 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0DB578D00BC for ; Fri, 20 Oct 2023 09:31:08 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C877BA10DA for ; Fri, 20 Oct 2023 13:31:07 +0000 (UTC) X-FDA: 81365925774.22.238AE4B Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf25.hostedemail.com (Postfix) with ESMTP id BFDC5A0010 for ; Fri, 20 Oct 2023 13:31:04 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=none; dmarc=none; spf=none (imf25.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=houtao@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697808665; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MLhi+Wo/vdVWoTUKpSOhxPbI62thZ7H+Yb+ge7LnRlk=; b=B39Fs4MIWcuFbTBQ6DP6fsp2OKR3aZezWAwGs7t+m2EewZD49zQ5PAX7WL/6m7IOR+r6u2 QYOuAZz0aEaUT7ZVMi+r7B1ZSz3+IyjCcaLbXtSgZgf9uXFXQvwCFYDXQHOer5Jpwz5DQq 4CQLMrb6Ik59u4IPgMGx0LxqTi1LSXU= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=none; dmarc=none; spf=none (imf25.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=houtao@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697808665; a=rsa-sha256; cv=none; b=6Vq6vhaFL3uJWRJXsTlvZu+NwA9A000YLsdOh3e0yroLiJrcKPo8mBATgtKz6nx0iIePaL U51kGpa2FpF3FVmh+yfnaeO+JFU83YlD+hk9QhANy1C4N5raJ0xx5dLt9/kcdfeVbn/qH6 sffdtxZKnu5g8nnu1bhibRtv5k864kQ= Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4SBlpR74rPz4f3l8Q for ; Fri, 20 Oct 2023 21:30:55 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBn+dgIgTJlmYjjDQ--.7231S9; Fri, 20 Oct 2023 21:30:57 +0800 (CST) From: Hou Tao To: bpf@vger.kernel.org, linux-mm@kvack.org Cc: Martin KaFai Lau , Alexei Starovoitov , Andrii Nakryiko , Song Liu , Hao Luo , Yonghong Song , Daniel Borkmann , KP Singh , Stanislav Fomichev , Jiri Olsa , John Fastabend , houtao1@huawei.com, Dennis Zhou , Tejun Heo , Christoph Lameter , Andrew Morton Subject: [PATCH bpf-next v3 5/7] bpf: Move the declaration of __bpf_obj_drop_impl() to bpf.h Date: Fri, 20 Oct 2023 21:32:00 +0800 Message-Id: <20231020133202.4043247-6-houtao@huaweicloud.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20231020133202.4043247-1-houtao@huaweicloud.com> References: <20231020133202.4043247-1-houtao@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgBn+dgIgTJlmYjjDQ--.7231S9 X-Coremail-Antispam: 1UD129KBjvJXoW7uF4UJr43Jw4DZF18CFW3KFg_yoW8Zr4kpF sxAr1Ikr48tF4j934DWa1ru343WrW7Ww1a9a4DG34avrWSqr9rXa1DKF1fuFW3trW8Krs2 vr1I9rWayry8ZFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1lIxAI cVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r4j6F4UMIIF0xvEx4A2js IEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUFgAwUUUUU X-CM-SenderInfo: xkrx3t3r6k3tpzhluzxrxghudrp/ X-CFilter-Loop: Reflected X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: BFDC5A0010 X-Stat-Signature: f3ba63bsgm4m6n7i6dyff3cjbkessk6a X-Rspam-User: X-HE-Tag: 1697808664-751327 X-HE-Meta: U2FsdGVkX1/k4U+T5Bs/6Mk6X6uzuCxk9vD1GBHZmmMVnQAYBufcua670zAI9zaHnbg12O90Q8alqPV8YCizk0rICkYdXqw2caZRV4B1n/PmXtLhz7NOnumDdB8GparxDRz3LlaJRmRR8aFrsx8j4hJWkJBUxBYpnww7SHgK4QKi23vuqfCGXx31wQ5s4aWyscYICx7PWkVhMEd74lZdBJTM7pVA7rJSoh81fv1EmCoDigz2a2xVAQLnKxFGP7gL5tFBwoUQ/ktp6tr7jDd6M6kimWakkexRpleCuW47iP8xlVgzLMLpZatgR2KBFAwcxqKnSyy9gNXfD9lvS8wLt+h+IWHwu40bTLwLOUdtkj7w60r+C0Q1ZQE6FEA9T8tYmbtyvTfvZTXynzhDhtJBdEDg8TXLsapk0jU39yMrLAYWB8mGVFzYgMjZT7j+8JUF40vne4ub370xPa+mLtIP8xH7crVlG10AMsJnu3n9zElS/Swpxc4P5q+npDGLD8hU7wgMbKOLH8VigAG7M2SkTChgnh03NBc3t/cnPQA35qwe6clFGAwgdb6j+3qrUKo86ptW7/nvoQt1VunBtXYro+6am5woVKBGILpBsd2BqTHHf2Wh6a6zoF3EkIVuGKcCf/uu2hIHJ9ogRlX0EDocLHDFMrpkWh5GP/fBQ0+7R8+REPngIZ4qIhZvhZKqgtHoR8EL3/RKkAPm7/1feGBq6zALplF+VDVP3QuOQtiIyzTDiBXBeZG/P7J6BF/1CZJqNX/K2Z4PA/2I5SpWHB/4ZIk5d5t8VG3Gr8J6AU1fX6Wc4FVep+SbyHdHnn2zjGH5YtRSuRW0kJ7+V0kQd+F22WEIm6ROReH8sZqIzhhFxOb5GLuTmWfA3DB5HL0LTKBL/O6x9905lFSh0RjVFHCBQMRl1LHzsEzrSrMUX0QHhoQzyIIK/YRsKoGs2dR8k77l8iWK1g+2YNrogno2XTV K0G8mL5u d2REEodCf7c4uuVibSxJhq7HiSxyEBmz9DyNtiY2kRmp8AQDYF9+0MS+cigtB4MnwkNOO5v7MJnWRxbfetmR+ry9UGTr32/Fo5AZA4xGnM9i+w55p6ReH02iq10vQVLK65gVfXppXk6FJqJPmygI01IwHDCqaQGLsJi4HyNf8v1J2unh1sQWsaH64IAkiBEzcTYS+T4yz07lpeJb4OPv3YAJhIn91gRVC8zqEy0NSOpEruCtc7klatHWq6mCnS2tvHJonnUAmVKLa6Z7cJCEKCsSyl4dNPeWasjAWMqX+lFYe2TcxVKkVOi8GEA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Hou Tao both syscall.c and helpers.c have the declaration of __bpf_obj_drop_impl(), so just move it to a common header file. Signed-off-by: Hou Tao --- include/linux/bpf.h | 1 + kernel/bpf/helpers.c | 2 -- kernel/bpf/syscall.c | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index b4b40b45962b2..ebd412179771e 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -2058,6 +2058,7 @@ struct btf_record *btf_record_dup(const struct btf_record *rec); bool btf_record_equal(const struct btf_record *rec_a, const struct btf_record *rec_b); void bpf_obj_free_timer(const struct btf_record *rec, void *obj); void bpf_obj_free_fields(const struct btf_record *rec, void *obj); +void __bpf_obj_drop_impl(void *p, const struct btf_record *rec); struct bpf_map *bpf_map_get(u32 ufd); struct bpf_map *bpf_map_get_with_uref(u32 ufd); diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index da058aead20c6..c814bb44d2d1b 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -1811,8 +1811,6 @@ bpf_base_func_proto(enum bpf_func_id func_id) } } -void __bpf_obj_drop_impl(void *p, const struct btf_record *rec); - void bpf_list_head_free(const struct btf_field *field, void *list_head, struct bpf_spin_lock *spin_lock) { diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 341f8cb4405c0..69998f84f7c8c 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -626,8 +626,6 @@ void bpf_obj_free_timer(const struct btf_record *rec, void *obj) bpf_timer_cancel_and_free(obj + rec->timer_off); } -extern void __bpf_obj_drop_impl(void *p, const struct btf_record *rec); - void bpf_obj_free_fields(const struct btf_record *rec, void *obj) { const struct btf_field *fields; -- 2.29.2