From patchwork Sun Apr 14 00:45:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Yang X-Patchwork-Id: 13628862 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 6F85EC4345F for ; Sun, 14 Apr 2024 00:46:10 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5539D6B0087; Sat, 13 Apr 2024 20:46:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4DD0A6B0088; Sat, 13 Apr 2024 20:46:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 330CB6B0089; Sat, 13 Apr 2024 20:46:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 0CE846B0087 for ; Sat, 13 Apr 2024 20:46:07 -0400 (EDT) Received: from smtpin01.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id CBCAA14018E for ; Sun, 14 Apr 2024 00:46:06 +0000 (UTC) X-FDA: 82006295532.01.9C9DDF8 Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by imf22.hostedemail.com (Postfix) with ESMTP id 48C4BC0005 for ; Sun, 14 Apr 2024 00:46:05 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bsx9sPix; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.53 as permitted sender) smtp.mailfrom=richard.weiyang@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713055565; a=rsa-sha256; cv=none; b=RuakuS0HFQO2V1190yaXLn8zJlOFUmPHgksV+dbmp+tdGujpW6vhgKwXPuHMC5vYAQjCYc Q8tSCQLfhICEiR+qIb/l/pMAd0J5dPXl/Riyda9aOsQaZvsKn/6gNv+wsAMvhxYc4qaqEH C3amOxucOOjMpJAsFNBv8NYStmEmkMI= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=bsx9sPix; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of richard.weiyang@gmail.com designates 209.85.218.53 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=1713055565; 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=pRb9y/cBVybmrEOvVi4M9YJvj2x4RiKjUdIpdofN424=; b=eYDVRHYyxGtq5eBNSLkBD5Okv+SP1UI9NYjbNg2M2xqeUpTwYUouRz5qhQ3oHmb+BQkmpy S57ghXmzvF7JuNPe3UJBmQlY/qAHB1OjvYUGooDMIVAJTOPwRJmBsSeMDEiWUg6xiS9cLd xKIbiO+Tdml8KnJzudiSNCGTBdnHMlg= Received: by mail-ej1-f53.google.com with SMTP id a640c23a62f3a-a52592a0b0fso27043866b.1 for ; Sat, 13 Apr 2024 17:46:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1713055564; x=1713660364; 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=pRb9y/cBVybmrEOvVi4M9YJvj2x4RiKjUdIpdofN424=; b=bsx9sPixZPF2VZEBlB0FEtJf21WZJGxGVZaGHAsLMZU1aqM9FO5bHoIIiRAqzS9nGe 7OlEyRlrjB3xRFunH81f+oWolPnrWfUGYIK5Dqo2stHhnOqwOjgYOZLAH65VXM+pH+Fy 7mk9F5qrFPIEHPs5rKPU4Ju/hwUhPJSJOfBY0WODuRJj8WKelGJRo+jDHCd0UJWGQ0kd AmGvBxLb/dhhZmQbBaGydc+htRAMcCBkErPM3BBCyzaqPuBxRQcnV7YbPPYMzG8YJypo ncTbmzuaF+mhvaquMBBpNX1rfUDcY+IuGUl15Eduagytd1jBoMFdyTSN4P5bL1v9oDbT uuHw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1713055564; x=1713660364; 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=pRb9y/cBVybmrEOvVi4M9YJvj2x4RiKjUdIpdofN424=; b=uHnpsr+g91MXCrSuYGH8niZ2d2LZVcdDwsnQyTguThmaMhm3IPzip7RRdXktQiW9M4 V91vzCCIg6EFUWjMzZYE7GtwuZlRO8gnju+dSL5Yl9OjTVEMZfWZLSP89tYjlQLwmdeu dGo1Yx39itp+nXZcfAsxZciu7QcHPtGVtqo8196m8MYnEHdk3gHZ1fpz0xiFgNBT3x9H kikq9IvlYh/3NB6wC09ltTfp0QaZaTkwMEOo8YC4ONSBvzawWUwnHu6BkmibFpTSXu4q swKaKAflTSVSWdSQlVvG2gGf5hAV36CFat9a0xfOvSiVvDdz6K8PMdJRXfvnveKRrKrj bGdA== X-Gm-Message-State: AOJu0YzGRUyUZwvLfs0sXMXHmtOX0Utr/bRbCcK7cuSNvlDD1DCXDNw8 cI44+Cv8BcwDzllSIQx/gLREmFvkaY8wMt0yi2W5fzWsWBl/3Mmp X-Google-Smtp-Source: AGHT+IFv0/R2LbrO0/cMbqJRXA6QvpIZCVcs/u2R1TM45rb9yx6IR647453b3o8ViyRJ/dkDdKMQoQ== X-Received: by 2002:a17:906:e06:b0:a52:53fc:b487 with SMTP id l6-20020a1709060e0600b00a5253fcb487mr893138eji.35.1713055563516; Sat, 13 Apr 2024 17:46:03 -0700 (PDT) Received: from localhost ([185.92.221.13]) by smtp.gmail.com with ESMTPSA id 27-20020a170906319b00b00a4739efd7cesm3583376ejy.60.2024.04.13.17.46.02 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Sat, 13 Apr 2024 17:46:02 -0700 (PDT) From: Wei Yang To: rppt@kernel.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, Wei Yang Subject: [PATCH 4/6] mm/memblock: remove consecutive regions at once Date: Sun, 14 Apr 2024 00:45:29 +0000 Message-Id: <20240414004531.6601-4-richard.weiyang@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20240414004531.6601-1-richard.weiyang@gmail.com> References: <20240414004531.6601-1-richard.weiyang@gmail.com> X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 48C4BC0005 X-Stat-Signature: z3bcj6nkxgsc6dsqej1hgqw3ui9gn5kz X-HE-Tag: 1713055565-197971 X-HE-Meta: U2FsdGVkX19wZORq1l/kF7pXxx801mYiYBZd3pSZmeVf/31L8swX2NZeKSoapOZ9K03GbGQmbGaZOJm11rco+7yxUQ+rq6Hf4QdmQOWEyp25M7qpuAxiTFcXvWAj4j24Zopn6E/9XpaYSe12jT2gwSm9Ah05WkIr6PpAdigBgTqmGhVHJlQookVktEgnJtaHFsLVNb2pHUfLkhP+MyXkSYduDTKTO+pZZfuIq77uZ+Wc5A8E79qMcAl3QWWHqGvp1R3Mmd1jMgbnXIV7vKMwy64s0pGc5DkGUkwJt3OTLDMz/TGhA0xL5iihnXdrQ0LvsDFLQaaYZ+zcrLBEqvYklv50XQWopRtxHm4T0c0wMZJPrO1w6OW6lpOYceCDK6Tjx6KEuIUZkly57TqlJvSWdbv362DwXVkTt5x9Wr9agGqr48BKyNP12JEH+LioGupYiscYQsWEwizeZjmLr6hvpiucCgahO+chB4KLNDAqNyjXgUekXWRL5ff8trKwtaa5/6liUOrvS2AstQc6NVJS/H1ImKII/6hw8sUc5fQgSeHjgkSCrd1fs5QAeZywtD4T6wIzN4f6YgfYZiRlTT9IbzMohxVG1locuQhj13yGTWBLYXQlYud30mf/EwkuzRSBKAce2AYBc7PzYaAX/3Zf60s1FJIdlj7eobnZtEmpwo+SE8imFAux/phd9gmfQok33za81Kutc8MpVr1qcKiXczrYRql8e2rPGI3snO0mowzH+Bq+tHcoo2+Rk6j5KMG/EjNf7FNX0dJGiICJ1u/DjnrFsq5YHb/IU+Ei+2Td/c9Jr9wHsNpFoySb1R6NwY5uUHdlRysNP403qukn2+YM8kpcT2t2SWEaB9SBIbdwwI4fQIbrbsZ5AQJ505578KYxe8RlOUw3/G0mosypXBqKy8E+Xs5g9K4/N5xm+zUE1Zik9yx9eZITnPLa0XbRptkTd18ZcabeP/5ehiuT+R6 rsNUsozn Me+f4o6ICxZooWCJ+62jO447gFJfA9+1OH8KTuvlVmWdkf6tLLdh8BnzYyf6dlz3CnkU8QYNT0m6jP6XujYxOc7WC7zZgBH4VGBvvEyH7DgSI1JReP6o5u3R0M/6rz/JBb51sVId2PO2F9a/y7X4yjNcKC2mt32U3IqH7jcaEshceMmw= X-Bogosity: Ham, tests=bogofilter, spamicity=0.004804, 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 2d7a2431803f..3fecee4bd41a 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 @@ -816,14 +824,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; }