Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:8 as permitted sender) client-ip=2620:137:e000::3:8;
From:   Zhiguo Jiang <justinjiang@vivo.com>
To:     Andrew Morton <akpm@linux-foundation.org>, linux-mm@kvack.org,
        linux-kernel@vger.kernel.org
Cc:     opensource.kernel@vivo.com, Zhiguo Jiang <justinjiang@vivo.com>
Subject: [PATCH] mm: vmscan: fix kswapd nr_to_reclaim repeated calculation
Date:   Sun, 24 Sep 2023 10:53:15 +0800
Message-ID: <20230924025315.285-1-justinjiang@vivo.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aGXEtHL/YQcv6TNby+4y772RvuEO3211ZYoISeEi1FZkONyh8JPt2k1lr0nO?=
 =?us-ascii?Q?s5KJbBBaL3KjUgZbFOEFmBQs+caWx6unvmmshL6S7QbMBQ4237qeIt0PHuDf?=
 =?us-ascii?Q?YIGJ8DacRKk8NxG2d0QZB0eKilq+/OMEXAxxHok9UQoLgiqieso1rMEoLz7C?=
 =?us-ascii?Q?vCHl3jKPAHb66A0vqn49qAH81QKA/MvxONqefn5NqbHiWcRMWyO82GZpn1xZ?=
 =?us-ascii?Q?ZkmM6ICA4MAxBOawRrz8Bj7hOtsefLmzuSxTxCpid9SkLj3i5b+zfzzEA80v?=
 =?us-ascii?Q?+VWSnD3G8nyt8ztpoDWCycuID8Lb8xL0KJul95PJbYFwtwi9ncUPHZ5mJaJQ?=
 =?us-ascii?Q?huR4x/Q4XBNXQlJGl4Q1Gyl72/IxJ2UgupsPt0fYsR0wdEQInwU/yKccSyVc?=
 =?us-ascii?Q?RpBmPgbNfQoIcX4vek0BsUQD09BQ4X+Myz2huuv37tGwJ1Gcy/IwL/YoO6Ss?=
 =?us-ascii?Q?G1KRvDXqG+9f7qnD5CAfOiD/FerVlkgG+C+a7GnQGnNvCtzz13APd1ulCWZr?=
 =?us-ascii?Q?e3oFQ5xmuVFWlpGEMc2miXTv3fOJNabGwhtrLcROoI5PqJWAfsWxyrXTlN2x?=
 =?us-ascii?Q?Jm3fmiNz6aMPDbfPa81QfkdEwgjQw1Ph4s2/k659POWzusTOaGADb5Gm8BYF?=
 =?us-ascii?Q?msJo0kc4yCSfp+Dx1rCnFo4zOAEu8XLC26GTSNUtqMo2qIKc2E0wv0swAyi2?=
 =?us-ascii?Q?zzkJU1SQ3Uo2FuC1oxEDaiZAnfwiZp4KqNuB1J0hDn7WNhV03cC0GYccnjWE?=
 =?us-ascii?Q?A2Tdab2YfIbxQqYCVAIUgHGiCDUSMX3gQISqquCaqrLclQe5uoLSd5itaShH?=
 =?us-ascii?Q?R2W7kviErLFjZQM0GM6Ot6UiqUT4sKpMVMmnwpVT9aKK1jtVX8BZnRO0JwoA?=
 =?us-ascii?Q?HEaemkg/xhgnXCSDWzwZIH9yEGC7RAIKx3q6r/vD03UocGxzuaOApuuuQlnP?=
 =?us-ascii?Q?Q97+UU+L8TULPkALTQxNrFdjJ+5E8OtOfLEXZpKP90Bh5eIoJhID6LRT6fKa?=
 =?us-ascii?Q?nmPS6ZSxoLSDrDAF7MJtTiiEPqKr8oFmmD/9B5aLZ1VKxZk/5kY7FIl5S/Mt?=
 =?us-ascii?Q?qsZnCedeVHOFRCJitvsBzWAAsD3y8W2uXnvcO5C6B1OY+eIEI5rO36l8Wodw?=
 =?us-ascii?Q?ZlfQ/e755sfIdegEK9ugbhHqV1iqOiEOwk3UCy2Er6+q36v+/K8Be2fnZE8a?=
 =?us-ascii?Q?rKSFHJdG3eV5tlB7hN6IqA0ygpf9yecrYdwLSBwnWnbqoKlCkZ3c4nkcc2dV?=
 =?us-ascii?Q?pjJC7j8fdiAPCqSkSYyJXDlXBt/pKfFOdaF9kdmonTAIhgYCpOZT7N4deh9Y?=
 =?us-ascii?Q?pqd9Z5RGXJrwPwL9Pc5ZC7JGatKrXqTLSirz+xz2KOpjKj/jYc5Y3157RdCz?=
 =?us-ascii?Q?DiUPHUVOzfNW6GhRo5Yvceh4DimhA3k/ULyVSKbcsUQ0TlEWpzJBWNv3HgUd?=
 =?us-ascii?Q?TIvM9U9g+ExMCNVfhc1HHIB9jFd3QB71VZX5hOHreyIgegkY5IdsONfYXD3A?=
 =?us-ascii?Q?mg07d7xPoKqomb6no2pgsJVAwGRsahtQgFbrjb7Tn+j1rip1Uu2gCHURpKcm?=
 =?us-ascii?Q?iNKPnEaz+06p1PbvNYjH34Jsm/+xDk62zM3KLu0J?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 1f5e4e1f-9536-4973-dbd2-08dbbca96c23
