[PATCH 2/7 linux-next] mISDN: replace current->state by set_current_state()

[PATCH 2/7 linux-next] mISDN: replace current->state by set_current_state()

[Fabian Frederick]

Use helper function to access current->state.
Direct assignments are prone to races and therefore buggy.

Thanks to Peter Zijlstra for the exact definition of the problem.

Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/isdn/hardware/mISDN/hfcpci.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/isdn/hardware/mISDN/hfcpci.c b/drivers/isdn/hardware/mISDN/hfcpci.c
index 3c92780..ff48da6 100644
--- a/drivers/isdn/hardware/mISDN/hfcpci.c
+++ b/drivers/isdn/hardware/mISDN/hfcpci.c
@@ -1755,7 +1755,7 @@ init_card(struct hfc_pci *hc)
 		enable_hwirq(hc);
 		spin_unlock_irqrestore(&hc->lock, flags);
 		/* Timeout 80ms */
-		current->state = TASK_UNINTERRUPTIBLE;
+		set_current_state(TASK_UNINTERRUPTIBLE);
 		schedule_timeout((80 * HZ) / 1000);
 		printk(KERN_INFO "HFC PCI: IRQ %d count %d\n",
 		       hc->irq, hc->irqcnt);
-- 
2.1.0

Re: [PATCH 2/7 linux-next] mISDN: replace current->state by set_current_state()

[David Miller]

From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 20 Feb 2015 19:12:52 +0100

> Use helper function to access current->state.
> Direct assignments are prone to races and therefore buggy.
> 
> Thanks to Peter Zijlstra for the exact definition of the problem.
> 
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Applied.

[PATCH 5/7 linux-next] hso: replace current->state by __set_current_state()

[Fabian Frederick]

Use helper functions to access current->state.
Direct assignments are prone to races and therefore buggy.

Thanks to Peter Zijlstra for the exact definition of the problem.

Suggested-By: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/usb/hso.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/usb/hso.c b/drivers/net/usb/hso.c
index 9cdfb3f..778e915 100644
--- a/drivers/net/usb/hso.c
+++ b/drivers/net/usb/hso.c
@@ -1594,7 +1594,7 @@ hso_wait_modem_status(struct hso_serial *serial, unsigned long arg)
 		}
 		cprev = cnow;
 	}
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	remove_wait_queue(&tiocmget->waitq, &wait);
 
 	return ret;
-- 
2.1.0

Re: [PATCH 5/7 linux-next] hso: replace current->state by __set_current_state()

[David Miller]

From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 20 Feb 2015 19:12:55 +0100

> Use helper functions to access current->state.
> Direct assignments are prone to races and therefore buggy.
> 
> Thanks to Peter Zijlstra for the exact definition of the problem.
> 
> Suggested-By: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Applied.

[PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Fabian Frederick]

Use helper functions to access current->state.
Direct assignments are prone to races and therefore buggy.

current->state = TASK_RUNNING is replaced by __set_current_state()

Thanks to Peter Zijlstra for the exact definition of the problem.

Suggested-By: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Fabian Frederick <fabf@skynet.be>
---
 drivers/net/wan/cosa.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
