From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E17ED44E660 for ; Tue, 4 Aug 2026 14:48:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785854916; cv=none; b=jS6BU+YkotgzPJOSXBc3fAytE/D5VRX3bPVGUAfH+hcBPsB9DqkUZ8oxdREevfD8SevQ5y89m1tkTBVQNyYNo2sErrWKlo1I5oJVQmFWanv9evFaCygHPXLLu6VsfVZvFL/eg89t8aZnvFLka7y5EN/8hYuOQHvot7IapwyoTlk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785854916; c=relaxed/simple; bh=Qk5tLGtVUMrxUyAx8qZcilBQuP5Ca38dCq3KJpt+5Dg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=akPw5oSPcKpasuRTQGuLGtmFgUuRwy5EoKQOWvoBhtYeqYQTA5ykluvAWaGNITOHYWUcBLkyR6pTkVWVadzIdOBEa8W1/VXpNoG9K9k6x5w0ra+pSoWwuT0BuRUET7CSE+Mio7Gkj6/ZsGgV03sz+BrMLVdspCTPgs9GrM7/hsI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=OtnacOvz; arc=none smtp.client-ip=209.85.215.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="OtnacOvz" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-c9b373d5af0so3637115a12.2 for ; Tue, 04 Aug 2026 07:48:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785854909; x=1786459709; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=Sj33KclCgI00dDNyPZb2XVJG6r1tXN3Oit5qoG8xUoc=; b=OtnacOvzxVbjW3DOb+mm6LV+OZJUemcM13tdGq39pGSVQ+g8EqZ9vblLpLE20pnQtX uc1PkygiumWosB+aFtvijBRKj0Wo2ccsIbjsqSbHFEPKO1ptPPxjxqYJ5CRctmo8+pwB LpsMYmh2y4XcvqC5kbLrwUe0O9x0qQrhvrmV/VbumNXUcVyoqgQ+Bnu83Nx248gAbEpq f28EqHz3GN4Jh9fuP5Hu2Kc3lCJRTpmUBF/+iSpZmo3tQvS/eYu4orEC9M2GUHtG3oFd McgNNKY+Ta287qggFjLguF+WA45UU4yk2ExuRywuLxe5Em/iiL2cRbL2UsfTnYxDeLBv APaQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785854909; x=1786459709; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=Sj33KclCgI00dDNyPZb2XVJG6r1tXN3Oit5qoG8xUoc=; b=mkLJbIeyJmVmx7oAkobAOwyNPHPikSmxvGsdEZ3FA98w76hxA0WpHeV7LkisPosgTH qQweZT+6Ht1hiwSxuInDgtEuTUlvQ8TUDVSI499wOb2tfYPkKuHtoYSCsxgJCFhDdOGc ZNaNVEori3CVcOoOYHGiyxfYAL3zsulli24hWnV/cJfmJ5qyDiWWEYnwaAuSKx/WhTHF FA3s3Grs48c1ud5KH7fOSzUY3jVl/pR+TahqqVijCvVfnOwCF8rbNUacPGh039WD6YkO E1U1HrGVIA8l3vl+kN4i/Ok2p27s6MxfcqD9pdIQEzcMDB37ftJ9C3FWJB8opPEqbcop +NPA== X-Gm-Message-State: AOJu0YynYD4ZpkvDWgM9Hiuk0NPFdvhwwSNeGRl9NrwLAXwt8EDoFh4F a+v2sp4LhkO8uHthY1PdLErVVzdOf1IS3SVABhGzHm2ocdQ6veOTeSd6 X-Gm-Gg: AR+sD10bKWtts3r7P3mEkCfwNBIpn3Akex0HG2fyDp39PK2DbQ5oUyZX3DbeZTey21W Pqdj0iRG/XGuimkZIQRdvbD8liH7kaTWBDFGopkdXKA6DgYxYRkOGF9veXw0oVkHDzvBax/9s5z w+Gqclfq2tFp3NJzipT9hS/KwTy5g8D5/r5i9iO6A+frCvAND7XVbnK78liMTioTs/8JSBZSwXX BIKeAy7gEaxML53tqaPKyQEzrY3DbJyLhzTfm+1hWtXUSTnYBU23G3hOVHA4k5r3ceCINmNSTow d/SR1TP2R0GjC4src5LfxEmQp/+HlLZ8OvpqWZrjEhTL5TSW7jZCq9hrWHhnSmXXXMsW6DPkFry SnfPdOxw4mdSNZLll9REvaGxZnguZmTosw7XrrigumdYz1KShEaaP7dhLtOfq7ixrqudX2XDP/E lTKCw6oHFa+JTovmyMaQaYY0Wx1okH8OYwWMUEJkDA5/6F49AUyfrTCPs= X-Received: by 2002:a17:902:e950:b0:2c6:90ec:f601 with SMTP id d9443c01a7336-2d05219d40emr150964835ad.8.1785854909443; Tue, 04 Aug 2026 07:48:29 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2d0aa4930e1sm8784175ad.41.2026.08.04.07.48.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 04 Aug 2026 07:48:28 -0700 (PDT) From: Sang-Heon Jeon To: Mike Rapoport , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 4/4] mm/mm_init: clean up zone_spanned_pages_in_node() Date: Tue, 4 Aug 2026 23:48:01 +0900 Message-ID: <20260804144803.3290255-5-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260804144803.3290255-1-ekffu200098@gmail.com> References: <20260804144803.3290255-1-ekffu200098@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Extract zone_movable_pfn[nid], which is used six times, into a local variable, and return early to reduce the indentation level. No functional change. Signed-off-by: Sang-Heon Jeon --- mm/mm_init.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 1190a27ed0fb..d544eed2f173 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1240,41 +1240,41 @@ static unsigned long __init zone_spanned_pages_in_node(int nid, { unsigned long zone_low = arch_zone_lowest_possible_pfn[zone_type]; unsigned long zone_high = arch_zone_highest_possible_pfn[zone_type]; + unsigned long movable_pfn = zone_movable_pfn[nid]; /* Get the start and end of the zone */ *zone_start_pfn = clamp(node_start_pfn, zone_low, zone_high); *zone_end_pfn = clamp(node_end_pfn, zone_low, zone_high); - /* Only adjust if ZONE_MOVABLE is on this node */ - if (zone_movable_pfn[nid]) { - /* Size ZONE_MOVABLE */ - if (zone_type == ZONE_MOVABLE) { - *zone_start_pfn = zone_movable_pfn[nid]; - *zone_end_pfn = min(node_end_pfn, - arch_zone_highest_possible_pfn[movable_zone]); + /* Nothing to adjust if ZONE_MOVABLE is not on this node */ + if (!movable_pfn) + goto out; - /* - * Check that this node has pages within the - * zone's required range - */ - if (*zone_end_pfn < node_start_pfn || - *zone_start_pfn > node_end_pfn) - return 0; + /* Size ZONE_MOVABLE */ + if (zone_type == ZONE_MOVABLE) { + *zone_start_pfn = movable_pfn; + *zone_end_pfn = min(node_end_pfn, + arch_zone_highest_possible_pfn[movable_zone]); - /* Move the zone start inside the node if necessary */ - *zone_start_pfn = max(*zone_start_pfn, node_start_pfn); + /* Check that this node has pages within the zone's required range */ + if (*zone_end_pfn < node_start_pfn || + *zone_start_pfn > node_end_pfn) + return 0; - /* Adjust for ZONE_MOVABLE starting within this range */ - } else if (!mirrored_kernelcore && - *zone_start_pfn < zone_movable_pfn[nid] && - *zone_end_pfn > zone_movable_pfn[nid]) { - *zone_end_pfn = zone_movable_pfn[nid]; + /* Move the zone start inside the node if necessary */ + *zone_start_pfn = max(*zone_start_pfn, node_start_pfn); - /* Check if this whole range is within ZONE_MOVABLE */ - } else if (*zone_start_pfn >= zone_movable_pfn[nid]) - *zone_start_pfn = *zone_end_pfn; + /* Adjust for ZONE_MOVABLE starting within this range */ + } else if (!mirrored_kernelcore && *zone_start_pfn < movable_pfn && + *zone_end_pfn > movable_pfn) { + *zone_end_pfn = movable_pfn; + + /* Check if this whole range is within ZONE_MOVABLE */ + } else if (*zone_start_pfn >= movable_pfn) { + *zone_start_pfn = *zone_end_pfn; } +out: /* Return the spanned pages */ return *zone_end_pfn - *zone_start_pfn; } -- 2.43.0