- Linux-kselftest-mirror - lists.linaro.org

[PATCH] selftests: Add functional test for the abort file in fusectl

by Chen Linxuan

This patch add a simple functional test for the "about" file in fusectlfs (/sys/fs/fuse/connections/ID/about). A simple fuse daemon is added for testing. Related discussion can be found in the link below. Link: https://lore.kernel.org/all/CAOQ4uxjKFXOKQxPpxtS6G_nR0tpw95w0GiO68UcWg_OBhm… Cc: Amir Goldstein <amir73il(a)gmail.com> Signed-off-by: Chen Linxuan <chenlinxuan(a)uniontech.com> --- MAINTAINERS | 1 + tools/testing/selftests/Makefile | 1 + .../selftests/filesystems/fusectl/.gitignore | 3 + .../selftests/filesystems/fusectl/Makefile | 21 +++ .../selftests/filesystems/fusectl/fuse_mnt.c | 146 ++++++++++++++++++ .../filesystems/fusectl/fusectl_test.c | 115 ++++++++++++++ 6 files changed, 287 insertions(+) create mode 100644 tools/testing/selftests/filesystems/fusectl/.gitignore create mode 100644 tools/testing/selftests/filesystems/fusectl/Makefile create mode 100644 tools/testing/selftests/filesystems/fusectl/fuse_mnt.c create mode 100644 tools/testing/selftests/filesystems/fusectl/fusectl_test.c diff --git a/MAINTAINERS b/MAINTAINERS index f21f1dabb5fe1..efc6c89113b95 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -9740,6 +9740,7 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git F: Documentation/filesystems/fuse.rst F: fs/fuse/ F: include/uapi/linux/fuse.h +F: tools/testing/selftests/filesystems/fusectl FUTEX SUBSYSTEM M: Thomas Gleixner <tglx(a)linutronix.de> diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 80fb84fa3cfcb..a9bfefa961889 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -36,6 +36,7 @@ TARGETS += filesystems/fat TARGETS += filesystems/overlayfs TARGETS += filesystems/statmount TARGETS += filesystems/mount-notify +TARGETS += filesystems/fusectl TARGETS += firmware TARGETS += fpu TARGETS += ftrace diff --git a/tools/testing/selftests/filesystems/fusectl/.gitignore b/tools/testing/selftests/filesystems/fusectl/.gitignore new file mode 100644 index 0000000000000..3e72e742d08e8 --- /dev/null +++ b/tools/testing/selftests/filesystems/fusectl/.gitignore @@ -0,0 +1,3 @@ +# SPDX-License-Identifier: GPL-2.0-only +fuse_mnt +fusectl_test diff --git a/tools/testing/selftests/filesystems/fusectl/Makefile b/tools/testing/selftests/filesystems/fusectl/Makefile new file mode 100644 index 0000000000000..612aad69a93aa --- /dev/null +++ b/tools/testing/selftests/filesystems/fusectl/Makefile @@ -0,0 +1,21 @@ +# SPDX-License-Identifier: GPL-2.0-or-later + +CFLAGS += -Wall -O2 -g $(KHDR_INCLUDES) + +TEST_GEN_PROGS := fusectl_test +TEST_GEN_FILES := fuse_mnt + +include ../../lib.mk + +VAR_CFLAGS := $(shell pkg-config fuse --cflags 2>/dev/null) +ifeq ($(VAR_CFLAGS),) +VAR_CFLAGS := -D_FILE_OFFSET_BITS=64 -I/usr/include/fuse +endif + +VAR_LDLIBS := $(shell pkg-config fuse --libs 2>/dev/null) +ifeq ($(VAR_LDLIBS),) +VAR_LDLIBS := -lfuse -pthread +endif + +$(OUTPUT)/fuse_mnt: CFLAGS += $(VAR_CFLAGS) +$(OUTPUT)/fuse_mnt: LDLIBS += $(VAR_LDLIBS) diff --git a/tools/testing/selftests/filesystems/fusectl/fuse_mnt.c b/tools/testing/selftests/filesystems/fusectl/fuse_mnt.c new file mode 100644 index 0000000000000..d12b17f30fadc --- /dev/null +++ b/tools/testing/selftests/filesystems/fusectl/fuse_mnt.c @@ -0,0 +1,146 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * fusectl test file-system + * Creates a simple FUSE filesystem with a single read-write file (/test) + */ + +#define FUSE_USE_VERSION 26 + +#include <fuse.h> +#include <stdio.h> +#include <string.h> +#include <errno.h> +#include <fcntl.h> +#include <stdlib.h> +#include <unistd.h> + +#define MAX(a, b) ((a) > (b) ? (a) : (b)) + +static char *content; +static size_t content_size = 0; +static const char test_path[] = "/test"; + +static int test_getattr(const char *path, struct stat *st) +{ + memset(st, 0, sizeof(*st)); + + if (!strcmp(path, "/")) { + st->st_mode = S_IFDIR | 0755; + st->st_nlink = 2; + return 0; + } + + if (!strcmp(path, test_path)) { + st->st_mode = S_IFREG | 0664; + st->st_nlink = 1; + st->st_size = content_size; + return 0; + } + + return -ENOENT; +} + +static int test_readdir(const char *path, void *buf, fuse_fill_dir_t filler, + off_t offset, struct fuse_file_info *fi) +{ + if (strcmp(path, "/")) + return -ENOENT; + + filler(buf, ".", NULL, 0); + filler(buf, "..", NULL, 0); + filler(buf, test_path + 1, NULL, 0); + + return 0; +} + +static int test_open(const char *path, struct fuse_file_info *fi) +{ + if (strcmp(path, test_path)) + return -ENOENT; + + return 0; +} + +static int test_read(const char *path, char *buf, size_t size, off_t offset, + struct fuse_file_info *fi) +{ + if (strcmp(path, test_path) != 0) + return -ENOENT; + + if (!content || content_size == 0) + return 0; + + if (offset >= content_size) + return 0; + + if (offset + size > content_size) + size = content_size - offset; + + memcpy(buf, content + offset, size); + + return size; +} + +static int test_write(const char *path, const char *buf, size_t size, + off_t offset, struct fuse_file_info *fi) +{ + size_t new_size; + + if (strcmp(path, test_path) != 0) + return -ENOENT; + + if(offset > content_size) + return -EINVAL; + + new_size = MAX(offset + size, content_size); + + if (new_size > content_size) + content = realloc(content, new_size); + + content_size = new_size; + + if (!content) + return -ENOMEM; + + memcpy(content + offset, buf, size); + + return size; +} + +static int test_truncate(const char *path, off_t size) +{ + if (strcmp(path, test_path) != 0) + return -ENOENT; + + if (size == 0) { + free(content); + content = NULL; + content_size = 0; + return 0; + } + + content = realloc(content, size); + + if (!content) + return -ENOMEM; + + if (size > content_size) + memset(content + content_size, 0, size - content_size); + + content_size = size; + return 0; +} + +static struct fuse_operations memfd_ops = { + .getattr = test_getattr, + .readdir = test_readdir, + .open = test_open, + .read = test_read, + .write = test_write, + .truncate = test_truncate, +}; + +int main(int argc, char *argv[]) +{ + return fuse_main(argc, argv, &memfd_ops, NULL); +} diff --git a/tools/testing/selftests/filesystems/fusectl/fusectl_test.c b/tools/testing/selftests/filesystems/fusectl/fusectl_test.c new file mode 100644 index 0000000000000..8ff130ae43122 --- /dev/null +++ b/tools/testing/selftests/filesystems/fusectl/fusectl_test.c @@ -0,0 +1,115 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// Copyright (c) 2025 Chen Linxuan <chenlinxuan(a)uniontech.com> + +#define _GNU_SOURCE + +#include <errno.h> +#include <fcntl.h> +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include <sys/mount.h> +#include <sys/stat.h> +#include <sys/types.h> +#include <sys/wait.h> +#include <unistd.h> +#include <dirent.h> +#include <linux/limits.h> + +#include "../../kselftest_harness.h" + +#define FUSECTL_MOUNTPOINT "/sys/fs/fuse/connections" +#define FUSE_MOUNTPOINT "/tmp/fuse_mnt_XXXXXX" +#define FUSE_DEVICE "/dev/fuse" +#define FUSECTL_TEST_VALUE "1" + +FIXTURE(fusectl){ + char fuse_mountpoint[sizeof(FUSE_MOUNTPOINT)]; + int connection; +}; + +FIXTURE_SETUP(fusectl) +{ + const char *fuse_mnt_prog = "./fuse_mnt"; + int status, pid; + struct stat statbuf; + + strcpy(self->fuse_mountpoint, FUSE_MOUNTPOINT); + + if (!mkdtemp(self->fuse_mountpoint)) + SKIP(return, + "Failed to create FUSE mountpoint %s", + strerror(errno)); + + if (access(FUSECTL_MOUNTPOINT, F_OK)) + SKIP(return, + "FUSE control filesystem not mounted"); + + pid = fork(); + if (pid < 0) + SKIP(return, + "Failed to fork FUSE daemon process: %s", + strerror(errno)); + + if (pid == 0) { + execlp(fuse_mnt_prog, fuse_mnt_prog, self->fuse_mountpoint, NULL); + exit(errno); + } + + waitpid(pid, &status, 0); + if (!WIFEXITED(status) || WEXITSTATUS(status) != 0) { + SKIP(return, + "Failed to start FUSE daemon %s", + strerror(WEXITSTATUS(status))); + } + + if (stat(self->fuse_mountpoint, &statbuf)) + SKIP(return, + "Failed to stat FUSE mountpoint %s", + strerror(errno)); + + self->connection = statbuf.st_dev; +} + +FIXTURE_TEARDOWN(fusectl) +{ + umount(self->fuse_mountpoint); + rmdir(self->fuse_mountpoint); +} + +TEST_F(fusectl, abort) +{ + char path_buf[PATH_MAX]; + int abort_fd, test_fd, ret; + + sprintf(path_buf, "/sys/fs/fuse/connections/%d/abort", self->connection); + + ASSERT_EQ(0, access(path_buf, F_OK)); + + abort_fd = open(path_buf, O_WRONLY); + ASSERT_GE(abort_fd, 0); + + sprintf(path_buf, "%s/test", self->fuse_mountpoint); + + test_fd = open(path_buf, O_RDWR); + ASSERT_GE(test_fd, 0); + + ret = read(test_fd, path_buf, sizeof(path_buf)); + ASSERT_EQ(ret, 0); + + ret = write(test_fd, "test", sizeof("test")); + ASSERT_EQ(ret, sizeof("test")); + + ret = lseek(test_fd, 0, SEEK_SET); + ASSERT_GE(ret, 0); + + ret = write(abort_fd, FUSECTL_TEST_VALUE, sizeof(FUSECTL_TEST_VALUE)); + ASSERT_GT(ret, 0); + + close(abort_fd); + + ret = read(test_fd, path_buf, sizeof(path_buf)); + ASSERT_LT(ret, 0); +} + +TEST_HARNESS_MAIN -- 2.43.0