index 83c39e2..88d121d 100644
--- a/drivers/net/wan/cosa.c
+++ b/drivers/net/wan/cosa.c
@@ -806,21 +806,21 @@ static ssize_t cosa_read(struct file *file,
 	spin_lock_irqsave(&cosa->lock, flags);
 	add_wait_queue(&chan->rxwaitq, &wait);
 	while (!chan->rx_status) {
-		current->state = TASK_INTERRUPTIBLE;
+		set_current_state(TASK_INTERRUPTIBLE);
 		spin_unlock_irqrestore(&cosa->lock, flags);
 		schedule();
 		spin_lock_irqsave(&cosa->lock, flags);
 		if (signal_pending(current) && chan->rx_status == 0) {
 			chan->rx_status = 1;
 			remove_wait_queue(&chan->rxwaitq, &wait);
-			current->state = TASK_RUNNING;
+			__set_current_state(TASK_RUNNING);
 			spin_unlock_irqrestore(&cosa->lock, flags);
 			mutex_unlock(&chan->rlock);
 			return -ERESTARTSYS;
 		}
 	}
 	remove_wait_queue(&chan->rxwaitq, &wait);
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	kbuf = chan->rxdata;
 	count = chan->rxsize;
 	spin_unlock_irqrestore(&cosa->lock, flags);
@@ -890,14 +890,14 @@ static ssize_t cosa_write(struct file *file,
 	spin_lock_irqsave(&cosa->lock, flags);
 	add_wait_queue(&chan->txwaitq, &wait);
 	while (!chan->tx_status) {
-		current->state = TASK_INTERRUPTIBLE;
+		set_current_state(TASK_INTERRUPTIBLE);
 		spin_unlock_irqrestore(&cosa->lock, flags);
 		schedule();
 		spin_lock_irqsave(&cosa->lock, flags);
 		if (signal_pending(current) && chan->tx_status == 0) {
 			chan->tx_status = 1;
 			remove_wait_queue(&chan->txwaitq, &wait);
-			current->state = TASK_RUNNING;
+			__set_current_state(TASK_RUNNING);
 			chan->tx_status = 1;
 			spin_unlock_irqrestore(&cosa->lock, flags);
 			up(&chan->wsem);
@@ -905,7 +905,7 @@ static ssize_t cosa_write(struct file *file,
 		}
 	}
 	remove_wait_queue(&chan->txwaitq, &wait);
-	current->state = TASK_RUNNING;
+	__set_current_state(TASK_RUNNING);
 	up(&chan->wsem);
 	spin_unlock_irqrestore(&cosa->lock, flags);
 	kfree(kbuf);
-- 
2.1.0

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Jan Yenya Kasprzak]

Fabian Frederick wrote:
: Use helper functions to access current->state.
: Direct assignments are prone to races and therefore buggy.
: 
: current->state = TASK_RUNNING is replaced by __set_current_state()
: 
: Thanks to Peter Zijlstra for the exact definition of the problem.

	OK, thanks. Although I wonder whether real users of COSA (an ISA-based
WAN card) do exist.

Acked-By: Jan "Yenya" Kasprzak <kas@fi.muni.cz>

-Y.

: 
: Suggested-By: Peter Zijlstra <peterz@infradead.org>
: Signed-off-by: Fabian Frederick <fabf@skynet.be>
: ---
:  drivers/net/wan/cosa.c | 12 ++++++------
:  1 file changed, 6 insertions(+), 6 deletions(-)
: 
: diff --git a/drivers/net/wan/cosa.c b/drivers/net/wan/cosa.c
: index 83c39e2..88d121d 100644
: --- a/drivers/net/wan/cosa.c
: +++ b/drivers/net/wan/cosa.c
: @@ -806,21 +806,21 @@ static ssize_t cosa_read(struct file *file,
:  	spin_lock_irqsave(&cosa->lock, flags);
:  	add_wait_queue(&chan->rxwaitq, &wait);
:  	while (!chan->rx_status) {
: -		current->state = TASK_INTERRUPTIBLE;
: +		set_current_state(TASK_INTERRUPTIBLE);
:  		spin_unlock_irqrestore(&cosa->lock, flags);
:  		schedule();
:  		spin_lock_irqsave(&cosa->lock, flags);
:  		if (signal_pending(current) && chan->rx_status == 0) {
:  			chan->rx_status = 1;
:  			remove_wait_queue(&chan->rxwaitq, &wait);
: -			current->state = TASK_RUNNING;
: +			__set_current_state(TASK_RUNNING);
:  			spin_unlock_irqrestore(&cosa->lock, flags);
:  			mutex_unlock(&chan->rlock);
:  			return -ERESTARTSYS;
:  		}
:  	}
:  	remove_wait_queue(&chan->rxwaitq, &wait);
: -	current->state = TASK_RUNNING;
: +	__set_current_state(TASK_RUNNING);
:  	kbuf = chan->rxdata;
:  	count = chan->rxsize;
:  	spin_unlock_irqrestore(&cosa->lock, flags);
: @@ -890,14 +890,14 @@ static ssize_t cosa_write(struct file *file,
:  	spin_lock_irqsave(&cosa->lock, flags);
:  	add_wait_queue(&chan->txwaitq, &wait);
:  	while (!chan->tx_status) {
: -		current->state = TASK_INTERRUPTIBLE;
: +		set_current_state(TASK_INTERRUPTIBLE);
:  		spin_unlock_irqrestore(&cosa->lock, flags);
:  		schedule();
:  		spin_lock_irqsave(&cosa->lock, flags);
:  		if (signal_pending(current) && chan->tx_status == 0) {
:  			chan->tx_status = 1;
:  			remove_wait_queue(&chan->txwaitq, &wait);
: -			current->state = TASK_RUNNING;
: +			__set_current_state(TASK_RUNNING);
:  			chan->tx_status = 1;
:  			spin_unlock_irqrestore(&cosa->lock, flags);
:  			up(&chan->wsem);
: @@ -905,7 +905,7 @@ static ssize_t cosa_write(struct file *file,
:  		}
:  	}
:  	remove_wait_queue(&chan->txwaitq, &wait);
: -	current->state = TASK_RUNNING;
: +	__set_current_state(TASK_RUNNING);
:  	up(&chan->wsem);
:  	spin_unlock_irqrestore(&cosa->lock, flags);
:  	kfree(kbuf);
: -- 
: 2.1.0

-- 
| Jan "Yenya" Kasprzak   <kas at {fi.muni.cz - work | yenya.net - private}> |
| New GPG 4096R/A45477D5 -- see http://www.fi.muni.cz/~kas/pgp-rollover.txt |
| http://www.fi.muni.cz/~kas/     Journal: http://www.fi.muni.cz/~kas/blog/ |
||| "New and improved" is only really improved if it also takes backwards |||
||| compatibility into account, rather than saying "now everybody must do |||
||| things the new and improved - and different - way"   --Linus Torvalds |||

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Sergei Shtylyov]

Hello.

On 02/20/2015 09:12 PM, Fabian Frederick wrote:

> Use helper functions to access current->state.
> Direct assignments are prone to races and therefore buggy.

> current->state = TASK_RUNNING is replaced by __set_current_state()

    You sometimes use __set_current_state() and sometimes set_current_state().

> Thanks to Peter Zijlstra for the exact definition of the problem.

> Suggested-By: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

[...]

WBR, Sergei

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Fabian Frederick]

> On 20 February 2015 at 19:34 Sergei Shtylyov
> <sergei.shtylyov@cogentembedded.com> wrote:
>
>
> Hello.
>
> On 02/20/2015 09:12 PM, Fabian Frederick wrote:
>
> > Use helper functions to access current->state.
> > Direct assignments are prone to races and therefore buggy.
>
> > current->state = TASK_RUNNING is replaced by __set_current_state()
>
>     You sometimes use __set_current_state() and sometimes set_current_state().
Hello Sergei,

Peter suggested to use __set_current_state() for TASK_RUNNING :
http://marc.info/?l=linux-kernel&m=142442259719216&w=2

Regards,
Fabian

>
> > Thanks to Peter Zijlstra for the exact definition of the problem.
>
> > Suggested-By: Peter Zijlstra <peterz@infradead.org>
> > Signed-off-by: Fabian Frederick <fabf@skynet.be>
>
> [...]
>
> WBR, Sergei
>

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Sergei Shtylyov]

On 02/20/2015 09:51 PM, Fabian Frederick wrote:

>>> Use helper functions to access current->state.
>>> Direct assignments are prone to races and therefore buggy.

>>> current->state = TASK_RUNNING is replaced by __set_current_state()

>>       You sometimes use __set_current_state() and sometimes set_current_state().

> Hello Sergei,

> Peter suggested to use __set_current_state() for TASK_RUNNING :
> http://marc.info/?l=linux-kernel&m=142442259719216&w=2

    I didn't even question your decisions, I (like Peter) just wanted a more 
coherent change-log. Thanks to Peter for the explanations though. :-)

> Regards,
> Fabian

>>> Thanks to Peter Zijlstra for the exact definition of the problem.

>>> Suggested-By: Peter Zijlstra <peterz@infradead.org>
>>> Signed-off-by: Fabian Frederick <fabf@skynet.be>

>> [...]

WBR, Sergei

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Peter Zijlstra]

