February 2023 - Linux-kselftest-mirror

[PATCH] SUNRPC: Ensure test case arrays are properly terminated

by Chuck Lever

From: Chuck Lever <chuck.lever(a)oracle.com> Geert Uytterhoeven reports: ... ok 9 Encrypt 13 bytes with camellia256-cts-cmac ok 10 Encrypt 30 bytes with camellia256-cts-cmac # RFC 6803 encryption: pass:0 fail:0 skip:10 total:10 ok 3 RFC 6803 encryption # SKIP Encryption type is not available 8<--- cut here --- Unable to handle kernel paging request at virtual address 73657420 when execute [73657420] *pgd=00000000 Internal error: Oops: 80000005 [#1] ARM CPU: 0 PID: 1 Comm: swapper Tainted: G N 6.2.0-rc7-00133-g373f26a81164-dirty #9 Hardware name: Generic DT based system PC is at 0x73657420 LR is at kunit_run_tests+0x3e0/0x5f4 On x86 with GCC 12, the missing array terminators did not seem to matter. Other platforms appear to be more picky. Reported-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Chuck Lever <chuck.lever(a)oracle.com> --- net/sunrpc/auth_gss/gss_krb5_test.c | 5 +++++ 1 file changed, 5 insertions(+) Hi Geert - Finally able to reproduce. This simple patch seems to address the crashes for me. If this patch fixes it for you I can push it to Linus before the v6.3 merge window closes. diff --git a/net/sunrpc/auth_gss/gss_krb5_test.c b/net/sunrpc/auth_gss/gss_krb5_test.c index 0a7c5280e4e3..ce0541e32fc9 100644 --- a/net/sunrpc/auth_gss/gss_krb5_test.c +++ b/net/sunrpc/auth_gss/gss_krb5_test.c @@ -519,6 +519,7 @@ static struct kunit_case rfc3961_test_cases[] = { .run_case = kdf_case, .generate_params = rfc3961_kdf_gen_params, }, + {} }; static struct kunit_suite rfc3961_suite = { @@ -780,6 +781,7 @@ static struct kunit_case rfc3962_test_cases[] = { .run_case = rfc3962_encrypt_case, .generate_params = rfc3962_encrypt_gen_params, }, + {} }; static struct kunit_suite rfc3962_suite = { @@ -1415,6 +1417,7 @@ static struct kunit_case rfc6803_test_cases[] = { .run_case = rfc6803_encrypt_case, .generate_params = rfc6803_encrypt_gen_params, }, + {} }; static struct kunit_suite rfc6803_suite = { @@ -1907,6 +1910,7 @@ static struct kunit_case rfc8009_test_cases[] = { .run_case = rfc8009_encrypt_case, .generate_params = rfc8009_encrypt_gen_params, }, + {} }; static struct kunit_suite rfc8009_suite = { @@ -2029,6 +2033,7 @@ static struct kunit_case encryption_test_cases[] = { .run_case = encrypt_selftest_case, .generate_params = encrypt_selftest_gen_params, }, + {} }; static struct kunit_suite encryption_test_suite = {

1 year, 1 month

2
1
0 0

[PATCH] SUNRPC: Let Kunit tests run with some enctypes compiled out

by Chuck Lever

