selftests/filesystems: devpts_pts included wrong header

PATCH In review Anders Roxell 3 participants 9 messages Apr 18, 2018 – May 10, 2018 Kselftest

Share & tools

Anders Roxell

author

2018-04-18 07:52 UTC #0 lore raw

PATCH 1/2 selftests/filesystems: devpts_pts included wrong header

We were picking up the wrong header should use asm/ioctls.h form the kernel and not the header from the system (sys/ioctl.h). In the current code we added the correct include and we added the kernel headers path to the CFLAGS.

Fixes ce290a19609d ("selftests: add devpts selftests")

Signed-off-by Anders Roxell <anders.roxell at linaro.org>

---

Hi,

I've been running devpts_pts on a mainline kernel (4.16+git0+60cc43fc88) and the verify_invalid_ptmx_bind_mount() test failes with this failure:

root at intel-core2-32:~# ./devpts_pts
Failed to perform TIOCGPTPEER ioctl

However, I'm still confused why I'm not able to get the test to pass. Strace showes that -ENOENT return in the TIOCGPTPEER implementation in the kernel. I think the -ENOENT gets returned from this path devpts_mntget()->devpts_ptmx_path->path_pts().

See the strace issue below:
root at intel-core2-32:~# strace ./devpts_pts
execve("./devpts_pts", ["./devpts_pts"], [/* 17 vars */]) = 0
brk(NULL) = 0x5634e0092000
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d338000
access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory)
open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3
fstat(3, {st_mode=S_IFREG|0644, st_size=16726, ...}) = 0
mmap(NULL, 16726, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f459d333000
close(3) = 0
open("/lib/libc.so.6", O_RDONLY|O_CLOEXEC) = 3
read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\3\2\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1681056, ...}) = 0
mmap(NULL, 3787168, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f459cd7b000 mprotect(0x7f459cf0f000, 2093056, PROT_NONE) = 0

mmap(0x7f459d10e000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x193000) = 0x7f459d10e000
mmap(0x7f459d114000, 14752, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f459d114000

close(3) = 0
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d331000 arch_prctl(ARCH_SET_FS, 0x7f459d331700) = 0
mprotect(0x7f459d10e000, 16384, PROT_READ) = 0
mprotect(0x5634debe3000, 4096, PROT_READ) = 0
mprotect(0x7f459d33a000, 4096, PROT_READ) = 0
munmap(0x7f459d333000, 16726) = 0
ioctl(0, TCGETS, {B38400 opost isig icanon echo ...}) = 0
unshare(CLONE_NEWNS) = 0
mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL) = 0
mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL) = 0
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4377 wait4(4377, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4377
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4377, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---

close(3)                                = 0
close(4)                                = 0
getpid()                                = 4376

open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_CREAT|O_EXCL, 0600) = 3 mount("/dev/pts/ptmx", "/tmp/devpts_ptmx_Z6aEvy", NULL, MS_BIND, NULL) = 0
close(3) = 0
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = -1 ENOENT (No such file or directory) write(2, "Failed to perform TIOCGPTPEER io"..., 36Failed to perform TIOCGPTPEER ioctl ) = 36

close(3)                                = 0
umount2("/dev/pts", 0)                  = 0
umount2("/dev/ptmx", 0)                 = 0
mkdir("/tmp/devpts_fs_w22bR6", 0700)    = 0

