March 2023 - Linux-kselftest-mirror

Re: [PATCH] selftests/bpf: Improve exception handling in rbtree_add_and_remove()

by Alexei Starovoitov

On Fri, Mar 24, 2023 at 7:13 AM Markus Elfring <Markus.Elfring(a)web.de> wrote: > > Date: Fri, 24 Mar 2023 14:54:18 +0100 > > The label “err_out” was used to jump to another pointer check despite of > the detail in the implementation of the function “rbtree_add_and_remove” > that it was determined already that a corresponding variable contained > a null pointer. > > 1. Thus return directly after the first call of the function > “bpf_obj_new” failed. > > 2. Delete two questionable checks. > > 3. Omit an extra initialisation (for the variable “m”) > which became unnecessary with this refactoring. > > > This issue was detected by using the Coccinelle software. > > Fixes: 215249f6adc0359e3546829e7ee622b5e309b0ad ("selftests/bpf: Add rbtree selftests") > Signed-off-by: Markus Elfring <elfring(a)users.sourceforge.net> Nack. Please stop sending such "cleanup" patches.

1 year, 9 months

1
0
0 0

[PATCH] capability: test_deny_namespace breakage due to capability conversion to u64

by Sasha Levin

Commit f122a08b197d ("capability: just use a 'u64' instead of a 'u32[2]' array") attempts to use BIT_LL() but actually wanted to use BIT_ULL(), fix it up to make the test compile and run again. Fixes: f122a08b197d ("capability: just use a 'u64' instead of a 'u32[2]' array") Signed-off-by: Sasha Levin <sashal(a)kernel.org> --- tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/progs/test_deny_namespace.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index b677dcd0b77af..91a4e61b61f6d 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -353,7 +353,7 @@ endif CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ - -I$(abspath $(OUTPUT)/../usr/include) + -I$(abspath $(OUTPUT)/../usr/include) -I$(TOOLSINCDIR) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ -Wno-compare-distinct-pointer-types diff --git a/tools/testing/selftests/bpf/progs/test_deny_namespace.c b/tools/testing/selftests/bpf/progs/test_deny_namespace.c index 591104e79812e..0a619c34d692d 100644 --- a/tools/testing/selftests/bpf/progs/test_deny_namespace.c +++ b/tools/testing/selftests/bpf/progs/test_deny_namespace.c @@ -4,6 +4,7 @@ #include <bpf/bpf_tracing.h> #include <errno.h> #include <linux/capability.h> +#include <vdso/bits.h> struct kernel_cap_struct { __u64 val; @@ -19,7 +20,7 @@ SEC("lsm.s/userns_create") int BPF_PROG(test_userns_create, const struct cred *cred, int ret) { struct kernel_cap_struct caps = cred->cap_effective; - __u64 cap_mask = BIT_LL(CAP_SYS_ADMIN); + __u64 cap_mask = BIT_ULL(CAP_SYS_ADMIN); if (ret) return 0; -- 2.39.2

1 year, 9 months

3
2
0 0

[PATCH net-next 0/4] mptcp: a couple of cleanups and improvements

by Matthieu Baerts

Patch 1 removes an unneeded address copy in subflow_syn_recv_sock(). Patch 2 simplifies subflow_syn_recv_sock() to postpone some actions and to avoid a bunch of conditionals. Patch 3 stops reporting limits that are not taken into account when the userspace PM is used. Patch 4 adds a new test to validate that the 'subflows' field reported by the kernel is correct. Such info can be retrieved via Netlink (e.g. with ss) or getsockopt(SOL_MPTCP, MPTCP_INFO). Signed-off-by: Matthieu Baerts <matthieu.baerts(a)tessares.net> --- Geliang Tang (1): selftests: mptcp: add mptcp_info tests Matthieu Baerts (1): mptcp: do not fill info not used by the PM in used Paolo Abeni (2): mptcp: avoid unneeded address copy mptcp: simplify subflow_syn_recv_sock() net/mptcp/sockopt.c | 20 +++++++---- net/mptcp/subflow.c | 43 +++++++--------------- tools/testing/selftests/net/mptcp/mptcp_join.sh | 47 ++++++++++++++++++++++++- 3 files changed, 72 insertions(+), 38 deletions(-) --- base-commit: 323fe43cf9aef79159ba8937218a3f076bf505af change-id: 20230324-upstream-net-next-20230324-misc-features-178b2b618414 Best regards, -- Matthieu Baerts <matthieu.baerts(a)tessares.net>