From: Chuck Lever <chuck.lever(a)oracle.com> Allow the new GSS Kerberos encryption type test suites to run outside of the kunit infrastructure. Replace the assertion that fires when lookup_enctype() so that the case is skipped instead of failing outright. Reported-by: Geert Uytterhoeven <geert(a)linux-m68k.org> Signed-off-by: Chuck Lever <chuck.lever(a)oracle.com> --- Hey Geert - This patch addresses part of your concern: with this patch applied, you should be able to run only the tests that target the encryption types that are enabled in your kernel. The other tests will be skipped rather than fail outright. net/sunrpc/auth_gss/gss_krb5_test.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/net/sunrpc/auth_gss/gss_krb5_test.c b/net/sunrpc/auth_gss/gss_krb5_test.c index c287ce15c419..0a7c5280e4e3 100644 --- a/net/sunrpc/auth_gss/gss_krb5_test.c +++ b/net/sunrpc/auth_gss/gss_krb5_test.c @@ -49,7 +49,8 @@ static void kdf_case(struct kunit *test) /* Arrange */ gk5e = gss_krb5_lookup_enctype(param->enctype); - KUNIT_ASSERT_NOT_NULL(test, gk5e); + if (!gk5e) + kunit_skip(test, "Encryption type is not available"); derivedkey.data = kunit_kzalloc(test, param->expected_result->len, GFP_KERNEL); @@ -83,7 +84,8 @@ static void checksum_case(struct kunit *test) /* Arrange */ gk5e = gss_krb5_lookup_enctype(param->enctype); - KUNIT_ASSERT_NOT_NULL(test, gk5e); + if (!gk5e) + kunit_skip(test, "Encryption type is not available"); Kc.len = gk5e->Kc_length; Kc.data = kunit_kzalloc(test, Kc.len, GFP_KERNEL); @@ -725,7 +727,8 @@ static void rfc3962_encrypt_case(struct kunit *test) /* Arrange */ gk5e = gss_krb5_lookup_enctype(param->enctype); - KUNIT_ASSERT_NOT_NULL(test, gk5e); + if (!gk5e) + kunit_skip(test, "Encryption type is not available"); cbc_tfm = crypto_alloc_sync_skcipher(gk5e->aux_cipher, 0, 0); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, cbc_tfm); @@ -1319,7 +1322,8 @@ static void rfc6803_encrypt_case(struct kunit *test) /* Arrange */ gk5e = gss_krb5_lookup_enctype(param->enctype); - KUNIT_ASSERT_NOT_NULL(test, gk5e); + if (!gk5e) + kunit_skip(test, "Encryption type is not available"); usage.data[3] = param->constant; @@ -1810,7 +1814,8 @@ static void rfc8009_encrypt_case(struct kunit *test) /* Arrange */ gk5e = gss_krb5_lookup_enctype(param->enctype); - KUNIT_ASSERT_NOT_NULL(test, gk5e); + if (!gk5e) + kunit_skip(test, "Encryption type is not available"); *(__be32 *)usage.data = cpu_to_be32(2); @@ -1975,7 +1980,8 @@ static void encrypt_selftest_case(struct kunit *test) /* Arrange */ gk5e = gss_krb5_lookup_enctype(param->enctype); - KUNIT_ASSERT_NOT_NULL(test, gk5e); + if (!gk5e) + kunit_skip(test, "Encryption type is not available"); cbc_tfm = crypto_alloc_sync_skcipher(gk5e->aux_cipher, 0, 0); KUNIT_ASSERT_NOT_ERR_OR_NULL(test, cbc_tfm);

1 year, 1 month

2
1
0 0

[PATCH] kunit: tool: Add support for m68k under QEMU

by Geert Uytterhoeven

Add basic support to run m68k under QEMU via kunit_tool. Signed-off-by: Geert Uytterhoeven <geert(a)linux-m68k.org> --- Does this need CONFIG_VIRTIO_CONSOLE=y? It seems to work fine without. drivers/clk/.kunitconfig: Fails because m68k uses big-endian I/O ops drivers/gpu/drm/tests/.kunitconfig kernel BUG at drivers/gpu/drm/drm_buddy.c:21! (also on arm, ignored) drivers/gpu/drm/vc4/tests/.kunitconfig Depends on arm, works on arm drivers/hid/.kunitconfig Unable to handle kernel NULL pointer dereference at virtual address (ptrval) Oops: 00000000 PC: [<001d7380>] uclogic_params_ugee_v2_has_battery+0x6/0x68 (also on arm, ignored) fs/ext4/.kunitconfig: OK fs/fat/.kunitconfig: OK kernel/kcsan/.kunitconfig Needs HAVE_ARCH_KCSAN and SMP (the former also on arm, ignored) lib/kunit/.kunitconfig: OK mm/kfence/.kunitconfig Needs HAVE_ARCH_KFENCE (fails on arm due to missing CONFIG_KFENCE_KUNIT_TEST=y, which depends on TRACEPOINTS) net/sunrpc/.kunitconfig After dropping CONFIG_STACKTRACE=y (why is this needed?) from net/sunrpc/.kunitconfig: Unable to handle kernel NULL pointer dereference at virtual address (ptrval) (also on arm, ignored) --- tools/testing/kunit/qemu_configs/m68k.py | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 tools/testing/kunit/qemu_configs/m68k.py diff --git a/tools/testing/kunit/qemu_configs/m68k.py b/tools/testing/kunit/qemu_configs/m68k.py new file mode 100644 index 0000000000000000..287fc386f8a7ff16 --- /dev/null +++ b/tools/testing/kunit/qemu_configs/m68k.py @@ -0,0 +1,10 @@ +# SPDX-License-Identifier: GPL-2.0-only +from ..qemu_config import QemuArchParams + +QEMU_ARCH = QemuArchParams(linux_arch='m68k', + kconfig=''' +CONFIG_VIRT=y''', + qemu_arch='m68k', + kernel_path='vmlinux', + kernel_command_line='console=hvc0', + extra_qemu_params=['-machine', 'virt']) -- 2.34.1