mount("devpts", "/tmp/devpts_fs_w22bR6", "devpts", MS_NOSUID|MS_NOEXEC, "newinstance,ptmxmode=0666,mode=0"...) = 0 open("/tmp/devpts_fs_w22bR6/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4378 wait4(4378, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4378
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4378, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---

close(3)                                = 0
close(4)                                = 0
unlink("/tmp/devpts_fs_w22bR6")         = -1 EISDIR (Is a directory)
exit_group(0)                           = ?

+++ exited with 0 +++
root at intel-core2-32:~#

 tools/testing/selftests/filesystems/Makefile     | 1 +
 tools/testing/selftests/filesystems/devpts_pts.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

tools/testing/selftests/filesystems/Makefile +1 -0

index 4e6d09fb166f..427a401aae5c 100644
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := dnotify_test devpts_pts
+CFLAGS += -I../../../../usr/include/
 all: $(TEST_PROGS)
 
 include ../lib.mk

tools/testing/selftests/filesystems/devpts_pts.c +1 -1

index b9055e974289..79420b9d00c7 100644
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
+#include <asm/ioctls.h>
 #include <sys/mount.h>
 #include <sys/wait.h>

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

Anders Roxell

author

2018-04-18 07:52 UTC #1 lore raw

PATCH 2/2 selftests/filesystems: remove Makefile warning

When overriding the 'clean' target make throws up warnings:
Makefile:9: warning: overriding recipe for target 'clean' ../lib.mk:98: warning: ignoring old recipe for target 'clean'

In current code we change from TEST_PROGS to TEST_GEN_PROGS and that does that we can remove the target 'clean' and 'all'.

Fixes 10924bc64487 ("selftests: move dnotify_test from Documentation/filesystems")

Signed-off-by Anders Roxell <anders.roxell at linaro.org>

---
 tools/testing/selftests/filesystems/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

tools/testing/selftests/filesystems/Makefile +1 -5

index 427a401aae5c..a55ac3ac09ad 100644
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := dnotify_test devpts_pts
+TEST_GEN_PROGS := dnotify_test devpts_pts
 CFLAGS += -I../../../../usr/include/
-all: $(TEST_PROGS)
 
 include ../lib.mk
-
-clean:
-	rm -fr $(TEST_PROGS)

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

Shuah Khan

maintainer

2018-04-18 14:54 UTC #2 lore raw

Re: [PATCH 2/2] selftests/filesystems: remove Makefile warning

Quoted 19 lines · Anders Roxell

When overriding the 'clean' target make throws up warnings:
Makefile:9: warning: overriding recipe for target 'clean' ../lib.mk:98: warning: ignoring old recipe for target 'clean'
In current code we change from TEST_PROGS to TEST_GEN_PROGS and that does that we can remove the target 'clean' and 'all'.
Fixes 10924bc64487 ("selftests: move dnotify_test from Documentation/filesystems")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---
 tools/testing/selftests/filesystems/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/filesystems/Makefile +0 -0
index 427a401aae5c..a55ac3ac09ad 100644

tools/testing/selftests/filesystems/Makefile line 9

Quoted 10 lines

tools/testing/selftests/filesystems/Makefile +1 -5

@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := dnotify_test devpts_pts
+TEST_GEN_PROGS := dnotify_test devpts_pts
 CFLAGS += -I../../../../usr/include/
-all: $(TEST_PROGS)
 
 include ../lib.mk
-
-clean:
-	rm -fr $(TEST_PROGS)

Hi Anders,

Michael sent in a patch to fix the problem already. It is in linux-kselftest fixes branch for 4.17-rc2

Classifying dnotify_test to TEST_GEN_PROGS_EXTENDED as Michael is the correct way to handle this problem. It allows the test to be built and installed and it won't be run in the main kselftest run.

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

Anders Roxell

author

2018-04-18 20:32 UTC #3 lore raw

Re: [PATCH 2/2] selftests/filesystems: remove Makefile warning

Quoted 33 lines · Shuah Khan

Quoted 19 lines · Anders Roxell
When overriding the 'clean' target make throws up warnings:
Makefile:9: warning: overriding recipe for target 'clean' ../lib.mk:98: warning: ignoring old recipe for target 'clean'
In current code we change from TEST_PROGS to TEST_GEN_PROGS and that does that we can remove the target 'clean' and 'all'.
Fixes 10924bc64487 ("selftests: move dnotify_test from Documentation/filesystems")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---
 tools/testing/selftests/filesystems/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/filesystems/Makefile +0 -0
index 427a401aae5c..a55ac3ac09ad 100644
tools/testing/selftests/filesystems/Makefile line 9
Quoted 10 lines
tools/testing/selftests/filesystems/Makefile +1 -5
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := dnotify_test devpts_pts
+TEST_GEN_PROGS := dnotify_test devpts_pts
 CFLAGS += -I../../../../usr/include/
-all: $(TEST_PROGS)
 
 include ../lib.mk
-
-clean:
-     rm -fr $(TEST_PROGS)
Hi Anders,

Quoted 1 line

Michael sent in a patch to fix the problem already.

I'm sorry I should have seen that.

Quoted 6 lines

It is in linux-kselftest fixes
branch for 4.17-rc2
Classifying dnotify_test to TEST_GEN_PROGS_EXTENDED as Michael is the correct way to handle this problem. It allows the test to be built and installed and it won't be run in the main kselftest run.

Great, thank you for the explanation.

Cheers,
Anders

Quoted 3 lines

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

Anders Roxell

author

2018-04-19 08:22 UTC #4 lore raw

Re: [PATCH 2/2] selftests/filesystems: remove Makefile warning

In reply to Shuah Khan

Quoted 33 lines · Shuah Khan

Quoted 19 lines · Anders Roxell
When overriding the 'clean' target make throws up warnings:
Makefile:9: warning: overriding recipe for target 'clean' ../lib.mk:98: warning: ignoring old recipe for target 'clean'
In current code we change from TEST_PROGS to TEST_GEN_PROGS and that does that we can remove the target 'clean' and 'all'.
Fixes 10924bc64487 ("selftests: move dnotify_test from Documentation/filesystems")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---
 tools/testing/selftests/filesystems/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/filesystems/Makefile +0 -0
index 427a401aae5c..a55ac3ac09ad 100644
tools/testing/selftests/filesystems/Makefile line 9
Quoted 10 lines
tools/testing/selftests/filesystems/Makefile +1 -5
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := dnotify_test devpts_pts
+TEST_GEN_PROGS := dnotify_test devpts_pts
 CFLAGS += -I../../../../usr/include/
-all: $(TEST_PROGS)
 
 include ../lib.mk
-
-clean:
-     rm -fr $(TEST_PROGS)
Hi Anders,

Quoted 6 lines

Michael sent in a patch to fix the problem already. It is in linux-kselftest fixes branch for 4.17-rc2
Classifying dnotify_test to TEST_GEN_PROGS_EXTENDED as Michael is the correct way to handle this problem. It allows the test to be built and installed and it won't be run in the main kselftest run.

Why don't we want to run them in the main kselftest run? Is the rationale documented somewhere/somehow?
If they are long running tests or intrusive tests, can we document with a printout like:
=== Test ${foo} - SKIPPED (${short_rationale}) ===
=== Test dnotify_test - SKIPPED (long run) ===
=== Test devpts_pts - SKIPPED (intrusive run) ===

Should there be a variable to turn them on from the main kselftest run?

Cheers,
Anders

Quoted 3 lines

thanks,
-- Shuah

Anders Roxell

author

2018-04-19 08:56 UTC #5 lore raw

Re: [PATCH 2/2] selftests/filesystems: remove Makefile warning

Quoted 37 lines · Anders Roxell

Quoted 36 lines · Shuah Khan
Quoted 19 lines · Anders Roxell
When overriding the 'clean' target make throws up warnings:
Makefile:9: warning: overriding recipe for target 'clean' ../lib.mk:98: warning: ignoring old recipe for target 'clean'
In current code we change from TEST_PROGS to TEST_GEN_PROGS and that does that we can remove the target 'clean' and 'all'.
Fixes 10924bc64487 ("selftests: move dnotify_test from Documentation/filesystems")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---
 tools/testing/selftests/filesystems/Makefile | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)
