From nobody Sat Apr 11 07:52:48 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 EDC81C282E7 for ; Sun, 14 Aug 2022 05:54:14 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230291AbiHNFyM (ORCPT ); Sun, 14 Aug 2022 01:54:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57458 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230109AbiHNFyK (ORCPT ); Sun, 14 Aug 2022 01:54:10 -0400 Received: from mail-il1-x141.google.com (mail-il1-x141.google.com [IPv6:2607:f8b0:4864:20::141]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B8CC752E76 for ; Sat, 13 Aug 2022 22:54:08 -0700 (PDT) Received: by mail-il1-x141.google.com with SMTP id p9so2471794ilq.13 for ; Sat, 13 Aug 2022 22:54:08 -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=TqLTKUmEk/mKGbJa80nE77aaCeS2f2PhLCxbPuooWhk=; b=Q+70lCxo0EOr6ZjULQtULwXoQfFqFrhzmgqGnXuME+BrsXkSjYP3hTsUbnpp1qw43m 1F6K2i2CQKCycUqiGC5ObC9j1BnKh/dxeOxl1qRdJeeFl756TIYVq0Cdz4Yy6uJaEccb T7cm9eYHf//UuNx/gSF5Vgw7Q66vQXTEPwIqZ9kIUu3it4V3EJHPx5/OIeDIxS+tbSm2 O0k9O+veuWtYGdsCjrYkCfd/o5yukBIAFTTWsKBhY/70a0oH2j5KFx6aixZWydOagUfp xCv/B2tiT8441toWEth7/JWx5Y30oN/FMiwPJJtZXMu7AmJgdfR529IUWeaCzuME630I 9KnQ== 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=TqLTKUmEk/mKGbJa80nE77aaCeS2f2PhLCxbPuooWhk=; b=mdBfXLapSoT1E1CMBdSqJygXLaKEpPr0VKD/57CT3fKPIKDftCht0mY0H3SdZC4VuL BoOfeHzLwGBG9H1dlcAd+dCmdEV9f2r9bZajuWyTI6ZZs58l8tbOezGURR/aGzohGrfv Ab8uXSYl5+qJyrHRyRPAxBLGfa+2NsTlcqj+cLdknm0Vrw3CDiUTvMMZXuwiERke3zsE bdojtjTXhDsbq0MHMkd8JKNLKaSw+2+P0mbkOphy9H81nT5WcSefhOO4O+VmfhopE99P Nw4xAnKHjp6VZ1vh7QAuPpXMerTjqWAvW7l8xiEyvAGHb39XkmgzbBojOa7feX52UVJz awrA== X-Gm-Message-State: ACgBeo1J4NSZrH+WXAlQ8GVE40INZcQYHbusqf8w4OqHx3fldYnzhYN+ Oojy1V5YNEX6qYrma+TwzVw= X-Google-Smtp-Source: AA6agR57m2tbZb2IQQdr4JcN2+O7/qS5xwfmQSAUfTIGFtypLP3eE76NYeUEL1dj9t1cc0w5ype3xw== X-Received: by 2002:a92:cda9:0:b0:2df:a725:6491 with SMTP id g9-20020a92cda9000000b002dfa7256491mr4968030ild.12.1660456448133; Sat, 13 Aug 2022 22:54:08 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id h8-20020a05660208c800b006882a3bd03fsm432587ioz.16.2022.08.13.22.54.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:07 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 1/8] memblock tests: update tests to check if memblock_alloc zeroed memory Date: Sun, 14 Aug 2022 00:53:53 -0500 Message-Id: <02d514d86f212c79e52792b8ecd919156d7a9c20.1660454730.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(). Signed-off-by: Rebecca Mckeever Reviewed-by: Shaoqin Huang --- tools/testing/memblock/tests/alloc_api.c | 24 ++++++++++++++++++++++++ tools/testing/memblock/tests/common.c | 7 +++++++ tools/testing/memblock/tests/common.h | 13 +++++++++++++ 3 files changed, 44 insertions(+) diff --git a/tools/testing/memblock/tests/alloc_api.c b/tools/testing/membl= ock/tests/alloc_api.c index a14f38eb8a89..71c89cb9b2a8 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 @@ -442,6 +456,7 @@ static int alloc_no_memory_generic_check(void) PREFIX_PUSH(); =20 reset_memblock_regions(); + fill_memblock(); =20 allocated_ptr =3D memblock_alloc(SZ_1K, SMP_CACHE_BYTES); =20 @@ -472,6 +487,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 +545,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 +589,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 +638,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 +691,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..0ca26fe12c38 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 +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..7a16a7dc8f2c 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 /* @@ -70,6 +82,7 @@ struct region { =20 void reset_memblock_regions(void); void reset_memblock_attributes(void); +void fill_memblock(void); void setup_memblock(void); void dummy_physical_memory_init(void); void dummy_physical_memory_cleanup(void); --=20 2.25.1 From nobody Sat Apr 11 07:52:48 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 2BBE1C25B06 for ; Sun, 14 Aug 2022 05:54:24 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240150AbiHNFyW (ORCPT ); Sun, 14 Aug 2022 01:54:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57532 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230358AbiHNFyM (ORCPT ); Sun, 14 Aug 2022 01:54:12 -0400 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5EE1354CBB for ; Sat, 13 Aug 2022 22:54:11 -0700 (PDT) Received: by mail-il1-x142.google.com with SMTP id d4so2483441ilc.8 for ; Sat, 13 Aug 2022 22:54:11 -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=ZU3J1Tgpo6J2fZewTeU+O/Q6QDBwUbPH94LC1fh/cTI=; b=ZTQK81BjL0rTYjPjzhlMNhZqjGEeUb/a8pHwNO4L9XxiVuRU1lt3eEoRpM4E+YIu6J ol7NKSrjSOR3lPufYupFHo0DXwBf1PR6Rr7SyWQN0000u7Zc/d0anaF0Rbmw2099Fqr8 TDPSGGh1AaAPQd0+n0LGTNGAm+HiZ4OD19pz/RQC7QISFniHwzhtojIRNYv5vID4kfJG VP2VPKdB9fFFwnJBt8uWamu+YfB/F6e0Jl8kOC+/5/fJcYxm8TbEuKnrzjCGpXaBmlDf KXuGxzgTlDJ3lCqh2dkMJ9Hm0yAHejlzgPuKQtp0TCvUEyyA7FmwqTo6ieT6aFDXzfxL jUUw== 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=ZU3J1Tgpo6J2fZewTeU+O/Q6QDBwUbPH94LC1fh/cTI=; b=4eOgWyY0kalizjYcS7AKxdQtfTQDJ3A+jjGY9PHhyHJQlRk6+aEadUPPclAF7TDPuG +IPR0jEc6l2MHTBvfuU7800NaZW8BFSet+qVeaPWiS9ckvaqMQY7BmB+C2NgguJ3d57e Ge4hh4YOv0An7K3I1spBqWKc0s/lRfCMEfIk7S2ROaktuqPsiuNP/j+RYZqtwRy0z7+0 4HhiEttturm+rqSeyCfNMuhDVYxQDv2IZgikAXrgGx/NiCmOkdKnuIfPjFaROuG5tz4n 8m4L5LJJTF0wspM9SwSEu/C9j4ks/9BIuc+JlECHS0KN+FplOMhEmp7KB1KrgBjHErmX BOaA== X-Gm-Message-State: ACgBeo1m+BauRsvBhlInVDinmkR7acDX5rYh9dafnioXzndQ26Ts4dKe 1LJoQpekVQvFiLI5Ndkb6U4= X-Google-Smtp-Source: AA6agR5WfFQmTHge9k1tDwb/jo2aPSqw4CIIzup15qIOPU0NPYDnVjv7sL7bpKLE+1V6QYJVfgxFhg== X-Received: by 2002:a92:c246:0:b0:2de:b25b:e75 with SMTP id k6-20020a92c246000000b002deb25b0e75mr4859094ilo.246.1660456450696; Sat, 13 Aug 2022 22:54:10 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id c2-20020a023302000000b003435a9369a3sm1803266jae.8.2022.08.13.22.54.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:10 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 2/8] memblock tests: update zeroed memory check for memblock_alloc_* tests Date: Sun, 14 Aug 2022 00:53:54 -0500 Message-Id: <02cad26bef7bc8c7271bba20deac0e5f0bf081c2.1660454730.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 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 Signed-off-by: Rebecca Mckeever Reviewed-by: Shaoqin Huang --- .../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 Sat Apr 11 07:52:48 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 15573C25B06 for ; Sun, 14 Aug 2022 05:54:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239676AbiHNFyZ (ORCPT ); Sun, 14 Aug 2022 01:54:25 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230109AbiHNFyO (ORCPT ); Sun, 14 Aug 2022 01:54:14 -0400 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 80FA357253 for ; Sat, 13 Aug 2022 22:54:13 -0700 (PDT) Received: by mail-io1-xd44.google.com with SMTP id b142so902073iof.10 for ; Sat, 13 Aug 2022 22:54:13 -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=ILkgh0s9flepsTVscJySAOnLBbfijO6Q0jsQRVlYp2g=; b=Vmr56r0E5Gp4w6hx+69k1/OoBNKL31qc26DEssO6j746fCOQeaXJ1y7eR35X6Lu+iR yLPsywCQjNweOfw3f60pBB3KT+swWKNgHIb9M2JKyws27ADmuBF3vQ5EGrDBCFOvp94n 8Mrmgtymaeqmp9K+3ADADVJVQYB6DMku1TfojSy9tYj9tErA7UfUNcXGu8NANCVlm3gg eUyfyGfE+gDOkmfSWkuV07OFR0OdRoXIrImM/2edpDVK7jgvUUmjGaX87eFHO9TWkhwt bcbjpdDnO7WqNixSsr1Pm9NJ+1yZdSV7RoNvmCsnI9iDPvA52xW1cGxnrTt6X2Q8vSPG Fxkw== 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=ILkgh0s9flepsTVscJySAOnLBbfijO6Q0jsQRVlYp2g=; b=cahB49qf98uMNPXpIWL2L3Zw028JtpukFa6rxsXDfhaL2YB+UymuLuTPdIWiBW1W+f CQXiUjvJE6xwYtmWhqzeXg35DQOURG0HjRmOYNHKFdBKtzPs2injUkD4HTO0Vhp1YZbP NtOQ1COihn8tBnGe34jFVpVzaUwVX46pwOsyaDQmpHnbBNnJ8x0DOxgVngiICoLcpQ8y VVpXAexXFplv57xoWsHcHgtBV25KMmJegRsoDBx4NVVZGlVqTJLk8uI76IxO0y6UjbG/ cvt06qt4rbHBxySOPp2WFXRBWOU096MRihM09h4JWNRO5lURquznk/iqZljN8P3xEuIf zQyQ== X-Gm-Message-State: ACgBeo3xvUOFXXkv4Bf6sTjvcuFfkG6imFl1DFqfUnu1XOx758/q8HoO gWVHuhinkWSvWQomkhRMbMA= X-Google-Smtp-Source: AA6agR5fSwtKF6fFIiIsxq3c073b8Pn8UpWGkfynSd8Toy4ruDAyb4ubeD7yMxLK1FxRc9MmfARtoA== X-Received: by 2002:a05:6638:250d:b0:340:4915:263 with SMTP id v13-20020a056638250d00b0034049150263mr4792485jat.17.1660456452707; Sat, 13 Aug 2022 22:54:12 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id x7-20020a056602160700b0067be3f195bcsm3197871iow.5.2022.08.13.22.54.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:12 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 3/8] memblock tests: add labels to verbose output for generic alloc tests Date: Sun, 14 Aug 2022 00:53:55 -0500 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 --- 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 71c89cb9b2a8..73c2c43e702a 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -752,10 +752,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; } @@ -774,10 +772,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; } @@ -785,10 +781,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; } @@ -796,10 +790,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; } @@ -807,10 +799,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; } @@ -818,10 +808,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 7a16a7dc8f2c..e0dd5b410099 100644 --- a/tools/testing/memblock/tests/common.h +++ b/tools/testing/memblock/tests/common.h @@ -101,4 +101,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 Sat Apr 11 07:52:48 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 B5F2CC25B06 for ; Sun, 14 Aug 2022 05:54:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240201AbiHNFy2 (ORCPT ); Sun, 14 Aug 2022 01:54:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57768 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230299AbiHNFyT (ORCPT ); Sun, 14 Aug 2022 01:54:19 -0400 Received: from mail-io1-xd44.google.com (mail-io1-xd44.google.com [IPv6:2607:f8b0:4864:20::d44]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E0A955C954 for ; Sat, 13 Aug 2022 22:54:15 -0700 (PDT) Received: by mail-io1-xd44.google.com with SMTP id z145so3796256iof.9 for ; Sat, 13 Aug 2022 22:54: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=2t+DOWlEB0vRRGkl5a8lTXvzwGf7Xd8C9kZbiMM/MLc=; b=J9SiQt4/9D4i9l4YDPfv/CkDxtvcgS0qErp07OhbDJT58SuOClE98CMskOD2JQa4gu 36vXpQHTkyjxM1VmAoDdGFko9X1lxEmjnZ/TDkC2qVHI6O12J3FyHxdB+/TDSscW9V1e iGrZcDdbLh/TjzmZxw+ZqxJILJMSOCIP20uC0V/Nx0BxYupYjBPJoEtpMu9yxo+01mXK Ro3xwZxMM1emc/Yt6CyjaV+gKdOR2UJpl3qH2s8JrAJMVILh1RIgMGaAyUXVV4TTF048 kokt4rU1rhvBNwIyoT8UivPBf03J0Xin3pscy7pkqz2JuLe4vI5VpTOJ3Tb07E0kDwNP wN6A== 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=2t+DOWlEB0vRRGkl5a8lTXvzwGf7Xd8C9kZbiMM/MLc=; b=f8smyjTpRx8iuANQBzoZGPOqE5TgkJAmY/i0v1w5wrZ2A0aCITwMYKX0GpYkEpu/9o o0yPvv9QmbpTUsI5S4ISaKOZ3l2hmUmt0z+x8WzAajBfJjlr/UMusMCSZsq3vD5vNR49 A0YS4oyc0fe0SDDgFa9Fd+h0zSswaYfDIQO+ca3nD+1jYopUvqeYoSV0wabWZ23fipCW WfBr2tVstCeytQqeTfgLh6eMTgBYY4DwY8yKJwBuXZSFG0hCl/35H71ti9FwCCqRFoCE kLIpAS+DO5JaJVjHvxxiwyVjTfNGlGTS8UR9VBT4cOXZqkQLa5H3QYLJQZNuqbmV5QYQ P+Iw== X-Gm-Message-State: ACgBeo1F0XZ3639qQErXYtrsRSQkvGBC0jCZXBYc9g9ioVaZKYpF3ubg qdMY4pWe2rPQZvC0jxaNee8= X-Google-Smtp-Source: AA6agR791dJ2mgJUdXOatqLGSN+pew7fSuNEmOQjNc0ZMEsG6UU5AYwc/ouK7aBzd7R8YZjO6l/wBg== X-Received: by 2002:a05:6638:13c9:b0:342:7d75:41f0 with SMTP id i9-20020a05663813c900b003427d7541f0mr5051021jaj.268.1660456454757; Sat, 13 Aug 2022 22:54:14 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id t4-20020a92c904000000b002dd5302804fsm2317185ilp.40.2022.08.13.22.54.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54: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 4/8] memblock tests: add additional tests for basic api and memblock_alloc Date: Sun, 14 Aug 2022 00:53:56 -0500 Message-Id: <816c5d36d18944171b3fa4964ce75d91f8096bf1.1660454730.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_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 --- 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 73c2c43e702a..fe1ee3b2e851 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -470,6 +470,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 @@ -814,6 +848,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"; @@ -836,6 +879,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..ef5642d0863b 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 r1_size, 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; + r1_size =3D r3.base - r1.base; + r2_size =3D r2_end - r3_end; + total_size =3D r1_size + 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, r1_size); + + ASSERT_EQ(rgn2->base, r3_end); + ASSERT_EQ(rgn2->size, 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 r1_size, 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; + r1_size =3D r3.base - r1.base; + r2_size =3D r2_end - r3_end; + total_size =3D r1_size + 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, r1_size); + + ASSERT_EQ(rgn2->base, r3_end); + ASSERT_EQ(rgn2->size, 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 Sat Apr 11 07:52:48 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 3706AC25B08 for ; Sun, 14 Aug 2022 05:54:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240215AbiHNFyb (ORCPT ); Sun, 14 Aug 2022 01:54:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236391AbiHNFyT (ORCPT ); Sun, 14 Aug 2022 01:54:19 -0400 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3170A5C9C9 for ; Sat, 13 Aug 2022 22:54:17 -0700 (PDT) Received: by mail-il1-x142.google.com with SMTP id f18so682188ilj.11 for ; Sat, 13 Aug 2022 22:54:17 -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=V683Hnn2q0/vCvNg5zACgDjgDcSCcwjZhitBaRpwDvQ=; b=hnWrx7hgdfuaDxo41+rNai87UZ1mbRQkGGgRRxtjaRx95RoWQnwhHaXgGRgcTms63Q BF/AO/Usat8RLcHyoQJvdLTeWFLqwPKwpSpzomTfvzOV1A7URE5UFFZ8HqyZqBfIh5+p gp2AIfKUcILS4U3oDcVry3aUf+eMmQHLsWOhtVa+oH4lbik4aQq1mu6gMiWk0Vf391u7 nSea5LTM1C0r4m2a6zKsBV0a0PrbcyXAW4C2+ZjdIjhc4AsaBmpwszqaUA46agtzRoz+ Z8eOQ9uUSfUdwfXTJ7rFrLYO5LZs4Yt2vNp2QMJIE2JUSWRXtNtf0VH3H/ciACP/k8tJ 3LUQ== 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=V683Hnn2q0/vCvNg5zACgDjgDcSCcwjZhitBaRpwDvQ=; b=BH168y97x763oA9gV0T5QjBHgCHm3k6qvVwcsSGwNNK6qmZW6BFjm51leRW0jSmE9u 8/tGHJUF+U5ugKpB5lshutdeN+js+RADnZzTyso1gi0ER4DSL1+KCWBV+93C0zBEHTUj Gn4ldhEp7RN4Kiv+pdmVzGIt8grKgj+WiyoP3PQlMe+BNmN5ivS9IWF/TxarVYp0MluJ aqCKZ4q/JmYr+pY/xwdlC/xiD7vufPpY6qNpJXc5KdHrs7U7dLrjifQPobiYKfI0W0gC G8XhdcUS31CHoEE5b25LHVjROZX5rlbnS41i/vt7R1Il6K7EYaRxrFunLPyLCE2Lww1F R2Nw== X-Gm-Message-State: ACgBeo1vzUVb2kMT8cHLMN+CKggTPmC4quDchTwxnGva7ck7WljxjbHG ha43yQ6qsIIztFjQvDnGMC4= X-Google-Smtp-Source: AA6agR79YY8+gdKUXDqfn42+zgcWVGin9Yh5/pTBmwNLQkvPUawNp1uaP2GpYjnodEDq8gC7iQxOIA== X-Received: by 2002:a05:6e02:160c:b0:2df:6eaa:1239 with SMTP id t12-20020a056e02160c00b002df6eaa1239mr4557398ilu.171.1660456456695; Sat, 13 Aug 2022 22:54:16 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id h8-20020a05660208c800b006882a3bd03fsm432704ioz.16.2022.08.13.22.54.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:16 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 5/8] memblock tests: update alloc_api to test memblock_alloc_raw Date: Sun, 14 Aug 2022 00:53:57 -0500 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() 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 | 106 ++++++++++++++++------- tools/testing/memblock/tests/common.h | 17 ++++ 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 fe1ee3b2e851..e3c0dc2174e9 100644 --- a/tools/testing/memblock/tests/alloc_api.c +++ b/tools/testing/memblock/tests/alloc_api.c @@ -1,6 +1,37 @@ // 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); +} + +static inline void verify_mem_content(void *mem, int size) +{ + if (alloc_test_flags & TEST_RAW) + ASSERT_MEM_NE((char *)mem, 0, size); + else + ASSERT_MEM_EQ((char *)mem, 0, size); +} + /* * 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 +50,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, expected_start); @@ -79,10 +110,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); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -126,10 +157,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - total_size); @@ -176,10 +207,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base - r2_size); @@ -228,10 +259,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); =20 ASSERT_EQ(rgn->size, r2.size + r3_size); ASSERT_EQ(rgn->base, r2.base - r3_size); @@ -284,10 +315,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base - r2.size - r3_size); @@ -332,7 +363,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 +387,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 +423,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 +458,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); =20 ASSERT_EQ(rgn->size, MEM_SIZE); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -458,7 +489,7 @@ static int alloc_no_memory_generic_check(void) reset_memblock_regions(); fill_memblock(); =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); @@ -492,7 +523,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); @@ -518,10 +549,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); =20 ASSERT_EQ(rgn->size, SZ_2); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -576,10 +607,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); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -620,10 +651,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -669,10 +700,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r1.base); @@ -722,10 +753,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); =20 ASSERT_EQ(rgn->size, r2.size + r3_size); ASSERT_EQ(rgn->base, r2.base); @@ -857,13 +888,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(); @@ -887,3 +919,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 e0dd5b410099..a0594f1e4fe3 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 /* --=20 2.25.1 From nobody Sat Apr 11 07:52:48 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 08BEBC25B06 for ; Sun, 14 Aug 2022 05:54:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240168AbiHNFye (ORCPT ); Sun, 14 Aug 2022 01:54:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57728 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240132AbiHNFyV (ORCPT ); Sun, 14 Aug 2022 01:54:21 -0400 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4B6655F99E for ; Sat, 13 Aug 2022 22:54:19 -0700 (PDT) Received: by mail-il1-x142.google.com with SMTP id c5so2490928ilh.3 for ; Sat, 13 Aug 2022 22:54:19 -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=mrwOFT/FVIpeQilRUSDlN1UFE6zYPVjgWmD8J2V/Rvw=; b=kzOoUtnt+1ScgJ8esSYWaoJQNS0I+4PV9yigMOUggv6Un7yJZpa2YCTxfyI7pmNJCE OchlVt+bRFGASVbrBnqan+ICPglUQP1NW/JQu277PhGvNJDI2PXHFbHhOUR6BTdZhyNw Dicfa0soc5mWdHKIfA9Hhs+EGQRefyT94wFa369xpj1MDMIoBNtNf4u8HsOgogPBnLx5 ppkIXLRVJum8M6IAVYXbkf75ABQzT4m4hrg15N+ORpppsqsrvELpnHhkXa990aij2VbK TOTW0HcwOvaVXqa0vPMppMRwUtfPJcPMf0NP+UOk+nOpovLeP2biej/Qzcq5um6ovfXm olxQ== 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=mrwOFT/FVIpeQilRUSDlN1UFE6zYPVjgWmD8J2V/Rvw=; b=E/T3Itf1pI3T8mxNJRJDP5fjFNoBTACCyR2doQEKSRgDzt5iFb8cL0hXDqUy6XLUtM AEwSorPySZQBJ+xAKDXRJbspn2gT4XBxZtu1NVsijqaBXRx483mDNnMrMYBZPmHWqi6E nutRAe3+9AD/MKY3HAlYmSld6ttBKhJCI+4azPfVWCc03iNjFUCfPrD3NvtHNjzmxST4 JkPYH4UJuAjZdXu/cOXvjEmDM2vNdSxajytcjIVFKJj4omELES0C+EIkl1/hsKPgjmM8 zUKWWekU1WClCnVu+fMb7tIgJ8Gpb8YsPU2fU+3Ub+cjdVqoqaMt+ZagdqoNp+CcviQT uw6Q== X-Gm-Message-State: ACgBeo11tCmIZAd66Fyv59vGBCK2tNtPCflkjxLN4XqO6gUPl5BVRm2L lQXe2jcHVTLnGaHkB76jUQ4= X-Google-Smtp-Source: AA6agR5YE34UARRXt7XzwTzkmVuH340HkSDCAUvT5f59RLZ+kXqXbh02Efm57RVbCJnfAhEDb7bzZw== X-Received: by 2002:a05:6e02:1caf:b0:2e0:cec1:9f17 with SMTP id x15-20020a056e021caf00b002e0cec19f17mr4801562ill.5.1660456458500; Sat, 13 Aug 2022 22:54:18 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id u7-20020a056e02110700b002dcafb975c6sm2603415ilk.82.2022.08.13.22.54.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:18 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 6/8] memblock tests: update alloc_nid_api to test memblock_alloc_try_nid_raw Date: Sun, 14 Aug 2022 00:53:58 -0500 Message-Id: <4c9b416480a5070f18c3933a1a03296f32c2091b.1660454730.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_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 | 196 ++++++++++++------- 1 file changed, 127 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..e16106d8446b 100644 --- a/tools/testing/memblock/tests/alloc_nid_api.c +++ b/tools/testing/memblock/tests/alloc_nid_api.c @@ -1,6 +1,42 @@ // 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); +} + +static inline void verify_mem_content(void *mem, int size) +{ + if (alloc_nid_test_flags & TEST_RAW) + ASSERT_MEM_NE((char *)mem, 0, size); + else + ASSERT_MEM_EQ((char *)mem, 0, size); +} + /* * A simple test that tries to allocate a memory region within min_addr and * max_addr range: @@ -32,12 +68,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size); @@ -86,12 +123,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size - misalign); @@ -137,12 +175,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -189,11 +228,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, max_addr - size); @@ -241,8 +281,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 +328,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, reserved_base); @@ -338,11 +380,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, min_addr); @@ -402,11 +445,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); =20 ASSERT_EQ(rgn1->size, r1.size + r3_size); ASSERT_EQ(rgn1->base, max_addr - r3_size); @@ -466,11 +510,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); =20 ASSERT_EQ(rgn->size, total_size); ASSERT_EQ(rgn->base, r2.base); @@ -531,11 +576,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); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, r1.base); @@ -597,8 +643,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 +675,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); @@ -666,11 +714,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_end_of_DRAM() - size); @@ -714,13 +763,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -769,13 +818,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr + (SMP_CACHE_BYTES - misalign)); @@ -822,12 +871,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -887,12 +936,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); =20 ASSERT_EQ(rgn1->size, r1.size); ASSERT_EQ(rgn1->base, max_addr); @@ -959,12 +1008,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); =20 ASSERT_EQ(rgn3->size, r3_size); ASSERT_EQ(rgn3->base, memblock_start_of_DRAM()); @@ -1004,12 +1053,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, min_addr); @@ -1043,12 +1092,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); =20 ASSERT_EQ(rgn->size, size); ASSERT_EQ(rgn->base, memblock_start_of_DRAM()); @@ -1193,13 +1242,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 +1275,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 Sat Apr 11 07:52:48 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 CCB2FC25B08 for ; Sun, 14 Aug 2022 05:54:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229504AbiHNFyf (ORCPT ); Sun, 14 Aug 2022 01:54:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57748 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240023AbiHNFyX (ORCPT ); Sun, 14 Aug 2022 01:54:23 -0400 Received: from mail-il1-x144.google.com (mail-il1-x144.google.com [IPv6:2607:f8b0:4864:20::144]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 453B45FAC8 for ; Sat, 13 Aug 2022 22:54:21 -0700 (PDT) Received: by mail-il1-x144.google.com with SMTP id j20so2492078ila.6 for ; Sat, 13 Aug 2022 22:54:21 -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=SnDhYdrAcbvGcTO2vU9jv0bvWt3Yk1v2Rp41yYuWQ5Y=; b=jyJHJXdGgxnJHliMAK+EYrp/qvH6ThciPn+bCSwsOKziwkLyYX6MPGlVUCubMP5P+B NMtPAWl/7nwg8cUg8r65aQI8ncSmX7SyCprI3nRYU3kMd9Tjn4p9tQm6yA9z9nuUWVRR PxOqj7+jJ4gADUE6RYNu/tNkBl1TRNlgnyZ2B5BD67koCOumu4Sz9RSZ9CA81l9mxXdF DlUdLdP52LMVa0G5fWRZChr6PIYHdKelTe/PywwwtkTPJpJZp/xGG3Sl+O1fOUhoh607 AClxX3snucMIc2jFqOEs9np8SalmREVGy4dQuVDKMDygLniWlBpWyWc8grFyeqZs6P23 SwNA== 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=SnDhYdrAcbvGcTO2vU9jv0bvWt3Yk1v2Rp41yYuWQ5Y=; b=Vzbg2ei00edXVlMxwcHx53HqxwK5RMe3en6Z3IhbnZ23bN9K81qQqM0Ng/tmlNYL9Y U5xeszFeLRzAypJA1ZhL0SUL8LJKWaSl+JD199B8dCXzaH5VQZYDbN3ioaQ+MUHSx5fn Yfgwwe1E3Fv0lHqZA9Bk0TIAZ0V8Q/hJtS3sdh7Y3ODC6m8sa0jSWvTA3xqFeU+UTU1t S7+MTOPbfVo8VI93Bbo+DLkvTwo4R88hSi9S84MNEMv5nENEAYKn4iMiLAsd+rJmO2yn BfiRgs56G2X0vNWBJMduco1yOINC9TpAlN65GykVMjB9LqVfPLOWmkIYiLL3q8Sm8sv8 RNFA== X-Gm-Message-State: ACgBeo2HsSkS8Zv2IInaxM3SkSuxJmAe8xbpC/GYk4FI40iml4r7+xgF dirTl+S/i5Pi4oS6GmBYgpao9hM1dUxWDw== X-Google-Smtp-Source: AA6agR5A4fVnZwWVC2PDMrTvzD+FcOYVwxg8Kew9QoZsCBpzm3YWd171CU+xXOYjPP670UvnabnUhw== X-Received: by 2002:a92:c246:0:b0:2de:b25b:e75 with SMTP id k6-20020a92c246000000b002deb25b0e75mr4859257ilo.246.1660456460564; Sat, 13 Aug 2022 22:54:20 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id d13-20020a92d5cd000000b002dd143ee62esm2648816ilq.14.2022.08.13.22.54.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:20 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 7/8] memblock tests: add tests for memblock_*bottom_up functions Date: Sun, 14 Aug 2022 00:53:59 -0500 Message-Id: <69524966ac92d93b45a8a8e739434d5fb31e3084.1660454730.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 simple tests for memblock_set_bottom_up() and memblock_bottom_up(). Reviewed-by: David Hildenbrand Signed-off-by: Rebecca Mckeever Reviewed-by: Shaoqin Huang --- 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 ef5642d0863b..d7f008e7a12a 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 Sat Apr 11 07:52:48 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 CA5B0C25B06 for ; Sun, 14 Aug 2022 05:54:40 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240238AbiHNFyi (ORCPT ); Sun, 14 Aug 2022 01:54:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57886 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239721AbiHNFyZ (ORCPT ); Sun, 14 Aug 2022 01:54:25 -0400 Received: from mail-il1-x142.google.com (mail-il1-x142.google.com [IPv6:2607:f8b0:4864:20::142]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 993755C356 for ; Sat, 13 Aug 2022 22:54:23 -0700 (PDT) Received: by mail-il1-x142.google.com with SMTP id d4so2483548ilc.8 for ; Sat, 13 Aug 2022 22:54:22 -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=57rgW1sYbO78tij7BVX5WYr55Vq5FbqyewxGMYBSZtk=; b=B/fgMudF1KCEFCKV6FWg8Gz3rGGiLl0m7TNOf0gfhZZp6Wrgxs92Z4hAbQ+aQjouFu X1OEhXaQUMv8zDIRSMsxneJhLVHEOzJrVtY5K5bCqT8vInwovKktKyBO+cfLYVHy9Aj1 9X2hRFjnuKLsoPh+WDybApb5+vLU2URzvWqvDUny2XJetlHCIEFJrgNaHJZTLpofWny0 +OgdAxLv45Bb5QQCWLQxMB3Ji++3isUtoslT8mnlSQWYA1BGe/FApjhKJuhSlCBNGGow 0gqtnCh97tSHuFJ/lKsADY3kBBv14SjhH0sqmEQMJLbuA/BonAIPynG6Y8rUyqSM6zhE RQyw== 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=57rgW1sYbO78tij7BVX5WYr55Vq5FbqyewxGMYBSZtk=; b=PdQptkyXGtsO0EjaLgGlcMpdZTNiBoU0kPJNZi/sE/CH7o2poBeKqJpRNGvvaXT+kh GTgC5dlFN/7Rn9gw994v4LjmmN80J0B2+zwJStCbYWsUae4kCwR6lKkJOANC7yM4GKE2 r8nau8NLJeiIYuH0BcIRWUmwkMj0fYlWKx0X1m0OZ/ZnFYHMJ611xIjt4XP76/I+nKNZ TbRpbRsi4msO2xUkhq43hHbgFFVg8yxRjmdXmdrmGffq9EmdPKS5Z9/VGlU3cQquLIEH EYQWZWkBhfQ25XfBkJ2kpjIhcNWcnFb3Lt+9raK7QozmYc+UYVnnirQaNmvjHPYk6Y52 KoHg== X-Gm-Message-State: ACgBeo07ArBv8dt+rVf1x1a99d8+4NSGLefCwq+dJrBVgabiYdGyNhYF 2ko4zhHGpI8sRpBCS9Pedcc= X-Google-Smtp-Source: AA6agR406vu4PkQdRHCd5fMLZ7RIpgMg5EM1fsk2ivjCdmJ3HsNQd0botplZ5UriMbe3vmUfiBL3QA== X-Received: by 2002:a05:6e02:2185:b0:2de:9a5a:4993 with SMTP id j5-20020a056e02218500b002de9a5a4993mr4535302ila.182.1660456462573; Sat, 13 Aug 2022 22:54:22 -0700 (PDT) Received: from sophie (static-198-54-128-70.cust.tzulo.com. [198.54.128.70]) by smtp.gmail.com with ESMTPSA id b6-20020a05660214c600b0067b7a057ee8sm3144563iow.25.2022.08.13.22.54.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 13 Aug 2022 22:54:22 -0700 (PDT) From: Rebecca Mckeever To: Mike Rapoport , linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: David Hildenbrand , Rebecca Mckeever Subject: [PATCH 8/8] memblock tests: add tests for memblock_trim_memory Date: Sun, 14 Aug 2022 00:54:00 -0500 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_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 d7f008e7a12a..c8bb44f20846 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 r2_base, 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(); + + r2_base =3D r2.base + (alignment - offset); + 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, 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 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(); + + 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, 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