1 year, 1 month

2
1
0 0

[PATCH] Fix snprintf format warnings during 'alsa' kselftest compilation

by Ivan Orlov

Fix 'alsa' kselftest compilation warnings by making snprintf format correspond the actual parameters types. Signed-off-by: Ivan Orlov <ivan.orlov0322(a)gmail.com> --- tools/testing/selftests/alsa/pcm-test.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c index f293c7d81009..52b109a162c6 100644 --- a/tools/testing/selftests/alsa/pcm-test.c +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -318,7 +318,7 @@ static void test_pcm_time1(struct pcm_data *data, goto __close; } if (rchannels != channels) { - snprintf(msg, sizeof(msg), "channels unsupported %ld != %ld", channels, rchannels); + snprintf(msg, sizeof(msg), "channels unsupported %ld != %u", channels, rchannels); skip = true; goto __close; } @@ -329,7 +329,7 @@ static void test_pcm_time1(struct pcm_data *data, goto __close; } if (rrate != rate) { - snprintf(msg, sizeof(msg), "rate unsupported %ld != %ld", rate, rrate); + snprintf(msg, sizeof(msg), "rate unsupported %ld != %u", rate, rrate); skip = true; goto __close; } @@ -393,24 +393,24 @@ static void test_pcm_time1(struct pcm_data *data, frames = snd_pcm_writei(handle, samples, rate); if (frames < 0) { snprintf(msg, sizeof(msg), - "Write failed: expected %d, wrote %li", rate, frames); + "Write failed: expected %ld, wrote %li", rate, frames); goto __close; } if (frames < rate) { snprintf(msg, sizeof(msg), - "expected %d, wrote %li", rate, frames); + "expected %ld, wrote %li", rate, frames); goto __close; } } else { frames = snd_pcm_readi(handle, samples, rate); if (frames < 0) { snprintf(msg, sizeof(msg), - "expected %d, wrote %li", rate, frames); + "expected %ld, wrote %li", rate, frames); goto __close; } if (frames < rate) { snprintf(msg, sizeof(msg), - "expected %d, wrote %li", rate, frames); + "expected %ld, wrote %li", rate, frames); goto __close; } } -- 2.34.1

1 year, 1 month

2
3
0 0

[PATCH] kselftest: amd-pstate: Fix spelling mistakes

by Sukrut Bellary