On Fri, Feb 20, 2015 at 09:34:28PM +0300, Sergei Shtylyov wrote:
> Hello.
> 
> On 02/20/2015 09:12 PM, Fabian Frederick wrote:
> 
> >Use helper functions to access current->state.
> >Direct assignments are prone to races and therefore buggy.
> 
> >current->state = TASK_RUNNING is replaced by __set_current_state()
> 
>    You sometimes use __set_current_state() and sometimes set_current_state().

It depends on which state; setting yourself TASK_RUNNING is free of
wakeup races -- you're already running after all, so it can safely use
__set_current_state().

Setting a blocking state otoh needs set_current_state() which issues a
full memory barriers with the store (critically in this case,
effectively after the store) such that it orders the state store with a
subsequent load in the condition check if it really needs to go to
sleep.


In full:

	current->state = TASK_UNINTERRUPTIBLE;		wait = false;
	smp_mb();					smp_wmb();
	if (wait)					p->state = TASK_RUNNING;
		schedule();

Without that smp_mb(); the following order is possible:

	if (wait)
							wait = false;
							smp_wmb();
							p->state = TASK_RUNNING;
	current->state = TASK_UNINTERRUPTIBLE;
		schedule();

And we'll wait forever more..

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Eric Dumazet]

On Fri, 2015-02-20 at 19:58 +0100, Peter Zijlstra wrote:
> On Fri, Feb 20, 2015 at 09:34:28PM +0300, Sergei Shtylyov wrote:
> > Hello.
> > 
> > On 02/20/2015 09:12 PM, Fabian Frederick wrote:
> > 
> > >Use helper functions to access current->state.
> > >Direct assignments are prone to races and therefore buggy.
> > 
> > >current->state = TASK_RUNNING is replaced by __set_current_state()
> > 
> >    You sometimes use __set_current_state() and sometimes set_current_state().
> 
> It depends on which state; setting yourself TASK_RUNNING is free of
> wakeup races -- you're already running after all, so it can safely use
> __set_current_state().

