From patchwork Thu Apr 25 07:19:25 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 13642908 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 E8C1DC10F15 for ; Thu, 25 Apr 2024 07:20:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6FBEF6B0099; Thu, 25 Apr 2024 03:20:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 67BB46B009A; Thu, 25 Apr 2024 03:20:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4CD996B009B; Thu, 25 Apr 2024 03:20:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 26A0B6B0099 for ; Thu, 25 Apr 2024 03:20:06 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 9AC60C048C for ; Thu, 25 Apr 2024 07:20:05 +0000 (UTC) X-FDA: 82047205170.13.B2AB846 Received: from mail-ed1-f46.google.com (mail-ed1-f46.google.com [209.85.208.46]) by imf19.hostedemail.com (Postfix) with ESMTP id E02A31A0013 for ; Thu, 25 Apr 2024 07:20:03 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dnXGaJJQ; spf=pass (imf19.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=1714029604; 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=5zCWK1z5+i/ljXs+t2uWpURyf0fwpDKHRDDfVzsjhwA=; b=MpIr7VwLfDVWSsEgWBdz9mixEsX30Oc4z6ajDuodMQzCaAPdzHGxaDsJs+NFHJD9S+PHF7 1EP4mzVpYzgNdVHtD7R6Egj1nYHrENqM5xHxalJ0/qmIVuSTDQxFsMEkc7z1zfMFAY16rJ QPIktqmrNXAfVuREVNpdP6cIFuXSZ4s= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=dnXGaJJQ; spf=pass (imf19.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=1714029604; a=rsa-sha256; cv=none; b=IO6+o6kit/bLG/kaZs+UqbzFbIhDAwpVfFdhRdp3RrNcqquyqtFUbKBC3azedqtoqVImBW jFIy4hF3A494K+0m3qIgUT2PuWJPUU9qm7i0r6FEZ2tto1O2BIioh+wFmozFbo5j6keHb1 qIHHcxOwOyud3O6vj8zMRqwkcgq1/Gg= Received: by mail-ed1-f46.google.com with SMTP id 4fb4d7f45d1cf-57232e47a81so1258605a12.0 for ; Thu, 25 Apr 2024 00:20:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1714029602; x=1714634402; 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=5zCWK1z5+i/ljXs+t2uWpURyf0fwpDKHRDDfVzsjhwA=; b=dnXGaJJQKYnufREwl7eZjqqzffDT2qVjodXBJ3SfVg0cxCSyigjL29/Rer+r3I06Cn wzRywIrl4rPEG3qMgY+Mkhy6MTfk86Q8edD5imYE9bHPFEVd4lvTSBg/CunBPrliQcwz 8GYcL1TxIxJrcdCeSMwZbpIgkAaCXEJYPR18EveLeC51G7Tieo2VvGA4fxbLULm590Cn DfjZGcSYBlQVgLDFRNG0nLaSN8Pd82ZMdCftGwPAoQA5oxsTOQK4KKxbqtay1RBcp2zp gcMPk3DOoDjzpXYT3cNXAdu9a2VQv0DdFtxLOhJTWkSALV7O5Ypl4C6z+yhMbhM7NH2R aiRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1714029602; x=1714634402; 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=5zCWK1z5+i/ljXs+t2uWpURyf0fwpDKHRDDfVzsjhwA=; b=UJ8mPMwNhcw50zZzJ6/4l+DIyPnZyh8VEoOC21h6k9mQvJzfT4/Z/y8++pMZBsTLVt B4mj+/Z2npAxMiH+/UsHVyxtbrtUrUFZzjCV3y/G7hSLyj8rs1TEuouul79+0q6W/q28 usYg0y+0vdtfJoTr7Ov97WcGEMRI5nKvXrlf2oB6xDAJ6s7ZGfSMcD7MdGiag4hHVfGk 14VmTGWSFBEk/CBS95iEPrS1eqkwXfNWYOqPiSxuujRDirfUX+Ta1s4pGtByHb3h5wJD qjhG3k9oQQo19hTmpg3FYwdR3lZVNE/DgGq0r2zbRlQgjS44oBdiG7pdmJxyl1jl791e hNdg== X-Gm-Message-State: AOJu0YyD26CbF+Y+tz7+yFxBG9ku/v1afXLE7EGMTJdsGfvMAVItOJMX Rx3jkVSdeYhCBI7sbD8rYDd0HKst8cYoNOmI0M3qVfrrpQk28EX8pmF7mrHA X-Google-Smtp-Source: AGHT+IG5m5VYgdZb2E2I2KzVYbWjEj3B0o0lHI+6DONkJ6DaVwNCyM5NEEYeFN/On0MfpReTdJYYsA== X-Received: by 2002:a50:9e4d:0:b0:572:2efe:4d14 with SMTP id z71-20020a509e4d000000b005722efe4d14mr1975223ede.10.1714029602169; Thu, 25 Apr 2024 00:20:02 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id bc16-20020a056402205000b005722efd31e4sm1790505edb.29.2024.04.25.00.20.01 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 25 Apr 2024 00:20:01 -0700 (PDT) From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, Wei Yang Subject: [Patch v2 4/8] mm/memblock: remove consecutive regions at once Date: Thu, 25 Apr 2024 07:19:25 +0000 Message-Id: <20240425071929.18004-5-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20240425071929.18004-1-richard.weiyang@gmail.com> References: <20240425071929.18004-1-richard.weiyang@gmail.com> X-Stat-Signature: 96d3usodyzk34ft61wrzuxurczie6s48 X-Rspamd-Queue-Id: E02A31A0013 X-Rspamd-Server: rspam10 X-Rspam-User: X-HE-Tag: 1714029603-766987 X-HE-Meta: U2FsdGVkX1+tpvkQ2VMmQn9jcTa1YhyCbg1ZBke99o4KySjenayWnNvfb8rdNSoJ66KlVEKd8o1H0jbvJ/DDQ2ZPiJIUt5SWwQS4p8B04xtIlnJD/oYquV75NRvjvXneVP+BBP5scFFmriKDZf50ixFEuVO+YU3sdiyFl5xWEvMb1ZM2zu0OrmdyhaDpVXn1h/VGuvv3zRMpeOoW3rXVdCi4oUa2RNMMcxQtq+Pu1YojAr1xa9sTrz015915WCTsCSzH0f8A8TfQ/2uDQX7Yg6hKanjOcJYMLvx2K4XgNGfnFFIfkJH05YqHJNKsr+lEqJqfoPQyLaUkbh2nw1itPYuFHrmksxHX7g0Qcl4UvZequPWYkuMf8NlRH5NHeSDuwXERDf97WdCjKHPj8ZdnoE29pr5pMV45wiBLkQuJjOj3zFUjunMQx53l3SDFbuBkd+mPOgRA75EGoM5UBd6ADxxq0hfHZU1CqCMtmz7p0qP/jTpjZ2PcDCnWJbtR1AzeswVxQt50p/9jtXmNnWr4y+le2BmX0Y7nMxFOIKr8ieTqZ2cLej+p6U5BcMw04RqDXMLc3JfhX9w34iFw/WP5JGwzTD4Dm+q/5TX8/HSJfT6+3Fr3IEDgocsqzZrKI6wVYLofBZNgVUrY5JcBZpCfwOX7uoHLPV/K1mujBTnYdWAWpMqDKOqOfpta1B82WfPL4YRwuYG/gCVGK5XgZDV9+KSASfL43N8yG6/ZAOSQWrOuJeir/W05wbT/R1NTVoJZyWN9WHrQhVMXen0nPtMBlSTZtBcqRR47yolsYPYnGvzJX6VVlROEimfVOggGh0mnl6Uzx4TB+AHe4S5XsmYd9CWbwkho2j8t9VMj/9MXnT2skLHoGvGhFLiixI9TGvfDSvaIEw3gOVPwbpj8QxgX55g77P237AQ/IT0tg0phOpbS8aeKhIZGlnLH7wVFszBVedFbRdLv7bWWV1XWvvt vqBkOPEz 5RDMmbGLNydlseSiTjwFUzkOUZAd1mIMhIp+FZvbnpiB/ehOfmm888laM2Gl9cX1WJhaqCcX6U+HiEcRB8d62luPm2/MpUio5QdjEXAiF0sYFPH6tPXBbPQoKhsgRqZt5cRBSfggJLW1LyJIF6mft2e04xnNVDdvT4qdJR6RTBuLf4FcdcXM7Up/+nfTePWZ3HIzUFx7shH8l2dykKoGRYHTo1r7VkTOV+aEOkE37x2MT7BmNM1qH6CMob4SF4A+ZouQC6Oj8pS7J4usoFpFZxGO/YNTkUp5vbO7Kwe5mTJSuaJcr8B0weid93OOItavfQJmzJPnko3F/BOXedz84Qd3EpKx75PFeeTgVvt+lyGMmhBkfUMx7O8XH4gw+L5iRQc8d2zzy8TOlC4JPNw3V2Rx+zN/CbLhKRET5pEdaRWojG70VdFuhyJpyImcmO4Ije73+bS9X6gcwf6l3EV6SGYDeSD1N6yECPzV08F6TBJz8zpN1hgkrN7KCF+d7zGmspXcS X-Bogosity: Ham, tests=bogofilter, spamicity=0.000001, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: In memblock_remove_range, we would remove consecutive regions after isolation. Instead of removing each region from end to start one by one, we could remove those consecutive regions at once. Signed-off-by: Wei Yang --- mm/memblock.c | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/mm/memblock.c b/mm/memblock.c index 5a363ef283d0..53e3aa2cd9a2 100644 --- a/mm/memblock.c +++ b/mm/memblock.c @@ -343,12 +343,15 @@ static phys_addr_t __init_memblock memblock_find_in_range(phys_addr_t start, return ret; } -static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r) +static void __init_memblock memblock_remove_regions(struct memblock_type *type, + unsigned long r, + unsigned int num) { - type->total_size -= type->regions[r].size; - memmove(&type->regions[r], &type->regions[r + 1], - (type->cnt - (r + 1)) * sizeof(type->regions[r])); - type->cnt--; + for (int i = 0; i < num; i++) + type->total_size -= type->regions[r + i].size; + memmove(&type->regions[r], &type->regions[r + num], + (type->cnt - (r + num)) * sizeof(type->regions[r])); + type->cnt -= num; /* Special case for empty arrays */ if (type->cnt == 0) { @@ -360,6 +363,11 @@ static void __init_memblock memblock_remove_region(struct memblock_type *type, u } } +static void __init_memblock memblock_remove_region(struct memblock_type *type, unsigned long r) +{ + memblock_remove_regions(type, r, 1); +} + #ifndef CONFIG_ARCH_KEEP_MEMBLOCK /** * memblock_discard - discard memory and reserved arrays if they were allocated @@ -846,14 +854,14 @@ static int __init_memblock memblock_remove_range(struct memblock_type *type, phys_addr_t base, phys_addr_t size) { int start_rgn, end_rgn; - int i, ret; + int ret; ret = memblock_isolate_range(type, base, size, &start_rgn, &end_rgn); if (ret) return ret; - for (i = end_rgn - 1; i >= start_rgn; i--) - memblock_remove_region(type, i); + if (end_rgn - start_rgn) + memblock_remove_regions(type, start_rgn, end_rgn - start_rgn); return 0; }