From patchwork Tue Apr 25 11:05:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13223204 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 78E2BC6FD18 for ; Tue, 25 Apr 2023 11:05:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB6F26B007B; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A66BF6B007D; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 92E9B6B007E; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 869D06B007B for ; Tue, 25 Apr 2023 07:05:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 43C5C1A0353 for ; Tue, 25 Apr 2023 11:05:41 +0000 (UTC) X-FDA: 80719632882.16.7BC9567 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf14.hostedemail.com (Postfix) with ESMTP id 528A310002D for ; Tue, 25 Apr 2023 11:05:39 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=fHIvqUmZ; spf=pass (imf14.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1682420739; 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:dkim-signature; bh=I2GjseRaZiiYKMGFnELwsfMhZhXtBsHUr2pHKO1ngQg=; b=3DifLm0tDZs7NjhTuZ3vkh9KhgaPVw1urH2jyz1RJUq9RCBtUmxkCyEafAXb1SrmuNxvWk RJq91QxDn+xV0zf1/n7mHmx18REuIIcicb1X3nCEFpogcvlstGID2FTAhptrWBW+k6p+ai ku3hfZxQkDvW3EQtlSC6jLvZUuHr9dU= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=fHIvqUmZ; spf=pass (imf14.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682420739; a=rsa-sha256; cv=none; b=hZPcnZ5RXj1BdD+iXxG4wqI0IZEA50o5A04UkZHgMkRRSBWLSjj6gEpt17V7xhKIYvdyuM B+Qpgx5G5CLHo9hk1NkA8VydxUUTkxwMqW9i3fxqyHEquncFNROhGhJh9X6CgytYhVzrKv p4eDTWE0wCy7rJeN9TN424Xzvuk5NlQ= Received: by mail-pf1-f179.google.com with SMTP id d2e1a72fcca58-63b60365f53so7046395b3a.0 for ; Tue, 25 Apr 2023 04:05:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1682420738; x=1685012738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=I2GjseRaZiiYKMGFnELwsfMhZhXtBsHUr2pHKO1ngQg=; b=fHIvqUmZ5phg4ETfqPuneR+uYrbeTFZNsqI5XZ3pc1dHVDhJLXx+0FexrM2XAJvjaz DMzNPe20gZ+NCvxomVoNk7+UR79+C4T1KVvfdllMBQIDgMY2UOCW0DZxkYp6oq2Foui9 Ad9oYzSTeGVri7alkJmHqYVcyUWCNAu61TGufp92Z8nGIMFj2zHiAVh9QMlyZMs8/X3n JaD5Z0SXR5QS9EAY/zo799iZxw/XCaMS5nZZFNEXsZ0uC8UWjlS5NmmnRb97ispvDyTB fJlLf2vgbq63ZL3bQSR/z4beNrVcaH7kTiLmle7C9I7G5kwKfFlFnPgkfKKqhnrV3Mw7 FUxg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682420738; x=1685012738; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=I2GjseRaZiiYKMGFnELwsfMhZhXtBsHUr2pHKO1ngQg=; b=EhhPnCs2fBoN8nnS7oI9oH+7uWSdxTgmQe4C2L8oKyXvzrqaFbwM8qMPGqEzK4Bnc7 YbO9r6pAFgZmI30wUmxk5/p/7L0Xis5OTzEcE15JsP0x7CdBhuDYcH2TyKOle4852kRA km7cTEdeD1zzLWCWhuprL8yMXMGM2QtxOMdIGixxQtCCN89lowjYlcMq04NMvut5zyJ+ fCNXnQLqRO5bHFa85uZeSzimfJXLTaxg4wb7mwRbSwkRqB58EpMJK8dYhh5z32PDsyAy mFMN0tl6r2tFlOHcwiRWHebK1j2mUcRyNCdhgXSKkroUwCJWLDKsxOTqyUXATo55WAK8 XhFg== X-Gm-Message-State: AAQBX9da8oPp96cWIn3glyeJMldg6pXZir8oZlZiPxIEhSPd23OQCED3 MvMJuYLzr6ZKZUgcK9vlhvTAUQ== X-Google-Smtp-Source: AKy350awbzXJx1QHpvFyg+xGDq1ex4M+sbcmkf9pb2UwPJHCYhwULi9AWE37QwzjYRLfzfHBJukZkw== X-Received: by 2002:a05:6a00:1581:b0:63b:8a91:e641 with SMTP id u1-20020a056a00158100b0063b8a91e641mr22828410pfk.11.1682420738337; Tue, 25 Apr 2023 04:05:38 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.236]) by smtp.gmail.com with ESMTPSA id u3-20020a056a00158300b0063f3aac78b9sm4422169pfk.79.2023.04.25.04.05.35 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Tue, 25 Apr 2023 04:05:38 -0700 (PDT) From: Peng Zhang To: Liam.Howlett@oracle.com Cc: akpm@linux-foundation.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, maple-tree@lists.infradead.org, Peng Zhang Subject: [PATCH 4/9] maple_tree: Update mtree_alloc_rrange() and mtree_alloc_range() testing Date: Tue, 25 Apr 2023 19:05:06 +0800 Message-Id: <20230425110511.11680-5-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230425110511.11680-1-zhangpeng.00@bytedance.com> References: <20230425110511.11680-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: 528A310002D X-Rspam-User: X-Stat-Signature: zr46zufc3my7zp1w153kc1r6kxb6q987 X-HE-Tag: 1682420739-672855 X-HE-Meta: U2FsdGVkX19a+vz2bMCbHsp+u7U5L/RuwXloJwhxF6Om5uPwN+aS+Ucs3m54DTsLeRwQTQn4Sfo1vLc3HHsySyang06BY1wSjt1weY/zgQak85Y67lWBI/m9+apLc2drYqIg3s2dknSq5KkR16lmlv7KKK9FoCbC67ystT9OS+Jb7vL0s40LJIFvVXwPSoXwswmpJPma2L3vbPYRFGhULbojRHVso1mOLPMCRsR+uhdgfa3RY6b7I1ne1f8H5ee16bW3bLdcnjnxmOB7ujb454VUTG4SiqD5JhMaEpyoVAx2D7YpFARyN4joF4ynfcsZhEGB1PpeG5NcTOTiKcGrGiwBjDRkQTFFMCW5MvTK+7AklSrKIwHOFB80Qy/IK9xJD2GQeAybpg6UnpFva39XTlcczWpb+jMNL57mJ2kAChhLd1oKbHon5GFACARsJIkrBuUWN20CKgcRCWoG2P6HsZ0MSmFlmmBtiMNMC4VvOcjnZ03hlA0sMKMf13QfXTomgC2L/Vp6Lnp7CfBHRCSLs5lxJouwGdsatlDu3IoN8kB/LBKAqP0WLIKq7COB+0rHp52iSnSdPQJd0PCROCzYPIvaI3acVQurIxU5xntet1P5gxbHN3YI3tcI1BFsnhC80mT+IC0GtMGLDD+BkdLjnHDZxQbIdx5bDq60/ehdL477plQK+x7m8l003U1xbFNim3bnAWGzXMQG07iEj5MdYsyJYSLnXY98t/RzfOCCzrcytLrQJDRJ4OpHo2+/2PGmk5iY2nDM77ivBFkpKNFA0GCgEgfcPMuDsirr5NKOqyx0JvcZ5xOTcFBvWGV0bxNw/GH5LkyDcX7GvV+HrMtkj5ybNxxYyYaa4b/hjY6BGlLdBRfE8ne4pwuVb3rxZ6F6ewAKKZ0/d97uVc5iN+JTNYXRRn5NzMUrzDATyF2bLyWkjgikWeKi4B37iNLXq6vMZmmtgRABzL6fbLEHF9r ZALnkrGc S+O+W/6L5Z8sB83G3b6d2zS7Mxr7hMj96ReZanV6uVQDABJ8Xrq0XoPmNagu9wbkkX/Z3qH/8c9Cgql8xIwyuuq9saVAxrORc0gfln+a+0OblZ/WUP1YrOBxXH9V/KEHC8mizjQ1pIJP4FIAfR21YkhrFmYQ2YV1QjFibWJOdrf0vX5+A4de7dGzuGFBMHrs4T9M9xLcj4c8E3Nh65uxspDsdhTycrLqMwn41D3i2T2IzIPV0Vt6F7cW3iugnY4piF9N8je6DCkvKUytbudzia+DieNHo8WhNnbRnyHHBbn2Jj3rp07iQ4pb6IZK3HTu4/Ashk54xSaf/twJToo7X6/UsBYvjaqHYJ7sf0au9LdpYvPvE1LL2ctAJ5o4thmPo8pWDuoWmR0PMweIFDaClxhJtPINyOJhR0HfiYxq9uVctDlPL3CcBY+QUUNlnHc9WCAzBOyMzZ2yKtslxM18Zzjxf0C07MnHJWbxX2EnznPQ8cMI= 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: "Liam R. Howlett" The previous changes to the gap searching made this testing fail. Unfortunately, there was not a safe update order, so fix the testing now. Fixes: e15e06a83923 ("lib/test_maple_tree: add testing for maple tree") Signed-off-by: Liam R. Howlett Co-developed-by: Peng Zhang Signed-off-by: Peng Zhang --- lib/test_maple_tree.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index f1db333270e9f..30f2ebff95d75 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -102,7 +102,7 @@ static noinline void check_mtree_alloc_rrange(struct maple_tree *mt, unsigned long result = expected + 1; int ret; - ret = mtree_alloc_rrange(mt, &result, ptr, size, start, end - 1, + ret = mtree_alloc_rrange(mt, &result, ptr, size, start, end, GFP_KERNEL); MT_BUG_ON(mt, ret != eret); if (ret) @@ -680,7 +680,7 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) 0, /* Return value success. */ 0x0, /* Min */ - 0x565234AF1 << 12, /* Max */ + 0x565234AF0 << 12, /* Max */ 0x3000, /* Size */ 0x565234AEE << 12, /* max - 3. */ 0, /* Return value success. */ @@ -692,14 +692,14 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) 0, /* Return value success. */ 0x0, /* Min */ - 0x7F36D510A << 12, /* Max */ + 0x7F36D5109 << 12, /* Max */ 0x4000, /* Size */ 0x7F36D5106 << 12, /* First rev hole of size 0x4000 */ 0, /* Return value success. */ /* Ascend test. */ 0x0, - 34148798629 << 12, + 34148798628 << 12, 19 << 12, 34148797418 << 12, 0x0, @@ -711,6 +711,12 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) 0x0, -EBUSY, + /* Single space test. */ + 34148798725 << 12, + 34148798725 << 12, + 1 << 12, + 34148798725 << 12, + 0, }; int i, range_count = ARRAY_SIZE(range); @@ -759,9 +765,9 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) mas_unlock(&mas); for (i = 0; i < req_range_count; i += 5) { #if DEBUG_REV_RANGE - pr_debug("\tReverse request between %lu-%lu size %lu, should get %lu\n", - req_range[i] >> 12, - (req_range[i + 1] >> 12) - 1, + pr_debug("\tReverse request %d between %lu-%lu size %lu, should get %lu\n", + i, req_range[i] >> 12, + (req_range[i + 1] >> 12), req_range[i+2] >> 12, req_range[i+3] >> 12); #endif @@ -777,6 +783,7 @@ static noinline void check_alloc_rev_range(struct maple_tree *mt) mt_set_non_kernel(1); mtree_erase(mt, 34148798727); /* create a deleted range. */ + mtree_erase(mt, 34148798725); check_mtree_alloc_rrange(mt, 0, 34359052173, 210253414, 34148798725, 0, mt); @@ -880,6 +887,13 @@ static noinline void check_alloc_range(struct maple_tree *mt) 4503599618982063UL << 12, /* Size */ 34359052178 << 12, /* Expected location */ -EBUSY, /* Return failure. */ + + /* Test a single entry */ + 34148798648 << 12, /* Min */ + 34148798648 << 12, /* Max */ + 4096, /* Size of 1 */ + 34148798648 << 12, /* Location is the same as min/max */ + 0, /* Success */ }; int i, range_count = ARRAY_SIZE(range); int req_range_count = ARRAY_SIZE(req_range); @@ -2660,7 +2674,7 @@ static noinline void check_empty_area_window(struct maple_tree *mt) MT_BUG_ON(mt, mas_empty_area(&mas, 5, 100, 6) != -EBUSY); mas_reset(&mas); - MT_BUG_ON(mt, mas_empty_area(&mas, 0, 8, 10) != -EBUSY); + MT_BUG_ON(mt, mas_empty_area(&mas, 0, 8, 10) != -EINVAL); mas_reset(&mas); mas_empty_area(&mas, 100, 165, 3);