From patchwork Wed Oct 18 11:33:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hou Tao X-Patchwork-Id: 13427013 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 ACBE7CDB47E for ; Wed, 18 Oct 2023 12:51:48 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 357BA8D0159; Wed, 18 Oct 2023 08:51:48 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3078D8D0016; Wed, 18 Oct 2023 08:51:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 1CF078D0159; Wed, 18 Oct 2023 08:51:48 -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 0B1888D0016 for ; Wed, 18 Oct 2023 08:51:48 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id C1AF8A0100 for ; Wed, 18 Oct 2023 12:51:47 +0000 (UTC) X-FDA: 81358569054.27.B3C130F Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf01.hostedemail.com (Postfix) with ESMTP id A70C04000C for ; Wed, 18 Oct 2023 12:51:44 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=none; spf=none (imf01.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.51) 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=1697633505; 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=r3PFbeAQBt4os+R1B7FovlyP/kn3qyKU903kxdf9zNI=; b=RucprM0kVMzsLt0xvYYmbJE6RDRx+YXo38PIgRDVwNIBxd9ohFREY3QxqQYBRSjwQtYjGY HlIzu2zJDApVu5fe02iMaw930akdoI7zDWtsjIbuJ7f2XakrosaOzm//apHuIj4sHtn4MJ fdkJu/SOIR2zwfsmtmrJ7MIJV+EPUb4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=none; spf=none (imf01.hostedemail.com: domain of houtao@huaweicloud.com has no SPF policy when checking 45.249.212.51) smtp.mailfrom=houtao@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1697633505; a=rsa-sha256; cv=none; b=BlwhVcPV8FUZLRoy2NcQ+pmmDupuRwrkPXnkXBW9m8B7wd3vc1G1iH//vStNUX5zk+d5sV 0/33fpB1VRCzKbXYCPAjCAFMx74pDrOWCu16/wOv7A6zh+E77AcvF+OipXxjqsg/wl5Qy4 I1LI7TOhmJq4zXXzL/K8K7JxtzMMAxE= Received: from mail02.huawei.com (unknown [172.30.67.143]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4S9TGm0kFvz4f3mVY for ; Wed, 18 Oct 2023 19:32:32 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.124.27]) by APP4 (Coremail) with SMTP id gCh0CgDnfd1Mwi9l9jYmDQ--.41845S7; Wed, 18 Oct 2023 19:32:33 +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 3/7] bpf: Re-enable unit_size checking for global per-cpu allocator Date: Wed, 18 Oct 2023 19:33:39 +0800 Message-Id: <20231018113343.2446300-4-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 X-CM-TRANSID: gCh0CgDnfd1Mwi9l9jYmDQ--.41845S7 X-Coremail-Antispam: 1UD129KBjvJXoW7AFyfXr4kGrWktw4xCFWfZrb_yoW8Zry8pF WxGFyfKwsYvFWxAw1Iqr4kCay3Jw4kG3W7Jayag348ZrW8ZF1jgws8Jry5WFWFkrZ5CF13 trZ5KF4xAFW5A3DanT9S1TB71UUUUUUqnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 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: A70C04000C X-Rspam-User: X-Stat-Signature: jn5b7cqkd1ou9jij71acyzsmtuqou1ks X-Rspamd-Server: rspam01 X-HE-Tag: 1697633504-241987 X-HE-Meta: U2FsdGVkX1+hkESbKipMFGQNU1Y10VqKY/lskegotkd9gz5qwtQKiWlpEYcjn0WMHwq2VVt0PMTr7f7XGjeEqNo8QQtnTk2ehTGbPpg1uKevVYKN9GE2BCBmYjPg8N0iVz3jxaqU3LK04hhJpbtd85F+c2Ymorw5StDkn/dc6f0WOOO+zMIM7r+3BNsEY4D4V/G1LuiVCUYD311iUotwtdrQI8pE2n42okCB2CkXOhu1Q6F3BH3YKo1RsjvoJPfJOuS/Fqsnk6cxybfy09vrqXO1mQvr7Hn2pBeAsG6dfbhIo2azjl4DFE0a9pIemCRr/dNOBRmK1dfsEKoubZ8nk1GEDSh6sEI73VcDiZGqIl4RZZGv7STxU5hNdg7qbnJavcPPLa1RG5PEDcW8s+dElXN2xgtulY6kTW161I0GiXNv/PAxBC5kcg6l4aVOKt8ltvsh4NlUT9Rdx3QfJDmnkrrju7ROLtMTmzJqVYZYdWBmAwxW3ACgUpxQ4owhoxt6qVX1tYANBJcYiNO4yw+mWwNKtO3cIRvKzwNdH010my/gQ+h6JlWqbDhrJJ4reIiM+5Kfe6RS+lxvPzuw08LAlPlfbcPEGp5oAdqCLJ+NwjsttTeUCRtloB/Q+G9gtxxojBsoP1k2rzuwemSocc0/aOSOCuZrd5PhD5YJj2pImIa9IWPm2H+GhsGQdaXGyeBm6Xr5SS/jrZuZ3oGy5jlxIHQzGVydZNGVW7f5Gw9lvzoa/9JtREaDQ4jfXsM4povGniqQIeDsmzw/hhucr0O4NV2nFlPd4icfdUeebPmtnJgos8qOT08rrZmlrKntgcEiye0RUjtGJ+FOKvtisBNaqorAfSvzWoNm6Iwa/jcDKF5w2cl3yTyv8eCCszP0Grvsb7lC6r9b4UOgAprLhAKGnLOWuItBHy+TqF6e35UyfBqSSJRhvv0/pocG5On2d3KkpvBislk2zcX6t0XX5v1 KRdx0dhq s7Oj0uCdusSjk5KqTJOQN4vXVC3lzQLyz/Am1iUkcohbCN02pITwDHPlH6RSG1aR9whx/XgYHYj9ez83I0qVqGTVJRpzDx7N88Vun3c8mAL09A6fU5om/hNYe24hDdL946x+IEGXfzxseoYyp3rsJ7dVkdq/GwPEVsNfIPzH7rPgUd2aIxjzax0N6fS4Y9HLQ1ALghd3L/qwOILYiLdAIpZEk/7FOjA1b7qEkHwntud0jaVIvTNy5pbBSKihoWk6DUE6XtN4RusscMjI= 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 3037f3e809d8..e52ef1e106ae 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 = 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; @@ -979,6 +975,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;