Skip to contentSkip to conversation

mxs/spi: Fix misuse of init_completion

PATCH Superseded Marek Vasut 3 participants 3 messages Aug 24, 2012

Subsystems (2)

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mxs/spi: Fix misuse of init_completion

The init_completion() call does reinit not only the variable carrying the flag that the completion finished, but also initialized the waitqueue associated with the completion. On the contrary, the INIT_WAITQUEUE() call only reinits the flag.

In case there was anything still stuck in the waitqueue, subsequent call to init_completion() would be able to create possible race condition. This patch uses the proper function and moves init_completion() into .probe() call of the driver, to be issued only once.

Note that such scenario is impossible, since two threads can never enter the mxs_spi_txrx_dma(), since whole this section is protected by mutex in SPI core. This by no means allows this issue to exit though.

Cc Chris Ball <[email protected]>
Cc Shawn Guo <[email protected]>
Cc Mark Brown <[email protected]>
Cc Fabio Estevam <[email protected]>
---
 drivers/spi/spi-mxs.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

V2: Update the patch description and snap a whip over myself for being lazy to
write one in the first place!

drivers/spi/spi-mxs.c +3 -1
index 331f600..c965cc6 100644
@@ -230,7 +230,7 @@ static int mxs_spi_txrx_dma(struct mxs_spi *spi, int cs,
 		return -EINVAL;
 	}
 
-	init_completion(&spi->c);
+	INIT_COMPLETION(spi->c);
 
 	if (*first)
 		pio |= BM_SSP_CTRL0_LOCK_CS;
@@ -560,6 +560,8 @@ static int __devinit mxs_spi_probe(struct platform_device *pdev)
 	ssp->devid = devid;
 	ssp->dma_channel = dma_channel;
 
+	init_completion(&spi->c);
+
 	ret = devm_request_irq(&pdev->dev, irq_err, mxs_ssp_irq_handler, 0,
 			       DRIVER_NAME, ssp);
 	if (ret)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 1/1 mxs/spi: Fix misuse of init_completion

Hi Marek,

Quoted 10 lines · Marek Vasut

The init_completion() call does reinit not only the variable carrying the flag that the completion finished, but also initialized the waitqueue associated with the completion. On the contrary, the INIT_WAITQUEUE() call only reinits the flag.

In case there was anything still stuck in the waitqueue, subsequent call to init_completion() would be able to create possible race condition. This patch uses the proper function and moves init_completion() into .probe() call of the driver, to be issued only once.

Quoted 5 lines

Note that such scenario is impossible, since two threads can never enter the mxs_spi_txrx_dma(), since whole this section is protected by mutex in SPI core. This by no means allows this issue to exit though.

Thanks for writing that up -- I appreciate seeing the explanation of the problems this could have caused.

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child
#2 lore raw

PATCH v2 1/1 mxs/spi: Fix misuse of init_completion

Dear Chris Ball,

Quoted 7 lines

Hi Marek,

Quoted 4 lines · Marek Vasut

The init_completion() call does reinit not only the variable carrying the flag that the completion finished, but also initialized the waitqueue associated with the completion. On the contrary, the INIT_WAITQUEUE() call only reinits the flag.

Darn, it's INIT_COMPLETION() of course.

Quoted 5 lines
Quoted 5 lines

In case there was anything still stuck in the waitqueue, subsequent call to init_completion() would be able to create possible race condition. This patch uses the proper function and moves init_completion() into .probe() call of the driver, to be issued only once.

Quoted 8 lines
Quoted 5 lines

Note that such scenario is impossible, since two threads can never enter the mxs_spi_txrx_dma(), since whole this section is protected by mutex in SPI core. This by no means allows this issue to exit though.

Thanks for writing that up -- I appreciate seeing the explanation of the problems this could have caused.

You're very welcome, I was really lazy, sorry about that and thanks for pushing me ;-) I hope someone might eventually even find this explanation useful.

Quoted 1 line

- Chris.

Best regards,
Marek Vasut