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 7E49FC54E66 for ; Fri, 15 Mar 2024 05:38:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 006EF800FC; Fri, 15 Mar 2024 01:38:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id EF8CC800B4; Fri, 15 Mar 2024 01:38:48 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DBFB5800FC; Fri, 15 Mar 2024 01:38:48 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id CBABE800B4 for ; Fri, 15 Mar 2024 01:38:48 -0400 (EDT) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 6E1D3A1235 for ; Fri, 15 Mar 2024 05:38:48 +0000 (UTC) X-FDA: 81898169136.24.A85DF75 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf12.hostedemail.com (Postfix) with ESMTP id 0ECE940003 for ; Fri, 15 Mar 2024 05:38:45 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=WhzCZ5A9; spf=none (imf12.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1710481126; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Vgui9xa+Yta3BpdkqR3h17bfR59JfFjIZqVGIGYKUUw=; b=M9KUksSQXXQ+cQ6oy+U7w26fgV0SCcobTIf0OPtk0d5KthfvMxYxVcwt5UnzOMYgXB8oL5 4A1hmpbhdOAwYfngM3HHtysWjxjViA0G5iS7KM4SGK2mFeCLCT7Z/DdE50my0HIgTtLGxL Aiq6FXs0lT+LmG53071aX+yflBQFGPY= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1710481126; a=rsa-sha256; cv=none; b=OA0NK1P/qaW+vrYPGn+r9r6XyEI0sSp28ESxiySyb5yE4ZexTrvAuLwKAgbRPjwbpM7khP C7tvaWqYVkDkXDJNx2b9Gd9q02biFYECfp98Q8GHv3RGtoTb9g0zNmZ5v90msLiAgLQvSv A2OiHS7ZNBBVS8LKIrkcQCq4i4TGU8g= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=WhzCZ5A9; spf=none (imf12.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:In-Reply-To:Content-Type: MIME-Version:References:Message-ID:Subject:Cc:To:From:Date:Reply-To: Content-Transfer-Encoding:Content-ID:Content-Description; bh=Vgui9xa+Yta3BpdkqR3h17bfR59JfFjIZqVGIGYKUUw=; b=WhzCZ5A9iWy3cuBbJxFhmCtmCe My656L9mMcEqZU3Nlk+GH8BHWpjfOFhdj73vXpCAUwsSo5nxyc72+iogwwelJ/fC/AOI4V4xY/fWD 9wrZjj1nLYgNCzrYNdiykEKGirz8h+b4BhAMJaPR90fC7QSUSU4ArXqTK3ylOOnMeddjxkdGJg3hF wjjgD7CB8ymvbUEpZIamsz3jMzU/qcxqrcb3ejgdc68RQCFAZKSkOEx+BEB03E2LMWCoM0QOigh0O tPowqFEL7g2fEn9vexxfKZwGGKvpYEdFkce6hCVjtoJY9lGCDK3Ko2aSRVpI8N3tpU0cqVGO04cbz 3XXDChqw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rl0H6-0000000GkFX-076Q; Fri, 15 Mar 2024 05:38:36 +0000 Date: Thu, 14 Mar 2024 22:38:35 -0700 From: Luis Chamberlain To: Baolin Wang Cc: akpm@linux-foundation.org, jhubbard@nvidia.com, vbabka@suse.cz, mgorman@suse.de, linux-mm@kvack.org, linux-kernel@vger.kernel.org, dave@stgolabs.net, p.raghav@samsung.com, da.gomez@samsung.com Subject: Re: [PATCH 2/3] mm/compaction: add and use for_each_populated_zone_pgdat() helper Message-ID: References: <20240314005436.2962962-1-mcgrof@kernel.org> <20240314005436.2962962-3-mcgrof@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: X-Rspamd-Queue-Id: 0ECE940003 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: tnyb5hgu9ph4qif1zye515d7dbt6rn35 X-HE-Tag: 1710481125-621167 X-HE-Meta: U2FsdGVkX1/D0qHTPr01mh0f01Tyh9FzrVXFxhiUTmFDmsgU+GSTCy4ydNyjeqH4Gfk1WrzwDaxTfPHpqvbs01FChiKPpakPwKO1hadEkgKboGpz5hm2R1aaNz0jnabfJqCCzwI//gZCEpRrNzf6ikSfJnmG9CV2q8aItcEudckq9PZbs1CXQfSncKRME9UnvZfxnVHatTPeRIAjl/6K65Qy5H4pdIiizXSjvX6ubYg42IreFUf3nzhPTguz+W97DI0VlqZr1QmU1XyHvg5hXaX1zYs43Lv2DyadKUVlT1ne0GyQhnlouKCbT2tN3DCMQb9pGdYYHzIYkEnNdKkxuJPsg03C1/+mxrlopi9PihDAVyfR6XdybDc7DYbjPlbdPUaJCXUP60yD7pcyTt5Osc7CkkqCpl5PK+LrlpPneHIOnnPKt1VkePnEWrPaSOvLP3L6/Xr0HcaiR6/odpeN4wYsIPOQ1F0791qoAEbzisg8ktDj+BqU+xNoeDgi9D0SvrrODmFoHSCaVyPdXG9T8zmpG9QbAVrVZeRMEnhqb0kAFsd2R7tGExiCZqRJnqOlj2BhS+KEto3wv0EQDXUxTr4WqSvv6SCcIKkXJ+MGxpPJ38am7wv2vQINu/XaeGCHbPAemFxdh8ulMw3b2sPd/B5gtnBaiOMEfgoT0//jtCEDm4IhJu8MNIeJEm63TUu4VHQ2gmlB03JqIADdLDd/ALrEPC1CdD380scnFEwgOdHVMeUHijy0Ir0AdqWQJ1cp/fBbj6ymt9qunuMj4q7Qt/J9ZIx8p55noy/qv17jABrmxC0wGA3hWO55pnJHIPeGerwbh0tgizCMhorhZoPK90ymh2LFsW2XmfeTeee/HHpNzvF0BcbSI704PDJcoj6jxPJeCiNSJXXn4/lcdguEDJ8FobzGPmm+tUzdiTGx7xLqJFLmugbhjiQNkKb88nF+wbU65LFNL0LhVdtEwT9 phj30nFE 284bGqVLG6N+NWo2azZCG+6bwxwTICpi/lmxHPtufErvnyEQRfvfWSh8vYmrCemzebxYPLRep+RWWNSIv4bfJnOFXPA== 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: On Thu, Mar 14, 2024 at 03:19:45PM +0800, Baolin Wang wrote: > > > On 2024/3/14 08:54, Luis Chamberlain wrote: > > We can just wrap most of the work done on fragmentation_score_node() > > into a pgdat helper for populated zones. Add the helper and use it. > > > > Signed-off-by: Luis Chamberlain > > --- > > include/linux/mmzone.h | 8 ++++++++ > > mm/compaction.c | 9 ++------- > > 2 files changed, 10 insertions(+), 7 deletions(-) > > > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > > index a497f189d988..1fd74c7100ec 100644 > > --- a/include/linux/mmzone.h > > +++ b/include/linux/mmzone.h > > @@ -1597,6 +1597,14 @@ extern struct zone *next_zone(struct zone *zone); > > ; /* do nothing */ \ > > else > > +#define for_each_populated_zone_pgdat(zone, pgdat) \ > > + for (zone = pgdat->node_zones; \ > > + zone; \ > > + zone = next_zone(zone)) \ > > + if (!populated_zone(zone)) \ > > + ; /* do nothing */ \ > > + else > > I think this will break the original logics, since the next_zone() will > iterate over all memory zones, instead of only the memory zones of the > specified node. Definitely, thanks, so we'd need something like this in addition: diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index 34b729fc751b..bd11d33ea14d 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -1568,6 +1568,7 @@ static inline struct pglist_data *NODE_DATA(int nid) extern struct pglist_data *first_online_pgdat(void); extern struct pglist_data *next_online_pgdat(struct pglist_data *pgdat); extern struct zone *next_zone(struct zone *zone); +extern struct zone *next_zone_pgdat(struct zone *zone, struct pglist_data *pgdat); /** * for_each_online_pgdat - helper macro to iterate over all online nodes @@ -1600,7 +1601,7 @@ extern struct zone *next_zone(struct zone *zone); #define for_each_populated_zone_pgdat(zone, pgdat) \ for (zone = pgdat->node_zones; \ zone; \ - zone = next_zone(zone)) \ + zone = next_zone_pgdat(zone, pgdat)) \ if (!populated_zone(zone)) \ ; /* do nothing */ \ else diff --git a/mm/compaction.c b/mm/compaction.c index 015126803017..96434f6fc1ad 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2152,7 +2152,6 @@ static unsigned int fragmentation_score_node(pg_data_t *pgdat) { unsigned int score = 0; struct zone *zone; - int zoneid; for_each_populated_zone_pgdat(zone, pgdat) score += fragmentation_score_zone_weighted(zone); diff --git a/mm/mmzone.c b/mm/mmzone.c index c01896eca736..043a6dc16c05 100644 --- a/mm/mmzone.c +++ b/mm/mmzone.c @@ -43,6 +43,18 @@ struct zone *next_zone(struct zone *zone) return zone; } +/* + * next_zone_pgdat - helper magic for for_each_zone() per node + */ +struct zone *next_zone_pgdat(struct zone *zone, struct pglist_data *pgdat) +{ + if (!zone || !pgdat) + return NULL; + if (zone < pgdat->node_zones + MAX_NR_ZONES - 1) + return ++zone; + return NULL; +} + static inline int zref_in_nodemask(struct zoneref *zref, nodemask_t *nodes) { #ifdef CONFIG_NUMA