iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Documentation/litmus-tests: Make cmpxchg() tests safe for klitmus

Browse Source 
The four litmus tests in Documentation/litmus-tests/atomic do not
declare all of their local variables.  Although this is just fine for LKMM
analysis by herd7, it causes build failures when run in-kernel by klitmus.
This commit therefore adjusts these tests to declare all local variables.

Reported-by: Andrea Parri <parri.andrea@gmail.com>
Signed-off-by: Paul E. McKenney <paulmck@kernel.org>
Acked-by: Andrea Parri <parri.andrea@gmail.com>
This commit is contained in:
Paul E. McKenney 2024-04-08 13:41:22 -07:00
parent d372e20433
commit 2ba5b4130e
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-1.litmus
View File

@ -23,6 +23,7 @@ P0(int *x, int *y, int *z)
P1(int *x, int *y, int *z) P1(int *x, int *y, int *z)
{ {
int r0; int r0;
int r1;
WRITE_ONCE(*y, 1); WRITE_ONCE(*y, 1);
r1 = cmpxchg(z, 1, 0); r1 = cmpxchg(z, 1, 0);

4
Documentation/litmus-tests/atomic/cmpxchg-fail-ordered-2.litmus
View File

@ -11,7 +11,6 @@ C cmpxchg-fail-ordered-2
P0(int *x, int *y) P0(int *x, int *y)
{ {
int r0;
int r1; int r1;
WRITE_ONCE(*x, 1); WRITE_ONCE(*x, 1);
@ -20,7 +19,8 @@ P0(int *x, int *y)
P1(int *x, int *y) P1(int *x, int *y)
{ {
int r0; int r1;
int r2;
r1 = cmpxchg(y, 0, 1); r1 = cmpxchg(y, 0, 1);
smp_mb__after_atomic(); smp_mb__after_atomic();

1
Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-1.litmus
View File

@ -23,6 +23,7 @@ P0(int *x, int *y, int *z)
P1(int *x, int *y, int *z) P1(int *x, int *y, int *z)
{ {
int r0; int r0;
int r1;
WRITE_ONCE(*y, 1); WRITE_ONCE(*y, 1);
r1 = cmpxchg(z, 1, 0); r1 = cmpxchg(z, 1, 0);

4
Documentation/litmus-tests/atomic/cmpxchg-fail-unordered-2.litmus
View File

@ -12,7 +12,6 @@ C cmpxchg-fail-unordered-2
P0(int *x, int *y) P0(int *x, int *y)
{ {
int r0;
int r1; int r1;
WRITE_ONCE(*x, 1); WRITE_ONCE(*x, 1);
@ -21,7 +20,8 @@ P0(int *x, int *y)
P1(int *x, int *y) P1(int *x, int *y)
{ {
int r0; int r1;
int r2;
r1 = cmpxchg(y, 0, 1); r1 = cmpxchg(y, 0, 1);
r2 = READ_ONCE(*x); r2 = READ_ONCE(*x);