Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37;
From:   Huan Yang <link@vivo.com>
To:     Jonathan Corbet <corbet@lwn.net>,
        Andrew Morton <akpm@linux-foundation.org>,
        Johannes Weiner <hannes@cmpxchg.org>,
        Michal Hocko <mhocko@kernel.org>,
        Roman Gushchin <roman.gushchin@linux.dev>,
        Shakeel Butt <shakeelb@google.com>,
        Muchun Song <muchun.song@linux.dev>,
        Yu Zhao <yuzhao@google.com>, Peter Xu <peterx@redhat.com>,
        David Hildenbrand <david@redhat.com>,
        "T.J. Alumbaugh" <talumbau@google.com>,
        Axel Rasmussen <axelrasmussen@google.com>,
        Ryan Roberts <ryan.roberts@arm.com>,
        Kefeng Wang <wangkefeng.wang@huawei.com>,
        Suren Baghdasaryan <surenb@google.com>,
        linux-doc@vger.kernel.org (open list:DOCUMENTATION),
        linux-kernel@vger.kernel.org (open list),
        linux-mm@kvack.org (open list:MEMORY MANAGEMENT),
        cgroups@vger.kernel.org (open list:CONTROL GROUP - MEMORY RESOURCE
        CONTROLLER (MEMCG))