tools/testing/selftests/filesystems/Makefile +0 -0
index 427a401aae5c..a55ac3ac09ad 100644
tools/testing/selftests/filesystems/Makefile line 9
Quoted 10 lines
tools/testing/selftests/filesystems/Makefile +1 -5
@@ -1,9 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0
-TEST_PROGS := dnotify_test devpts_pts
+TEST_GEN_PROGS := dnotify_test devpts_pts
 CFLAGS += -I../../../../usr/include/
-all: $(TEST_PROGS)
 
 include ../lib.mk
-
-clean:
-     rm -fr $(TEST_PROGS)
Hi Anders,
Michael sent in a patch to fix the problem already. It is in linux-kselftest fixes branch for 4.17-rc2

Quoted 6 lines

Quoted 3 lines
Classifying dnotify_test to TEST_GEN_PROGS_EXTENDED as Michael is the correct way to handle this problem. It allows the test to be built and installed and it won't be run in the main kselftest run.
Why don't we want to run them in the main kselftest run? Is the rationale documented somewhere/somehow?

Think I found the rationale documented in the changelog [1].

What do you think about adding a variable to this test saying run for xx minutes and if it hasn't
crashed, consider it as a passed test ?

Cheers,
Anders
[1] https://patchwork.kernel.org/patch/10332365/

