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 1945AE95A63 for ; Sat, 7 Oct 2023 13:50:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D1DE8D0016; Sat, 7 Oct 2023 09:50:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10D758D0005; Sat, 7 Oct 2023 09:50:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E79AC8D0016; Sat, 7 Oct 2023 09:50:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id D933B8D0005 for ; Sat, 7 Oct 2023 09:50:12 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id A69E91201E9 for ; Sat, 7 Oct 2023 13:50:12 +0000 (UTC) X-FDA: 81318799464.01.6931264 Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by imf14.hostedemail.com (Postfix) with ESMTP id 112F6100020 for ; Sat, 7 Oct 2023 13:50:09 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=none; dmarc=none; spf=none (imf14.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=1696686611; 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=nnDi7O0bwXPzUU08E2n9e2OLqxZjFOv8fz6NNZkN11Y=; b=Jgah3+yYkBOHI9TLK7Uwv2u+L3miP+1AEtrT6c5VfWH3fkPYbgZf+lTrUNGjJwLEuNd6AA TORQZrThbqHV7cE2YZfBbzQutgSTYUC4Mj0evWxtwALzRvF7YeIj3yHGGczEDJ0pOKlIh+ STQGPj4zi6/dklLUVYYH2ATd1Xan10A= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=none; dmarc=none; spf=none (imf14.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=1696686611; a=rsa-sha256; cv=none; b=q4Piaw+GqYXGJnH2JN8i8AGR9jm4YgaIu5SozThLJFa9c2s26sTnuXeBv/9sLv+05ACie1 qEptaTO9Bqsbmfsb2+LCV8jZdTH5xeKpSSvK35Zm2y2DJK4tLXPldV/9wzaVtRRyTz4b8J ZZj4xgktcFVMB2R8zFMQtSXE4KQv59E= Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4S2mrH5pLfz4f3kFs for ; Sat, 7 Oct 2023 21:49:51 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAnvdz9YSFl4YF2CQ--.30763S8; Sat, 07 Oct 2023 21:49:56 +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 4/6] bpf: Move the declaration of __bpf_obj_drop_impl() to internal.h Date: Sat, 7 Oct 2023 21:51:04 +0800 Message-Id: <20231007135106.3031284-5-houtao@huaweicloud.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20231007135106.3031284-1-houtao@huaweicloud.com> References: <20231007135106.3031284-1-houtao@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:gCh0CgAnvdz9YSFl4YF2CQ--.30763S8 X-Coremail-Antispam: 1UD129KBjvJXoW7uF4UJr45ArWkXr18WF47XFb_yoW8Kr4fpF sxAF17GrsYqF4293srWF4F9FWYq3yUW343Ca4DW34Yyr4SqF9Fqw4DtF13WFy3KrW8KrWr ZF1FgryFy3y8Z3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBIb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUAV Cq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0 rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267 AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E 14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7 xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Y z7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2 Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s02 6x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0x vE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY 6xAIw20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aV CY1x0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU13l1DUUUUU== X-CM-SenderInfo: xkrx3t3r6k3tpzhluzxrxghudrp/ X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: 112F6100020 X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: wmoneiwifsii8y4ndwkx9tsiuyr9693d X-HE-Tag: 1696686609-740965 X-HE-Meta: U2FsdGVkX1/7g2oyI663FJshXjh3SxIt/ewrh2VOsxocOsVm8y9E6quwWm8oWc8ktPkktFngQCjrvPFLdhzs3pP2ypAQCSLEl9H51RexWWTf15J3/ikwrZwGZDofIn5BOG0ZuAnmihLKkdT7nD+qsw4jwXAeKy0JlKvStRoq8t9t2FZ0zoRtvUmiwozuRMTSK3Liq2tv0PxmFIeygJNzEb+M6qI4G8COklwoH4b0XWXCkXKt6VHY5LZ+BGJL7tC2SxpLMMTS3Zsvnf7wH06GR4ET2VOTuL5Bi400S64sEJxI5780Mr6OESwb7jrWaKfCfNiV5V8FeVzPzx35n3Heu4VDftS1BqPIotns1v6/3Jya2s4EnRBll1l+DyLHS/fAmgGWZEEl2jBsXF12IaqZvq8CYqCPtMRB6kUyWAQUTw6SdAEUOLtfpN7C1jEfr/ZQid/cZErqRzvwu4Cl3eNT6e9jNSbk4zHxVfrYOukFvf3qEbxGoAHPq0kz6br73T+n2EuyBHEgnhEznTuH4BkB+fbH+Tcqmx3xvY0jZH0dR6ZwrlluQbLDNHFnKPuLiLCEZYc3FANCwtf241BeVn29un5CvcIDWbrN3CTgpvJuCKb14ioEMRKXDXkBJNKWGiCbZMnfKnN+xTuMaRB4Qku//RkAxpGwDgOj6gLo+nA677gy1W5ZkhkhiQceLyr21Xv2EaFt7RnYDsrFT+9HkTPHVvXTZXAY2zhJMoKGTR4mT9uFdnGN6iSvaMABtMnjUz1gWptHTnS91Xr1WvNjb7XXvChhb2Ym0TTWkSbWX3DU2WL5ptQgiSWoBj9MdT/piHPQASita4QgUxIQM9OTwOW840j9EHp3xmhEl/SCWjr3ioQdWcQAR5gIRf5ox3C1q/GngzsPwHv3VIO3XThJws8EMoZ1tt9If1eTO/cKLoWyDoBcg/MMuq5986H+hkiWSmcKQoq6yEHPjwFBo7DGJn8 ayWvxzHe OkBkBfebGeQwz+08MAkl24I52NBVQ7RuRO3mUF2i6dJ5E8IEK8fdYKK1T64zFIwEyPLz6wknNajG22texqS1KifpmcMxAOb2W65iwdi2H3/bH4dRuH2e9f+RREbvkw25yZCoH+JiZ37ErRO4CZrCYp4LgkEsIaeLy/frZgZSUCz+nICwm4VeFiuLnXoG8FRcN7/mUx4swT2+LH4AaRJoAtovrv7dRuUcqvT+2xQDkpMBDKGdRt9nId9opZ2gGlf9nIjeEItavnL0tDjBTfAgF/PQ7ZOns8367W+BXoyz4DyUrId0GiWlf/qpRpK4v4pnRpphps5BgwvifrQ5yI/3qBtc2FVbZye+hesOg X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, 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 --- kernel/bpf/helpers.c | 3 +-- kernel/bpf/internal.h | 11 +++++++++++ kernel/bpf/syscall.c | 4 ++-- 3 files changed, 14 insertions(+), 4 deletions(-) create mode 100644 kernel/bpf/internal.h diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index dd1c69ee3375..07f49f8831c0 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -24,6 +24,7 @@ #include #include +#include "internal.h" #include "../../lib/kstrtox.h" /* If kernel subsystem is allowing eBPF programs to call this function, @@ -1808,8 +1809,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/internal.h b/kernel/bpf/internal.h new file mode 100644 index 000000000000..e233ea83eb0a --- /dev/null +++ b/kernel/bpf/internal.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* Copyright (C) 2023. Huawei Technologies Co., Ltd + */ +#ifndef __BPF_INTERNAL_H_ +#define __BPF_INTERNAL_H_ + +struct btf_record; + +void __bpf_obj_drop_impl(void *p, const struct btf_record *rec); + +#endif /* __BPF_INTERNAL_H_ */ diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 6b5280f14a53..7de4b9f97c8f 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -39,6 +39,8 @@ #include +#include "internal.h" + #define IS_FD_ARRAY(map) ((map)->map_type == BPF_MAP_TYPE_PERF_EVENT_ARRAY || \ (map)->map_type == BPF_MAP_TYPE_CGROUP_ARRAY || \ (map)->map_type == BPF_MAP_TYPE_ARRAY_OF_MAPS) @@ -626,8 +628,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