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 B8ED5E95A61 for ; Sat, 7 Oct 2023 14:06:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3FEF16B02A5; Sat, 7 Oct 2023 10:06:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 388146B02A7; Sat, 7 Oct 2023 10:06:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 202476B02A9; Sat, 7 Oct 2023 10:06:26 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 0C6806B02A5 for ; Sat, 7 Oct 2023 10:06:26 -0400 (EDT) Received: from smtpin26.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id DE96AA018B for ; Sat, 7 Oct 2023 14:06:25 +0000 (UTC) X-FDA: 81318840330.26.2460DAA Received: from dggsgout12.his.huawei.com (unknown [45.249.212.56]) by imf07.hostedemail.com (Postfix) with ESMTP id EFD8F4001E for ; Sat, 7 Oct 2023 14:06:21 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=none; spf=none (imf07.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=houtao@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1696687583; 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=CG7xDJUVeFHNsMLnxp8amCjXU+S4ue4Lj3fbF21UMTM=; b=DqCM2ar8seOikvSTsDY2BXZbCbnT615QKUUStT4FR6ckpQTd39wAv/o7VkKl8nYBwekv7P CpT4Unn4LrJnXlE1MSKXjnpvwTb2tklNciSn+4CbyDuwST+2pRZlcIctgCIKhqn4vXjkks CzVrkWBXIx9KuSA+JF/rLKX5hrvwhno= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1696687583; a=rsa-sha256; cv=none; b=qIlaIWqf5390UQjABqhfJKmunygmrVMfdCYk+ueMoD05GDsA44RJNlAdrk+XgalaCvEOQf LuK8k6YIOWTXy3EH9HqDXuwD/CEsEKUTVDCxKQ0kslz1kAbVnGbPCqhxDqD/n6DpHT9WI6 S2IBj21/KySjnGDed1qdlw5YHhXXCz8= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=none; spf=none (imf07.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.56) smtp.mailfrom=houtao@huaweicloud.com; dmarc=none Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTP id 4S2mrH11JWz4f3kFl 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--.30763S7; 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 3/6] bpf: Use alloc_size_percpu() in bpf_mem_free{_rcu}() Date: Sat, 7 Oct 2023 21:51:03 +0800 Message-Id: <20231007135106.3031284-4-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--.30763S7 X-Coremail-Antispam: 1UD129KBjvJXoW7urWrCw1rAFykWr43XrWkWFg_yoW5JrWUpF W7Kr18Ar4kXF4rW3W7Wr1xAa45Jw1Ig3WxKay7Xry5uFyfWr1DXr4kGry7XFn09rWUKaya yryvgr4fCrWUJ3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x 0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU1c4S7UUUUU== X-CM-SenderInfo: xkrx3t3r6k3tpzhluzxrxghudrp/ X-CFilter-Loop: Reflected X-Rspamd-Queue-Id: EFD8F4001E X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: tpt8jze844sdg48mwwyekipmq8eqqezt X-HE-Tag: 1696687581-825644 X-HE-Meta: U2FsdGVkX1+qISrGcKxUapXIc03loeXNeduDlwp4jSODfCCqnE20/JoSE7gMHW/Vijx79AJDDOzMtqw9ISKAwGqpWRDd4IVsj2qUPg+rffnUNKZSN93MlWN3Jl4JtS50DJbeTrgaII2sDwi+EYxkLwqJlOpmazQucnIMEOMMzwkR9XqnStm4jcoKII4gZtu+LN0GmM+XWK6KaU5HONzgvtGaBzXQLvYG3osEfbKjOnj26UYIJRC/lyaW6H23SPRBLOafnRLa5oi5XqgUQB9Roscds8j0S+eiTMQ738JvmkDLsHFfevHSMV/PeMOWcqsb/ppre3FFNURpj3qC6qAp5+1uXNr7QOzlbYj+iYnfdsaTtAsfbrkr4kfXVvP89LnoMHtyRkdLoAGggw7Ur+wVnVkfCqjV/Kxou0ihfu6kJbJVvO3DJawwDyLRunG98SgL+pjztk492kJa/YLucuwTO5Tk7HwPtWKfo3D9J0ifXSRtcMrssDdAaCa0ASSLI3uhkBlztsnz7tXuUYo78Gx4vf/G2pfWk7CU+0Hf0cL/5x9EohB8EScYKV15yJJdl9jgQtszMKktDPspCcsIHDWFl/TPTgkqewOdBXaYNgtNTvAKYVtmFnBj7BhO2TNmXFp7bclEzoRjgStnZ05mArryapzxHJw9G6e8MCx41tBFdqSiaJrkYBuCgHqN04p/46w1FI5bu6WdOcYf5x774rYeh6R1LHPp7qBFAJFaUnoSyqe+Ltbn50JmPYC3UxkEyDac+Hv2Yhbj/EfCg3TmZXDX4FerAAD30aBzYSsOkbBAg+nvY0IGX9q6dT1Sbjgae6nDimxjBzbUOzRn8j1WOHZIT8AprlbNeGFGPLkdbd3ukNtjiBHNRW0p0kpj0krCUDmOPY4gBlPaFBBNPe3WthdV9Q3K9Eh2dWCEejLVRiYI6wP8AMawGORkwodAJhs8UPuUxtRI585EKndjP41cIW4 tYsWVllh vj+U+DP9rmnSV3sgKwZTRUm6veSKS8fwrZOzx7TDQickPQwXV7vGe53Mod+YT+Ph/3RMcSlc5TJNNoSR7BWxjKDIAv9nM43FH0EtV6I2dyfl7GqMMTZ3pg/vTC6j59mEoCdofEOhyyNn/c7iJSh1RD60EweMwVOY9ThwIMerHGjTkbGdbJmCZh7XBURAFNMJjGDG6AF/rVqV8xHLfM+qUUpmoAK/lM9EdVdR7vzCD4xdwjbzG9Bro95bSSSmKLMfsTX2fVz8Mq+SKu2+B9JZXz51etNjZ/+I4C4CWvW0HddIVUKKFQO7h9hKLeg== 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 For bpf_global_percpu_ma, the pointer passed to bpf_mem_free_rcu() is allocated by kmalloc() and its size is fixed (16-bytes on x86-64). So no matter which cache allocates the dynamic per-cpu area, cache[2] will always be used to free the per-cpu area. Fix the unbalance by checking whether the bpf memory allocator is per-cpu or not and use alloc_size_percpu() instead of ksize() to find the correct cache for per-cpu free. Signed-off-by: Hou Tao --- include/linux/bpf_mem_alloc.h | 1 + kernel/bpf/memalloc.c | 16 ++++++++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/include/linux/bpf_mem_alloc.h b/include/linux/bpf_mem_alloc.h index d644bbb298af..bb1223b21308 100644 --- a/include/linux/bpf_mem_alloc.h +++ b/include/linux/bpf_mem_alloc.h @@ -11,6 +11,7 @@ struct bpf_mem_caches; struct bpf_mem_alloc { struct bpf_mem_caches __percpu *caches; struct bpf_mem_cache __percpu *cache; + bool percpu; struct work_struct work; }; diff --git a/kernel/bpf/memalloc.c b/kernel/bpf/memalloc.c index af9ff0755959..a17f650085ef 100644 --- a/kernel/bpf/memalloc.c +++ b/kernel/bpf/memalloc.c @@ -531,6 +531,7 @@ int bpf_mem_alloc_init(struct bpf_mem_alloc *ma, int size, bool percpu) /* room for llist_node and per-cpu pointer */ if (percpu) percpu_size = LLIST_NODE_SZ + sizeof(void *); + ma->percpu = percpu; if (size) { pc = __alloc_percpu_gfp(sizeof(*pc), 8, GFP_KERNEL); @@ -880,6 +881,17 @@ void notrace *bpf_mem_alloc(struct bpf_mem_alloc *ma, size_t size) return !ret ? NULL : ret + LLIST_NODE_SZ; } +static notrace int bpf_mem_free_idx(void *ptr, bool percpu) +{ + size_t size; + + if (percpu) + size = alloc_size_percpu(*((void **)ptr)); + else + size = ksize(ptr - LLIST_NODE_SZ); + return bpf_mem_cache_idx(size); +} + void notrace bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr) { int idx; @@ -887,7 +899,7 @@ void notrace bpf_mem_free(struct bpf_mem_alloc *ma, void *ptr) if (!ptr) return; - idx = bpf_mem_cache_idx(ksize(ptr - LLIST_NODE_SZ)); + idx = bpf_mem_free_idx(ptr, ma->percpu); if (idx < 0) return; @@ -901,7 +913,7 @@ void notrace bpf_mem_free_rcu(struct bpf_mem_alloc *ma, void *ptr) if (!ptr) return; - idx = bpf_mem_cache_idx(ksize(ptr - LLIST_NODE_SZ)); + idx = bpf_mem_free_idx(ptr, ma->percpu); if (idx < 0) return; -- 2.29.2