From patchwork Wed Dec 13 01:38:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Schatzberg X-Patchwork-Id: 13490270 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 E1A72C4332F for ; Wed, 13 Dec 2023 01:38:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 75AA88D0011; Tue, 12 Dec 2023 20:38:52 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 709E48D0009; Tue, 12 Dec 2023 20:38:52 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5AB468D0011; Tue, 12 Dec 2023 20:38:52 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 4540B8D0009 for ; Tue, 12 Dec 2023 20:38:52 -0500 (EST) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 2AFE11A0ADA for ; Wed, 13 Dec 2023 01:38:52 +0000 (UTC) X-FDA: 81560086104.14.48B1874 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) by imf03.hostedemail.com (Postfix) with ESMTP id 66FD02000A for ; Wed, 13 Dec 2023 01:38:50 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="TVe/XU5V"; spf=pass (imf03.hostedemail.com: domain of schatzberg.dan@gmail.com designates 209.85.167.170 as permitted sender) smtp.mailfrom=schatzberg.dan@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1702431530; a=rsa-sha256; cv=none; b=QXcdXaCzlBW47vppROghKEOGvpMaieTgbwCxa7y0/uOcWCwLWwQ0WEbmi8G2hVXYxVOQtG FCxpUIDg6J4es0eGSwzojNV/Lu2mGjbazor6Y/d+UUJSK5rA5e+EOKJSwtAfpP4lsPatGA A21CQlLHeETvhN7tC55F756mNu4UosE= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b="TVe/XU5V"; spf=pass (imf03.hostedemail.com: domain of schatzberg.dan@gmail.com designates 209.85.167.170 as permitted sender) smtp.mailfrom=schatzberg.dan@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1702431530; 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:in-reply-to:references:references:dkim-signature; bh=yjbQsD2zw+AVOTOAO2gfbyL0vE9tzy1c44w2jRTtXIc=; b=3sCIfdGtYi/YJs3IE1Nytc1QvUHxIAzXl7y5/YFeyeYYRJWOmCfUR8ErbuRBiGIo0mf0pF ZxXCJYvEmovoxa4+QyDUWmSAqQ5akNSd76sdyZkhkDtP7PxUz7juZ+pxEQwYO7F7gZ7m7M FrA+iArincz4YoarB3XP1JudJTpUPGQ= Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3ba10647a19so1859138b6e.3 for ; Tue, 12 Dec 2023 17:38:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702431529; x=1703036329; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=yjbQsD2zw+AVOTOAO2gfbyL0vE9tzy1c44w2jRTtXIc=; b=TVe/XU5VmKCuF9vk3M22q5joTKXrs8rVi6RAnnd5bmvfdCiSHtPAYa1zeTrAjZeSEb tLmym5wdrHVyi7/W2MROhF2ywOIjq707bFU8tP2lacwU/IQkpUNtvpPXj9FY0c2ZYmy4 yLVpzQ6ZOSwrhVcCXD1AQU9XvU5CyPiiM/8vajtT1HMZxCxV1xc8cMbs9iG8lRwSrSez +xEc+XtelrhmEKM+izGXv0WDCQ63Lf9p1yglEtKQ9Zj337gYy2KMq3Gk+rhfM+86GLuG xggOWPcUmnGW/EI/FThDR66+Avdhlty5FkD9vVjxc96plgwDzpcy8GhlylsbTrAW6ybu Vclg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702431529; x=1703036329; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=yjbQsD2zw+AVOTOAO2gfbyL0vE9tzy1c44w2jRTtXIc=; b=JiXM9R85QXaYtaduvQJJLKm0HWRJSB0S79Q6xqqT+thtmjPQGJBnPwL3jf/iSrfvux 4XYSaF9G1pv7lAAbc3ZBflbF41vVpUdpKyezN51qwO8lrrDnPeUE24wD5h1weChfdVGE 8os1cJXa5E3GEbjEOHF43KKrcAJvXX7QR0oDaOpZcgh+WNj5IJXiSPeeejSSVsg7VnO9 QFCQ9ZaZoyPd2fE3tTjnT82U/aSfobnXCUUo7Lyc7CX9dwNyqR7d4xdQ8OiQAJaadg85 uTzz5m2NSLnDDlknhbKhdcRVgrIDPMInmowo7/p1K2yIukr6AKB6Mu+wSiCGePo6bxmx /7Jg== X-Gm-Message-State: AOJu0Yx8RhxvTwx/2ladUaFYaoFxrkpDx9CZg6nF/Sw68cCXwbHFfh3c IQsb8t0KPI6zkE5VpPh770A= X-Google-Smtp-Source: AGHT+IGgXLdoPr2KB+fyLYZzAHHRmPQQCEoDPHrM7vuygKI9CqqksVCR1GKYIffLffbC2ftpntZpnA== X-Received: by 2002:a05:6808:16a4:b0:3b8:b063:6bae with SMTP id bb36-20020a05680816a400b003b8b0636baemr8604954oib.93.1702431529213; Tue, 12 Dec 2023 17:38:49 -0800 (PST) Received: from localhost ([2620:10d:c090:500::7:1c76]) by smtp.gmail.com with ESMTPSA id u23-20020a62d457000000b006ce781f6f85sm9148130pfl.43.2023.12.12.17.38.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Dec 2023 17:38:48 -0800 (PST) From: Dan Schatzberg To: Johannes Weiner , Roman Gushchin , Yosry Ahmed , Huan Yang Cc: linux-kernel@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Tejun Heo , Zefan Li , Jonathan Corbet , Michal Hocko , Shakeel Butt , Muchun Song , Andrew Morton , David Hildenbrand , Matthew Wilcox , Chris Li , Kefeng Wang , Dan Schatzberg , Yue Zhao , Hugh Dickins Subject: [PATCH V4 1/2] mm: add defines for min/max swappiness Date: Tue, 12 Dec 2023 17:38:02 -0800 Message-Id: <20231213013807.897742-2-schatzberg.dan@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231213013807.897742-1-schatzberg.dan@gmail.com> References: <20231213013807.897742-1-schatzberg.dan@gmail.com> MIME-Version: 1.0 X-Rspamd-Server: rspam08 X-Rspamd-Queue-Id: 66FD02000A X-Stat-Signature: pe7n1wr1iutc7d4sip6p8jbsrd39ie8s X-Rspam-User: X-HE-Tag: 1702431530-581133 X-HE-Meta: U2FsdGVkX1/fHf0SseQ91TQzgogKUeIddT8d2hku91vlK0Ktjp58YQZbkQLkxheFfxDRQ1myVw4oB59gOTuddO6EPhy56M++V+QZdY8e/PLPddZ++Lk+UJFGnxEbfjJBS8qyQtcJzrLACzFMnDDzEJN1d419ETp7uO7jvX8ogPLaYwpPwZC+0Z9Yt8LxERx+aAbCHru36QCGeytHk58OLiFFk6DHcjybZdgyN8QlhbnFt/lOwfafBCtfXGDvpWRP3Sj1JMBQPBsowgdSPTNpFEzOzvLxqakM5ZEv5vw5yeu4R6b9x8TLAg9YkiQ2QsqIuR86pFMrMisi79Sm0lxCvn1mE/VreIl5SrIjrFkMxml3CFYflYsA30PZT4Ck7QgvujHy05KxUlcfeNRFbgu81AdbR7Py6Wm4dKc0Q7BCvNt2eoifxls3SrsrLQsC1ga0RLrm9gFNjaLpEmETmasZ8AxX1MyOxctbZzMJzA9l1/wXI9s0JANnRxX7cAvrwBe7027k6VP07sFheKWu7sesv26h5UM/W7wEBKljavjofNeVVxnXNskUKEHrlTfKYkRwV5dFBOQpsDKn/XALHbKIYhH3TacXpfAE+P3YBJG1n6RSiWQwqbh2xyQ9O4a2MwthLkZNsqjXHiaOpyCGRI/OuwEU+7+1VMvf+2G9aDpuGfdBg7o5dF/jUP0ZB7B4jiCDRrVJP3izZcXr2mjlZQn1VoBqThnGx1NpuTvraFnhCaiO9O6luS6y+dzAJtGJDDbT63YNiaIK7UPA61vRMGVDNH1t2VjcK3/DGllcMXOMqaj2EgSdvbwlwOoZcgJiewswLUR4Hz8bz7LOxHiBed2x+fShcvZFEuVCs8TSv0mbjmIEg7jhp8dt0omAMk/5av8y8wb84gDu9ZwWEX2K4m91dpuMJbfrbYyQC9UBk6VVxbOFyFt8nn1mzKjGLPsE8bjseTBjHs3F1DVmE4Qh4TL jg9pXYpY 5V50bUa2hSf3b02ttBoodhCBknX801wsrXQj/pEGSum4vEyh/BJH1DRKAnwEoCc76iWSXeDRpUhRA4mw9DMYRmNFgYmJwU11DtO8COnS6r5Hd3ypsue9XoFb6ycdpnRUw5KDOogyoSzhk0S772dGoNPo2PGcUNcYzQ7NlPcCJ3j3+BSpocavjzIMHYB305ARcT5mdgyS2Nvt1yN86HdZBzU2TNg85maOF2us1dy4mo1G6zG5NBOVTeo8pnyfK7ZzTD1RLOLPG9BnLvWtLkkivT1xKJKASBH8pk2QHoTeFHLRKa9AJIHT+f+wuBl7mA+CTbOnIUj6/qS/07vz0PRpVVpls0pWWGhCnqkQNTJdrAfYfY1dtv/9Zmn5nLpwHIJ6IthSxKFdWrdQwUBNfqel8wRodk48zEDD9vDuWRwDQS2aUKk5wQSf49LXhTDGm2WVhA9KREUhYQB4DVbhAWi5QHI/GD+ENGyXqXEa4MJHqOQYF8hnKa/ihDQ4FOUogUD2TPV7lZSFv6mw6fAHrNLOrLJgS/8dwxfT0l3GG/zh6dTC72RPyrVSBv88MsA== 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: We use the constants 0 and 200 in a few places in the mm code when referring to the min and max swappiness. This patch adds MIN_SWAPPINESS and MAX_SWAPPINESS #defines to improve clarity. There are no functional changes. Signed-off-by: Dan Schatzberg --- include/linux/swap.h | 2 ++ mm/memcontrol.c | 2 +- mm/vmscan.c | 10 +++++----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index f6dd6575b905..e2ab76c25b4a 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -407,6 +407,8 @@ extern unsigned long try_to_free_pages(struct zonelist *zonelist, int order, #define MEMCG_RECLAIM_MAY_SWAP (1 << 1) #define MEMCG_RECLAIM_PROACTIVE (1 << 2) +#define MIN_SWAPPINESS 0 +#define MAX_SWAPPINESS 200 extern unsigned long try_to_free_mem_cgroup_pages(struct mem_cgroup *memcg, unsigned long nr_pages, gfp_t gfp_mask, diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 1c1061df9cd1..9748a6b88bb8 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -4337,7 +4337,7 @@ static int mem_cgroup_swappiness_write(struct cgroup_subsys_state *css, { struct mem_cgroup *memcg = mem_cgroup_from_css(css); - if (val > 200) + if (val > MAX_SWAPPINESS) return -EINVAL; if (!mem_cgroup_is_root(memcg)) diff --git a/mm/vmscan.c b/mm/vmscan.c index 506f8220c5fe..2aa671fe938b 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2403,7 +2403,7 @@ static void get_scan_count(struct lruvec *lruvec, struct scan_control *sc, ap = swappiness * (total_cost + 1); ap /= anon_cost + 1; - fp = (200 - swappiness) * (total_cost + 1); + fp = (MAX_SWAPPINESS - swappiness) * (total_cost + 1); fp /= file_cost + 1; fraction[0] = ap; @@ -4400,7 +4400,7 @@ static int get_type_to_scan(struct lruvec *lruvec, int swappiness, int *tier_idx { int type, tier; struct ctrl_pos sp, pv; - int gain[ANON_AND_FILE] = { swappiness, 200 - swappiness }; + int gain[ANON_AND_FILE] = { swappiness, MAX_SWAPPINESS - swappiness }; /* * Compare the first tier of anon with that of file to determine which @@ -4444,7 +4444,7 @@ static int isolate_folios(struct lruvec *lruvec, struct scan_control *sc, int sw type = LRU_GEN_ANON; else if (swappiness == 1) type = LRU_GEN_FILE; - else if (swappiness == 200) + else if (swappiness == MAX_SWAPPINESS) type = LRU_GEN_ANON; else type = get_type_to_scan(lruvec, swappiness, &tier); @@ -5368,9 +5368,9 @@ static int run_cmd(char cmd, int memcg_id, int nid, unsigned long seq, lruvec = get_lruvec(memcg, nid); - if (swappiness < 0) + if (swappiness < MIN_SWAPPINESS) swappiness = get_swappiness(lruvec, sc); - else if (swappiness > 200) + else if (swappiness > MAX_SWAPPINESS) goto done; switch (cmd) {