2021-01-13 02:53:46

by Shakeel Butt

[permalink] [raw]
Subject: Re: mmotm 2021-01-12-01-57 uploaded (NR_SWAPCACHE in mm/)

On Tue, Jan 12, 2021 at 1:50 PM Andrew Morton <[email protected]> wrote:
>
> On Tue, 12 Jan 2021 12:38:18 -0800 Randy Dunlap <[email protected]> wrote:
>
> > On 1/12/21 1:58 AM, [email protected] wrote:
> > > The mm-of-the-moment snapshot 2021-01-12-01-57 has been uploaded to
> > >
> > > https://www.ozlabs.org/~akpm/mmotm/
> > >
> > > mmotm-readme.txt says
> > >
> > > README for mm-of-the-moment:
> > >
> > > https://www.ozlabs.org/~akpm/mmotm/
> > >
> > > This is a snapshot of my -mm patch queue. Uploaded at random hopefully
> > > more than once a week.
> > >
> >
> > on i386 and x86_64:
> >
> > when CONFIG_SWAP is not set/enabled:
> >
> > ../mm/migrate.c: In function ‘migrate_page_move_mapping’:
> > ../mm/migrate.c:504:35: error: ‘NR_SWAPCACHE’ undeclared (first use in this function); did you mean ‘QC_SPACE’?
> > __mod_lruvec_state(old_lruvec, NR_SWAPCACHE, -nr);
> > ^~~~~~~~~~~~
> >
> > ../mm/memcontrol.c:1529:20: error: ‘NR_SWAPCACHE’ undeclared here (not in a function); did you mean ‘SGP_CACHE’?
> > { "swapcached", NR_SWAPCACHE },
> > ^~~~~~~~~~~~
>
> Thanks. I did the below.
>
> But we're still emitting "Node %d SwapCached: 0 kB" in sysfs when
> CONFIG_SWAP=n, which is probably wrong. Shakeel, can you please have a
> think?
>

Thanks Andrew for fixing. Independent of this patch, we already print
""SwapCached:" in /proc/meminfo for CONFIG_SWAP=n, so I think doing
the same for per-node meminfo should be fine too.