glebfm/strace
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

futex: recognise FUTEX_BITSET_MATCH_ANY bitmask

Browse Source 
* xlat/futexbitset.in: New file.
* futex.c: Include "xlat/futexbitset.h".
(futex) <FUTEX_WAIT_BITSET, FUTEX_WAKE_BITSET>: Decode val3 using
futexbitset xlat.
* tests/futex.c: Add checks for 0xffffffff bitset mask printing.

Closes: Linux commit v4.16-rc1~166^2^2~2
This commit is contained in:
Eugene Syromyatnikov 2018-08-29 22:18:36 +02:00 committed by Dmitry V. Levin
parent 8a56b8a1b7
commit c3ac40611c
3 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
futex.c
View File

@ -41,6 +41,7 @@
# define FUTEX_OP_OPARG_SHIFT 8
#endif
#include "xlat/futexbitset.h"
#include "xlat/futexops.h"
#include "xlat/futexwakeops.h"
#include "xlat/futexwakecmps.h"
@ -74,11 +75,13 @@ SYS_FUNC(futex)
tprintf(", %u", val);
tprints(", ");
print_timespec(tcp, timeout);
tprintf(", %#x", val3);
tprints(", ");
printxval(futexbitset, val3, NULL);
break;
case FUTEX_WAKE_BITSET:
tprintf(", %u", val);
tprintf(", %#x", val3);
tprints(", ");
printxval(futexbitset, val3, NULL);
break;
case FUTEX_REQUEUE:
tprintf(", %u", val);

16
tests/futex.c
View File

@ -166,6 +166,9 @@ void invalid_op(int *val, int op, uint32_t argmask, ...)
# define VAL3 ((unsigned long) 0xbadda7a09caffee1LLU)
# define VAL3_PR ((unsigned) VAL3)
# define VAL3A ((unsigned long) 0xbadda7a0ffffffffLLU)
# define VAL3A_PR "FUTEX_BITSET_MATCH_ANY"
int
main(int argc, char *argv[])
{
@ -288,6 +291,14 @@ main(int argc, char *argv[])
zero_extend_signed_to_ull(tmout->tv_nsec), VAL3_PR,
sprintrc(rc));
CHECK_FUTEX_ENOSYS(uaddr, FUTEX_WAIT_BITSET, VAL, tmout, uaddr2 + 1,
VAL3A, (rc == -1) && (errno == EAGAIN));
printf("futex(%p, FUTEX_WAIT_BITSET, %u, {tv_sec=%lld, tv_nsec=%llu}"
", %s) = %s\n",
uaddr, VAL_PR, (long long) tmout->tv_sec,
zero_extend_signed_to_ull(tmout->tv_nsec), VAL3A_PR,
sprintrc(rc));
/* val3 of 0 is invalid */
CHECK_FUTEX_ENOSYS(uaddr, FUTEX_WAIT_BITSET, VAL, tmout, uaddr2 + 1, 0,
(rc == -1) && (errno == EINVAL));
@ -375,6 +386,11 @@ main(int argc, char *argv[])
printf("futex(%p, FUTEX_WAKE_BITSET, %u, %#x) = %s\n", uaddr, 10,
VAL3_PR, sprintrc(rc));
CHECK_FUTEX_ENOSYS(uaddr, FUTEX_WAKE_BITSET, 10, NULL, NULL,
VAL3A, (rc == 0));
printf("futex(%p, FUTEX_WAKE_BITSET, %u, %s) = %s\n", uaddr, 10,
VAL3A_PR, sprintrc(rc));
/* bitset 0 is invalid */
CHECK_FUTEX_ENOSYS(uaddr, FUTEX_WAKE_BITSET, 10, NULL, NULL, 0,
(rc == -1) && (errno == EINVAL));

1
xlat/futexbitset.in Normal file
View File

@ -0,0 +1 @@
FUTEX_BITSET_MATCH_ANY 0xffffffff