6 months, 1 week

2
4
0 0

[PATCH] selftests/mm: Deduplicate second mmap() of 5*PAGE_SIZE at base

by Mark Brown

The map_fixed_noreplace test does two blocks of test starting from a mapping of 5 pages at the base address, logging a test result for each initial mapping. These are logged with the same test name, causing test automation software to see two reports for the same test in a single run. Tweak the log message for the second one to deduplicate. Signed-off-by: Mark Brown <broonie(a)kernel.org> --- tools/testing/selftests/mm/map_fixed_noreplace.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/mm/map_fixed_noreplace.c b/tools/testing/selftests/mm/map_fixed_noreplace.c index d53de2486080..1e9980b8993c 100644 --- a/tools/testing/selftests/mm/map_fixed_noreplace.c +++ b/tools/testing/selftests/mm/map_fixed_noreplace.c @@ -96,7 +96,7 @@ int main(void) ksft_exit_fail_msg("Error:1: mmap() succeeded when it shouldn't have\n"); } ksft_print_msg("mmap() @ 0x%lx-0x%lx p=%p result=%m\n", addr, addr + size, p); - ksft_test_result_pass("mmap() 5*PAGE_SIZE at base\n"); + ksft_test_result_pass("Second mmap() 5*PAGE_SIZE at base\n"); /* * Second mapping contained within first: --- base-commit: 82f2b0b97b36ee3fcddf0f0780a9a0825d52fec3 change-id: 20250514-selftests-mm-map-fixed-noreplace-dup-25f83f618bb2 Best regards, -- Mark Brown <broonie(a)kernel.org>

6 months, 1 week

1
0
0 0

[PATCH] kselftest: x86: Improve MOV SS test result message

by Brigham Campbell

Apparently, this test completes successfully when it completes execution without either causing a kernel panic or being killed by the kernel. This new test result message is more descriptive and grammatically correct. Signed-off-by: Brigham Campbell <me(a)brighamcampbell.com> --- tools/testing/selftests/x86/mov_ss_trap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/x86/mov_ss_trap.c b/tools/testing/selftests/x86/mov_ss_trap.c index f22cb6b382f9..d80033c0d7eb 100644 --- a/tools/testing/selftests/x86/mov_ss_trap.c +++ b/tools/testing/selftests/x86/mov_ss_trap.c @@ -269,6 +269,6 @@ int main() ); } - printf("[OK]\tI aten't dead\n"); + printf("[OK]\tkernel handled MOV SS without crashing test\n"); return 0; } -- 2.49.0

6 months, 1 week

1
0
0 0

[PATCH] kselftest: dma - fix typo "mininum" -> "minimum" in comment

by Sukrut Heroorkar

Fixes a small typo in a comment; helping to improve clarity in code comment. Signed-off-by: Sukrut Heroorkar <hsukrut3(a)gmail.com> --- tools/testing/selftests/dma/dma_map_benchmark.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/dma/dma_map_benchmark.c b/tools/testing/selftests/dma/dma_map_benchmark.c index b12f1f9babf8..ed5522061dd6 100644 --- a/tools/testing/selftests/dma/dma_map_benchmark.c +++ b/tools/testing/selftests/dma/dma_map_benchmark.c @@ -80,7 +80,7 @@ int main(int argc, char **argv) exit(1); } - /* suppose the mininum DMA zone is 1MB in the world */ + /* suppose the minimum DMA zone is 1MB in the world */ if (bits < 20 || bits > 64) { fprintf(stderr, "invalid dma mask bit, must be in 20-64\n"); exit(1); -- 2.43.0

6 months, 2 weeks

1
0
0 0

[PATCH] docs: msm: fix grammar and spelling in crash dump format

by Suresh K C

From: Suresh K C <suresh.k.chandrappa(a)gmail.com> Fixes minor grammar and spelling issues in the MSM crash dump documentation: - Corrected "uinque" to "unique" - Changed "Set of registers values" to "Set of register values" These changes improve clarity and maintain consistency with kernel documentation standards. Signed-off-by: Suresh K C <suresh.k.chandrappa(a)gmail.com> --- Documentation/gpu/msm-crash-dump.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/gpu/msm-crash-dump.rst b/Documentation/gpu/msm-crash-dump.rst index 9509cc4224f4..6a7a947044ee 100644 --- a/Documentation/gpu/msm-crash-dump.rst +++ b/Documentation/gpu/msm-crash-dump.rst @@ -70,7 +70,7 @@ ringbuffer bo List of buffers from the hanging submission if available. - Each buffer object will have a uinque iova. + Each buffer object will have a unique iova. iova GPU address of the buffer object. @@ -83,7 +83,7 @@ bo Trailing zeros at the end of the buffer will be skipped. registers - Set of registers values. Each entry is on its own line enclosed + Set of register values. Each entry is on its own line enclosed by brackets { }. offset -- 2.43.0

6 months, 2 weeks

1
0
0 0

[PATCH] selftests: rtc: fix grammar for more clarity

by Nidhish Chauhan

Fix some grammar mistake and improve clarity of output messages and comments in rtctest.c. Fix format of message in accordance to other output messages in rtctest.c. Signed-off-by: Nidhish Chauhan <solemnsquire(a)gmail.com> --- tools/testing/selftests/rtc/rtctest.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/tools/testing/selftests/rtc/rtctest.c b/tools/testing/selftests/rtc/rtctest.c index be175c0e6ae3..42456dd90095 100644 --- a/tools/testing/selftests/rtc/rtctest.c +++ b/tools/testing/selftests/rtc/rtctest.c @@ -138,10 +138,10 @@ TEST_F_TIMEOUT(rtc, date_read_loop, READ_LOOP_DURATION_SEC + 2) { rtc_read = rtc_time_to_timestamp(&rtc_tm); /* Time should not go backwards */ ASSERT_LE(prev_rtc_read, rtc_read); - /* Time should not increase more then 1s at a time */ + /* Time should not increase by more than 1s at a time */ ASSERT_GE(prev_rtc_read + 1, rtc_read); - /* Sleep 11ms to avoid killing / overheating the RTC */ + /* Sleep for 11ms to avoid overloading or overheating the RTC */ nanosleep_with_retries(READ_LOOP_SLEEP_MS * 1000000); prev_rtc_read = rtc_read; @@ -163,7 +163,7 @@ TEST_F_TIMEOUT(rtc, uie_read, NUM_UIE + 2) { rc = ioctl(self->fd, RTC_UIE_ON, 0); if (rc == -1) { ASSERT_EQ(EINVAL, errno); - TH_LOG("skip update IRQs not supported."); + TH_LOG("Skipping test since update IRQs are not supported."); return; } @@ -192,7 +192,7 @@ TEST_F(rtc, uie_select) { rc = ioctl(self->fd, RTC_UIE_ON, 0); if (rc == -1) { ASSERT_EQ(EINVAL, errno); - TH_LOG("skip update IRQs not supported."); + TH_LOG("Skipping test since update IRQs are not supported."); return; } @@ -252,7 +252,7 @@ TEST_F(rtc, alarm_alm_set) { */ ASSERT_EQ(RTC_ALARM_UNKNOWN, alarm_state); ASSERT_EQ(EINVAL, errno); - TH_LOG("skip alarms are not supported."); + TH_LOG("Skipping test since alarms are not supported."); return; } @@ -324,7 +324,7 @@ TEST_F(rtc, alarm_wkalm_set) { */ ASSERT_EQ(RTC_ALARM_UNKNOWN, alarm_state); ASSERT_EQ(EINVAL, errno); - TH_LOG("skip alarms are not supported."); + TH_LOG("Skipping test since alarms are not supported."); return; } @@ -384,7 +384,7 @@ TEST_F_TIMEOUT(rtc, alarm_alm_set_minute, 65) { */ ASSERT_EQ(RTC_ALARM_UNKNOWN, alarm_state); ASSERT_EQ(EINVAL, errno); - TH_LOG("skip alarms are not supported."); + TH_LOG("Skipping test since alarms are not supported."); return; } @@ -454,7 +454,7 @@ TEST_F_TIMEOUT(rtc, alarm_wkalm_set_minute, 65) { */ ASSERT_EQ(RTC_ALARM_UNKNOWN, alarm_state); ASSERT_EQ(EINVAL, errno); - TH_LOG("skip alarms are not supported."); + TH_LOG("Skipping test since alarms are not supported."); return; } @@ -494,7 +494,7 @@ int main(int argc, char **argv) case 1: break; default: - fprintf(stderr, "usage: %s [rtcdev]\n", argv[0]); + fprintf(stderr, "Usage: %s [rtcdev]\n", argv[0]); return 1; } -- 2.49.0

6 months, 2 weeks

1
0
0 0

[PATCH] selftests: powerpc: Fix spelling and grammar in PMU test files

by Akshaykumar Gunari

Corrected multiple spelling and grammar issues in the under powerpc PMU selftests: - Corrected 'aplicable' -> 'applicable'. - Corrected 'contraint' -> 'constraint'. - Corrected 'Incase' -> 'In Case'. These changes improve documentation quality and maintain code readability. Signed-off-by: Akshaykumar Gunari <akshaygunari(a)gmail.com> --- .../pmu/event_code_tests/group_constraint_cache_test.c | 4 ++-- .../pmu/event_code_tests/group_constraint_l2l3_sel_test.c | 6 +++--- .../group_constraint_radix_scope_qual_test.c | 4 ++-- .../event_code_tests/group_constraint_thresh_cmp_test.c | 8 ++++---- .../event_code_tests/group_constraint_thresh_ctl_test.c | 4 ++-- .../event_code_tests/group_constraint_thresh_sel_test.c | 4 ++-- .../pmu/event_code_tests/group_constraint_unit_test.c | 8 ++++---- tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c | 4 ++-- .../powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c | 2 +- .../sampling_tests/mmcra_bhrb_disable_no_branch_test.c | 2 +- .../powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c | 2 +- .../powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c | 2 +- 12 files changed, 25 insertions(+), 25 deletions(-) diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c index f4be05aa3a3d..855dca7334da 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_cache_test.c @@ -31,7 +31,7 @@ static int group_constraint_cache(void) /* Check for platform support for the test */ SKIP_IF(platform_check_for_tests()); - /* Init the events for the group contraint check for l1 cache select bits */ + /* Init the events for the group constraint check for l1 cache select bits */ event_init(&leader, EventCode_1); FAIL_IF(event_open(&leader)); @@ -42,7 +42,7 @@ static int group_constraint_cache(void) event_close(&event); - /* Init the event for the group contraint l1 cache select test */ + /* Init the event for the group constraint l1 cache select test */ event_init(&event, EventCode_3); /* Expected to succeed as sibling event request same l1 cache select bits as leader */ diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c index e3c7a0c071e2..9de991d7a767 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_l2l3_sel_test.c @@ -30,12 +30,12 @@ static int group_constraint_l2l3_sel(void) /* * Check for platform support for the test. - * This test is only aplicable on ISA v3.1 + * This test is only applicable on ISA v3.1 */ SKIP_IF(platform_check_for_tests()); SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1)); - /* Init the events for the group contraint check for l2l3_sel bits */ + /* Init the events for the group constraint check for l2l3_sel bits */ event_init(&leader, EventCode_1); FAIL_IF(event_open(&leader)); @@ -46,7 +46,7 @@ static int group_constraint_l2l3_sel(void) event_close(&event); - /* Init the event for the group contraint l2l3_sel test */ + /* Init the event for the group constraint l2l3_sel test */ event_init(&event, EventCode_3); /* Expected to succeed as sibling event request same l2l3_sel bits as leader */ diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c index 9233175787cc..e354129cd7fb 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_radix_scope_qual_test.c @@ -26,12 +26,12 @@ static int group_constraint_radix_scope_qual(void) /* * Check for platform support for the test. - * This test is aplicable on ISA v3.1 only. + * This test is applicable on ISA v3.1 only. */ SKIP_IF(platform_check_for_tests()); SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1)); - /* Init the events for the group contraint check for radix_scope_qual bits */ + /* Init the events for the group constraint check for radix_scope_qual bits */ event_init(&leader, EventCode_1); FAIL_IF(event_open(&leader)); diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c index 4b69e7214c0b..433fa9982c8c 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_cmp_test.c @@ -37,7 +37,7 @@ static int group_constraint_thresh_cmp(void) SKIP_IF(platform_check_for_tests()); if (have_hwcap2(PPC_FEATURE2_ARCH_3_1)) { - /* Init the events for the group contraint check for thresh_cmp bits */ + /* Init the events for the group constraint check for thresh_cmp bits */ event_init(&leader, p10_EventCode_1); /* Add the thresh_cmp value for leader in config1 */ @@ -54,7 +54,7 @@ static int group_constraint_thresh_cmp(void) event_close(&event); - /* Init the event for the group contraint thresh compare test */ + /* Init the event for the group constraint thresh compare test */ event_init(&event, p10_EventCode_2); /* Add the same thresh_cmp value for leader and sibling event in config1 */ @@ -66,7 +66,7 @@ static int group_constraint_thresh_cmp(void) event_close(&leader); event_close(&event); } else { - /* Init the events for the group contraint check for thresh_cmp bits */ + /* Init the events for the group constraint check for thresh_cmp bits */ event_init(&leader, p9_EventCode_1); FAIL_IF(event_open(&leader)); @@ -77,7 +77,7 @@ static int group_constraint_thresh_cmp(void) event_close(&event); - /* Init the event for the group contraint thresh compare test */ + /* Init the event for the group constraint thresh compare test */ event_init(&event, p9_EventCode_3); /* Expected to succeed as sibling and leader event request same thresh_cmp bits */ diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c index e0852ebc1671..7e7206eefcfd 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_ctl_test.c @@ -35,7 +35,7 @@ static int group_constraint_thresh_ctl(void) /* Check for platform support for the test */ SKIP_IF(platform_check_for_tests()); - /* Init the events for the group contraint thresh control test */ + /* Init the events for the group constraint thresh control test */ event_init(&leader, EventCode_1); FAIL_IF(event_open(&leader)); @@ -46,7 +46,7 @@ static int group_constraint_thresh_ctl(void) event_close(&event); - /* Init the event for the group contraint thresh control test */ + /* Init the event for the group constraint thresh control test */ event_init(&event, EventCode_3); /* Expected to succeed as sibling and leader event request same thresh_ctl bits */ diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c index 50a8cd843ce7..1b1336c1ddb1 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_thresh_sel_test.c @@ -34,7 +34,7 @@ static int group_constraint_thresh_sel(void) /* Check for platform support for the test */ SKIP_IF(platform_check_for_tests()); - /* Init the events for the group contraint thresh select test */ + /* Init the events for the group constraint thresh select test */ event_init(&leader, EventCode_1); FAIL_IF(event_open(&leader)); @@ -45,7 +45,7 @@ static int group_constraint_thresh_sel(void) event_close(&event); - /* Init the event for the group contraint thresh select test */ + /* Init the event for the group constraint thresh select test */ event_init(&event, EventCode_3); /* Expected to succeed as sibling and leader event request same thresh_sel bits */ diff --git a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c index a2c18923dcec..86684331f2bc 100644 --- a/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c +++ b/tools/testing/selftests/powerpc/pmu/event_code_tests/group_constraint_unit_test.c @@ -21,7 +21,7 @@ * Testcase for group constraint check of unit and pmc bits which is * used to program corresponding unit and pmc field in Monitor Mode * Control Register 1 (MMCR1) - * One of the event in the group should use PMC 4 incase units field + * One of the event in the group should use PMC 4 in case units field * value is within 6 to 9 otherwise event_open for the group will fail. */ static int group_constraint_unit(void) @@ -37,21 +37,21 @@ static int group_constraint_unit(void) SKIP_IF(platform_check_for_tests()); SKIP_IF(have_hwcap2(PPC_FEATURE2_ARCH_3_1)); - /* Init the events for the group contraint check for unit bits */ + /* Init the events for the group constraint check for unit bits */ e = &events[0]; event_init(e, EventCode_1); /* Expected to fail as PMC 4 is not used with unit field value 6 to 9 */ FAIL_IF(!event_open(&events[0])); - /* Init the events for the group contraint check for unit bits */ + /* Init the events for the group constraint check for unit bits */ e = &events[1]; event_init(e, EventCode_2); /* Expected to pass as PMC 4 is used with unit field value 6 to 9 */ FAIL_IF(event_open(&events[1])); - /* Init the event for the group contraint unit test */ + /* Init the event for the group constraint unit test */ e = &events[2]; event_init(e, EventCode_3); diff --git a/tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c b/tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c index 8a538b6182a1..7ec35566790a 100644 --- a/tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c +++ b/tools/testing/selftests/powerpc/pmu/sampling_tests/misc.c @@ -466,7 +466,7 @@ int get_thresh_cmp_val(struct event event) return value; /* - * Incase of P10, thresh_cmp value is not part of raw event code + * In case of P10, thresh_cmp value is not part of raw event code * and provided via attr.config1 parameter. To program threshold in MMCRA, * take a 18 bit number N and shift right 2 places and increment * the exponent E by 1 until the upper 10 bits of N are zero. @@ -498,7 +498,7 @@ int get_thresh_cmp_val(struct event event) * by comparing base_platform value from auxv and real * PVR value. * auxv_base_platform() func gives information of "base platform" - * corresponding to PVR value. Incase, if the distro doesn't + * corresponding to PVR value. In case, if the distro doesn't * support platform PVR (missing cputable support), base platform * in auxv will have a default value other than the real PVR's. * In this case, ISAv3 PMU (generic compat PMU) will be registered diff --git a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c index 809de8d58b3b..696f4285af3e 100644 --- a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c +++ b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_cond_test.c @@ -29,7 +29,7 @@ static int mmcra_bhrb_cond_test(void) /* * Check for platform support for the test. - * This test is only aplicable on ISA v3.1 + * This test is only applicable on ISA v3.1 */ SKIP_IF(check_pvr_for_sampling_tests()); SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1)); diff --git a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c index fa0dc15f9123..6ed293d18a34 100644 --- a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c +++ b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_no_branch_test.c @@ -26,7 +26,7 @@ static int mmcra_bhrb_disable_no_branch_test(void) /* * Check for platform support for the test. - * This test is only aplicable on ISA v3.1 + * This test is only applicable on ISA v3.1 */ SKIP_IF(check_pvr_for_sampling_tests()); SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1)); diff --git a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c index bc3161ab003d..858e37705275 100644 --- a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c +++ b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_disable_test.c @@ -26,7 +26,7 @@ static int mmcra_bhrb_disable_test(void) /* * Check for platform support for the test. - * This test is only aplicable on ISA v3.1 + * This test is only applicable on ISA v3.1 */ SKIP_IF(check_pvr_for_sampling_tests()); SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1)); diff --git a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c index fd6c9f12212c..6ae3edfedd51 100644 --- a/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c +++ b/tools/testing/selftests/powerpc/pmu/sampling_tests/mmcra_bhrb_ind_call_test.c @@ -29,7 +29,7 @@ static int mmcra_bhrb_ind_call_test(void) /* * Check for platform support for the test. - * This test is only aplicable on ISA v3.1 + * This test is only applicable on ISA v3.1 */ SKIP_IF(check_pvr_for_sampling_tests()); SKIP_IF(!have_hwcap2(PPC_FEATURE2_ARCH_3_1)); -- 2.43.0

