From nobody Fri Apr 10 21:53:22 2026 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5AFDAC25B0E for ; Fri, 19 Aug 2022 08:46:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347709AbiHSIqU (ORCPT ); Fri, 19 Aug 2022 04:46:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347626AbiHSIqR (ORCPT ); Fri, 19 Aug 2022 04:46:17 -0400 Received: from mail-qk1-x742.google.com (mail-qk1-x742.google.com [IPv6:2607:f8b0:4864:20::742]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AE9B7C59DC for ; Fri, 19 Aug 2022 01:46:15 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id b2so2829803qkh.12 for ; Fri, 19 Aug 2022 01:46:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=T6rhqE1MDLBP83ZdYjzgRTjb9QP2DbulaYxhEKflwcI=; b=EODm/tgOXmfGDiUTBzlFfo2pXKmvdh5NP1zbe4zqxZ+cFOPq24geJIl4VS4cAyFSEY RgJonVPErwLISjpACtZNAcgbrwsYJeoSioaIUHZYgegJPwHw2ZAWDkKkhmEzr+2ja9pD SGYn7F3OpGSjnqUXalwgtCkyGFCHh5hB3b74EVROAt8V0Dyxa1l2764zf2dSQFdfWgi8 UmnQBDFwgUTWbAUuXGlW5LOtZBjP89xlpQRL8lYSI4mHV4HZYOark7SaTzs3o3r/gY66 HWIv0avsDadhc5UuZQCFZ8jHMaLa39IMSsqFGzLDxcLZICfCbHX3BrxcaMupABfkmpLP npGA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=T6rhqE1MDLBP83ZdYjzgRTjb9QP2DbulaYxhEKflwcI=; b=rWRjiefTHmKRTrw9fwIY6G7xBMRfsxmgu3DoFTwJkE6gZmkKh0njz/XlQmLbKEiin/ CiO3wZYD1SaHzdfq/iBcymkkn5jfaz+7BuRDX3bMp7oqL2PA8QVd2CHRU/orQ7fGERsd VJv6c7VABouOOazaUtIq6mU6LKeyD8oz5JvrfnhbKbX3UOvdcradUqmCqk84I46DxKWQ eBicpzsZ3BH2Uhh5hFQ8yh+p+jNLWGGOQwbVWifTfgEU6UoRrFkGBC4W4BVRF+WD+1ym tzvWT62fBwQ4Qo4ijC8N/fzvk1jsNkhE7iG2xC5DnUj5cGff4zC3Y2SayfndsFeaDGA/ 3rIQ== X-Gm-Message-State: ACgBeo3XaUrAB/RwD0RpazpcDAvj2Xg8Af6Zw7/3I8sbdyKNlzMakZMc B3QZNPSEOE9O6FgbgF8w7WE= X-Google-Smtp-Source: AA6agR5/5HKdbMnmU2Q3rWRq85nYe5q8AxDJQEmnNdvwYsxtvkZ/qUReYl93pldQv5eDgMo15ghVYg== X-Received: by 2002:a37:2dc7:0:b0:6b8:62a6:ba34 with SMTP id t190-20020a372dc7000000b006b862a6ba34mr4292955qkh.760.1660898774695; Fri, 19 Aug 2022 01:46:14 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id u5-20020a05620a0c4500b006b5e296452csm3201640qki.54.2022.08.19.01.46.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:46:14 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH v2 4/8] memblock tests: add additional tests for basic api and memblock_alloc Date: Fri, 19 Aug 2022 01:34:52 -0700 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Add tests for memblock_add(), memblock_reserve(), memblock_remove(), memblock_free(), and memblock_alloc() for the following test scenarios. memblock_add() and memblock_reserve(): - add/reserve a memory block in the gap between two existing memory blocks, and check that the blocks are merged into one region - try to add/reserve memblock regions that extend past PHYS_ADDR_MAX memblock_remove() and memblock_free(): - remove/free a region when it is the only available region + These tests ensure that the first region is overwritten with a "dummy" region when the last remaining region of that type is removed or freed. - remove/free() a region that overlaps with two existing regions of the relevant type - try to remove/free memblock regions that extend past PHYS_ADDR_MAX memblock_alloc(): - try to allocate a region that is larger than the total size of available memory (memblock.memory) Signed-off-by: Rebecca Mckeever Reviewed-by: David Hildenbrand --- tools/testing/memblock/tests/alloc_api.c | 44 ++ tools/testing/memblock/tests/basic_api.c | 499 +++++++++++++++++++++++ 2 files changed, 543 insertions(+) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index 6a9c8e788cac..65bff77dd55b 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -469,6 +469,40 @@ static int alloc_no_memory_generic_check(void) return 0; } =20 +/* + * A test that tries to allocate a region that is larger than the total si= ze of + * available memory (memblock.memory): + * + * +-----------------------------------+ + * | new | + * +-----------------------------------+ + * | | + * | | + * +---------------------------------+ + * + * Expect no allocation to happen. + */ +static int alloc_too_large_generic_check(void) +{ + struct memblock_region *rgn =3D &memblock.reserved.regions[0]; + void *allocated_ptr =3D NULL; + + PREFIX_PUSH(); + + setup_memblock(); + + allocated_ptr =3D memblock_alloc(MEM_SIZE + SZ_2, SMP_CACHE_BYTES); + + ASSERT_EQ(allocated_ptr, NULL); + ASSERT_EQ(rgn->size, 0); + ASSERT_EQ(rgn->base, 0); + ASSERT_EQ(memblock.reserved.total_size, 0); + + test_pass_pop(); + + return 0; +} + /* * A simple test that tries to allocate a small memory region. * Expect to allocate an aligned region at the beginning of the available @@ -813,6 +847,15 @@ static int alloc_no_memory_check(void) return 0; } =20 +static int alloc_too_large_check(void) +{ + test_print("\tRunning %s...\n", __func__); + run_top_down(alloc_too_large_generic_check); + run_bottom_up(alloc_too_large_generic_check); + + return 0; +} + int memblock_alloc_checks(void) { const char *func_testing =3D "memblock_alloc"; @@ -835,6 +878,7 @@ int memblock_alloc_checks(void) alloc_no_space_check(); alloc_limited_space_check(); alloc_no_memory_check(); + alloc_too_large_check(); =20 dummy_physical_memory_cleanup(); =20 diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index 66f46f261e66..ea79396e4611 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -326,6 +326,102 @@ static int memblock_add_twice_check(void) return 0; } =20 +/* + * A test that tries to add two memory blocks that don't overlap with one + * another and then add a third memory block in the space between the firs= t two: + * + * | +--------+--------+--------+ | + * | | r1 | r3 | r2 | | + * +--------+--------+--------+--------+--+ + * + * Expect to merge the three entries into one region that starts at r1.base + * and has size of r1.size + r2.size + r3.size. The region counter and tot= al + * size of the available memory are updated. + */ +static int memblock_add_between_check(void) +{ + struct memblock_region *rgn; + phys_addr_t total_size; + + rgn =3D &memblock.memory.regions[0]; + + struct region r1 =3D { + .base =3D SZ_1G, + .size =3D SZ_8K + }; + struct region r2 =3D { + .base =3D SZ_1G + SZ_16K, + .size =3D SZ_8K + }; + struct region r3 =3D { + .base =3D SZ_1G + SZ_8K, + .size =3D SZ_8K + }; + + PREFIX_PUSH(); + + total_size =3D r1.size + r2.size + r3.size; + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_add(r2.base, r2.size); + memblock_add(r3.base, r3.size); + + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); + + test_pass_pop(); + + return 0; +} + +/* + * A simple test that tries to add a memory block r when r extends past + * PHYS_ADDR_MAX: + * + * +--------+ + * | r | + * +--------+ + * | +----+ + * | | rgn| + * +----------------------------+----+ + * + * Expect to add a memory block of size PHYS_ADDR_MAX - r.base. Expect the + * total size of available memory and the counter to be updated. + */ +static int memblock_add_near_max_check(void) +{ + struct memblock_region *rgn; + phys_addr_t total_size; + + rgn =3D &memblock.memory.regions[0]; + + struct region r =3D { + .base =3D PHYS_ADDR_MAX - SZ_1M, + .size =3D SZ_2M + }; + + PREFIX_PUSH(); + + total_size =3D PHYS_ADDR_MAX - r.base; + + reset_memblock_regions(); + memblock_add(r.base, r.size); + + ASSERT_EQ(rgn->base, r.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); + + test_pass_pop(); + + return 0; +} + static int memblock_add_checks(void) { prefix_reset(); @@ -339,6 +435,8 @@ static int memblock_add_checks(void) memblock_add_overlap_bottom_check(); memblock_add_within_check(); memblock_add_twice_check(); + memblock_add_between_check(); + memblock_add_near_max_check(); =20 prefix_pop(); =20 @@ -604,6 +702,102 @@ static int memblock_reserve_twice_check(void) return 0; } =20 +/* + * A test that tries to mark two memory blocks that don't overlap as reser= ved + * and then reserve a third memory block in the space between the first tw= o: + * + * | +--------+--------+--------+ | + * | | r1 | r3 | r2 | | + * +--------+--------+--------+--------+--+ + * + * Expect to merge the three entries into one reserved region that starts = at + * r1.base and has size of r1.size + r2.size + r3.size. The region counter= and + * total for memblock.reserved are updated. + */ +static int memblock_reserve_between_check(void) +{ + struct memblock_region *rgn; + phys_addr_t total_size; + + rgn =3D &memblock.reserved.regions[0]; + + struct region r1 =3D { + .base =3D SZ_1G, + .size =3D SZ_8K + }; + struct region r2 =3D { + .base =3D SZ_1G + SZ_16K, + .size =3D SZ_8K + }; + struct region r3 =3D { + .base =3D SZ_1G + SZ_8K, + .size =3D SZ_8K + }; + + PREFIX_PUSH(); + + total_size =3D r1.size + r2.size + r3.size; + + reset_memblock_regions(); + memblock_reserve(r1.base, r1.size); + memblock_reserve(r2.base, r2.size); + memblock_reserve(r3.base, r3.size); + + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); + + return 0; +} + +/* + * A simple test that tries to reserve a memory block r when r extends past + * PHYS_ADDR_MAX: + * + * +--------+ + * | r | + * +--------+ + * | +----+ + * | | rgn| + * +----------------------------+----+ + * + * Expect to reserve a memory block of size PHYS_ADDR_MAX - r.base. Expect= the + * total size of reserved memory and the counter to be updated. + */ +static int memblock_reserve_near_max_check(void) +{ + struct memblock_region *rgn; + phys_addr_t total_size; + + rgn =3D &memblock.reserved.regions[0]; + + struct region r =3D { + .base =3D PHYS_ADDR_MAX - SZ_1M, + .size =3D SZ_2M + }; + + PREFIX_PUSH(); + + total_size =3D PHYS_ADDR_MAX - r.base; + + reset_memblock_regions(); + memblock_reserve(r.base, r.size); + + ASSERT_EQ(rgn->base, r.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); + + return 0; +} + static int memblock_reserve_checks(void) { prefix_reset(); @@ -616,6 +810,8 @@ static int memblock_reserve_checks(void) memblock_reserve_overlap_bottom_check(); memblock_reserve_within_check(); memblock_reserve_twice_check(); + memblock_reserve_between_check(); + memblock_reserve_near_max_check(); =20 prefix_pop(); =20 @@ -887,6 +1083,155 @@ static int memblock_remove_within_check(void) return 0; } =20 +/* + * A simple test that tries to remove a region r1 from the array of + * available memory regions when r1 is the only available region. + * Expect to add a memory block r1 and then remove r1 so that a dummy + * region is added. The region counter stays the same, and the total size + * is updated. + */ +static int memblock_remove_only_region_check(void) +{ + struct memblock_region *rgn; + + rgn =3D &memblock.memory.regions[0]; + + struct region r1 =3D { + .base =3D SZ_2K, + .size =3D SZ_4K + }; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_remove(r1.base, r1.size); + + ASSERT_EQ(rgn->base, 0); + ASSERT_EQ(rgn->size, 0); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, 0); + + test_pass_pop(); + + return 0; +} + +/* + * A simple test that tries remove a region r2 from the array of available + * memory regions when r2 extends past PHYS_ADDR_MAX: + * + * +--------+ + * | r2 | + * +--------+ + * | +---+....+ + * | |rgn| | + * +------------------------+---+----+ + * + * Expect that only the portion between PHYS_ADDR_MAX and r2.base is remov= ed. + * Expect the total size of available memory to be updated and the counter= to + * not be updated. + */ +static int memblock_remove_near_max_check(void) +{ + struct memblock_region *rgn; + phys_addr_t total_size; + + rgn =3D &memblock.memory.regions[0]; + + struct region r1 =3D { + .base =3D PHYS_ADDR_MAX - SZ_2M, + .size =3D SZ_2M + }; + + struct region r2 =3D { + .base =3D PHYS_ADDR_MAX - SZ_1M, + .size =3D SZ_2M + }; + + PREFIX_PUSH(); + + total_size =3D r1.size - (PHYS_ADDR_MAX - r2.base); + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_remove(r2.base, r2.size); + + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.total_size, total_size); + + test_pass_pop(); + + return 0; +} + +/* + * A test that tries to remove a region r3 that overlaps with two existing + * regions r1 and r2: + * + * +----------------+ + * | r3 | + * +----------------+ + * | +----+..... ........+--------+ + * | | |r1 : : |r2 | | + * +----+----+----+---+-------+--------+-----+ + * + * Expect that only the intersections of r1 with r3 and r2 with r3 are rem= oved + * from the available memory pool. Expect the total size of available memo= ry to + * be updated and the counter to not be updated. + */ +static int memblock_remove_overlap_two_check(void) +{ + struct memblock_region *rgn1, *rgn2; + phys_addr_t new_r1_size, new_r2_size, r2_end, r3_end, total_size; + + rgn1 =3D &memblock.memory.regions[0]; + rgn2 =3D &memblock.memory.regions[1]; + + struct region r1 =3D { + .base =3D SZ_16M, + .size =3D SZ_32M + }; + struct region r2 =3D { + .base =3D SZ_64M, + .size =3D SZ_64M + }; + struct region r3 =3D { + .base =3D SZ_32M, + .size =3D SZ_64M + }; + + PREFIX_PUSH(); + + r2_end =3D r2.base + r2.size; + r3_end =3D r3.base + r3.size; + new_r1_size =3D r3.base - r1.base; + new_r2_size =3D r2_end - r3_end; + total_size =3D new_r1_size + new_r2_size; + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_add(r2.base, r2.size); + memblock_remove(r3.base, r3.size); + + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, new_r1_size); + + ASSERT_EQ(rgn2->base, r3_end); + ASSERT_EQ(rgn2->size, new_r2_size); + + ASSERT_EQ(memblock.memory.cnt, 2); + ASSERT_EQ(memblock.memory.total_size, total_size); + + test_pass_pop(); + + return 0; +} + static int memblock_remove_checks(void) { prefix_reset(); @@ -898,6 +1243,9 @@ static int memblock_remove_checks(void) memblock_remove_overlap_top_check(); memblock_remove_overlap_bottom_check(); memblock_remove_within_check(); + memblock_remove_only_region_check(); + memblock_remove_near_max_check(); + memblock_remove_overlap_two_check(); =20 prefix_pop(); =20 @@ -1163,6 +1511,154 @@ static int memblock_free_within_check(void) return 0; } =20 +/* + * A simple test that tries to free a memory block r1 that was marked + * earlier as reserved when r1 is the only available region. + * Expect to reserve a memory block r1 and then free r1 so that r1 is + * overwritten with a dummy region. The region counter stays the same, + * and the total size is updated. + */ +static int memblock_free_only_region_check(void) +{ + struct memblock_region *rgn; + + rgn =3D &memblock.reserved.regions[0]; + + struct region r1 =3D { + .base =3D SZ_2K, + .size =3D SZ_4K + }; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_reserve(r1.base, r1.size); + memblock_free((void *)r1.base, r1.size); + + ASSERT_EQ(rgn->base, 0); + ASSERT_EQ(rgn->size, 0); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, 0); + + test_pass_pop(); + + return 0; +} + +/* + * A simple test that tries free a region r2 when r2 extends past PHYS_ADD= R_MAX: + * + * +--------+ + * | r2 | + * +--------+ + * | +---+....+ + * | |rgn| | + * +------------------------+---+----+ + * + * Expect that only the portion between PHYS_ADDR_MAX and r2.base is freed. + * Expect the total size of reserved memory to be updated and the counter = to + * not be updated. + */ +static int memblock_free_near_max_check(void) +{ + struct memblock_region *rgn; + phys_addr_t total_size; + + rgn =3D &memblock.reserved.regions[0]; + + struct region r1 =3D { + .base =3D PHYS_ADDR_MAX - SZ_2M, + .size =3D SZ_2M + }; + + struct region r2 =3D { + .base =3D PHYS_ADDR_MAX - SZ_1M, + .size =3D SZ_2M + }; + + PREFIX_PUSH(); + + total_size =3D r1.size - (PHYS_ADDR_MAX - r2.base); + + reset_memblock_regions(); + memblock_reserve(r1.base, r1.size); + memblock_free((void *)r2.base, r2.size); + + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, total_size); + + ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); + + return 0; +} + +/* + * A test that tries to free a reserved region r3 that overlaps with two + * existing reserved regions r1 and r2: + * + * +----------------+ + * | r3 | + * +----------------+ + * | +----+..... ........+--------+ + * | | |r1 : : |r2 | | + * +----+----+----+---+-------+--------+-----+ + * + * Expect that only the intersections of r1 with r3 and r2 with r3 are fre= ed + * from the collection of reserved memory. Expect the total size of reserv= ed + * memory to be updated and the counter to not be updated. + */ +static int memblock_free_overlap_two_check(void) +{ + struct memblock_region *rgn1, *rgn2; + phys_addr_t new_r1_size, new_r2_size, r2_end, r3_end, total_size; + + rgn1 =3D &memblock.reserved.regions[0]; + rgn2 =3D &memblock.reserved.regions[1]; + + struct region r1 =3D { + .base =3D SZ_16M, + .size =3D SZ_32M + }; + struct region r2 =3D { + .base =3D SZ_64M, + .size =3D SZ_64M + }; + struct region r3 =3D { + .base =3D SZ_32M, + .size =3D SZ_64M + }; + + PREFIX_PUSH(); + + r2_end =3D r2.base + r2.size; + r3_end =3D r3.base + r3.size; + new_r1_size =3D r3.base - r1.base; + new_r2_size =3D r2_end - r3_end; + total_size =3D new_r1_size + new_r2_size; + + reset_memblock_regions(); + memblock_reserve(r1.base, r1.size); + memblock_reserve(r2.base, r2.size); + memblock_free((void *)r3.base, r3.size); + + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, new_r1_size); + + ASSERT_EQ(rgn2->base, r3_end); + ASSERT_EQ(rgn2->size, new_r2_size); + + ASSERT_EQ(memblock.reserved.cnt, 2); + ASSERT_EQ(memblock.reserved.total_size, total_size); + + test_pass_pop(); + + return 0; +} + static int memblock_free_checks(void) { prefix_reset(); @@ -1174,6 +1670,9 @@ static int memblock_free_checks(void) memblock_free_overlap_top_check(); memblock_free_overlap_bottom_check(); memblock_free_within_check(); + memblock_free_only_region_check(); + memblock_free_near_max_check(); + memblock_free_overlap_two_check(); =20 prefix_pop(); =20 --=20 2.25.1