| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20230515165222.dqlazo2lg723ael2@revolver>
Date: Mon, 15 May 2023 12:52:22 -0400
From: "Liam R. Howlett" <Liam.Howlett@...cle.com>
To: Peng Zhang <zhangpeng.00@...edance.com>
Cc: akpm@...ux-foundation.org, linux-mm@...ck.org,
linux-kernel@...r.kernel.org, maple-tree@...ts.infradead.org
Subject: Re: [PATCH 01/10] maple_tree: Drop the test code for
mtree_alloc_{range,rrange}()
* Peng Zhang <zhangpeng.00@...edance.com> [230515 09:18]:
> Drop the test code for mtree_alloc_{range,rrange}() because we are going
> to drop them.
>
> Signed-off-by: Peng Zhang <zhangpeng.00@...edance.com>
Reviewed-by: Liam R. Howlett <Liam.Howlett@...cle.com>
> ---
> 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 */
> --
> 2.20.1
>
Powered by blists - more mailing lists