selftests/memfd: move common code into common.c
PATCH 1/1 selftests/memfd: move common code into common.c
Remove code duplication, in the current code, we move common code for memfd to common.c.
The duplicate functions got added in commit 87b2d44026e0 ("selftests:
add memfd/sealing page-pinning tests")
--- tools/testing/selftests/memfd/common.c | 37 +++++++++++++++++++ tools/testing/selftests/memfd/common.h | 4 ++ tools/testing/selftests/memfd/fuse_test.c | 43 +--------------------- tools/testing/selftests/memfd/memfd_test.c | 37 ------------------- 4 files changed, 43 insertions(+), 78 deletions(-)
tools/testing/selftests/memfd/common.c +37 -0
@@ -44,3 +44,40 @@ int sys_memfd_create(const char *name, unsigned int flags)return syscall (__NR_memfd_create, name, flags); } + +unsigned int mfd_assert_get_seals (int fd) +{ +int r; + + r =fcntl (fd,F_GET_SEALS ); +if (r <0 ) { +printf ("GET_SEALS(%d) failed: %m\n" , fd); +abort (); + } + +return (unsigned int )r; +} + +void mfd_assert_add_seals (int fd,unsigned int seals) +{ +int r; +unsigned int s; + + s =mfd_assert_get_seals (fd); + r =fcntl (fd,F_ADD_SEALS , seals); +if (r <0 ) { +printf ("ADD_SEALS(%d, %u -> %u) failed: %m\n" , fd, s, seals); +abort (); + } +} + +void mfd_assert_has_seals (int fd,unsigned int seals) +{ +unsigned int s; + + s =mfd_assert_get_seals (fd); +if (s != seals) { +printf ("%u != %u = GET_SEALS(%d)\n" , seals, s, fd); +abort (); + } +}
tools/testing/selftests/memfd/common.h +4 -0
@@ -6,4 +6,8 @@ extern int hugetlbfs_test;unsigned long default_huge_page_size (void );int sys_memfd_create (const char *name,unsigned int flags); +void mfd_assert_add_seals (int fd,unsigned int seals); +void mfd_assert_has_seals (int fd,unsigned int seals); +unsigned int mfd_assert_get_seals (int fd); +#endif
tools/testing/selftests/memfd/fuse_test.c +2 -41
51 lines not on this page · raw message
tools/testing/selftests/memfd/memfd_test.c +0 -37
@@ -67,43 +67,6 @@ static void mfd_fail_new(const char *name, unsigned int flags) } } -static unsigned int mfd_assert_get_seals (int fd) -{ -int r; - - r =fcntl (fd,F_GET_SEALS ); -if (r <0 ) { -printf ("GET_SEALS(%d) failed: %m\n" , fd); -abort (); - } - -return (unsigned int )r; -} - -static void mfd_assert_has_seals (int fd,unsigned int seals) -{ -unsigned int s; - - s =mfd_assert_get_seals (fd); -if (s != seals) { -printf ("%u != %u = GET_SEALS(%d)\n" , seals, s, fd); -abort (); - } -} - -static void mfd_assert_add_seals (int fd,unsigned int seals) -{ -int r; -unsigned int s; - - s =mfd_assert_get_seals (fd); - r =fcntl (fd,F_ADD_SEALS , seals); -if (r <0 ) { -printf ("ADD_SEALS(%d, %u -> %u) failed: %m\n" , fd, s, seals); -abort (); - } -} -static void mfd_fail_add_seals (int fd,unsigned int seals) {int r;
Signature · 6 lines
2.17.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 177 lines · Anders Roxell
Remove code duplication, in the current code, we move common code for memfd to
common.c.The duplicate functions got added in commit
87b2d44026e0("selftests:
add memfd/sealing page-pinning tests")Signed-off-by Anders Roxell <anders.roxell at linaro.org>--- tools/testing/selftests/memfd/common.c | 37 +++++++++++++++++++ tools/testing/selftests/memfd/common.h | 4 ++ tools/testing/selftests/memfd/fuse_test.c | 43 +--------------------- tools/testing/selftests/memfd/memfd_test.c | 37 ------------------- 4 files changed, 43 insertions(+), 78 deletions(-)tools/testing/selftests/memfd/common.c +37
-0@@ -44,3 +44,40 @@ int sys_memfd_create(const char *name, unsigned int flags)return syscall (__NR_memfd_create, name, flags); } + +unsigned int mfd_assert_get_seals (int fd) +{ +int r; + + r =fcntl (fd,F_GET_SEALS ); +if (r <0 ) { +printf ("GET_SEALS(%d) failed: %m\n" , fd); +abort (); + } + +return (unsigned int )r; +} + +void mfd_assert_add_seals (int fd,unsigned int seals) +{ +int r; +unsigned int s; + + s =mfd_assert_get_seals (fd); + r =fcntl (fd,F_ADD_SEALS , seals); +if (r <0 ) { +printf ("ADD_SEALS(%d, %u -> %u) failed: %m\n" , fd, s, seals); +abort (); + } +} + +void mfd_assert_has_seals (int fd,unsigned int seals) +{ +unsigned int s; + + s =mfd_assert_get_seals (fd); +if (s != seals) { +printf ("%u != %u = GET_SEALS(%d)\n" , seals, s, fd); +abort (); + } +}tools/testing/selftests/memfd/common.h +4
-0@@ -6,4 +6,8 @@ extern int hugetlbfs_test;unsigned long default_huge_page_size (void );int sys_memfd_create (const char *name,unsigned int flags); +void mfd_assert_add_seals (int fd,unsigned int seals); +void mfd_assert_has_seals (int fd,unsigned int seals); +unsigned int mfd_assert_get_seals (int fd); +#endif tools/testing/selftests/memfd/fuse_test.c +2
-41@@ -60,49 +60,10 @@ static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags)return fd; } -static __u64 mfd_assert_get_seals (int fd) +static int mfd_busy_add_seals (int fd,unsigned int seals) {long r; - - r =fcntl (fd,F_GET_SEALS ); -if (r <0 ) { -printf ("GET_SEALS(%d) failed: %m\n" , fd); -abort (); - } - -return r; -} - -static void mfd_assert_has_seals (int fd,__u64 seals) -{ -__u64 s; - - s =mfd_assert_get_seals (fd); -if (s != seals) { -printf ("%llu != %llu = GET_SEALS(%d)\n" , - (unsigned long long )seals, (unsigned long long )s, fd); -abort (); - } -} - -static void mfd_assert_add_seals (int fd,__u64 seals) -{ -long r; -__u64 s; - - s =mfd_assert_get_seals (fd); - r =fcntl (fd,F_ADD_SEALS , seals); -if (r <0 ) { -printf ("ADD_SEALS(%d, %llu -> %llu) failed: %m\n" , - fd, (unsigned long long )s, (unsigned long long )seals); -abort (); - } -} - -static int mfd_busy_add_seals (int fd,__u64 seals) -{ -long r; -__u64 s; +unsigned int s; r =fcntl (fd,F_GET_SEALS );if (r <0 )tools/testing/selftests/memfd/memfd_test.c +0
-38@@ -67,43 +67,6 @@ static void mfd_fail_new(const char *name, unsigned int flags) } } -static unsigned int mfd_assert_get_seals (int fd) -{ -int r; - - r =fcntl (fd,F_GET_SEALS ); -if (r <0 ) { -printf ("GET_SEALS(%d) failed: %m\n" , fd); -abort (); - } - -return (unsigned int )r; -} - -static void mfd_assert_has_seals (int fd,unsigned int seals) -{ -unsigned int s; - - s =mfd_assert_get_seals (fd); -if (s != seals) { -printf ("%u != %u = GET_SEALS(%d)\n" , seals, s, fd); -abort (); - } -} - -static void mfd_assert_add_seals (int fd,unsigned int seals) -{ -int r; -unsigned int s; - - s =mfd_assert_get_seals (fd); - r =fcntl (fd,F_ADD_SEALS , seals); -if (r <0 ) { -printf ("ADD_SEALS(%d, %u -> %u) failed: %m\n" , fd, s, seals); -abort (); - } -} -static void mfd_fail_add_seals (int fd,unsigned int seals) {int r; --
Quoted 2 lines
2.17.0
Ping.
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Shuah Khan
maintainerHi David,
Quoted 8 lines · Anders Roxell
Quoted 7 lines · Anders Roxell
Remove code duplication, in the current code, we move common code for memfd to
common.c.The duplicate functions got added in commit
87b2d44026e0("selftests:
add memfd/sealing page-pinning tests")Signed-off-by Anders Roxell <anders.roxell at linaro.org>
Okay pull in this patch. I will queue this up for 4.18-rc1. Let me know if you have any objections.
Quoted 166 lines
Quoted 166 lines
--- tools/testing/selftests/memfd/common.c | 37 +++++++++++++++++++ tools/testing/selftests/memfd/common.h | 4 ++ tools/testing/selftests/memfd/fuse_test.c | 43 +--------------------- tools/testing/selftests/memfd/memfd_test.c | 37 ------------------- 4 files changed, 43 insertions(+), 78 deletions(-)tools/testing/selftests/memfd/common.c +37
-0@@ -44,3 +44,40 @@ int sys_memfd_create(const char *name, unsigned int flags)return syscall (__NR_memfd_create, name, flags); } + +unsigned int mfd_assert_get_seals (int fd) +{ +int r; + + r =fcntl (fd,F_GET_SEALS ); +if (r <0 ) { +printf ("GET_SEALS(%d) failed: %m\n" , fd); +abort (); + } + +return (unsigned int )r; +} + +void mfd_assert_add_seals (int fd,unsigned int seals) +{ +int r; +unsigned int s; + + s =mfd_assert_get_seals (fd); + r =fcntl (fd,F_ADD_SEALS , seals); +if (r <0 ) { +printf ("ADD_SEALS(%d, %u -> %u) failed: %m\n" , fd, s, seals); +abort (); + } +} + +void mfd_assert_has_seals (int fd,unsigned int seals) +{ +unsigned int s; + + s =mfd_assert_get_seals (fd); +if (s != seals) { +printf ("%u != %u = GET_SEALS(%d)\n" , seals, s, fd); +abort (); + } +}tools/testing/selftests/memfd/common.h +4
-0@@ -6,4 +6,8 @@ extern int hugetlbfs_test;unsigned long default_huge_page_size (void );int sys_memfd_create (const char *name,unsigned int flags); +void mfd_assert_add_seals (int fd,unsigned int seals); +void mfd_assert_has_seals (int fd,unsigned int seals); +unsigned int mfd_assert_get_seals (int fd); +#endif tools/testing/selftests/memfd/fuse_test.c +2
-41@@ -60,49 +60,10 @@ static int mfd_assert_new(const char *name, loff_t sz, unsigned int flags)return fd; } -static __u64 mfd_assert_get_seals (int fd) +static int mfd_busy_add_seals (int fd,unsigned int seals) {long r; - - r =fcntl (fd,F_GET_SEALS ); -if (r <0 ) { -printf ("GET_SEALS(%d) failed: %m\n" , fd); -abort (); - } - -return r; -} - -static void mfd_assert_has_seals (int fd,__u64 seals) -{ -__u64 s; - - s =mfd_assert_get_seals (fd); -if (s != seals) { -printf ("%llu != %llu = GET_SEALS(%d)\n" , - (unsigned long long )seals, (unsigned long long )s, fd); -abort (); - } -} - -static void mfd_assert_add_seals (int fd,__u64 seals) -{ -long r; -__u64 s; - - s =mfd_assert_get_seals (fd); - r =fcntl (fd,F_ADD_SEALS , seals); -if (r <0 ) { -printf ("ADD_SEALS(%d, %llu -> %llu) failed: %m\n" , - fd, (unsigned long long )s, (unsigned long long )seals); -abort (); - } -} - -static int mfd_busy_add_seals (int fd,__u64 seals) -{ -long r; -__u64 s; +unsigned int s; r =fcntl (fd,F_GET_SEALS );if (r <0 )tools/testing/selftests/memfd/memfd_test.c +0
-37@@ -67,43 +67,6 @@ static void mfd_fail_new(const char *name, unsigned int flags) } } -static unsigned int mfd_assert_get_seals (int fd) -{ -int r; - - r =fcntl (fd,F_GET_SEALS ); -if (r <0 ) { -printf ("GET_SEALS(%d) failed: %m\n" , fd); -abort (); - } - -return (unsigned int )r; -} - -static void mfd_assert_has_seals (int fd,unsigned int seals) -{ -unsigned int s; - - s =mfd_assert_get_seals (fd); -if (s != seals) { -printf ("%u != %u = GET_SEALS(%d)\n" , seals, s, fd); -abort (); - } -} - -static void mfd_assert_add_seals (int fd,unsigned int seals) -{ -int r; -unsigned int s; - - s =mfd_assert_get_seals (fd); - r =fcntl (fd,F_ADD_SEALS , seals); -if (r <0 ) { -printf ("ADD_SEALS(%d, %u -> %u) failed: %m\n" , fd, s, seals); -abort (); - } -} -
Quoted 9 lines
Quoted 6 lines
tools/testing/selftests/memfd/memfd_test.c +0
-1static void mfd_fail_add_seals (int fd,unsigned int seals) {int r; --2.17.0
Ping.
thanks,
-- Shuah
--
To unsubscribe from this list: send the line "unsubscribe linux-kselftest" in the body of a message to majordomo at vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html