From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pg1-f175.google.com (mail-pg1-f175.google.com [209.85.215.175]) (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 6ACE347A0DC for ; Thu, 6 Aug 2026 16:21:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.175 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786033294; cv=none; b=D18CmqGZtZax6bEyiUDw920rO35ghWGaKHflWDge8XiKq389JsWYUMzQqE6bfcdyRU2PJZWnMeQ3dn+SMhbLbyqwAeE0mm+N5/dBBnICNxV7usISvDqA6pZuOv1WlRyRiwY/rnDLG5kpdl8sB49c/4FoLRffzlDxzcoCn17+8vE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786033294; c=relaxed/simple; bh=BtIhWpcD4jx/UBt3NU5E6NXRP26Z42urhyUgnVAhPhI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N1YRHgrP9A2pAJEPZC5/MRerGK2l9rKqWQvtTrZ0DXvGnBiA1eq7u4Yfvji5Oc7BnuTYhPW1qCZXSpRMBGm7Nr+rt1OlkBRm37hOCwKhQNDin0kDXefL1mPSeLpio1oFme0o34oUA22XqV4FcvZgWAYi9xum66iApSTYbzVq7R0= 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=COlYOSRe; arc=none smtp.client-ip=209.85.215.175 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="COlYOSRe" Received: by mail-pg1-f175.google.com with SMTP id 41be03b00d2f7-c9eefcf9175so2207967a12.3 for ; Thu, 06 Aug 2026 09:21:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1786033291; x=1786638091; 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=nnHRaA/5R5s9aZOS569tdN3FNz3hlxbEkvfjm317fS4=; b=COlYOSRelmxAKLYoM9wWsKdL3EMqys2CqmQ+QlL6kkaNING7ISsliUJYvmbTcv1MS9 rYPM14BvGmflbQkfGTRtztbRsQ+AtWL7mlLmHZl52g7r5n9MlgYlXDLdF9qSuQ26foYo zL7gtS57DJFlhrQuQuFMPflrwrAJXzxZziJSs2kVt5ctyCDH7O/INfbZyjwzw4xd9ier k/yabsIXYDsik3NTcds32XEAX9NgKJAzp1wXQUyb7cxgbTJvTT9a4zJtushlpD8tNQYd XHtqApE0XtSdpGVY966D5Z6GI2NqPiOMKxSF4RbKlH70EoNe9abxOgerKokOSIemz+oH FeYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1786033291; x=1786638091; 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=nnHRaA/5R5s9aZOS569tdN3FNz3hlxbEkvfjm317fS4=; b=CZAARvduryzIyZKOJ2TQojpF8pJanJHTp4lKh3QvQHHp6wtF00N9jsysvKRvus8k0W wGTSjX+h3AWJBT55QIqv+gnvfPPiJL+ZQYMzY3uasnwtr7CpwAzUNa7NQu11jKuMp3KQ GasNW0dwNrLTsg/zJ6E5vp4GvF+6nHd+7+7VOtpm+imaXFbRPkgw+9CnhSVC5f9sfFHB MQkOe7pUuqa/1Sc468y27HBGLTuLRUXslCn7ANlOvESc+a6L98No/FFZM1ZDIhRhRKnk I48l+lxmvmaqUQZIoooymLTli3AP5Pwq8rb1kdO6uS1cVDf+7N8FubOgjAS6cJ1ZKf9/ sLRg== X-Gm-Message-State: AOJu0Yx/+IdTChCKowZsiWkz+5NiDlvxMPk23vSUhv33SGdPjV0H0+4O q+xK3D8EDP/8Xm9JBsp2yFeaRofNMLEezRaCdDBlZZXhSS89z+Ah17Wc X-Gm-Gg: AR+sD12lQDHwl2xLBr6HkhhG6ZU33cRJDbJdqmHDu1JajLJit8kbbN0cTWR/yY1u6qu XYWhZ0egk4EteBGRsImBJpoDV9gn2LhzV1Qnlhccwvk/7RUj8y6T80V+MNGdPmviQSnqSB0sArh KaJ+b67FJxEZAqDjMFs8qKJ7Fy912eErmd064Pa5TNZoYQ1Ex9rmlwQuGVEPXbC49D8+/QF2+iZ W/FP4sQdnPWplKfiDY2hWcp3FE6HZvnT8I+Qr2lkmOKe8pNTWRjqLOvi8yGnzl8CQQFpR54u8Wd aXwzW6JF7qdU5/OxKKwoiOwACUwupRudkN1HTdR0lGCz4rGh2cwc0ts/08dGENnZfMAGINAPw2x jIbnOusGMSpzaZCZmFWnpRbx2Ji4oY+mT/UrpaNu7bQwge9C9BxR55X+PpiOM7QUnWb6oKrs3N6 dcamFHucU8y2J+t7JmwKReIhtYckMC7C4JQl2CIQR1DTY5+D9Tg3AZAzA= X-Received: by 2002:aa7:88d2:0:b0:847:8650:69cd with SMTP id d2e1a72fcca58-84f2e0eda51mr16720422b3a.33.1786033291353; Thu, 06 Aug 2026 09:21:31 -0700 (PDT) Received: from ubuntu.. ([110.9.142.4]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-84f459b66e6sm1662739b3a.40.2026.08.06.09.21.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2026 09:21:30 -0700 (PDT) From: Sang-Heon Jeon To: Mike Rapoport , Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH v2 5/5] mm/mm_init: clean up zone_spanned_pages_in_node() Date: Fri, 7 Aug 2026 01:20:56 +0900 Message-ID: <20260806162100.313965-6-ekffu200098@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260806162100.313965-1-ekffu200098@gmail.com> References: <20260806162100.313965-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 four 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 | 43 +++++++++++++++++++++++-------------------- 1 file changed, 23 insertions(+), 20 deletions(-) diff --git a/mm/mm_init.c b/mm/mm_init.c index 27f454edbebb..ab445111a846 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -1192,37 +1192,40 @@ 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; - /* This range starts below ZONE_MOVABLE */ - } else if (*zone_start_pfn < zone_movable_pfn[nid]) { - *zone_end_pfn = min(*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); - /* This whole range is within ZONE_MOVABLE */ - } else { - *zone_start_pfn = *zone_end_pfn; - } + /* This range starts below ZONE_MOVABLE */ + } else if (*zone_start_pfn < movable_pfn) { + *zone_end_pfn = min(*zone_end_pfn, movable_pfn); + + /* This whole range is within ZONE_MOVABLE */ + } else { + *zone_start_pfn = *zone_end_pfn; } +out: /* Return the spanned pages */ return *zone_end_pfn - *zone_start_pfn; } -- 2.43.0