From patchwork Mon May 15 13:17:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peng Zhang X-Patchwork-Id: 13241436 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 B5032C77B75 for ; Mon, 15 May 2023 13:18:33 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2AD01900002; Mon, 15 May 2023 09:18:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 25E50280001; Mon, 15 May 2023 09:18:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 124DF900005; Mon, 15 May 2023 09:18:33 -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 ECA41900002 for ; Mon, 15 May 2023 09:18:32 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 968BA120FA4 for ; Mon, 15 May 2023 13:18:32 +0000 (UTC) X-FDA: 80792543664.07.DDD43E9 Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by imf26.hostedemail.com (Postfix) with ESMTP id 96950140016 for ; Mon, 15 May 2023 13:18:30 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=iH5wFnjA; spf=pass (imf26.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.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=1684156710; 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=EveqtihCJt7fcxXdeINag7+zgOnp1O/guDL1F4v1dKU=; b=cBGIzXBG8AYHQUtODr6+bDfYzEDXXkJxep3DvxJcNM7sUJ2WZk0BDJe/lP5J6qHwNMGJof 2NBj7Ms4QynrJnI7elxFG/ezlOwsIO85lqh6ld+DFgcFJhvzhrKnbypuleppI+DInXuwQ/ TnBzZl5dJ7Y6fD0qAflNVkLudzs8Ng0= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1684156710; a=rsa-sha256; cv=none; b=lgxBhHaPpWrElvJC2yspRy0w1idcuJBYi7Kk6+naryFIo3mwlZBCa+MIHLMoLU7DpmQ29f IH/O9dAnY5OgKtgpNMlQjbgzCF0HwpsQl2HIwSFts3qeWyKUPM+Xt6zqOov/Ofj5AbwdAr Gkyu/WclAi6JWQEFFJoWpYaWBVmns+8= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=bytedance.com header.s=google header.b=iH5wFnjA; spf=pass (imf26.hostedemail.com: domain of zhangpeng.00@bytedance.com designates 209.85.215.179 as permitted sender) smtp.mailfrom=zhangpeng.00@bytedance.com; dmarc=pass (policy=quarantine) header.from=bytedance.com Received: by mail-pg1-f179.google.com with SMTP id 41be03b00d2f7-53033a0b473so6211226a12.0 for ; Mon, 15 May 2023 06:18:28 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1684156708; x=1686748708; 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=EveqtihCJt7fcxXdeINag7+zgOnp1O/guDL1F4v1dKU=; b=iH5wFnjAsZmRlAplDuTJ9I2hT2yvPCtbCKAQtoKqkq9S613j7lIiGO7vKZbSxzeW9h y+bsbpYKxsSfj0ALt0rm64PBjNnXlkahKtOH0yA3Cur9j3p8fSEUf6LVDIwbYOyemyEx JbYvB6KqpsD9G8GEDUDuDf2iQmVs2gW09IIshiqQf6gjH417PbMKiSGifdc7GmoEQfm0 KYF8J1oWTM6zH6D4HVei6jdxOb9NOAUCc5G2cdQbBoM16/K567m0A03DOMoHDmNhYIRZ QiTRh5AtBQdJ1rnV9qTdcMXoAqu/IC34CoDAq4WgSRaGVQANFFafyPMJBUaFX4iT1wXS W+vw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1684156708; x=1686748708; 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=EveqtihCJt7fcxXdeINag7+zgOnp1O/guDL1F4v1dKU=; b=IprYp2MEKp4EOclELPZG2Cm56vxMQTzNL1AT0GXETn1aEWlnWU5mBZAYod+JhQPypW JT7zU/hG+X5Cw7OUnp1a+43CpGfhfFZNQJB624mVZEIuDoqBU+SjTSI97BzjO0PIQIUj CcMK807Di/9mEXLDI02nleFAolfW/rdIDfSJtxPKtj0y6W03bNEEVMUkbxkA+1u+K0mT ofIkYFKxu3rJrhOltKrcMU1ZtZvbhq9ZWk+1hgNolWAAdCuOqCJUTdVaEQcfFP+XjW/w cpNgPz1QagKThIw3u2y+xGNG3HOptmE2RX4FWC086qY0hPdxzVDrNhkWNcha3cNUiuxi oWmA== X-Gm-Message-State: AC+VfDxtRsiGdau9xKytk4At03XJYP67Ld2PbpMfoMeItPhajq9/+hgv AwOLoQvnxUHMOx4wJ+qGzxdgBw== X-Google-Smtp-Source: ACHHUZ7JMEsSVoqIlBjE6pkY5JjMvLaZiehEFdZD2uDcVkyZJj0xmJh8G6Mir8ezq0lEU2wjPZzOhQ== X-Received: by 2002:a17:90a:9906:b0:23f:83de:7e4a with SMTP id b6-20020a17090a990600b0023f83de7e4amr31914390pjp.7.1684156707618; Mon, 15 May 2023 06:18:27 -0700 (PDT) Received: from GL4FX4PXWL.bytedance.net ([139.177.225.239]) by smtp.gmail.com with ESMTPSA id gl20-20020a17090b121400b0024749e7321bsm14190014pjb.6.2023.05.15.06.18.25 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 15 May 2023 06:18:27 -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 01/10] maple_tree: Drop the test code for mtree_alloc_{range,rrange}() Date: Mon, 15 May 2023 21:17:48 +0800 Message-Id: <20230515131757.60035-2-zhangpeng.00@bytedance.com> X-Mailer: git-send-email 2.37.0 (Apple Git-136) In-Reply-To: <20230515131757.60035-1-zhangpeng.00@bytedance.com> References: <20230515131757.60035-1-zhangpeng.00@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 96950140016 X-Rspam-User: X-Rspamd-Server: rspam06 X-Stat-Signature: p8a88k7eurhh4djj8cfogw76axjhgmta X-HE-Tag: 1684156710-121926 X-HE-Meta: U2FsdGVkX188sZx7niZvhd5lB/OipUl2Wb6X9XyTgLG2HnoKg8+Wp4kkx2jwV3IZwgZXI1OYCbxeFzg7RVKxlIfIBIT+bFpz24vbgsOOBVF7b1ExVq0u/ZIotXV0OqJ0Ba02xeCvna8I1gm/8HAr9sUSrufFp3D4/jVGvWGY8pACWi6t/ovJM49PQHEDwWuYO6AeziW0mkhJUTK+iF2sIDa06nWMjK8U706ICIheeYEKSYwdw8oWrSrWFBWw5xeL/fthgSaDd06sDaGLPHCR0rGCJGhuPQL0/PYAzzIiflLfX10LFX7ilaUy6HMyWJ9epjDdqO1x2TIM8/bZTzFwcJiZRXtH5kuJLJrR8gVSpVraJC0y8WJ5tWGZkDsXw4C149qPQAes5QK4dysfUwYcAz+nLq0aZCxAuivQjVep/QGeGWWx9BiPgWif6y8qTNM97AHDoQuqXy4bt9nXhDfFNLsWqLxyya+n3CnsQnZyo4IBJ2QZhNeRHEQNYJj12pdG/59VgnqbLXVOodBBEZdbgty6fywZ2s1TNSc1/a5hWAupj03ueycciL7ThW/bg3h+OXsHIO6yLhQmhF5JVv634+dGU/rlOXVlxggjA97SlKZTCIXLV8egBM7kWTfu5324nonopUABv8mz3iZYHHcRDeftue748wr6b4D1DTdYDamAvzKhVRaT2WjsAIlh0RG+JOlQfmDrsxcct5crRh1GRAZBSqOokiDzDzmtvSRmWjYxgNruOE+rW0+KJTEAwLH0YbST16BCVfY1ytS3PdY0jZo2NI6yfTuWWY6H4dJhEEcr+HQqcGcK7aKE93iVARCaH/cbARv/IBfrOs3LjtLHZY7nxFk6d3RWGFk+4OmFkI1wmwGRZD7DSinqPHnqpl0h54fX1hR6pOk2U6XKu48K5lGNkRtbbGCem0Gvp+s9AOjW7ChWJ7ZSSfvoErbk4xrZGPKAsyZSGoxSYDMEClY 4XlN7OwY z86HlSb1gMCXmjcmffgh9bDgfQliC4e9ACcdeYf3xauO6geqb5DuXDPMVQLtw5yjxmItd5o93OVPOKkMl0AOKo+Jh8v/Xz1KTlY8J0UK3khq3hwTkAJSoSYXBWX5ctW/waXTofvwGsxQoMd48i6x7raROt5H18yUEzfc1rMBA7grQ1StzkhCWIrvAvMsPW7JaHuE0KA0+i+ixfTlJBygqQibtBxilRanj5tL3SsWaqPJgmFQa5sDJIwVf2iiwiAHONAjYic6r9y70PtnvDK8YZHOcDqUM+Nvu+B8zw8NVqPO8SXvTokd6oeqGGxzE6uZLFf5hPMOMN81uEIUjRMpuTEG/7zugS8XyI+3hi66XGky/FV8sTJd+3VmqYeVP+gB3d+nPAkeuCZ2FryecP74N67gfHnCYwwqMcQjPNm3QsJLvxiJVWkTBLK8IGMjJp5M30E4LVJe3Fqwm3J4= 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: Drop the test code for mtree_alloc_{range,rrange}() because we are going to drop them. Signed-off-by: Peng Zhang Reviewed-by: Liam R. Howlett --- lib/test_maple_tree.c | 389 ------------------------------------------ 1 file changed, 389 deletions(-) diff --git a/lib/test_maple_tree.c b/lib/test_maple_tree.c index 9939be34e516e..86d7f742d243e 100644 --- a/lib/test_maple_tree.c +++ b/lib/test_maple_tree.c @@ -97,42 +97,6 @@ static void __init *mtree_test_erase(struct maple_tree *mt, unsigned long index) return mtree_erase(mt, index); } -#if defined(CONFIG_64BIT) -static noinline void __init check_mtree_alloc_range(struct maple_tree *mt, - unsigned long start, unsigned long end, unsigned long size, - unsigned long expected, int eret, void *ptr) -{ - - unsigned long result = expected + 1; - int ret; - - ret = mtree_alloc_range(mt, &result, ptr, size, start, end, - GFP_KERNEL); - MT_BUG_ON(mt, ret != eret); - if (ret) - return; - - MT_BUG_ON(mt, result != expected); -} - -static noinline void __init check_mtree_alloc_rrange(struct maple_tree *mt, - unsigned long start, unsigned long end, unsigned long size, - unsigned long expected, int eret, void *ptr) -{ - - unsigned long result = expected + 1; - int ret; - - ret = mtree_alloc_rrange(mt, &result, ptr, size, start, end, - GFP_KERNEL); - MT_BUG_ON(mt, ret != eret); - if (ret) - return; - - MT_BUG_ON(mt, result != expected); -} -#endif - static noinline void __init check_load(struct maple_tree *mt, unsigned long index, void *ptr) { @@ -635,348 +599,6 @@ static noinline void __init check_find_2(struct maple_tree *mt) /*MT_BUG_ON(mt, !mtree_empty(mt)); */ } - -#if defined(CONFIG_64BIT) -static noinline void __init check_alloc_rev_range(struct maple_tree *mt) -{ - /* - * Generated by: - * cat /proc/self/maps | awk '{print $1}'| - * awk -F "-" '{printf "0x%s, 0x%s, ", $1, $2}' - */ - - static const unsigned long range[] = { - /* Inclusive , Exclusive. */ - 0x565234af2000, 0x565234af4000, - 0x565234af4000, 0x565234af9000, - 0x565234af9000, 0x565234afb000, - 0x565234afc000, 0x565234afd000, - 0x565234afd000, 0x565234afe000, - 0x565235def000, 0x565235e10000, - 0x7f36d4bfd000, 0x7f36d4ee2000, - 0x7f36d4ee2000, 0x7f36d4f04000, - 0x7f36d4f04000, 0x7f36d504c000, - 0x7f36d504c000, 0x7f36d5098000, - 0x7f36d5098000, 0x7f36d5099000, - 0x7f36d5099000, 0x7f36d509d000, - 0x7f36d509d000, 0x7f36d509f000, - 0x7f36d509f000, 0x7f36d50a5000, - 0x7f36d50b9000, 0x7f36d50db000, - 0x7f36d50db000, 0x7f36d50dc000, - 0x7f36d50dc000, 0x7f36d50fa000, - 0x7f36d50fa000, 0x7f36d5102000, - 0x7f36d5102000, 0x7f36d5103000, - 0x7f36d5103000, 0x7f36d5104000, - 0x7f36d5104000, 0x7f36d5105000, - 0x7fff5876b000, 0x7fff5878d000, - 0x7fff5878e000, 0x7fff58791000, - 0x7fff58791000, 0x7fff58793000, - }; - - static const unsigned long holes[] = { - /* - * Note: start of hole is INCLUSIVE - * end of hole is EXCLUSIVE - * (opposite of the above table.) - * Start of hole, end of hole, size of hole (+1) - */ - 0x565234afb000, 0x565234afc000, 0x1000, - 0x565234afe000, 0x565235def000, 0x12F1000, - 0x565235e10000, 0x7f36d4bfd000, 0x28E49EDED000, - }; - - /* - * req_range consists of 4 values. - * 1. min index - * 2. max index - * 3. size - * 4. number that should be returned. - * 5. return value - */ - static const unsigned long req_range[] = { - 0x565234af9000, /* Min */ - 0x7fff58791000, /* Max */ - 0x1000, /* Size */ - 0x7fff5878d << 12, /* First rev hole of size 0x1000 */ - 0, /* Return value success. */ - - 0x0, /* Min */ - 0x565234AF0 << 12, /* Max */ - 0x3000, /* Size */ - 0x565234AEE << 12, /* max - 3. */ - 0, /* Return value success. */ - - 0x0, /* Min */ - -1, /* Max */ - 0x1000, /* Size */ - 562949953421311 << 12,/* First rev hole of size 0x1000 */ - 0, /* Return value success. */ - - 0x0, /* Min */ - 0x7F36D5109 << 12, /* Max */ - 0x4000, /* Size */ - 0x7F36D5106 << 12, /* First rev hole of size 0x4000 */ - 0, /* Return value success. */ - - /* Ascend test. */ - 0x0, - 34148798628 << 12, - 19 << 12, - 34148797418 << 12, - 0x0, - - /* Too big test. */ - 0x0, - 18446744073709551615UL, - 562915594369134UL << 12, - 0x0, - -EBUSY, - - /* Single space test. */ - 34148798725 << 12, - 34148798725 << 12, - 1 << 12, - 34148798725 << 12, - 0, - }; - - int i, range_count = ARRAY_SIZE(range); - int req_range_count = ARRAY_SIZE(req_range); - unsigned long min = 0; - - MA_STATE(mas, mt, 0, 0); - - mtree_store_range(mt, MTREE_ALLOC_MAX, ULONG_MAX, XA_ZERO_ENTRY, - GFP_KERNEL); -#define DEBUG_REV_RANGE 0 - for (i = 0; i < range_count; i += 2) { - /* Inclusive, Inclusive (with the -1) */ - -#if DEBUG_REV_RANGE - pr_debug("\t%s: Insert %lu-%lu\n", __func__, range[i] >> 12, - (range[i + 1] >> 12) - 1); -#endif - check_insert_range(mt, range[i] >> 12, (range[i + 1] >> 12) - 1, - xa_mk_value(range[i] >> 12), 0); - mt_validate(mt); - } - - - mas_lock(&mas); - for (i = 0; i < ARRAY_SIZE(holes); i += 3) { -#if DEBUG_REV_RANGE - pr_debug("Search from %lu-%lu for gap %lu should be at %lu\n", - min, holes[i+1]>>12, holes[i+2]>>12, - holes[i] >> 12); -#endif - MT_BUG_ON(mt, mas_empty_area_rev(&mas, min, - holes[i+1] >> 12, - holes[i+2] >> 12)); -#if DEBUG_REV_RANGE - pr_debug("Found %lu %lu\n", mas.index, mas.last); - pr_debug("gap %lu %lu\n", (holes[i] >> 12), - (holes[i+1] >> 12)); -#endif - MT_BUG_ON(mt, mas.last + 1 != (holes[i+1] >> 12)); - MT_BUG_ON(mt, mas.index != (holes[i+1] >> 12) - (holes[i+2] >> 12)); - min = holes[i+1] >> 12; - mas_reset(&mas); - } - - mas_unlock(&mas); - for (i = 0; i < req_range_count; i += 5) { -#if DEBUG_REV_RANGE - 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 - check_mtree_alloc_rrange(mt, - req_range[i] >> 12, /* start */ - req_range[i+1] >> 12, /* end */ - req_range[i+2] >> 12, /* size */ - req_range[i+3] >> 12, /* expected address */ - req_range[i+4], /* expected return */ - xa_mk_value(req_range[i] >> 12)); /* pointer */ - mt_validate(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); - - mtree_destroy(mt); -} - -static noinline void __init check_alloc_range(struct maple_tree *mt) -{ - /* - * Generated by: - * cat /proc/self/maps|awk '{print $1}'| - * awk -F "-" '{printf "0x%s, 0x%s, ", $1, $2}' - */ - - static const unsigned long range[] = { - /* Inclusive , Exclusive. */ - 0x565234af2000, 0x565234af4000, - 0x565234af4000, 0x565234af9000, - 0x565234af9000, 0x565234afb000, - 0x565234afc000, 0x565234afd000, - 0x565234afd000, 0x565234afe000, - 0x565235def000, 0x565235e10000, - 0x7f36d4bfd000, 0x7f36d4ee2000, - 0x7f36d4ee2000, 0x7f36d4f04000, - 0x7f36d4f04000, 0x7f36d504c000, - 0x7f36d504c000, 0x7f36d5098000, - 0x7f36d5098000, 0x7f36d5099000, - 0x7f36d5099000, 0x7f36d509d000, - 0x7f36d509d000, 0x7f36d509f000, - 0x7f36d509f000, 0x7f36d50a5000, - 0x7f36d50b9000, 0x7f36d50db000, - 0x7f36d50db000, 0x7f36d50dc000, - 0x7f36d50dc000, 0x7f36d50fa000, - 0x7f36d50fa000, 0x7f36d5102000, - 0x7f36d5102000, 0x7f36d5103000, - 0x7f36d5103000, 0x7f36d5104000, - 0x7f36d5104000, 0x7f36d5105000, - 0x7fff5876b000, 0x7fff5878d000, - 0x7fff5878e000, 0x7fff58791000, - 0x7fff58791000, 0x7fff58793000, - }; - static const unsigned long holes[] = { - /* Start of hole, end of hole, size of hole (+1) */ - 0x565234afb000, 0x565234afc000, 0x1000, - 0x565234afe000, 0x565235def000, 0x12F1000, - 0x565235e10000, 0x7f36d4bfd000, 0x28E49EDED000, - }; - - /* - * req_range consists of 4 values. - * 1. min index - * 2. max index - * 3. size - * 4. number that should be returned. - * 5. return value - */ - static const unsigned long req_range[] = { - 0x565234af9000, /* Min */ - 0x7fff58791000, /* Max */ - 0x1000, /* Size */ - 0x565234afb000, /* First hole in our data of size 1000. */ - 0, /* Return value success. */ - - 0x0, /* Min */ - 0x7fff58791000, /* Max */ - 0x1F00, /* Size */ - 0x0, /* First hole in our data of size 2000. */ - 0, /* Return value success. */ - - /* Test ascend. */ - 34148797436 << 12, /* Min */ - 0x7fff587AF000, /* Max */ - 0x3000, /* Size */ - 34148798629 << 12, /* Expected location */ - 0, /* Return value success. */ - - /* Test failing. */ - 34148798623 << 12, /* Min */ - 34148798683 << 12, /* Max */ - 0x15000, /* Size */ - 0, /* Expected location */ - -EBUSY, /* Return value failed. */ - - /* Test filling entire gap. */ - 34148798623 << 12, /* Min */ - 0x7fff587AF000, /* Max */ - 0x10000, /* Size */ - 34148798632 << 12, /* Expected location */ - 0, /* Return value success. */ - - /* Test walking off the end of root. */ - 0, /* Min */ - -1, /* Max */ - -1, /* Size */ - 0, /* Expected location */ - -EBUSY, /* Return value failure. */ - - /* Test looking for too large a hole across entire range. */ - 0, /* Min */ - -1, /* Max */ - 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); - unsigned long min = 0x565234af2000; - MA_STATE(mas, mt, 0, 0); - - mtree_store_range(mt, MTREE_ALLOC_MAX, ULONG_MAX, XA_ZERO_ENTRY, - GFP_KERNEL); - for (i = 0; i < range_count; i += 2) { -#define DEBUG_ALLOC_RANGE 0 -#if DEBUG_ALLOC_RANGE - pr_debug("\tInsert %lu-%lu\n", range[i] >> 12, - (range[i + 1] >> 12) - 1); - mt_dump(mt, mt_dump_hex); -#endif - check_insert_range(mt, range[i] >> 12, (range[i + 1] >> 12) - 1, - xa_mk_value(range[i] >> 12), 0); - mt_validate(mt); - } - - - - mas_lock(&mas); - for (i = 0; i < ARRAY_SIZE(holes); i += 3) { - -#if DEBUG_ALLOC_RANGE - pr_debug("\tGet empty %lu-%lu size %lu (%lx-%lx)\n", min >> 12, - holes[i+1] >> 12, holes[i+2] >> 12, - min, holes[i+1]); -#endif - MT_BUG_ON(mt, mas_empty_area(&mas, min >> 12, - holes[i+1] >> 12, - holes[i+2] >> 12)); - MT_BUG_ON(mt, mas.index != holes[i] >> 12); - min = holes[i+1]; - mas_reset(&mas); - } - mas_unlock(&mas); - for (i = 0; i < req_range_count; i += 5) { -#if DEBUG_ALLOC_RANGE - pr_debug("\tTest %d: %lu-%lu size %lu expected %lu (%lu-%lu)\n", - i/5, req_range[i] >> 12, req_range[i + 1] >> 12, - req_range[i + 2] >> 12, req_range[i + 3] >> 12, - req_range[i], req_range[i+1]); -#endif - check_mtree_alloc_range(mt, - req_range[i] >> 12, /* start */ - req_range[i+1] >> 12, /* end */ - req_range[i+2] >> 12, /* size */ - req_range[i+3] >> 12, /* expected address */ - req_range[i+4], /* expected return */ - xa_mk_value(req_range[i] >> 12)); /* pointer */ - mt_validate(mt); -#if DEBUG_ALLOC_RANGE - mt_dump(mt, mt_dump_hex); -#endif - } - - mtree_destroy(mt); -} -#endif - static noinline void __init check_ranges(struct maple_tree *mt) { int i, val, val2; @@ -3448,17 +3070,6 @@ static int __init maple_tree_seed(void) check_ranges(&tree); mtree_destroy(&tree); -#if defined(CONFIG_64BIT) - /* These tests have ranges outside of 4GB */ - mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); - check_alloc_range(&tree); - mtree_destroy(&tree); - - mt_init_flags(&tree, MT_FLAGS_ALLOC_RANGE); - check_alloc_rev_range(&tree); - mtree_destroy(&tree); -#endif - mt_init_flags(&tree, 0); check_load(&tree, set[0], NULL); /* See if 5015 -> NULL */