Fix spelling mistakes in run.sh "drvier" => "driver" and in gitsource.sh "senconds" => "seconds". Signed-off-by: Sukrut Bellary <sukrut.bellary(a)gmail.com> --- tools/testing/selftests/amd-pstate/gitsource.sh | 4 ++-- tools/testing/selftests/amd-pstate/run.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/testing/selftests/amd-pstate/gitsource.sh b/tools/testing/selftests/amd-pstate/gitsource.sh index dbc1fe45599d..5f2171f0116d 100755 --- a/tools/testing/selftests/amd-pstate/gitsource.sh +++ b/tools/testing/selftests/amd-pstate/gitsource.sh @@ -117,7 +117,7 @@ parse_gitsource() printf "Gitsource-$1-#$2 power consumption(J): $en_sum\n" | tee -a $OUTFILE_GIT.result # Permance is the number of run gitsource per second, denoted 1/t, where 1 is the number of run gitsource in t - # senconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J), + # seconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J), # and t is time measured in seconds(s). This means that performance per watt becomes # 1/t 1/t 1 # ----- = ----- = --- @@ -175,7 +175,7 @@ gather_gitsource() printf "Gitsource-$1 avg power consumption(J): $avg_en\n" | tee -a $OUTFILE_GIT.result # Permance is the number of run gitsource per second, denoted 1/t, where 1 is the number of run gitsource in t - # senconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J), + # seconds. It is well known that P=E/t, where P is power measured in watts(W), E is energy measured in joules(J), # and t is time measured in seconds(s). This means that performance per watt becomes # 1/t 1/t 1 # ----- = ----- = --- diff --git a/tools/testing/selftests/amd-pstate/run.sh b/tools/testing/selftests/amd-pstate/run.sh index 57cad57e59c0..de4d8e9c9565 100755 --- a/tools/testing/selftests/amd-pstate/run.sh +++ b/tools/testing/selftests/amd-pstate/run.sh @@ -244,7 +244,7 @@ prerequisite() if [ "$scaling_driver" != "$CURRENT_TEST" ]; then echo "$0 # Skipped: Test can only run on $CURRENT_TEST driver or run comparative test." echo "$0 # Please set X86_AMD_PSTATE enabled or run comparative test." - echo "$0 # Current cpufreq scaling drvier is $scaling_driver." + echo "$0 # Current cpufreq scaling driver is $scaling_driver." exit $ksft_skip fi else @@ -252,7 +252,7 @@ prerequisite() "tbench" | "gitsource") if [ "$scaling_driver" != "$COMPARATIVE_TEST" ]; then echo "$0 # Skipped: Comparison test can only run on $COMPARISON_TEST driver." - echo "$0 # Current cpufreq scaling drvier is $scaling_driver." + echo "$0 # Current cpufreq scaling driver is $scaling_driver." exit $ksft_skip fi ;; -- 2.25.1

1 year, 1 month

1
0
0 0

[GIT PULL] KUnit next update for Linux 6.3-rc1

by Shuah Khan

Hi Linus, Please pull the following KUnit next update for Linux 6.3-rc1. This KUnit update for Linux 6.3-rc1 consists of cleanups, new features, and documentation updates: -- adds Function Redirection API to isolate the code being tested from other parts of the kernel. functionredirection.rst has the details. diff is attached. thanks, -- Shuah ---------------------------------------------------------------- The following changes since commit 4ec5183ec48656cec489c49f989c508b68b518e3: Linux 6.2-rc7 (2023-02-05 13:13:28 -0800) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux-kselftest-kunit-6.3-rc1 for you to fetch changes up to 82649c7c0da431d147a75c6ae768ee42c1053f53: kunit: Add printf attribute to fail_current_test_impl (2023-02-08 18:08:14 -0700) ---------------------------------------------------------------- linux-kselftest-kunit-6.3-rc1 This KUnit update for Linux 6.3-rc1 consists of cleanups, new features, and documentation updates: -- adds Function Redirection API to isolate the code being tested from other parts of the kernel. functionredirection.rst has the details. ---------------------------------------------------------------- Alexander Pantyukhin (2): tools/testing/kunit/kunit.py: remove redundant double check kunit: kunit.py extract handlers David Gow (3): kunit: Add "hooks" to call into KUnit when it's built as a module kunit: Expose 'static stub' API to redirect functions kunit: Add printf attribute to fail_current_test_impl Rae Moar (1): lib/hashtable_test.c: add test for the hashtable structure Sadiya Kazi (1): Documentation: Add Function Redirection API docs .../dev-tools/kunit/api/functionredirection.rst | 162 +++++++++++ Documentation/dev-tools/kunit/api/index.rst | 13 +- Documentation/dev-tools/kunit/usage.rst | 15 +- include/kunit/static_stub.h | 113 ++++++++ include/kunit/test-bug.h | 29 +- lib/Kconfig.debug | 13 + lib/Makefile | 9 + lib/hashtable_test.c | 317 +++++++++++++++++++++ lib/kunit/Makefile | 4 + lib/kunit/hooks-impl.h | 31 ++ lib/kunit/hooks.c | 21 ++ lib/kunit/kunit-example-test.c | 38 +++ lib/kunit/static_stub.c | 123 ++++++++ lib/kunit/test.c | 15 +- tools/testing/kunit/kunit.py | 186 ++++++------ 15 files changed, 966 insertions(+), 123 deletions(-) create mode 100644 Documentation/dev-tools/kunit/api/functionredirection.rst create mode 100644 include/kunit/static_stub.h create mode 100644 lib/hashtable_test.c create mode 100644 lib/kunit/hooks-impl.h create mode 100644 lib/kunit/hooks.c create mode 100644 lib/kunit/static_stub.c ----------------------------------------------------------------

