[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <20170821084236.hsxtqtmsno7aqnls@hirez.programming.kicks-ass.net>
Date: Mon, 21 Aug 2017 10:42:36 +0200
From: Peter Zijlstra <peterz@...radead.org>
To: Mathieu Desnoyers <mathieu.desnoyers@...icios.com>
Cc: "Paul E . McKenney" <paulmck@...ux.vnet.ibm.com>,
linux-kernel@...r.kernel.org, Boqun Feng <boqun.feng@...il.com>,
Andrew Hunter <ahh@...gle.com>,
Maged Michael <maged.michael@...il.com>, gromer@...gle.com,
Avi Kivity <avi@...lladb.com>,
Benjamin Herrenschmidt <benh@...nel.crashing.org>,
Paul Mackerras <paulus@...ba.org>,
Michael Ellerman <mpe@...erman.id.au>,
Dave Watson <davejwatson@...com>
Subject: Re: [PATCH v2] membarrier: Document scheduler barrier requirements
On Fri, Aug 18, 2017 at 09:39:16PM -0700, Mathieu Desnoyers wrote:
> @@ -3295,6 +3301,9 @@ static void __sched notrace __schedule(bool preempt)
> * Make sure that signal_pending_state()->signal_pending() below
> * can't be reordered with __set_current_state(TASK_INTERRUPTIBLE)
> * done by the caller to avoid the race with signal_wake_up().
> + *
> + * The membarrier system call requires a full memory barrier
> + * after coming from user-space, before storing to rq->curr.
> */
> smp_mb__before_spinlock();
> rq_lock(rq, &rf);
Merge conflict here, current tip is over to smp_mb__after_spinlock().
Powered by blists - more mailing lists