commit cfafcd117 "futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()" causes glibc nptl/tst-robustpi8 failure
Since:
commit cfafcd117da0216520568c195cb2f6cd1980c4bb
Author: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100
futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()
glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8: ../nptl/pthread_mutex_lock.c:424: __pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e, __err) != ESRCH || !robust' failed.
pthread_mutex_lock.c:
415 if (INTERNAL_SYSCALL_ERROR_P (e, __err)
416 && (INTERNAL_SYSCALL_ERRNO (e, __err) == ESRCH
417 || INTERNAL_SYSCALL_ERRNO (e, __err) == EDEADLK))
418 {
419 assert (INTERNAL_SYSCALL_ERRNO (e, __err) != EDEADLK
420 || (kind != PTHREAD_MUTEX_ERRORCHECK_NP
421 && kind != PTHREAD_MUTEX_RECURSIVE_NP));
422 /* ESRCH can happen only for non-robust PI mutexes where
423 the owner of the lock died. */
424 assert (INTERNAL_SYSCALL_ERRNO (e, __err) != ESRCH || !robust);
During bisection the commit above hangs the machine when I run the testcase.
See: https://sourceware.org/bugzilla/show_bug.cgi?id=21487
--
Markus
Quoted 24 lines · Markus Trippelsdorf
Since:
commitcfafcd117da0216520568c195cb2f6cd1980c4bbAuthor: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100futex: Rework
futex_lock_pi()to use rt_mutex_*_proxy_lock()glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8:../nptl/pthread_mutex_lock.c:424:__pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e,__err) != ESRCH || !robust' failed.
pthread_mutex_lock.c:
415 if (INTERNAL_SYSCALL_ERROR_P(e,__err)
416 && (INTERNAL_SYSCALL_ERRNO(e,__err) == ESRCH
417 ||INTERNAL_SYSCALL_ERRNO(e,__err) == EDEADLK))
418 {
419 assert (INTERNAL_SYSCALL_ERRNO(e,__err) != EDEADLK
420 || (kind !=PTHREAD_MUTEX_ERRORCHECK_NP
421 && kind !=PTHREAD_MUTEX_RECURSIVE_NP));
422 /* ESRCH can happen only for non-robust PI mutexes where
423 the owner of the lock died. */
424 assert (INTERNAL_SYSCALL_ERRNO(e,__err) != ESRCH || !robust);
Quoted 4 lines
During bisection the commit above hangs the machine when I run the testcase.
Markus, could you confirm that it is chocking on the EAGAIN failure? Or is it something else?
What is userspace supposed to do with the error code?
Thanks,
Florian
Peter Zijlstra
maintainerQuoted 28 lines · Florian Weimer
Quoted 27 lines · Markus Trippelsdorf
Since:
commitcfafcd117da0216520568c195cb2f6cd1980c4bbAuthor: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100futex: Rework
futex_lock_pi()to use rt_mutex_*_proxy_lock()glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8:../nptl/pthread_mutex_lock.c:424:__pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e,__err) != ESRCH || !robust' failed.
pthread_mutex_lock.c:
415 if (INTERNAL_SYSCALL_ERROR_P(e,__err)
416 && (INTERNAL_SYSCALL_ERRNO(e,__err) == ESRCH
417 ||INTERNAL_SYSCALL_ERRNO(e,__err) == EDEADLK))
418 {
419 assert (INTERNAL_SYSCALL_ERRNO(e,__err) != EDEADLK
420 || (kind !=PTHREAD_MUTEX_ERRORCHECK_NP
421 && kind !=PTHREAD_MUTEX_RECURSIVE_NP));
422 /* ESRCH can happen only for non-robust PI mutexes where
423 the owner of the lock died. */
424 assert (INTERNAL_SYSCALL_ERRNO(e,__err) != ESRCH || !robust);During bisection the commit above hangs the machine when I run the testcase.
Quoted 6 lines
Quoted 1 line
Markus, could you confirm that it is chocking on the EAGAIN failure? Or is it something else?
What is userspace supposed to do with the error code?
IIRC that -EAGAIN should not get to userspace. The kernel should retry the lock operation. I'll go stare at it.
Peter Zijlstra
maintainerQuoted 31 lines · Peter Zijlstra
Quoted 30 lines · Florian Weimer
Quoted 28 lines · Markus Trippelsdorf
Since:
commitcfafcd117da0216520568c195cb2f6cd1980c4bbAuthor: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100futex: Rework
futex_lock_pi()to use rt_mutex_*_proxy_lock()glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8:../nptl/pthread_mutex_lock.c:424:__pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e,__err) != ESRCH || !robust' failed.
pthread_mutex_lock.c:
415 if (INTERNAL_SYSCALL_ERROR_P(e,__err)
416 && (INTERNAL_SYSCALL_ERRNO(e,__err) == ESRCH
417 ||INTERNAL_SYSCALL_ERRNO(e,__err) == EDEADLK))
418 {
419 assert (INTERNAL_SYSCALL_ERRNO(e,__err) != EDEADLK
420 || (kind !=PTHREAD_MUTEX_ERRORCHECK_NP
421 && kind !=PTHREAD_MUTEX_RECURSIVE_NP));
422 /* ESRCH can happen only for non-robust PI mutexes where
423 the owner of the lock died. */
424 assert (INTERNAL_SYSCALL_ERRNO(e,__err) != ESRCH || !robust);During bisection the commit above hangs the machine when I run the testcase.
Quoted 7 lines
Quoted 4 lines
Markus, could you confirm that it is chocking on the EAGAIN failure? Or is it something else?
What is userspace supposed to do with the error code?
IIRC that
-EAGAINshould not get to userspace. The kernel should retry the lock operation. I'll go stare at it.
So commit:
bebe5b514345 ("futex: Futex_unlock_pi() determinism")
put a WARN_ON_ONCE() on that -EAGAIN condition, and since that doesn't appear to be triggering, I suspect something else is buggered.
Peter Zijlstra
maintainerQuoted 11 lines · Markus Trippelsdorf
Since:
commitcfafcd117da0216520568c195cb2f6cd1980c4bbAuthor: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100futex: Rework
futex_lock_pi()to use rt_mutex_*_proxy_lock()glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8:../nptl/pthread_mutex_lock.c:424:__pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e,__err) != ESRCH || !robust' failed.
OK, so how do I get those tests build?
I did a checkout of glibc.git
glibc$ mkdir build; cd build
build$ ../configure --disable-sanity-checks ; make -j40 build$ ./nptl/tst-robustpi8
-bash: ./nptl/tst-robustpi8: No such file or directory
"make tests" doesn't seem to work either even though its a build target listed in the Makefiles.
What magic incantation do I need?
Quoted 22 lines · Peter Zijlstra
Quoted 11 lines · Markus Trippelsdorf
Since:
commitcfafcd117da0216520568c195cb2f6cd1980c4bbAuthor: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100futex: Rework
futex_lock_pi()to use rt_mutex_*_proxy_lock()glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8:../nptl/pthread_mutex_lock.c:424:__pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e,__err) != ESRCH || !robust' failed.OK, so how do I get those tests build?
I did a checkout of glibc.git
glibc$ mkdir build; cd build
build$ ../configure --disable-sanity-checks ; make -j40 build$ ./nptl/tst-robustpi8
-bash: ./nptl/tst-robustpi8: No such file or directory
Quoted 4 lines
"make tests" doesn't seem to work either even though its a build target listed in the Makefiles.
What magic incantation do I need?
Something like:
% ~/glibc/configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --with-headers=/usr/include --enable-add-ons --enable-kernel=4.10 --with-tls --with-__thread --enable-bind-now --without-gd --without-cvs --disable-profile --disable-multi-arch --disable-werror % make -j128
% make -j128 check
But I've attached the testcase, so building should be unnecessary.
Signature · 1 line
Markus
Peter Zijlstra
maintainerQuoted 23 lines · Markus Trippelsdorf
Quoted 22 lines · Peter Zijlstra
Quoted 11 lines · Markus Trippelsdorf
Since:
commitcfafcd117da0216520568c195cb2f6cd1980c4bbAuthor: Peter Zijlstra <[email protected]> Date: Wed Mar 22 11:35:58 2017 +0100futex: Rework
futex_lock_pi()to use rt_mutex_*_proxy_lock()glibc's nptl/tst-robustpi8 testcase fails:
glibc-build % ./nptl/tst-robustpi8
tst-robustpi8:../nptl/pthread_mutex_lock.c:424:__pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e,__err) != ESRCH || !robust' failed.OK, so how do I get those tests build?
I did a checkout of glibc.git
glibc$ mkdir build; cd build
build$ ../configure --disable-sanity-checks ; make -j40 build$ ./nptl/tst-robustpi8
-bash: ./nptl/tst-robustpi8: No such file or directory
Quoted 8 lines
Quoted 4 lines
"make tests" doesn't seem to work either even though its a build target listed in the Makefiles.
What magic incantation do I need?
Something like:
% ~/glibc/configure --prefix=/usr --libdir=/usr/lib --libexecdir=/usr/lib --with-headers=/usr/include --enable-add-ons --enable-kernel=4.10 --with-tls --with-__thread --enable-bind-now --without-gd --without-cvs --disable-profile --disable-multi-arch --disable-werror
I specifically didn't want to set --prefix=/usr etc.. because I didn't want to run any risk of the thing actually installing and wrecking my system, I'll try the other bits through.
Quoted 2 lines
% make -j128
% make -j128 check
make check is failing here:
/usr/local/src/glibc/build/math/test-ldouble-carg.o -MD -MP -MF /usr/local/src/glibc/build/math/test-ldouble-carg.o.dt -MT /usr/local/src/glibc/build/math/test-ldouble-carg.o /usr/bin/ld: /usr/local/src/glibc/build/math/test-math-iszero.o: relocation R_X86_64_32S against `.text' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: Nonrepresentable section on output
collect2: error: ld returned 1 exit status
Quoted 1 line
But I've attached the testcase, so building should be unnecessary.
Thanks..
Quoted 11 lines · Peter Zijlstra
OK, so how do I get those tests build?
I did a checkout of glibc.git
glibc$ mkdir build; cd build
build$ ../configure --disable-sanity-checks ; make -j40 build$ ./nptl/tst-robustpi8
-bash: ./nptl/tst-robustpi8: No such file or directory"make tests" doesn't seem to work either even though its a build target listed in the Makefiles.
This builds the nptl test:
make subdirs=nptl run-built-tests=no
To run a single test, use this:
bash -x testrun.sh nptl/tst-robustpi8
This is required because the test might not be compatible with the installed glibc (some nptl tests are whitebox tests). You can feed the command line printed due to “bash -x” into strace or a debugger. The environment variable settings aren't necessary for most tests.
Thanks,
Florian
Peter Zijlstra
maintainerQuoted 10 lines · Florian Weimer
Quoted 9 lines · Peter Zijlstra
OK, so how do I get those tests build?
I did a checkout of glibc.git
glibc$ mkdir build; cd build
build$ ../configure --disable-sanity-checks ; make -j40 build$ ./nptl/tst-robustpi8
-bash: ./nptl/tst-robustpi8: No such file or directory
Quoted 6 lines
Quoted 2 lines
"make tests" doesn't seem to work either even though its a build target listed in the Makefiles.
This builds the nptl test:
make subdirs=nptl run-built-tests=no
That more or less worked, it still failed:
/usr/bin/ld: /usr/local/src/glibc/build/nptl/tst-once5.o: relocation R_X86_64_32 against `.text' can not be used when making a shared object; recompile with -fPIC /usr/bin/ld: final link failed: Nonrepresentable section on output
collect2: error: ld returned 1 exit status
But it does that after building the tst-robustpi8 thing, so I seem to have all I need here.
Quoted 8 lines
To run a single test, use this:
bash -x
testrun.shnptl/tst-robustpi8This is required because the test might not be compatible with the installed glibc (some nptl tests are whitebox tests). You can feed the command line printed due to “bash -x” into strace or a debugger. The environment variable settings aren't necessary for most tests.
Indeed, that seems to work:
$ ./elf/ld-linux-x86-64.so.2 --library-path .:./math:./elf:./dlfcn:./nss:./nis:./rt:./resolv:./crypt:./mathvec:./support:./nptl ./nptl/tst-robustpi8 tst-robustpi8: ../nptl/pthread_mutex_lock.c:424: __pthread_mutex_lock_full: Assertion `INTERNAL_SYSCALL_ERRNO (e, __err) != ESRCH || !robust' failed.
Quoted 5 lines · Peter Zijlstra
That more or less worked, it still failed:
/usr/bin/ld:/usr/local/src/glibc/build/nptl/tst-once5.o: relocationR_X86_64_32against `.text' can not be used when making a shared object; recompile with -fPIC/usr/bin/ld: final link failed: Nonrepresentable section on output
collect2: error: ld returned 1 exit status
I think this is a bug in the binutils version shipping with Debian jessie.
Quoted 2 lines
But it does that after building the tst-robustpi8 thing, so I seem to have all I need here.
Great, have fun figuring out what's going on. :-/
Thanks,
Florian
Peter Zijlstra
maintainerQuoted 8 lines · Florian Weimer
Quoted 5 lines · Peter Zijlstra
That more or less worked, it still failed:
/usr/bin/ld:/usr/local/src/glibc/build/nptl/tst-once5.o: relocationR_X86_64_32against `.text' can not be used when making a shared object; recompile with -fPIC/usr/bin/ld: final link failed: Nonrepresentable section on output
collect2: error: ld returned 1 exit statusI think this is a bug in the binutils version shipping with Debian jessie.
I am indeed on debian/testing (which is jessie just now I think), I'll apt-get upgrade to see if its fixed, otherwise, I'll just have to live with it for now.
Quoted 8 lines · Peter Zijlstra
Quoted 7 lines · Florian Weimer
Quoted 5 lines · Peter Zijlstra
That more or less worked, it still failed:
/usr/bin/ld:/usr/local/src/glibc/build/nptl/tst-once5.o: relocationR_X86_64_32against `.text' can not be used when making a shared object; recompile with -fPIC/usr/bin/ld: final link failed: Nonrepresentable section on output
collect2: error: ld returned 1 exit status
Quoted 5 lines
Quoted 1 line
I think this is a bug in the binutils version shipping with Debian jessie.
I am indeed on debian/testing (which is jessie just now I think), I'll apt-get upgrade to see if its fixed, otherwise, I'll just have to live with it for now.
Careful. It's fixed in *current* debian/testing (stretch), so a very large upgrade might be waiting for you.
Florian
Peter Zijlstra
maintainerQuoted 6 lines · Florian Weimer
Quoted 2 lines · Peter Zijlstra
But it does that after building the tst-robustpi8 thing, so I seem to have all I need here.
Great, have fun figuring out what's going on. :-/
ld-linux-x86-64-2165 [018] .... 290.235869: sched_process_fork: comm=ld-linux-x86-64 pid=2165 child_comm=ld-linux-x86-64 child_pid=2166 ld-linux-x86-64-2166 [019] .... 290.436398: handle_futex_death: 00007f066634e870: 876 -> 40000000 ld-linux-x86-64-2166 [019] .... 290.436399: handle_futex_death: 00007f066634e0c8: 876 -> 40000000 ld-linux-x86-64-2166 [019] .... 290.436400: handle_futex_death: 00007f066634ee38: 80000876 -> c0000000 ld-linux-x86-64-2166 [019] .... 290.436401: sched_process_exit: comm=ld-linux-x86-64 pid=2166 prio=120 ld-linux-x86-64-2164 [019] ...1 290.436546: attach_to_pi_owner: 2: 00007f066634e078 = 80000876
ld-linux-x86-64-2183 [026] .... 827.987914: sched_process_fork: comm=ld-linux-x86-64 pid=2183 child_comm=ld-linux-x86-64 child_pid=2187 ld-linux-x86-64-2187 [029] .... 828.188218: handle_futex_death: 00007f76dd361690: 88b -> 40000000 ld-linux-x86-64-2187 [029] .... 828.188219: handle_futex_death: 00007f76dd361898: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188220: handle_futex_death: 00007f76dd3615c8: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188220: handle_futex_death: 00007f76dd3612d0: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188220: handle_futex_death: 00007f76dd361af0: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188221: handle_futex_death: 00007f76dd361168: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188222: sched_process_exit: comm=ld-linux-x86-64 pid=2187 prio=120 ld-linux-x86-64-2182 [019] ...1 828.188373: attach_to_pi_owner: 2: 00007f76dd361000 = 8000088b
In both cases we fail in FUTEX_LOCK_PI trying to acquire a futex owned by a dead task, resulting in the -ESRCH.
Now, pthread_mutex_lock() isn't expecting -ESRCH for robust futexes, because for robust we'd expect handle_futex_death() to clear out the futex value and set OWNER_DIED, as can be seen above.
The problem is however that the futex address we fail on, doesn't appear to have been fixed up, so its either not on the robust list, or the robust list got broken.
I'll see if I can narrow that down a little more.
Peter Zijlstra
maintainerQuoted 35 lines · Peter Zijlstra
Quoted 6 lines · Florian Weimer
Quoted 2 lines · Peter Zijlstra
But it does that after building the tst-robustpi8 thing, so I seem to have all I need here.
Great, have fun figuring out what's going on. :-/
ld-linux-x86-64-2165 [018] .... 290.235869: sched_process_fork: comm=ld-linux-x86-64 pid=2165 child_comm=ld-linux-x86-64 child_pid=2166 ld-linux-x86-64-2166 [019] .... 290.436398: handle_futex_death: 00007f066634e870: 876 -> 40000000 ld-linux-x86-64-2166 [019] .... 290.436399: handle_futex_death: 00007f066634e0c8: 876 -> 40000000 ld-linux-x86-64-2166 [019] .... 290.436400: handle_futex_death: 00007f066634ee38: 80000876 -> c0000000 ld-linux-x86-64-2166 [019] .... 290.436401: sched_process_exit: comm=ld-linux-x86-64 pid=2166 prio=120 ld-linux-x86-64-2164 [019] ...1 290.436546: attach_to_pi_owner: 2: 00007f066634e078 = 80000876ld-linux-x86-64-2183 [026] .... 827.987914: sched_process_fork: comm=ld-linux-x86-64 pid=2183 child_comm=ld-linux-x86-64 child_pid=2187 ld-linux-x86-64-2187 [029] .... 828.188218: handle_futex_death: 00007f76dd361690: 88b -> 40000000 ld-linux-x86-64-2187 [029] .... 828.188219: handle_futex_death: 00007f76dd361898: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188220: handle_futex_death: 00007f76dd3615c8: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188220: handle_futex_death: 00007f76dd3612d0: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188220: handle_futex_death: 00007f76dd361af0: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188221: handle_futex_death: 00007f76dd361168: 8000088b -> c0000000 ld-linux-x86-64-2187 [029] .... 828.188222: sched_process_exit: comm=ld-linux-x86-64 pid=2187 prio=120 ld-linux-x86-64-2182 [019] ...1 828.188373: attach_to_pi_owner: 2: 00007f76dd361000 = 8000088bIn both cases we fail in
FUTEX_LOCK_PItrying to acquire a futex owned by a dead task, resulting in the-ESRCH.
Quoted 7 lines
Now,
pthread_mutex_lock()isn't expecting-ESRCHfor robust futexes, because for robust we'd expecthandle_futex_death()to clear out the futex value and setOWNER_DIED, as can be seen above.The problem is however that the futex address we fail on, doesn't appear to have been fixed up, so its either not on the robust list, or the robust list got broken.
The robust list walk finishes without issue. So no premature terminations. The address really isn't on it.
Peter Zijlstra
maintainerQuoted 6 lines · Florian Weimer
Quoted 2 lines · Peter Zijlstra
But it does that after building the tst-robustpi8 thing, so I seem to have all I need here.
Great, have fun figuring out what's going on. :-/
Please test the below, it cures things for me.
---
Subject: futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()
Markus reported that the glibc/nptl/tst-robustpi8 test was failing after commit:
cfafcd117da0 ("futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()")
Much tracing later I managed to catch the culprit:
ld-linux-x86-64-2161 [019] .... 410.760971: SyS_futex: 00007ffbeb76b028: 80000875 op=FUTEX_LOCK_PI ld-linux-x86-64-2161 [019] ...1 410.760972: lock_pi_update_atomic: 00007ffbeb76b028: curval=80000875 uval=80000875 newval=80000875 ret=0 ld-linux-x86-64-2165 [011] .... 410.760978: SyS_futex: 00007ffbeb76b028: 80000875 op=FUTEX_UNLOCK_PI ld-linux-x86-64-2165 [011] d..1 410.760979: do_futex: 00007ffbeb76b028: curval=80000875 uval=80000875 newval=80000871 ret=0 ld-linux-x86-64-2165 [011] .... 410.760980: SyS_futex: 00007ffbeb76b028: 80000871 ret=0000 ld-linux-x86-64-2161 [019] .... 410.760980: SyS_futex: 00007ffbeb76b028: 80000871 ret=ETIMEDOUT
What we see here is 2165 doing an UNLOCK_PI, assigning the lock to the pending 2161 which then returns with -ETIMEDOUT.
That wrecks the lock state, because now the owner isn't aware it acquired the lock and we remove the pending robust list entry.
If we then kill 2161, the robust list will not clear out this futex and the subsequent acquire on this futex will then (correctly) result in -ESRCH which is unexpected by glibc which then triggers an internal assertion and dies.
Thomas spotted the bug in rt_mutex_cleanup_proxy_lock(). I had overlooked that mark_wakeup_next_waiter() results in !rt_mutex_owner() instead of it pointing to the (next) task. This is to allow lock stealing.
This means that we need to do a try_to_take_rt_mutex() call in order to set rt_mutex_owner() before we test to see if its ours.
While there, fix what looks like a merge error which resulted in rt_mutex_cleanup_proxy_lock() having two calls to fixup_rt_mutex_waiters() and rt_mutex_wait_proxy_lock() not having any. Both should have one, since both potentially touch the waiter list.
--- kernel/locking/rtmutex.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
kernel/locking/rtmutex.c +18 -6
@@ -1785,12 +1785,14 @@ int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,int ret;raw_spin_lock_irq (&lock->wait_lock); - -set_current_state (TASK_INTERRUPTIBLE ); -/* sleep on the mutex */ +set_current_state (TASK_INTERRUPTIBLE ); ret =__rt_mutex_slowlock (lock,TASK_INTERRUPTIBLE , to, waiter); - +/* +* try_to_take_rt_mutex() sets the waiter bit unconditionally. We might +* have to fix that up. +*/ +fixup_rt_mutex_waiters (lock);raw_spin_unlock_irq (&lock->wait_lock);return ret;
@@ -1822,15 +1824,25 @@ bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,raw_spin_lock_irq (&lock->wait_lock);/* +* Do an unconditional try-lock, this deals with the lock stealing +* state where __rt_mutex_futex_unlock() -> mark_wakeup_next_waiter() +* sets a NULL owner. +* +* We're not interested in the return value, because the subsequent +* test on rt_mutex_owner() will infer that. If the trylock succeeded, +* we will own the lock and it will have removed the waiter. If we +* failed the trylock, we're still not owner and we need to remove +* ourselves. +*/ +try_to_take_rt_mutex (lock, current, waiter); +/* * Unless we're the owner; we're still enqueued on the wait_list. * So check if we became owner, if not, take us off the wait_list. */ if (rt_mutex_owner (lock) != current) {remove_waiter (lock, waiter); -fixup_rt_mutex_waiters (lock); cleanup = true; } -/* * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might * have to fix that up.
Peter Zijlstra
maintainerQuoted 5 lines · Peter Zijlstra
Markus reported that the glibc/nptl/tst-robustpi8 test was failing after commit:
cfafcd117da0("futex: Reworkfutex_lock_pi()to use rt_mutex_*_proxy_lock()")
Quoted 8 lines
Much tracing later I managed to catch the culprit:
ld-linux-x86-64-2161 [019] .... 410.760971: SyS_futex: 00007ffbeb76b028: 80000875 op=FUTEX_LOCK_PI ld-linux-x86-64-2161 [019] ...1 410.760972: lock_pi_update_atomic: 00007ffbeb76b028: curval=80000875 uval=80000875 newval=80000875 ret=0 ld-linux-x86-64-2165 [011] .... 410.760978: SyS_futex: 00007ffbeb76b028: 80000875 op=FUTEX_UNLOCK_PI ld-linux-x86-64-2165 [011] d..1 410.760979: do_futex: 00007ffbeb76b028: curval=80000875 uval=80000875 newval=80000871 ret=0 ld-linux-x86-64-2165 [011] .... 410.760980: SyS_futex: 00007ffbeb76b028: 80000871 ret=0000 ld-linux-x86-64-2161 [019] .... 410.760980: SyS_futex: 00007ffbeb76b028: 80000871 ret=ETIMEDOUT
The above trace continues like:
ld-linux-x86-64-2164 [006] .... 410.762336: SyS_futex: 00007ffbeb76b028: 80000871 op=FUTEX_LOCK_PI ld-linux-x86-64-2164 [006] ...1 410.762337: lock_pi_update_atomic: 00007ffbeb76b028: curval=80000871 uval=80000871 newval=80000871 ret=0 ld-linux-x86-64-2164 [006] .... 410.762347: SyS_futex: 00007ffbeb76b028: 80000871 ret=ETIMEDOUT ld-linux-x86-64-2161 [019] .... 410.762521: SyS_futex: 00007ffbeb76b028: 80000871 op=FUTEX_LOCK_PI ld-linux-x86-64-2161 [019] .... 410.762522: SyS_futex: 00007ffbeb76b028: 80000871 ret=EDEADLK
And every subsequent attempt by 2161 will (obviously) return EDEADLK.
Now since the test explicitly tracks the lock state[] and pthread_mutex_*lock() return values this _should_ have triggered one of the printf()'s, but I never saw any of those.
Quoted 9 lines · Peter Zijlstra
Quoted 6 lines · Florian Weimer
Quoted 2 lines · Peter Zijlstra
But it does that after building the tst-robustpi8 thing, so I seem to have all I need here.
Great, have fun figuring out what's going on. :-/
Please test the below, it cures things for me.
Thanks. The glibc testsuite now finishes without any failure.
Signature · 1 line
Markus
tip-bot for Peter Zijlstra
merge bot[tip:locking/urgent] futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()
In reply to Peter Zijlstrafutex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()
Commit-ID: 04dc1b2fff4e96cb4142227fbdc63c8871ad4ed9 Gitweb: http://git.kernel.org/tip/04dc1b2fff4e96cb4142227fbdc63c8871ad4ed9 Author: Peter Zijlstra <[email protected]> AuthorDate: Fri, 19 May 2017 17:48:50 +0200 Committer: Thomas Gleixner <[email protected]> CommitDate: Mon, 22 May 2017 21:57:18 +0200
futex,rt_mutex: Fix rt_mutex_cleanup_proxy_lock()
Markus reported that the glibc/nptl/tst-robustpi8 test was failing after commit:
cfafcd117da0 ("futex: Rework futex_lock_pi() to use rt_mutex_*_proxy_lock()")
The following trace shows the problem:
ld-linux-x86-64-2161 [019] .... 410.760971: SyS_futex: 00007ffbeb76b028: 80000875 op=FUTEX_LOCK_PI ld-linux-x86-64-2161 [019] ...1 410.760972: lock_pi_update_atomic: 00007ffbeb76b028: curval=80000875 uval=80000875 newval=80000875 ret=0 ld-linux-x86-64-2165 [011] .... 410.760978: SyS_futex: 00007ffbeb76b028: 80000875 op=FUTEX_UNLOCK_PI ld-linux-x86-64-2165 [011] d..1 410.760979: do_futex: 00007ffbeb76b028: curval=80000875 uval=80000875 newval=80000871 ret=0 ld-linux-x86-64-2165 [011] .... 410.760980: SyS_futex: 00007ffbeb76b028: 80000871 ret=0000 ld-linux-x86-64-2161 [019] .... 410.760980: SyS_futex: 00007ffbeb76b028: 80000871 ret=ETIMEDOUT
Task 2165 does an UNLOCK_PI, assigning the lock to the waiter task 2161 which then returns with -ETIMEDOUT. That wrecks the lock state, because now the owner isn't aware it acquired the lock and removes the pending robust list entry.
If 2161 is killed, the robust list will not clear out this futex and the subsequent acquire on this futex will then (correctly) result in -ESRCH which is unexpected by glibc, triggers an internal assertion and dies.
Task 2161 Task 2165
rt_mutex_wait_proxy_lock()
timeout();
/* T2161 is still queued in the waiter list */ return -ETIMEDOUT;
futex_unlock_pi()
spin_lock(hb->lock);
rtmutex_unlock()
remove_rtmutex_waiter(T2161);
mark_lock_available();
/* Make the next waiter owner of the user space side */
futex_uval = 2161;
spin_unlock(hb->lock);
spin_lock(hb->lock);
rt_mutex_cleanup_proxy_lock()
if (rtmutex_owner() !== current)
...
return FAIL;....
return -ETIMEOUT;
This means that rt_mutex_cleanup_proxy_lock() needs to call try_to_take_rt_mutex() so it can take over the rtmutex correctly which was assigned by the waker. If the rtmutex is owned by some other task then this call is harmless and just confirmes that the waiter is not able to acquire it.
While there, fix what looks like a merge error which resulted in rt_mutex_cleanup_proxy_lock() having two calls to fixup_rt_mutex_waiters() and rt_mutex_wait_proxy_lock() not having any. Both should have one, since both potentially touch the waiter list.
--- kernel/locking/rtmutex.c | 24 ++++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-)
kernel/locking/rtmutex.c +18 -6
@@ -1785,12 +1785,14 @@ int rt_mutex_wait_proxy_lock(struct rt_mutex *lock,int ret;raw_spin_lock_irq (&lock->wait_lock); - -set_current_state (TASK_INTERRUPTIBLE ); -/* sleep on the mutex */ +set_current_state (TASK_INTERRUPTIBLE ); ret =__rt_mutex_slowlock (lock,TASK_INTERRUPTIBLE , to, waiter); - +/* +* try_to_take_rt_mutex() sets the waiter bit unconditionally. We might +* have to fix that up. +*/ +fixup_rt_mutex_waiters (lock);raw_spin_unlock_irq (&lock->wait_lock);return ret;
@@ -1822,15 +1824,25 @@ bool rt_mutex_cleanup_proxy_lock(struct rt_mutex *lock,raw_spin_lock_irq (&lock->wait_lock);/* +* Do an unconditional try-lock, this deals with the lock stealing +* state where __rt_mutex_futex_unlock() -> mark_wakeup_next_waiter() +* sets a NULL owner. +* +* We're not interested in the return value, because the subsequent +* test on rt_mutex_owner() will infer that. If the trylock succeeded, +* we will own the lock and it will have removed the waiter. If we +* failed the trylock, we're still not owner and we need to remove +* ourselves. +*/ +try_to_take_rt_mutex (lock, current, waiter); +/* * Unless we're the owner; we're still enqueued on the wait_list. * So check if we became owner, if not, take us off the wait_list. */ if (rt_mutex_owner (lock) != current) {remove_waiter (lock, waiter); -fixup_rt_mutex_waiters (lock); cleanup = true; } -/* * try_to_take_rt_mutex() sets the waiter bit unconditionally. We might * have to fix that up.