mm/util: don't read __page_2 for order-1 folios in snapshot_page()
Subsystems (3)
PATCH v2 1/1 mm/util: don't read __page_2 for order-1 folios in snapshot_page()
snapshot_page() currently reads __page_2 after checking nr_pages > 1, but it should only do so when nr_pages > 2.
During DLPAR memory remove on a 22 TB ppc64le LPAR, snapshot_page() oopsed on the page isolation path while reading an order-1 folio's __page_2 from an adjacent absent section (unmapped vmemmap).
Fix this to avoid reading memmap that doesn't exist (e.g., a vmemmap hole).
---
v1 -> v2:
- Condense the commit message.
- Drop the code comment.
mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
mm/util.c +1 -1
@@ -1353,7 +1353,7 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)if (ps->idx <MAX_FOLIO_NR_PAGES ) {memcpy (&ps->folio_snapshot, foliop,2 *sizeof (struct page )); nr_pages =folio_nr_pages (&ps->folio_snapshot); -if (nr_pages >1 ) +if (nr_pages >2 )memcpy (&ps->folio_snapshot.__page_2, &foliop->__page_2,sizeof (struct page ));set_ps_flags (ps, foliop, page);
Signature · 1 line
2.54.0
Quoted 9 lines · Aboorva Devarajan
snapshot_page()currently reads__page_2after checkingnr_pages> 1, but it should only do so whennr_pages> 2.During DLPAR memory remove on a 22 TB ppc64le LPAR,
snapshot_page()oopsed on the page isolation path while reading an order-1 folio's__page_2from an adjacent absent section (unmapped vmemmap).Fix this to avoid reading memmap that doesn't exist (e.g., a vmemmap hole).
I appreciate you're absolutely swimming in it, but there's absolutely no need to inflict IBM terminology on the rest of us ;-) That second paragraph could simply be:
If an order-1 folio is allocated at the end of a vmemmap section, __page_2 will not exist and reading it will cause a fault.
Quoted 31 lines
Fixes 31a31da8a618 ("mm: move _pincount in folio to page[2] on 32bit")Cc [email protected] # v6.15+Reported-by Sourabh Jain <[email protected]>Reviewed-by Lorenzo Stoakes <[email protected]>Signed-off-by Aboorva Devarajan <[email protected]>---
v1 -> v2:
- Condense the commit message.
- Drop the code comment.mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/util.c +1
-1@@ -1353,7 +1353,7 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)if (ps->idx <MAX_FOLIO_NR_PAGES ) {memcpy (&ps->folio_snapshot, foliop,2 *sizeof (struct page )); nr_pages =folio_nr_pages (&ps->folio_snapshot); -if (nr_pages >1 ) +if (nr_pages >2 )memcpy (&ps->folio_snapshot.__page_2, &foliop->__page_2,sizeof (struct page ));set_ps_flags (ps, foliop, page);Signature · 1 line
2.54.0
Quoted 11 lines · Matthew Wilcox
Quoted 9 lines · Aboorva Devarajan
snapshot_page()currently reads__page_2after checkingnr_pages> 1, but it should only do so whennr_pages> 2.During DLPAR memory remove on a 22 TB ppc64le LPAR,
snapshot_page()oopsed on the page isolation path while reading an order-1 folio's__page_2from an adjacent absent section (unmapped vmemmap).Fix this to avoid reading memmap that doesn't exist (e.g., a vmemmap hole).
Quoted 6 lines
I appreciate you're absolutely swimming in it, but there's absolutely no need to inflict IBM terminology on the rest of us ;-) That second paragraph could simply be:
If an order-1 folio is allocated at the end of a vmemmap section,
__page_2will not exist and reading it will cause a fault.
I think having a brief description on how the issue was originally reproduced can be useful for determining impact and validating backports.
Quoted 35 lines
Reviewed-by Matthew Wilcox (Oracle) <[email protected]>Quoted 31 lines
Fixes 31a31da8a618 ("mm: move _pincount in folio to page[2] on 32bit")Cc [email protected] # v6.15+Reported-by Sourabh Jain <[email protected]>Reviewed-by Lorenzo Stoakes <[email protected]>Signed-off-by Aboorva Devarajan <[email protected]>---
v1 -> v2:
- Condense the commit message.
- Drop the code comment.mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/util.c +1
-1@@ -1353,7 +1353,7 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)if (ps->idx <MAX_FOLIO_NR_PAGES ) {memcpy (&ps->folio_snapshot, foliop,2 *sizeof (struct page )); nr_pages =folio_nr_pages (&ps->folio_snapshot); -if (nr_pages >1 ) +if (nr_pages >2 )memcpy (&ps->folio_snapshot.__page_2, &foliop->__page_2,sizeof (struct page ));set_ps_flags (ps, foliop, page);Signature · 1 line
2.54.0
Quoted 9 lines · Aboorva Devarajan
snapshot_page()currently reads__page_2after checkingnr_pages> 1, but it should only do so whennr_pages> 2.During DLPAR memory remove on a 22 TB ppc64le LPAR,
snapshot_page()oopsed on the page isolation path while reading an order-1 folio's__page_2from an adjacent absent section (unmapped vmemmap).Fix this to avoid reading memmap that doesn't exist (e.g., a vmemmap hole).
Quoted 28 lines
Fixes 31a31da8a618 ("mm: move _pincount in folio to page[2] on 32bit")Cc [email protected] # v6.15+Reported-by Sourabh Jain <[email protected]>Reviewed-by Lorenzo Stoakes <[email protected]>Signed-off-by Aboorva Devarajan <[email protected]>---
v1 -> v2:
- Condense the commit message.
- Drop the code comment.mm/util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)mm/util.c +1
-1@@ -1353,7 +1353,7 @@ void snapshot_page(struct page_snapshot *ps, const struct page *page)if (ps->idx <MAX_FOLIO_NR_PAGES ) {memcpy (&ps->folio_snapshot, foliop,2 *sizeof (struct page )); nr_pages =folio_nr_pages (&ps->folio_snapshot); -if (nr_pages >1 ) +if (nr_pages >2 )memcpy (&ps->folio_snapshot.__page_2, &foliop->__page_2,sizeof (struct page ));set_ps_flags (ps, foliop, page);