Cc:     opensource.kernel@vivo.com, Huan Yang <link@vivo.com>
Subject: [PATCH 1/3] mm: multi-gen LRU: fold lru_gen run cmd
Date:   Mon,  9 Oct 2023 10:57:20 +0800
Message-Id: <20231009025726.5982-2-link@vivo.com>
In-Reply-To: <20231009025726.5982-1-link@vivo.com>
References: <20231009025726.5982-1-link@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?q9eV6o8Ahbn2lbTm65cJerRZw/j2WhLTUPsUuhBi5JfoGvluco+MfoAIVY0Y?=
 =?us-ascii?Q?4Xo+nmDLERqWqipcvaoQzoKjaUjTtnzTEHVku3doF+QiDBD7CjtmXgxEaFMI?=
 =?us-ascii?Q?bNnIJrjUFlMxvj2FRoBpZunfknjKFTitdTIURM7kXepX2+NhmqZlOEEMSedN?=
 =?us-ascii?Q?6w/yGLT3kFW3qxQSaY/qWvQp5SMOSFU7LldNxGZCipYYIt+nQzy+rqHWomNZ?=
 =?us-ascii?Q?SOkBHc4RrTdsjIXtJXFM0lgY18gc/21SG5DCflcj4ESEuqnPGPDqQlKcecdl?=
 =?us-ascii?Q?TbnAsiFx1IkmLe91HWcZmEszPpgAaRAi81CWlu2Vaq4qK90+j1pyPIJ7Wsx/?=
 =?us-ascii?Q?FclxuRcOXUCjhPEH/P+IqcUyfXMols+suq45KXubKFcTjMoDBZ6aJGHbzSTr?=
 =?us-ascii?Q?yHV/RPmpbrZG0p7kcTEsooWmSowGwitpnKgamxiTUikZX7/2JDI36XoNWU+k?=
 =?us-ascii?Q?MmgKatcJ3MTZzVj/UBrzVDkW5JVpf2fy2sNHwM6ic8rk/dS/8njJNLmNV3e7?=
 =?us-ascii?Q?NLLrPPuyn1dt0O+y8viNF06sQQI76J0+ec7U5KSfjXSlZ1nXuM1XVoXDEJCi?=
 =?us-ascii?Q?Q8LpnL1kPOSN45uo3uAz8bWoM/YJYP7Y/6vZ5qMnNzavxU5bIAz5OJKa89OQ?=
 =?us-ascii?Q?JbLfVJqAgcIu0oq92Mt55S4OuyH7YIcnw2MOCctPjSxZ135dWQEXjzVkRyEy?=
 =?us-ascii?Q?4s0GCADN8bf5CqsUDt+alvGK9yD+R4PjX2LmtHIx0hUsRYo78pHaeNpXE3hi?=
 =?us-ascii?Q?j92tFpd8F5kFBN8beFfl8j13Vfgb9TbE8gIzRDnSgYQTogp3/eA3uazQA3uP?=
 =?us-ascii?Q?mn/w0IhQOrOLYKhri2Djd25PWxZ4d94fD99VtdK5j1kw9YrE+EHNQAPYADHt?=
 =?us-ascii?Q?HA/idrvMZASBBoOPTZ0OJN5o9vuCoDp1p1YCN5JQZAd9919fLur/OngY2m2E?=
 =?us-ascii?Q?djnjAiHTt1jQjyoCCjItkNtac+OvYsetDt2LDeuyVgvyNYfewwRbq476txCr?=
 =?us-ascii?Q?btstSGvTOt+Cb+bl0xTqSEjJa6pNa1xSzl9JldfHaiMI1sDIQxnr6MRP/FzP?=
 =?us-ascii?Q?V93ReHd102NC7rM0aAO0e6J0SJQBpSJzYNh5+M/NuGNAvphirMARS9nWqRQB?=
 =?us-ascii?Q?ehx9Q11hz3GlNfEbwhuoVLTfcBZBs8uQyPyMsUexTPkS5L0q74PgpgnOJ8Qp?=
 =?us-ascii?Q?RnYO2QnEnwP3D98+VN963uhrvWs1cWE799xyEU380Bo34dYKvtYIOL4m+LlR?=
 =?us-ascii?Q?rz+89a/1kLUh7bx2jY59MqQdPQyjCqTBChaVRH/amBfwNC/eq7Lgeva5LNDE?=
 =?us-ascii?Q?25j4u9vwdfl1/n8CmUyRvxf4CaBMxUEmh4YgH+WmY8J9bLHHxGb73wHERiEY?=
 =?us-ascii?Q?o8yKop6CKD0CuCidWqXw0qmyIFehK7Zn92PejcGT78fuT/dLjB9XxjaYoeZG?=
 =?us-ascii?Q?gi3Dukpu3zx2rr2h14gPSmcLQLAzF9Xn7WriT7JzbBrTTqpeqFUqIyiDbSwG?=
 =?us-ascii?Q?rSP5rwZGlqWcqp2CpBWP0NJa0TKzkqAaEOHfAEh7uw0LW0CjHIMUJSL/K49g?=
 =?us-ascii?Q?Zu4+Mzc//hmUvmmJAQ0+G9W53F7SHJlPE8ywwt+d?=
