[PATCH v2 4/6] kselftest/arm64: mte: user_mem: add test type enum

[Shuah Khan]

On 2/3/22 7:36 AM, Joey Gouly wrote:
> This enum will be used to parameterise the test to perform other syscalls
> than 'read'.
> 

More information here.

> Signed-off-by: Joey Gouly <joey.gouly at arm.com>
> Cc: Catalin Marinas <catalin.marinas at arm.com>
> Cc: Will Deacon <will at kernel.org>
> Cc: Mark Brown <broonie at kernel.org>
> Cc: Shuah Khan <shuah at kernel.org>
> ---
>   .../selftests/arm64/mte/check_user_mem.c      | 38 +++++++++++++------
>   1 file changed, 26 insertions(+), 12 deletions(-)
> 
> diff --git a/tools/testing/selftests/arm64/mte/check_user_mem.c b/tools/testing/selftests/arm64/mte/check_user_mem.c
> index 35061ae23ed5..6d4aeb14027b 100644
> --- a/tools/testing/selftests/arm64/mte/check_user_mem.c
> +++ b/tools/testing/selftests/arm64/mte/check_user_mem.c
> @@ -19,12 +19,18 @@
>   
>   static size_t page_sz;
>   
> +enum test_type {
> +	READ_TEST,
> +	LAST_TEST,
> +};
> +
>   static int check_usermem_access_fault(int mem_type, int mode, int mapping,
> -                                      int tag_offset, int tag_len)
> +                                      int tag_offset, int tag_len,
> +                                      enum test_type test_type)
>   {
>   	int fd, i, err;
>   	char val = 'A';
> -	size_t len, read_len;
> +	ssize_t len, syscall_len;
>   	void *ptr, *ptr_next;
>   	int fileoff, ptroff, size;
>   	int sizes[] = {1, 2, 3, 8, 16, 32, 4096, page_sz};
> @@ -46,9 +52,9 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping,
>   	}
>   	mte_initialize_current_context(mode, (uintptr_t)ptr, len);
>   	/* Copy from file into buffer with valid tag */
> -	read_len = read(fd, ptr, len);
> +	syscall_len = read(fd, ptr, len);
>   	mte_wait_after_trig();
> -	if (cur_mte_cxt.fault_valid || read_len < len) {
> +	if (cur_mte_cxt.fault_valid || syscall_len < len) {
>   		err = KSFT_FAIL;
>   		goto usermem_acc_err;
>   	}
> @@ -73,8 +79,16 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping,
>   			for (i = 0; i < ARRAY_SIZE(sizes); i++) {
>   				size = sizes[i];
>   				lseek(fd, 0, 0);
> -				/* Copy from file into buffer with invalid tag */
> -				read_len = read(fd, ptr + ptroff, size);
> +
> +				/* perform file operation on buffer with invalid tag */
> +				switch (test_type) {
> +				case READ_TEST:
> +					syscall_len = read(fd, ptr + ptroff, size);
> +					break;
> +				case LAST_TEST:
> +					goto usermem_acc_err;
> +				}
> +
>   				mte_wait_after_trig();
>   				/*
>   				 * Accessing user memory in kernel with invalid tag should fail in sync
> @@ -85,9 +99,9 @@ static int check_usermem_access_fault(int mem_type, int mode, int mapping,
>   					err = KSFT_FAIL;
>   					goto usermem_acc_err;
>   				}
> -				if (mode == MTE_SYNC_ERR && read_len < len) {
> +				if (mode == MTE_SYNC_ERR && syscall_len < len) {
>   					/* test passed */
> -				} else if (mode == MTE_ASYNC_ERR && read_len == size) {
> +				} else if (mode == MTE_ASYNC_ERR && syscall_len == size) {
>   					/* test passed */
>   				} else {
>   					err = KSFT_FAIL;
> @@ -121,14 +135,14 @@ int main(int argc, char *argv[])
>   	/* Set test plan */
>   	ksft_set_plan(4);
>   
> -	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, page_sz, 0),
> +	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_PRIVATE, page_sz, 0, READ_TEST),
>   		"Check memory access from kernel in sync mode, private mapping and mmap memory\n");
> -	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, page_sz, 0),
> +	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_SYNC_ERR, MAP_SHARED, page_sz, 0, READ_TEST),
>   		"Check memory access from kernel in sync mode, shared mapping and mmap memory\n");
>   
> -	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, page_sz, 0),
> +	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_PRIVATE, page_sz, 0, READ_TEST),
>   		"Check memory access from kernel in async mode, private mapping and mmap memory\n");
> -	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, page_sz, 0),
> +	evaluate_test(check_usermem_access_fault(USE_MMAP, MTE_ASYNC_ERR, MAP_SHARED, page_sz, 0, READ_TEST),
>   		"Check memory access from kernel in async mode, shared mapping and mmap memory\n");
>   
>   	mte_restore_setup();
> 

The rest looks good

With the above requested changes -

Reviewed-by: Shuah Khan <skhan at linuxfoundation.org>

thanks,
-- Shuah