Quoted 6 lines

If they are long running tests or intrusive tests, can we document with a printout like:
=== Test ${foo} - SKIPPED (${short_rationale}) ===
=== Test dnotify_test - SKIPPED (long run) ===
=== Test devpts_pts - SKIPPED (intrusive run) ===

Quoted 8 lines

Should there be a variable to turn them on from the main kselftest run?
Cheers,
Anders
Quoted 3 lines
thanks,
-- Shuah

Christian Brauner

Acked-by on v1 1/2

2018-05-02 14:05 UTC #6 lore raw

In reply to Anders Roxell

Quoted 7 lines · Anders Roxell

We were picking up the wrong header should use asm/ioctls.h form the kernel and not the header from the system (sys/ioctl.h). In the current code we added the correct include and we added the kernel headers path to the CFLAGS.
Fixes ce290a19609d ("selftests: add devpts selftests")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---

Acked-by Christian Brauner <christian.brauner at ubuntu.com>

Patch looks good to me.

I'm going to look into the ioctl() error.

Thanks!
Christian

Quoted 109 lines

Hi,
I've been running devpts_pts on a mainline kernel (4.16+git0+60cc43fc88) and
the verify_invalid_ptmx_bind_mount() test failes with this failure:
root at intel-core2-32:~# ./devpts_pts
Failed to perform TIOCGPTPEER ioctl
However, I'm still confused why I'm not able to get the test to pass. Strace showes that -ENOENT return in the TIOCGPTPEER implementation in the kernel. I think the -ENOENT gets returned from this path devpts_mntget()->devpts_ptmx_path->path_pts().
See the strace issue below:
root at intel-core2-32:~# strace ./devpts_pts
execve("./devpts_pts", ["./devpts_pts"], [/* 17 vars */]) = 0
brk(NULL) = 0x5634e0092000
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d338000
access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory)
open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3
fstat(3, {st_mode=S_IFREG|0644, st_size=16726, ...}) = 0
mmap(NULL, 16726, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f459d333000
close(3) = 0
open("/lib/libc.so.6", O_RDONLY|O_CLOEXEC) = 3
read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\3\2\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1681056, ...}) = 0
mmap(NULL, 3787168, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f459cd7b000 mprotect(0x7f459cf0f000, 2093056, PROT_NONE) = 0
mmap(0x7f459d10e000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x193000) = 0x7f459d10e000
mmap(0x7f459d114000, 14752, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f459d114000
close(3) = 0
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d331000 arch_prctl(ARCH_SET_FS, 0x7f459d331700) = 0
mprotect(0x7f459d10e000, 16384, PROT_READ) = 0
mprotect(0x5634debe3000, 4096, PROT_READ) = 0
mprotect(0x7f459d33a000, 4096, PROT_READ) = 0
munmap(0x7f459d333000, 16726) = 0
ioctl(0, TCGETS, {B38400 opost isig icanon echo ...}) = 0
unshare(CLONE_NEWNS) = 0
mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL) = 0
mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL) = 0
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4377 wait4(4377, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4377
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4377, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
close(3)                                = 0
close(4)                                = 0
getpid()                                = 4376
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_CREAT|O_EXCL, 0600) = 3 mount("/dev/pts/ptmx", "/tmp/devpts_ptmx_Z6aEvy", NULL, MS_BIND, NULL) = 0
close(3) = 0
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = -1 ENOENT (No such file or directory) write(2, "Failed to perform TIOCGPTPEER io"..., 36Failed to perform TIOCGPTPEER ioctl ) = 36
close(3)                                = 0
umount2("/dev/pts", 0)                  = 0
umount2("/dev/ptmx", 0)                 = 0
mkdir("/tmp/devpts_fs_w22bR6", 0700)    = 0
mount("devpts", "/tmp/devpts_fs_w22bR6", "devpts", MS_NOSUID|MS_NOEXEC, "newinstance,ptmxmode=0666,mode=0"...) = 0 open("/tmp/devpts_fs_w22bR6/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4378 wait4(4378, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4378
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4378, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
close(3)                                = 0
close(4)                                = 0
unlink("/tmp/devpts_fs_w22bR6")         = -1 EISDIR (Is a directory)
exit_group(0)                           = ?
+++ exited with 0 +++
root at intel-core2-32:~#
 tools/testing/selftests/filesystems/Makefile     | 1 +
 tools/testing/selftests/filesystems/devpts_pts.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/filesystems/Makefile +1 -0
index 4e6d09fb166f..427a401aae5c 100644
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := dnotify_test devpts_pts
+CFLAGS += -I../../../../usr/include/
 all: $(TEST_PROGS)
 
 include ../lib.mk
tools/testing/selftests/filesystems/devpts_pts.c +1 -2
index b9055e974289..79420b9d00c7 100644
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
+#include <asm/ioctls.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 
--

Quoted 2 lines

2.11.0

Shuah Khan

maintainer

2018-05-04 19:42 UTC #7 lore raw

Quoted 126 lines · Christian Brauner

Quoted 7 lines · Anders Roxell
We were picking up the wrong header should use asm/ioctls.h form the kernel and not the header from the system (sys/ioctl.h). In the current code we added the correct include and we added the kernel headers path to the CFLAGS.
Fixes ce290a19609d ("selftests: add devpts selftests")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---
Acked-by Christian Brauner <christian.brauner at ubuntu.com>
Patch looks good to me.
I'm going to look into the ioctl() error.
Thanks!
Christian
Quoted 108 lines
Hi,
I've been running devpts_pts on a mainline kernel (4.16+git0+60cc43fc88) and
the verify_invalid_ptmx_bind_mount() test failes with this failure:
root at intel-core2-32:~# ./devpts_pts
Failed to perform TIOCGPTPEER ioctl
However, I'm still confused why I'm not able to get the test to pass. Strace showes that -ENOENT return in the TIOCGPTPEER implementation in the kernel. I think the -ENOENT gets returned from this path devpts_mntget()->devpts_ptmx_path->path_pts().
See the strace issue below:
root at intel-core2-32:~# strace ./devpts_pts
execve("./devpts_pts", ["./devpts_pts"], [/* 17 vars */]) = 0
brk(NULL) = 0x5634e0092000
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d338000
access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory)
open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3
fstat(3, {st_mode=S_IFREG|0644, st_size=16726, ...}) = 0
mmap(NULL, 16726, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f459d333000
close(3) = 0
open("/lib/libc.so.6", O_RDONLY|O_CLOEXEC) = 3
read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\3\2\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1681056, ...}) = 0
mmap(NULL, 3787168, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f459cd7b000 mprotect(0x7f459cf0f000, 2093056, PROT_NONE) = 0
mmap(0x7f459d10e000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x193000) = 0x7f459d10e000
mmap(0x7f459d114000, 14752, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f459d114000
close(3) = 0
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d331000 arch_prctl(ARCH_SET_FS, 0x7f459d331700) = 0
mprotect(0x7f459d10e000, 16384, PROT_READ) = 0
mprotect(0x5634debe3000, 4096, PROT_READ) = 0
mprotect(0x7f459d33a000, 4096, PROT_READ) = 0
munmap(0x7f459d333000, 16726) = 0
ioctl(0, TCGETS, {B38400 opost isig icanon echo ...}) = 0
unshare(CLONE_NEWNS) = 0
mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL) = 0
mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL) = 0
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4377 wait4(4377, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4377
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4377, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
close(3)                                = 0
close(4)                                = 0
getpid()                                = 4376
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_CREAT|O_EXCL, 0600) = 3 mount("/dev/pts/ptmx", "/tmp/devpts_ptmx_Z6aEvy", NULL, MS_BIND, NULL) = 0
close(3) = 0
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = -1 ENOENT (No such file or directory) write(2, "Failed to perform TIOCGPTPEER io"..., 36Failed to perform TIOCGPTPEER ioctl ) = 36
close(3)                                = 0
umount2("/dev/pts", 0)                  = 0
umount2("/dev/ptmx", 0)                 = 0
mkdir("/tmp/devpts_fs_w22bR6", 0700)    = 0
mount("devpts", "/tmp/devpts_fs_w22bR6", "devpts", MS_NOSUID|MS_NOEXEC, "newinstance,ptmxmode=0666,mode=0"...) = 0 open("/tmp/devpts_fs_w22bR6/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4378 wait4(4378, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4378
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4378, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
close(3)                                = 0
close(4)                                = 0
unlink("/tmp/devpts_fs_w22bR6")         = -1 EISDIR (Is a directory)
exit_group(0)                           = ?
+++ exited with 0 +++
root at intel-core2-32:~#
 tools/testing/selftests/filesystems/Makefile     | 1 +
 tools/testing/selftests/filesystems/devpts_pts.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/filesystems/Makefile +1 -0
index 4e6d09fb166f..427a401aae5c 100644
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := dnotify_test devpts_pts
+CFLAGS += -I../../../../usr/include/
 all: $(TEST_PROGS)
 
 include ../lib.mk
tools/testing/selftests/filesystems/devpts_pts.c +1 -1
index b9055e974289..79420b9d00c7 100644
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
+#include <asm/ioctls.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 

Quoted 4 lines

Quoted 3 lines
--
2.11.0

Thanks. I will queue this up for 4.18-rc1

-- 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

Shuah Khan

maintainer

2018-05-10 17:26 UTC #8 lore raw

Quoted 127 lines · Shuah Khan

Quoted 126 lines · Christian Brauner
Quoted 7 lines · Anders Roxell
We were picking up the wrong header should use asm/ioctls.h form the kernel and not the header from the system (sys/ioctl.h). In the current code we added the correct include and we added the kernel headers path to the CFLAGS.
Fixes ce290a19609d ("selftests: add devpts selftests")
Signed-off-by Anders Roxell <anders.roxell at linaro.org>
---
Acked-by Christian Brauner <christian.brauner at ubuntu.com>
Patch looks good to me.
I'm going to look into the ioctl() error.
Thanks!
Christian
Quoted 108 lines
Hi,
I've been running devpts_pts on a mainline kernel (4.16+git0+60cc43fc88) and
the verify_invalid_ptmx_bind_mount() test failes with this failure:
root at intel-core2-32:~# ./devpts_pts
Failed to perform TIOCGPTPEER ioctl
However, I'm still confused why I'm not able to get the test to pass. Strace showes that -ENOENT return in the TIOCGPTPEER implementation in the kernel. I think the -ENOENT gets returned from this path devpts_mntget()->devpts_ptmx_path->path_pts().
See the strace issue below:
root at intel-core2-32:~# strace ./devpts_pts
execve("./devpts_pts", ["./devpts_pts"], [/* 17 vars */]) = 0
brk(NULL) = 0x5634e0092000
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d338000
access("/etc/ld.so.preload", R_OK) = -1 ENOENT (No such file or directory)
open("/etc/ld.so.cache", O_RDONLY|O_CLOEXEC) = 3
fstat(3, {st_mode=S_IFREG|0644, st_size=16726, ...}) = 0
mmap(NULL, 16726, PROT_READ, MAP_PRIVATE, 3, 0) = 0x7f459d333000
close(3) = 0
open("/lib/libc.so.6", O_RDONLY|O_CLOEXEC) = 3
read(3, "\177ELF\2\1\1\3\0\0\0\0\0\0\0\0\3\0>\0\1\0\0\0\260\3\2\0\0\0\0\0"..., 832) = 832 fstat(3, {st_mode=S_IFREG|0755, st_size=1681056, ...}) = 0
mmap(NULL, 3787168, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0) = 0x7f459cd7b000 mprotect(0x7f459cf0f000, 2093056, PROT_NONE) = 0
mmap(0x7f459d10e000, 24576, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x193000) = 0x7f459d10e000
mmap(0x7f459d114000, 14752, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_ANONYMOUS, -1, 0) = 0x7f459d114000
close(3) = 0
mmap(NULL, 8192, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0) = 0x7f459d331000 arch_prctl(ARCH_SET_FS, 0x7f459d331700) = 0
mprotect(0x7f459d10e000, 16384, PROT_READ) = 0
mprotect(0x5634debe3000, 4096, PROT_READ) = 0
mprotect(0x7f459d33a000, 4096, PROT_READ) = 0
munmap(0x7f459d333000, 16726) = 0
ioctl(0, TCGETS, {B38400 opost isig icanon echo ...}) = 0
unshare(CLONE_NEWNS) = 0
mount("", "/", NULL, MS_REC|MS_PRIVATE, NULL) = 0
mount("/dev/pts/ptmx", "/dev/ptmx", NULL, MS_BIND, NULL) = 0
open("/dev/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4377 wait4(4377, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4377
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4377, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
close(3)                                = 0
close(4)                                = 0
getpid()                                = 4376
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_CREAT|O_EXCL, 0600) = 3 mount("/dev/pts/ptmx", "/tmp/devpts_ptmx_Z6aEvy", NULL, MS_BIND, NULL) = 0
close(3) = 0
open("/tmp/devpts_ptmx_Z6aEvy", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = -1 ENOENT (No such file or directory) write(2, "Failed to perform TIOCGPTPEER io"..., 36Failed to perform TIOCGPTPEER ioctl ) = 36
close(3)                                = 0
umount2("/dev/pts", 0)                  = 0
umount2("/dev/ptmx", 0)                 = 0
mkdir("/tmp/devpts_fs_w22bR6", 0700)    = 0
mount("devpts", "/tmp/devpts_fs_w22bR6", "devpts", MS_NOSUID|MS_NOEXEC, "newinstance,ptmxmode=0666,mode=0"...) = 0 open("/tmp/devpts_fs_w22bR6/ptmx", O_RDWR|O_NOCTTY|O_CLOEXEC) = 3
ioctl(3, TIOCSPTLCK, [0]) = 0
ioctl(3, _IOC(0, 0x54, 0x41, 0x00), 0x80102) = 4
clone(child_stack=NULL, flags=CLONE_CHILD_CLEARTID|CLONE_CHILD_SETTID|SIGCHLD, child_tidptr=0x7f459d3319d0) = 4378 wait4(4378, [{WIFEXITED(s) && WEXITSTATUS(s) == 0}], 0, NULL) = 4378
--- SIGCHLD {si_signo=SIGCHLD, si_code=CLD_EXITED, si_pid=4378, si_uid=0, si_status=0, si_utime=0, si_stime=0} ---
close(3)                                = 0
close(4)                                = 0
unlink("/tmp/devpts_fs_w22bR6")         = -1 EISDIR (Is a directory)
exit_group(0)                           = ?
+++ exited with 0 +++
root at intel-core2-32:~#
 tools/testing/selftests/filesystems/Makefile     | 1 +
 tools/testing/selftests/filesystems/devpts_pts.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
tools/testing/selftests/filesystems/Makefile +1 -0
index 4e6d09fb166f..427a401aae5c 100644
@@ -1,5 +1,6 @@
 # SPDX-License-Identifier: GPL-2.0
 TEST_PROGS := dnotify_test devpts_pts
+CFLAGS += -I../../../../usr/include/
 all: $(TEST_PROGS)
 
 include ../lib.mk
tools/testing/selftests/filesystems/devpts_pts.c +1 -1
index b9055e974289..79420b9d00c7 100644
@@ -8,7 +8,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#include <sys/ioctl.h>
+#include <asm/ioctls.h>
 #include <sys/mount.h>
 #include <sys/wait.h>
 

Quoted 9 lines

Quoted 4 lines
Quoted 3 lines
--
2.11.0
Thanks. I will queue this up for 4.18-rc1
-- Shuah

Applied to linux-kselftest next for 4.18-rc1.