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 A2B54CDB47E for ; Wed, 18 Oct 2023 11:32:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 45BBC8D0155; Wed, 18 Oct 2023 07:32:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 40C1C8D0151; Wed, 18 Oct 2023 07:32:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2FD188D0155; Wed, 18 Oct 2023 07:32:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 20F9B8D0151 for ; Wed, 18 Oct 2023 07:32:55 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EC165A0213 for ; Wed, 18 Oct 2023 11:32:54 +0000 (UTC) X-FDA: 81358370268.11.E9700D7 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf28.hostedemail.com (Postfix) with ESMTP id 7D07FC001B for ; Wed, 18 Oct 2023 11:32:52 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; dmarc=none; spf=none (imf28.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=houtao@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1697628773; 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=lot3n0fLIIAkSXLahatSLhxrZe0YTQVk/HtXT5MPQ5w=; b=Z5gYDLCsB/Msp39ATnS6PAWPfILhq3v7kCAiJTyK2hlNPQyvM0xfQUxi8au7oQABbIlJz7 7OFcpXZpaPmH5saRBwxw3Gw5nbHquh1jlwattr9FxDoaRgwXJGSXbuJJ2IhBDS9qTU/Nqe fdyIlrA/louUMvtWZJHvjwQYZGZNF2k= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; dmarc=none; spf=none (imf28.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=houtao@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697628773; a=rsa-sha256; cv=none; b=xtXpzfnIvyPAV1R7OCYblTNfC+mEZDZEOBclwL19TT1Z+Dw2LSK/J0PSzs+GFkZy+FUSXQ 4gMVrOJTLpfplBHAyEyWPWnmiFLH2FiVQHwNOfk2GU2L9xzpvrIZmTj1BI8OCgszg4d8US rMZcs/vtmHalDnXL5F5W+XKhXhhwtfc= Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4S9TGj4b53z4f3mHt for ; Wed, 18 Oct 2023 19:32:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnfd1Mwi9l9jYmDQ--.41845S9; Wed, 18 Oct 2023 19:32:35 +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 v2 5/7] bpf: Move the declaration of __bpf_obj_drop_impl() to bpf.h Date: Wed, 18 Oct 2023 19:33:41 +0800 Message-Id: <20231018113343.2446300-6-houtao@huaweicloud.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20231018113343.2446300-1-houtao@huaweicloud.com> References: <20231018113343.2446300-1-houtao@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgDnfd1Mwi9l9jYmDQ--.41845S9 X-Coremail-Antispam: 1UD129KBjvJXoW7uF4UJr43Jw4DCFW7JFW7twb_yoW8Zr4rpa nxAr1Ikr48tF4j93s8Wa1ru34agrW7Ww1aka4DGw1avr4SqryDZa1DKF1fuFy3trW0krs2 vr1I9rWayry8ZFDanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBSb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1lIxAI cVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r4UMIIF0xvEx4A2js IEc7CjxVAFwI0_Gr1j6F4UJbIYCTnIWIevJa73UjIFyTuYvjxUFgAwUUUUU X-CM-SenderInfo: xkrx3t3r6k3tpzhluzxrxghudrp/ X-CFilter-Loop: Reflected X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 7D07FC001B X-Stat-Signature: 8fd96ugpnuzp1xyx9w7bma3rbw39opjr X-HE-Tag: 1697628772-589756 X-HE-Meta: U2FsdGVkX182AYPKPMIBD11JgGk1XgOKPf6OlF5NhsVLjdg3CYE78lVRn/p4hvFzvS85hlJz4RnMFYlX0wLOdDn20DUrxFh1okFEmC/jpTKLixhgl+/dlJTpcBA/h577ZpjZ2ywxRV18xOttlt979iBN4RSDQZXHIyGfNJ71NJAxj4l0NgQY63DeqbnHGjJvogsvLb5JYITZOmM6FOnIzz8s/sppR365Q5mjRCqzaHFMc2WfjxxflCdsTfebqDC/CPRf59DQxVn4dQTwQaEfsigKLgRJBpvU843gXMu4VPVI1x3C2paqqiPTNz0X7uOgg+oSjYQI/yxIznm0RXqU/iCso4aLIurECaODOmHaprGvMl7XLYvFHdYxFFtWskpXSvlRIXDZrH8A+gR+mZvkQJqNqw3sVJ5R/6InfOusArvmLLvLNR0fEY79IAZG3MblRB06j6KyKCQ8RTHCvRAcqjOmaLXq8vmAa1HJEGYvYaBmS71eKKjwKFTNjh2rH0sgHm8mKKEcImsZ2uhy1Vpc5D/Y1Bf/iE1TOj1up+yaBPPkL7+Fv2i3+SId1eM91X8jj9sJGTbO1uspBE8y5818X7GnC+RE3QV1lHd8IyDdVMOkPSTKa7ONd8edhlbirW3RcJ/woehYngX8WgCZCndoUar2AF5vgKapINbxHiPS+Rx4JvLORb4rHJNY/oX5RkhZGRBAk23dwo45Snac8FPAjHwv1FpH2oHfjsay5KjZeyc6sSe8WqEOjVyppQeaIWSsqksPt63GsM5gehU5zO+uE/yQIWAUBNJUaRfisu6hILuqfJKWfwXEpoup9SARyOgPBnkGEmzblR1qHYuPNCpdL5MWUUDi36kfmKvU4G3qnvVfjPGZA3Hs4bE//e2IuqnMowWOYu2MVfK5DVDtTWQsbi+azsB4V9XTrRF534Eu49EBmtrFshW3aQqnWS0xXhOAjvhHLh3CC0a7EWEjVuk L8R/i0eg Mja5HiUmNCesRow1S3yFOJY68DIrXLlHiz5exY+tEvt8rQDAvMqC3PIvR/eJAS4cq/tveMoVag/Y1IvmqFNG50OqlYhWCUPcgwX/vPSTkaZt30ooZZvO7+CJHAAA4BgA4UK1ndsFN4t6KzvIpTlY4LocbPpVK9mJ1um6QrG7MiyMFTC57r8JJ6HzbnPefUDDQTHfxry0FWWQ8JrHzJmh0r2m26cxpaf0+MZZYnELCg7YJAstCmXtedMK6BemijBodiLeHuP+nli7Okd8= 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 b4b40b45962b..ebd412179771 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 61f51dee8448..c67012d28e52 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 341f8cb4405c..69998f84f7c8 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