selftests-mm-support-shmem-mthp-collapse-testing.patch removed from -mm tree
The quilt patch titled
Subject: selftests: mm: support shmem mTHP collapse testing
has been removed from the -mm tree. Its filename was
selftests-mm-support-shmem-mthp-collapse-testing.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: Baolin Wang <[email protected]>
Subject: selftests: mm: support shmem mTHP collapse testing
Date: Tue, 20 Aug 2024 17:49:17 +0800
Add shmem mTHP collpase testing. Similar to the anonymous page, users can use the '-s' parameter to specify the shmem mTHP size for testing.
---
tools/testing/selftests/mm/khugepaged.c | 4 + tools/testing/selftests/mm/thp_settings.c | 46 +++++++++++++++++--- tools/testing/selftests/mm/thp_settings.h | 9 +++ 3 files changed, 51 insertions(+), 8 deletions(-)
tools/testing/selftests/mm/khugepaged.c renamed from tools/testing/selftests/mm/khugepaged.c~selftests-mm-support-shmem-mthp-collapse-testing +3 -1
@@ -1095,7 +1095,7 @@ static void usage(void)fprintf (stderr,"\n\tSupported Options:\n" );fprintf (stderr,"\t\t-h: This help message.\n" );fprintf (stderr,"\t\t-s: mTHP size, expressed as page order.\n" ); -fprintf (stderr,"\t\t Defaults to 0. Use this size for anon allocations.\n" ); +fprintf (stderr,"\t\t Defaults to 0. Use this size for anon or shmem allocations.\n" );exit (1 ); }
@@ -1209,6 +1209,8 @@ int main(int argc, char **argv) default_settings.khugepaged.pages_to_scan = hpage_pmd_nr *8 ; default_settings.hugepages[hpage_pmd_order].enabled =THP_INHERIT ; default_settings.hugepages[anon_order].enabled =THP_ALWAYS ; + default_settings.shmem_hugepages[hpage_pmd_order].enabled =SHMEM_INHERIT ; + default_settings.shmem_hugepages[anon_order].enabled =SHMEM_ALWAYS ;save_settings ();thp_push_settings (&default_settings);
tools/testing/selftests/mm/thp_settings.c renamed from tools/testing/selftests/mm/thp_settings.c~selftests-mm-support-shmem-mthp-collapse-testing +40 -6
94 lines not on this page · raw message
tools/testing/selftests/mm/thp_settings.h renamed from tools/testing/selftests/mm/thp_settings.h~selftests-mm-support-shmem-mthp-collapse-testing +8 -1
@@ -22,10 +22,11 @@ enum thp_defrag { };enum shmem_enabled { +SHMEM_NEVER ,SHMEM_ALWAYS ,SHMEM_WITHIN_SIZE ,SHMEM_ADVISE , -SHMEM_NEVER , +SHMEM_INHERIT ,SHMEM_DENY ,SHMEM_FORCE , };
@@ -46,6 +47,10 @@ struct khugepaged_settings {unsigned long pages_to_scan; }; +struct shmem_hugepages_settings { +enum shmem_enabled enabled; +}; +struct thp_settings {enum thp_enabled thp_enabled;enum thp_defrag thp_defrag;
@@ -54,6 +59,7 @@ struct thp_settings {struct khugepaged_settings khugepaged;unsigned long read_ahead_kb;struct hugepages_settings hugepages[NR_ORDERS ]; +struct shmem_hugepages_settings shmem_hugepages[NR_ORDERS ]; };int read_file (const char *path,char *buf,size_t buflen);
@@ -76,5 +82,6 @@ void thp_save_settings(void);void thp_set_read_ahead_path (char *path);unsigned long thp_supported_orders (void ); +unsigned long thp_shmem_supported_orders (void );#endif /* __THP_SETTINGS_H__ */
_
Patches currently in -mm which might be from [email protected] are