Maybe this might be self documented in set_current_state(),
as we have about 120 calls to __set_current_state(TASK_RUNNING)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 41c60e5302d7..26133da6445e 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -275,7 +275,11 @@ extern char ___assert_task_state[1 - 2*!!(
 #define set_current_state(state_value)				\
 	do {							\
 		current->task_state_change = _THIS_IP_;		\
-		set_mb(current->state, (state_value));		\
+		if (__builtin_constant_p(state_value) &&	\
+		    (state_value) == TASK_RUNNING)		\
+			current->state = (state_value);		\
+		else						\
+			set_mb(current->state, (state_value));	\
 	} while (0)
 
 #else

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Eric Dumazet]

On Fri, 2015-02-20 at 11:31 -0800, Eric Dumazet wrote:
> On Fri, 2015-02-20 at 19:58 +0100, Peter Zijlstra wrote:
> > On Fri, Feb 20, 2015 at 09:34:28PM +0300, Sergei Shtylyov wrote:
> > > Hello.
> > > 
> > > On 02/20/2015 09:12 PM, Fabian Frederick wrote:
> > > 
> > > >Use helper functions to access current->state.
> > > >Direct assignments are prone to races and therefore buggy.
> > > 
> > > >current->state = TASK_RUNNING is replaced by __set_current_state()
> > > 
> > >    You sometimes use __set_current_state() and sometimes set_current_state().
> > 
> > It depends on which state; setting yourself TASK_RUNNING is free of
> > wakeup races -- you're already running after all, so it can safely use
> > __set_current_state().
> 
> Maybe this might be self documented in set_current_state(),
> as we have about 120 calls to __set_current_state(TASK_RUNNING)

And about 138 calls to set_current_state(TASK_RUNNING)

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Peter Zijlstra]

