selftests-mm-rename-uffd_stats-to-uffd_args.patch removed from -mm tree
The quilt patch titled
Subject: selftests/mm: rename uffd_stats to uffd_args
has been removed from the -mm tree. Its filename was
selftests-mm-rename-uffd_stats-to-uffd_args.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: Peter Xu <[email protected]>
Subject: selftests/mm: rename uffd_stats to uffd_args
Date: Wed, 12 Apr 2023 12:43:37 -0400
Prepare for adding more fields into the struct.
---
tools/testing/selftests/mm/uffd-common.c | 28 +++++------ tools/testing/selftests/mm/uffd-common.h | 6 +- tools/testing/selftests/mm/uffd-stress.c | 51 ++++++++++----------- 3 files changed, 42 insertions(+), 43 deletions(-)
tools/testing/selftests/mm/uffd-common.c renamed from tools/testing/selftests/mm/uffd-common.c~selftests-mm-rename-uffd_stats-to-uffd_args +14 -14
@@ -186,34 +186,34 @@ struct uffd_test_ops hugetlb_uffd_test_o .check_pmd_mapping = NULL, }; -void uffd_stats_report (struct uffd_stats *stats,int n_cpus) +void uffd_stats_report (struct uffd_args *args,int n_cpus) {int i;unsigned long long miss_total =0 , wp_total =0 , minor_total =0 ;for (i =0 ; i < n_cpus; i++) { - miss_total += stats[i].missing_faults; - wp_total += stats[i].wp_faults; - minor_total += stats[i].minor_faults; + miss_total += args[i].missing_faults; + wp_total += args[i].wp_faults; + minor_total += args[i].minor_faults; }printf ("userfaults: " );if (miss_total) {printf ("%llu missing (" , miss_total);for (i =0 ; i < n_cpus; i++) -printf ("%lu+" , stats[i].missing_faults); +printf ("%lu+" , args[i].missing_faults);printf ("\b) " ); }if (wp_total) {printf ("%llu wp (" , wp_total);for (i =0 ; i < n_cpus; i++) -printf ("%lu+" , stats[i].wp_faults); +printf ("%lu+" , args[i].wp_faults);printf ("\b) " ); }if (minor_total) {printf ("%llu minor (" , minor_total);for (i =0 ; i < n_cpus; i++) -printf ("%lu+" , stats[i].minor_faults); +printf ("%lu+" , args[i].minor_faults);printf ("\b)" ); }printf ("\n" );
@@ -397,7 +397,7 @@ int uffd_read_msg(int ufd, struct uffd_mreturn 0 ; } -void uffd_handle_page_fault (struct uffd_msg *msg,struct uffd_stats *stats) +void uffd_handle_page_fault (struct uffd_msg *msg,struct uffd_args *args) {unsigned long offset;
@@ -407,7 +407,7 @@ void uffd_handle_page_fault(struct uffd_if (msg->arg.pagefault.flags &UFFD_PAGEFAULT_FLAG_WP ) {/* Write protect page faults */ wp_range (uffd, msg->arg.pagefault.address, page_size, false); - stats->wp_faults++; + args->wp_faults++; }else if (msg->arg.pagefault.flags &UFFD_PAGEFAULT_FLAG_MINOR ) {uint8_t *area;int b;
@@ -430,7 +430,7 @@ void uffd_handle_page_fault(struct uffd_for (b =0 ; b < page_size; ++b) area[b] = ~area[b];continue_range (uffd, msg->arg.pagefault.address, page_size); - stats->minor_faults++; + args->minor_faults++; }else {/* * Missing page faults.
@@ -460,14 +460,14 @@ void uffd_handle_page_fault(struct uffd_ offset &= ~(page_size-1 );if (copy_page (uffd, offset)) - stats->missing_faults++; + args->missing_faults++; } }void *uffd_poll_thread (void *arg) { -struct uffd_stats *stats = (struct uffd_stats *)arg; -unsigned long cpu = stats->cpu; +struct uffd_args *args = (struct uffd_args *)arg; +unsigned long cpu = args->cpu;struct pollfd pollfd[2 ];struct uffd_msg msg;struct uffdio_register uffd_reg;
@@ -502,7 +502,7 @@ void *uffd_poll_thread(void *arg)err ("unexpected msg event %u\n" , msg.event);break ;case UFFD_EVENT_PAGEFAULT : -uffd_handle_page_fault (&msg, stats); +uffd_handle_page_fault (&msg, args);break ;case UFFD_EVENT_FORK :close (uffd);
tools/testing/selftests/mm/uffd-common.h renamed from tools/testing/selftests/mm/uffd-common.h~selftests-mm-rename-uffd_stats-to-uffd_args +3 -3
@@ -70,7 +70,7 @@ - 1)))/* Userfaultfd test statistics */ -struct uffd_stats { +struct uffd_args {int cpu;unsigned long missing_faults;unsigned long wp_faults;
@@ -98,12 +98,12 @@ extern uffd_test_ops_t shmem_uffd_test_oextern uffd_test_ops_t hugetlb_uffd_test_ops;extern uffd_test_ops_t *uffd_test_ops; -void uffd_stats_report (struct uffd_stats *stats,int n_cpus); +void uffd_stats_report (struct uffd_args *args,int n_cpus);void uffd_test_ctx_init (uint64_t features);void userfaultfd_open (uint64_t *features);int uffd_read_msg (int ufd,struct uffd_msg *msg);void wp_range (int ufd,__u64 start,__u64 len,bool wp); -void uffd_handle_page_fault (struct uffd_msg *msg,struct uffd_stats *stats); +void uffd_handle_page_fault (struct uffd_msg *msg,struct uffd_args *args);int __copy_page (int ufd,unsigned long offset,bool retry);int copy_page (int ufd,unsigned long offset);void *uffd_poll_thread (void *arg);
tools/testing/selftests/mm/uffd-stress.c renamed from tools/testing/selftests/mm/uffd-stress.c~selftests-mm-rename-uffd_stats-to-uffd_args +25 -26
170 lines not on this page · raw message
_
Patches currently in -mm which might be from [email protected] are
selftests-mm-let-uffd_handle_page_fault-take-wp-parameter.patch selftests-mm-allow-allocate_area-to-fail-properly.patch selftests-mm-add-framework-for-uffd-unit-test.patch selftests-mm-move-uffd-pagemap-test-to-unit-test.patch selftests-mm-move-uffd-minor-test-to-unit-test.patch selftests-mm-move-uffd-sig-events-tests-into-uffd-unit-tests.patch selftests-mm-move-zeropage-test-into-uffd-unit-tests.patch selftests-mm-workaround-no-way-to-detect-uffd-minor-wp.patch selftests-mm-allow-uffd-test-to-skip-properly-with-no-privilege.patch selftests-mm-drop-sys-dev-test-in-uffd-stress-test.patch selftests-mm-add-shmem-private-test-to-uffd-stress.patch selftests-mm-add-uffdio-register-ioctls-test.patch mm-hugetlb-fix-uffd-wp-during-fork.patch mm-hugetlb-fix-uffd-wp-bit-lost-when-unsharing-happens.patch selftests-mm-add-a-few-options-for-uffd-unit-test.patch selftests-mm-extend-and-rename-uffd-pagemap-test.patch selftests-mm-rename-cow_extra_libs-to-iouring_extra_libs.patch selftests-mm-add-tests-for-ro-pinning-vs-fork.patch