From: Wanpeng Li <kernellwp@gmail.com>
To: "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
kvm <kvm@vger.kernel.org>
Cc: Wanpeng Li <wanpeng.li@hotmail.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Ingo Molnar <mingo@kernel.org>, Waiman Long <Waiman.Long@hpe.com>,
Davidlohr Bueso <dave@stgolabs.net>
Subject: Re: [PATCH v4] locking/pvqspinlock: Fix double hash race
Date: Tue, 19 Jul 2016 14:53:18 +0800 [thread overview]
Message-ID: <CANRm+CyK_OhQkM-KwDyBH=e7D-Koa8tsOi_AJbprF_QAYJE7Pw@mail.gmail.com> (raw)
In-Reply-To: <1468633869-4066-1-git-send-email-wanpeng.li@hotmail.com>
Sorry for the quick ping, but could we catch the merge window? Ingo. :)
2016-07-16 9:51 GMT+08:00 Wanpeng Li <kernellwp@gmail.com>:
> From: Wanpeng Li <wanpeng.li@hotmail.com>
>
> When the lock holder vCPU is racing with the queue head vCPU:
>
> lock holder vCPU queue head vCPU
> ===================== ==================
>
> node->locked = 1;
> <preemption> READ_ONCE(node->locked)
> ... pv_wait_head_or_lock():
> SPIN_THRESHOLD loop;
> pv_hash();
> lock->locked = _Q_SLOW_VAL;
> node->state = vcpu_hashed;
> pv_kick_node():
> cmpxchg(node->state,
> vcpu_halted, vcpu_hashed);
> lock->locked = _Q_SLOW_VAL;
> pv_hash();
>
> With preemption at the right moment, it is possible that both the
> lock holder and queue head vCPUs can be racing to set node->state
> which can result in hash entry race. Making sure the state is never
> set to vcpu_halted will prevent this racing from happening.
>
> This patch fix it by setting vcpu_hashed after we did all hash thing.
>
> Reviewed-by: Pan Xinhui <xinhui.pan@linux.vnet.ibm.com>
> Cc: Peter Zijlstra (Intel) <peterz@infradead.org>
> Cc: Ingo Molnar <mingo@kernel.org>
> Cc: Waiman Long <Waiman.Long@hpe.com>
> Cc: Davidlohr Bueso <dave@stgolabs.net>
> Signed-off-by: Wanpeng Li <wanpeng.li@hotmail.com>
> ---
> v3 -> v4:
> * update patch subject
> * add code comments
> v2 -> v3:
> * fix typo in patch description
> v1 -> v2:
> * adjust patch description
>
> kernel/locking/qspinlock_paravirt.h | 23 ++++++++++++++++++++++-
> 1 file changed, 22 insertions(+), 1 deletion(-)
>
> diff --git a/kernel/locking/qspinlock_paravirt.h b/kernel/locking/qspinlock_paravirt.h
> index 21ede57..ca96db4 100644
> --- a/kernel/locking/qspinlock_paravirt.h
> +++ b/kernel/locking/qspinlock_paravirt.h
> @@ -450,7 +450,28 @@ pv_wait_head_or_lock(struct qspinlock *lock, struct mcs_spinlock *node)
> goto gotlock;
> }
> }
> - WRITE_ONCE(pn->state, vcpu_halted);
> + /*
> + * lock holder vCPU queue head vCPU
> + * ---------------- ---------------
> + * node->locked = 1;
> + * <preemption> READ_ONCE(node->locked)
> + * ... pv_wait_head_or_lock():
> + * SPIN_THRESHOLD loop;
> + * pv_hash();
> + * lock->locked = _Q_SLOW_VAL;
> + * node->state = vcpu_hashed;
> + * pv_kick_node():
> + * cmpxchg(node->state,
> + * vcpu_halted, vcpu_hashed);
> + * lock->locked = _Q_SLOW_VAL;
> + * pv_hash();
> + *
> + * With preemption at the right moment, it is possible that both the
> + * lock holder and queue head vCPUs can be racing to set node->state.
> + * Making sure the state is never set to vcpu_halted will prevent this
> + * racing from happening.
> + */
> + WRITE_ONCE(pn->state, vcpu_hashed);
> qstat_inc(qstat_pv_wait_head, true);
> qstat_inc(qstat_pv_wait_again, waitcnt);
> pv_wait(&l->locked, _Q_SLOW_VAL);
> --
> 2.1.0
>
--
Regards,
Wanpeng Li
prev parent reply other threads:[~2016-07-19 6:53 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-16 1:51 [PATCH v4] locking/pvqspinlock: Fix double hash race Wanpeng Li
2016-07-16 20:03 ` Davidlohr Bueso
2016-07-25 10:30 ` Wanpeng Li
2016-07-19 6:53 ` Wanpeng Li [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CANRm+CyK_OhQkM-KwDyBH=e7D-Koa8tsOi_AJbprF_QAYJE7Pw@mail.gmail.com' \
--to=kernellwp@gmail.com \
--cc=Waiman.Long@hpe.com \
--cc=dave@stgolabs.net \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=wanpeng.li@hotmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).