1 year, 9 months

1
5
0 0

[PATCH v5 0/4] cover-letter: Add IO page table replacement support

by Nicolin Chen

[ This series depends on VFIO device cdev series ] Changelog v5: * Kept the cmd->id in the iommufd_test_create_access() so the access can be created with an ioas by default. Then, renamed the previous ioctl IOMMU_TEST_OP_ACCESS_SET_IOAS to IOMMU_TEST_OP_ACCESS_REPLACE_IOAS, so it would be used to replace an access->ioas pointer. * Added iommufd_access_replace() API after the introductions of the other two APIs iommufd_access_attach() and iommufd_access_detach(). * Since vdev->iommufd_attached is also set in emulated pathway too, call iommufd_access_update(), similar to the physical pathway. v4: https://lore.kernel.org/linux-iommu/cover.1678284812.git.nicolinc@nvidia.co… * Rebased on top of Jason's series adding replace() and hwpt_alloc() https://lore.kernel.org/linux-iommu/0-v2-51b9896e7862+8a8c-iommufd_alloc_jg… * Rebased on top of cdev series v6 https://lore.kernel.org/kvm/20230308132903.465159-1-yi.l.liu@intel.com/ * Dropped the patch that's moved to cdev series. * Added unmap function pointer sanity before calling it. * Added "Reviewed-by" from Kevin and Yi. * Added back the VFIO change updating the ATTACH uAPI. v3: https://lore.kernel.org/linux-iommu/cover.1677288789.git.nicolinc@nvidia.co… * Rebased on top of Jason's iommufd_hwpt branch: https://lore.kernel.org/linux-iommu/0-v2-406f7ac07936+6a-iommufd_hwpt_jgg@n… * Dropped patches from this series accordingly. There were a couple of VFIO patches that will be submitted after the VFIO cdev series. Also, renamed the series to be "emulated". * Moved dma_unmap sanity patch to the first in the series. * Moved dma_unmap sanity to cover both VFIO and IOMMUFD pathways. * Added Kevin's "Reviewed-by" to two of the patches. * Fixed a NULL pointer bug in vfio_iommufd_emulated_bind(). * Moved unmap() call to the common place in iommufd_access_set_ioas(). v2: https://lore.kernel.org/linux-iommu/cover.1675802050.git.nicolinc@nvidia.co… * Rebased on top of vfio_device cdev v2 series. * Update the kdoc and commit message of iommu_group_replace_domain(). * Dropped revert-to-core-domain part in iommu_group_replace_domain(). * Dropped !ops->dma_unmap check in vfio_iommufd_emulated_attach_ioas(). * Added missing rc value in vfio_iommufd_emulated_attach_ioas() from the iommufd_access_set_ioas() call. * Added a new patch in vfio_main to deny vfio_pin/unpin_pages() calls if vdev->ops->dma_unmap is not implemented. * Added a __iommmufd_device_detach helper and let the replace routine do a partial detach(). * Added restriction on auto_domains to use the replace feature. * Added the patch "iommufd/device: Make hwpt_list list_add/del symmetric" from the has_group removal series. v1: https://lore.kernel.org/linux-iommu/cover.1675320212.git.nicolinc@nvidia.co… Hi all, The existing IOMMU APIs provide a pair of functions: iommu_attach_group() for callers to attach a device from the default_domain (NULL if not being supported) to a given iommu domain, and iommu_detach_group() for callers to detach a device from a given domain to the default_domain. Internally, the detach_dev op is deprecated for the newer drivers with default_domain. This means that those drivers likely can switch an attaching domain to another one, without stagging the device at a blocking or default domain, for use cases such as: 1) vPASID mode, when a guest wants to replace a single pasid (PASID=0) table with a larger table (PASID=N) 2) Nesting mode, when switching the attaching device from an S2 domain to an S1 domain, or when switching between relevant S1 domains. This series is rebased on top of Jason Gunthorpe's series that introduces iommu_group_replace_domain API and IOMMUFD infrastructure for the IOMMUFD "physical" devices. The IOMMUFD "emulated" deivces will need some extra steps to replace the access->ioas object and its iopt pointer. You can also find this series on Github: https://github.com/nicolinc/iommufd/commits/iommu_group_replace_domain-v5 Thank you Nicolin Chen Nicolin Chen (4): vfio: Do not allow !ops->dma_unmap in vfio_pin/unpin_pages() iommufd: Add iommufd_access_replace() API iommufd/selftest: Add IOMMU_TEST_OP_ACCESS_REPLACE_IOAS coverage vfio: Support IO page table replacement drivers/iommu/iommufd/device.c | 60 +++++++++++++++---- drivers/iommu/iommufd/iommufd_test.h | 4 ++ drivers/iommu/iommufd/selftest.c | 19 ++++++ drivers/vfio/iommufd.c | 11 ++-- drivers/vfio/vfio_main.c | 4 ++ include/linux/iommufd.h | 1 + include/uapi/linux/vfio.h | 6 ++ tools/testing/selftests/iommu/iommfd*.c | 0 tools/testing/selftests/iommu/iommufd.c | 29 ++++++++- tools/testing/selftests/iommu/iommufd_utils.h | 19 ++++++ 10 files changed, 135 insertions(+), 18 deletions(-) create mode 100644 tools/testing/selftests/iommu/iommfd*.c -- 2.40.0