On Fri, Feb 20, 2015 at 11:31:53AM -0800, Eric Dumazet wrote:
> On Fri, 2015-02-20 at 19:58 +0100, Peter Zijlstra wrote:

> Maybe this might be self documented in set_current_state(),
> as we have about 120 calls to __set_current_state(TASK_RUNNING)
> 
> diff --git a/include/linux/sched.h b/include/linux/sched.h
> index 41c60e5302d7..26133da6445e 100644
> --- a/include/linux/sched.h
> +++ b/include/linux/sched.h
> @@ -275,7 +275,11 @@ extern char ___assert_task_state[1 - 2*!!(
>  #define set_current_state(state_value)				\
>  	do {							\
>  		current->task_state_change = _THIS_IP_;		\
> -		set_mb(current->state, (state_value));		\
> +		if (__builtin_constant_p(state_value) &&	\
> +		    (state_value) == TASK_RUNNING)		\
> +			current->state = (state_value);		\
> +		else						\
> +			set_mb(current->state, (state_value));	\
>  	} while (0)

lkml.kernel.org/r/20150206163947.GR21418@twins.programming.kicks-ass.net

The problem is that there _might_ be someone relying on that barrier.

Its (very) unlikely, but you don't want to risk subtle borkage just
because. And I'm too lazy to go audit all of them :/

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[Fabian Frederick]

> On 20 February 2015 at 19:58 Peter Zijlstra <peterz@infradead.org> wrote:
>
>
> On Fri, Feb 20, 2015 at 09:34:28PM +0300, Sergei Shtylyov wrote:
> > Hello.
> >
> > On 02/20/2015 09:12 PM, Fabian Frederick wrote:
> >
> > >Use helper functions to access current->state.
> > >Direct assignments are prone to races and therefore buggy.
> >
> > >current->state = TASK_RUNNING is replaced by __set_current_state()
> >
> >    You sometimes use __set_current_state() and sometimes
> >set_current_state().
>
> It depends on which state; setting yourself TASK_RUNNING is free of
> wakeup races -- you're already running after all, so it can safely use
> __set_current_state().
>
> Setting a blocking state otoh needs set_current_state() which issues a
> full memory barriers with the store (critically in this case,
> effectively after the store) such that it orders the state store with a
> subsequent load in the condition check if it really needs to go to
> sleep.
>
>
> In full:
>
>       current->state = TASK_UNINTERRUPTIBLE;          wait = false;
>       smp_mb();                                       smp_wmb();
>       if (wait)                                       p->state = TASK_RUNNING;
>               schedule();
>
> Without that smp_mb(); the following order is possible:
>
>       if (wait)
>                                                       wait = false;
>                                                       smp_wmb();
>                                                       p->state = TASK_RUNNING;
>       current->state = TASK_UNINTERRUPTIBLE;
>               schedule();
>
> And we'll wait forever more..
Do I have to add more comments in changelogs or is it OK for you ?
Maybe something like:
"
current->state = TASK_RUNNING can safely be converted to __set_current_state()
as we're already in that state. Other assignments are converted to
set_current_state() (which uses set_mb()).

"
Regards,
Fabian
>

Re: [PATCH 6/7 linux-next] wan: cosa: replace current->state by set_current_state()

[David Miller]

From: Fabian Frederick <fabf@skynet.be>
Date: Fri, 20 Feb 2015 19:12:56 +0100

> Use helper functions to access current->state.
> Direct assignments are prone to races and therefore buggy.
> 
> current->state = TASK_RUNNING is replaced by __set_current_state()
> 
> Thanks to Peter Zijlstra for the exact definition of the problem.
> 
> Suggested-By: Peter Zijlstra <peterz@infradead.org>
> Signed-off-by: Fabian Frederick <fabf@skynet.be>

Applied.