| Message ID | 20230815032645.1393700-10-willy@infradead.org (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | Remove _folio_dtor and _folio_order | expand |
On 15.08.23 05:26, Matthew Wilcox (Oracle) wrote: > Store the folio order in the low byte of the flags word in the first > tail page. This frees up the word that was being used to store the > order and dtor bytes previously. > Is there still a free flag in page[1] after this change? I need one, at least for a prototype I'm working on. (could fallback to page[2], though eventually, though)
On Tue, Aug 15, 2023 at 09:59:08AM +0200, David Hildenbrand wrote: > On 15.08.23 05:26, Matthew Wilcox (Oracle) wrote: > > Store the folio order in the low byte of the flags word in the first > > tail page. This frees up the word that was being used to store the > > order and dtor bytes previously. > > > > Is there still a free flag in page[1] after this change? I need one, at > least for a prototype I'm working on. (could fallback to page[2], though > eventually, though) There are only ~13 flags used in page[1] at this point. Plenty of space.
On Tue, Aug 15, 2023 at 04:26:45AM +0100, Matthew Wilcox (Oracle) wrote: > Store the folio order in the low byte of the flags word in the first > tail page. This frees up the word that was being used to store the > order and dtor bytes previously. > > Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> > --- > include/linux/mm.h | 10 +++++----- > include/linux/mm_types.h | 3 +-- > kernel/crash_core.c | 1 - > mm/internal.h | 2 +- > mm/page_alloc.c | 4 +++- > 5 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index cf0ae8c51d7f..85568e2b2556 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -1028,7 +1028,7 @@ struct inode; > * compound_order() can be called without holding a reference, which means > * that niceties like page_folio() don't work. These callers should be > * prepared to handle wild return values. For example, PG_head may be > - * set before _folio_order is initialised, or this may be a tail page. > + * set before the order is initialised, or this may be a tail page. > * See compaction.c for some good examples. > */ > static inline unsigned int compound_order(struct page *page) > @@ -1037,7 +1037,7 @@ static inline unsigned int compound_order(struct page *page) > > if (!test_bit(PG_head, &folio->flags)) > return 0; > - return folio->_folio_order; > + return folio->_flags_1 & 0xff; > } > > /** > @@ -1053,7 +1053,7 @@ static inline unsigned int folio_order(struct folio *folio) > { > if (!folio_test_large(folio)) > return 0; > - return folio->_folio_order; > + return folio->_flags_1 & 0xff; > } > > #include <linux/huge_mm.h> > @@ -2025,7 +2025,7 @@ static inline long folio_nr_pages(struct folio *folio) > #ifdef CONFIG_64BIT > return folio->_folio_nr_pages; > #else > - return 1L << folio->_folio_order; > + return 1L << (folio->_flags_1 & 0xff); > #endif > } > > @@ -2043,7 +2043,7 @@ static inline unsigned long compound_nr(struct page *page) > #ifdef CONFIG_64BIT > return folio->_folio_nr_pages; > #else > - return 1L << folio->_folio_order; > + return 1L << (folio->_flags_1 & 0xff); > #endif > } > > diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h > index d45a2b8041e0..659c7b84726c 100644 > --- a/include/linux/mm_types.h > +++ b/include/linux/mm_types.h > @@ -282,7 +282,6 @@ static inline struct page *encoded_page_ptr(struct encoded_page *page) > * @_refcount: Do not access this member directly. Use folio_ref_count() > * to find how many references there are to this folio. > * @memcg_data: Memory Control Group data. > - * @_folio_order: Do not use directly, call folio_order(). > * @_entire_mapcount: Do not use directly, call folio_entire_mapcount(). > * @_nr_pages_mapped: Do not use directly, call folio_mapcount(). > * @_pincount: Do not use directly, call folio_maybe_dma_pinned(). > @@ -334,8 +333,8 @@ struct folio { > struct { > unsigned long _flags_1; > unsigned long _head_1; > + unsigned long _folio_avail; This can just be dropped? Having this single field as "avail" is weird, without mentioning the rest, IMHO. We can have a separate patch to resolve what's available, either you can leave that to my series, or if you dislike that you can propose what you've replied to my cover letter but add all the available bits. > /* public: */ > - unsigned char _folio_order; > atomic_t _entire_mapcount; > atomic_t _nr_pages_mapped; > atomic_t _pincount; > diff --git a/kernel/crash_core.c b/kernel/crash_core.c > index 934dd86e19f5..693445e1f7f6 100644 > --- a/kernel/crash_core.c > +++ b/kernel/crash_core.c > @@ -455,7 +455,6 @@ static int __init crash_save_vmcoreinfo_init(void) > VMCOREINFO_OFFSET(page, lru); > VMCOREINFO_OFFSET(page, _mapcount); > VMCOREINFO_OFFSET(page, private); > - VMCOREINFO_OFFSET(folio, _folio_order); > VMCOREINFO_OFFSET(page, compound_head); > VMCOREINFO_OFFSET(pglist_data, node_zones); > VMCOREINFO_OFFSET(pglist_data, nr_zones); > diff --git a/mm/internal.h b/mm/internal.h > index e3d11119b04e..c415260c1f06 100644 > --- a/mm/internal.h > +++ b/mm/internal.h > @@ -407,7 +407,7 @@ static inline void folio_set_order(struct folio *folio, unsigned int order) > if (WARN_ON_ONCE(!order || !folio_test_large(folio))) > return; > > - folio->_folio_order = order; > + folio->_flags_1 = (folio->_flags_1 & ~0xffUL) | order; > #ifdef CONFIG_64BIT > folio->_folio_nr_pages = 1U << order; > #endif > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index 9fe9209605a5..0e0e0d18a81b 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -1115,8 +1115,10 @@ static __always_inline bool free_pages_prepare(struct page *page, > > VM_BUG_ON_PAGE(compound && compound_order(page) != order, page); > > - if (compound) > + if (compound) { > ClearPageHasHWPoisoned(page); > + page[1].flags &= ~0xffUL; Could we hide the hard-coded 0xff in some way? One easy way would be using a macro with a bunch of helpers, like folio_set|get|clear_order(). The other way is maybe we can also define _flags_1 an enum, where we can just move over the compound_order field at offset 0? But I'm not sure how that looks like at last. Thanks, > + } > for (i = 1; i < (1 << order); i++) { > if (compound) > bad += free_tail_page_prepare(page, page + i); > -- > 2.40.1 > >
diff --git a/include/linux/mm.h b/include/linux/mm.h index cf0ae8c51d7f..85568e2b2556 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1028,7 +1028,7 @@ struct inode; * compound_order() can be called without holding a reference, which means * that niceties like page_folio() don't work. These callers should be * prepared to handle wild return values. For example, PG_head may be - * set before _folio_order is initialised, or this may be a tail page. + * set before the order is initialised, or this may be a tail page. * See compaction.c for some good examples. */ static inline unsigned int compound_order(struct page *page) @@ -1037,7 +1037,7 @@ static inline unsigned int compound_order(struct page *page) if (!test_bit(PG_head, &folio->flags)) return 0; - return folio->_folio_order; + return folio->_flags_1 & 0xff; } /** @@ -1053,7 +1053,7 @@ static inline unsigned int folio_order(struct folio *folio) { if (!folio_test_large(folio)) return 0; - return folio->_folio_order; + return folio->_flags_1 & 0xff; } #include <linux/huge_mm.h> @@ -2025,7 +2025,7 @@ static inline long folio_nr_pages(struct folio *folio) #ifdef CONFIG_64BIT return folio->_folio_nr_pages; #else - return 1L << folio->_folio_order; + return 1L << (folio->_flags_1 & 0xff); #endif } @@ -2043,7 +2043,7 @@ static inline unsigned long compound_nr(struct page *page) #ifdef CONFIG_64BIT return folio->_folio_nr_pages; #else - return 1L << folio->_folio_order; + return 1L << (folio->_flags_1 & 0xff); #endif } diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index d45a2b8041e0..659c7b84726c 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -282,7 +282,6 @@ static inline struct page *encoded_page_ptr(struct encoded_page *page) * @_refcount: Do not access this member directly. Use folio_ref_count() * to find how many references there are to this folio. * @memcg_data: Memory Control Group data. - * @_folio_order: Do not use directly, call folio_order(). * @_entire_mapcount: Do not use directly, call folio_entire_mapcount(). * @_nr_pages_mapped: Do not use directly, call folio_mapcount(). * @_pincount: Do not use directly, call folio_maybe_dma_pinned(). @@ -334,8 +333,8 @@ struct folio { struct { unsigned long _flags_1; unsigned long _head_1; + unsigned long _folio_avail; /* public: */ - unsigned char _folio_order; atomic_t _entire_mapcount; atomic_t _nr_pages_mapped; atomic_t _pincount; diff --git a/kernel/crash_core.c b/kernel/crash_core.c index 934dd86e19f5..693445e1f7f6 100644 --- a/kernel/crash_core.c +++ b/kernel/crash_core.c @@ -455,7 +455,6 @@ static int __init crash_save_vmcoreinfo_init(void) VMCOREINFO_OFFSET(page, lru); VMCOREINFO_OFFSET(page, _mapcount); VMCOREINFO_OFFSET(page, private); - VMCOREINFO_OFFSET(folio, _folio_order); VMCOREINFO_OFFSET(page, compound_head); VMCOREINFO_OFFSET(pglist_data, node_zones); VMCOREINFO_OFFSET(pglist_data, nr_zones); diff --git a/mm/internal.h b/mm/internal.h index e3d11119b04e..c415260c1f06 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -407,7 +407,7 @@ static inline void folio_set_order(struct folio *folio, unsigned int order) if (WARN_ON_ONCE(!order || !folio_test_large(folio))) return; - folio->_folio_order = order; + folio->_flags_1 = (folio->_flags_1 & ~0xffUL) | order; #ifdef CONFIG_64BIT folio->_folio_nr_pages = 1U << order; #endif diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 9fe9209605a5..0e0e0d18a81b 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -1115,8 +1115,10 @@ static __always_inline bool free_pages_prepare(struct page *page, VM_BUG_ON_PAGE(compound && compound_order(page) != order, page); - if (compound) + if (compound) { ClearPageHasHWPoisoned(page); + page[1].flags &= ~0xffUL; + } for (i = 1; i < (1 << order); i++) { if (compound) bad += free_tail_page_prepare(page, page + i);
Store the folio order in the low byte of the flags word in the first tail page. This frees up the word that was being used to store the order and dtor bytes previously. Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> --- include/linux/mm.h | 10 +++++----- include/linux/mm_types.h | 3 +-- kernel/crash_core.c | 1 - mm/internal.h | 2 +- mm/page_alloc.c | 4 +++- 5 files changed, 10 insertions(+), 10 deletions(-)