From mboxrd@z Thu Jan 1 00:00:00 1970 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 DDBC8CD1284 for ; Fri, 5 Apr 2024 01:58:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6EC426B00C0; Thu, 4 Apr 2024 21:58:28 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6749A6B00C1; Thu, 4 Apr 2024 21:58:28 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C71B6B00C2; Thu, 4 Apr 2024 21:58:28 -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 2D1D06B00C0 for ; Thu, 4 Apr 2024 21:58:28 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id BF7F81C0D56 for ; Fri, 5 Apr 2024 01:58:27 +0000 (UTC) X-FDA: 81973818654.08.80B113E Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by imf25.hostedemail.com (Postfix) with ESMTP id 1F187A0004 for ; Fri, 5 Apr 2024 01:58:25 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=B3deMQXS; spf=pass (imf25.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.208.46 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=1712282306; a=rsa-sha256; cv=none; b=mIuNOb7aj5WlndEbYnvOIkDHxSBhwuDJn3BMqNhSznCXuytn6RIzD3NmspX5/ViMAGx8fO rQxJppD9diojSJ6FfZP6fBBg9wxYtPAKEe/9biaFQS2mxUs3crYCMQsg5yWFnPZFccL+nt iiDIVK0dM2PQyJ7XIDh/DyiRmRSq8qQ= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=B3deMQXS; spf=pass (imf25.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.208.46 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=1712282306; 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:references:dkim-signature; bh=coy9fyC0oUBsDuO46bbBbLw+3TP8xyBClArMKco5Hyk=; b=FkfVVJ/5kXDf4Y7o6Temv7JZJPlGVjnfGFU/SvjxTMGxTDulOOXDkGJUfAKNSMYa6cw7WV HUnH7CVRVNt4hIYpMBrDLTWHvrPNosb7Yw8hFYZgLiNjsMLfMF7bkq3RERuMGWEIpi9m6e QH0YiJVHM11/5ppFVKTGTs1BXYEPU2Y= Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-56bf6591865so2447129a12.0 for ; Thu, 04 Apr 2024 18:58:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712282304; x=1712887104; darn=kvack.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=coy9fyC0oUBsDuO46bbBbLw+3TP8xyBClArMKco5Hyk=; b=B3deMQXSFNgBteXKdU6k6krqdYCjBOy6bEwKeNZeL40dNDbTMJ/uQrSTPoAzkXQMaD w3mbVL8LmOAQTftzpGZbjD6DZlBEAreQl3sktIya99nfVmWhBR8y+kEcpQA/sUqOAThl 7ISVHm+zBv3UvCXyqBfNPV9JMvO2IZWFCqBMKXYy7RhuN0MLuEscH0L47r5PERbeImbW kWVP+KErunJ2mx5ixugJPcnZzY8UKr8+Ys5MzVOLnTr1v5sHfvCVtJxnf0KRoiLRAk/a lABLn1UsKB5Bre/RvwxXsuhQjQTW7/NPYQpiIBysA10jLNWp8pdvHrYq8icTOudAajML 2DZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712282304; x=1712887104; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=coy9fyC0oUBsDuO46bbBbLw+3TP8xyBClArMKco5Hyk=; b=SHQ4DGcj1MnJ907NscG2rdn/7u/tJfrvNb+E8mBHBcfmC1fr5vcM7MKt4XAtTErLG+ WlC50S87ZELSZeC27wPiaT5Gc6SoFlH0MaUsQ8IyCe4OmgJguYHPLGs6QA2c6jlAPBlJ 9YiXpxLpXdSWH82pdK5SIsTgFUrHTfbqMcF7b8zbntFuZRbkamMez20RtVllVOn+kyOY 6rJ31f9xMGNmbb+yA9IaESskfC878f8wx8bYB7nQa/4pjq5sAU41G4ybm+MAnx+HTKo3 uRraRnB3E3fP8lsUbGCnrM/Sq2eywE7WGHXlpv+q9k+99iTVP2kNymnPGnjDBu0dB8H1 v9JQ== X-Gm-Message-State: AOJu0YwawKqjG8UPBkI1YEILXpoTYrF/sZv4OdFMJKFFONl42nw8SrYL 7f59806bD7Uj8cn3L38RWww5woKR3IG75Hvgh2qjoqFmMi9uWTUx X-Google-Smtp-Source: AGHT+IF0U9T0KbAKq1J2BQfd/RGchbxY66GQJ8jIE1m28MoAu/YUlru5VTmbbtkxCtTZGGJVzbyu2A== X-Received: by 2002:a50:d599:0:b0:56c:5990:813e with SMTP id v25-20020a50d599000000b0056c5990813emr36647edi.13.1712282304597; Thu, 04 Apr 2024 18:58:24 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id n17-20020aa7c451000000b0056c509a11acsm253873edr.33.2024.04.04.18.58.23 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Apr 2024 18:58:23 -0700 (PDT) From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, Wei Yang , Paul Mackerras , Tejun Heo Subject: [Patch v3] mm/memblock: remove empty dummy entry Date: Fri, 5 Apr 2024 01:58:21 +0000 Message-Id: <20240405015821.13411-1-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 1F187A0004 X-Stat-Signature: im8jugsc8wjdq17nkoqh14xdfgqj53uu X-Rspam-User: X-HE-Tag: 1712282305-100318 X-HE-Meta: U2FsdGVkX1/RLgfqGjTAV6fq543XSZvhbuuiKaeBo9mzGf0TWGQT85L0X8ARMkm/C1mAkAr9MGdnqhDSoMNx+GTystESSRceI6ALdHVzMOYS3dvg1IoAZZsTieXpW2IMl4slJRFlyQ7SWQt6cpvlyhLoDg5qTZb86qvqb6f4dBbYGQGHwtzYMtAdkO7INxj3ju1BNWkS7vvZFCGmjaH5fRqq45aeSB0/ftpwWERl9cTtpySDb7OX32JdWam874CQXkwH0B8bb2qKTQkvSvm4n79+bpGZ4bLzEGoa2635CR160m2fGDM7WgRK/4YTc2i7x6bd0o4tbGiG2C6qM6yBQbXp1LZYGGBq74b2rWWeBd2VYGhZSaQEJu305q0JvQQYJtww/3uylaUkvN/YLo+YFGZVcTExbXcE3yFt6+DRYE8E/41pz5uTZ7wUD8O0YYcNdmqDqxb9O4StbiAuvOQIeFgNlgHDO7uRs5HizYVjwddmSZt09F8+P1yBpnJAusuqcs4fqrB8yDuSaceJG7+gwa4/xD09xxVXvpFOpsiwfcPXcAUnJg5kbjLtHLBi/ePaiIsFxCf1oVV4PvaU3rokn8oGQZOHPVRj8h3RtoiceK10RlpHWD3BY11BepKiPQvbrV7B3a/EdEbWgiRESIgeasl0i4NWVge4k2k3/LMc6jyF6nfDQq84vBNMxymG3ZpFagohsp6ywbcKrf3mt83GK9MNreeKQ8clcmPFbVfWUAAUrVWI+z9RKDBUV4uRn2vbO8uXmhG7ucc+2GY7xeuh3RBVwKsTP6wynO1vyfb4QI4+iHBWB3ohOw20OmWbuECeuppyENSp592OVsCLrjTqxo7cCpdL5MElgeQcuiTSGMBRjlnQXiYwZZSu+11J/PoYRou9A4goqZoO5OdsFQaNRu4qXal7R7o6A0Ub9xnHjOGBBPOb8I/9fgUCCvi4SM4DQ/vH+ubDnWh4DxS2Czj +3ajWCaU HtscWqO2rjurEDQsZi8croMBJwOFsp4v4c0kksGpsgwMAFZXYzqtK4NQSSxzxq1giienrDfKOMWnZpxzvzDg9lpKrao7hRFyoBQIs/0hzJoG9ubqL8ZoVvPoV41pXvNqsNs8RKVm0t5bnHUgD0B/Vb25x6hvb3G+IjDN1vVPjgLvMW+hrEokp2yaDWolOkubPV7ruyyF8FpJxjDQA7dEWiJhDxSnCdGBdDC49ASmg0iqxi0vKqaI38Ll8N+jLDcJoJ0EoAEgwT5S5sk3U4GirI3ND1RkKZg0076P8fUKNlbCJZn6/WLUVftqeh61v0KKlad9riEgd0ZHKFcCzfcAjS4w4ItOyf8Vha3xYpect8OWUTZsk2VXakh6BZ3CVXNlVX8spEv6FDjAsyuy5uosIEY8C+9jZUjOWVtjwjkd1PorX4sHOGsqhhqfH8HEAjNDJLrUq9fK+BFLQ7qA5xDX2WUCw9bBLnLeN9Cr+if4CeSCy4hFb21juVt4Y7Nw74WmPPG8OgmJUl3XPRe4DlobyfoZ+vDmyX3NsJx74x6Tfj3UDUfkLob6+Adi0hVAam1ImRoHJExy+KSBEb//j4ji7c7lrOBss8zPj7iJTF3DFcErrnOC/5p8BC9qjFA== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The dummy entry is introduced in the initial implementation of lmb in commit 7c8c6b9776fb ("powerpc: Merge lmb.c and make MM initialization use it."). As the comment says the empty dummy entry is to simplify the code. /* Create a dummy zero size LMB which will get coalesced away later. * This simplifies the lmb_add() code below... */ While current code is reimplemented by Tejun in commit 784656f9c680 ("memblock: Reimplement memblock_add_region()"). This empty dummy entry seems not benefit the code any more. Let's remove it. Signed-off-by: Wei Yang CC: Paul Mackerras CC: Tejun Heo CC: Mike Rapoport --- v2: remove cnt initialization to 0 and keep special case for empty array v3: reset cnt to 0 in memblock test --- mm/memblock.c | 7 ++----- tools/testing/memblock/tests/basic_api.c | 8 ++++---- tools/testing/memblock/tests/common.c | 4 ++-- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index d09136e040d3..98d25689cf10 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -114,12 +114,10 @@ static struct memblock_region memblock_physmem_init_regions[INIT_PHYSMEM_REGIONS struct memblock memblock __initdata_memblock = { .memory.regions = memblock_memory_init_regions, - .memory.cnt = 1, /* empty dummy entry */ .memory.max = INIT_MEMBLOCK_MEMORY_REGIONS, .memory.name = "memory", .reserved.regions = memblock_reserved_init_regions, - .reserved.cnt = 1, /* empty dummy entry */ .reserved.max = INIT_MEMBLOCK_RESERVED_REGIONS, .reserved.name = "reserved", @@ -130,7 +128,6 @@ struct memblock memblock __initdata_memblock = { #ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP struct memblock_type physmem = { .regions = memblock_physmem_init_regions, - .cnt = 1, /* empty dummy entry */ .max = INIT_PHYSMEM_REGIONS, .name = "physmem", }; @@ -356,7 +353,6 @@ static void __init_memblock memblock_remove_region(struct memblock_type *type, u /* Special case for empty arrays */ if (type->cnt == 0) { WARN_ON(type->total_size != 0); - type->cnt = 1; type->regions[0].base = 0; type->regions[0].size = 0; type->regions[0].flags = 0; @@ -600,12 +596,13 @@ static int __init_memblock memblock_add_range(struct memblock_type *type, /* special case for empty array */ if (type->regions[0].size == 0) { - WARN_ON(type->cnt != 1 || type->total_size); + WARN_ON(type->cnt != 0 || type->total_size); type->regions[0].base = base; type->regions[0].size = size; type->regions[0].flags = flags; memblock_set_region_node(&type->regions[0], nid); type->total_size = size; + type->cnt = 1; return 0; } diff --git a/tools/testing/memblock/tests/basic_api.c b/tools/testing/memblock/tests/basic_api.c index 57bf2688edfd..f317fe691fc4 100644 --- a/tools/testing/memblock/tests/basic_api.c +++ b/tools/testing/memblock/tests/basic_api.c @@ -15,12 +15,12 @@ static int memblock_initialization_check(void) PREFIX_PUSH(); ASSERT_NE(memblock.memory.regions, NULL); - ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.cnt, 0); ASSERT_EQ(memblock.memory.max, EXPECTED_MEMBLOCK_REGIONS); ASSERT_EQ(strcmp(memblock.memory.name, "memory"), 0); ASSERT_NE(memblock.reserved.regions, NULL); - ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.cnt, 0); ASSERT_EQ(memblock.memory.max, EXPECTED_MEMBLOCK_REGIONS); ASSERT_EQ(strcmp(memblock.reserved.name, "reserved"), 0); @@ -1295,7 +1295,7 @@ static int memblock_remove_only_region_check(void) ASSERT_EQ(rgn->base, 0); ASSERT_EQ(rgn->size, 0); - ASSERT_EQ(memblock.memory.cnt, 1); + ASSERT_EQ(memblock.memory.cnt, 0); ASSERT_EQ(memblock.memory.total_size, 0); test_pass_pop(); @@ -1723,7 +1723,7 @@ static int memblock_free_only_region_check(void) ASSERT_EQ(rgn->base, 0); ASSERT_EQ(rgn->size, 0); - ASSERT_EQ(memblock.reserved.cnt, 1); + ASSERT_EQ(memblock.reserved.cnt, 0); ASSERT_EQ(memblock.reserved.total_size, 0); test_pass_pop(); diff --git a/tools/testing/memblock/tests/common.c b/tools/testing/memblock/tests/common.c index f43b6f414983..c2c569f12178 100644 --- a/tools/testing/memblock/tests/common.c +++ b/tools/testing/memblock/tests/common.c @@ -40,13 +40,13 @@ void reset_memblock_regions(void) { memset(memblock.memory.regions, 0, memblock.memory.cnt * sizeof(struct memblock_region)); - memblock.memory.cnt = 1; + memblock.memory.cnt = 0; memblock.memory.max = INIT_MEMBLOCK_REGIONS; memblock.memory.total_size = 0; memset(memblock.reserved.regions, 0, memblock.reserved.cnt * sizeof(struct memblock_region)); - memblock.reserved.cnt = 1; + memblock.reserved.cnt = 0; memblock.reserved.max = INIT_MEMBLOCK_RESERVED_REGIONS; memblock.reserved.total_size = 0; } -- 2.34.1