| Message ID | 20210305041901.2396498-4-willy@infradead.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Page folios | expand |
On Fri, 5 Mar 2021 04:18:39 +0000 "Matthew Wilcox (Oracle)" <willy@infradead.org> wrote: > Allow page counters to be more readily modified by callers which have > a folio. Name these wrappers with 'stat' instead of 'state' as requested > by Linus here: > https://lore.kernel.org/linux-mm/CAHk-=wj847SudR-kt+46fT3+xFFgiwpgThvm7DJWGdi4cVrbnQ@mail.gmail.com/ > > --- a/include/linux/vmstat.h > +++ b/include/linux/vmstat.h > @@ -402,6 +402,54 @@ static inline void drain_zonestat(struct zone *zone, > struct per_cpu_pageset *pset) { } > #endif /* CONFIG_SMP */ > > +static inline > +void __inc_zone_folio_stat(struct folio *folio, enum zone_stat_item item) > +{ > + __mod_zone_page_state(folio_zone(folio), item, folio_nr_pages(folio)); > +} The naming is unfortunate. We expect inc: add one to dec: subtract one from mod: modify by signed quantity So these are inconsistent. Perhaps use "add" and "sub" instead. At least to alert people to the fact that these are different. And, again, it's nice to see the subsystem's name leading the identifiers, so "zone_folio_stat_add()".
On Sat, Mar 13, 2021 at 12:37:07PM -0800, Andrew Morton wrote: > On Fri, 5 Mar 2021 04:18:39 +0000 "Matthew Wilcox (Oracle)" <willy@infradead.org> wrote: > > > Allow page counters to be more readily modified by callers which have > > a folio. Name these wrappers with 'stat' instead of 'state' as requested > > by Linus here: > > https://lore.kernel.org/linux-mm/CAHk-=wj847SudR-kt+46fT3+xFFgiwpgThvm7DJWGdi4cVrbnQ@mail.gmail.com/ > > > > --- a/include/linux/vmstat.h > > +++ b/include/linux/vmstat.h > > @@ -402,6 +402,54 @@ static inline void drain_zonestat(struct zone *zone, > > struct per_cpu_pageset *pset) { } > > #endif /* CONFIG_SMP */ > > > > +static inline > > +void __inc_zone_folio_stat(struct folio *folio, enum zone_stat_item item) > > +{ > > + __mod_zone_page_state(folio_zone(folio), item, folio_nr_pages(folio)); > > +} > > The naming is unfortunate. We expect > > inc: add one to > dec: subtract one from > mod: modify by signed quantity > > So these are inconsistent. Perhaps use "add" and "sub" instead. At > least to alert people to the fact that these are different. > > And, again, it's nice to see the subsystem's name leading the > identifiers, so "zone_folio_stat_add()". I thought this was a 'zone stat', so __zone_stat_add_folio()? I'm not necessarily signing up to change the existing __inc_node_page_state(), but I might. If so, __node_stat_add_page()?
On Sun, 14 Mar 2021 04:11:55 +0000 Matthew Wilcox <willy@infradead.org> wrote: > On Sat, Mar 13, 2021 at 12:37:07PM -0800, Andrew Morton wrote: > > On Fri, 5 Mar 2021 04:18:39 +0000 "Matthew Wilcox (Oracle)" <willy@infradead.org> wrote: > > > > > Allow page counters to be more readily modified by callers which have > > > a folio. Name these wrappers with 'stat' instead of 'state' as requested > > > by Linus here: > > > https://lore.kernel.org/linux-mm/CAHk-=wj847SudR-kt+46fT3+xFFgiwpgThvm7DJWGdi4cVrbnQ@mail.gmail.com/ > > > > > > --- a/include/linux/vmstat.h > > > +++ b/include/linux/vmstat.h > > > @@ -402,6 +402,54 @@ static inline void drain_zonestat(struct zone *zone, > > > struct per_cpu_pageset *pset) { } > > > #endif /* CONFIG_SMP */ > > > > > > +static inline > > > +void __inc_zone_folio_stat(struct folio *folio, enum zone_stat_item item) > > > +{ > > > + __mod_zone_page_state(folio_zone(folio), item, folio_nr_pages(folio)); > > > +} > > > > The naming is unfortunate. We expect > > > > inc: add one to > > dec: subtract one from > > mod: modify by signed quantity > > > > So these are inconsistent. Perhaps use "add" and "sub" instead. At > > least to alert people to the fact that these are different. > > > > And, again, it's nice to see the subsystem's name leading the > > identifiers, so "zone_folio_stat_add()". > > I thought this was a 'zone stat', so __zone_stat_add_folio()? > I'm not necessarily signing up to change the existing > __inc_node_page_state(), but I might. If so, __node_stat_add_page()? That works. It's the "inc means +1" and "dec means -1" whiplash that struck me the most.
> +static inline > +void __inc_zone_folio_stat(struct folio *folio, enum zone_stat_item item) This prototype style is weird and doesn't follow either of the preffered styles.. > static inline void __mod_zone_freepage_state(struct zone *zone, int nr_pages, > int migratetype) > { > @@ -536,6 +584,24 @@ static inline void __dec_lruvec_page_state(struct page *page, > __mod_lruvec_page_state(page, idx, -1); > } > > +static inline void __mod_lruvec_folio_stat(struct folio *folio, > + enum node_stat_item idx, int val) .. like the ones that exist and are added by you just below.
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 506d625163a1..dff5342df07b 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h @@ -402,6 +402,54 @@ static inline void drain_zonestat(struct zone *zone, struct per_cpu_pageset *pset) { } #endif /* CONFIG_SMP */ +static inline +void __inc_zone_folio_stat(struct folio *folio, enum zone_stat_item item) +{ + __mod_zone_page_state(folio_zone(folio), item, folio_nr_pages(folio)); +} + +static inline +void __dec_zone_folio_stat(struct folio *folio, enum zone_stat_item item) +{ + __mod_zone_page_state(folio_zone(folio), item, -folio_nr_pages(folio)); +} + +static inline +void inc_zone_folio_stat(struct folio *folio, enum zone_stat_item item) +{ + mod_zone_page_state(folio_zone(folio), item, folio_nr_pages(folio)); +} + +static inline +void dec_zone_folio_stat(struct folio *folio, enum zone_stat_item item) +{ + mod_zone_page_state(folio_zone(folio), item, -folio_nr_pages(folio)); +} + +static inline +void __inc_node_folio_stat(struct folio *folio, enum node_stat_item item) +{ + __mod_node_page_state(folio_pgdat(folio), item, folio_nr_pages(folio)); +} + +static inline +void __dec_node_folio_stat(struct folio *folio, enum node_stat_item item) +{ + __mod_node_page_state(folio_pgdat(folio), item, -folio_nr_pages(folio)); +} + +static inline +void inc_node_folio_stat(struct folio *folio, enum node_stat_item item) +{ + mod_node_page_state(folio_pgdat(folio), item, folio_nr_pages(folio)); +} + +static inline +void dec_node_folio_stat(struct folio *folio, enum node_stat_item item) +{ + mod_node_page_state(folio_pgdat(folio), item, -folio_nr_pages(folio)); +} + static inline void __mod_zone_freepage_state(struct zone *zone, int nr_pages, int migratetype) { @@ -536,6 +584,24 @@ static inline void __dec_lruvec_page_state(struct page *page, __mod_lruvec_page_state(page, idx, -1); } +static inline void __mod_lruvec_folio_stat(struct folio *folio, + enum node_stat_item idx, int val) +{ + __mod_lruvec_page_state(&folio->page, idx, val); +} + +static inline void __inc_lruvec_folio_stat(struct folio *folio, + enum node_stat_item idx) +{ + __mod_lruvec_folio_stat(folio, idx, folio_nr_pages(folio)); +} + +static inline void __dec_lruvec_folio_stat(struct folio *folio, + enum node_stat_item idx) +{ + __mod_lruvec_folio_stat(folio, idx, -folio_nr_pages(folio)); +} + static inline void inc_lruvec_state(struct lruvec *lruvec, enum node_stat_item idx) { @@ -560,4 +626,21 @@ static inline void dec_lruvec_page_state(struct page *page, mod_lruvec_page_state(page, idx, -1); } +static inline void mod_lruvec_folio_stat(struct folio *folio, + enum node_stat_item idx, int val) +{ + mod_lruvec_page_state(&folio->page, idx, val); +} + +static inline void inc_lruvec_folio_stat(struct folio *folio, + enum node_stat_item idx) +{ + mod_lruvec_folio_stat(folio, idx, folio_nr_pages(folio)); +} + +static inline void dec_lruvec_folio_stat(struct folio *folio, + enum node_stat_item idx) +{ + mod_lruvec_folio_stat(folio, idx, -folio_nr_pages(folio)); +} #endif /* _LINUX_VMSTAT_H */
Allow page counters to be more readily modified by callers which have a folio. Name these wrappers with 'stat' instead of 'state' as requested by Linus here: https://lore.kernel.org/linux-mm/CAHk-=wj847SudR-kt+46fT3+xFFgiwpgThvm7DJWGdi4cVrbnQ@mail.gmail.com/ Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/vmstat.h | 83 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 83 insertions(+)