From nobody Fri Apr 10 20:15:59 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 D0566C25B0E for ; Fri, 19 Aug 2022 08:40:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345493AbiHSIkH (ORCPT ); Fri, 19 Aug 2022 04:40:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39770 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1346618AbiHSIjh (ORCPT ); Fri, 19 Aug 2022 04:39:37 -0400 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9F05952FED for ; Fri, 19 Aug 2022 01:39:36 -0700 (PDT) Received: by mail-qt1-x843.google.com with SMTP id e28so2865914qts.1 for ; Fri, 19 Aug 2022 01:39:36 -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=ZVAH52wX+Vt0VKFbPcXrR0NQYeosP7RaFGxexdtx2/k=; b=RBvhEylwETKO3LQxwWSeaQIT8zFQsVcb2ac4fQv65r4ZaKJOIxncaj3jU95FlpRq1C miI4Mo+in6YwX1eXdwPiPt2Mf/MuUKer/ORZsLwibFNz2IYhiR261oGgJFHi/wofDzUl 6SvY+GbnuYbT23bJp2HASErvNrB5tVY7rlMIM1KFKh5v86IthHVkwds+7aErsgGTePLH GvK7SijEyufalcqph/NO0rUf+Af2ZQw7X7P4sbIXHELV8ijwWDn0BM2Jt0MRIqCmK4tG tA4v+A7Oro3k3VWl14IWMrKgTMrNwIZ8FMO/j2LhzneVE1FstWD0gvhVVXd3vrngiHlR PzZg== 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=ZVAH52wX+Vt0VKFbPcXrR0NQYeosP7RaFGxexdtx2/k=; b=GdG3Doedhh/4bJ66QigzS8ylByujHgEEPs089ycCMWB+3QBl4qVirHLatKMg/NIacv M/4v/HpKr3CCw6w2QiSeiWBsA/GtbojIafkvkpw1hxWmaLZKwdWBhLwc5RhVlhBMpK5v nuNw1wB/AJKOfUiWs4KqaUsQseWQK2WMrvpabBUuGgAeo9BPuuMIaE0lzt1hxoni8Lq/ DEEslsk0jCof8/9dodz39LehSzF3620UR+pS65R3fQ6YcAxsaNLAhqUjzdXfFyqqY+P9 HEHU6d385pdF0vYVwyTvLZ+uiiS9BsYDxBsE0l1a4QeGdF0YstmMr/YbKP88QQUZS/Ab 0w9w== X-Gm-Message-State: ACgBeo0xBowivm1wpxhvX2KTj34kwnS8B/q4GT9GPhgk0aGnsKM5mlqZ 0AREZcFIum56K80ad6/3lfk= X-Google-Smtp-Source: AA6agR63GuJ9BaRkAT1HJfWOqq0Tozm0ITWs+Ffdd9lihkVdVI6HsKLlY1QYEJeOEWwacxzbNVZz4w== X-Received: by 2002:a05:622a:1185:b0:343:7de8:c0f2 with SMTP id m5-20020a05622a118500b003437de8c0f2mr5509076qtk.256.1660898375533; Fri, 19 Aug 2022 01:39:35 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id az41-20020a05620a172900b006bb8b5b79efsm3265212qkb.129.2022.08.19.01.39.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:39:35 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever , Shaoqin Huang Subject: [PATCH v2 1/8] memblock tests: update tests to check if memblock_alloc zeroed memory Date: Fri, 19 Aug 2022 01:34:49 -0700 Message-Id: <669782f4f508c3dd60c5efd6d130d12a77573448.1660897732.git.remckee0@gmail.com> 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 an assert in memblock_alloc() tests where allocation is expected to occur. The assert checks whether the entire chunk of allocated memory is cleared. The current memblock_alloc() tests do not check whether the allocated memory was zeroed. memblock_alloc() should zero the allocated memory since it is a wrapper for memblock_alloc_try_nid(). Reviewed-by: Shaoqin Huang Signed-off-by: Rebecca Mckeever Reviewed-by: David Hildenbrand --- tools/testing/memblock/tests/alloc_api.c | 23 +++++++++++++++++++++++ tools/testing/memblock/tests/common.c | 7 +++++++ tools/testing/memblock/tests/common.h | 12 ++++++++++++ 3 files changed, 42 insertions(+) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index a14f38eb8a89..aefb67557de9 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -22,6 +22,8 @@ static int alloc_top_down_simple_check(void) allocated_ptr =3D memblock_alloc(size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, expected_start); =20 @@ -80,6 +82,8 @@ static int alloc_top_down_disjoint_check(void) allocated_ptr =3D memblock_alloc(r2_size, alignment); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); =20 @@ -125,6 +129,8 @@ static int alloc_top_down_before_check(void) allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - total_size); =20 @@ -173,6 +179,8 @@ static int alloc_top_down_after_check(void) allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base - r2_size); =20 @@ -223,6 +231,8 @@ static int alloc_top_down_second_fit_check(void) allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + ASSERT_EQ(rgn->size, r2.size + r3_size); ASSERT_EQ(rgn->base, r2.base - r3_size); =20 @@ -277,6 +287,8 @@ static int alloc_in_between_generic_check(void) allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base - r2.size - r3_size); =20 @@ -418,6 +430,8 @@ static int alloc_limited_space_generic_check(void) allocated_ptr =3D memblock_alloc(available_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, available_size); + ASSERT_EQ(rgn->size, MEM_SIZE); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 @@ -472,6 +486,8 @@ static int alloc_bottom_up_simple_check(void) allocated_ptr =3D memblock_alloc(SZ_2, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, SZ_2); + ASSERT_EQ(rgn->size, SZ_2); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 @@ -528,6 +544,7 @@ static int alloc_bottom_up_disjoint_check(void) allocated_ptr =3D memblock_alloc(r2_size, alignment); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -571,6 +588,8 @@ static int alloc_bottom_up_before_check(void) allocated_ptr =3D memblock_alloc(r1_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r1_size); + ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); =20 @@ -618,6 +637,8 @@ static int alloc_bottom_up_after_check(void) allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base); =20 @@ -669,6 +690,8 @@ static int alloc_bottom_up_second_fit_check(void) allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + ASSERT_EQ(rgn->size, r2.size + r3_size); ASSERT_EQ(rgn->base, r2.base); =20 diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock= /tests/common.c index 76a8ad818f3a..eec6901081af 100644 --- a/tools/testing/memblock/tests/common.c +++ b/tools/testing/memblock/tests/common.c @@ -60,16 +60,23 @@ void reset_memblock_attributes(void) memblock.current_limit =3D MEMBLOCK_ALLOC_ANYWHERE; } =20 +static inline void fill_memblock(void) +{ + memset(memory_block.base, 1, MEM_SIZE); +} + void setup_memblock(void) { reset_memblock_regions(); memblock_add((phys_addr_t)memory_block.base, MEM_SIZE); + fill_memblock(); } =20 void dummy_physical_memory_init(void) { memory_block.base =3D malloc(MEM_SIZE); assert(memory_block.base); + fill_memblock(); } =20 void dummy_physical_memory_cleanup(void) diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock= /tests/common.h index d396e5423a8e..29756e652e3e 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -51,6 +51,18 @@ assert((_expected) < (_seen)); \ } while (0) =20 +/** + * ASSERT_MEM_EQ(): + * Check that the first @_size bytes of @_seen are all equal to @_expected. + * If false, print failed test message (if running with --verbose) and then + * assert. + */ +#define ASSERT_MEM_EQ(_seen, _expected, _size) do { \ + for (int _i =3D 0; _i < (_size); _i++) { \ + ASSERT_EQ((_seen)[_i], (_expected)); \ + } \ +} while (0) + #define PREFIX_PUSH() prefix_push(__func__) =20 /* --=20 2.25.1 From nobody Fri Apr 10 20:15:59 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 ED777C25B0E for ; Fri, 19 Aug 2022 08:42:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347280AbiHSImG (ORCPT ); Fri, 19 Aug 2022 04:42:06 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48392 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347270AbiHSIlx (ORCPT ); Fri, 19 Aug 2022 04:41:53 -0400 Received: from mail-qt1-x843.google.com (mail-qt1-x843.google.com [IPv6:2607:f8b0:4864:20::843]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 0DCED67452 for ; Fri, 19 Aug 2022 01:41:49 -0700 (PDT) Received: by mail-qt1-x843.google.com with SMTP id j17so2846119qtp.12 for ; Fri, 19 Aug 2022 01:41:49 -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=PFs/qXz1irqoPW1RQONVSX/UZnoITe4BseRhR7exQIk=; b=nrxsZSFJATbxAFW+4G1nowH9Rxxfz5mTEm7/OLNuUQgdzB0FZqg/pgYxtzjg+3aQ1e f4LHPv0Jwbz1oaLLpIoIRUylpZodleb3ezEYJAndn55y/+U7gq1f0ibflvHX65c+d9Km r5vFgb4qvVAOC0IwKKnT5+XCgV30r8w3XeVc8SnlK+tZ+DsvOfcde/v+n9EH/e4TBHYy GciDGrcuINhxQSuRAh6IMGbQv5NW9NOVcivkEVAq+dK7OuLMwWFSOM6f8MykZtxG3krv T+Ich+K5cJkRLvsouVAbAsNlaCbKvgbcFkWC+z/c7tcC5pHjDDdBIcHc+LXAGa1jLWrt W4CQ== 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=PFs/qXz1irqoPW1RQONVSX/UZnoITe4BseRhR7exQIk=; b=ZP/apT1f/0j5hNZktdH1YejBih0+fdFHF9fvdtF9IQOgCRRbzZUZlj6LWg3XoVg91E A64pehGOEJmV8t54Auidr+vRDOKM1/RhMh0hCsdxfkbXRczRwqVuVLKJhmKH78UbRV6w OFe3pABhWhlcwY5Yi+rf9UvPz/rsYMJUK67E/y6gLe7AbyNl6EbOmvmzXDTB/2O1yCKk iHRvwXgqHAxdVZ0FWWyeTUUWKD2Ix0eGWXYnCDdFxxxKdsbhaKmnnwAaCsAMpFVHGcFj yAkRS1k9iYIGkN/TnjgzXa1nFYU35XgULZ2n49p/5qNmVK83eLeWyZx/I7XAt9VW93l0 SB7A== X-Gm-Message-State: ACgBeo0Ap+SNk2VlgIh9PoHZkRajzrXo7hPEAuYkmF6A+JNL7Qo2CixS gE+de/1GlRNHbr6HqTuhOYo= X-Google-Smtp-Source: AA6agR5PPFo3Cz0k33UftdyYjQici7vLNI5MGZG1EJL7K9NXyiKQZPDMgfVlHXyOzi+jIF8ZvcabBg== X-Received: by 2002:ac8:5f94:0:b0:344:55da:cee1 with SMTP id j20-20020ac85f94000000b0034455dacee1mr5590857qta.40.1660898508526; Fri, 19 Aug 2022 01:41:48 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id v9-20020a05622a014900b00342f8d4d0basm2868087qtw.43.2022.08.19.01.41.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:41:48 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever , Shaoqin Huang Subject: [PATCH v2 2/8] memblock tests: update zeroed memory check for memblock_alloc_* tests Date: Fri, 19 Aug 2022 01:34:50 -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" Update the assert in memblock_alloc_try_nid() and memblock_alloc_from() tests that checks whether the memory is cleared so that it checks the entire chunk of allocated memory instead of just the first byte. Reviewed-by: David Hildenbrand Reviewed-by: Shaoqin Huang Signed-off-by: Rebecca Mckeever --- .../memblock/tests/alloc_helpers_api.c | 8 +-- tools/testing/memblock/tests/alloc_nid_api.c | 72 +++++-------------- 2 files changed, 20 insertions(+), 60 deletions(-) diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testi= ng/memblock/tests/alloc_helpers_api.c index 1069b4bdd5fd..796527cf3bd2 100644 --- a/tools/testing/memblock/tests/alloc_helpers_api.c +++ b/tools/testing/memblock/tests/alloc_helpers_api.c @@ -19,7 +19,6 @@ static int alloc_from_simple_generic_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -31,10 +30,9 @@ static int alloc_from_simple_generic_check(void) min_addr =3D memblock_end_of_DRAM() - SMP_CACHE_BYTES; =20 allocated_ptr =3D memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -66,7 +64,6 @@ static int alloc_from_misaligned_generic_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -79,10 +76,9 @@ static int alloc_from_misaligned_generic_check(void) min_addr =3D memblock_end_of_DRAM() - (SMP_CACHE_BYTES * 2 - 1); =20 allocated_ptr =3D memblock_alloc_from(size, SMP_CACHE_BYTES, min_addr); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - SMP_CACHE_BYTES); diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/m= emblock/tests/alloc_nid_api.c index 255fd514e9f5..71b7beb35526 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -19,7 +19,6 @@ static int alloc_try_nid_top_down_simple_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -35,11 +34,10 @@ static int alloc_try_nid_top_down_simple_check(void) =20 allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size); @@ -74,7 +72,6 @@ static int alloc_try_nid_top_down_end_misaligned_check(vo= id) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -91,11 +88,10 @@ static int alloc_try_nid_top_down_end_misaligned_check(= void) =20 allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size - misalign); @@ -128,7 +124,6 @@ static int alloc_try_nid_exact_address_generic_check(vo= id) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -144,11 +139,10 @@ static int alloc_try_nid_exact_address_generic_check(= void) =20 allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -183,7 +177,6 @@ static int alloc_try_nid_top_down_narrow_range_check(vo= id) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -198,10 +191,9 @@ static int alloc_try_nid_top_down_narrow_range_check(v= oid) =20 allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size); @@ -277,7 +269,6 @@ static int alloc_try_nid_min_reserved_generic_check(voi= d) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -298,10 +289,9 @@ static int alloc_try_nid_min_reserved_generic_check(vo= id) =20 allocated_ptr =3D memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, reserved_base); @@ -332,7 +322,6 @@ static int alloc_try_nid_max_reserved_generic_check(voi= d) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -351,10 +340,9 @@ static int alloc_try_nid_max_reserved_generic_check(vo= id) =20 allocated_ptr =3D memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, min_addr); @@ -389,7 +377,6 @@ static int alloc_try_nid_top_down_reserved_with_space_c= heck(void) struct memblock_region *rgn1 =3D &memblock.reserved.regions[1]; struct memblock_region *rgn2 =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; struct region r1, r2; =20 PREFIX_PUSH(); @@ -417,10 +404,9 @@ static int alloc_try_nid_top_down_reserved_with_space_= check(void) =20 allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); =20 ASSERT_EQ(rgn1->size, r1.size + r3_size); ASSERT_EQ(rgn1->base, max_addr - r3_size); @@ -456,7 +442,6 @@ static int alloc_try_nid_reserved_full_merge_generic_ch= eck(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; struct region r1, r2; =20 PREFIX_PUSH(); @@ -483,10 +468,9 @@ static int alloc_try_nid_reserved_full_merge_generic_c= heck(void) =20 allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r2.base); @@ -522,7 +506,6 @@ static int alloc_try_nid_top_down_reserved_no_space_che= ck(void) struct memblock_region *rgn1 =3D &memblock.reserved.regions[1]; struct memblock_region *rgn2 =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; struct region r1, r2; =20 PREFIX_PUSH(); @@ -550,10 +533,9 @@ static int alloc_try_nid_top_down_reserved_no_space_ch= eck(void) =20 allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -634,7 +616,6 @@ static int alloc_try_nid_top_down_cap_max_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -649,10 +630,9 @@ static int alloc_try_nid_top_down_cap_max_check(void) =20 allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); @@ -674,7 +654,6 @@ static int alloc_try_nid_top_down_cap_min_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -689,10 +668,9 @@ static int alloc_try_nid_top_down_cap_min_check(void) =20 allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); @@ -723,7 +701,6 @@ static int alloc_try_nid_bottom_up_simple_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -740,11 +717,10 @@ static int alloc_try_nid_bottom_up_simple_check(void) allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -779,7 +755,6 @@ static int alloc_try_nid_bottom_up_start_misaligned_che= ck(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -797,11 +772,10 @@ static int alloc_try_nid_bottom_up_start_misaligned_c= heck(void) allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr + (SMP_CACHE_BYTES - misalign)); @@ -836,7 +810,6 @@ static int alloc_try_nid_bottom_up_narrow_range_check(v= oid) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -852,10 +825,9 @@ static int alloc_try_nid_bottom_up_narrow_range_check(= void) allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -890,7 +862,6 @@ static int alloc_try_nid_bottom_up_reserved_with_space_= check(void) struct memblock_region *rgn1 =3D &memblock.reserved.regions[1]; struct memblock_region *rgn2 =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; struct region r1, r2; =20 PREFIX_PUSH(); @@ -919,10 +890,9 @@ static int alloc_try_nid_bottom_up_reserved_with_space= _check(void) allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, max_addr); @@ -964,7 +934,6 @@ static int alloc_try_nid_bottom_up_reserved_no_space_ch= eck(void) struct memblock_region *rgn2 =3D &memblock.reserved.regions[1]; struct memblock_region *rgn3 =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; struct region r1, r2; =20 PREFIX_PUSH(); @@ -993,10 +962,9 @@ static int alloc_try_nid_bottom_up_reserved_no_space_c= heck(void) allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); =20 ASSERT_EQ(rgn3->size, r3_size); ASSERT_EQ(rgn3->base, memblock_start_of_DRAM()); @@ -1024,7 +992,6 @@ static int alloc_try_nid_bottom_up_cap_max_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -1040,10 +1007,9 @@ static int alloc_try_nid_bottom_up_cap_max_check(voi= d) allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -1065,7 +1031,6 @@ static int alloc_try_nid_bottom_up_cap_min_check(void) { struct memblock_region *rgn =3D &memblock.reserved.regions[0]; void *allocated_ptr =3D NULL; - char *b; =20 PREFIX_PUSH(); =20 @@ -1081,10 +1046,9 @@ static int alloc_try_nid_bottom_up_cap_min_check(voi= d) allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, min_addr, max_addr, NUMA_NO_NODE); - b =3D (char *)allocated_ptr; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_EQ(*b, 0); + ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); --=20 2.25.1 From nobody Fri Apr 10 20:15:59 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 234ECC25B0E for ; Fri, 19 Aug 2022 08:44:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347594AbiHSIoI (ORCPT ); Fri, 19 Aug 2022 04:44:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347451AbiHSIoD (ORCPT ); Fri, 19 Aug 2022 04:44:03 -0400 Received: from mail-qk1-x741.google.com (mail-qk1-x741.google.com [IPv6:2607:f8b0:4864:20::741]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7FB8E6DFAB for ; Fri, 19 Aug 2022 01:44:02 -0700 (PDT) Received: by mail-qk1-x741.google.com with SMTP id w18so2838054qki.8 for ; Fri, 19 Aug 2022 01:44:02 -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=/AuZh6/EXSH4csd9kXJqbNQ5qfX/45Zmq2NrwoQlhOA=; b=UQp6NnGxVUdhiACYjgNV9DX95HS5blr4xke/sutLdPm+vXMaThK7VmVkT6mWU4Ch7p 49BrJhLa5Z5xG+kGpMfwmWkqSmhtkaFoXXjXxIMLLqnwCFQPFkUnH/Qr/bh1n8seqksr O7Jk1yuvfCp5R6B1P1P25I+w5EOVDm10mqlg6cs2Sr2OsjwEP+yuCSZOxntOu6jeQdW0 iz+/eWus/uOVZ4PqkosN2ja1fXKHazn1WyUhSIsDe0Tlq4m8eOd6th+TjcIxZqmxMrub Y3AUvBRRlhR7mTZKNJXqQ/D4KekqRe2VB/jxkGxep1YNtYtKlgllph4XtIlVOyfVfSpI vR/g== 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=/AuZh6/EXSH4csd9kXJqbNQ5qfX/45Zmq2NrwoQlhOA=; b=kk+zdH7oxjlJaHRhux4aSGcXvWoqN5u+EdzZ5HK/0t1gFkIzWocWeSsecDgQ1VsrY2 QqfZQNX+DxXtAegDiNI2F7HgR2GqiDU2Fm5jjeFYjVHuXmj+JrrahCaGFuRzyrxMD+yb gX1qa0Ta8VDqytQX7LMch9Z9+Yl11/n7A3HoksIXQwGzPzfExW6IcmnMCK0veYMnfESI 77cQNPrOZTa08kcRJ3edRCy+5fXs1+HUL52uMQhOtfWahaWobzpc+vCbtu//igvIfL1P dTIBnJTc2YqbnLsbzhoGMdjgm3SERgxWINreDEerBiwy14ks1Hp9LXhmMrK4Nu0Pruyk kvLg== X-Gm-Message-State: ACgBeo38ZRSy7YWecVCI931WHbGCw/BYgZbeZLuBtYWehPinyJ7t/rIn eZ/8aTECUVoCvLtSHAktzNI= X-Google-Smtp-Source: AA6agR6mMCUz+yGW+fRODy/h7mLgQjqFYADzX2efdHIXyhGeBpHCWvxfi3CqauZM+dU6X51Dal0vrg== X-Received: by 2002:a05:620a:4588:b0:6bb:50d4:7f7d with SMTP id bp8-20020a05620a458800b006bb50d47f7dmr4424643qkb.244.1660898641587; Fri, 19 Aug 2022 01:44:01 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id s13-20020a05620a254d00b006b633dc839esm3464833qko.66.2022.08.19.01.44.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:44:01 -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 3/8] memblock tests: add labels to verbose output for generic alloc tests Date: Fri, 19 Aug 2022 01:34:51 -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" Generic tests for memblock_alloc*() functions do not use separate functions for testing top-down and bottom-up allocation directions. Therefore, the function name that is displayed in the verbose testing output does not include the allocation direction. Add an additional prefix when running generic tests for memblock_alloc*() functions that indicates which allocation direction is set. The prefix will be displayed when the tests are run in verbose mode. Signed-off-by: Rebecca Mckeever Reviewed-by: David Hildenbrand --- tools/testing/memblock/tests/alloc_api.c | 36 +++++++------------ .../memblock/tests/alloc_helpers_api.c | 12 +++---- tools/testing/memblock/tests/alloc_nid_api.c | 36 +++++++------------ tools/testing/memblock/tests/common.h | 16 +++++++++ 4 files changed, 44 insertions(+), 56 deletions(-) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index aefb67557de9..6a9c8e788cac 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -751,10 +751,8 @@ static int alloc_after_check(void) static int alloc_in_between_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_in_between_generic_check(); - memblock_set_bottom_up(true); - alloc_in_between_generic_check(); + run_top_down(alloc_in_between_generic_check); + run_bottom_up(alloc_in_between_generic_check); =20 return 0; } @@ -773,10 +771,8 @@ static int alloc_second_fit_check(void) static int alloc_small_gaps_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_small_gaps_generic_check(); - memblock_set_bottom_up(true); - alloc_small_gaps_generic_check(); + run_top_down(alloc_small_gaps_generic_check); + run_bottom_up(alloc_small_gaps_generic_check); =20 return 0; } @@ -784,10 +780,8 @@ static int alloc_small_gaps_check(void) static int alloc_all_reserved_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_all_reserved_generic_check(); - memblock_set_bottom_up(true); - alloc_all_reserved_generic_check(); + run_top_down(alloc_all_reserved_generic_check); + run_bottom_up(alloc_all_reserved_generic_check); =20 return 0; } @@ -795,10 +789,8 @@ static int alloc_all_reserved_check(void) static int alloc_no_space_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_no_space_generic_check(); - memblock_set_bottom_up(true); - alloc_no_space_generic_check(); + run_top_down(alloc_no_space_generic_check); + run_bottom_up(alloc_no_space_generic_check); =20 return 0; } @@ -806,10 +798,8 @@ static int alloc_no_space_check(void) static int alloc_limited_space_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_limited_space_generic_check(); - memblock_set_bottom_up(true); - alloc_limited_space_generic_check(); + run_top_down(alloc_limited_space_generic_check); + run_bottom_up(alloc_limited_space_generic_check); =20 return 0; } @@ -817,10 +807,8 @@ static int alloc_limited_space_check(void) static int alloc_no_memory_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_no_memory_generic_check(); - memblock_set_bottom_up(true); - alloc_no_memory_generic_check(); + run_top_down(alloc_no_memory_generic_check); + run_bottom_up(alloc_no_memory_generic_check); =20 return 0; } diff --git a/tools/testing/memblock/tests/alloc_helpers_api.c b/tools/testi= ng/memblock/tests/alloc_helpers_api.c index 796527cf3bd2..1ccf02639ad6 100644 --- a/tools/testing/memblock/tests/alloc_helpers_api.c +++ b/tools/testing/memblock/tests/alloc_helpers_api.c @@ -357,10 +357,8 @@ static int alloc_from_bottom_up_min_addr_cap_check(voi= d) static int alloc_from_simple_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_from_simple_generic_check(); - memblock_set_bottom_up(true); - alloc_from_simple_generic_check(); + run_top_down(alloc_from_simple_generic_check); + run_bottom_up(alloc_from_simple_generic_check); =20 return 0; } @@ -368,10 +366,8 @@ static int alloc_from_simple_check(void) static int alloc_from_misaligned_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_from_misaligned_generic_check(); - memblock_set_bottom_up(true); - alloc_from_misaligned_generic_check(); + run_top_down(alloc_from_misaligned_generic_check); + run_bottom_up(alloc_from_misaligned_generic_check); =20 return 0; } diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/m= emblock/tests/alloc_nid_api.c index 71b7beb35526..82fa8ea36320 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -1142,10 +1142,8 @@ static int alloc_try_nid_cap_min_check(void) static int alloc_try_nid_min_reserved_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_try_nid_min_reserved_generic_check(); - memblock_set_bottom_up(true); - alloc_try_nid_min_reserved_generic_check(); + run_top_down(alloc_try_nid_min_reserved_generic_check); + run_bottom_up(alloc_try_nid_min_reserved_generic_check); =20 return 0; } @@ -1153,10 +1151,8 @@ static int alloc_try_nid_min_reserved_check(void) static int alloc_try_nid_max_reserved_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_try_nid_max_reserved_generic_check(); - memblock_set_bottom_up(true); - alloc_try_nid_max_reserved_generic_check(); + run_top_down(alloc_try_nid_max_reserved_generic_check); + run_bottom_up(alloc_try_nid_max_reserved_generic_check); =20 return 0; } @@ -1164,10 +1160,8 @@ static int alloc_try_nid_max_reserved_check(void) static int alloc_try_nid_exact_address_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_try_nid_exact_address_generic_check(); - memblock_set_bottom_up(true); - alloc_try_nid_exact_address_generic_check(); + run_top_down(alloc_try_nid_exact_address_generic_check); + run_bottom_up(alloc_try_nid_exact_address_generic_check); =20 return 0; } @@ -1175,10 +1169,8 @@ static int alloc_try_nid_exact_address_check(void) static int alloc_try_nid_reserved_full_merge_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_try_nid_reserved_full_merge_generic_check(); - memblock_set_bottom_up(true); - alloc_try_nid_reserved_full_merge_generic_check(); + run_top_down(alloc_try_nid_reserved_full_merge_generic_check); + run_bottom_up(alloc_try_nid_reserved_full_merge_generic_check); =20 return 0; } @@ -1186,10 +1178,8 @@ static int alloc_try_nid_reserved_full_merge_check(v= oid) static int alloc_try_nid_reserved_all_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_try_nid_reserved_all_generic_check(); - memblock_set_bottom_up(true); - alloc_try_nid_reserved_all_generic_check(); + run_top_down(alloc_try_nid_reserved_all_generic_check); + run_bottom_up(alloc_try_nid_reserved_all_generic_check); =20 return 0; } @@ -1197,10 +1187,8 @@ static int alloc_try_nid_reserved_all_check(void) static int alloc_try_nid_low_max_check(void) { test_print("\tRunning %s...\n", __func__); - memblock_set_bottom_up(false); - alloc_try_nid_low_max_generic_check(); - memblock_set_bottom_up(true); - alloc_try_nid_low_max_generic_check(); + run_top_down(alloc_try_nid_low_max_generic_check); + run_bottom_up(alloc_try_nid_low_max_generic_check); =20 return 0; } diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock= /tests/common.h index 29756e652e3e..58f84bf2c9ae 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -100,4 +100,20 @@ static inline void test_pass_pop(void) prefix_pop(); } =20 +static inline void run_top_down(int (*func)()) +{ + memblock_set_bottom_up(false); + prefix_push("top-down"); + func(); + prefix_pop(); +} + +static inline void run_bottom_up(int (*func)()) +{ + memblock_set_bottom_up(true); + prefix_push("bottom-up"); + func(); + prefix_pop(); +} + #endif --=20 2.25.1 From nobody Fri Apr 10 20:15:59 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 From nobody Fri Apr 10 20:15:59 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 5B8D1C25B0E for ; Fri, 19 Aug 2022 08:48:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347786AbiHSIsb (ORCPT ); Fri, 19 Aug 2022 04:48:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32846 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347247AbiHSIs2 (ORCPT ); Fri, 19 Aug 2022 04:48:28 -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 6D68612763 for ; Fri, 19 Aug 2022 01:48:27 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id f4so2841267qkl.7 for ; Fri, 19 Aug 2022 01:48:26 -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=+/tTAaq4SyXDvjqiXYJq06J1xw9p6xExTRiWwAt7voA=; b=DFdItZppJaZJQ9kqYVnBQ6dJfDBGTlMfooej5MSwHPt16M90RUgs8zg2tNp08HNqjr /QLq1dLD39hmKk0Cm0e35TFuiYaESdvFAqvTNxtAc8nlSKkbb/08kfLO15nlb9OdRXY6 BHM/AsiMKiLPjSV6fU9UCLAVTIVUk6kAWOEEZTZsKeBrLV2iMqCZ19lJ0ay1jc411jki 949rgKL/wjvX6t6bec7eu7bs1MSWsrc5k6uycExfVpjVzDYrQ8MlgYrDbaoco6vw0dQF vWpNKUkCX/1DjXbuOGJbj7voq8TEZ3VutBOj7ZrQgxsNAKAhkUtzuwl1ZWRE84Kwf4tX mrMw== 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=+/tTAaq4SyXDvjqiXYJq06J1xw9p6xExTRiWwAt7voA=; b=feQURnGeX82jSH/gnJ7IOIIn4U3mAoFKy7x4aNz+bTjBdl0GgKtpULHaqMxjxQLeOP u6z7svnV8Pg12wa+MccFRSqeCSg6BLQNfHQ2HAxesknbCdVh1dgN42C8V24i8OzND7Hj 8sDmeiMpIPDqniYerTUISKhnl821B6Um3l76aXrWLVrlIjPkG0rvTZiDleKe2JSxcBqT DNTtYOJSwzHjE3yah8OYf6MUOV2dCEjKb16X9RnTQBKg3RRWqVZe35Q3jkOmXGDQcCEq eeY4Ads/IY+HjWEmWlfnUiuL6FWN06EEzRFDG78jd7yO4AJvj9t9PWUCk4ownZYLa7E6 43dg== X-Gm-Message-State: ACgBeo1qeZc5CyK2zuqgpOP/u1Hg2X5uIF0/e7JWmfVcpcS7cerFc/G7 zC+OEVVQkRThI6rRb64BIWWVAHhNjsc= X-Google-Smtp-Source: AA6agR7TjKL8xHf6BW8HnKHJ07wIticslY4KZRtI8Ea6UPq4gNnGmDqI8zs50WPEXkoWP/uQ5BayTQ== X-Received: by 2002:a05:620a:2584:b0:6ab:91fd:15dd with SMTP id x4-20020a05620a258400b006ab91fd15ddmr4640097qko.287.1660898905949; Fri, 19 Aug 2022 01:48:25 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id bl18-20020a05620a1a9200b006b8e63dfffbsm2954513qkb.58.2022.08.19.01.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:48:25 -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 5/8] memblock tests: update alloc_api to test memblock_alloc_raw Date: Fri, 19 Aug 2022 01:34:53 -0700 Message-Id: <48cfb01ba417895f28ce7ef9b99d1ce0854bfd5e.1660897732.git.remckee0@gmail.com> 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" Update memblock_alloc() tests so that they test either memblock_alloc() or memblock_alloc_raw() depending on the value of alloc_test_flags. Run through all the existing tests in memblock_alloc_api twice: once for memblock_alloc() and once for memblock_alloc_raw(). When the tests run memblock_alloc(), they test that the entire memory region is zero. When the tests run memblock_alloc_raw(), they test that the entire memory region is nonzero. Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/tests/alloc_api.c | 98 ++++++++++++++++-------- tools/testing/memblock/tests/common.h | 25 ++++++ 2 files changed, 90 insertions(+), 33 deletions(-) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index 65bff77dd55b..cf67687ae044 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -1,6 +1,29 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "alloc_api.h" =20 +static const char * const func_testing[] =3D { + "memblock_alloc", + "memblock_alloc_raw" +}; + +static int alloc_test_flags =3D TEST_ZEROED; + +static inline const char * const get_func_testing(int flags) +{ + if (flags & TEST_RAW) + return func_testing[1]; + else + return func_testing[0]; +} + +static inline void *run_memblock_alloc(phys_addr_t size, phys_addr_t align) +{ + if (alloc_test_flags & TEST_RAW) + return memblock_alloc_raw(size, align); + else + return memblock_alloc(size, align); +} + /* * A simple test that tries to allocate a small memory region. * Expect to allocate an aligned region near the end of the available memo= ry. @@ -19,10 +42,10 @@ static int alloc_top_down_simple_check(void) =20 expected_start =3D memblock_end_of_DRAM() - SMP_CACHE_BYTES; =20 - allocated_ptr =3D memblock_alloc(size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, expected_start); @@ -79,10 +102,10 @@ static int alloc_top_down_disjoint_check(void) =20 memblock_reserve(r1.base, r1.size); =20 - allocated_ptr =3D memblock_alloc(r2_size, alignment); + allocated_ptr =3D run_memblock_alloc(r2_size, alignment); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_test_flags); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -126,10 +149,10 @@ static int alloc_top_down_before_check(void) =20 memblock_reserve(memblock_end_of_DRAM() - total_size, r1_size); =20 - allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - total_size); @@ -176,10 +199,10 @@ static int alloc_top_down_after_check(void) =20 memblock_reserve(r1.base, r1.size); =20 - allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base - r2_size); @@ -228,10 +251,10 @@ static int alloc_top_down_second_fit_check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, r2.size + r3_size); ASSERT_EQ(rgn->base, r2.base - r3_size); @@ -284,10 +307,10 @@ static int alloc_in_between_generic_check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base - r2.size - r3_size); @@ -332,7 +355,7 @@ static int alloc_small_gaps_generic_check(void) region_end +=3D gap_size + region_size; } =20 - allocated_ptr =3D memblock_alloc(region_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(region_size, SMP_CACHE_BYTES); =20 ASSERT_EQ(allocated_ptr, NULL); =20 @@ -356,7 +379,7 @@ static int alloc_all_reserved_generic_check(void) /* Simulate full memory */ memblock_reserve(memblock_start_of_DRAM(), MEM_SIZE); =20 - allocated_ptr =3D memblock_alloc(SZ_256, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(SZ_256, SMP_CACHE_BYTES); =20 ASSERT_EQ(allocated_ptr, NULL); =20 @@ -392,7 +415,7 @@ static int alloc_no_space_generic_check(void) /* Simulate almost-full memory */ memblock_reserve(memblock_start_of_DRAM(), reserved_size); =20 - allocated_ptr =3D memblock_alloc(SZ_1K, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(SZ_1K, SMP_CACHE_BYTES); =20 ASSERT_EQ(allocated_ptr, NULL); =20 @@ -427,10 +450,10 @@ static int alloc_limited_space_generic_check(void) /* Simulate almost-full memory */ memblock_reserve(memblock_start_of_DRAM(), reserved_size); =20 - allocated_ptr =3D memblock_alloc(available_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(available_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, available_size); + verify_mem_content(allocated_ptr, available_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, MEM_SIZE); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -457,7 +480,7 @@ static int alloc_no_memory_generic_check(void) =20 reset_memblock_regions(); =20 - allocated_ptr =3D memblock_alloc(SZ_1K, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(SZ_1K, SMP_CACHE_BYTES); =20 ASSERT_EQ(allocated_ptr, NULL); ASSERT_EQ(rgn->size, 0); @@ -491,7 +514,7 @@ static int alloc_too_large_generic_check(void) =20 setup_memblock(); =20 - allocated_ptr =3D memblock_alloc(MEM_SIZE + SZ_2, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(MEM_SIZE + SZ_2, SMP_CACHE_BYTES); =20 ASSERT_EQ(allocated_ptr, NULL); ASSERT_EQ(rgn->size, 0); @@ -517,10 +540,10 @@ static int alloc_bottom_up_simple_check(void) =20 setup_memblock(); =20 - allocated_ptr =3D memblock_alloc(SZ_2, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(SZ_2, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, SZ_2); + verify_mem_content(allocated_ptr, SZ_2, alloc_test_flags); =20 ASSERT_EQ(rgn->size, SZ_2); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -575,10 +598,10 @@ static int alloc_bottom_up_disjoint_check(void) =20 memblock_reserve(r1.base, r1.size); =20 - allocated_ptr =3D memblock_alloc(r2_size, alignment); + allocated_ptr =3D run_memblock_alloc(r2_size, alignment); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_test_flags); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -619,10 +642,10 @@ static int alloc_bottom_up_before_check(void) =20 memblock_reserve(memblock_start_of_DRAM() + r1_size, r2_size); =20 - allocated_ptr =3D memblock_alloc(r1_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r1_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r1_size); + verify_mem_content(allocated_ptr, r1_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -668,10 +691,10 @@ static int alloc_bottom_up_after_check(void) =20 memblock_reserve(r1.base, r1.size); =20 - allocated_ptr =3D memblock_alloc(r2_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r2_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base); @@ -721,10 +744,10 @@ static int alloc_bottom_up_second_fit_check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc(r3_size, SMP_CACHE_BYTES); + allocated_ptr =3D run_memblock_alloc(r3_size, SMP_CACHE_BYTES); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_test_flags); =20 ASSERT_EQ(rgn->size, r2.size + r3_size); ASSERT_EQ(rgn->base, r2.base); @@ -856,13 +879,14 @@ static int alloc_too_large_check(void) return 0; } =20 -int memblock_alloc_checks(void) +static int memblock_alloc_checks_internal(int flags) { - const char *func_testing =3D "memblock_alloc"; + const char *func =3D get_func_testing(flags); =20 + alloc_test_flags =3D flags; prefix_reset(); - prefix_push(func_testing); - test_print("Running %s tests...\n", func_testing); + prefix_push(func); + test_print("Running %s tests...\n", func); =20 reset_memblock_attributes(); dummy_physical_memory_init(); @@ -886,3 +910,11 @@ int memblock_alloc_checks(void) =20 return 0; } + +int memblock_alloc_checks(void) +{ + memblock_alloc_checks_internal(TEST_ZEROED); + memblock_alloc_checks_internal(TEST_RAW); + + return 0; +} diff --git a/tools/testing/memblock/tests/common.h b/tools/testing/memblock= /tests/common.h index 58f84bf2c9ae..4fd3534ff955 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -12,6 +12,11 @@ =20 #define MEM_SIZE SZ_16K =20 +enum test_flags { + TEST_ZEROED =3D 0x0, + TEST_RAW =3D 0x1 +}; + /** * ASSERT_EQ(): * Check the condition @@ -63,6 +68,18 @@ } \ } while (0) =20 +/** + * ASSERT_MEM_NE(): + * Check that none of the first @_size bytes of @_seen are equal to @_expe= cted. + * If false, print failed test message (if running with --verbose) and then + * assert. + */ +#define ASSERT_MEM_NE(_seen, _expected, _size) do { \ + for (int _i =3D 0; _i < (_size); _i++) { \ + ASSERT_NE((_seen)[_i], (_expected)); \ + } \ +} while (0) + #define PREFIX_PUSH() prefix_push(__func__) =20 /* @@ -116,4 +133,12 @@ static inline void run_bottom_up(int (*func)()) prefix_pop(); } =20 +static inline void verify_mem_content(void *mem, int size, int flags) +{ + if (flags & TEST_RAW) + ASSERT_MEM_NE((char *)mem, 0, size); + else + ASSERT_MEM_EQ((char *)mem, 0, size); +} + #endif --=20 2.25.1 From nobody Fri Apr 10 20:15:59 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 2796FC25B0E for ; Fri, 19 Aug 2022 08:50:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347868AbiHSIup (ORCPT ); Fri, 19 Aug 2022 04:50:45 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37684 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347848AbiHSIul (ORCPT ); Fri, 19 Aug 2022 04:50:41 -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 E1DACCCE2C for ; Fri, 19 Aug 2022 01:50:39 -0700 (PDT) Received: by mail-qk1-x742.google.com with SMTP id g21so2854566qka.5 for ; Fri, 19 Aug 2022 01:50:39 -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=xSx7RYl5xzn5Nqy9fpVkhUaz0743H4TI5Je5gt/WTOg=; b=oRYB7iIvryx/XYDVDgT+hgAGJpIa+BEu6aoJSkSbD+z+M9lQXVnBmGZlC2vJw5zppI xAoLWsu9K2WfSCNOGACcHx27NbbCxp7YoVqTgBJ0ya2Ll8XVR2EIz7P+bnwK+Csqsc2K LpqbUCIiXPTJJFEKWnPQk+a88RXMP2yvWDt/Luzl9K893ttc1IPvomk2YdbL91khrMBU iPfwK1aVVULEnAdQBCashvho4ssZuHdDP9BXkc/u6tWuiHAWHmE396GO7uQC9u+pjuYu blhinv7UOdPzTJl+Vv/YotvmJjmvUYK36/6XHXStbMXoX0kzj0GtakntmxqzteJiNIQw EoZA== 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=xSx7RYl5xzn5Nqy9fpVkhUaz0743H4TI5Je5gt/WTOg=; b=xhnLHNxDoQTEbKxRXxpABIomm/rjt8SMMM/cwgyFTX/ZahSScsW5XXoVPProYjOZf9 YdL0zelWFX10vL7SNxv6AjDFywWaD97Aw8kh6wWebQT8mQt2t1GRNeQ0OXNv4WwfZl6H WwZt9PcxcHTtl8DwA1lMKjNOx//x+7g6nDLYqYkBHl4vnxICOz+K7l2BPlS2VJRGTDPz nMVWHl7MHn98g4XTC6NW80UVZUrnGqKu40bXhkSpKmJJR60kng23inIMshTkD7/4PXqu 09RluTHa5GBy69JOnVUBceF6uSMpS+3lJqgWrIhwrb08AqymYJa6MwP19OT8mkrbVyAF G2jQ== X-Gm-Message-State: ACgBeo16pGMguqGe7ZQ8TamCUtaSpDLyLC4ovSQskPr5a1P2ZhKSG2Sa Nej4v37cgTlV5o0Ls4tIj+w= X-Google-Smtp-Source: AA6agR4VqPXl/ZiUHWT6AQz1NJP+/Ke6LW9rQJhBfMUV8k8iiUUkNijHITDUlW5Dguz3bt6e5QVyyg== X-Received: by 2002:a05:620a:3198:b0:6bb:78dc:f10c with SMTP id bi24-20020a05620a319800b006bb78dcf10cmr4695987qkb.433.1660899038963; Fri, 19 Aug 2022 01:50:38 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id b17-20020ac84f11000000b0031e9ab4e4cesm2553325qte.26.2022.08.19.01.50.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:50:38 -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 6/8] memblock tests: update alloc_nid_api to test memblock_alloc_try_nid_raw Date: Fri, 19 Aug 2022 01:34:54 -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" Update memblock_alloc_try_nid() tests so that they test either memblock_alloc_try_nid() or memblock_alloc_try_nid_raw() depending on the value of alloc_nid_test_flags. Run through all the existing tests in alloc_nid_api twice: once for memblock_alloc_try_nid() and once for memblock_alloc_try_nid_raw(). When the tests run memblock_alloc_try_nid(), they test that the entire memory region is zero. When the tests run memblock_alloc_try_nid_raw(), they test that the entire memory region is nonzero. Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/tests/alloc_nid_api.c | 188 ++++++++++++------- 1 file changed, 119 insertions(+), 69 deletions(-) diff --git a/tools/testing/memblock/tests/alloc_nid_api.c b/tools/testing/m= emblock/tests/alloc_nid_api.c index 82fa8ea36320..2c1d5035e057 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -1,6 +1,34 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "alloc_nid_api.h" =20 +static const char * const func_testing[] =3D { + "memblock_alloc_try_nid", + "memblock_alloc_try_nid_raw" +}; + +static int alloc_nid_test_flags =3D TEST_ZEROED; + +static inline const char * const get_func_testing(int flags) +{ + if (flags & TEST_RAW) + return func_testing[1]; + else + return func_testing[0]; +} + +static inline void *run_memblock_alloc_try_nid(phys_addr_t size, + phys_addr_t align, + phys_addr_t min_addr, + phys_addr_t max_addr, int nid) +{ + if (alloc_nid_test_flags & TEST_RAW) + return memblock_alloc_try_nid_raw(size, align, min_addr, + max_addr, nid); + else + return memblock_alloc_try_nid(size, align, min_addr, + max_addr, nid); +} + /* * A simple test that tries to allocate a memory region within min_addr and * max_addr range: @@ -32,12 +60,13 @@ static int alloc_try_nid_top_down_simple_check(void) min_addr =3D memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2; max_addr =3D min_addr + SZ_512; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size); @@ -86,12 +115,13 @@ static int alloc_try_nid_top_down_end_misaligned_check= (void) min_addr =3D memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2; max_addr =3D min_addr + SZ_512 + misalign; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size - misalign); @@ -137,12 +167,13 @@ static int alloc_try_nid_exact_address_generic_check(= void) min_addr =3D memblock_start_of_DRAM() + SMP_CACHE_BYTES; max_addr =3D min_addr + size; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -189,11 +220,12 @@ static int alloc_try_nid_top_down_narrow_range_check(= void) min_addr =3D memblock_start_of_DRAM() + SZ_512; max_addr =3D min_addr + SMP_CACHE_BYTES; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size); @@ -241,8 +273,9 @@ static int alloc_try_nid_low_max_generic_check(void) min_addr =3D memblock_start_of_DRAM(); max_addr =3D min_addr + SMP_CACHE_BYTES; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_EQ(allocated_ptr, NULL); =20 @@ -287,11 +320,12 @@ static int alloc_try_nid_min_reserved_generic_check(v= oid) =20 memblock_reserve(reserved_base, r1_size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, reserved_base); @@ -338,11 +372,12 @@ static int alloc_try_nid_max_reserved_generic_check(v= oid) =20 memblock_reserve(max_addr, r1_size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r2_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r2_size); + verify_mem_content(allocated_ptr, r2_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, min_addr); @@ -402,11 +437,12 @@ static int alloc_try_nid_top_down_reserved_with_space= _check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn1->size, r1.size + r3_size); ASSERT_EQ(rgn1->base, max_addr - r3_size); @@ -466,11 +502,12 @@ static int alloc_try_nid_reserved_full_merge_generic_= check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r2.base); @@ -531,11 +568,12 @@ static int alloc_try_nid_top_down_reserved_no_space_c= heck(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -597,8 +635,9 @@ static int alloc_try_nid_reserved_all_generic_check(voi= d) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_EQ(allocated_ptr, NULL); =20 @@ -628,11 +667,12 @@ static int alloc_try_nid_top_down_cap_max_check(void) min_addr =3D memblock_end_of_DRAM() - SZ_1K; max_addr =3D memblock_end_of_DRAM() + SZ_256; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); @@ -666,11 +706,12 @@ static int alloc_try_nid_top_down_cap_min_check(void) min_addr =3D memblock_start_of_DRAM() - SZ_256; max_addr =3D memblock_end_of_DRAM(); =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); @@ -714,13 +755,13 @@ static int alloc_try_nid_bottom_up_simple_check(void) min_addr =3D memblock_start_of_DRAM() + SMP_CACHE_BYTES * 2; max_addr =3D min_addr + SZ_512; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -769,13 +810,13 @@ static int alloc_try_nid_bottom_up_start_misaligned_c= heck(void) min_addr =3D memblock_start_of_DRAM() + misalign; max_addr =3D min_addr + SZ_512; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); rgn_end =3D rgn->base + rgn->size; =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr + (SMP_CACHE_BYTES - misalign)); @@ -822,12 +863,12 @@ static int alloc_try_nid_bottom_up_narrow_range_check= (void) min_addr =3D memblock_start_of_DRAM() + SZ_512; max_addr =3D min_addr + SMP_CACHE_BYTES; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -887,12 +928,12 @@ static int alloc_try_nid_bottom_up_reserved_with_spac= e_check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, max_addr); @@ -959,12 +1000,12 @@ static int alloc_try_nid_bottom_up_reserved_no_space= _check(void) memblock_reserve(r1.base, r1.size); memblock_reserve(r2.base, r2.size); =20 - allocated_ptr =3D memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(r3_size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, r3_size); + verify_mem_content(allocated_ptr, r3_size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn3->size, r3_size); ASSERT_EQ(rgn3->base, memblock_start_of_DRAM()); @@ -1004,12 +1045,12 @@ static int alloc_try_nid_bottom_up_cap_max_check(vo= id) min_addr =3D memblock_start_of_DRAM() + SZ_1K; max_addr =3D memblock_end_of_DRAM() + SZ_256; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -1043,12 +1084,12 @@ static int alloc_try_nid_bottom_up_cap_min_check(vo= id) min_addr =3D memblock_start_of_DRAM(); max_addr =3D memblock_end_of_DRAM() - SZ_256; =20 - allocated_ptr =3D memblock_alloc_try_nid(size, SMP_CACHE_BYTES, - min_addr, max_addr, - NUMA_NO_NODE); + allocated_ptr =3D run_memblock_alloc_try_nid(size, SMP_CACHE_BYTES, + min_addr, max_addr, + NUMA_NO_NODE); =20 ASSERT_NE(allocated_ptr, NULL); - ASSERT_MEM_EQ((char *)allocated_ptr, 0, size); + verify_mem_content(allocated_ptr, size, alloc_nid_test_flags); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -1193,13 +1234,14 @@ static int alloc_try_nid_low_max_check(void) return 0; } =20 -int memblock_alloc_nid_checks(void) +static int memblock_alloc_nid_checks_internal(int flags) { - const char *func_testing =3D "memblock_alloc_try_nid"; + const char *func =3D get_func_testing(flags); =20 + alloc_nid_test_flags =3D flags; prefix_reset(); - prefix_push(func_testing); - test_print("Running %s tests...\n", func_testing); + prefix_push(func); + test_print("Running %s tests...\n", func); =20 reset_memblock_attributes(); dummy_physical_memory_init(); @@ -1225,3 +1267,11 @@ int memblock_alloc_nid_checks(void) =20 return 0; } + +int memblock_alloc_nid_checks(void) +{ + memblock_alloc_nid_checks_internal(TEST_ZEROED); + memblock_alloc_nid_checks_internal(TEST_RAW); + + return 0; +} --=20 2.25.1 From nobody Fri Apr 10 20:15:59 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 40505C32771 for ; Fri, 19 Aug 2022 08:52:57 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347430AbiHSIw4 (ORCPT ); Fri, 19 Aug 2022 04:52:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343696AbiHSIwy (ORCPT ); Fri, 19 Aug 2022 04:52:54 -0400 Received: from mail-qt1-x842.google.com (mail-qt1-x842.google.com [IPv6:2607:f8b0:4864:20::842]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF56EA8A0 for ; Fri, 19 Aug 2022 01:52:53 -0700 (PDT) Received: by mail-qt1-x842.google.com with SMTP id h4so2861703qtj.11 for ; Fri, 19 Aug 2022 01:52:53 -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=jASm5F7IG0cL7Edz8ZOf/AbyNJZ6sd775ispaeESRb0=; b=TRa8ABit0XQvSbDR2dM/OYiebLfodgmI9pv5uHw4sJ1x5pS2tAP3hILJXO22stjVWb SsR5IN16WTY4P92/+DPl5Ow511nagAwV5YqxOlirPhX8SP7KStqpyD3Ig1kS8ontazEr Hb5Uf67GcRPKsm25fBmfy6toELEBKSu0uUnNnLJsSe19J55ZEBSMEZxt06Jkwymx/b+g tgt/bbCv1ZkYkPObpzne8bGuFL9Vf3tpTMXnM3NKXtmZEVGMVzU1XwBNwHnvovNly1XY z3/26FYTFgLvsXsbzYoT7tJnnSJ5uISbUGpqQnE/+4SmVl1TLTodMyRp1xFvyEg0z5B6 5nyw== 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=jASm5F7IG0cL7Edz8ZOf/AbyNJZ6sd775ispaeESRb0=; b=u8R8VwOmz7kzf8XooV9lDgL2xMkP5Q1NUvIfEIMzNaW3tLacyV2JZfQXVPky9Qg+aK XbTJtxUAJ1fnlLta1BMy91FcIW0pSkRFaC9gTlbSKFLJTOwCBP1PWR33HltbqLwtKN4u U9Sk0liNOQqPyYf7qcfbbG2N74hsl3ElhvZf8Os+Kwtvo1btcEp2HDy5VnklC3uKqxTm KkDYiqthuqlDOqieFV0pSsYD+wm9W5EPFPWmSprky8M2N7RYfS2bgJ9WJz+kTyTtj6Lz +g3WdH35J38kOa0i5vBjz6RSt6RW5ndHHrQLnkXyQD+wvs3rz3jWb1AHZkA4/d4/BOaL hTGA== X-Gm-Message-State: ACgBeo1oQn9auxpQAvPNMBQKv1YoRG0si0nDBu/2LElvnxmVyRPqXmA9 q9wv97+BFKYi2Zd2GM4sHVE= X-Google-Smtp-Source: AA6agR4AYmNMNf30kl/3P5ZoHdVZkf0G2VyOjgLq3MTmBmirkaXdSrwX7sXzYxmDCuKFMrlu3u5GjQ== X-Received: by 2002:ac8:5d89:0:b0:344:7c2d:92ba with SMTP id d9-20020ac85d89000000b003447c2d92bamr5451296qtx.124.1660899172229; Fri, 19 Aug 2022 01:52:52 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id q1-20020a05620a0d8100b006bb2661f3fasm3648840qkl.133.2022.08.19.01.52.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:52:51 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever , Shaoqin Huang Subject: [PATCH v2 7/8] memblock tests: add tests for memblock_*bottom_up functions Date: Fri, 19 Aug 2022 01:34:55 -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 simple tests for memblock_set_bottom_up() and memblock_bottom_up(). Reviewed-by: David Hildenbrand Reviewed-by: Shaoqin Huang Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/tests/basic_api.c | 45 ++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index ea79396e4611..c7490291c485 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -1679,6 +1679,50 @@ static int memblock_free_checks(void) return 0; } =20 +static int memblock_set_bottom_up_check(void) +{ + prefix_push("memblock_set_bottom_up"); + + memblock_set_bottom_up(false); + ASSERT_EQ(memblock.bottom_up, false); + memblock_set_bottom_up(true); + ASSERT_EQ(memblock.bottom_up, true); + + reset_memblock_attributes(); + test_pass_pop(); + + return 0; +} + +static int memblock_bottom_up_check(void) +{ + prefix_push("memblock_bottom_up"); + + memblock_set_bottom_up(false); + ASSERT_EQ(memblock_bottom_up(), memblock.bottom_up); + ASSERT_EQ(memblock_bottom_up(), false); + memblock_set_bottom_up(true); + ASSERT_EQ(memblock_bottom_up(), memblock.bottom_up); + ASSERT_EQ(memblock_bottom_up(), true); + + reset_memblock_attributes(); + test_pass_pop(); + + return 0; +} + +static int memblock_bottom_up_checks(void) +{ + test_print("Running memblock_*bottom_up tests...\n"); + + prefix_reset(); + memblock_set_bottom_up_check(); + prefix_reset(); + memblock_bottom_up_check(); + + return 0; +} + int memblock_basic_checks(void) { memblock_initialization_check(); @@ -1686,6 +1730,7 @@ int memblock_basic_checks(void) memblock_reserve_checks(); memblock_remove_checks(); memblock_free_checks(); + memblock_bottom_up_checks(); =20 return 0; } --=20 2.25.1 From nobody Fri Apr 10 20:15:59 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 7E568C32771 for ; Fri, 19 Aug 2022 08:55:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1347769AbiHSIzt (ORCPT ); Fri, 19 Aug 2022 04:55:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1347892AbiHSIzS (ORCPT ); Fri, 19 Aug 2022 04:55:18 -0400 Received: from mail-qt1-x841.google.com (mail-qt1-x841.google.com [IPv6:2607:f8b0:4864:20::841]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 53D7FD4764 for ; Fri, 19 Aug 2022 01:55:06 -0700 (PDT) Received: by mail-qt1-x841.google.com with SMTP id y18so2875546qtv.5 for ; Fri, 19 Aug 2022 01:55:06 -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=QFgB1gsSAoG+hS58IncwUozrISMMlQtds/WbFB87YTI=; b=AbdL85n3lmzPtDCe/0JF9M2e5jB3Q0mtzxFL6dD/0wie8bJw6MV6jGErrfhBedZKy+ KlhLOqMTHjkU/+J3wkmvZyChrRLEcr1+Y2MC4CoAmnNOoW0q/XnAjrk0JZ49UgvJKjS/ kvIiitERotZ2K1lQI6W3FzdXzI9ZuLiqpvtG/3azfIJFkOFArd/FuNmUJNqLaPZORz+W MzD+VDnBMfsGPMfh43Yw5UC12IBHDHhO09rAH/dTJrToff6YXZX8HLRlTTbVW1lsyE/b 8OlMT0FSItyIPXS6EUcHrM1EEzHgb1EB61IAwsgfK5Nb/Inq584oiRqQ1h/UnxPPYjAK 6uqA== 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=QFgB1gsSAoG+hS58IncwUozrISMMlQtds/WbFB87YTI=; b=LwBQ5a/ETStNnRAoihCThV7GQk1ChBJsufLsym2mczs4ayyUNLanmLuJ8BLAzEidq1 GA1InxzP0Z83lLhDHJfesJrJZ6/LsGKXVbWkh5SCXQQj9H1/r3Uyf4G6aR5rNH3D0qHl +U9LdGXxcdyxZ+EMdoMOXZTd4HIJY7LaAVss5mdiSpT7uwe8IYQq29HX0Pulh5rh7yDi EI7//HVieYzmPwHT9xKgw01czOk971u50XWx2yfQ6tPBBgO7i/EIcs1iL9niqxl6u25J 1C3ckOHzWfsx9xxWXWkGSyXCYUINTrYcQWbhG/1lPJueTSxpqsBGQVMJAaAA31lPCgTi bcQw== X-Gm-Message-State: ACgBeo0VJx7YMgRvu+KJYTbuQybHqxyEXJYvR1RntO2ngRKnGOZno+1y DDEYChVdLin2okINqe4Ul4I= X-Google-Smtp-Source: AA6agR7jlnvccUlV1fMt3CaIEGX7wpp5Q3lwM6x8ijuDU20Fd7DPGrCK+t9G8cEyNsbsIHibjjZaCw== X-Received: by 2002:a05:622a:1492:b0:344:5130:4094 with SMTP id t18-20020a05622a149200b0034451304094mr5687369qtx.3.1660899305200; Fri, 19 Aug 2022 01:55:05 -0700 (PDT) Received: from sophie ([89.46.62.64]) by smtp.gmail.com with ESMTPSA id t201-20020a37aad2000000b006bacf4703c5sm3495354qke.111.2022.08.19.01.55.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 19 Aug 2022 01:55:04 -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 8/8] memblock tests: add tests for memblock_trim_memory Date: Fri, 19 Aug 2022 01:34:56 -0700 Message-Id: <4157021eecdd3abb503d4b1d1449844baac2d7b9.1660897732.git.remckee0@gmail.com> 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_trim_memory() for the following scenarios: - all regions aligned - one region unalign that is smaller than the alignment - one region unaligned at the base - one region unaligned at the end Signed-off-by: Rebecca Mckeever --- tools/testing/memblock/tests/basic_api.c | 223 +++++++++++++++++++++++ 1 file changed, 223 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/membl= ock/tests/basic_api.c index c7490291c485..7048319bb096 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -8,6 +8,7 @@ #define FUNC_RESERVE "memblock_reserve" #define FUNC_REMOVE "memblock_remove" #define FUNC_FREE "memblock_free" +#define FUNC_TRIM "memblock_trim_memory" =20 static int memblock_initialization_check(void) { @@ -1723,6 +1724,227 @@ static int memblock_bottom_up_checks(void) return 0; } =20 +/* + * A test that tries to trim memory when both ends of the memory region are + * aligned. Expect that the memory will not be trimmed. Expect the counter= to + * not be updated. + */ +static int memblock_trim_memory_aligned_check(void) +{ + struct memblock_region *rgn; + phys_addr_t alignment =3D SMP_CACHE_BYTES; + + rgn =3D &memblock.memory.regions[0]; + + struct region r =3D { + .base =3D alignment, + .size =3D alignment * 4 + }; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_add(r.base, r.size); + memblock_trim_memory(alignment); + + ASSERT_EQ(rgn->base, r.base); + ASSERT_EQ(rgn->size, r.size); + + ASSERT_EQ(memblock.memory.cnt, 1); + + test_pass_pop(); + + return 0; +} + +/* + * A test that tries to trim memory when there are two available regions, = r1 and + * r2. Region r1 is aligned on both ends and region r2 is unaligned on one= end + * and smaller than the alignment: + * + * alignment + * |--------| + * | +-----------------+ +------+ | + * | | r1 | | r2 | | + * +--------+-----------------+--------+------+---+ + * ^ ^ ^ ^ ^ + * |________|________|________| | + * | Unaligned address + * Aligned addresses + * + * Expect that r1 will not be trimmed and r2 will be removed. Expect the + * counter to be updated. + */ +static int memblock_trim_memory_too_small_check(void) +{ + struct memblock_region *rgn; + phys_addr_t alignment =3D SMP_CACHE_BYTES; + + rgn =3D &memblock.memory.regions[0]; + + struct region r1 =3D { + .base =3D alignment, + .size =3D alignment * 2 + }; + struct region r2 =3D { + .base =3D alignment * 4, + .size =3D alignment - SZ_2 + }; + + PREFIX_PUSH(); + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_add(r2.base, r2.size); + memblock_trim_memory(alignment); + + ASSERT_EQ(rgn->base, r1.base); + ASSERT_EQ(rgn->size, r1.size); + + ASSERT_EQ(memblock.memory.cnt, 1); + + test_pass_pop(); + + return 0; +} + +/* + * A test that tries to trim memory when there are two available regions, = r1 and + * r2. Region r1 is aligned on both ends and region r2 is unaligned at the= base + * and aligned at the end: + * + * Unaligned address + * | + * v + * | +-----------------+ +---------------+ | + * | | r1 | | r2 | | + * +--------+-----------------+----------+---------------+---+ + * ^ ^ ^ ^ ^ ^ + * |________|________|________|________|________| + * | + * Aligned addresses + * + * Expect that r1 will not be trimmed and r2 will be trimmed at the base. + * Expect the counter to not be updated. + */ +static int memblock_trim_memory_unaligned_base_check(void) +{ + struct memblock_region *rgn1, *rgn2; + phys_addr_t alignment =3D SMP_CACHE_BYTES; + phys_addr_t offset =3D SZ_2; + phys_addr_t new_r2_base, new_r2_size; + + rgn1 =3D &memblock.memory.regions[0]; + rgn2 =3D &memblock.memory.regions[1]; + + struct region r1 =3D { + .base =3D alignment, + .size =3D alignment * 2 + }; + struct region r2 =3D { + .base =3D alignment * 4 + offset, + .size =3D alignment * 2 - offset + }; + + PREFIX_PUSH(); + + new_r2_base =3D r2.base + (alignment - offset); + new_r2_size =3D r2.size - (alignment - offset); + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_add(r2.base, r2.size); + memblock_trim_memory(alignment); + + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, r1.size); + + ASSERT_EQ(rgn2->base, new_r2_base); + ASSERT_EQ(rgn2->size, new_r2_size); + + ASSERT_EQ(memblock.memory.cnt, 2); + + test_pass_pop(); + + return 0; +} + +/* + * A test that tries to trim memory when there are two available regions, = r1 and + * r2. Region r1 is aligned on both ends and region r2 is aligned at the b= ase + * and unaligned at the end: + * + * Unaligned address + * | + * v + * | +-----------------+ +---------------+ | + * | | r1 | | r2 | | + * +--------+-----------------+--------+---------------+---+ + * ^ ^ ^ ^ ^ ^ + * |________|________|________|________|________| + * | + * Aligned addresses + * + * Expect that r1 will not be trimmed and r2 will be trimmed at the base. + * Expect the counter to not be updated. + */ +static int memblock_trim_memory_unaligned_end_check(void) +{ + struct memblock_region *rgn1, *rgn2; + phys_addr_t alignment =3D SMP_CACHE_BYTES; + phys_addr_t offset =3D SZ_2; + phys_addr_t new_r2_size; + + rgn1 =3D &memblock.memory.regions[0]; + rgn2 =3D &memblock.memory.regions[1]; + + struct region r1 =3D { + .base =3D alignment, + .size =3D alignment * 2 + }; + struct region r2 =3D { + .base =3D alignment * 4, + .size =3D alignment * 2 - offset + }; + + PREFIX_PUSH(); + + new_r2_size =3D r2.size - (alignment - offset); + + reset_memblock_regions(); + memblock_add(r1.base, r1.size); + memblock_add(r2.base, r2.size); + memblock_trim_memory(alignment); + + ASSERT_EQ(rgn1->base, r1.base); + ASSERT_EQ(rgn1->size, r1.size); + + ASSERT_EQ(rgn2->base, r2.base); + ASSERT_EQ(rgn2->size, new_r2_size); + + ASSERT_EQ(memblock.memory.cnt, 2); + + test_pass_pop(); + + return 0; +} + +static int memblock_trim_memory_checks(void) +{ + prefix_reset(); + prefix_push(FUNC_TRIM); + test_print("Running %s tests...\n", FUNC_TRIM); + + memblock_trim_memory_aligned_check(); + memblock_trim_memory_too_small_check(); + memblock_trim_memory_unaligned_base_check(); + memblock_trim_memory_unaligned_end_check(); + + prefix_pop(); + + return 0; +} + int memblock_basic_checks(void) { memblock_initialization_check(); @@ -1731,6 +1953,7 @@ int memblock_basic_checks(void) memblock_remove_checks(); memblock_free_checks(); memblock_bottom_up_checks(); + memblock_trim_memory_checks(); =20 return 0; } --=20 2.25.1