Skip to content

Commit

Permalink
From patchwork series 431555
Browse files Browse the repository at this point in the history 
https://patchwork.ozlabs.org//project/linuxppc-dev/list/?series=431555
  • Loading branch information
Fox Snowpatch committed Nov 15, 2024
1 parent ad0be02 commit b790bf4
Show file tree
Hide file tree
Showing 29 changed files with 32 additions and 14 deletions.
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/alignment/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/cache_shape/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/copyloops/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/dexcr/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/dscr/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/lib/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/math/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/mce/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/mm/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
2 changes: 1 addition & 1 deletion tools/testing/selftests/powerpc/mm/stack_expansion_ldst.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ static int test(void)

page_size = getpagesize();
getrlimit(RLIMIT_STACK, &rlimit);
printf("Stack rlimit is 0x%lx\n", rlimit.rlim_cur);
printf("Stack rlimit is 0x%llx\n", (unsigned long long)rlimit.rlim_cur);

printf("Testing loads ...\n");
test_one_type(LOAD, page_size, rlimit.rlim_cur);
Expand Down
4 changes: 2 additions & 2 deletions tools/testing/selftests/powerpc/mm/subpage_prot.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,8 @@ int test_file(void)
perror("failed to map file");
return 1;
}
printf("allocated %s for 0x%lx bytes at %p\n",
file_name, filesize, fileblock);
printf("allocated %s for 0x%llx bytes at %p\n",
file_name, (long long)filesize, fileblock);

printf("testing file map...\n");

Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/nx-gzip/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/papr_attributes/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/papr_sysparm/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/papr_vpd/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
3 changes: 0 additions & 3 deletions tools/testing/selftests/powerpc/pmu/count_stcx_fail.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,9 +144,6 @@ static int test_body(void)
/* Run for 16Bi instructions */
FAIL_IF(do_count_loop(events, 16000000000, overhead, true));

/* Run for 64Bi instructions */
FAIL_IF(do_count_loop(events, 64000000000, overhead, true));

event_close(&events[0]);
event_close(&events[1]);

Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/pmu/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/primitives/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/ptrace/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/scripts/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
8 changes: 4 additions & 4 deletions tools/testing/selftests/powerpc/security/mitigation-patching.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ fi

tainted=$(cat /proc/sys/kernel/tainted)
if [[ "$tainted" -ne 0 ]]; then
echo "Error: kernel already tainted!" >&2
exit 1
echo "Warning: kernel already tainted! ($tainted)" >&2
fi

mitigations="barrier_nospec stf_barrier count_cache_flush rfi_flush entry_flush uaccess_flush"
Expand Down Expand Up @@ -68,9 +67,10 @@ fi
echo "Waiting for timeout ..."
wait

orig_tainted=$tainted
tainted=$(cat /proc/sys/kernel/tainted)
if [[ "$tainted" -ne 0 ]]; then
echo "Error: kernel became tainted!" >&2
if [[ "$tainted" != "$orig_tainted" ]]; then
echo "Error: kernel newly tainted, before ($orig_tainted) after ($tainted)" >&2
exit 1
fi

Expand Down
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/security/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
2 changes: 1 addition & 1 deletion tools/testing/selftests/powerpc/signal/sigfuz.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -321,5 +321,5 @@ int main(int argc, char **argv)
if (!args)
args = ARG_COMPLETE;

test_harness(signal_fuzzer, "signal_fuzzer");
return test_harness(signal_fuzzer, "signal_fuzzer");
}
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/stringloops/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/switch_endian/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/syscalls/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130
2 changes: 1 addition & 1 deletion tools/testing/selftests/powerpc/tm/tm-signal-context-force-tm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,5 +176,5 @@ int tm_signal_context_force_tm(void)

int main(int argc, char **argv)
{
test_harness(tm_signal_context_force_tm, "tm_signal_context_force_tm");
return test_harness(tm_signal_context_force_tm, "tm_signal_context_force_tm");
}
3 changes: 1 addition & 2 deletions tools/testing/selftests/powerpc/tm/tm-signal-sigreturn-nt.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,5 @@ int tm_signal_sigreturn_nt(void)

int main(int argc, char **argv)
{
test_harness(tm_signal_sigreturn_nt, "tm_signal_sigreturn_nt");
return test_harness(tm_signal_sigreturn_nt, "tm_signal_sigreturn_nt");
}

1 change: 1 addition & 0 deletions tools/testing/selftests/powerpc/vphn/settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
timeout=130

0 comments on commit b790bf4

Please sign in to comment.