6 months, 2 weeks

1
0
0 0

[PATCH] kselftests/x86: Correct grammer in VMX pairing message

by Sukrut Heroorkar

Fixes a small grammatical error in the print message. signed-off-by: Sukrut Heroorkar <hsukrut3(a)gmail.com> --- tools/testing/selftests/x86/ioperm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/x86/ioperm.c b/tools/testing/selftests/x86/ioperm.c index 69d5fb7050c2..a5099e526912 100644 --- a/tools/testing/selftests/x86/ioperm.c +++ b/tools/testing/selftests/x86/ioperm.c @@ -107,7 +107,7 @@ int main(void) err(1, "fork"); if (child == 0) { - printf("[RUN]\tchild: check that we inherited permissions\n"); + printf("[RUN]\tchild: check that if we inherited permissions\n"); expect_ok(0x80); expect_gp(0xed); printf("[RUN]\tchild: Extend permissions to 0x81\n"); -- 2.43.0

6 months, 2 weeks

2
1
0 0

[PATCH] selftests/mm: compaction_test: convert comments to preferred style

by George Anthony Vernon

Convert multi-line comments to preferred style with beginning and ending almost-blank lines. Signed-off-by: George Anthony Vernon <contact(a)gvernon.com> --- tools/testing/selftests/mm/compaction_test.c | 22 +++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/tools/testing/selftests/mm/compaction_test.c b/tools/testing/selftests/mm/compaction_test.c index 2c3a0eb6b22d..b217ec4a434b 100644 --- a/tools/testing/selftests/mm/compaction_test.c +++ b/tools/testing/selftests/mm/compaction_test.c @@ -1,6 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 /* - * * A test for the patch "Allow compaction of unevictable pages". * With this patch we should be able to allocate at least 1/4 * of RAM in huge pages. Without the patch much less is @@ -94,8 +93,10 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size, snprintf(init_nr_hugepages, sizeof(init_nr_hugepages), "%lu", initial_nr_hugepages); - /* We want to test with 80% of available memory. Else, OOM killer comes - in to play */ + /* + * We want to test with 80% of available memory. Else, OOM killer comes + * in to play + */ mem_free = mem_free * 0.8; fd = open("/proc/sys/vm/nr_hugepages", O_RDWR | O_NONBLOCK); @@ -106,8 +107,10 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size, goto out; } - /* Request a large number of huge pages. The Kernel will allocate - as much as it can */ + /* + * Request a large number of huge pages. The Kernel will allocate + * as much as it can + */ if (write(fd, "100000", (6*sizeof(char))) != (6*sizeof(char))) { ksft_print_msg("Failed to write 100000 to /proc/sys/vm/nr_hugepages: %s\n", strerror(errno)); @@ -122,8 +125,10 @@ int check_compaction(unsigned long mem_free, unsigned long hugepage_size, goto close_fd; } - /* We should have been able to request at least 1/3 rd of the memory in - huge pages */ + /* + * We should have been able to request at least 1/3 rd of the memory in + * huge pages + */ nr_hugepages_ul = strtoul(nr_hugepages, NULL, 10); if (!nr_hugepages_ul) { ksft_print_msg("ERROR: No memory is available as huge pages\n"); @@ -243,7 +248,8 @@ int main(int argc, char **argv) entry->next = list; list = entry; - /* Write something (in this case the address of the map) to + /* + * Write something (in this case the address of the map) to * ensure that KSM can't merge the mapped pages */ for (i = 0; i < MAP_SIZE; i += page_size) -- 2.49.0

6 months, 2 weeks

1
0
0 0

[RFC PATCH v2 00/13] New KVM ioctl to link a gmem inode to a new gmem file

by Ryan Afranji

Hello, RFC v2 addresses comments in RFC v1 [1]. This series is also rebased on kvm/next (v6.15-rc4). Here's the series stitched together for your convenience: https://github.com/googleprodkernel/linux-cc/tree/kvm-gmem-link-migrate-rfc… Changes from RFC v1: + Adds patches to make guest mem use guest mem inodes instead of anonymous inodes. + Changed the name of factored out gmem allocating function to kvm_gmem_alloc_view(). + Changed the flag name vm_move_enc_ctxt_supported to use_vm_enc_ctxt_op. + Various small changes to make patchset compatible with latest version of kvm/next. As a refresher, split file/inode model was proposed in guest_mem v11, where memslot bindings belong to the file and pages belong to the inode. This model lends itself well to having different VMs use separate files pointing to the same inode. The split file/inode model has also been used by the other following recent patch series: + mmap support for guest_memfd: [2] + NUMA mempolicy support for guest_memfd: [3] + HugeTLB support for guest_memfd: [4] This RFC proposes an ioctl, KVM_LINK_GUEST_MEMFD, that takes a VM and a gmem fd, and returns another gmem fd referencing a different file and associated with VM. This RFC also includes an update to KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM to migrate memory context (slot->arch.lpage_info and kvm->mem_attr_array) from source to destination vm, intra-host. Intended usage of the two ioctls: 1. Source VM’s fd is passed to destination VM via unix sockets. 2. Destination VM uses new ioctl KVM_LINK_GUEST_MEMFD to link source VM’s fd to a new fd. 3. Destination VM will pass new fds to KVM_SET_USER_MEMORY_REGION, which will bind the new file, pointing to the same inode that the source VM’s file points to, to memslots. 4. Use KVM_CAP_VM_MOVE_ENC_CONTEXT_FROM to move kvm->mem_attr_array and slot->arch.lpage_info to the destination VM. 5. Run the destination VM as per normal. Some other approaches considered were: + Using the linkat() syscall, but that requires a mount/directory for a source fd to be linked to + Using the dup() syscall, but that only duplicates the fd, and both fds point to the same file [1] https://lore.kernel.org/all/cover.1691446946.git.ackerleytng@google.com/T/ [2] https://lore.kernel.org/all/20250328153133.3504118-2-tabba@google.com/ [3] https://lore.kernel.org/all/20250408112402.181574-6-shivankg@amd.com/ [4] https://lore.kernel.org/all/c1ee659c212b5a8b0e7a7f4d1763699176dd3a62.174726… --- Ackerley Tng (12): KVM: guest_memfd: Make guest mem use guest mem inodes instead of anonymous inodes KVM: guest_mem: Refactor out kvm_gmem_alloc_view() KVM: guest_mem: Add ioctl KVM_LINK_GUEST_MEMFD KVM: selftests: Add tests for KVM_LINK_GUEST_MEMFD ioctl KVM: selftests: Test transferring private memory to another VM KVM: x86: Refactor sev's flag migration_in_progress to kvm struct KVM: x86: Refactor common code out of sev.c KVM: x86: Refactor common migration preparation code out of sev_vm_move_enc_context_from KVM: x86: Let moving encryption context be configurable KVM: x86: Handle moving of memory context for intra-host migration KVM: selftests: Generalize migration functions from sev_migrate_tests.c KVM: selftests: Add tests for migration of private mem David Hildenbrand (1): fs: Refactor to provide function that allocates a secure anonymous inode arch/x86/include/asm/kvm_host.h | 3 +- arch/x86/kvm/svm/sev.c | 82 +------ arch/x86/kvm/svm/svm.h | 3 +- arch/x86/kvm/x86.c | 218 ++++++++++++++++- arch/x86/kvm/x86.h | 6 + fs/anon_inodes.c | 23 +- include/linux/fs.h | 13 +- include/linux/kvm_host.h | 18 ++ include/uapi/linux/kvm.h | 8 + include/uapi/linux/magic.h | 1 + mm/secretmem.c | 9 +- tools/testing/selftests/kvm/Makefile.kvm | 1 + .../testing/selftests/kvm/guest_memfd_test.c | 43 ++++ .../testing/selftests/kvm/include/kvm_util.h | 31 +++ .../kvm/x86/private_mem_migrate_tests.c | 93 ++++++++ .../selftests/kvm/x86/sev_migrate_tests.c | 48 ++-- virt/kvm/guest_memfd.c | 225 +++++++++++++++--- virt/kvm/kvm_main.c | 17 +- virt/kvm/kvm_mm.h | 14 +- 19 files changed, 697 insertions(+), 159 deletions(-) create mode 100644 tools/testing/selftests/kvm/x86/private_mem_migrate_tests.c -- 2.49.0.1101.gccaa498523-goog

6 months, 2 weeks

1
13
0 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

Linux-kselftest-mirror