selftests/bpf: Test kfunc bpf_strcasecmp
Subsystems (3)
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH 1/2 bpf: add bpf_strcasecmp kfunc
From: Rong Tao <[email protected]>
bpf_strcasecmp() function performs same like bpf_strcmp() except ignoring the case of the characters.
--- kernel/bpf/helpers.c | 56 +++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 14 deletions(-)
kernel/bpf/helpers.c +42 -14
@@ -3349,20 +3349,7 @@ __bpf_kfunc void __bpf_trap(void)* __get_kernel_nofault instead of plain dereference to make them safe. */ -/** -* bpf_strcmp - Compare two strings -* @s1__ign: One string -* @s2__ign: Another string -* -* Return: -* * %0 - Strings are equal -* * %-1 - @s1__ign is smaller -* * %1 - @s2__ign is smaller -* * %-EFAULT - Cannot read one of the strings -* * %-E2BIG - One of strings is too large -* * %-ERANGE - One of strings is outside of kernel address space -*/ -__bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign) +int __bpf_strcasecmp (const char *s1__ign,const char *s2__ign,bool ignore_case) {char c1, c2;int i;
@@ -3376,6 +3363,10 @@ __bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign)for (i =0 ; i <XATTR_SIZE_MAX ; i++) {__get_kernel_nofault (&c1, s1__ign, char, err_out);__get_kernel_nofault (&c2, s2__ign, char, err_out); +if (ignore_case) { + c1 =tolower (c1); + c2 =tolower (c2); + }if (c1 != c2)return c1 < c2 ?-1 :1 ;if (c1 =='\0' )
@@ -3388,6 +3379,42 @@ __bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign)return -EFAULT ; } +/** +* bpf_strcmp - Compare two strings +* @s1__ign: One string +* @s2__ign: Another string +* +* Return: +* * %0 - Strings are equal +* * %-1 - @s1__ign is smaller +* * %1 - @s2__ign is smaller +* * %-EFAULT - Cannot read one of the strings +* * %-E2BIG - One of strings is too large +* * %-ERANGE - One of strings is outside of kernel address space +*/ +__bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign) +{ +return __bpf_strcasecmp (s1__ign, s2__ign, false); +} + +/** +* bpf_strcasecmp - Compare two strings, ignoring the case of the characters +* @s1__ign: One string +* @s2__ign: Another string +* +* Return: +* * %0 - Strings are equal +* * %-1 - @s1__ign is smaller +* * %1 - @s2__ign is smaller +* * %-EFAULT - Cannot read one of the strings +* * %-E2BIG - One of strings is too large +* * %-ERANGE - One of strings is outside of kernel address space +*/ +__bpf_kfunc int bpf_strcasecmp(const char *s1__ign, const char *s2__ign) +{ +return __bpf_strcasecmp (s1__ign, s2__ign, true); +} +/** * bpf_strnchr - Find a character in a length limited string * @s__ign: The string to be searched
@@ -3832,6 +3859,7 @@ BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)#endif BTF_ID_FLAGS(func, __bpf_trap)BTF_ID_FLAGS (func, bpf_strcmp); +BTF_ID_FLAGS (func, bpf_strcasecmp);BTF_ID_FLAGS (func, bpf_strchr);BTF_ID_FLAGS (func, bpf_strchrnul);BTF_ID_FLAGS (func, bpf_strnchr);
Signature · 1 line
2.51.0
Re: [PATCH bpf-next 1/2] bpf: add bpf_strcasecmp kfunc
Quoted 23 lines · Rong Tao
From: Rong Tao <[email protected]>
bpf_strcasecmp()function performs same likebpf_strcmp()except ignoring the case of the characters.Signed-off-by Rong Tao <[email protected]>--- kernel/bpf/helpers.c | 56 +++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 14 deletions(-)kernel/bpf/helpers.c +0
-5@@ -3349,20 +3349,7 @@ __bpf_kfunc void __bpf_trap(void)* __get_kernel_nofault instead of plain dereference to make them safe. */ -/** -* bpf_strcmp - Compare two strings -* @s1__ign: One string -* @s2__ign: Another string -*
kernel/bpf/helpers.c __bpf_kfunc void __bpf_trap(void) · line 3352
Quoted 10 lines
kernel/bpf/helpers.c +1
-9-* Return: -* * %0 - Strings are equal -* * %-1 - @s1__ign is smaller -* * %1 - @s2__ign is smaller -* * %-EFAULT - Cannot read one of the strings -* * %-E2BIG - One of strings is too large -* * %-ERANGE - One of strings is outside of kernel address space -*/ -__bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign) +int __bpf_strcasecmp (const char *s1__ign,const char *s2__ign,bool ignore_case)
No need to use the __ign suffix here.
Otherwise LGTM. I guess that it could be useful in some applications.
Viktor
Quoted 65 lines
kernel/bpf/helpers.c +41
-0{char c1, c2;int i;@@ -3376,6 +3363,10 @@ __bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign)for (i =0 ; i <XATTR_SIZE_MAX ; i++) {__get_kernel_nofault (&c1, s1__ign, char, err_out);__get_kernel_nofault (&c2, s2__ign, char, err_out); +if (ignore_case) { + c1 =tolower (c1); + c2 =tolower (c2); + }if (c1 != c2)return c1 < c2 ?-1 :1 ;if (c1 =='\0' )@@ -3388,6 +3379,42 @@ __bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign)return -EFAULT ; } +/** +* bpf_strcmp - Compare two strings +* @s1__ign: One string +* @s2__ign: Another string +* +* Return: +* * %0 - Strings are equal +* * %-1 - @s1__ign is smaller +* * %1 - @s2__ign is smaller +* * %-EFAULT - Cannot read one of the strings +* * %-E2BIG - One of strings is too large +* * %-ERANGE - One of strings is outside of kernel address space +*/ +__bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign) +{ +return __bpf_strcasecmp (s1__ign, s2__ign, false); +} + +/** +* bpf_strcasecmp - Compare two strings, ignoring the case of the characters +* @s1__ign: One string +* @s2__ign: Another string +* +* Return: +* * %0 - Strings are equal +* * %-1 - @s1__ign is smaller +* * %1 - @s2__ign is smaller +* * %-EFAULT - Cannot read one of the strings +* * %-E2BIG - One of strings is too large +* * %-ERANGE - One of strings is outside of kernel address space +*/ +__bpf_kfunc int bpf_strcasecmp(const char *s1__ign, const char *s2__ign) +{ +return __bpf_strcasecmp (s1__ign, s2__ign, true); +} +/** * bpf_strnchr - Find a character in a length limited string * @s__ign: The string to be searched @@ -3832,6 +3859,7 @@ BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)#endif BTF_ID_FLAGS(func, __bpf_trap)BTF_ID_FLAGS (func, bpf_strcmp); +BTF_ID_FLAGS (func, bpf_strcasecmp);BTF_ID_FLAGS (func, bpf_strchr);BTF_ID_FLAGS (func, bpf_strchrnul);BTF_ID_FLAGS (func, bpf_strnchr);
Re: [PATCH bpf-next 1/2] bpf: add bpf_strcasecmp kfunc
Quoted 19 lines · Viktor Malik
Quoted 18 lines · Rong Tao
From: Rong Tao <[email protected]>
bpf_strcasecmp()function performs same likebpf_strcmp()except ignoring the case of the characters.Signed-off-by Rong Tao <[email protected]>--- kernel/bpf/helpers.c | 56 +++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 14 deletions(-)kernel/bpf/helpers.c +0
-0@@ -3349,20 +3349,7 @@ __bpf_kfunc void __bpf_trap(void)* __get_kernel_nofault instead of plain dereference to make them safe. */
Quoted 16 lines
Quoted 5 lines
kernel/bpf/helpers.c +0
-5-/** -* bpf_strcmp - Compare two strings -* @s1__ign: One string -* @s2__ign: Another string -* kernel/bpf/helpers.c __bpf_kfunc void __bpf_trap(void) · line 3352
Quoted 10 lines
kernel/bpf/helpers.c +1
-9-* Return: -* * %0 - Strings are equal -* * %-1 - @s1__ign is smaller -* * %1 - @s2__ign is smaller -* * %-EFAULT - Cannot read one of the strings -* * %-E2BIG - One of strings is too large -* * %-ERANGE - One of strings is outside of kernel address space -*/ -__bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign) +int __bpf_strcasecmp (const char *s1__ign,const char *s2__ign,bool ignore_case)No need to use the
__ignsuffix here.
Viktor, Thanks for your review, i'll submit v2 soon.
Rong Tao
Quoted 70 lines
Otherwise LGTM. I guess that it could be useful in some applications.
Viktor
Quoted 65 lines
kernel/bpf/helpers.c +41
-0{char c1, c2;int i;@@ -3376,6 +3363,10 @@ __bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign)for (i =0 ; i <XATTR_SIZE_MAX ; i++) {__get_kernel_nofault (&c1, s1__ign, char, err_out);__get_kernel_nofault (&c2, s2__ign, char, err_out); +if (ignore_case) { + c1 =tolower (c1); + c2 =tolower (c2); + }if (c1 != c2)return c1 < c2 ?-1 :1 ;if (c1 =='\0' )@@ -3388,6 +3379,42 @@ __bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign)return -EFAULT ; } +/** +* bpf_strcmp - Compare two strings +* @s1__ign: One string +* @s2__ign: Another string +* +* Return: +* * %0 - Strings are equal +* * %-1 - @s1__ign is smaller +* * %1 - @s2__ign is smaller +* * %-EFAULT - Cannot read one of the strings +* * %-E2BIG - One of strings is too large +* * %-ERANGE - One of strings is outside of kernel address space +*/ +__bpf_kfunc int bpf_strcmp(const char *s1__ign, const char *s2__ign) +{ +return __bpf_strcasecmp (s1__ign, s2__ign, false); +} + +/** +* bpf_strcasecmp - Compare two strings, ignoring the case of the characters +* @s1__ign: One string +* @s2__ign: Another string +* +* Return: +* * %0 - Strings are equal +* * %-1 - @s1__ign is smaller +* * %1 - @s2__ign is smaller +* * %-EFAULT - Cannot read one of the strings +* * %-E2BIG - One of strings is too large +* * %-ERANGE - One of strings is outside of kernel address space +*/ +__bpf_kfunc int bpf_strcasecmp(const char *s1__ign, const char *s2__ign) +{ +return __bpf_strcasecmp (s1__ign, s2__ign, true); +} +/** * bpf_strnchr - Find a character in a length limited string * @s__ign: The string to be searched @@ -3832,6 +3859,7 @@ BTF_ID_FLAGS(func, bpf_iter_dmabuf_destroy, KF_ITER_DESTROY | KF_SLEEPABLE)#endif BTF_ID_FLAGS(func, __bpf_trap)BTF_ID_FLAGS (func, bpf_strcmp); +BTF_ID_FLAGS (func, bpf_strcasecmp);BTF_ID_FLAGS (func, bpf_strchr);BTF_ID_FLAGS (func, bpf_strchrnul);BTF_ID_FLAGS (func, bpf_strnchr);
PATCH 2/2 selftests/bpf: Test kfunc bpf_strcasecmp
In reply to a message not in the archiveFrom: Rong Tao <[email protected]>
Add testsuites for kfunc bpf_strcasecmp.
--- tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c | 6 ++++++ tools/testing/selftests/bpf/progs/string_kfuncs_success.c | 5 +++++ 2 files changed, 11 insertions(+)
tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c +6 -0
@@ -31,6 +31,8 @@ char *invalid_kern_ptr = (char *)-1;/* Passing NULL to string kfuncs (treated as a userspace ptr) */ SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_null1(void *ctx) { return bpf_strcmp(NULL, "hello"); } SEC("syscall") __retval(USER_PTR_ERR)int test_strcmp_null2(void *ctx) { return bpf_strcmp("hello", NULL); } +SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_null1(void *ctx) { return bpf_strcasecmp(NULL, "HELLO"); } +SEC("syscall") __retval(USER_PTR_ERR)int test_strcasecmp_null2(void *ctx) { return bpf_strcasecmp("HELLO", NULL); } SEC("syscall") __retval(USER_PTR_ERR)int test_strchr_null(void *ctx) { return bpf_strchr(NULL, 'a'); } SEC("syscall") __retval(USER_PTR_ERR)int test_strchrnul_null(void *ctx) { return bpf_strchrnul(NULL, 'a'); } SEC("syscall") __retval(USER_PTR_ERR)int test_strnchr_null(void *ctx) { return bpf_strnchr(NULL, 1, 'a'); }
@@ -49,6 +51,8 @@ SEC("syscall") __retval(USER_PTR_ERR)int test_strnstr_null2(void *ctx) { return/* Passing userspace ptr to string kfuncs */ SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_user_ptr1(void *ctx) { return bpf_strcmp(user_ptr, "hello"); } SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_user_ptr2(void *ctx) { return bpf_strcmp("hello", user_ptr); } +SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_user_ptr1(void *ctx) { return bpf_strcasecmp(user_ptr, "HELLO"); } +SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_user_ptr2(void *ctx) { return bpf_strcasecmp("HELLO", user_ptr); } SEC("syscall") __retval(USER_PTR_ERR) int test_strchr_user_ptr(void *ctx) { return bpf_strchr(user_ptr, 'a'); } SEC("syscall") __retval(USER_PTR_ERR) int test_strchrnul_user_ptr(void *ctx) { return bpf_strchrnul(user_ptr, 'a'); } SEC("syscall") __retval(USER_PTR_ERR) int test_strnchr_user_ptr(void *ctx) { return bpf_strnchr(user_ptr, 1, 'a'); }
@@ -69,6 +73,8 @@ SEC("syscall") __retval(USER_PTR_ERR) int test_strnstr_user_ptr2(void *ctx) { re/* Passing invalid kernel ptr to string kfuncs should always return -EFAULT */ SEC("syscall") __retval(-EFAULT) int test_strcmp_pagefault1(void *ctx) { return bpf_strcmp(invalid_kern_ptr, "hello"); } SEC("syscall") __retval(-EFAULT) int test_strcmp_pagefault2(void *ctx) { return bpf_strcmp("hello", invalid_kern_ptr); } +SEC("syscall") __retval(-EFAULT) int test_strcasecmp_pagefault1(void *ctx) { return bpf_strcasecmp(invalid_kern_ptr, "HELLO"); } +SEC("syscall") __retval(-EFAULT) int test_strcasecmp_pagefault2(void *ctx) { return bpf_strcasecmp("HELLO", invalid_kern_ptr); } SEC("syscall") __retval(-EFAULT) int test_strchr_pagefault(void *ctx) { return bpf_strchr(invalid_kern_ptr, 'a'); } SEC("syscall") __retval(-EFAULT) int test_strchrnul_pagefault(void *ctx) { return bpf_strchrnul(invalid_kern_ptr, 'a'); } SEC("syscall") __retval(-EFAULT) int test_strnchr_pagefault(void *ctx) { return bpf_strnchr(invalid_kern_ptr, 1, 'a'); }
tools/testing/selftests/bpf/progs/string_kfuncs_success.c +5 -0
@@ -12,6 +12,11 @@ char str[] = "hello world";/* Functional tests */ __test(0) int test_strcmp_eq(void *ctx) { return bpf_strcmp(str, "hello world"); } __test(1) int test_strcmp_neq(void *ctx) { return bpf_strcmp(str, "hello"); } +__test(0) int test_strcasecmp_eq1(void *ctx) { return bpf_strcasecmp(str, "hello world"); } +__test(0) int test_strcasecmp_eq2(void *ctx) { return bpf_strcasecmp(str, "HELLO WORLD"); } +__test(0) int test_strcasecmp_eq3(void *ctx) { return bpf_strcasecmp(str, "HELLO world"); } +__test(1) int test_strcasecmp_neq1(void *ctx) { return bpf_strcasecmp(str, "hello"); } +__test(1) int test_strcasecmp_neq2(void *ctx) { return bpf_strcasecmp(str, "HELLO"); } __test(1) int test_strchr_found(void *ctx) { return bpf_strchr(str, 'e'); } __test(11) int test_strchr_null(void *ctx) { return bpf_strchr(str, '\0'); } __test(-ENOENT) int test_strchr_notfound(void *ctx) { return bpf_strchr(str, 'x'); }
Signature · 1 line
2.51.0
Quoted 47 lines · Rong Tao
From: Rong Tao <[email protected]>
Add testsuites for kfunc
bpf_strcasecmp.Signed-off-by Rong Tao <[email protected]>--- tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c | 6 ++++++ tools/testing/selftests/bpf/progs/string_kfuncs_success.c | 5 +++++ 2 files changed, 11 insertions(+)tools/testing/selftests/bpf/progs/string_kfuncs_failure1.c +6
-0@@ -31,6 +31,8 @@ char *invalid_kern_ptr = (char *)-1;/* Passing NULL to string kfuncs (treated as a userspace ptr) */ SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_null1(void *ctx) { return bpf_strcmp(NULL, "hello"); } SEC("syscall") __retval(USER_PTR_ERR)int test_strcmp_null2(void *ctx) { return bpf_strcmp("hello", NULL); } +SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_null1(void *ctx) { return bpf_strcasecmp(NULL, "HELLO"); } +SEC("syscall") __retval(USER_PTR_ERR)int test_strcasecmp_null2(void *ctx) { return bpf_strcasecmp("HELLO", NULL); } SEC("syscall") __retval(USER_PTR_ERR)int test_strchr_null(void *ctx) { return bpf_strchr(NULL, 'a'); } SEC("syscall") __retval(USER_PTR_ERR)int test_strchrnul_null(void *ctx) { return bpf_strchrnul(NULL, 'a'); } SEC("syscall") __retval(USER_PTR_ERR)int test_strnchr_null(void *ctx) { return bpf_strnchr(NULL, 1, 'a'); }@@ -49,6 +51,8 @@ SEC("syscall") __retval(USER_PTR_ERR)int test_strnstr_null2(void *ctx) { return/* Passing userspace ptr to string kfuncs */ SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_user_ptr1(void *ctx) { return bpf_strcmp(user_ptr, "hello"); } SEC("syscall") __retval(USER_PTR_ERR) int test_strcmp_user_ptr2(void *ctx) { return bpf_strcmp("hello", user_ptr); } +SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_user_ptr1(void *ctx) { return bpf_strcasecmp(user_ptr, "HELLO"); } +SEC("syscall") __retval(USER_PTR_ERR) int test_strcasecmp_user_ptr2(void *ctx) { return bpf_strcasecmp("HELLO", user_ptr); } SEC("syscall") __retval(USER_PTR_ERR) int test_strchr_user_ptr(void *ctx) { return bpf_strchr(user_ptr, 'a'); } SEC("syscall") __retval(USER_PTR_ERR) int test_strchrnul_user_ptr(void *ctx) { return bpf_strchrnul(user_ptr, 'a'); } SEC("syscall") __retval(USER_PTR_ERR) int test_strnchr_user_ptr(void *ctx) { return bpf_strnchr(user_ptr, 1, 'a'); }@@ -69,6 +73,8 @@ SEC("syscall") __retval(USER_PTR_ERR) int test_strnstr_user_ptr2(void *ctx) { re/* Passing invalid kernel ptr to string kfuncs should always return -EFAULT */ SEC("syscall") __retval(-EFAULT) int test_strcmp_pagefault1(void *ctx) { return bpf_strcmp(invalid_kern_ptr, "hello"); } SEC("syscall") __retval(-EFAULT) int test_strcmp_pagefault2(void *ctx) { return bpf_strcmp("hello", invalid_kern_ptr); } +SEC("syscall") __retval(-EFAULT) int test_strcasecmp_pagefault1(void *ctx) { return bpf_strcasecmp(invalid_kern_ptr, "HELLO"); } +SEC("syscall") __retval(-EFAULT) int test_strcasecmp_pagefault2(void *ctx) { return bpf_strcasecmp("HELLO", invalid_kern_ptr); } SEC("syscall") __retval(-EFAULT) int test_strchr_pagefault(void *ctx) { return bpf_strchr(invalid_kern_ptr, 'a'); } SEC("syscall") __retval(-EFAULT) int test_strchrnul_pagefault(void *ctx) { return bpf_strchrnul(invalid_kern_ptr, 'a'); } SEC("syscall") __retval(-EFAULT) int test_strnchr_pagefault(void *ctx) { return bpf_strnchr(invalid_kern_ptr, 1, 'a'); }tools/testing/selftests/bpf/progs/string_kfuncs_success.c +0
-0@@ -12,6 +12,11 @@ char str[] = "hello world";/* Functional tests */
tools/testing/selftests/bpf/progs/string_kfuncs_success.c char str[] = "hello world"; · line 22
Quoted 10 lines
tools/testing/selftests/bpf/progs/string_kfuncs_success.c +5
-0__test(0) int test_strcmp_eq(void *ctx) { return bpf_strcmp(str, "hello world"); } __test(1) int test_strcmp_neq(void *ctx) { return bpf_strcmp(str, "hello"); } +__test(0) int test_strcasecmp_eq1(void *ctx) { return bpf_strcasecmp(str, "hello world"); } +__test(0) int test_strcasecmp_eq2(void *ctx) { return bpf_strcasecmp(str, "HELLO WORLD"); } +__test(0) int test_strcasecmp_eq3(void *ctx) { return bpf_strcasecmp(str, "HELLO world"); } +__test(1) int test_strcasecmp_neq1(void *ctx) { return bpf_strcasecmp(str, "hello"); } +__test(1) int test_strcasecmp_neq2(void *ctx) { return bpf_strcasecmp(str, "HELLO"); } __test(1) int test_strchr_found(void *ctx) { return bpf_strchr(str, 'e'); } __test(11) int test_strchr_null(void *ctx) { return bpf_strchr(str, '\0'); } __test(-ENOENT) int test_strchr_notfound(void *ctx) { return bpf_strchr(str, 'x'); }
Missing a test for returning -E2BIG in tools/testing/selftests/bpf/progs/string_kfuncs_failure2.c.
Viktor