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 DCA4AE95A61 for ; Sat, 7 Oct 2023 13:50:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2BBAB8D0011; Sat, 7 Oct 2023 09:50:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 26B768D0005; Sat, 7 Oct 2023 09:50:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1336B8D0011; Sat, 7 Oct 2023 09:50:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 046688D0005 for ; Sat, 7 Oct 2023 09:50:06 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id CA27A4025B for ; Sat, 7 Oct 2023 13:50:05 +0000 (UTC) X-FDA: 81318799170.14.3617A95 Received: from dggsgout11.his.huawei.com (unknown [45.249.212.51]) by imf29.hostedemail.com (Postfix) with ESMTP id 1ED9B120014 for ; Sat, 7 Oct 2023 13:50:01 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=none; spf=none (imf29.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=1696686603; a=rsa-sha256; cv=none; b=uQITGoT+JePMjhz4GYF9yQmarFLy7z8Z7a3+fHoMdevAEXzkzXEt2pg7QaooaresUENqYo nEJ1DGiJ+rXAPpORLl7FNvzTT4PvzT4Dih6StG0hxuJRft9yy6fo9ZBVmaAA0O9P6X5kvp SnScMjqIEmcW8L03iAvRcCtauseBzZ8= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=none; spf=none (imf29.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=1696686603; 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=xM4XLsSzUEggqsFf/wTnojdlu6bsJmFiZo+722Ow+7s=; b=XkIZY6x53ZlhQ2fxCvFnSizm4gp4IbQDlWqqKiVSYzCiVMoAbQOeqVEHJzUvxXN3ktB3kR PCGMj3T/vvgWTuleu2kC/YYRjH6EiNaK0XmSEyigkVgBAvvGaFbMEuTCiRTRn4ELHx/9rH A1jSUCd/aQqudVw992g13QUPgSUB0N0= Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4S2mrJ72srz4f3lfv for ; Sat, 7 Oct 2023 21:49:52 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgAnvdz9YSFl4YF2CQ--.30763S6; Sat, 07 Oct 2023 21:49:55 +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 2/6] bpf: Re-enable unit_size checking for global per-cpu allocator Date: Sat, 7 Oct 2023 21:51:02 +0800 Message-Id: <20231007135106.3031284-3-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--.30763S6 X-Coremail-Antispam: 1UD129KBjvJXoW7ur17ZryxCrW8Kr4xXw1kZrb_yoW8uFyUpF WxGF93JrsYvFW0yw1xXr4vkay3Jw4kG3W7Jayag348ZrW8Zr12gw4Dtry3WFWFkrZ3AF1a yF95KF4fCF4rA3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUBYb4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M28IrcIa0xkI8VA2jI8067AKxVWUXw A2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAvFVAK0II2c7xJM28CjxkF64kEwVA0rcxS w2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3wA2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxV W8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v2 6rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr21l5I8CrVACY4xI64kE6c02F40Ex7xfMc Ij6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_ Jr0_Gr1lF7xvr2IYc2Ij64vIr41lFIxGxcIEc7CjxVA2Y2ka0xkIwI1l42xK82IYc2Ij64 vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAqx4xG67AKxVWUJVWUGwC20s026x8G jcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r4a6rW5MIIYrxkI7VAKI48JMIIF0xvE2I x0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6xkF7I0E14v26F4j6r4UJwCI42IY6xAI w20EY4v20xvaj40_Jr0_JF4lIxAIcVC2z280aVAFwI0_Jr0_Gr1lIxAIcVC2z280aVCY1x 0267AKxVW8JVW8JrUvcSsGvfC2KfnxnUUI43ZEXa7IU1sa9DUUUUU== X-CM-SenderInfo: xkrx3t3r6k3tpzhluzxrxghudrp/ X-CFilter-Loop: Reflected X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1ED9B120014 X-Stat-Signature: ckx5pos5tbodmzkqp613j7s8mbm1bkx4 X-Rspam-User: X-HE-Tag: 1696686601-877249 X-HE-Meta: U2FsdGVkX19dijJpenQ5lSvHPIHEXtA4JcIcK9bckls4NHYhakhBbbDRPAruDCIGc6wgnRCv68fhr5nqXoM1DDu1v5MBu7CiQeUQhjkk0W41XqLHb57W4nEa8pLUEetJxsGZTp+Xp8mX1Xk9eUlPlL/SGzPpkgNxdWZFz5DthjB8hp4wSJymll7MghCTx9gP8+2Mwab/xk+eDGUag0rHiEyF9nu/dm0cM570HWGuAW2VDE93F0XcFSTAWyHptR/rKg1OChdC5wdPyX7q51Y6+/kcqDYYTy7ouMpRusa459H/DsMEIilSehLWACYC0EtHZ+mGSogQEO4f66zhvR3Vor10O+pXUQspivRZ5xF1vTnR0+n9Qp1GLxguiGIfgCyqK6Q3Q3o733ZglrNzJVoUGn0YQlG3b8x22QmQy1YqmvGyO9Xouj2/QtDXscDDLp4xuhECIAEcyQf2TLy8MxObIip8+sG7jJ5Xk67eRsZlf3yqV404m7Apaxa374xgTzzUE+hpwUORQY18YG9DQnFUtuap0bmyhDv7nPu1kxBDlJyKUk/XvdYNI0O/WE/pAVnICeCzZ2giCAf78fxcZCwmpxEHvlTiAgEa+2M6SnomxO/b4EtgjvoEjssgtthdEh55LiG+ERL9S7fcBEzh6R/N/WypDWzPMgHV4rE3T/RUURLjaHJiy8zaWUw7dJNWNDNO5ZphRNp8djS48uySegF+WvQ6436gtPC+mJG9/VZqA06Yp+9F8AQaAZc/fPtN/yok6VCXzS+Z6AGVJpOav9tILBNpdMmxkte+VLh8vu/kj9RSiwntDEmYKBH1Aj2eMdLqwNuCpHgtJ+/ygttp0F7ymlH/gRXVeY7zuYLEdFkg0zmaRvQdLIwjdr5D3EH3tODta2k+f3zO7cipXhXsfP7hRSuADc4Nqsy4G3NeWSb9H7PFxAFK7phETVnj0ajbRK39ljTEa5VclCG6GPAP1jQ T9z0eVZ6 8tjYoAUG/lrAE3A444ElJ52hapFtcY4TjL+3rox6meaR6jmNhFf7C9l4koBBLs9x7L9f9TlxxfdUJV5N8JDAQv+p3JzU5NajWxy/1ISfCqvAjTn2Cf69RQ9uTwfUepP/mCY6WYF4DsgQTAZvk/Y2uR0AZBLn6bULpj2IJ1FOrkDgg5fN1vnaO4RO1kAR9rcRqDCcxWdewlvd8PNfhBwQX90bNwzYwO4ttym6eDDDnrM428pT29XZ8/040wBr2BEvIb7N5mz+M/Lm7Y5hS2GM+dJLyS6uHUtdvklbdjEgk8DcjwXVmQIFWDq7K8Q== 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 alloc_size_percpu() 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 | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/kernel/bpf/memalloc.c b/kernel/bpf/memalloc.c index 6cf61ea55c27..af9ff0755959 100644 --- a/kernel/bpf/memalloc.c +++ b/kernel/bpf/memalloc.c @@ -497,21 +497,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 = alloc_size_percpu(((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; @@ -979,7 +975,14 @@ void notrace *bpf_mem_cache_alloc_flags(struct bpf_mem_alloc *ma, gfp_t flags) return !ret ? NULL : ret + LLIST_NODE_SZ; } -/* Most of the logic is taken from setup_kmalloc_cache_index_table() */ +/* The alignment of dynamic per-cpu area is 8 and c->unit_size and the + * actual size of dynamic per-cpu area will always be matched, so 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. + * + * Most of the logic is taken from setup_kmalloc_cache_index_table(). + */ static __init int bpf_mem_cache_adjust_size(void) { unsigned int size, index; -- 2.29.2