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 C0434CD1294 for ; Wed, 3 Apr 2024 09:11:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 409356B008C; Wed, 3 Apr 2024 05:11:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3B9A06B0092; Wed, 3 Apr 2024 05:11:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 280E06B0093; Wed, 3 Apr 2024 05:11:44 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 0A5716B008C for ; Wed, 3 Apr 2024 05:11:44 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id 82C6780CFB for ; Wed, 3 Apr 2024 09:11:43 +0000 (UTC) X-FDA: 81967652886.05.D25110F Received: from mail-ed1-f50.google.com (mail-ed1-f50.google.com [209.85.208.50]) by imf24.hostedemail.com (Postfix) with ESMTP id 5FC80180013 for ; Wed, 3 Apr 2024 09:11:40 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UdqVpiRL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1712135500; a=rsa-sha256; cv=none; b=bw8R36Nh5DtYNPk891s9xtvTpWB7Y99ayuUCWsE8ANXdTF7e7YLkyAh/wNeK4OFHO14aq0 PmtCvrUFRLGcdrbA3/lnM7uUh2e/92P2gPC4pgLnB5kemc4CYHKlV24jy9hXNFek3vLc/c BdW5iYPCIiIzJ6/f7ci/AsJatbvr/x0= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=UdqVpiRL; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf24.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.208.50 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1712135500; 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=S03TsKe0uR4Vg97Acrn6JmGuegwPC2Btek09C9he81w=; b=S4Ztx+u4wdwsYlFIygMDpCNLG1SYjHxqr5qERG6JaqaHkDvGjtwjueKeenhJc8SV7BZoHv yjhcXq4YzB0uBv3tDAgWZgvYpz1A0T8ELouWvr7m3w2eqHCZ8KD2xT+HAIl+gkGBE9/0vA zDaSHZSEuRstuRL9BctGaFIrPfBublY= Received: by mail-ed1-f50.google.com with SMTP id 4fb4d7f45d1cf-56bdf81706aso7713854a12.2 for ; Wed, 03 Apr 2024 02:11:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712135499; x=1712740299; darn=kvack.org; h=message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=S03TsKe0uR4Vg97Acrn6JmGuegwPC2Btek09C9he81w=; b=UdqVpiRL6zeH9HVH6NRSq9KJYPb4pYlcVwcfmGSq6NeZJOqdKbhmcRk9eSY82B5wBd HabyQcoogwo5EmzBqyAGkW/LhQBDiEXmzKNsJ0GgnFht3qnYoEteqzvFwe0PEPo1i3Rx Ndc8JDsv5VodLMLs1fT+TaByBwYm4vMn8D42x3N0Eh1u2ytUavotYWZGeMz3j92ceX2I 2p/4kWtH/9OqQzmwVgBUBYRA5qKN6QmPiIFJdXh+B3mqkT1WAQebrf7FcDSWfRUgBcIv p4ZO0FT9dMJk3dJoh5pq0Fjtc4D1TrApWvXRQ2AtCvYVAm5odyWBfnWpiZU6YDVtBlbV fl3A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712135499; x=1712740299; h=message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=S03TsKe0uR4Vg97Acrn6JmGuegwPC2Btek09C9he81w=; b=As3Kbb2et8PcyTb17gT8uVJFXkUSPl4nO7BTHj2SGn/2Wo7gGJD8mZrXtNs6bOahF6 XwzB6JoiVumQuRJnttRwxg0wZs645g+/pdd6Y2+XjnzrdBN/miSLBeppKCoY7t7lJwz0 4sMvDlMG+npFbjT/cRX9/GMUJNt6nMPMRWxQ+VU3NwnqcCDFISPSqPbb9iziqR3Tyd3q zWf9YJfz17pPxIql9pI9LECQNFFxj2WiKgIFYYpeWT9FeVCqGN/S+7r5esQhrZnJ+hgD HST8w777lkdvK7hGv2pKsl1ziEUaPjmiVm6+U42gqrwlZ+r61xhMvfvqD82knjd8T2je Psqw== X-Gm-Message-State: AOJu0Yy2qQGK7PYHQqxJlHmn/aJMaSI/es7ZHwFxUQhJH1ykwMW0TiIT QZgcv47W4eZsSZUffBiaFHgDVh6Ek4E4tFgnAY+3OZ2m4451gyz4 X-Google-Smtp-Source: AGHT+IFqy28UrdUtn7bUTVZQvD0ruuBR2wZIdvsC5Qn7zaE7M87gAZKytmerG7eTBuMNUqzo8lXajw== X-Received: by 2002:a50:8758:0:b0:568:93f:36c6 with SMTP id 24-20020a508758000000b00568093f36c6mr1565881edv.22.1712135498453; Wed, 03 Apr 2024 02:11:38 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id bx25-20020a0564020b5900b0056db8d09436sm5929483edb.94.2024.04.03.02.11.37 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 03 Apr 2024 02:11:37 -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] mm/memblock: remove empty dummy entry Date: Wed, 3 Apr 2024 09:10:45 +0000 Message-Id: <20240403091045.12009-1-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5FC80180013 X-Stat-Signature: 6xbsiw19xu9hkmkyhtj13smq71gjc534 X-HE-Tag: 1712135500-619188 X-HE-Meta: U2FsdGVkX19kOhv5EinQQLvEDC9yDH6EIeDEmfJfigH1Su+bCUOLiCJ0z4NhJk41ukSgc/b0u5gHWI7VirKMYS7G8zI89+H8IoROpsQS3IPY15BYb1NiaKNeYTcef+CO/HKVJDL+6OsBSGPJr0w8PTx3lnzs4JR15+Ay1DwTczXRdPPWlx1Oxx1UgoOcBgFqqrr+WYzPubZlRx23sCeRq/dADD1pejdxr2QGAq8qHT14ccWIX/jSfJRb6HhD5OvMXpNhyiS+VbaH/zq1GKaqIHPoWklLzOfGui9GyYs/xBSBp8bo+7y1YPJnfS4T8SIz4u+VBl7DF8gl48w9yWq0zyCoPNneMwW5clejHK67RGqS+QXH3MpjyDLaYm5FL38jpvCVZzsGOAQBkcNyQmkBfKphf14q8NT1Egs5HxORK5w9WwKg7wLlZk7C1gWAJAIfB11aDYg8ZSQ57ThGHbqnhPkfMFCaYr2aGRiwg21+eB//IgsAwlibvp6AyHIAsMLJSm4CWMuRJBi8QBwHrd/53Bmz7i+ZXV/wqw9KKsG54rRgSE59tFnUUNuSf73tC0gYOH2MknYKyza9FFX3rV5RIsyAlZ+InZykNvvzZ+6bAjz4mtiBSudyL9b1w9U8UxqXIFSE11EhfEcPN90C6fKGXTNNv/S7eWNccg6NmqMhmlnnWYCzinSFwE/vMdTMc9k8jUpZD0gPRoU9Yy+FihHel5KJvDrPPTE1vbIW600txYigwe8pqb20NSD+c5503WVZ9NVJ6zf5Smz4aClIG4BPsgxndABj2TB0H3qzVgKB1Zkn4oq+iLQJpParXRBXmboWj6R18U3yT2JTNxSeOnqOPd8M2CgT6zp8aGHh9JUQpJ+s1qOn1RHOIerZWom+5mfyNwLNZqIJpeTeeLChlWL6hk+PwxHmVl+0R2JuqIqYq8hyC7mWVZXoFZhFaSu4OSup1+hUpKr/g/0b0AqsJlt YctdmBWz dQI7TeU/OwXNVJTBQbs4fJ0sVIiLVWgK1ZdAMLcu22AWU+QJcGpP0Am4HBzcrtOEF/UHobpYkmkXwQsS5AmRAy4jHb564JciHXUeRcK0oHQC56qCujxRiUfIvS8JUziFgyrN+uExcw3h5wis+10fdMPA6Rm6yB8awhfw+4peZjdnF3aYaoGlKGYyIsczc0KE2ppZFokZfTrioMj5ykcro7HrL865XPYdGT0CcpGUUhJHF1E3ttSKNxY9Z3Op7JsvDzwUU67yWjT6G5x/MvBU/OXd/7neNf2UTb+pdXIkwIJCfpAesGDBtAkp8/hBDWfckZJibEwOhV1rgGQiD5kgpr/9Q8mNPe4JFbWOMKL3WopyaCVozEuShShf8Dc/iH5fwGVPypM5LSaG92/9UT/HL5pGyqngD0K3ky5pI5QHSyBcgFiB1T1BNInQ/f+oQGHN0H+tjRTcx043Nm6s/W9mghCFatPUVGgvhDfOg8p3xsTYR0xpXWQpu8LH6ytLoclakFREyy0zn7l8jCIcS+27USt8L3cSftfOAsWmSybGKAgDccwgU+DeA2/yAHzHpDBAu8kDnbqPZg4npBr9ZUxnX1x2MbufrFZZ2KkPeqy0Bq76g9J//ORruY99eyw== 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 --- mm/memblock.c | 18 +++--------------- tools/testing/memblock/tests/basic_api.c | 8 ++++---- tools/testing/memblock/tests/common.c | 4 ++-- 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index d09136e040d3..100d3b7ab499 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -114,12 +114,12 @@ 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.cnt = 0, .memory.max = INIT_MEMBLOCK_MEMORY_REGIONS, .memory.name = "memory", .reserved.regions = memblock_reserved_init_regions, - .reserved.cnt = 1, /* empty dummy entry */ + .reserved.cnt = 0, .reserved.max = INIT_MEMBLOCK_RESERVED_REGIONS, .reserved.name = "reserved", @@ -130,7 +130,7 @@ 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 */ + .cnt = 0, .max = INIT_PHYSMEM_REGIONS, .name = "physmem", }; @@ -356,7 +356,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; @@ -598,17 +597,6 @@ static int __init_memblock memblock_add_range(struct memblock_type *type, if (!size) return 0; - /* special case for empty array */ - if (type->regions[0].size == 0) { - WARN_ON(type->cnt != 1 || 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; - return 0; - } - /* * The worst case is when new range overlaps all existing regions, * then we'll need type->cnt + 1 empty regions in @type. So if 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..4fa94b281280 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