On Fri, Jun 26, 2015 at 04:12:44PM +0200, git repository hosting wrote:
> Module: xenomai-jki
> Branch: for-forge
> Commit: 67a64e164b737759cc171d3b04b05770e1450cb6
> URL:
> http://git.xenomai.org/?p=xenomai-jki.git;a=commit;h=67a64e164b737759cc171d3b04b05770e1450cb6
>
> Author: Jan Kiszka <[email protected]>
> Date: Fri Jun 26 15:11:42 2015 +0200
>
> cobalt/kernel: Fix locking for xnthread info manipulations
>
> nklock must be held when manipulating bits of xnthread::info. Not all
> callsites of xnthread_set/clear_info follow this rule so far, directly
> or indirectly, fix them (and possibly some other races along this).
>
> Signed-off-by: Jan Kiszka <[email protected]>
>
> ---
>
> include/cobalt/kernel/rtdm/driver.h | 8 ++++----
> kernel/cobalt/posix/syscall.c | 5 +++++
> kernel/cobalt/synch.c | 2 ++
> kernel/cobalt/thread.c | 5 +++++
> 4 files changed, 16 insertions(+), 4 deletions(-)
>
> diff --git a/include/cobalt/kernel/rtdm/driver.h
> b/include/cobalt/kernel/rtdm/driver.h
> index c14198b..de476ca 100644
> --- a/include/cobalt/kernel/rtdm/driver.h
> +++ b/include/cobalt/kernel/rtdm/driver.h
> @@ -553,7 +553,7 @@ static inline void rtdm_lock_get(rtdm_lock_t *lock)
> {
> XENO_BUG_ON(COBALT, !spltest());
> spin_lock(lock);
> - __xnsched_lock();
> + xnsched_lock();
> }
>
> /**
> @@ -566,7 +566,7 @@ static inline void rtdm_lock_get(rtdm_lock_t *lock)
> static inline void rtdm_lock_put(rtdm_lock_t *lock)
> {
> spin_unlock(lock);
> - __xnsched_unlock();
> + xnsched_unlock();
> }
>
> /**
> @@ -584,7 +584,7 @@ static inline rtdm_lockctx_t
> __rtdm_lock_get_irqsave(rtdm_lock_t *lock)
>
> context = ipipe_test_and_stall_head();
> spin_lock(lock);
> - __xnsched_lock();
> + xnsched_lock();
>
> return context;
> }
> @@ -603,7 +603,7 @@ static inline
> void rtdm_lock_put_irqrestore(rtdm_lock_t *lock, rtdm_lockctx_t context)
> {
> spin_unlock(lock);
> - __xnsched_unlock();
> + xnsched_unlock();
> ipipe_restore_head(context);
> }
These changes are not without risk: is not there a risk of deadlock
if one thread calls rtdm_lock_get without holding the nklock and
another calls it while holding it?
--
Gilles.
https://click-hack.org
_______________________________________________
Xenomai mailing list
[email protected]
http://xenomai.org/mailman/listinfo/xenomai