X-MS-Exchange-CrossTenant-AuthSource: JH0PR06MB6849.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Sep 2023 02:53:25.7572
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 923e42dc-48d5-4cbe-b582-1a797a6412ed
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: H9HpfAgIeaiJ+peRz8KI10S7xrGpSGue0VQdG7jocpRo/o0MxtXQI/U1fIRibJscH2TlzUlteM8Xxmz8ffvIlA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SEYPR06MB5326
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no
	version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Sat, 23 Sep 2023 19:53:53 -0700 (PDT)

In kswapd recycling shrink, high watermark is fixed, meaning the 
nr_to_reclaim value is fixed, so there is no need to repeatedly
calculate the nr_to_reclaim value during each iteraton.

Signed-off-by: Zhiguo Jiang <justinjiang@vivo.com>
---
 mm/vmscan.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
 mode change 100644 => 100755 mm/vmscan.c

diff --git a/mm/vmscan.c b/mm/vmscan.c
index a4e44f1c97c1..1aab3549969e
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -6638,7 +6638,9 @@ static bool kswapd_shrink_node(pg_data_t *pgdat,
 	int z;
 
 	/* Reclaim a number of pages proportional to the number of zones */
-	sc->nr_to_reclaim = 0;
+	if (sc->nr_to_reclaim > 0)
+		goto shrink;
+
 	for (z = 0; z <= sc->reclaim_idx; z++) {
 		zone = pgdat->node_zones + z;
 		if (!managed_zone(zone))
@@ -6647,6 +6649,7 @@ static bool kswapd_shrink_node(pg_data_t *pgdat,
 		sc->nr_to_reclaim += max(high_wmark_pages(zone), SWAP_CLUSTER_MAX);
 	}
 
+shrink:
 	/*
 	 * Historically care was taken to put equal pressure on all zones but
 	 * now pressure is applied based on node LRU order.
@@ -6725,6 +6728,7 @@ static int balance_pgdat(pg_data_t *pgdat, int order, int highest_zoneidx)
 		.gfp_mask = GFP_KERNEL,
 		.order = order,
 		.may_unmap = 1,
+		.nr_to_reclaim = 0,
 	};
 
 	set_task_reclaim_state(current, &sc.reclaim_state);
-- 
2.39.0