X-OriginatorOrg: vivo.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 5f9d9c91-01b6-4445-fade-08dbc8738c48
X-MS-Exchange-CrossTenant-AuthSource: PUZPR06MB5676.apcprd06.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Oct 2023 02:58:00.5434
 (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: K8pE71oorl2FBFhVFty4U/SKq2HSsVwTkAfHEHqoUkCBRXPGLmzMzkkaPSWONch6BaVCGKI+/Xu3r3kTAoTrBg==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: TY0PR06MB5428
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS autolearn=ham
        autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
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 (snail.vger.email [0.0.0.0]); Sun, 08 Oct 2023 19:58:12 -0700 (PDT)

From: HuanYang <link@vivo.com>

This patch move LRU_GEN define helper into mm_inline which will
used in per memcg lru gen node.

let run aging/eviction into func, per memcg also will run this.

Signed-off-by: HuanYang <link@vivo.com>
---
 include/linux/mm_inline.h |  9 ++++++++
 mm/vmscan.c               | 45 +++++++++++++++++++++------------------
 2 files changed, 33 insertions(+), 21 deletions(-)

diff --git a/include/linux/mm_inline.h b/include/linux/mm_inline.h
index 8148b30a9df1..b953b305c8a2 100644
--- a/include/linux/mm_inline.h
+++ b/include/linux/mm_inline.h
@@ -101,6 +101,15 @@ static __always_inline enum lru_list folio_lru_list(struct folio *folio)
 
 #ifdef CONFIG_LRU_GEN
 
+#define DEFINE_MAX_SEQ(lruvec)						\
+	unsigned long max_seq = READ_ONCE((lruvec)->lrugen.max_seq)
+
+#define DEFINE_MIN_SEQ(lruvec)						\
+	unsigned long min_seq[ANON_AND_FILE] = {			\
+		READ_ONCE((lruvec)->lrugen.min_seq[LRU_GEN_ANON]),	\
+		READ_ONCE((lruvec)->lrugen.min_seq[LRU_GEN_FILE]),	\
+	}
+
 #ifdef CONFIG_LRU_GEN_ENABLED
 static inline bool lru_gen_enabled(void)
 {
diff --git a/mm/vmscan.c b/mm/vmscan.c
index ea57a43ebd6b..f59977964e81 100644
--- a/mm/vmscan.c
+++ b/mm/vmscan.c
@@ -3285,15 +3285,6 @@ static bool should_clear_pmd_young(void)
 
 #define LRU_REFS_FLAGS	(BIT(PG_referenced) | BIT(PG_workingset))
 
-#define DEFINE_MAX_SEQ(lruvec)						\
-	unsigned long max_seq = READ_ONCE((lruvec)->lrugen.max_seq)
-
-#define DEFINE_MIN_SEQ(lruvec)						\
-	unsigned long min_seq[ANON_AND_FILE] = {			\
-		READ_ONCE((lruvec)->lrugen.min_seq[LRU_GEN_ANON]),	\
-		READ_ONCE((lruvec)->lrugen.min_seq[LRU_GEN_FILE]),	\
-	}
-
 #define for_each_gen_type_zone(gen, type, zone)				\
 	for ((gen) = 0; (gen) < MAX_NR_GENS; (gen)++)			\
 		for ((type) = 0; (type) < ANON_AND_FILE; (type)++)	\
@@ -6058,6 +6049,29 @@ static int run_eviction(struct lruvec *lruvec, unsigned long seq, struct scan_co
 	return -EINTR;
 }
 
+static int __process_one_cmd(char cmd, struct lruvec *lruvec, unsigned long seq,
+			     struct scan_control *sc, int swappiness,
+			     unsigned long opt)
+{
+	int err;
+
+	if (swappiness < 0)
+		swappiness = get_swappiness(lruvec, sc);
+	else if (swappiness > 200)
+		return -EINVAL;
+
+	switch (cmd) {
+	case '+':
+		err = run_aging(lruvec, seq, sc, swappiness, opt);
+		break;
+	case '-':
+		err = run_eviction(lruvec, seq, sc, swappiness, opt);
+		break;
+	}
+
+	return err;
+}
+
 static int run_cmd(char cmd, int memcg_id, int nid, unsigned long seq,
 		   struct scan_control *sc, int swappiness, unsigned long opt)
 {
@@ -6086,19 +6100,8 @@ static int run_cmd(char cmd, int memcg_id, int nid, unsigned long seq,
 
 	lruvec = get_lruvec(memcg, nid);
 
-	if (swappiness < 0)
-		swappiness = get_swappiness(lruvec, sc);
-	else if (swappiness > 200)
-		goto done;
+	err = __process_one_cmd(cmd, lruvec, seq, sc, swappiness, opt);
 
-	switch (cmd) {
-	case '+':
-		err = run_aging(lruvec, seq, sc, swappiness, opt);
-		break;
-	case '-':
-		err = run_eviction(lruvec, seq, sc, swappiness, opt);
-		break;
-	}
 done:
 	mem_cgroup_put(memcg);
 
-- 
2.34.1