Add testing for the newly added prepare API, for both aligned
and non-aligned API, also probe API is also tested along with
prepare API.
CC: Alexander Duyck <alexander.du...@gmail.com>
Signed-off-by: Yunsheng Lin <linyunsh...@huawei.com>
---
.../selftests/mm/page_frag/page_frag_test.c | 66 +++++++++++++++++--
tools/testing/selftests/mm/run_vmtests.sh | 4 ++
tools/testing/selftests/mm/test_page_frag.sh | 31 +++++++++
3 files changed, 96 insertions(+), 5 deletions(-)
diff --git a/tools/testing/selftests/mm/page_frag/page_frag_test.c
b/tools/testing/selftests/mm/page_frag/page_frag_test.c
index 36543a129e40..567bcc6a181e 100644
--- a/tools/testing/selftests/mm/page_frag/page_frag_test.c
+++ b/tools/testing/selftests/mm/page_frag/page_frag_test.c
@@ -29,6 +29,10 @@ static bool test_align;
module_param(test_align, bool, 0);
MODULE_PARM_DESC(test_align, "use align API for testing");
+static bool test_prepare;
+module_param(test_prepare, bool, 0);
+MODULE_PARM_DESC(test_prepare, "use prepare API for testing");
+
static int test_alloc_len = 2048;
module_param(test_alloc_len, int, 0);
MODULE_PARM_DESC(test_alloc_len, "alloc len for testing");
@@ -68,6 +72,18 @@ static int page_frag_pop_thread(void *arg)
return 0;
}
+static void frag_frag_test_commit(struct page_frag_cache *nc,
+ struct page_frag *prepare_pfrag,
+ struct page_frag *probe_pfrag,
+ unsigned int used_sz)
+{
+ WARN_ON_ONCE(prepare_pfrag->page != probe_pfrag->page ||
+ prepare_pfrag->offset != probe_pfrag->offset ||
+ prepare_pfrag->size != probe_pfrag->size);
+
+ page_frag_commit(nc, prepare_pfrag, used_sz);
+}
+
static int page_frag_push_thread(void *arg)
{
struct ptr_ring *ring = arg;
@@ -80,13 +96,52 @@ static int page_frag_push_thread(void *arg)
int ret;
if (test_align) {
- va = page_frag_alloc_align(&test_nc, test_alloc_len,
- GFP_KERNEL, SMP_CACHE_BYTES);
+ if (test_prepare) {
+ struct page_frag prepare_frag, probe_frag;
+ void *probe_va;
+
+ va =
page_frag_alloc_refill_prepare_align(&test_nc,
+
test_alloc_len,
+
&prepare_frag,
+
GFP_KERNEL,
+
SMP_CACHE_BYTES);
+
+ probe_va =
__page_frag_alloc_refill_probe_align(&test_nc,
+
test_alloc_len,
+
&probe_frag,
+
-SMP_CACHE_BYTES);
+ WARN_ON_ONCE(va != probe_va);
+
+ if (likely(va))
+ frag_frag_test_commit(&test_nc,
&prepare_frag,
+ &probe_frag,
test_alloc_len);
+ } else {
+ va = page_frag_alloc_align(&test_nc,
+ test_alloc_len,
+ GFP_KERNEL,
+ SMP_CACHE_BYTES);
+ }
WARN_ONCE((unsigned long)va & (SMP_CACHE_BYTES - 1),
"unaligned va returned\n");
} else {
- va = page_frag_alloc(&test_nc, test_alloc_len,
GFP_KERNEL);
+ if (test_prepare) {
+ struct page_frag prepare_frag, probe_frag;
+ void *probe_va;
+
+ va = page_frag_alloc_refill_prepare(&test_nc,
test_alloc_len,
+
&prepare_frag, GFP_KERNEL);
+
+ probe_va =
page_frag_alloc_refill_probe(&test_nc, test_alloc_len,
+
&probe_frag);
+
+ WARN_ON_ONCE(va != probe_va);
+ if (likely(va))
+ frag_frag_test_commit(&test_nc,
&prepare_frag,
+ &probe_frag,
test_alloc_len);
+ } else {
+ va = page_frag_alloc(&test_nc, test_alloc_len,
GFP_KERNEL);
+ }
}
if (!va)
@@ -152,8 +207,9 @@ static int __init page_frag_test_init(void)
test_pushed, test_popped);
duration = (u64)ktime_us_delta(ktime_get(), start);
- pr_info("%d of iterations for %s testing took: %lluus\n", nr_test,
- test_align ? "aligned" : "non-aligned", duration);
+ pr_info("%d of iterations for %s %s API testing took: %lluus\n",
nr_test,
+ test_align ? "aligned" : "non-aligned",
+ test_prepare ? "prepare" : "alloc", duration);
ptr_ring_cleanup(&ptr_ring, NULL);
page_frag_cache_drain(&test_nc);
diff --git a/tools/testing/selftests/mm/run_vmtests.sh
b/tools/testing/selftests/mm/run_vmtests.sh
index 2c5394584af4..f6ff9080a6f2 100755
--- a/tools/testing/selftests/mm/run_vmtests.sh
+++ b/tools/testing/selftests/mm/run_vmtests.sh
@@ -464,6 +464,10 @@ CATEGORY="page_frag" run_test ./test_page_frag.sh aligned
CATEGORY="page_frag" run_test ./test_page_frag.sh nonaligned
+CATEGORY="page_frag" run_test ./test_page_frag.sh aligned_prepare
+
+CATEGORY="page_frag" run_test ./test_page_frag.sh nonaligned_prepare
+
echo "SUMMARY: PASS=${count_pass} SKIP=${count_skip} FAIL=${count_fail}" |
tap_prefix
echo "1..${count_total}" | tap_output
diff --git a/tools/testing/selftests/mm/test_page_frag.sh
b/tools/testing/selftests/mm/test_page_frag.sh
index d750d910c899..71c3531fa38e 100755
--- a/tools/testing/selftests/mm/test_page_frag.sh
+++ b/tools/testing/selftests/mm/test_page_frag.sh
@@ -36,6 +36,8 @@ ksft_skip=4
SMOKE_PARAM="test_push_cpu=$TEST_CPU_0 test_pop_cpu=$TEST_CPU_1"
NONALIGNED_PARAM="$SMOKE_PARAM test_alloc_len=75 nr_test=$NR_TEST"
ALIGNED_PARAM="$NONALIGNED_PARAM test_align=1"
+NONALIGNED_PREPARE_PARAM="$NONALIGNED_PARAM test_prepare=1"
+ALIGNED_PREPARE_PARAM="$ALIGNED_PARAM test_prepare=1"
check_test_requirements()
{
@@ -74,6 +76,24 @@ run_aligned_check()
echo "Check the kernel ring buffer to see the summary."
}
+run_nonaligned_prepare_check()
+{
+ echo "Run performance tests to evaluate how fast nonaligned prepare API
is."
+
+ insmod $DRIVER $NONALIGNED_PREPARE_PARAM > /dev/null 2>&1
+ echo "Done."
+ echo "Ccheck the kernel ring buffer to see the summary."
+}
+
+run_aligned_prepare_check()
+{
+ echo "Run performance tests to evaluate how fast aligned prepare API
is."
+
+ insmod $DRIVER $ALIGNED_PREPARE_PARAM > /dev/null 2>&1
+ echo "Done."
+ echo "Check the kernel ring buffer to see the summary."
+}
+
run_smoke_check()
{
echo "Run smoke test."
@@ -86,6 +106,7 @@ run_smoke_check()
usage()
{
echo -n "Usage: $0 [ aligned ] | [ nonaligned ] | | [ smoke ] | "
+ echo "[ aligned_prepare ] | [ nonaligned_prepare ] | "
echo "manual parameters"
echo
echo "Valid tests and parameters:"
@@ -106,6 +127,12 @@ usage()
echo "# Performance testing for aligned alloc API"
echo "$0 aligned"
echo
+ echo "# Performance testing for nonaligned prepare API"
+ echo "$0 nonaligned_prepare"
+ echo
+ echo "# Performance testing for aligned prepare API"
+ echo "$0 aligned_prepare"
+ echo
exit 0
}
@@ -159,6 +186,10 @@ function run_test()
run_nonaligned_check
elif [[ "$1" = "aligned" ]]; then
run_aligned_check
+ elif [[ "$1" = "nonaligned_prepare" ]]; then
+ run_nonaligned_prepare_check
+ elif [[ "$1" = "aligned_prepare" ]]; then
+ run_aligned_prepare_check
else
run_manual_check $@
fi
--
2.34.1
