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 EF32EC46CD2 for ; Sun, 24 Dec 2023 17:15:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 084226B0071; Sun, 24 Dec 2023 12:15:04 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 00C7C6B0072; Sun, 24 Dec 2023 12:15:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DC8EC6B0074; Sun, 24 Dec 2023 12:15:03 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id CDD2C6B0071 for ; Sun, 24 Dec 2023 12:15:03 -0500 (EST) Received: from smtpin15.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 9A435120219 for ; Sun, 24 Dec 2023 17:15:03 +0000 (UTC) X-FDA: 81602362086.15.03BE934 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf21.hostedemail.com (Postfix) with ESMTP id AFD1A1C0006 for ; Sun, 24 Dec 2023 17:15:01 +0000 (UTC) Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VlGmpu6D; spf=pass (imf21.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1703438101; 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=rWclcl6l5CpDy57UrngTUx/Lz4xG/HJvFYX2YqYxruU=; b=DDbBV+hqwACVjizdzutFD4ismmbeM1WPuTObciB0MydSSFAj3rv7daj4csOmwR9ynoxb/O +rhhjqKx1BmUhT0f/A17aNl2En56cSnnUPzTAMlhWKMZGEqs6026+W4C/aYLLYc47m+/VE Fgtv9rcaOUkwxS8SN9dAvfMzTC2UEGo= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1703438101; a=rsa-sha256; cv=none; b=gz1GQh+E1x+D2YeuK4Y9ouUAF/F+Q2V4tfU1yTnQb0AGPeyZkx65ir4JPZcVu/MdcckB6A lWdCZq2LLHbX3ZXsvzDbjVcNORaxuuOV0bZXhwgkdPNUUnachXZYBZiBrYKfUt5h+yPfd+ /WzLm+HJGVc/39NXle6l7js4lkIStb4= ARC-Authentication-Results: i=1; imf21.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=VlGmpu6D; spf=pass (imf21.hostedemail.com: domain of chrisl@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=chrisl@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 9DDF260BFA for ; Sun, 24 Dec 2023 17:15:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D84A4C433AB for ; Sun, 24 Dec 2023 17:14:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703438099; bh=sUtCX9BT+hLGHE76Vf5GNGPKRofN6whsC0oBi+gGX5A=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=VlGmpu6DZnJkISsA1AJaq6693WmCVAlu3dANfFSz3B86OlMtQcsPaz3HN6ijeQoXd zBMvQfLvGYM0eR7Enl5APLYft1AbNDvhcDwZTMkOiP1XPmkQo2+kukrXQ7ZS6Pvs9n +tk/5tCFxJJI9Lc8L0YaXL37wkwvgMBH8QDVsMEnoEAyG/PIbGnfeLRvAn7jd8eTGX qi7nZ4wPYz+cF80OZGT34jZu/+Fq3K1PGlY1s0f2y1d2e7gRpJ/bX7mWjZMfgNg2/I scTAnd1u9JLhUjFDGu6Pd4Q9E0u2KabwHYIFALi9I9sh+DC4Fz6us5qfdtR1CejzwZ BxwUZKibSDsQA== Received: by mail-io1-f47.google.com with SMTP id ca18e2360f4ac-7b7fb34265fso138764039f.3 for ; Sun, 24 Dec 2023 09:14:59 -0800 (PST) X-Gm-Message-State: AOJu0YzhWc2470PTMWVIKnvFbM1DMalOcmyFAvWM4zrSIBY+2y5Vlfmz nR3imgJk7mJBEM0PGg8Avf2W7PjidwQnOPlexMcjhIF614XZ X-Google-Smtp-Source: AGHT+IEO6q1FQ8VwDr8zmcOqSXXv7BmjQaVSMyiriY6QrNu/ufURkhTeW1w35vDQpv6nCx35oLFc7ejrJCa2fsnqf2s= X-Received: by 2002:a6b:7014:0:b0:7ba:965b:fde6 with SMTP id l20-20020a6b7014000000b007ba965bfde6mr4539184ioc.33.1703438098913; Sun, 24 Dec 2023 09:14:58 -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: Chris Li Date: Sun, 24 Dec 2023 09:14:47 -0800 X-Gmail-Original-Message-ID: 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)" , Nhat Pham , Yue Zhao Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: AFD1A1C0006 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 4g6tkcknyc4iq73nsh573ixg433g9ra9 X-HE-Tag: 1703438101-86198 X-HE-Meta: U2FsdGVkX18gleBWGkP6LkfqCNp1F4GLCrCdKguZNuaRAK+dCFWOLhAEa92yhm7m963LAz/2j7a8jX8+zI0SQvYr54A82w0dEmACUxBMGSszXdgSZDqgRFJmmk2SPXzG28Mug7hW9tonFoEfFMtH22AtuVQvgajDfclujkhbcmqOLmBQuR7WogEpIafK7fGXkt/jr5InSVtshAXC5ZEJw4kDIrckE2U7UVG3eaDgLVCUawEW+k+ekQlG3UMVfKW3CnWsXnJTd8vF3p08GFL8lAFUIrmlGlisWdUEhzboldWA/OsiFFLNKWLZU5nc5euYPtqVbIUzSH13XvrCAx8oZO43sQW2nwYvhm06XbL06vaK2ec7+AotFooBKoB9IZxNKpCPjHz/Hk0rN9b8wdCpZfb5E9S3Gu5VounElQnrx4cCgJ4YVPEl9t56HnD9++H4EkChqcxc4VwoT3A8b2KE6ixLWjY7N3qyXtvVvUBPbquCjOq6KLGspB3FfKxIvYX427Z+lIV2cksNGDrXrBbgvIDIFIN5RuZUlxDHavJj0lUuNpgih5qgDx4dcY48mC7H+rd75xNC9umyxQviWFF3o0oHdtG8Ne/qqBUSo8Pk2hrH9OjS1CKbFog7+JBvjvTltN+yJJAyoNK5glI1rkmHCA/z/arFRJR3RXk9+zr5tj5KODQZYUlpL5dFYv4H5lim7Sehc7VaUvRysplVU+OAbt8bqsFOTxCIBzDnFo0J42wdsIDl6P00tQmuoEj/ZostJyhgrwMaIzViqWzi2gQS20UJZw3BsZMbq/LipSJF6VLGV9xhwTkB9JPW2f3jY8w34Sb0c4nEhhO+GJq6qDKH/1VlamlKgjnPIJBf+JMbT+3mwfX2UAKwOsnpBiD5q6xpvCHnMZpHeTSsC2UADLv3ZRY2zUr2ANQVGNv2NNBIhv2iusr5NzGWmoNuZZ1L4S/sElEsPhOMcTZZLrCgYd9 ji6QBLEN EzmZKq0J8wMUUapbY7lCKAcEHXkpsrRUWIz/EGUzGE/BAfmozYXuI8mRxe53M5bwhTwK2ik8FqBQtj0GhuMZ4VlZx/mefeRwDAkeFQ6QyEKKtJClV+bAOLPKWGRO8+oN6CYBpmCP8m4QCvi5yKiCEaIK9PS2x9IYizEpjwuW5sp1MvIewGLmfLzk+7vSAQ33hbGjbrdkswdO6feLzjsWTBfRq3t73O1bBKYhqIXEY0z9ss7yF35LPHjA7JTLbDUFEktJrC1ayY6ixrb4BpWXYlFXGMdTS6RAPXQ4pI01K7V7+CLEBpIrhVUFoua+aF84c0liRhnUHykcKEMC0ZWoDhtPvApV7BC3IBfTIQi8ifpB10B440UGf+d0U6g== 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: Hi Dan, Acked-by: Chris Li Chris 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 > >