selftests/memfd/memfd_test.c: fix implicit declaration
PATCH 1/2 selftests/memfd/memfd_test.c: fix implicit declaration
gcc warns about implicit declaration.
gcc -D_FILE_OFFSET_BITS=64 -I../../../../include/uapi/
-I../../../../include/ -I../../../../usr/include/ memfd_test.c common.o -o memfd_testmemfd_test.c: In function ‘mfd_assert_get_seals’:
memfd_test.c:74:6: warning: implicit declaration of function ‘fcntl’
[-Wimplicit-function-declaration]
r = fcntl(fd, F_GET_SEALS);
^~~~~
memfd_test.c: In function ‘mfd_assert_open’:
memfd_test.c:197:6: warning: implicit declaration of function ‘open’
[-Wimplicit-function-declaration]
r = open(buf, flags, mode);
^~~~memfd_test.c: In function ‘mfd_assert_write’:
memfd_test.c:328:6: warning: implicit declaration of function ‘fallocate’
[-Wimplicit-function-declaration]
r = fallocate(fd,
^~~~~~~~~
In the current code, we include the headers that the functions want according to the man pages, and we add some defines that will be used if they isn't found in glibc. The defines was added into the kernel source in kernel >= 3.16 and glibc requires kernel header files >= 3.2.
--- tools/testing/selftests/memfd/memfd_test.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
tools/testing/selftests/memfd/memfd_test.c +24 -1
@@ -6,7 +6,6 @@#include <inttypes.h> #include <limits.h> #include <linux/falloc.h> -#include <linux/fcntl.h> #include <linux/memfd.h> #include <sched.h> #include <stdio.h>
@@ -14,13 +13,37 @@#include <signal.h> #include <string.h> #include <sys/mman.h> +#include <sys/types.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/wait.h> +#include <fcntl.h> #include <unistd.h> #include "common.h" +#ifndef F_LINUX_SPECIFIC_BASE +# define F_LINUX_SPECIFIC_BASE 1024 +#endif +#ifndef F_ADD_SEALS +# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) +#endif +#ifndef F_GET_SEALS +# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) +#endif +#ifndef F_SEAL_SEAL +# define F_SEAL_SEAL 0x0001/* prevent further seals from being set */ +#endif +#ifndef F_SEAL_SHRINK +# define F_SEAL_SHRINK 0x0002/* prevent file from shrinking */ +#endif +#ifndef F_SEAL_GROW +# define F_SEAL_GROW 0x0004/* prevent file from growing */ +#endif +#ifndef F_SEAL_WRITE +# define F_SEAL_WRITE 0x0008/* prevent writes */ +#endif +#define MEMFD_STR "memfd:"#define MEMFD_HUGE_STR "memfd-hugetlb:"#define SHARED_FT_STR "(shared file-table)"
Signature · 6 lines
2.11.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
PATCH 2/2 selftests/memfd/fuse_test: fix implicit declaration
gcc warns about implicit declaration.
gcc -D_FILE_OFFSET_BITS=64 -I../../../../include/uapi/
-I../../../../include/ -I../../../../usr/include/ fuse_test.c common.o -o fuse_testfuse_test.c: In function ‘mfd_assert_get_seals’:
fuse_test.c:67:6: warning: implicit declaration of function ‘fcntl’
[-Wimplicit-function-declaration]
r = fcntl(fd, F_GET_SEALS);
^~~~~
fuse_test.c: In function ‘main’:
fuse_test.c:261:7: warning: implicit declaration of function ‘open’
[-Wimplicit-function-declaration]
fd = open(argv[1], O_RDONLY | O_CLOEXEC);
^~~~make: Leaving directory 'tools/testing/selftests/memfd'
In the current code, we include the headers that the functions want according to the man pages, and we move common code for memfd to common.c. Moved F_ADD_SEALS and friends to memfd/common.h since both fuse_test and memfd_test uses them.
--- tools/testing/selftests/memfd/common.c | 41 ++++++++++++++++++++- tools/testing/selftests/memfd/common.h | 26 +++++++++++++ tools/testing/selftests/memfd/fuse_test.c | 46 ++--------------------- tools/testing/selftests/memfd/memfd_test.c | 59 ------------------------------ 4 files changed, 70 insertions(+), 102 deletions(-)
tools/testing/selftests/memfd/common.c +40 -1
@@ -4,8 +4,10 @@#include <stdio.h> #include <stdlib.h> -#include <linux/fcntl.h> #include <linux/memfd.h> +#include <sys/types.h> +#include <sys/stat.h> +#include <fcntl.h> #include <unistd.h> #include <sys/syscall.h>
@@ -44,3 +46,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 +26 -0
@@ -1,9 +1,35 @@#ifndef COMMON_H_ #define COMMON_H_ +#ifndef F_LINUX_SPECIFIC_BASE +# define F_LINUX_SPECIFIC_BASE 1024 +#endif +#ifndef F_ADD_SEALS +# define F_ADD_SEALS (F_LINUX_SPECIFIC_BASE + 9) +#endif +#ifndef F_GET_SEALS +# define F_GET_SEALS (F_LINUX_SPECIFIC_BASE + 10) +#endif +#ifndef F_SEAL_SEAL +# define F_SEAL_SEAL 0x0001/* prevent further seals from being set */ +#endif +#ifndef F_SEAL_SHRINK +# define F_SEAL_SHRINK 0x0002/* prevent file from shrinking */ +#endif +#ifndef F_SEAL_GROW +# define F_SEAL_GROW 0x0004/* prevent file from growing */ +#endif +#ifndef F_SEAL_WRITE +# define F_SEAL_WRITE 0x0008/* prevent writes */ +#endif +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 +4 -42
69 lines not on this page · raw message
tools/testing/selftests/memfd/memfd_test.c +0 -59
71 lines not on this page · raw message
Signature · 6 lines
2.11.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 45 lines · Anders Roxell
gcc warns about implicit declaration.
gcc -D_FILE_OFFSET_BITS=64 -I../../../../include/uapi/
-I../../../../include/ -I../../../../usr/include/memfd_test.ccommon.o -omemfd_testmemfd_test.c: In function ‘mfd_assert_get_seals’:
memfd_test.c:74:6: warning: implicit declaration of function ‘fcntl’
[-Wimplicit-function-declaration]r = fcntl(fd, F_GET_SEALS); ^~~~~ memfd_test.c: In function ‘mfd_assert_open’: memfd_test.c:197:6: warning: implicit declaration of function ‘open’ [-Wimplicit-function-declaration] r = open(buf, flags, mode); ^~~~
memfd_test.c: In function ‘mfd_assert_write’:
memfd_test.c:328:6: warning: implicit declaration of function ‘fallocate’
[-Wimplicit-function-declaration]
r = fallocate(fd,^~~~~~~~~In the current code, we include the headers that the functions want according to the man pages, and we add some defines that will be used if they isn't found in glibc. The defines was added into the kernel source in kernel >= 3.16 and glibc requires kernel header files >= 3.2.
Fixes 4f5ce5e8d7e2 ("selftests: add memfd_create() + sealing tests")Signed-off-by Anders Roxell <anders.roxell at linaro.org>--- tools/testing/selftests/memfd/memfd_test.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)tools/testing/selftests/memfd/memfd_test.c +0
-1@@ -6,7 +6,6 @@#include <inttypes.h> #include <limits.h> #include <linux/falloc.h> -#include <linux/fcntl.h> #include <linux/memfd.h> #include <sched.h> #include <stdio.h>
tools/testing/selftests/memfd/memfd_test.c line 21
Quoted 9 lines
tools/testing/selftests/memfd/memfd_test.c +2
-0@@ -14,13 +13,37 @@#include <signal.h> #include <string.h> #include <sys/mman.h> +#include <sys/types.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/wait.h> +#include <fcntl.h> #include <unistd.h>
I suspect there is some guiding philosophy for selftests that I am unfamiliar with. However, it seems that tests should use as much of the header files in the current kernel source tree as possible. This change removes the include of a header in the current source tree <linux/fcntl.h>. It replaces that with the header <fcntl.h> from the host system (and some other changes).
To me, this seems like step in the wrong direction. But, I could be totally wrong and perhaps self tests should primarily target the host system header files.
Signature · 5 lines
Mike Kravetz -- 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 63 lines · Mike Kravetz
Quoted 45 lines · Anders Roxell
gcc warns about implicit declaration.
gcc -D_FILE_OFFSET_BITS=64 -I../../../../include/uapi/
-I../../../../include/ -I../../../../usr/include/memfd_test.ccommon.o -omemfd_testmemfd_test.c: In function ‘mfd_assert_get_seals’:
memfd_test.c:74:6: warning: implicit declaration of function ‘fcntl’
[-Wimplicit-function-declaration]r = fcntl(fd, F_GET_SEALS); ^~~~~ memfd_test.c: In function ‘mfd_assert_open’: memfd_test.c:197:6: warning: implicit declaration of function ‘open’ [-Wimplicit-function-declaration] r = open(buf, flags, mode); ^~~~
memfd_test.c: In function ‘mfd_assert_write’:
memfd_test.c:328:6: warning: implicit declaration of function ‘fallocate’
[-Wimplicit-function-declaration]
r = fallocate(fd,^~~~~~~~~In the current code, we include the headers that the functions want according to the man pages, and we add some defines that will be used if they isn't found in glibc. The defines was added into the kernel source in kernel >= 3.16 and glibc requires kernel header files >= 3.2.
Fixes 4f5ce5e8d7e2 ("selftests: add memfd_create() + sealing tests")Signed-off-by Anders Roxell <anders.roxell at linaro.org>--- tools/testing/selftests/memfd/memfd_test.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)tools/testing/selftests/memfd/memfd_test.c +0
-1@@ -6,7 +6,6 @@#include <inttypes.h> #include <limits.h> #include <linux/falloc.h> -#include <linux/fcntl.h> #include <linux/memfd.h> #include <sched.h> #include <stdio.h> tools/testing/selftests/memfd/memfd_test.c line 21
Quoted 9 lines
tools/testing/selftests/memfd/memfd_test.c +2
-0@@ -14,13 +13,37 @@#include <signal.h> #include <string.h> #include <sys/mman.h> +#include <sys/types.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/wait.h> +#include <fcntl.h> #include <unistd.h> I suspect there is some guiding philosophy for selftests that I am unfamiliar with. However, it seems that tests should use as much of the header files in the current kernel source tree as possible. This change removes the include of a header in the current source tree <
linux/fcntl.h>. It replaces that with the header <fcntl.h> from the host system (and some other changes).
Quoted 3 lines
To me, this seems like step in the wrong direction. But, I could be totally wrong and perhaps self tests should primarily target the host system header files.
So in a way I agree with you. However, what was the design decisions internal kernel headers vs. headers from Host System ?
For me it isn't clear how/when we use them, its a mix today is it not?
To ignore warnings with -Wno-implicit-function-declaration wont be an alternative I think.
Cheers,
Anders
Quoted 2 lines
--
Mike Kravetz
--
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 64 lines · Anders Roxell
Quoted 63 lines · Mike Kravetz
Quoted 45 lines · Anders Roxell
gcc warns about implicit declaration.
gcc -D_FILE_OFFSET_BITS=64 -I../../../../include/uapi/
-I../../../../include/ -I../../../../usr/include/memfd_test.ccommon.o -omemfd_testmemfd_test.c: In function ‘mfd_assert_get_seals’:
memfd_test.c:74:6: warning: implicit declaration of function ‘fcntl’
[-Wimplicit-function-declaration]r = fcntl(fd, F_GET_SEALS); ^~~~~ memfd_test.c: In function ‘mfd_assert_open’: memfd_test.c:197:6: warning: implicit declaration of function ‘open’ [-Wimplicit-function-declaration] r = open(buf, flags, mode); ^~~~
memfd_test.c: In function ‘mfd_assert_write’:
memfd_test.c:328:6: warning: implicit declaration of function ‘fallocate’
[-Wimplicit-function-declaration]
r = fallocate(fd,^~~~~~~~~In the current code, we include the headers that the functions want according to the man pages, and we add some defines that will be used if they isn't found in glibc. The defines was added into the kernel source in kernel >= 3.16 and glibc requires kernel header files >= 3.2.
Fixes 4f5ce5e8d7e2 ("selftests: add memfd_create() + sealing tests")Signed-off-by Anders Roxell <anders.roxell at linaro.org>--- tools/testing/selftests/memfd/memfd_test.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)tools/testing/selftests/memfd/memfd_test.c +0
-1@@ -6,7 +6,6 @@#include <inttypes.h> #include <limits.h> #include <linux/falloc.h> -#include <linux/fcntl.h> #include <linux/memfd.h> #include <sched.h> #include <stdio.h> tools/testing/selftests/memfd/memfd_test.c line 21
Quoted 9 lines
tools/testing/selftests/memfd/memfd_test.c +2
-0@@ -14,13 +13,37 @@#include <signal.h> #include <string.h> #include <sys/mman.h> +#include <sys/types.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/wait.h> +#include <fcntl.h> #include <unistd.h> I suspect there is some guiding philosophy for selftests that I am unfamiliar with. However, it seems that tests should use as much of the header files in the current kernel source tree as possible. This change removes the include of a header in the current source tree <
linux/fcntl.h>. It replaces that with the header <fcntl.h> from the host system (and some other changes).
Quoted 7 lines
Quoted 3 lines
To me, this seems like step in the wrong direction. But, I could be totally wrong and perhaps self tests should primarily target the host system header files.
So in a way I agree with you. However, what was the design decisions internal kernel headers vs. headers from Host System ?
For me it isn't clear how/when we use them, its a mix today is it not?
I am unsure as well. Was hoping someone who was more involved in the development/design philosophy of self tests would chime in and comment.
My thought that the tests should use more of the associated kernel header files is based on the fact that those header files 'should' be more aligned with the tests. The host system header files could be very different than those of the running kernel we are testing.
Quoted 2 lines
To ignore warnings with -Wno-implicit-function-declaration wont be an alternative I think.
I am not opposed to your changes. Again, was just hoping to discover what should be the direction/philosophy for header file use.
Signature · 5 lines
Mike Kravetz -- 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
maintainerQuoted 34 lines · Mike Kravetz
Quoted 33 lines · Anders Roxell
Quoted 32 lines · Mike Kravetz
Quoted 31 lines · Anders Roxell
gcc warns about implicit declaration.
gcc -D_FILE_OFFSET_BITS=64 -I../../../../include/uapi/
-I../../../../include/ -I../../../../usr/include/memfd_test.ccommon.o -omemfd_testmemfd_test.c: In function ‘mfd_assert_get_seals’:
memfd_test.c:74:6: warning: implicit declaration of function ‘fcntl’
[-Wimplicit-function-declaration]r = fcntl(fd, F_GET_SEALS); ^~~~~ memfd_test.c: In function ‘mfd_assert_open’: memfd_test.c:197:6: warning: implicit declaration of function ‘open’ [-Wimplicit-function-declaration] r = open(buf, flags, mode); ^~~~
memfd_test.c: In function ‘mfd_assert_write’:
memfd_test.c:328:6: warning: implicit declaration of function ‘fallocate’
[-Wimplicit-function-declaration]
r = fallocate(fd,^~~~~~~~~In the current code, we include the headers that the functions want according to the man pages, and we add some defines that will be used if they isn't found in glibc. The defines was added into the kernel source in kernel >= 3.16 and glibc requires kernel header files >= 3.2>>>>
Fixes 4f5ce5e8d7e2 ("selftests: add memfd_create() + sealing tests")Signed-off-by Anders Roxell <anders.roxell at linaro.org>--- tools/testing/selftests/memfd/memfd_test.c | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-)
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
tools/testing/selftests/memfd/memfd_test.c line 9
Quoted 9 lines
tools/testing/selftests/memfd/memfd_test.c +0
-1@@ -6,7 +6,6 @@#include <inttypes.h> #include <limits.h> #include <linux/falloc.h> -#include <linux/fcntl.h>
We don't want to change this to fix the warnings. This will defeat the purpose of testing the kernel including the headers.
Quoted 21 lines
Quoted 21 lines
Quoted 21 lines
tools/testing/selftests/memfd/memfd_test.c line 21
Quoted 13 lines
tools/testing/selftests/memfd/memfd_test.c +2
-0#include <linux/memfd.h> #include <sched.h> #include <stdio.h> @@ -14,13 +13,37 @@#include <signal.h> #include <string.h> #include <sys/mman.h> +#include <sys/types.h> #include <sys/stat.h> #include <sys/syscall.h> #include <sys/wait.h> +#include <fcntl.h> #include <unistd.h> I suspect there is some guiding philosophy for selftests that I am unfamiliar with. However, it seems that tests should use as much of the header files in the current kernel source tree as possible. This change removes the include of a header in the current source tree <
linux/fcntl.h>. It replaces that with the header <fcntl.h> from the host system (and some other changes).
Quoted 7 lines
Quoted 7 lines
Quoted 3 lines
To me, this seems like step in the wrong direction. But, I could be totally wrong and perhaps self tests should primarily target the host system header files.
So in a way I agree with you. However, what was the design decisions internal kernel headers vs. headers from Host System ?
For me it isn't clear how/when we use them, its a mix today is it not?
Internal headers are the primary focus to be able to find regressions.
Quoted 8 lines
I am unsure as well. Was hoping someone who was more involved in the development/design philosophy of self tests would chime in and comment.
My thought that the tests should use more of the associated kernel header files is based on the fact that those header files 'should' be more aligned with the tests. The host system header files could be very different than those of the running kernel we are testing.
Right. The goal for these tests is to verify the kernel including the headers. So for best results, the tests should be built with the headers in the kernel not the ones that are installed on the system they are being built on.
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