1 year, 9 months

2
7
0 0

[PATCH v2] kselftest/alsa: Fix -Wformat compiler warnings

by Alexander Heinrich

Fix compiler warnings caused by mixing long and unsigned int values: Change type of variables rate, channels, period_size and buffer_size to unsigned int (as used by rrate). Signed-off-by: Alexander Heinrich <hallo(a)alexanderheinrich.de> --- Hi Takashi, Thank you for your feedback on my first version of the patch! I have changed the variables to unsigned int, removed the casts and changed the relevant format specifiers to %d. This produced a new warnings in two places, where the 'rate' and 'channels' variables were being multiplied with 'snd_pcm_format_physical_width()', because this function returns an int (and can return a negative value on failure). I added a check for negative values, so that the return value can safely be cast to unsigned int. For the string to int conversion functions, the return values for the test cases in pcm-test.conf are non-negative and in the range of unsigned int, so I just cast them to unsigned int. Please let me know if I can further improve on my patch (it is my first)! Thanks and greetings, Alex tools/testing/selftests/alsa/pcm-test.c | 41 ++++++++++++++----------- 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c index 3e390fe67eb9..d4420789837c 100644 --- a/tools/testing/selftests/alsa/pcm-test.c +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -259,7 +259,7 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, { char name[64], key[128], msg[256]; const char *cs; - int i, err; + int i, err, phys_width; snd_pcm_t *handle = NULL; snd_pcm_access_t access = SND_PCM_ACCESS_RW_INTERLEAVED; snd_pcm_format_t format, old_format; @@ -267,8 +267,7 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, unsigned char *samples = NULL; snd_pcm_sframes_t frames; long long ms; - long rate, channels, period_size, buffer_size; - unsigned int rrate; + unsigned int rate, channels, period_size, buffer_size, rrate; snd_pcm_uframes_t rperiod_size, rbuffer_size, start_threshold; timestamp_t tstamp; bool pass = false; @@ -308,12 +307,15 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, ksft_exit_fail_msg("Wrong format '%s'\n", cs); conf_get_string_array(pcm_cfg, "alt_formats", NULL, alt_formats, ARRAY_SIZE(alt_formats), NULL); - rate = conf_get_long(pcm_cfg, "rate", NULL, 48000); - channels = conf_get_long(pcm_cfg, "channels", NULL, 2); - period_size = conf_get_long(pcm_cfg, "period_size", NULL, 4096); - buffer_size = conf_get_long(pcm_cfg, "buffer_size", NULL, 16384); - - samples = malloc((rate * channels * snd_pcm_format_physical_width(format)) / 8); + rate = (unsigned int)conf_get_long(pcm_cfg, "rate", NULL, 48000); + channels = (unsigned int)conf_get_long(pcm_cfg, "channels", NULL, 2); + period_size = (unsigned int)conf_get_long(pcm_cfg, "period_size", NULL, 4096); + buffer_size = (unsigned int)conf_get_long(pcm_cfg, "buffer_size", NULL, 16384); + + phys_width = snd_pcm_format_physical_width(format); + if (phys_width < 0) + ksft_exit_fail_msg("Unknown PCM format\n"); + samples = malloc((rate * channels * (unsigned int)phys_width) / 8); if (!samples) ksft_exit_fail_msg("Out of memory\n"); snd_pcm_format_set_silence(format, samples, rate * channels); @@ -357,8 +359,11 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, snd_pcm_access_name(access), snd_pcm_format_name(old_format), snd_pcm_format_name(format)); + phys_width = snd_pcm_format_physical_width(format); + if (phys_width < 0) + ksft_exit_fail_msg("Unknown PCM format\n"); samples = realloc(samples, (rate * channels * - snd_pcm_format_physical_width(format)) / 8); + (unsigned int)phys_width) / 8); if (!samples) ksft_exit_fail_msg("Out of memory\n"); snd_pcm_format_set_silence(format, samples, rate * channels); @@ -371,29 +376,29 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, } err = snd_pcm_hw_params_set_channels(handle, hw_params, channels); if (err < 0) { - snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_channels %ld: %s", channels, snd_strerror(err)); + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_channels %d: %s", channels, snd_strerror(err)); goto __close; } rrate = rate; err = snd_pcm_hw_params_set_rate_near(handle, hw_params, &rrate, 0); if (err < 0) { - snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_rate %ld: %s", rate, snd_strerror(err)); + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_rate %d: %s", rate, snd_strerror(err)); goto __close; } if (rrate != rate) { - snprintf(msg, sizeof(msg), "rate mismatch %ld != %ld", rate, rrate); + snprintf(msg, sizeof(msg), "rate mismatch %d != %d", rate, rrate); goto __close; } rperiod_size = period_size; err = snd_pcm_hw_params_set_period_size_near(handle, hw_params, &rperiod_size, 0); if (err < 0) { - snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_period_size %ld: %s", period_size, snd_strerror(err)); + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_period_size %d: %s", period_size, snd_strerror(err)); goto __close; } rbuffer_size = buffer_size; err = snd_pcm_hw_params_set_buffer_size_near(handle, hw_params, &rbuffer_size); if (err < 0) { - snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_buffer_size %ld: %s", buffer_size, snd_strerror(err)); + snprintf(msg, sizeof(msg), "snd_pcm_hw_params_set_buffer_size %d: %s", buffer_size, snd_strerror(err)); goto __close; } err = snd_pcm_hw_params(handle, hw_params); @@ -428,14 +433,14 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, goto __close; } - ksft_print_msg("%s.%s.%d.%d.%d.%s hw_params.%s.%s.%ld.%ld.%ld.%ld sw_params.%ld\n", + ksft_print_msg("%s.%s.%d.%d.%d.%s hw_params.%s.%s.%d.%d.%d.%d sw_params.%ld\n", test_class_name, test_name, data->card, data->device, data->subdevice, snd_pcm_stream_name(data->stream), snd_pcm_access_name(access), snd_pcm_format_name(format), - (long)rate, (long)channels, - (long)rperiod_size, (long)rbuffer_size, + rate, channels, + rperiod_size, rbuffer_size, (long)start_threshold); /* Set all the params, actually run the test */ -- 2.34.1

1 year, 9 months

2
1
0 0

[PATCH 0/5] Split a folio to any lower order folios

by Zi Yan

From: Zi Yan <ziy(a)nvidia.com> Hi all, File folio supports any order and people would like to support flexible orders for anonymous folio[1] too. Currently, split_huge_page() only splits a huge page to order-0 pages, but splitting to orders higher than 0 is also useful. This patchset adds support for splitting a huge page to any lower order pages and uses it during folio truncate operations. The patchset is on top of mm-everything-2023-03-19-21-50. * Patch 1 and 2 add new_order parameter split_page_memcg() and split_page_owner() and prepare for upcoming changes. * Patch 3 adds split_huge_page_to_list_to_order() to split a huge page to any lower order. The original split_huge_page_to_list() calls split_huge_page_to_list_to_order() with new_order = 0. * Patch 4 uses split_huge_page_to_list_to_order() in large pagecache folio truncation instead of split the large folio all the way down to order-0. * Patch 5 adds a test API to debugfs and test cases in split_huge_page_test selftests. Comments and/or suggestions are welcome. [1] https://lore.kernel.org/linux-mm/Y%2FblF0GIunm+pRIC@casper.infradead.org/ Zi Yan (5): mm: memcg: make memcg huge page split support any order split. mm: page_owner: add support for splitting to any order in split page_owner. mm: thp: split huge page to any lower order pages. mm: truncate: split huge page cache page to a non-zero order if possible. mm: huge_memory: enable debugfs to split huge pages to any order. include/linux/huge_mm.h | 10 +- include/linux/memcontrol.h | 5 +- include/linux/page_owner.h | 12 +- mm/huge_memory.c | 138 ++++++++--- mm/memcontrol.c | 8 +- mm/page_alloc.c | 8 +- mm/page_owner.c | 11 +- mm/truncate.c | 21 +- .../selftests/mm/split_huge_page_test.c | 225 +++++++++++++++++- 9 files changed, 368 insertions(+), 70 deletions(-) -- 2.39.2

1 year, 9 months

4
10
0 0

[PATCH v1 0/2] KVM: s390: CMMA migration selftest and small bugfix

by Nico Boehr

Add a new selftest for CMMA migration. Also fix a small issue found during development of the test. Nico Boehr (2): KVM: s390: selftests: add selftest for CMMA migration KVM: s390: fix KVM_S390_GET_CMMA_BITS for GFNs in memslot holes arch/s390/kvm/kvm-s390.c | 4 + tools/testing/selftests/kvm/Makefile | 1 + tools/testing/selftests/kvm/s390x/cmma_test.c | 679 ++++++++++++++++++ 3 files changed, 684 insertions(+) create mode 100644 tools/testing/selftests/kvm/s390x/cmma_test.c -- 2.39.1

1 year, 9 months

2
10
0 0

[PATCH] kselftest/alsa: Fix -Wformat compiler warnings

by Alexander Heinrich

I noticed some -Wformat compiler warnings in pcm-test.c while building kselftest, fix them by using the same types for format specifier and arguments. Signed-off-by: Alexander Heinrich <hallo(a)alexanderheinrich.de> --- tools/testing/selftests/alsa/pcm-test.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c index 58b525a4a32c..44fc5f826ab5 100644 --- a/tools/testing/selftests/alsa/pcm-test.c +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -371,7 +371,7 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, goto __close; } if (rrate != rate) { - snprintf(msg, sizeof(msg), "rate mismatch %ld != %ld", rate, rrate); + snprintf(msg, sizeof(msg), "rate mismatch %ld != %d", rate, rrate); goto __close; } rperiod_size = period_size; @@ -437,24 +437,24 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, 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, 9 months

