summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPetr Vorel <petr.vorel@gmail.com>2022-07-23 22:30:14 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-07-28 17:49:40 +0100
commitb9223d27bdebd1356b3ece4c8735f561c947d47d (patch)
tree091061581eb92c7723cc0bb4f7d35329917d8338 /meta
parent403dfe91ea6d985b6f0533adea2167e36f24e9b2 (diff)
downloadpoky-b9223d27bdebd1356b3ece4c8735f561c947d47d.tar.gz
ltp: Add post release runtime fixes
Backport various post 20220527 release runtime fixes: * The concept of max runtime * tst_test.sh: Cleanup getopts usage * mountns0[1-3]: wait for umount completed in thread_b (From OE-Core rev: 1946833bdcce57250f346db1b8f2f898c2c3244c) Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch121
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch63
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch154
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch53
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch31
-rw-r--r--meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch44
-rw-r--r--meta/recipes-extended/ltp/ltp_20220527.bb6
7 files changed, 472 insertions, 0 deletions
diff --git a/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
new file mode 100644
index 0000000000..726f6212f3
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch
@@ -0,0 +1,121 @@
1From bda92ad659a52d38ac810099f69adff626b064c6 Mon Sep 17 00:00:00 2001
2From: Joerg Vehlow <joerg.vehlow@aox.de>
3Date: Mon, 27 Jun 2022 10:44:49 +0200
4Subject: [PATCH] memcg/functional: Fix usage of PAGESIZE from memcg_lib.sh
5
6$PAGESIZES is set in memcg_lib.sh, which was moved to the bottom of the file.
7
8Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage")
9
10Reviewed-by: Petr Vorel <pvorel@suse.cz>
11Signed-off-by: Joerg Vehlow <joerg.vehlow@aox.de>
12Upstream-Status: Backport [bda92ad659a52d38ac810099f69adff626b064c6]
13---
14 .../controllers/memcg/functional/memcg_failcnt.sh | 7 ++++---
15 .../memcg/functional/memcg_max_usage_in_bytes_test.sh | 10 +++++-----
16 .../memcg/functional/memcg_subgroup_charge.sh | 8 ++++----
17 .../memcg/functional/memcg_usage_in_bytes_test.sh | 10 +++++-----
18 4 files changed, 18 insertions(+), 17 deletions(-)
19
20diff --git a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
21index 1fed01569..1be98a056 100755
22--- a/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
23+++ b/testcases/kernel/controllers/memcg/functional/memcg_failcnt.sh
24@@ -12,9 +12,6 @@ MEMCG_TESTFUNC=test
25 MEMCG_SHMMAX=1
26 TST_TEST_DATA="--mmap-anon --mmap-file --shm"
27
28-MEMORY_LIMIT=$PAGESIZE
29-MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2))
30-
31 test()
32 {
33 ROD echo $MEMORY_LIMIT \> memory.limit_in_bytes
34@@ -36,4 +33,8 @@ test()
35 }
36
37 . memcg_lib.sh
38+
39+MEMORY_LIMIT=$PAGESIZE
40+MEMORY_TO_ALLOCATE=$((MEMORY_LIMIT * 2))
41+
42 tst_run
43diff --git a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
44index d1ffbe053..302810513 100755
45--- a/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
46+++ b/testcases/kernel/controllers/memcg/functional/memcg_max_usage_in_bytes_test.sh
47@@ -9,11 +9,6 @@
48 MEMCG_TESTFUNC=test
49 TST_CNT=4
50
51-
52-MEM_TO_ALLOC=$((PAGESIZE * 1024))
53-MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
54-MEM_LIMIT=$((MEM_TO_ALLOC * 2))
55-
56 # Run test cases which checks memory.[memsw.]max_usage_in_bytes after make
57 # some memory allocation
58 test_max_usage_in_bytes()
59@@ -88,4 +83,9 @@ test4()
60 }
61
62 . memcg_lib.sh
63+
64+MEM_TO_ALLOC=$((PAGESIZE * 1024))
65+MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
66+MEM_LIMIT=$((MEM_TO_ALLOC * 2))
67+
68 tst_run
69diff --git a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
70index 08b6697d4..9bcc01258 100755
71--- a/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
72+++ b/testcases/kernel/controllers/memcg/functional/memcg_subgroup_charge.sh
73@@ -12,10 +12,6 @@
74 MEMCG_TESTFUNC=test
75 TST_CNT=3
76
77-
78-# Allocate memory bigger than per-cpu kernel memory
79-MEM_TO_ALLOC=$((PAGESIZES * 2))
80-
81 # Test the memory charge won't move to subgroup
82 # $1 - memory.limit_in_bytes in sub group
83 test_subgroup()
84@@ -67,4 +63,8 @@ test3()
85 }
86
87 . memcg_lib.sh
88+
89+# Allocate memory bigger than per-cpu kernel memory
90+MEM_TO_ALLOC=$((PAGESIZES * 2))
91+
92 tst_run
93diff --git a/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh b/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh
94index 6f932124e..125d88e55 100755
95--- a/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh
96+++ b/testcases/kernel/controllers/memcg/functional/memcg_usage_in_bytes_test.sh
97@@ -9,11 +9,6 @@
98 MEMCG_TESTFUNC=test
99 TST_CNT=2
100
101-
102-MEM_TO_ALLOC=$((PAGESIZE * 1024))
103-MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
104-MEM_LIMIT=$((MEM_TO_ALLOC * 2))
105-
106 test1()
107 {
108 tst_res TINFO "Test memory.usage_in_bytes"
109@@ -35,4 +30,9 @@ test2()
110 }
111
112 . memcg_lib.sh
113+
114+MEM_TO_ALLOC=$((PAGESIZE * 1024))
115+MEM_EXPECTED_UPPER=$((MEM_TO_ALLOC + MEM_USAGE_RANGE))
116+MEM_LIMIT=$((MEM_TO_ALLOC * 2))
117+
118 tst_run
119--
1202.37.1
121
diff --git a/meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch b/meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch
new file mode 100644
index 0000000000..1339c603b9
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch
@@ -0,0 +1,63 @@
1From 6d4c8343d33e7d8fa059246310413f029a9e8573 Mon Sep 17 00:00:00 2001
2From: Li Wang <liwang@redhat.com>
3Date: Thu, 7 Jul 2022 17:38:45 +0800
4Subject: [PATCH] mountns0[1-3]: wait for umount completed in thread_b
5
6To get rid of race condition (occurs with umount_folders):
7
8 mountns01.c:42: TPASS: shared mount in parent passed
9 mountns01.c:83: TPASS: shared mount in child passed
10 tst_device.c:394: TWARN: umount('B') failed with EINVAL
11 mountns.h:39: TWARN: umount(B) failed: EINVAL (22)
12
13Signed-off-by: Li Wang <liwang@redhat.com>
14Reviewed-by: Yang Xu <xuyang2018.jy@fujitsu.com>
15Upstream-Status: Backport [6d4c8343d33e7d8fa059246310413f029a9e8573]
16---
17 testcases/kernel/containers/mountns/mountns01.c | 2 ++
18 testcases/kernel/containers/mountns/mountns02.c | 2 ++
19 testcases/kernel/containers/mountns/mountns03.c | 2 ++
20 3 files changed, 6 insertions(+)
21
22diff --git a/testcases/kernel/containers/mountns/mountns01.c b/testcases/kernel/containers/mountns/mountns01.c
23index e99134aba..e8f176920 100644
24--- a/testcases/kernel/containers/mountns/mountns01.c
25+++ b/testcases/kernel/containers/mountns/mountns01.c
26@@ -86,6 +86,8 @@ static void run(void)
27
28 TST_CHECKPOINT_WAKE(0);
29
30+ SAFE_WAIT(NULL);
31+
32 SAFE_UMOUNT(DIRA);
33 }
34
35diff --git a/testcases/kernel/containers/mountns/mountns02.c b/testcases/kernel/containers/mountns/mountns02.c
36index 258b61217..4b85fa79b 100644
37--- a/testcases/kernel/containers/mountns/mountns02.c
38+++ b/testcases/kernel/containers/mountns/mountns02.c
39@@ -87,6 +87,8 @@ static void run(void)
40
41 TST_CHECKPOINT_WAKE(0);
42
43+ SAFE_WAIT(NULL);
44+
45 SAFE_UMOUNT(DIRA);
46 }
47
48diff --git a/testcases/kernel/containers/mountns/mountns03.c b/testcases/kernel/containers/mountns/mountns03.c
49index f37ae7902..1d26a25d8 100644
50--- a/testcases/kernel/containers/mountns/mountns03.c
51+++ b/testcases/kernel/containers/mountns/mountns03.c
52@@ -97,6 +97,8 @@ static void run(void)
53
54 TST_CHECKPOINT_WAKE(0);
55
56+ SAFE_WAIT(NULL);
57+
58 SAFE_UMOUNT(DIRA);
59 }
60
61--
622.37.1
63
diff --git a/meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch b/meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch
new file mode 100644
index 0000000000..f747a1f97f
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch
@@ -0,0 +1,154 @@
1From 33c156e295e35d4839a135d8ba5db485b7712ced Mon Sep 17 00:00:00 2001
2From: Joerg Vehlow <joerg.vehlow@aox.de>
3Date: Mon, 27 Jun 2022 09:27:09 +0200
4Subject: [PATCH] net_stress: Fix usage of variables from tst_net.sh
5
6These tests use variables (NS_TIMES, IP_TOTAL, ROUTE_TOTAL
7and IF_UPDOWN_TIMES) from tst_net.sh, before sourcing it.
8
9Fixes: 04021637f ("tst_test.sh: Cleanup getopts usage")
10
11Reviewed-by: Petr Vorel <pvorel@suse.cz>
12Signed-off-by: Joerg Vehlow <joerg.vehlow@aox.de>
13Upstream-Status: Backport [33c156e295e35d4839a135d8ba5db485b7712ced]
14---
15 testcases/network/stress/interface/if-addr-adddel.sh | 7 ++++---
16 testcases/network/stress/interface/if-addr-addlarge.sh | 7 ++++---
17 testcases/network/stress/interface/if-route-adddel.sh | 5 +++--
18 testcases/network/stress/interface/if-route-addlarge.sh | 5 +++--
19 testcases/network/stress/interface/if-updown.sh | 5 +++--
20 testcases/network/stress/interface/if4-addr-change.sh | 4 +++-
21 6 files changed, 20 insertions(+), 13 deletions(-)
22
23diff --git a/testcases/network/stress/interface/if-addr-adddel.sh b/testcases/network/stress/interface/if-addr-adddel.sh
24index cb453e612..0750501f0 100755
25--- a/testcases/network/stress/interface/if-addr-adddel.sh
26+++ b/testcases/network/stress/interface/if-addr-adddel.sh
27@@ -7,9 +7,6 @@
28
29 IF_CMD='ifconfig'
30
31-# The interval of the check interface activity
32-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
33-
34 test_body()
35 {
36 local cmd="$CMD"
37@@ -89,4 +86,8 @@ test_body()
38 }
39
40 . if-lib.sh
41+
42+# The interval of the check interface activity
43+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
44+
45 tst_run
46diff --git a/testcases/network/stress/interface/if-addr-addlarge.sh b/testcases/network/stress/interface/if-addr-addlarge.sh
47index 3c876c17d..d0759c86b 100755
48--- a/testcases/network/stress/interface/if-addr-addlarge.sh
49+++ b/testcases/network/stress/interface/if-addr-addlarge.sh
50@@ -7,9 +7,6 @@
51
52 IF_CMD='ifconfig'
53
54-# The interval of the check interface activity
55-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))}
56-
57 test_body()
58 {
59 local cmd="$CMD"
60@@ -110,4 +107,8 @@ test_body()
61 }
62
63 . if-lib.sh
64+
65+# The interval of the check interface activity
66+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IP_TOTAL / 20))}
67+
68 tst_run
69diff --git a/testcases/network/stress/interface/if-route-adddel.sh b/testcases/network/stress/interface/if-route-adddel.sh
70index b50da268a..51445e4f7 100755
71--- a/testcases/network/stress/interface/if-route-adddel.sh
72+++ b/testcases/network/stress/interface/if-route-adddel.sh
73@@ -7,8 +7,6 @@
74
75 IF_CMD='route'
76
77-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
78-
79 test_body()
80 {
81 local cmd="$CMD"
82@@ -64,4 +62,7 @@ test_body()
83 }
84
85 . if-lib.sh
86+
87+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
88+
89 tst_run
90diff --git a/testcases/network/stress/interface/if-route-addlarge.sh b/testcases/network/stress/interface/if-route-addlarge.sh
91index 7d09d1216..355b6b4ab 100755
92--- a/testcases/network/stress/interface/if-route-addlarge.sh
93+++ b/testcases/network/stress/interface/if-route-addlarge.sh
94@@ -7,8 +7,6 @@
95
96 IF_CMD='route'
97
98-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))}
99-
100 test_body()
101 {
102 local cmd="$CMD"
103@@ -76,4 +74,7 @@ test_body()
104 }
105
106 . if-lib.sh
107+
108+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($ROUTE_TOTAL / 20))}
109+
110 tst_run
111diff --git a/testcases/network/stress/interface/if-updown.sh b/testcases/network/stress/interface/if-updown.sh
112index 9a5709c85..71c78d785 100755
113--- a/testcases/network/stress/interface/if-updown.sh
114+++ b/testcases/network/stress/interface/if-updown.sh
115@@ -8,8 +8,6 @@
116 IF_CMD='ifconfig'
117 TST_CLEANUP="if_cleanup_restore"
118
119-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))}
120-
121 test_body()
122 {
123 local cmd="$CMD"
124@@ -47,4 +45,7 @@ test_body()
125 }
126
127 . if-lib.sh
128+
129+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($IF_UPDOWN_TIMES / 20))}
130+
131 tst_run
132diff --git a/testcases/network/stress/interface/if4-addr-change.sh b/testcases/network/stress/interface/if4-addr-change.sh
133index b9ece2af9..f162e6a51 100755
134--- a/testcases/network/stress/interface/if4-addr-change.sh
135+++ b/testcases/network/stress/interface/if4-addr-change.sh
136@@ -9,7 +9,6 @@ TST_CLEANUP="do_cleanup"
137 TST_TESTFUNC="test_body"
138 TST_NEEDS_CMDS="ifconfig"
139
140-CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
141 # Maximum host portion of the IPv4 address on the local host
142 LHOST_IPV4_HOST_MAX="254"
143
144@@ -61,4 +60,7 @@ test_body()
145 }
146
147 . tst_net.sh
148+
149+CHECK_INTERVAL=${CHECK_INTERVAL:-$(($NS_TIMES / 20))}
150+
151 tst_run
152--
1532.37.1
154
diff --git a/meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch b/meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch
new file mode 100644
index 0000000000..8acfaf7c8e
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-netstress-Restore-runtime-to-5m.patch
@@ -0,0 +1,53 @@
1From cc4a27c235d0cf69a55cd8829b232566b0223333 Mon Sep 17 00:00:00 2001
2From: Petr Vorel <pvorel@suse.cz>
3Date: Wed, 13 Jul 2022 09:46:14 +0200
4Subject: [PATCH] netstress: Restore runtime to 5m
5
6netstress requires the previous default timeout 5m due longer timeout
7for higher message sizes (e.g. 65535):
8
9./sctp_ipsec.sh -6 -p comp -m transport -s 100:1000:65535:R65535
10sctp_ipsec 1 TPASS: netstress passed, median time 5 ms, data: 5 9 6 5 5
11sctp_ipsec 2 TINFO: run server 'netstress -T sctp -S fd00:1:1:1::1 -D ltp_ns_veth1 -R 500000 -B /tmp/LTP_sctp_ipsec.ARZbGkvjPa'
12sctp_ipsec 2 TINFO: run client 'netstress -l -T sctp -H fd00:1:1:1::1 -n 1000 -N 1000 -S fd00:1:1:1::2 -D ltp_ns_veth2 -a 2 -r 100 -d /tmp/LTP_sctp_ipsec.ARZbGkvjPa/tst_netload.res' 5 times
13sctp_ipsec 2 TPASS: netstress passed, median time 6 ms, data: 8 6 6 5 6
14sctp_ipsec 3 TINFO: run server 'netstress -T sctp -S fd00:1:1:1::1 -D ltp_ns_veth1 -R 500000 -B /tmp/LTP_sctp_ipsec.ARZbGkvjPa'
15sctp_ipsec 3 TINFO: run client 'netstress -l -T sctp -H fd00:1:1:1::1 -n 65535 -N 65535 -S fd00:1:1:1::2 -D ltp_ns_veth2 -a 2 -r 100 -d /tmp/LTP_sctp_ipsec.ARZbGkvjPa/tst_netload.res' 5 times
16sctp_ipsec 3 TWARN: netstress failed, ret: 2
17tst_test.c:1526: TINFO: Timeout per run is 0h 00m 30s
18netstress.c:896: TINFO: IP_BIND_ADDRESS_NO_PORT is used
19netstress.c:898: TINFO: connection: addr 'fd00:1:1:1::1', port '55097'
20netstress.c:900: TINFO: client max req: 100
21netstress.c:901: TINFO: clients num: 2
22netstress.c:906: TINFO: client msg size: 65535
23netstress.c:907: TINFO: server msg size: 65535
24netstress.c:979: TINFO: SCTP client
25netstress.c:475: TINFO: Running the test over IPv6
26Test timeouted, sending SIGKILL!
27tst_test.c:1577: TINFO: If you are running on slow machine, try exporting LTP_TIMEOUT_MUL > 1
28tst_test.c:1579: TBROK: Test killed! (timeout?)
29
30Converting netstress.c to use TST_NO_DEFAULT_MAIN (i.e. implementing main)
31would require more changes, because it uses .forks_child, .needs_checkpoints,
32cleanup function.
33
34Signed-off-by: Petr Vorel <pvorel@suse.cz>
35Upstream-Status: Backport [cc4a27c235d0cf69a55cd8829b232566b0223333]
36---
37 testcases/network/netstress/netstress.c | 1 +
38 1 file changed, 1 insertion(+)
39
40diff --git a/testcases/network/netstress/netstress.c b/testcases/network/netstress/netstress.c
41index 6c9e83112..7c222531d 100644
42--- a/testcases/network/netstress/netstress.c
43+++ b/testcases/network/netstress/netstress.c
44@@ -1028,5 +1028,6 @@ static struct tst_test test = {
45 {"B:", &server_bg, "Run in background, arg is the process directory"},
46 {}
47 },
48+ .max_runtime = 300,
49 .needs_checkpoints = 1,
50 };
51--
522.37.1
53
diff --git a/meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch b/meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch
new file mode 100644
index 0000000000..2b9557ad01
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-nfs05_make_tree-Restore-5-min-timeout.patch
@@ -0,0 +1,31 @@
1From 463da729537faa6d5ef206912fdec871c1059dac Mon Sep 17 00:00:00 2001
2From: Petr Vorel <pvorel@suse.cz>
3Date: Thu, 16 Jun 2022 16:33:31 +0200
4Subject: [PATCH] nfs05_make_tree: Restore 5 min timeout
5
6nfs05_make_tree is a long running test. The previous default timeout 5
7min was enough after reducing runtime in 05be61cf6.
8
9But the new default 30 sec introduced in the concept of max runtime is
10definitely not enough. Restore the previous timeout 5 min.
11
12Signed-off-by: Petr Vorel <pvorel@suse.cz>
13
14Upstream-Status: Backport [463da729537faa6d5ef206912fdec871c1059dac]
15---
16 testcases/network/nfs/nfs_stress/nfs05_make_tree.c | 1 +
17 1 file changed, 1 insertion(+)
18
19diff --git a/testcases/network/nfs/nfs_stress/nfs05_make_tree.c b/testcases/network/nfs/nfs_stress/nfs05_make_tree.c
20index fdc13bd5d..5456c1bf0 100644
21--- a/testcases/network/nfs/nfs_stress/nfs05_make_tree.c
22+++ b/testcases/network/nfs/nfs_stress/nfs05_make_tree.c
23@@ -215,4 +215,5 @@ static struct tst_test test = {
24 .options = opts,
25 .test_all = do_test,
26 .setup = setup,
27+ .max_runtime = 300,
28 };
29--
302.37.1
31
diff --git a/meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch b/meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch
new file mode 100644
index 0000000000..1652f8c94e
--- /dev/null
+++ b/meta/recipes-extended/ltp/ltp/0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch
@@ -0,0 +1,44 @@
1From 9fb28002bb2ce988b99d1756ff7b902f76e3472a Mon Sep 17 00:00:00 2001
2From: Jan Stancek <jstancek@redhat.com>
3Date: Tue, 21 Jun 2022 10:37:17 +0200
4Subject: [PATCH] syscalls/migrate_pages03: restore runtime to 5m
5
6Arches with large pages have trouble completing all loops in 30s,
7restore runtime to 5m. Also check for remaining runtime and
8exit if we run out.
9
10Signed-off-by: Jan Stancek <jstancek@redhat.com>
11Reviewed-by: Cyril Hrubis <chrubis@suse.cz>
12Signed-off-by: Li Wang <liwang@redhat.com>
13Upstream-Status: Backport [9fb28002bb2ce988b99d1756ff7b902f76e3472a]
14---
15 testcases/kernel/syscalls/migrate_pages/migrate_pages03.c | 6 ++++++
16 1 file changed, 6 insertions(+)
17
18diff --git a/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c b/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c
19index c6afb4cce..2866c96e6 100644
20--- a/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c
21+++ b/testcases/kernel/syscalls/migrate_pages/migrate_pages03.c
22@@ -127,6 +127,11 @@ static void migrate_test(void)
23 tst_res(TFAIL | TERRNO, "migrate_pages() failed");
24 return;
25 }
26+
27+ if (!tst_remaining_runtime()) {
28+ tst_res(TINFO, "Out of runtime, exitting...");
29+ break;
30+ }
31 }
32 SAFE_SETEUID(0);
33
34@@ -134,6 +139,7 @@ static void migrate_test(void)
35 }
36
37 static struct tst_test test = {
38+ .max_runtime = 300,
39 .min_kver = "2.6.32",
40 .needs_root = 1,
41 .setup = setup,
42--
432.37.1
44
diff --git a/meta/recipes-extended/ltp/ltp_20220527.bb b/meta/recipes-extended/ltp/ltp_20220527.bb
index 094251ec81..d07563c4e1 100644
--- a/meta/recipes-extended/ltp/ltp_20220527.bb
+++ b/meta/recipes-extended/ltp/ltp_20220527.bb
@@ -29,6 +29,12 @@ SRC_URI = "git://github.com/linux-test-project/ltp.git;branch=master;protocol=ht
29 file://0001-Remove-OOM-tests-from-runtest-mm.patch \ 29 file://0001-Remove-OOM-tests-from-runtest-mm.patch \
30 file://disable_hanging_tests.patch \ 30 file://disable_hanging_tests.patch \
31 file://0001-kvm-use-LD-instead-of-hardcoding-ld.patch \ 31 file://0001-kvm-use-LD-instead-of-hardcoding-ld.patch \
32 file://0001-nfs05_make_tree-Restore-5-min-timeout.patch \
33 file://0001-syscalls-migrate_pages03-restore-runtime-to-5m.patch \
34 file://0001-mountns0-1-3-wait-for-umount-completed-in-thread_b.patch \
35 file://0001-netstress-Restore-runtime-to-5m.patch \
36 file://0001-net_stress-Fix-usage-of-variables-from-tst_net.sh.patch \
37 file://0001-memcg-functional-Fix-usage-of-PAGESIZE-from-memcg_li.patch \
32 " 38 "
33 39
34S = "${WORKDIR}/git" 40S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-06-02 05:00:43 +0000