From patchwork Mon Aug 8 00:56:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: CGEL X-Patchwork-Id: 12938421 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 6DD30C19F2A for ; Mon, 8 Aug 2022 00:57:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 80E608E0002; Sun, 7 Aug 2022 20:57:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7970F8E0001; Sun, 7 Aug 2022 20:57:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 638738E0002; Sun, 7 Aug 2022 20:57:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 4E0A08E0001 for ; Sun, 7 Aug 2022 20:57:05 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 161F2409E8 for ; Mon, 8 Aug 2022 00:57:05 +0000 (UTC) X-FDA: 79774611210.09.071D7F4 Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by imf10.hostedemail.com (Postfix) with ESMTP id B7E68C002B for ; Mon, 8 Aug 2022 00:57:04 +0000 (UTC) Received: by mail-pl1-f173.google.com with SMTP id x10so7217009plb.3 for ; Sun, 07 Aug 2022 17:57:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc; bh=trpRXvmFHTWKEanKbEL3EOrwzaz4Qg86JnLq2qjjATg=; b=k8q8F3O9itdWzfGswqCnLbH3LdJQWsxB24a5mOHYuuxQo4sIU6+andY8QM5Romn1Tf ++EIfoJuUbWsLq69dTxSQrE9pZQhuUQBYMbTtTe6lX2ebQPqeD3ONbzqxcs++qUrn/Dx duTwaBE/5Z0Ncp1xOw4Y7pIyMHpr9E1EbwTR7nelCBgemPer8luqneXgKcjhAhYi2wQK ZuVVkG41t2FQy017FfOB2W832CXfE1K3WiTKh5zjZhOtI6TjGZzI/nqEGy6tgrz7KTBV RHTeqyhKdHWlQNWafCqxzhLqPC0yzFED6kT5ICVy/xCDFSEIABShcN9WO4yigZUWlpzt LzoQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=trpRXvmFHTWKEanKbEL3EOrwzaz4Qg86JnLq2qjjATg=; b=Q/SSNBcu+Y3jUhYyPz3XMimuM6TCDB9Eq/ldm6CDBXvMSAbKStfLDIv4pmuFhg+hGc hUu9sZoUuL6+AlDYC20n0SS5HcTHarJi6ylv8PXFe2azSg6/LNRVlr+12rCCm0+e90Qk lMw9lytg7cBnIWW4OUc71cGasOA+pwqUt7dVBayMv/6WBKbZqkEVIUuaWEjDs+sfiUS3 XVgO9YTsC3uTCBwTdgX3pl6h4N3BRV+ErjnwfDWcjcjU9cTGRwc5PEDLuhFlO+87KcGa A1CTuK3thtXPK8fTJusXseuBIOVtO0JL5TdZ9g54xJjwq5l1DmimCXaKJBRhibpAxS+e EZFg== X-Gm-Message-State: ACgBeo3Bi45SRQTvZnvWH9ZsOK/NhA8O3/ItqMSwFbAD6Shem8/9Ofgd KNCK7DhbKw2iZowPt4daMWaE8LNTHZ8= X-Google-Smtp-Source: AA6agR5hq4HQHbrJUnjOtFv65LhemxGljkUyYobdG4D3SofKLFGEyz007HLPQPxDOwbHNY25IQFWhw== X-Received: by 2002:a17:90b:4b89:b0:1f5:68b:b14e with SMTP id lr9-20020a17090b4b8900b001f5068bb14emr27524755pjb.30.1659920223538; Sun, 07 Aug 2022 17:57:03 -0700 (PDT) Received: from localhost.localdomain ([193.203.214.57]) by smtp.gmail.com with ESMTPSA id j13-20020a170902da8d00b001709aea1516sm2278564plx.276.2022.08.07.17.57.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 17:57:02 -0700 (PDT) From: cgel.zte@gmail.com X-Google-Original-From: yang.yang29@zte.com.cn To: akpm@linux-foundation.org, hannes@cmpxchg.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Yang Yang Subject: [PATCH v2] mm/vmscan: define macros for refaults in struct lruvec Date: Mon, 8 Aug 2022 00:56:45 +0000 Message-Id: <20220808005644.1721066-1-yang.yang29@zte.com.cn> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659920224; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:references:dkim-signature; bh=trpRXvmFHTWKEanKbEL3EOrwzaz4Qg86JnLq2qjjATg=; b=48kHXAzff9u3JKYi5acguGBXjVzv7748zTa+oKxdkYijXS1OgatIwOCEBLsMvia8YX/fsm 9TYg6Z6ysafaUTgw03mlUR1ZbRcMg0xWIfgz+vl2AvKkZ/Q5EuUoqFzVQ0hJ+y2/ZWWssk zMLQIjXK7Vs/XlvVu+jIFs7pJ9aHJLI= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=k8q8F3O9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of cgel.zte@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=cgel.zte@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1659920224; a=rsa-sha256; cv=none; b=CZOzysnd8DvgCwsZf3K1CBVfMVGPyit3lw5aSSw/nNqfm0W0h+A1rlzjqFit03ZIT7McAA 76viyfl2Bjk73iacVFf0kQFejg4R/OwdLruVpdtKIWGvijSp49P2A1oRsrWvgQZC3Q8Lva xX/PyuTcwEr8dBclQTM33k+/K+2nJ1c= X-Rspamd-Queue-Id: B7E68C002B Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=k8q8F3O9; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf10.hostedemail.com: domain of cgel.zte@gmail.com designates 209.85.214.173 as permitted sender) smtp.mailfrom=cgel.zte@gmail.com X-Rspam-User: X-Rspamd-Server: rspam07 X-Stat-Signature: p188m84p1dkp6my1ctxwriy6m1gqyarg X-HE-Tag: 1659920224-131198 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: From: Yang Yang The magic number 0 and 1 are used in several places in vmscan.c. Define macros for them to improve code readability. Signed-off-by: Yang Yang --- Change for v2: - fix compile error when CONFIG_NFSD is y --- include/linux/mmzone.h | 2 ++ mm/vmscan.c | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h index e24b40c52468..8f571dc7c524 100644 --- a/include/linux/mmzone.h +++ b/include/linux/mmzone.h @@ -306,6 +306,8 @@ static inline bool is_active_lru(enum lru_list lru) return (lru == LRU_ACTIVE_ANON || lru == LRU_ACTIVE_FILE); } +#define WORKINGSET_ANON 0 +#define WORKINGSET_FILE 1 #define ANON_AND_FILE 2 enum lruvec_flags { diff --git a/mm/vmscan.c b/mm/vmscan.c index b2b1431352dc..428f8fa60331 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -3230,7 +3230,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) refaults = lruvec_page_state(target_lruvec, WORKINGSET_ACTIVATE_ANON); - if (refaults != target_lruvec->refaults[0] || + if (refaults != target_lruvec->refaults[WORKINGSET_ANON] || inactive_is_low(target_lruvec, LRU_INACTIVE_ANON)) sc->may_deactivate |= DEACTIVATE_ANON; else @@ -3243,7 +3243,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) */ refaults = lruvec_page_state(target_lruvec, WORKINGSET_ACTIVATE_FILE); - if (refaults != target_lruvec->refaults[1] || + if (refaults != target_lruvec->refaults[WORKINGSET_FILE] || inactive_is_low(target_lruvec, LRU_INACTIVE_FILE)) sc->may_deactivate |= DEACTIVATE_FILE; else @@ -3559,9 +3559,9 @@ static void snapshot_refaults(struct mem_cgroup *target_memcg, pg_data_t *pgdat) target_lruvec = mem_cgroup_lruvec(target_memcg, pgdat); refaults = lruvec_page_state(target_lruvec, WORKINGSET_ACTIVATE_ANON); - target_lruvec->refaults[0] = refaults; + target_lruvec->refaults[WORKINGSET_ANON] = refaults; refaults = lruvec_page_state(target_lruvec, WORKINGSET_ACTIVATE_FILE); - target_lruvec->refaults[1] = refaults; + target_lruvec->refaults[WORKINGSET_FILE] = refaults; } /*