1 year, 2 months

4
4
0 0

[ANN]: kdevops v6.2 released devices

by Luis Chamberlain

I'd like to announce the release of kdevops v6.2 [0] [1]. I had already written about most of the new features on the v6.2-rc1 release in the December 2022 notes [2], but since a new features cannot regress we've seen a few more new features sneak in since then. I'll re-iterate a few of the newest major features added since our last release (v5.0.2): * ZNS * CXL * NFS * Initial Kernel selftests suport: firmware, sysctl, kmod * OCI cloud support * libvirt use 9p now for local builds * PCI-passthrough support including a new dynamic kconfig interface for it * Building qemu for you * 12 btrfs profiles to test * Results for tests are now archived see workflows/fstests/results/ for an example namespace For more details of release notes you can refer to the v6.2-rc1 [3] and v6.2 [4] git tags. Thanks a lot to the developers who have contributed: Adam Manzanares Amir Goldstein Chandan Babu R Jeff Layton Joel Granados Josef Bacik Luis Chamberlain Pankaj Raghav *If* it makes sense, we may set up a stable brach for v6.2.y releases so which could fixate on the vagrant setup, so that folks using libvirt can get fixes. If we do that it would make sense to just merge fixes to the master branch first before the stable branch as well just as we do in upstream linux / stable branches. Luis [0] https://github.com/linux-kdevops/kdevops [1] https://gitlab.com/linux-kdevops/kdevops [2] https://people.kernel.org/mcgrof/kdevops-v6-2-rc1-released [3] https://github.com/linux-kdevops/kdevops/releases/tag/v6.2-rc1 [4] https://github.com/linux-kdevops/kdevops/releases/tag/v6.2

1 year, 2 months

1
0
0 0

[PATCH v2 0/7] Revise the hwpt lifetime model

by Jason Gunthorpe

As discussed here is a small series to address the confusing lifetime scheme for the hwpt. This was some leftover from prior rework that was never fully cleaned up. Make it clear that the ioas and ioas->hwpt_list are associated with the hwpt during creation and never changed until it is destroyed. A hwpt with a positive reference count is always valid for device attachment. This is a step toward the nesting and replace series. I have this on github: https://github.com/jgunthorpe/linux/commits/iommufd_hwpt v2: - Basically completely different - Add a test for HWPT cases by enhancing the mock iommu driver to be more complete - Move the device attachment as well into iommufd_hw_pagetable_alloc() so destroy is more symmetric v1: https://lore.kernel.org/r/0-v1-4336b5cb2fe4+1d7-iommufd_hwpt_jgg@nvidia.com Jason Gunthorpe (7): iommufd: Assert devices_lock for iommufd_hw_pagetable_has_group() iommufd: Add iommufd_lock_obj() around the auto-domains hwpts iommufd: Move ioas related HWPT destruction into iommufd_hw_pagetable_destroy() iommufd: Move iommufd_device to iommufd_private.h iommufd: Make iommufd_hw_pagetable_alloc() do iopt_table_add_domain() iommufd/selftest: Make selftest create a more complete mock device iommufd/selftest: Add a selftest for iommufd_device_attach() with a hwpt argument drivers/iommu/iommufd/device.c | 150 +++++--------- drivers/iommu/iommufd/hw_pagetable.c | 72 ++++++- drivers/iommu/iommufd/iommufd_private.h | 35 +++- drivers/iommu/iommufd/selftest.c | 196 +++++++++++++++--- tools/testing/selftests/iommu/iommufd.c | 15 +- .../selftests/iommu/iommufd_fail_nth.c | 8 - 6 files changed, 319 insertions(+), 157 deletions(-) base-commit: 8473685c99683f9e2c7e2a42ef3d3f14a79be274 -- 2.39.1

