From patchwork Tue Oct 8 11:20:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yunsheng Lin X-Patchwork-Id: 13826290 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id C62F3CEF152 for ; Tue, 8 Oct 2024 11:27:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A12A86B00A4; Tue, 8 Oct 2024 07:27:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 972CF6B00A5; Tue, 8 Oct 2024 07:27:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7EBEE6B00A6; Tue, 8 Oct 2024 07:27:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 59AC96B00A4 for ; Tue, 8 Oct 2024 07:27:25 -0400 (EDT) Received: from smtpin05.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 32434141B41 for ; Tue, 8 Oct 2024 11:27:24 +0000 (UTC) X-FDA: 82650209250.05.0ED740C Received: from szxga04-in.huawei.com (szxga04-in.huawei.com [45.249.212.190]) by imf16.hostedemail.com (Postfix) with ESMTP id 817B4180002 for ; Tue, 8 Oct 2024 11:27:22 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1728386743; a=rsa-sha256; cv=none; b=wq5yrbIdE2FbS05Y+uC0Oyp7kfcH8dhY/mfCwqQy2cSsT/CNYRuSbAjParN8h9zDflJ899 c7AT86gK4uuRhFCHr5p+5fQOqQq0/krtXtRlwCiIZZPxjWrDOhu9gTgPFOJcMDDMpXBRQP JrZMu/K4wNMFDIzlCbjqTbf1lYtNNa8= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf16.hostedemail.com: domain of linyunsheng@huawei.com designates 45.249.212.190 as permitted sender) smtp.mailfrom=linyunsheng@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1728386743; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vcscuEIx/nOXzPzA8rC3XdtS3OQ+vc0nt0pl8LKmBHk=; b=wm956MZPpmjGA1qQSCsMk/nI3N62Pj7sqfaVEdfJAUlNEjK1aFK/QsmQKoZethvsui2ZRM OZjyxVZlvMqnKoouVPYSLai8W7Ry6g8aLxgabEWRdDUoOpR3IFFVeSwI7v5IQ79OZHwM4l dn0mY4GgBd4hP0uW8lzTLPIa/MuIu8g= Received: from mail.maildlp.com (unknown [172.19.163.44]) by szxga04-in.huawei.com (SkyGuard) with ESMTP id 4XNDHB71Djz2DdFy; Tue, 8 Oct 2024 19:26:14 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 0559B1401F1; Tue, 8 Oct 2024 19:27:19 +0800 (CST) Received: from localhost.localdomain (10.90.30.45) by dggpemf200006.china.huawei.com (7.185.36.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Tue, 8 Oct 2024 19:27:18 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Andrew Morton , Shuah Khan , , Subject: [PATCH net-next v20 11/14] mm: page_frag: add testing for the newly added prepare API Date: Tue, 8 Oct 2024 19:20:45 +0800 Message-ID: <20241008112049.2279307-12-linyunsheng@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20241008112049.2279307-1-linyunsheng@huawei.com> References: <20241008112049.2279307-1-linyunsheng@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.90.30.45] X-ClientProxiedBy: dggems701-chm.china.huawei.com (10.3.19.178) To dggpemf200006.china.huawei.com (7.185.36.61) X-Rspamd-Queue-Id: 817B4180002 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: s8ggihjqqs5foctzpaxwiriit55ygetu X-HE-Tag: 1728386842-458598 X-HE-Meta: U2FsdGVkX1+R3HgoHFMRpE/FH0PP4WAFZiqmWpdg+B8iZm7oriIP32rgMoQES1k+6LS/0m48pbfvu6EDzHAAkXV/gxGAkX6BRIWNT/+me2g/txceufd/iG7I2lYx/zY/r1RQRalFKiT3nyiF6qVmIOv/N7Xp3eLffIBlORExzFI2q9JCjgaRDMmwXwUi2Rhpqm4DpgieLdUtfCfUMeDBWDd8vG/suH5MKMZzt0jJv+E4abgkaJDGVHLL8bzaMS1+sk61wotc6kWv6s+5O+SgfmIYMti/J3tDMJB/94MeCMud/KIm+KXBYpI5aEugUz9YwMdp+zzA5lWYG0N3/1uZrkE4qSI3Qxq/1M7gBcCt0czM5Oucxd+C3RZneZsTEPhVrm0/wthrXSX8nfxmwIJsNTNdNfOscB0om3NiRC2l7Irl3gcY4LQ40y9LI1Li4CG+DybeLIOeszhD7LV+gFCW7HvMzzIy+bjU9YZ67HhQi+gx0WpMMQmyznkREB3atbcERrgVybcUIaBXgMlVIwOaKpQVgVPQ1tyg+Co+DVfHplt5bR+ao1mqKsM3I6xKwXDKqsLfKAm5IOYeUl8tOuuywIVRXK4JGezEd5ZpZw0yueNh5QCiEf3AUuJ5qAJv8MVTkR8XZ+yH67qZxTkCUQik0cSq+vvrtJmddfm873wAi5e0hk0R03UaaDWyCB3lLWh/9GyzAMCYxU0vNGG8iNPJhJMC6hSOeJdhOx3pvT1PqoUNnWovHnnHWVf8xojxavwq1Ue4PY+BlhJxEyB+ZGgk8PAztW3AANo0I+1oicGyfYieB/SYHT5d65Ip3XamjA2mWB6B1uRZBsXdTQdMeAmrgy+wjacmHB3aukVUOohqgwianzfFSAluRtQu4iMHtTpzUxiDwYoP4jlEIesUPHHo+ai8hz+iAeAkAcJY0m7ZRns3B3Js/PfqQgWBqlphlcYKPDkCUi9VH/4bdjqcmw8 eSukt/TJ 5YISi0dV0gvQfxIl7dV22oBj1i+AWDAghz2vO7VBW2+rtfPuySpO+TNeHJxy917iX2id98pxeAaqvBINkE4C/2i2Zv7HMVT9/6ywKFqOwVjwrXFX/kGm67x92MEYfqowYaG/5XhPzqkwuXFo7M6RRUQY4Ws6xkSiFp/DzzoD5ekjDq3xMsN1zjMJ7JPEiZM0u3+HkN7vU9++uQlkHbZUzJtHcwFV1H1zwo8ZzeED1CKZVRkGqsF/iEMmrs+k5HzPigaqv+BBep81rLGo39MdrvXA/hkFjdZYCiLS5 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: 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 Signed-off-by: Yunsheng Lin --- .../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