2
2
0 0

[PATCH] kselftest/alsa - pcm-test: Don't include diagnostic message in test name

by Mark Brown

When reporting errors or skips we currently include the diagnostic message indicating why we're failing or skipping. This isn't ideal since KTAP defines the entire print as the test name, so if there's an error then test systems won't detect the test as being the same one as a passing test. Move the diagnostic to a separate ksft_print_msg() to avoid this issue, the test name part will always be the same for passes, fails and skips and the diagnostic information is still displayed. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/pcm-test.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/tools/testing/selftests/alsa/pcm-test.c b/tools/testing/selftests/alsa/pcm-test.c index 58b525a4a32c..bab56ea67e89 100644 --- a/tools/testing/selftests/alsa/pcm-test.c +++ b/tools/testing/selftests/alsa/pcm-test.c @@ -489,17 +489,18 @@ static void test_pcm_time(struct pcm_data *data, enum test_class class, } if (!skip) - ksft_test_result(pass, "%s.%s.%d.%d.%d.%s%s%s\n", + ksft_test_result(pass, "%s.%s.%d.%d.%d.%s\n", test_class_name, test_name, data->card, data->device, data->subdevice, - snd_pcm_stream_name(data->stream), - msg[0] ? " " : "", msg); + snd_pcm_stream_name(data->stream)); else - ksft_test_result_skip("%s.%s.%d.%d.%d.%s%s%s\n", + ksft_test_result_skip("%s.%s.%d.%d.%d.%s\n", test_class_name, test_name, data->card, data->device, data->subdevice, - snd_pcm_stream_name(data->stream), - msg[0] ? " " : "", msg); + snd_pcm_stream_name(data->stream)); + + if (msg[0]) + ksft_print_msg("%s\n", msg); pthread_mutex_unlock(&results_lock); --- base-commit: e8d018dd0257f744ca50a729e3d042cf2ec9da65 change-id: 20230323-alsa-pcm-test-names-bcd31b586ca9 Best regards, -- Mark Brown <broonie(a)kernel.org>

