From patchwork Fri Nov 15 20:11:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qian Cai X-Patchwork-Id: 11247077 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C603F138C for ; Fri, 15 Nov 2019 20:11:50 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 9302C206D9 for ; Fri, 15 Nov 2019 20:11:50 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lca.pw header.i=@lca.pw header.b="Fae3n/Du" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 9302C206D9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lca.pw Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id BD03F6B0007; Fri, 15 Nov 2019 15:11:49 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id B81296B0008; Fri, 15 Nov 2019 15:11:49 -0500 (EST) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A95B46B000A; Fri, 15 Nov 2019 15:11:49 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0097.hostedemail.com [216.40.44.97]) by kanga.kvack.org (Postfix) with ESMTP id 99D756B0007 for ; Fri, 15 Nov 2019 15:11:49 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with SMTP id 6B793824D19F for ; Fri, 15 Nov 2019 20:11:49 +0000 (UTC) X-FDA: 76159607538.06.lunch39_672bca2e4634f X-Spam-Summary: 2,0,0,8982f01ccd124733,d41d8cd98f00b204,cai@lca.pw,:akpm@linux-foundation.org:hannes@cmpxchg.org:surenb@google.com::linux-kernel@vger.kernel.org:cai@lca.pw,RULES_HIT:41:355:379:541:800:960:967:973:988:989:1260:1263:1345:1437:1534:1542:1711:1730:1747:1777:1792:2198:2199:2393:2525:2559:2563:2682:2685:2731:2859:2933:2937:2939:2942:2945:2947:2951:2954:3022:3138:3139:3140:3141:3142:3353:3865:3867:3872:3934:3936:3938:3941:3944:3947:3950:3953:3956:3959:4250:4321:4605:5007:6119:6261:6653:7875:7903:8599:9025:9036:10004:10913:11026:11473:11658:11914:12043:12296:12297:12517:12519:12555:12783:12895:12986:13161:13229:13846:14018:14093:14096:14181:14394:14721:14849:21080:21433:21444:21451:21627:30054,0,RBL:209.85.222.194:@lca.pw:.lbl8.mailshell.net-62.2.0.100 66.100.201.201,CacheIP:none,Bayesian:0.5,0.5,0.5,Netcheck:none,DomainCache:0,MSF:not bulk,SPF:fp,MSBL:0,DNSBL:neutral,Custom_rules:0:0:0,LFtime:88,LUA_SUMMARY:none X-HE-Tag: lunch39_672bca2e4634f X-Filterd-Recvd-Size: 4994 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by imf42.hostedemail.com (Postfix) with ESMTP for ; Fri, 15 Nov 2019 20:11:48 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id m125so9104707qkd.8 for ; Fri, 15 Nov 2019 12:11:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=lca.pw; s=google; h=from:to:cc:subject:date:message-id; bh=rK+VrpxQV4ZTcM3wBx6WIAo16VtCG97yuNEHzYaGRMU=; b=Fae3n/DuTYTPRHB4hSz3cMXShYJQZSWaZ4R8pe8ItWpRUgKDRs22e+z3iKUqdTs2St r4G9QamAQcxlLYvzs2fII7SPvTkl+qu97rE/XURhL/zMW+FABXHZCDFF6n54HpE1ehoL BxBrzXgtmlRJZhtOh/RDFfuE9Q5hSFWvLgD1tyYTeOn/0+g3CPu46H0tBBMQXWOU6f64 HagAQS8mVQrLugSBdLnqFmr8PYpwX5Iq8Rj0v2pCgy6g20clMPQhdhtxJSFLgm/0cyPL 8au7DIzvzxqx9258O4VoWmfPV+0XPl+YUCPeP/iCiWXr0xYWfyi8XnFZRsaV2g32P2WG 8wsA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=rK+VrpxQV4ZTcM3wBx6WIAo16VtCG97yuNEHzYaGRMU=; b=M/bD1QlGhI2PYrmeVob5uF8yvOzgXVrhli5qekM+vs9ojs94ISkyKdcE+M8r7eSU6K C3t8tLOU4IlDrKhb10wK5ypxuya0ek7Ai62/71kN0dRrJ1y09MO9Wofm2HFo1FhpksSV F3mGBVnzNdxXf23fU6r4Inaj547UwKEsWYyr2i0Lh7L/eQx1dZR1nO9m1DJfl7xgbwVV t/P/Ynss2SMhWVLF9ycbHFEb3FghOARGhU43dNZE14DRQaOK4IsFBQzLStsck95rM0rf 1hcrOLDJOIiLjOpRWdihnNXYjU8mRBe/yxfssPMuheyowEvoUQVtW2eg0AWvgPOC/yfR gr3A== X-Gm-Message-State: APjAAAWaFvk+/sH5NaxfyzRDVAfx9O7fU5jnVM5kkO33UR38cd34qHED HccNA//Ls5HFIc3Rv1DD/YD+cg== X-Google-Smtp-Source: APXvYqy2bx2+1MOm/glZSsmaCtGCM9fsuPgPSsBrYLKN2mvBXXRw/H0R5/+8kgJE1cbHuIVx77qz1w== X-Received: by 2002:a37:a5d3:: with SMTP id o202mr13122947qke.283.1573848707981; Fri, 15 Nov 2019 12:11:47 -0800 (PST) Received: from qcai.nay.com (nat-pool-bos-t.redhat.com. [66.187.233.206]) by smtp.gmail.com with ESMTPSA id m13sm4612267qka.109.2019.11.15.12.11.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 15 Nov 2019 12:11:47 -0800 (PST) From: Qian Cai To: akpm@linux-foundation.org Cc: hannes@cmpxchg.org, surenb@google.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Qian Cai Subject: [PATCH -next v2] mm/vmscan: fix some -Wenum-conversion warnings Date: Fri, 15 Nov 2019 15:11:37 -0500 Message-Id: <1573848697-29262-1-git-send-email-cai@lca.pw> X-Mailer: git-send-email 1.8.3.1 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: The -next commit "mm: vmscan: enforce inactive:active ratio at the reclaim root" [1] introduced some Clang -Wenum-conversion warnings, mm/vmscan.c:2216:39: warning: implicit conversion from enumeration type 'enum lru_list' to different enumeration type 'enum node_stat_item' [-Wenum-conversion] inactive = lruvec_page_state(lruvec, inactive_lru); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~ mm/vmscan.c:2217:37: warning: implicit conversion from enumeration type 'enum lru_list' to different enumeration type 'enum node_stat_item' [-Wenum-conversion] active = lruvec_page_state(lruvec, active_lru); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~ mm/vmscan.c:2746:42: warning: implicit conversion from enumeration type 'enum lru_list' to different enumeration type 'enum node_stat_item' [-Wenum-conversion] file = lruvec_page_state(target_lruvec, LRU_INACTIVE_FILE); ~~~~~~~~~~~~~~~~~ ^~~~~~~~~~~~~~~~~ Since it guarantees the relative order between the LRU items, fix it by using NR_LRU_BASE for the translation. [1] http://lkml.kernel.org/r/20191107205334.158354-4-hannes@cmpxchg.org Signed-off-by: Qian Cai Acked-by: Johannes Weiner --- v2: use NR_LRU_BASE/NR_INACTIVE_FILE per Johannes. mm/vmscan.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 122b3920aaa4..c8e88f4d9932 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2213,8 +2213,8 @@ static bool inactive_is_low(struct lruvec *lruvec, enum lru_list inactive_lru) unsigned long inactive_ratio; unsigned long gb; - inactive = lruvec_page_state(lruvec, inactive_lru); - active = lruvec_page_state(lruvec, active_lru); + inactive = lruvec_page_state(lruvec, NR_LRU_BASE + inactive_lru); + active = lruvec_page_state(lruvec, NR_LRU_BASE + active_lru); gb = (inactive + active) >> (30 - PAGE_SHIFT); if (gb) @@ -2743,7 +2743,7 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc) * thrashing, try to reclaim those first before touching * anonymous pages. */ - file = lruvec_page_state(target_lruvec, LRU_INACTIVE_FILE); + file = lruvec_page_state(target_lruvec, NR_INACTIVE_FILE); if (file >> sc->priority && !(sc->may_deactivate & DEACTIVATE_FILE)) sc->cache_trim_mode = 1; else