From mboxrd@z Thu Jan 1 00:00:00 1970 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 9AB2FC3DA6E for ; Thu, 21 Dec 2023 02:01:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 243646B0082; Wed, 20 Dec 2023 21:01:28 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1F3826B0083; Wed, 20 Dec 2023 21:01:28 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0BB1E6B0085; Wed, 20 Dec 2023 21:01:28 -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 EDFDD6B0082 for ; Wed, 20 Dec 2023 21:01:27 -0500 (EST) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id B6F9440650 for ; Thu, 21 Dec 2023 02:01:27 +0000 (UTC) X-FDA: 81589173414.23.C0A0BED Received: from mail-io1-f49.google.com (mail-io1-f49.google.com [209.85.166.49]) by imf15.hostedemail.com (Postfix) with ESMTP id 08923A0004 for ; Thu, 21 Dec 2023 02:01:25 +0000 (UTC) Authentication-Results: imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WUbeb83D; spf=pass (imf15.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.49 as permitted sender) smtp.mailfrom=nphamcs@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=1703124086; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=7uprnz/jjYuy4jWp8M6YseVkbWg8KRWXhaIAky0jmfE=; b=nlFTE2s8zEYN/OK9vsCD9EI4YibfFWa9Chfo9lYxTachj30xv8JEaWi37XNSIWzGcqwX51 fhfZeJZPvoGegDnN6SuqxPv8ZHLdA6tv/PNoQX/24IPg9n3Z6UgSofJudFaye0Soor8er0 fL8Z7JVa5/DEWmC2zvxd/pcU3aj5/XA= ARC-Authentication-Results: i=1; imf15.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=WUbeb83D; spf=pass (imf15.hostedemail.com: domain of nphamcs@gmail.com designates 209.85.166.49 as permitted sender) smtp.mailfrom=nphamcs@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703124086; a=rsa-sha256; cv=none; b=qutOdI2BqjDc7oO4Ap4IaxoOiTRfLXJF276lghcIOVDQZBTROqDb7RlKroHCx+6fiZENRB 50LbPZojmIWKRscpfDJzFOF6G1iG809pfxgX7nEaCaYusD3TiihhD7wniIUL84KHkY4nB8 W50lMTKqINqZaEIdNHBftKgLIdH8IbY= Received: by mail-io1-f49.google.com with SMTP id ca18e2360f4ac-7b7fdde8b54so12756539f.1 for ; Wed, 20 Dec 2023 18:01:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1703124085; x=1703728885; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=7uprnz/jjYuy4jWp8M6YseVkbWg8KRWXhaIAky0jmfE=; b=WUbeb83Dv9nWdDIfvPNgp1CgsqDKJDUILSIC9VtqyHk7KGbTCcZiyfLammKXl1aEhi OYwXv2lQ3o5UiWtgh3Coh3zX/up+H1yG0Yq65+fLiTyXQZ/WxwH8X+uwpC+koLsjeuKy LE7lznsT4ZsGaVwg026exEGRx0qB0xHY/EHbPrv9egep8r+E1/AR2uw6hpL7XR1KWNA0 39FC+izvv/ascfdYSTjDzPabNB6z9y1ghGE/C5xejdfofcBTFJmY4nbMX9HlsYEGicSS gwnEecBih21okilDMvVyGFO+WgyFu8Lbpnc90CXM1WCreDbujUUPe1jUfDja6QA8pzsE zVTA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1703124085; x=1703728885; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7uprnz/jjYuy4jWp8M6YseVkbWg8KRWXhaIAky0jmfE=; b=C+OpN9q5OR31tuUYIwSdNdtykbP3EKULGOWJRNIPsOFfl5KduJOxO/vTCF7q/3aeAx feIKT/iZ7+AYTb8Zaor30nH2qQHXjYz+XGn2fQg05NNbfsgK+wRQcnOcgGLMlOwezHGU yw8aF8r8NYOec41Kdm/k7aSVcuzfpTgknkEfPRCBGJ+DnBPeR2SFzxXGBqxnHw0ZjkGE rT4r0qIhastziJesqcYesnd92lH/aZWpT71hCQxWVZQvdUAjYstSEQF6yZqPnT9vHLNy ZnnlX7Rw8fsxj97KttzwtNpR8tzf6N/4in5YMvyjeUaJZS5K476b2eSpfnGzbkSdybU6 s1Tw== X-Gm-Message-State: AOJu0YxxpbBeu4MvdIvMY+A139wCPNZIcqI8ko2ABt+7HTrc+t4JJ+Lq sDqdIHgPzmFrq6Iq8P2HM3rQ7/uwF9WiA66bXN0= X-Google-Smtp-Source: AGHT+IHR51LjiWdOebtbBexnDeSV//C/Noc4zDv9CvLklzYhekwRS6kGUobGMBJIQkMj3Tu/WQhPg+zbFBnbMgKV5YM= X-Received: by 2002:a6b:3f56:0:b0:7b9:232c:eeb3 with SMTP id m83-20020a6b3f56000000b007b9232ceeb3mr2763300ioa.6.1703124084910; Wed, 20 Dec 2023 18:01:24 -0800 (PST) MIME-Version: 1.0 References: <20231220152653.3273778-1-schatzberg.dan@gmail.com> <20231220152653.3273778-2-schatzberg.dan@gmail.com> In-Reply-To: <20231220152653.3273778-2-schatzberg.dan@gmail.com> From: Nhat Pham Date: Wed, 20 Dec 2023 18:01:14 -0800 Message-ID: Subject: Re: [PATCH v5 1/2] mm: add defines for min/max swappiness To: Dan Schatzberg Cc: Johannes Weiner , Roman Gushchin , Yosry Ahmed , Huan Yang , 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 , Kefeng Wang , SeongJae Park , "Vishal Moola (Oracle)" , Yue Zhao Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 08923A0004 X-Rspam-User: X-Stat-Signature: p7s6b3xdqesri1j6tjo368x44jjb3i7o X-Rspamd-Server: rspam01 X-HE-Tag: 1703124085-976318 X-HE-Meta: U2FsdGVkX18Q7bLMzCZMwmitXsAKJe4UxLHDThCtv2T0D+YPE8+a+brc3XchrFdlAoGvyjG7fpPxIwJs5Fc/MUECpJud8qFsXzjsA2pEroU1TEzANsLAMKzVzp4k+WycyjHe7hHArokUIWuFloH5cVhIi7OsPYyRZE3DGeGUyU5Pz1j9VcSAinP2jkjznLiesorz5+0wxvJKAFuizi1iqu0VLsIEIZCxMfIkZ7PU9NA8VXk1P/L39LHQz8N9tupvQnxy44pHsfSzDYZcasxwVevvdJm2WsMo3fvkdR3gcXF133B+qtg3Wo4zUEtOZ8v70D11XSM/p0xGMpLd076PWpZZrQJcIqDGemCsQTbMFRVfppyMTDIeSZRH1utbNIk/3ktF4VmP+QJfvn/YZLCz6S8TRMPicZXaBEtbBg1GHpkl/wwh09LqHuPi6sAyRITPJFn78LJjvCXbLqR9EFjbh9CyS0UDFrBB2HuC0W9Ku62/eNY1hnJ4ciZ2fXfTmqTeRYFLJzU8bitbwm7qiiG0f3M+uAVFYtqDwfxx52LVcS8ZNDJCVPV0UVPxTkRBPvDQGRlx4th3/J4xbPnzfNR+u8mxPJsylGIPQETKhTNeLcsMCQOAPwdgeoPMKVFFAcYPVRkG3CNjRBnYcEdoL/AkEjDznevzu/YKVw9mgO9FSCGcU2LOdlQZ4NaFrhWF4GqMhUnG7lJ3kcj9rXeWwa8f47kqlYRhasVe2ZX5u9KRf2zng62T/TuqAu9E/dHOeCirr4kyBpzhGAOwoRAay6+290mTgTiRJWlovkpDkfq0DwrjVhF7/lkfdymqBzjK2+Lf4D//AkcU3NOeKB3rJ6boycuisapHAACnNWwTjy9aK9t2CeL9BU7ZyepXKydcqLe+TIf3shyCW8MBvXFOx/tCVBjD1PWilWb77onZxZOLS6n3jxWjvwX/DG6Tz5q02dueyYHWZ63maUk7gW1YDSE 1XLaMKKN nqY9Gnm6GRvjp57sPtWSCoBZS0NLYS/S4bbDFUIeO+D610PqB80HJapu2b76wsIZ9V5oUJbVSe5zEZ4BVUfVTaH5WqHnvx9Z7XJFmQzhO8T0oFZQS8k6Z6phg2vkGzc2bCVv19n4Icbn5+AMaaE3ENnSI/CHrRup9uBVMD02WzrZfpEJmva34ulrUoESEBMr0PQMDXfJL3YEXBZn9gZz268g33ET2wUJePJ/vsoyoKatsUsaGFHizayh3p7MsY5JxcaMp9FgIIxrTRchgMPS988haoq9//pzDRyg2Uu1E79s7vK0WnUV88tVKCc/Oi62TZfQUg9pnA3gaOmsch3RihtxfrZ8uk9HWq042u+gzOL/kDpsB708+0GHbHNXyN327BJjNuW1LXJtsFaKDK2Ow1a8BPl/1u82QOCinc1qJWn3XHReYxokHgreUe1tVUk9bKpPo 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: On Wed, Dec 20, 2023 at 7:27=E2=80=AFAM Dan Schatzberg wrote: > > 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 | 14 +++++++------- > 3 files changed, 10 insertions(+), 8 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 zonelis= t *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 *mem= cg, > unsigned long nr_pages, > gfp_t gfp_mask, > diff --git a/mm/memcontrol.c b/mm/memcontrol.c > index b226090fd906..fbe9f02dd206 100644 > --- a/mm/memcontrol.c > +++ b/mm/memcontrol.c > @@ -4337,7 +4337,7 @@ static int mem_cgroup_swappiness_write(struct cgrou= p_subsys_state *css, > { > struct mem_cgroup *memcg =3D 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 9dd8977de5a2..d91963e2d47f 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -183,7 +183,7 @@ struct scan_control { > #endif > > /* > - * From 0 .. 200. Higher means more swappy. > + * From 0 .. MAX_SWAPPINESS. Higher means more swappy. > */ > int vm_swappiness =3D 60; > > @@ -2403,7 +2403,7 @@ static void get_scan_count(struct lruvec *lruvec, s= truct scan_control *sc, > ap =3D swappiness * (total_cost + 1); > ap /=3D anon_cost + 1; > > - fp =3D (200 - swappiness) * (total_cost + 1); > + fp =3D (MAX_SWAPPINESS - swappiness) * (total_cost + 1); > fp /=3D file_cost + 1; > > fraction[0] =3D 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] =3D { swappiness, 200 - swappiness }; > + int gain[ANON_AND_FILE] =3D { swappiness, MAX_SWAPPINESS - swappi= ness }; > > /* > * Compare the first tier of anon with that of file to determine = which > @@ -4436,7 +4436,7 @@ static int isolate_folios(struct lruvec *lruvec, st= ruct scan_control *sc, int sw > /* > * Try to make the obvious choice first. When anon and file are b= oth > * available from the same generation, interpret swappiness 1 as = file > - * first and 200 as anon first. > + * first and MAX_SWAPPINESS as anon first. > */ > if (!swappiness) > type =3D LRU_GEN_FILE; > @@ -4444,7 +4444,7 @@ static int isolate_folios(struct lruvec *lruvec, st= ruct scan_control *sc, int sw > type =3D LRU_GEN_ANON; > else if (swappiness =3D=3D 1) > type =3D LRU_GEN_FILE; > - else if (swappiness =3D=3D 200) > + else if (swappiness =3D=3D MAX_SWAPPINESS) > type =3D LRU_GEN_ANON; > else > type =3D get_type_to_scan(lruvec, swappiness, &tier); > @@ -5398,9 +5398,9 @@ static int run_cmd(char cmd, int memcg_id, int nid,= unsigned long seq, > > lruvec =3D get_lruvec(memcg, nid); > > - if (swappiness < 0) > + if (swappiness < MIN_SWAPPINESS) > swappiness =3D get_swappiness(lruvec, sc); > - else if (swappiness > 200) > + else if (swappiness > MAX_SWAPPINESS) > goto done; > > switch (cmd) { > -- > 2.39.3 > Sorry for being late to the party :) Was preoccupied with zswap convos. Hmm these are all the occurrences of 0 and 200 (in the context of swappiness) I can dig out. So, FWIW: Reviewed-by: Nhat Pham