1 year, 9 months

2
1
0 0

[PATCH] kselftest/alsa - mixer-test: Log values associated with event issues

by Mark Brown

While it is common for driver bugs with events to apply to all events there are some issues which only trigger for specific values. Understanding these is easier if we know what we were trying to do when configuring the control so add logging for the specific values involved in the spurious event. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/alsa/mixer-test.c | 44 +++++++++++++++++++++++++++++++ 1 file changed, 44 insertions(+) diff --git a/tools/testing/selftests/alsa/mixer-test.c b/tools/testing/selftests/alsa/mixer-test.c index 05f1749ae19d..15d2ef8d4d27 100644 --- a/tools/testing/selftests/alsa/mixer-test.c +++ b/tools/testing/selftests/alsa/mixer-test.c @@ -445,6 +445,48 @@ static void test_ctl_name(struct ctl_data *ctl) ctl->card->card, ctl->elem); } +static void show_values(struct ctl_data *ctl, snd_ctl_elem_value_t *orig_val, + snd_ctl_elem_value_t *read_val) +{ + long long orig_int, read_int; + int i; + + for (i = 0; i < snd_ctl_elem_info_get_count(ctl->info); i++) { + switch (snd_ctl_elem_info_get_type(ctl->info)) { + case SND_CTL_ELEM_TYPE_BOOLEAN: + orig_int = snd_ctl_elem_value_get_boolean(orig_val, i); + read_int = snd_ctl_elem_value_get_boolean(read_val, i); + break; + + case SND_CTL_ELEM_TYPE_INTEGER: + orig_int = snd_ctl_elem_value_get_integer(orig_val, i); + read_int = snd_ctl_elem_value_get_integer(read_val, i); + break; + + case SND_CTL_ELEM_TYPE_INTEGER64: + orig_int = snd_ctl_elem_value_get_integer64(orig_val, + i); + read_int = snd_ctl_elem_value_get_integer64(read_val, + i); + break; + + case SND_CTL_ELEM_TYPE_ENUMERATED: + orig_int = snd_ctl_elem_value_get_enumerated(orig_val, + i); + read_int = snd_ctl_elem_value_get_enumerated(read_val, + i); + break; + + default: + return; + } + + ksft_print_msg("%s.%d orig %lld read %lld, is_volatile %d\n", + ctl->name, i, orig_int, read_int, + snd_ctl_elem_info_is_volatile(ctl->info)); + } +} + static bool show_mismatch(struct ctl_data *ctl, int index, snd_ctl_elem_value_t *read_val, snd_ctl_elem_value_t *expected_val) @@ -584,12 +626,14 @@ static int write_and_verify(struct ctl_data *ctl, if (err < 1) { ksft_print_msg("No event generated for %s\n", ctl->name); + show_values(ctl, initial_val, read_val); ctl->event_missing++; } } else { if (err != 0) { ksft_print_msg("Spurious event generated for %s\n", ctl->name); + show_values(ctl, initial_val, read_val); ctl->event_spurious++; } } --- base-commit: e8d018dd0257f744ca50a729e3d042cf2ec9da65 change-id: 20230322-alsa-mixer-event-values-7498bca29241 Best regards, -- Mark Brown <broonie(a)kernel.org>

1 year, 9 months

2
1
0 0

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror March 2023