Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0142FC41513 for ; Tue, 7 May 2024 07:59:11 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 422FB6B0088; Tue, 7 May 2024 03:59:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3D3186B0089; Tue, 7 May 2024 03:59:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 29A9C6B008A; Tue, 7 May 2024 03:59:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 060426B0088 for ; Tue, 7 May 2024 03:59:11 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id A9206A08EF for ; Tue, 7 May 2024 07:59:10 +0000 (UTC) X-FDA: 82090849260.01.E77D8D9 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) by imf18.hostedemail.com (Postfix) with ESMTP id C4CEE1C000C for ; Tue, 7 May 2024 07:59:08 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=SakmtKIt; spf=pass (imf18.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1715068748; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references:dkim-signature; bh=gTTLHYA9f4wekWMEXM6x+5GuOxsj2dEHNGTJhgkSO0Q=; b=OCxpjdf1EcUERSUZtteAK9LfI6eTIKZo9oeetbDgrT0XVQFq4i+O8TZ08gj9mj1ZIxpq// Fub2DO+CGzC2maUf9kk6CslIg5LokQKA8/z9lz517o2P9SK8PwSP3sT/kAdzTx30AoRyx8 LRmMWVB/7yIjvdB56cPS52mPFeDgiyg= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=SakmtKIt; spf=pass (imf18.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.43 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1715068748; a=rsa-sha256; cv=none; b=Ed/6HUv5XD1LwjkFBolcV0Ip9UBvlrvEmXIKFCapTgc60CmuyAS3jlXke/+fuVgRx2rgJD MZCAAB7O6PVCaYOc2UuQdG2qcl+VtV3rLed0pOSfVzyYguLoAGMBjBBjAo3n1RHYPguyqT YfPw+cjuEKQKk0DYAgv/oIxe1/q4LwI= Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a59b097b202so485841466b.0 for ; Tue, 07 May 2024 00:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715068747; x=1715673547; darn=kvack.org; h=references:in-reply-to:message-id:date:subject:cc:to:from:from:to :cc:subject:date:message-id:reply-to; bh=gTTLHYA9f4wekWMEXM6x+5GuOxsj2dEHNGTJhgkSO0Q=; b=SakmtKIthsHS4VjyIO/Itejebjt8Qt1HipIgXj0KqQDYj8QCOdpw2iFhkyWtC/kN0j 73iQ9AagFKL2FF+jPC9CNBe9ven6IIi0MHn82qNj4V4wnBC6Kj10BFd3wsG0Em9w5UFX vT87W48lT1JhC6gme/6i6TpM8WhxA4m+rSTYv1J+49safbh/WQ5MQBSVow2jY1kbfeUH 3vngdJCgq0qfseipQHR4Bj7h7xbMgtY/WKnNl/I4AZ9ljkuk0nM8gxzXWkkaWKHkn62M cQGnaZrtyhELSbPXaqZRJQjjvgnu45Vei0K7/QTamdl5dPa2oNCKO5Jpla4zWAbkklR6 u3+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715068747; x=1715673547; h=references:in-reply-to:message-id:date:subject:cc:to:from :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gTTLHYA9f4wekWMEXM6x+5GuOxsj2dEHNGTJhgkSO0Q=; b=VbNEPjXCtS5wLI+rGSmkM++8SZAtHviO6qaXF1rqqtowAIJd6reLZsNFlZTZOaC9xH VB54koAisPNu9KNY9C/6z7vUZRlpdfbSe1LKlnuBB6af1PBwkTWwJtTBdMj6HPUINKJ0 JfCwHGkYgTw2Iak1KwPDudDd2LNR490An0w0YBPItLUIfKHob6EuOvbX7QmwITMeGif+ 2LWKs3qMO1kOypFS9Y5oCzClTx6eidYpYg4n/4jO/o9YhP4xmPAQ1E3ngoUpmx2+sbQd e8wYLebb7ThFt30norGKz0myFu4cyJV4WGr2ggkQxEIsVAFJE3wpNBtEuSKQenygv79o ARig== X-Gm-Message-State: AOJu0Yy6r+F0zklHxvQPURUZxWo9zVjPBZzOnzg8PqylrNPsJ86rLsT7 AZ6+RyuTz4PphaQ1vcczghthitjmWuvfkdD/qO92FiK8gn2dYUbR X-Google-Smtp-Source: AGHT+IFUK+nzcVHetXzXFpLUtdozo0jxKeEvFyQ3DXIpmhVN1QjIrfxlbXsIZCHX4vv+ZZwEEtoJRg== X-Received: by 2002:a17:906:5907:b0:a59:b543:c9f9 with SMTP id h7-20020a170906590700b00a59b543c9f9mr5050672ejq.7.1715068747358; Tue, 07 May 2024 00:59:07 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id wp20-20020a170907061400b00a59c5301bc7sm2746232ejb.61.2024.05.07.00.59.06 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 May 2024 00:59:06 -0700 (PDT) From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, Wei Yang Subject: [Patch v3 1/7] memblock tests: add memblock_reserve_all_locations_check() Date: Tue, 7 May 2024 07:58:27 +0000 Message-Id: <20240507075833.6346-2-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20240507075833.6346-1-richard.weiyang@gmail.com> References: <20240507075833.6346-1-richard.weiyang@gmail.com> X-Rspamd-Queue-Id: C4CEE1C000C X-Rspam-User: X-Rspamd-Server: rspam04 X-Stat-Signature: 3zrq5a6tpxaf5imrzhfkbdmoe1feupga X-HE-Tag: 1715068748-571678 X-HE-Meta: U2FsdGVkX19KYMPkptkCrpzWUFOGhjINuA/JtwuVlUFAqfSvHA9gwXTYi9CTU94gHfjUyxbL2gEdgE9742UulWR4wa/969q8H/vZn/SHUs/AjzqxZ5h9MoQP/xs6db80zd/Io8bYzO/ayWI/AYn3Mh1F/GzU9/m25EuGYiC3piYJVlnyl8Fcq1GGwTk5gWqE+RQSLsON6ArPfgwM+OasTI+fhu7nGd8fr98SPqrJA11JrbtSny0qV3qQzPwKRoIzCFQfPDSIIs25Y9jUjW0e2AYx6+d4szwcN3k1Y6m6UTDn8KDe+FyOSuJ2dAuuEXEXLRRoFQwRNHhIAcwPud48Lo/vVudp2CvBJh7/DDB4iAyvvtWla9j5k5xipDSKQirEGIIBkeTqFKP6/eMlSOi5XWAeROnEOP7ddRScJ65p1PN4WezcF1wUM0OgLNDO8NL+IzRc4XnIDSXQak9PY7sanHWeIQMQL0BL3Y0xmyTlag8s3LCRI9mMmz/vKhPBCGEryP1D1Adm/ebu0Y5Rbc+jUzNd+VafeQdtJO8cyON6uFQQKibv20vNj2upHO1i6AuYTW2I1IHojSUBH9kbYfd7oYq+zqgWmY6RSkqHpz+XqfHH9ZjJLSYqqGlSEhsx5DxSL3lGUVgWULuEPYClr00JdAietCojpYxXXwJJsVXZow+Z3qdXewEktIw3X4sAmQUP6G9VYXYBxBv/7vjIRllXgCIUPP9WFsOuCogilNWEAdHorOWTCrVtz/4efh7y18pyRGg0BrUIKNHY6riZ6l+kINrK9DIb0fXrLhU3/35jF6r+KJcB4JllROXafVXFK2DAdJ+s3VhhQHvOKVHbnjE1uB0xzKRImbF5XyU1dwQi83evaC79lbx18e/5K+OhY14EmXS15a6Yg2rhUQW52QzR2x+Oe9sTHelktnpZRtGQYDnRcFsDTnsge45f5MhsE8yHdCqic3cDz2OZueut6Ke QVG0LR2P OMOn/M1MgwfprQFO+Skq6pIWvDprau5oaxwtg7ykYrdSSpCjbA7z3IYCucGssHoyltr8ZaFyxQoVy0BasIMTYNvUXJLOw+8sMoiqvda+SSJePTRoIF0jp/j0Fumq104NH1kR42YxKB/zyD7W4NiZPwLHr5fZOziKqaZ+JN2oT41fepeASZirbao1EpGsTcQVzE5Qpu1Po4ngtW7Y/m7OTe4JO0V1UHJmDeFLwSQrAuh3dXV3h0A6diFtGJPZjjVd1lhnPG3hqNymv3EkC1Zua5fG2rWY2YJTmX3GwnjhRdIdgdjLulPZkSEmR8Fjgk+V+auiiWrkuldLPLmoeQNP7eJlfdx925bu7UhRZTxOz/LP1762SU2b8/vyLQThHF8b2Q+8GzAqBe9+sWLYKrVk1ZqsMsvx7YMMaBTjf8kwKDvMnyUSmfIjm9dDo/ZcDnZhDf+8Sz5jbnPhXE/MPay7wi25/GN2/Eq04u7OJXONkJILtMQk1ECAyz6XILGjmBHQrE6vuIbCo57uQAS2GNGglGmafaZ0HSvBh2YrXP0VRKE0h7WM= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000057, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: Instead of adding 129th memory block at the last position, let's try all possible position. Signed-off-by: Wei Yang --- tools/testing/memblock/tests/basic_api.c | 107 +++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index f317fe691fc4..bd3ebbf6b697 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -982,6 +982,112 @@ static int memblock_reserve_many_check(void) return 0; } + +/* + * A test that trying to reserve the 129th memory block at all locations. + * Expect to trigger memblock_double_array() to double the + * memblock.memory.max, find a new valid memory as reserved.regions. + * + * 0 1 2 128 + * +-------+ +-------+ +-------+ +-------+ + * | 32K | | 32K | | 32K | ... | 32K | + * +-------+-------+-------+-------+-------+ +-------+ + * |<-32K->| |<-32K->| + * + */ +/* Keep the gap so these memory region will not be merged. */ +#define MEMORY_BASE(idx) (SZ_128K + (MEM_SIZE * 2) * (idx)) +static int memblock_reserve_all_locations_check(void) +{ + int i, skip; + void *orig_region; + struct region r = { + .base = SZ_16K, + .size = SZ_16K, + }; + phys_addr_t new_reserved_regions_size; + + PREFIX_PUSH(); + + /* Reserve the 129th memory block for all possible positions*/ + for (skip = 0; skip < INIT_MEMBLOCK_REGIONS + 1; skip++) { + reset_memblock_regions(); + memblock_allow_resize(); + + /* Add a valid memory region used by double_array(). */ + dummy_physical_memory_init(); + memblock_add(dummy_physical_memory_base(), MEM_SIZE); + + for (i = 0; i < INIT_MEMBLOCK_REGIONS + 1; i++) { + if (i == skip) + continue; + + /* Reserve some fakes memory region to fulfill the memblock. */ + memblock_reserve(MEMORY_BASE(i), MEM_SIZE); + + if (i < skip) { + ASSERT_EQ(memblock.reserved.cnt, i + 1); + ASSERT_EQ(memblock.reserved.total_size, (i + 1) * MEM_SIZE); + } else { + ASSERT_EQ(memblock.reserved.cnt, i); + ASSERT_EQ(memblock.reserved.total_size, i * MEM_SIZE); + } + } + + orig_region = memblock.reserved.regions; + + /* This reserve the 129 memory_region, and makes it double array. */ + memblock_reserve(MEMORY_BASE(skip), MEM_SIZE); + + /* + * This is the memory region size used by the doubled reserved.regions, + * and it has been reserved due to it has been used. The size is used to + * calculate the total_size that the memblock.reserved have now. + */ + new_reserved_regions_size = PAGE_ALIGN((INIT_MEMBLOCK_REGIONS * 2) * + sizeof(struct memblock_region)); + /* + * The double_array() will find a free memory region as the new + * reserved.regions, and the used memory region will be reserved, so + * there will be one more region exist in the reserved memblock. And the + * one more reserved region's size is new_reserved_regions_size. + */ + ASSERT_EQ(memblock.reserved.cnt, INIT_MEMBLOCK_REGIONS + 2); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM_SIZE + + new_reserved_regions_size); + ASSERT_EQ(memblock.reserved.max, INIT_MEMBLOCK_REGIONS * 2); + + /* + * Now memblock_double_array() works fine. Let's check after the + * double_array(), the memblock_reserve() still works as normal. + */ + memblock_reserve(r.base, r.size); + ASSERT_EQ(memblock.reserved.regions[0].base, r.base); + ASSERT_EQ(memblock.reserved.regions[0].size, r.size); + + ASSERT_EQ(memblock.reserved.cnt, INIT_MEMBLOCK_REGIONS + 3); + ASSERT_EQ(memblock.reserved.total_size, (INIT_MEMBLOCK_REGIONS + 1) * MEM_SIZE + + new_reserved_regions_size + + r.size); + ASSERT_EQ(memblock.reserved.max, INIT_MEMBLOCK_REGIONS * 2); + + dummy_physical_memory_cleanup(); + + /* + * The current reserved.regions is occupying a range of memory that + * allocated from dummy_physical_memory_init(). After free the memory, + * we must not use it. So restore the origin memory region to make sure + * the tests can run as normal and not affected by the double array. + */ + memblock.reserved.regions = orig_region; + memblock.reserved.cnt = INIT_MEMBLOCK_RESERVED_REGIONS; + } + + test_pass_pop(); + + return 0; +} + static int memblock_reserve_checks(void) { prefix_reset(); @@ -997,6 +1103,7 @@ static int memblock_reserve_checks(void) memblock_reserve_between_check(); memblock_reserve_near_max_check(); memblock_reserve_many_check(); + memblock_reserve_all_locations_check(); prefix_pop(); -- 2.34.1