1 year, 2 months

2
18
0 0

[PATCH bpf-next] selftests/bpf: Fix compilation errors: assign a value to a constant

by Rong Tao

From: Rong Tao <rongtao(a)cestc.cn> Added bpf_find_vma test in commit f108662b27c9("selftests/bpf: Add tests for bpf_find_vma") to assign values to variables that declare const in find_vma_fail1.c programs, which is an error to the compiler and does not test BPF verifiers. It is better to replace 'const vm_flags_t vm_flags' with 'unsigned long vm_start' for testing. $ make -C tools/testing/selftests/bpf/ -j8 ... progs/find_vma_fail1.c:16:16: error: cannot assign to non-static data member 'vm_flags' with const-qualified type 'const vm_flags_t' (aka 'const unsigned long') vma->vm_flags |= 0x55; ~~~~~~~~~~~~~ ^ ../tools/testing/selftests/bpf/tools/include/vmlinux.h:1898:20: note: non-static data member 'vm_flags' declared const here const vm_flags_t vm_flags; ~~~~~~~~~~~`~~~~~~^~~~~~~~ Signed-off-by: Rong Tao <rongtao(a)cestc.cn> --- tools/testing/selftests/bpf/progs/find_vma_fail1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/progs/find_vma_fail1.c b/tools/testing/selftests/bpf/progs/find_vma_fail1.c index b3b326b8e2d1..47d5dedff554 100644 --- a/tools/testing/selftests/bpf/progs/find_vma_fail1.c +++ b/tools/testing/selftests/bpf/progs/find_vma_fail1.c @@ -13,7 +13,7 @@ static long write_vma(struct task_struct *task, struct vm_area_struct *vma, struct callback_ctx *data) { /* writing to vma, which is illegal */ - vma->vm_flags |= 0x55; + vma->vm_start = 0xffffffffff600000; return 0; } -- 2.39.2

1 year, 2 months

1
0
0 0

[PATCH linux-next] selftests: net: udpgso_bench_tx: Add test for IP fragmentation of UDP packets

by yang.yang29＠zte.com.cn

From: zhang yunkai (CGEL ZTE) <zhang.yunkai(a)zte.com.cn> The UDP GSO bench only tests the performance of userspace payload splitting and UDP GSO. But we are also concerned about the performance comparing with IP fragmentation and UDP GSO. In other words comparing IP fragmentation and segmentation. So we add testcase of IP fragmentation of UDP packets, then user would easy to get to know the performance promotion of UDP GSO compared with IP fragmentation. We add a new option "-f", which is to send big data using IP fragmentation instead of using UDP GSO or userspace payload splitting. In the QEMU environment we could see obvious promotion of UDP GSO. The first test is to get the performance of userspace payload splitting. bash# udpgso_bench_tx -l 4 -4 -D "$DST" udp tx: 10 MB/s 7812 calls/s 186 msg/s udp tx: 10 MB/s 7392 calls/s 176 msg/s udp tx: 11 MB/s 7938 calls/s 189 msg/s udp tx: 11 MB/s 7854 calls/s 187 msg/s The second test is to get the performance of IP fragmentation. bash# udpgso_bench_tx -l 4 -4 -D "$DST" -f udp tx: 33 MB/s 572 calls/s 572 msg/s udp tx: 33 MB/s 563 calls/s 563 msg/s udp tx: 31 MB/s 540 calls/s 540 msg/s udp tx: 33 MB/s 571 calls/s 571 msg/s The third test is to get the performance of UDP GSO. bash# udpgso_bench_tx -l 4 -4 -D "$DST" -S 0 udp tx: 46 MB/s 795 calls/s 795 msg/s udp tx: 49 MB/s 845 calls/s 845 msg/s udp tx: 49 MB/s 847 calls/s 847 msg/s udp tx: 45 MB/s 774 calls/s 774 msg/s Signed-off-by: zhang yunkai (CGEL ZTE) <zhang.yunkai(a)zte.com.cn> Reviewed-by: xu xin (CGEL ZTE) <xu.xin16(a)zte.com.cn> Reviewed-by: Yang Yang (CGEL ZTE) <yang.yang29(a)zte.com.cn> Cc: Xuexin Jiang (CGEL ZTE) <jiang.xuexin(a)zte.com.cn> --- tools/testing/selftests/net/udpgso_bench_tx.c | 33 ++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/net/udpgso_bench_tx.c b/tools/testing/selftests/net/udpgso_bench_tx.c index 477392715a9a..025e706b594b 100644 --- a/tools/testing/selftests/net/udpgso_bench_tx.c +++ b/tools/testing/selftests/net/udpgso_bench_tx.c @@ -64,6 +64,7 @@ static int cfg_runtime_ms = -1; static bool cfg_poll; static int cfg_poll_loop_timeout_ms = 2000; static bool cfg_segment; +static bool cfg_fragment; static bool cfg_sendmmsg; static bool cfg_tcp; static uint32_t cfg_tx_ts = SOF_TIMESTAMPING_TX_SOFTWARE; @@ -375,6 +376,21 @@ static int send_udp_sendmmsg(int fd, char *data) return ret; } +static int send_udp_fragment(int fd, char *data) +{ + int ret; + + ret = sendto(fd, data, cfg_payload_len, cfg_zerocopy ? MSG_ZEROCOPY : 0, + cfg_connected ? NULL : (void *)&cfg_dst_addr, + cfg_connected ? 0 : cfg_alen); + if (ret == -1) + error(1, errno, "write"); + if (ret != cfg_payload_len) + error(1, errno, "write: %uB != %uB\n", ret, cfg_payload_len); + + return 1; +} + static void send_udp_segment_cmsg(struct cmsghdr *cm) { uint16_t *valp; @@ -429,7 +445,7 @@ static int send_udp_segment(int fd, char *data) static void usage(const char *filepath) { - error(1, 0, "Usage: %s [-46acmHPtTuvz] [-C cpu] [-D dst ip] [-l secs] " + error(1, 0, "Usage: %s [-46acfmHPtTuvz] [-C cpu] [-D dst ip] [-l secs] " "[-L secs] [-M messagenr] [-p port] [-s sendsize] [-S gsosize]", filepath); } @@ -440,7 +456,7 @@ static void parse_opts(int argc, char **argv) int max_len, hdrlen; int c; - while ((c = getopt(argc, argv, "46acC:D:Hl:L:mM:p:s:PS:tTuvz")) != -1) { + while ((c = getopt(argc, argv, "46acC:D:fHl:L:mM:p:s:PS:tTuvz")) != -1) { switch (c) { case '4': if (cfg_family != PF_UNSPEC) @@ -469,6 +485,9 @@ static void parse_opts(int argc, char **argv) case 'l': cfg_runtime_ms = strtoul(optarg, NULL, 10) * 1000; break; + case 'f': + cfg_fragment = true; + break; case 'L': cfg_poll_loop_timeout_ms = strtoul(optarg, NULL, 10) * 1000; break; @@ -527,10 +546,10 @@ static void parse_opts(int argc, char **argv) error(1, 0, "must pass one of -4 or -6"); if (cfg_tcp && !cfg_connected) error(1, 0, "connectionless tcp makes no sense"); - if (cfg_segment && cfg_sendmmsg) - error(1, 0, "cannot combine segment offload and sendmmsg"); - if (cfg_tx_tstamp && !(cfg_segment || cfg_sendmmsg)) - error(1, 0, "Options -T and -H require either -S or -m option"); + if ((cfg_segment + cfg_sendmmsg + cfg_fragment) > 1) + error(1, 0, "cannot combine segment offload , fragment and sendmmsg"); + if (cfg_tx_tstamp && !(cfg_segment || cfg_sendmmsg || cfg_fragment)) + error(1, 0, "Options -T and -H require either -S or -m or -f option"); if (cfg_family == PF_INET) hdrlen = sizeof(struct iphdr) + sizeof(struct udphdr); @@ -695,6 +714,8 @@ int main(int argc, char **argv) num_sends += send_udp_segment(fd, buf[i]); else if (cfg_sendmmsg) num_sends += send_udp_sendmmsg(fd, buf[i]); + else if (cfg_fragment) + num_sends += send_udp_fragment(fd, buf[i]); else num_sends += send_udp(fd, buf[i]); num_msgs++; -- 2.15.2

1 year, 2 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror February 2023