From patchwork Fri Oct 20 13:31:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Tao X-Patchwork-Id: 13430745 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 CBBA1C0032E for ; Fri, 20 Oct 2023 13:31:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 690148D00D1; Fri, 20 Oct 2023 09:31:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 665368D00BC; Fri, 20 Oct 2023 09:31:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 553198D00D1; Fri, 20 Oct 2023 09:31:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4675E8D00BC for ; Fri, 20 Oct 2023 09:31:07 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id D086A1A106D for ; Fri, 20 Oct 2023 13:31:06 +0000 (UTC) X-FDA: 81365925732.07.3EDFACE Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf24.hostedemail.com (Postfix) with ESMTP id E895C18001F for ; Fri, 20 Oct 2023 13:31:03 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=none; dmarc=none; spf=none (imf24.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=1697808664; 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=gQf3/TSFe9z7lhHV360o6dGJLcCvV/d0qS53PjviQtE=; b=Yq0WH62yKfcX4k+FcqKcMGYNJ4Ub4Y2wazZZFdpsptgcvKFVPTLCKiFybTW5bOyPk+jqyb K0XGGSlLMzxu3fVdPZOEW3Nr9MWedebTYdJ0tP9S+Yj4TZS+qGyBv/FjiCg7lN5piBm559 Ns+AqKMTg20MrOrC/rm48DKU6kZTB+4= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=none; dmarc=none; spf=none (imf24.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=1697808664; a=rsa-sha256; cv=none; b=nBzxfWSJMEF7+x8VZxidqjOpqQFGVgD3+78X+YMWRhC/Ne4cGwlNO3QTfFPCIWM5jVq3Xl 5AZgzZJ48RvD+JEz1LGRuT7tuhEnOgz0gqayc1pjFbsiMrjAf3TunRWXjW62GqBKo0I4Jm HhilAaXNC2YNKyWg/VKnjcQxm3wbzwM= Received: from mail02.huawei.com (unknown [172.30.67.153]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4SBlpQ4QBYz4f3kkK for ; Fri, 20 Oct 2023 21:30:54 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgBn+dgIgTJlmYjjDQ--.7231S7; Fri, 20 Oct 2023 21:30: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 v3 3/7] bpf: Re-enable unit_size checking for global per-cpu allocator Date: Fri, 20 Oct 2023 21:31:58 +0800 Message-Id: <20231020133202.4043247-4-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 X-CM-TRANSID: gCh0CgBn+dgIgTJlmYjjDQ--.7231S7 X-Coremail-Antispam: 1UD129KBjvJXoW7AFyfXr4kGrWkKrW7uFy3Jwb_yoW8ZryrpF WxKFyfGwsYvFW8Zw1Iqr4kCa13Jw4kG3W7Jayag348ZrW8ZF1jgw45Gry3WFWFkrZ5CF43 tFWvkF4xAF45A3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBFb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUWw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x 0267AKxVW8Jr0_Cr1UYxBIdaVFxhVjvjDU0xZFpf9x07UAkuxUUUUU= X-CM-SenderInfo: xkrx3t3r6k3tpzhluzxrxghudrp/ X-CFilter-Loop: Reflected X-Rspamd-Server: rspam09 X-Rspamd-Queue-Id: E895C18001F X-Stat-Signature: ziksjo9q8et4qko5sgoahbzts7hfahmi X-Rspam-User: X-HE-Tag: 1697808663-881886 X-HE-Meta: U2FsdGVkX1+j0rJ03Yv46++dmDe2TauxR5JESZH9zxlBOSHP1bLdkhqHFw4NCtCgmeby0vxU+N/xMT0MLG05fyJq7FIgDfWBME3RsWz/QI3e4Ze/UuSg1crbNmSyRCW2f4w+1wRvLfckY/b+J/0Hftp1xNMiP/ZttbqfZK6WnWviDeFdcC8EiHFQbfKkDLHDhf6L4gWGECvkOL1ASZu9a9FlTa+jEwSfbtQVXkKZacfJQBnkny7osBiIIbBzOCuHMh8AvWjG3Rn3iHIDcCE8QlcQIGptOth3Mi3m6Pf4+x35gIcE/ltSHXUw4PorS22g6/79bmfonhr9gwS3FJR+NVEMEe/HdnB+9e3sdc3G5axW7qnlCBzjd8FlZzihXGcwOj4VplAJBK/1H3z9ZUd6QwDwMeTVp6otSi6XVyI6d53cQc8yZTz6DP7vj3eQwUhkpitKEsD4XVVoh+xexPDeMjXCN4o3G/XXIkHW/26oz0+FcxgqJfXreDGn2+uDgx6JfNhNXPXb+eavQW1PaR7jg2h9BrpSZchUfM1yAiGSfFix/qDWyK81Ubn1J7P/aRT8i7U5NhAxmsVdMtTMHfnoq1hCf/ZoXu622iQr8zPB6Aq2Dxodc+2BzCdKzYqvmh9tgm1wBaJ5gVN1rlIULUoLBHLLcZvVk69cGRu+Ya4I9xHRpD4VQhMO4RbSaUZsiBBbe4s9CD4QwkFPS5ovW2fvGAJxaUW6rAUdGrzdojxm6oflV/DVT9vk5vurLLHv+U9JWc9zeUE5uL0vRvI1P3zUHqblYM+etDoq099Aepxj7qJ1RNkKcNJ69Xx+WP+QE3YDOz2H7nmbJwUWjSCs2q99VD+uLsYdKoModvI9euV0oTsPo2grP3y3uBIm+smp8KnD+LzIUsGbaHnyOZmBiaTyOY/VEAA1XFRlQ0c/xviHMPNZwKviAmYN++wnGpl154RTDyWzE2JQ7rTMKuoTEx1 nnb7r5TA 71OZ5kGJXfzcKOoFdp0pc9Tcx6nIGb4suoQpLHVTffKsgeySbKI02zI0E5lvEDzKOrhltBqKJMrZMWPEzqUKEP7FQelmfkJ+YlF9wzG3un8p6KLtKRlANqdFJEzhI79zXBEVsSPOi5o3vvfUj+pgKwjKo5TW7ZX4hLQ1mf+g5z+WQce9i8GK6zrFEFM9GC+FDZGd435ywjy+6y1LK7PoPnJmNOMY0JQwZWOLNwgWRV91Kztu62gv0Pt5dM8pMErCF7DvVcef2Q9wJRgv22sWzW9hMWmL1LcZ1K6k80uaFnmjmO7FaEIoWX03ELQ== 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 With pcpu_alloc_size() in place, check whether or not the size of the dynamic per-cpu area is matched with unit_size. Signed-off-by: Hou Tao --- kernel/bpf/memalloc.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/kernel/bpf/memalloc.c b/kernel/bpf/memalloc.c index 39ea316c55e79..776bdf5ffd80b 100644 --- a/kernel/bpf/memalloc.c +++ b/kernel/bpf/memalloc.c @@ -491,21 +491,17 @@ static int check_obj_size(struct bpf_mem_cache *c, unsigned int idx) struct llist_node *first; unsigned int obj_size; - /* For per-cpu allocator, the size of free objects in free list doesn't - * match with unit_size and now there is no way to get the size of - * per-cpu pointer saved in free object, so just skip the checking. - */ - if (c->percpu_size) - return 0; - first = c->free_llist.first; if (!first) return 0; - obj_size = ksize(first); + if (c->percpu_size) + obj_size = pcpu_alloc_size(((void **)first)[1]); + else + obj_size = ksize(first); if (obj_size != c->unit_size) { - WARN_ONCE(1, "bpf_mem_cache[%u]: unexpected object size %u, expect %u\n", - idx, obj_size, c->unit_size); + WARN_ONCE(1, "bpf_mem_cache[%u]: percpu %d, unexpected object size %u, expect %u\n", + idx, c->percpu_size, obj_size, c->unit_size); return -EINVAL; } return 0; @@ -973,6 +969,12 @@ void notrace *bpf_mem_cache_alloc_flags(struct bpf_mem_alloc *ma, gfp_t flags) return !ret ? NULL : ret + LLIST_NODE_SZ; } +/* The alignment of dynamic per-cpu area is 8, so c->unit_size and the + * actual size of dynamic per-cpu area will always be matched and there is + * no need to adjust size_index for per-cpu allocation. However for the + * simplicity of the implementation, use an unified size_index for both + * kmalloc and per-cpu allocation. + */ static __init int bpf_mem_cache_adjust_size(void) { unsigned int size;