From patchwork Thu Feb 13 16:36:59 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kemeng Shi X-Patchwork-Id: 13972885 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 9B00CC021A4 for ; Thu, 13 Feb 2025 07:40:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 22760280007; Thu, 13 Feb 2025 02:40:34 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1B0F3280001; Thu, 13 Feb 2025 02:40:34 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 029D5280007; Thu, 13 Feb 2025 02:40:33 -0500 (EST) 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 D7148280001 for ; Thu, 13 Feb 2025 02:40:33 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 60F57C07A7 for ; Thu, 13 Feb 2025 07:40:33 +0000 (UTC) X-FDA: 83114123946.04.761467B Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf04.hostedemail.com (Postfix) with ESMTP id A6AFA40006 for ; Thu, 13 Feb 2025 07:40:28 +0000 (UTC) Authentication-Results: imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1739432431; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=GYGSMKj8gt2zx/tAh03eOXeSVnyH/rrcVzQUxHaZZzs=; b=MltQERxTujTbaeiwzRlmoEHJphwDKgU643w1LIQTVyBJavKb4BwbGnWIrUF2vIzWoKKVDa Tap+GL42iw/KIH9PqmT50psK734Vc3MQiz1gXogLGdQHjH92cKe2WuehfFClFuJizH8T86 WfugnD/PZx7aI3nuuPYQqBqUO+9H3a8= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf04.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1739432431; a=rsa-sha256; cv=none; b=WgUuCzxnJ0UxanR8rCa+Ofg/EfESUz6ZSKx2F/Mi0s8f5fBAM0/ROAVXu8uASsG8o6/CRH YL64ZTj3uPV07Ti0LHWJwE4Adox2YDW0L0x8htqH2KbQyischAa67c5632cwbmCnMcXwba +/5qjfduDpHBdSXqaBG+LqAWFki+uv8= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4YtnC41zLsz4f3kvM for ; Thu, 13 Feb 2025 15:40:00 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.75]) by mail.maildlp.com (Postfix) with ESMTP id 0AB991A12E1 for ; Thu, 13 Feb 2025 15:40:23 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP2 (Coremail) with SMTP id Syh0CgDnpGfloa1nx+vHDg--.7502S2; Thu, 13 Feb 2025 15:40:22 +0800 (CST) From: Kemeng Shi To: willy@infradead.org, akpm@linux-foundation.org, geert@linux-m68k.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH] test_xarray: fix failure in check_pause when CONFIG_XARRAY_MULTI is not defined Date: Fri, 14 Feb 2025 00:36:59 +0800 Message-Id: <20250213163659.414309-1-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CM-TRANSID: Syh0CgDnpGfloa1nx+vHDg--.7502S2 X-Coremail-Antispam: 1UD129KBjvJXoW7Kr47tFyktFykZr1DuF17KFg_yoW8uFyfpF W7Wa4Ivry8Jrn2yw1DAa1xu34Fgw1rWa13KrW5Gr10yF9xur12yw1UKFyqvr9rCFW0vay5 AanYgrnFganrAa7anT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUvYb4IE77IF4wAFF20E14v26r1j6r4UM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8lY4IEw2IIxxk0rwA2F7IY1VAKz4vEj48ve4kI8wA2z4x0Y4vE2Ix0cI8IcVAFwI0_Ar0_ tr1l84ACjcxK6xIIjxv20xvEc7CjxVAFwI0_Cr0_Gr1UM28EF7xvwVC2z280aVAFwI0_Gc CE3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxI r21l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87 Iv67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAa w2AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxV Aqx4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r12 6r1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_Jr0_JF4lIxAIcVC0I7IYx2IY6x kF7I0E14v26r1j6r4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AK xVWUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r1j6r4UYxBIdaVFxhVjvjDU0xZFpf9x07 jSYL9UUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspam-User: X-Stat-Signature: x1s17yzu9js1guzd81mm8z5gr68dt66h X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: A6AFA40006 X-HE-Tag: 1739432428-85714 X-HE-Meta: U2FsdGVkX1/RhEBdL76mBHSOyU4F81tWoPeNdn2R79s3HvVo/wKTrd/9MVenfbD9HVwbGARRtvy5Z8OB6AwoEJI+bGhn9nAArg/q+QfJlPKZhWkCoAYVRA6iecovGtaquZ7NZ/exX4JOnrz2lcUBUuq75mgh8yx0gCmyaY8FCtCAZqtO9gbDn5PuHVcGFZF6p9z73KJ685P3pbwanBmMywH9m7xsYrPXC49GgfQddMI7lbHywX1F7quuKQMVQ5YAEaISxQUzl2/MDTtXO/Z1dCd8v7IFBQtrmj0LPQilfrbZit6wuDEAcge5EN8D87CT3PQskoti3Zdz8p3d6TqVVxSOL3yX7kDJ+TapeR6IJwzteE8w4Kqdkd+rlwbcyw38tX37TtG2nPArj7PIPIz9RjcPcedjOQY9ZLYQieJH0/LIdT48mZcu0PmWHW8n9aW5ATxRH8VeJXSkiZSiq9sml+i135ZhKUABo5F5dKEcGTbD8b8ymVsAKsHNakx35DH8BPxBzEL8f45zIiAeNLMXVRBYCaIdovN44QjL17EMzmkK85/a4OmcwcmnQ1E4WXPNOp10oTFTF+K0WBxP7MFaIYyugVage3CFm/TT7B0aXhFkw6VlbYEllvuzNM5CsCj3V0t3xxNHevTDLhJk6n0pgfteMNM53YmiRAx2xA/eUlwm/4L2uDrb00FU7Dem2+KyFD2I4pDQ1W14WIboWAPEZeuYtscYvHcWUggSJrjuc88y4OpDlME1JhlpPJc3MRbOblWw1VIUM3NRPppTZkIjnuhw8b2MmEkfYJSlPdMDapq88dG1uk9OTNL+eJE2SxuDG0dv3sb8nWaKtUmrydWB5RVmfZAv78GtvnyZO2J/whQk0AFvI6XfqKCXdDsUS4Ni1Lo3Lf+3MOiU3lFJIs/HIkEJf9cKja7JhT4KnumO7mLvH0ZEZoQMgL8rNyf496uQ++OrzI3hFyWTEEq7kNx ja5k7dly lFT00bidPHGVc3dnN9DosV03AcWAO3YdoQJoQ930IFf1t2/yAoUKWR7kTc8EMYPBnjtN3+wO+5B85VtOhHZcKQVoUWnHmBbZooHyN5l+nL/N19RyNC0Qgfr/4rEROTKoOPaBK1YSk7lOkYYPUVD4H/DLT4xLI8zDr5dEEWScy7yv3PPZmozbw7rO5KOPbIAOFSwUbiid/sdKbBRtiL2PqITE4bFwWKmnW1QWaT7d7VNaBu1LqixvKefHT8R7uWn9GWJDR7fZSB1kIzTiCWSdt1KpvYg== 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: List-Subscribe: List-Unsubscribe: In case CONFIG_XARRAY_MULTI is not defined, xa_store_order can store a multi-index entry but xas_for_each can't tell sbiling entry from valid entry. So the check_pause failed when we store a multi-index entry and wish xas_for_each can handle it normally. Avoid to store multi-index entry when CONFIG_XARRAY_MULTI is disabled to fix the failure. Signed-off-by: Kemeng Shi Reported-by: Geert Uytterhoeven Tested-by: Geert Uytterhoeven --- lib/test_xarray.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/lib/test_xarray.c b/lib/test_xarray.c index 6932a26f4927..0e865bab4a10 100644 --- a/lib/test_xarray.c +++ b/lib/test_xarray.c @@ -1418,7 +1418,7 @@ static noinline void check_pause(struct xarray *xa) { XA_STATE(xas, xa, 0); void *entry; - unsigned int order; + int order; unsigned long index = 1; unsigned int count = 0; @@ -1450,7 +1450,7 @@ static noinline void check_pause(struct xarray *xa) xa_destroy(xa); index = 0; - for (order = XA_CHUNK_SHIFT; order > 0; order--) { + for (order = order_limit - 1; order >= 0; order--) { XA_BUG_ON(xa, xa_store_order(xa, index, order, xa_mk_index(index), GFP_KERNEL)); index += 1UL << order; @@ -1462,24 +1462,25 @@ static noinline void check_pause(struct xarray *xa) rcu_read_lock(); xas_for_each(&xas, entry, ULONG_MAX) { XA_BUG_ON(xa, entry != xa_mk_index(index)); - index += 1UL << (XA_CHUNK_SHIFT - count); + index += 1UL << (order_limit - count - 1); count++; } rcu_read_unlock(); - XA_BUG_ON(xa, count != XA_CHUNK_SHIFT); + XA_BUG_ON(xa, count != order_limit); index = 0; count = 0; - xas_set(&xas, XA_CHUNK_SIZE / 2 + 1); + /* test unaligned index */ + xas_set(&xas, 1 % (1UL << (order_limit - 1))); rcu_read_lock(); xas_for_each(&xas, entry, ULONG_MAX) { XA_BUG_ON(xa, entry != xa_mk_index(index)); - index += 1UL << (XA_CHUNK_SHIFT - count); + index += 1UL << (order_limit - count - 1); count++; xas_pause(&xas); } rcu_read_unlock(); - XA_BUG_ON(xa, count != XA_CHUNK_SHIFT); + XA_BUG_ON(xa, count != order_limit); xa_destroy(xa);