Remove the pipes runtest file
PATCH v2 1/5 Remove the pipes runtest file
We have two almost identical runtest files:
[root@localhost runtest]# diff ipc pipes
1c1
< #DESCRIPTION:Interprocess communication stress
---
Quoted 1 line
#DESCRIPTION:IPC pipes stress
30,32d29
<
< sem01 sem01
< sem02 sem02
[root@localhost runtest]#
Since both are part of the default scenario, their common tests are executed twice by LTP run. Let's fix that by removing the pipes file. If one needs to execute only pipeio* test cases, he/she will still be able to do it by executing the ipc file.
---
Changes since V1:
- added the ack
runtest/pipes | 29 ----------------------------- scenario_groups/default | 1 - 2 files changed, 0 insertions(+), 30 deletions(-) delete mode 100644 runtest/pipes
runtest/pipes deleted +0 -29
@@ -1,29 +0,0 @@ -#DESCRIPTION:IPC pipes stress -# These tests use tests/pipeio to put pipes (named or unnamed) through a workout -# -pipeio_1 pipeio -T pipeio_1 -c 5 -s 4090 -i 100 -b -f x80 -# spawns 5 children to write 100 chunks of 4090 bytes to a named pipe -# using blocking I/O -#pipeio_2 pipeio -T pipeio_2 -c 5 -s 4090 -i 100 -f x80 -# spawns 5 children to write 100 chunks of 4090 bytes to a named pipe -# using non-blocking I/O -# This test hits EAGAIN, which pipeio doesn't handle at the moment -pipeio_3 pipeio -T pipeio_3 -c 5 -s 4090 -i 100 -u -b -f x80 -# spawns 5 children to write 100 chunks of 4090 bytes to an unnamed pipe -# using blocking I/O -pipeio_4 pipeio -T pipeio_4 -c 5 -s 4090 -i 100 -u -f x80 -# spawns 5 children to write 100 chunks of 4090 bytes to an unnamed pipe -# using non-blocking I/O -pipeio_5 pipeio -T pipeio_5 -c 5 -s 5000 -i 10 -b -f x80 -# spawns 5 children to write 10 chunks of 5000 bytes to a named pipe -# using blocking I/O -pipeio_6 pipeio -T pipeio_6 -c 5 -s 5000 -i 10 -b -u -f x80 -# spawns 5 children to write 10 chunks of 5000 bytes to an unnamed pipe -# using blocking I/O -#pipeio_7 pipeio -T pipeio_7 -c 5 -s 5000 -i 10 -f x80 -# spawns 5 children to write 10 chunks of 5000 bytes to a named pipe -# using non-blocking I/O -# This test hits EAGAIN, which pipeio doesn't handle at the moment -pipeio_8 pipeio -T pipeio_8 -c 5 -s 5000 -i 10 -u -f x80 -# spawns 5 children to write 10 chunks of 5000 bytes to an unnamed pipe -# using non-blocking I/O
scenario_groups/default +0 -1
@@ -25,7 +25,6 @@ commands hyperthreading kernel_misc fs_ext4 -pipes can cpuhotplug net.ipv6_lib
Signature · 1 line
1.7.1
PATCH v2 2/5 Rename CVE 2012-0957, 2016-4997, 2017-5669, 2017-6951 tests
---
Changes since V1:
- moved source files to corresponding directories
runtest/cve | 8 +- runtest/syscalls | 8 +- testcases/cve/.gitignore | 4 - testcases/cve/cve-2012-0957.c | 94 -------------- testcases/cve/cve-2016-4997.c | 129 -------------------- testcases/cve/cve-2017-5669.c | 113 ----------------- testcases/cve/cve-2017-6951.c | 46 ------- testcases/kernel/syscalls/ipc/shmat/.gitignore | 1 + testcases/kernel/syscalls/ipc/shmat/shmat03.c | 113 +++++++++++++++++ testcases/kernel/syscalls/request_key/.gitignore | 1 + .../kernel/syscalls/request_key/request_key05.c | 46 +++++++ testcases/kernel/syscalls/setsockopt/.gitignore | 1 + .../kernel/syscalls/setsockopt/setsockopt03.c | 129 ++++++++++++++++++++ testcases/kernel/syscalls/uname/.gitignore | 1 + testcases/kernel/syscalls/uname/Makefile | 2 + testcases/kernel/syscalls/uname/uname04.c | 94 ++++++++++++++ 16 files changed, 396 insertions(+), 394 deletions(-) delete mode 100644 testcases/cve/cve-2012-0957.c delete mode 100644 testcases/cve/cve-2016-4997.c delete mode 100644 testcases/cve/cve-2017-5669.c delete mode 100644 testcases/cve/cve-2017-6951.c create mode 100644 testcases/kernel/syscalls/ipc/shmat/shmat03.c create mode 100644 testcases/kernel/syscalls/request_key/request_key05.c create mode 100644 testcases/kernel/syscalls/setsockopt/setsockopt03.c create mode 100644 testcases/kernel/syscalls/uname/uname04.c
runtest/cve +4 -4
@@ -2,13 +2,13 @@ cve-2011-0999 thp01 -I 120 cve-2011-2183 ksm05 -I 10 cve-2011-2496 vma03 -cve-2012-0957 cve-2012-0957 +cve-2012-0957 uname04 cve-2014-0196 cve-2014-0196 cve-2015-0235 gethostbyname_r01 cve-2015-7550 keyctl02 cve-2016-4470 keyctl01.sh cve-2015-3290 cve-2015-3290 -cve-2016-4997 cve-2016-4997 +cve-2016-4997 setsockopt03 cve-2016-5195 dirtyc0w cve-2016-7042 cve-2016-7042 cve-2016-7117 cve-2016-7117
@@ -16,8 +16,8 @@ cve-2016-9604 keyctl08 cve-2016-10044 cve-2016-10044 cve-2017-2618 cve-2017-2618 cve-2017-2671 cve-2017-2671 -cve-2017-5669 cve-2017-5669 -cve-2017-6951 cve-2017-6951 +cve-2017-5669 shmat03 +cve-2017-6951 request_key05 cve-2017-7308 setsockopt02 cve-2017-7472 keyctl04 cve-2017-12192 keyctl07
runtest/syscalls +4 -4
@@ -960,8 +960,8 @@ renameat202 renameat202 -i 10 request_key01 request_key01 request_key02 request_key02 request_key03 request_key03 -cve-2017-6951 cve-2017-6951 request_key04 request_key04 +request_key05 request_key05 rmdir01 rmdir01 rmdir02 rmdir02
@@ -1187,7 +1187,7 @@ setsid01 setsid01 setsockopt01 setsockopt01 setsockopt02 setsockopt02 -cve-2016-4997 cve-2016-4997 +setsockopt03 setsockopt03 settimeofday01 settimeofday01 settimeofday02 settimeofday02
@@ -1205,7 +1205,7 @@ setxattr03 setxattr03 shmat01 shmat01 shmat02 shmat02 -cve-2017-5669 cve-2017-5669 +shmat03 shmat03 shmctl01 shmctl01 shmctl02 shmctl02
@@ -1400,7 +1400,7 @@ umask01 umask01 uname01 uname01 uname02 uname02 uname03 uname03 -cve-2012-0957 cve-2012-0957 +uname04 uname04 unlink01 symlink01 -T unlink01 unlink05 unlink05
testcases/cve/.gitignore +0 -4
@@ -1,14 +1,10 @@ -cve-2012-0957 cve-2014-0196 cve-2015-3290 -cve-2016-4997 cve-2016-7042 cve-2016-7117 cve-2016-10044 cve-2017-2618 cve-2017-2671 -cve-2017-6951 -cve-2017-5669 meltdown stack_clash cve-2017-17052
testcases/cve/cve-2012-0957.c deleted +0 -94
94 lines not on this page · raw message
testcases/cve/cve-2016-4997.c deleted +0 -129
129 lines not on this page · raw message
testcases/cve/cve-2017-5669.c deleted +0 -113
113 lines not on this page · raw message
testcases/cve/cve-2017-6951.c deleted +0 -46
46 lines not on this page · raw message
testcases/kernel/syscalls/ipc/shmat/.gitignore +1 -0
@@ -1,2 +1,3 @@ /shmat01 /shmat02 +/shmat03
testcases/kernel/syscalls/ipc/shmat/shmat03.c new file +113 -0
113 lines not on this page · raw message
testcases/kernel/syscalls/request_key/.gitignore +1 -0
@@ -2,3 +2,4 @@ /request_key02 /request_key03 /request_key04 +/request_key05
testcases/kernel/syscalls/request_key/request_key05.c new file +46 -0
46 lines not on this page · raw message
testcases/kernel/syscalls/setsockopt/.gitignore +1 -0
@@ -1,2 +1,3 @@ /setsockopt01 /setsockopt02 +/setsockopt03
testcases/kernel/syscalls/setsockopt/setsockopt03.c new file +129 -0
129 lines not on this page · raw message
testcases/kernel/syscalls/uname/.gitignore +1 -0
@@ -1,3 +1,4 @@ /uname01 /uname02 /uname03 +/uname04
testcases/kernel/syscalls/uname/Makefile +2 -0
@@ -20,4 +20,6 @@ top_srcdir ?= ../../../.. include $(top_srcdir)/include/mk/testcases.mk +uname04: CFLAGS += -D_GNU_SOURCE + include $(top_srcdir)/include/mk/generic_leaf_target.mk
testcases/kernel/syscalls/uname/uname04.c new file +94 -0
94 lines not on this page · raw message
Signature · 1 line
1.7.1
PATCH v2 3/5 runtest/sched: removed sched_{set, get}attr test cases
In reply to Stanislav KholmanskikhAll these test cases do not fall into the category of "Scheduler Stress Tests", so their better location is in runtest/syscalls, where they are already defined.
Both runtest/sched and runtest/syscalls are part of the default scenario, these test cases will be executed in a default run anyway.
---
Changes since V1:
- added the ack
runtest/sched | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-)
runtest/sched +0 -4
@@ -9,10 +9,6 @@ trace_sched01 trace_sched -c 1 hackbench01 hackbench 50 process 1000 hackbench02 hackbench 20 thread 1000 -sched_setattr01 sched_setattr01 -sched_getattr01 sched_getattr01 -sched_getattr02 sched_getattr02 - sched_cli_serv run_sched_cliserv.sh # Run this stress test for 2 minutes sched_stress sched_stress.sh
Signature · 1 line
1.7.1
PATCH v2 4/5 runtest/commands: add _sh to all testcases
In reply to Stanislav KholmanskikhTo avoid existing and possible name collisions in
http://lists.linux.it/pipermail/ltp/2018-October/009490.html
it was proposed to add '_sh' to all testcases in runtest/commands
---
Changes since V1:
- changed the naming scheme
- changed names of all test cases in commands
runtest/commands | 82 +++++++++++++++++++++++++++--------------------------- 1 files changed, 41 insertions(+), 41 deletions(-)
runtest/commands +41 -41
@@ -1,42 +1,42 @@ #DESCRIPTION:General Linux commands -ar export TCdat=$LTPROOT/testcases/bin; ar01 -ld01 ld01 -ldd01 ldd01 -nm01 nm01 -file01 file01.sh -tar01 tar_tests.sh -logrotate export TCdat=$LTPROOT/testcases/bin; logrotate_tests.sh -cpio01 cpio_tests.sh -unzip01 unzip01.sh -gzip01 gzip_tests.sh -cp01 cp_tests.sh -ln01 ln_tests.sh -mkdir01 mkdir_tests.sh -mv01 mv_tests.sh -du01 du01.sh -df01_ext2 df01.sh -f ext2 -df01_ext3 df01.sh -f ext3 -df01_ext4 df01.sh -f ext4 -df01_xfs df01.sh -f xfs -df01_vfat df01.sh -f vfat -df01_exfat df01.sh -f exfat -df01_ntfs df01.sh -f ntfs -mkfs01 mkfs01.sh -mkfs01_ext2 mkfs01.sh -f ext2 -mkfs01_ext3 mkfs01.sh -f ext3 -mkfs01_ext4 mkfs01.sh -f ext4 -mkfs01_xfs mkfs01.sh -f xfs -mkfs01_btrfs mkfs01.sh -f btrfs -mkfs01_minix mkfs01.sh -f minix -mkfs01_msdos mkfs01.sh -f msdos -mkfs01_vfat mkfs01.sh -f vfat -mkfs01_ntfs mkfs01.sh -f ntfs -mkswap01 mkswap01.sh -which01 which01.sh -lsmod01 lsmod01.sh -insmod01 insmod01.sh -wc01 wc01.sh -keyctl01 keyctl01.sh -gdb01 gdb01.sh -unshare01 unshare01.sh -sysctl01 sysctl01.sh +ar_sh export TCdat=$LTPROOT/testcases/bin; ar01 +ld01_sh ld01 +ldd01_sh ldd01 +nm01_sh nm01 +file01_sh file01.sh +tar01_sh tar_tests.sh +logrotate_sh export TCdat=$LTPROOT/testcases/bin; logrotate_tests.sh +cpio01_sh cpio_tests.sh +unzip01_sh unzip01.sh +gzip01_sh gzip_tests.sh +cp01_sh cp_tests.sh +ln01_sh ln_tests.sh +mkdir01_sh mkdir_tests.sh +mv01_sh mv_tests.sh +du01_sh du01.sh +df01_ext2_sh df01.sh -f ext2 +df01_ext3_sh df01.sh -f ext3 +df01_ext4_sh df01.sh -f ext4 +df01_xfs_sh df01.sh -f xfs +df01_vfat_sh df01.sh -f vfat +df01_exfat_sh df01.sh -f exfat +df01_ntfs_sh df01.sh -f ntfs +mkfs01_sh mkfs01.sh +mkfs01_ext2_sh mkfs01.sh -f ext2 +mkfs01_ext3_sh mkfs01.sh -f ext3 +mkfs01_ext4_sh mkfs01.sh -f ext4 +mkfs01_xfs_sh mkfs01.sh -f xfs +mkfs01_btrfs_sh mkfs01.sh -f btrfs +mkfs01_minix_sh mkfs01.sh -f minix +mkfs01_msdos_sh mkfs01.sh -f msdos +mkfs01_vfat_sh mkfs01.sh -f vfat +mkfs01_ntfs_sh mkfs01.sh -f ntfs +mkswap01_sh mkswap01.sh +which01_sh which01.sh +lsmod01_sh lsmod01.sh +insmod01_sh insmod01.sh +wc01_sh wc01.sh +keyctl01_sh keyctl01.sh +gdb01_sh gdb01.sh +unshare01_sh unshare01.sh +sysctl01_sh sysctl01.sh
Signature · 1 line
1.7.1
PATCH v2 5/5 Remove numa from the default scenario
In reply to Stanislav KholmanskikhSince the move_pages tests are in syscalls and numa01.sh is known to be broken.
---
Changes since V1:
- In V1 I removed move_pages* from numa, here I remove numa from the default scenario
scenario_groups/default | 1 - 1 files changed, 0 insertions(+), 1 deletions(-)
scenario_groups/default +0 -1
@@ -19,7 +19,6 @@ fcntl-locktests connectors timers power_management_tests -numa hugetlb commands hyperthreading
Signature · 1 line
1.7.1
PATCH v2 1/5 Remove the pipes runtest file
In reply to Stanislav KholmanskikhHi!
The whole patchset looks good to me.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/5 Remove the pipes runtest file
Hi.
Quoted 3 lines · Cyril Hrubis
Hi!
The whole patchset looks good to me.
Thank you. I committed the series.
Sadly, but I missed that 'git am' was not happy with the description message for the first patch, so now it looks like:
commit b8c9b0d326ef54f484cfe22878bc8df4304cfb5e
Author: Stanislav Kholmanskikh <[email protected]> Date: Mon Oct 8 12:12:43 2018 +0300
Remove the pipes runtest file
We have two almost identical runtest files:
[root@localhost runtest]# diff ipc pipes 1c1
< #DESCRIPTION:Interprocess communication stress
i.e. the description is truncated, and Signed-off-by and Acked-by lines are gone too.
I'm sorry about that.
PATCH v2 1/5 Remove the pipes runtest file
Hi!
Quoted 4 lines
Thank you. I committed the series.
Sadly, but I missed that 'git am' was not happy with the description message for the first patch, so now it looks like:
Well, it cat still be fixed, the obvious way how to do that is to revert the broken patch and apply a correct one.
Signature · 2 lines
Cyril Hrubis [email protected]
PATCH v2 1/5 Remove the pipes runtest file
Quoted 9 lines · Cyril Hrubis
Hi!
Quoted 4 lines
Thank you. I committed the series.
Sadly, but I missed that 'git am' was not happy with the description message for the first patch, so now it looks like:
Well, it cat still be fixed, the obvious way how to do that is to revert the broken patch and apply a correct one.
Thank you. I reverted the patch and applied it again but with the corrected description. It should be fine now.
Sorry for the trouble.