mm-readahead-do-not-allow-order-1-folio.patch removed from -mm tree
The quilt patch titled
Subject: mm/readahead: do not allow order-1 folio
has been removed from the -mm tree. Its filename was
mm-readahead-do-not-allow-order-1-folio.patch
This patch was dropped because it was merged into the mm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryan Roberts <[email protected]>
Subject: mm/readahead: do not allow order-1 folio
Date: Fri, 1 Dec 2023 16:10:45 +0000
The THP machinery does not support order-1 folios because it requires meta data spanning the first 3 struct pages. So order-2 is the smallest large folio that we can safely create.
There was a theoretical bug whereby if ra->size was 2 or 3 pages (due to the device-specific bdi->ra_pages being set that way), we could end up with order = 1. Fix this by unconditionally checking if the preferred order is 1 and if so, set it to 0. Previously this was done in a few specific places, but with this refactoring it is done just once, unconditionally, at the end of the calculation.
This is a theoretical bug found during review of the code; I have no evidence to suggest this manifests in the real world (I expect all device-specific ra_pages values are much bigger than 3).
---
mm/readahead.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-)
mm/readahead.c renamed from mm/readahead.c~mm-readahead-do-not-allow-order-1-folio +6 -8
@@ -511,16 +511,14 @@ void page_cache_ra_order(struct readaheaunsigned int order = new_order;/* Align with smaller pages if needed */ -if (index & ((1UL << order) -1 )) { +if (index & ((1UL << order) -1 )) order =__ffs (index); -if (order ==1 ) - order =0 ; - }/* Don't allocate pages past EOF */ -while (index + (1UL << order) -1 > limit) { -if (--order ==1 ) - order =0 ; - } +while (index + (1UL << order) -1 > limit) + order--; +/* THP machinery does not support order-1 */ +if (order ==1 ) + order =0 ; err =ra_alloc_folio (ractl, index, mark, order, gfp);if (err)break ;
_
Patches currently in -mm which might be from [email protected] are
mm-allow-deferred-splitting-of-arbitrary-anon-large-folios.patch mm-non-pmd-mappable-large-folios-for-folio_add_new_anon_rmap.patch mm-thp-introduce-multi-size-thp-sysfs-interface.patch mm-thp-introduce-multi-size-thp-sysfs-interface-fix.patch mm-thp-support-allocation-of-anonymous-multi-size-thp.patch selftests-mm-kugepaged-restore-thp-settings-at-exit.patch selftests-mm-factor-out-thp-settings-management.patch selftests-mm-support-multi-size-thp-interface-in-thp_settings.patch selftests-mm-khugepaged-enlighten-for-multi-size-thp.patch selftests-mm-cow-generalize-do_run_with_thp-helper.patch selftests-mm-cow-add-tests-for-anonymous-multi-size-thp.patch