diff mbox

spi: davinci: use request_threaded_irq() to fix deadlock

Message ID 1356120806-27964-1-git-send-email-m-karicheri2@ti.com (mailing list archive)
State Superseded, archived
Headers show

Commit Message

Murali Karicheri Dec. 21, 2012, 8:13 p.m. UTC
With RT pre-empt patch applied to Linux kernel, the irq handler will be
force converted to an irq thread. spi driver can get back to back messages
from the slave device. In such cases, IRQ thread doesn't get a chance to
run to read the slave data. Hence the irq handler must be run in hard irq
context to read/write data from slave device. Otherwise, the kernel goes
into a deadlock. This patch fixes this issue when PREEMPT_RT_FULL is
enabled in the kernel. A dummy thread function is provided to satisfy the
request_threaded_irq() API. Passing a NULL for function also causes the
irq handler to be executed in the thread context.

Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>
---
 drivers/spi/spi-davinci.c |   17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

Comments

Grant Likely Dec. 22, 2012, 10:08 a.m. UTC | #1
On Fri, 21 Dec 2012 15:13:26 -0500, Murali Karicheri <m-karicheri2@ti.com> wrote:
> With RT pre-empt patch applied to Linux kernel, the irq handler will be
> force converted to an irq thread. spi driver can get back to back messages
> from the slave device. In such cases, IRQ thread doesn't get a chance to
> run to read the slave data. Hence the irq handler must be run in hard irq
> context to read/write data from slave device. Otherwise, the kernel goes
> into a deadlock. This patch fixes this issue when PREEMPT_RT_FULL is
> enabled in the kernel. A dummy thread function is provided to satisfy the
> request_threaded_irq() API. Passing a NULL for function also causes the
> irq handler to be executed in the thread context.
> 
> Signed-off-by: Murali Karicheri <m-karicheri2@ti.com>

Thomas, would you mind taking a look at this for me. My gut feel is that
this is the wrong way to solve the problem that Murali is having and
that it really just hacks something that works.

It seems to me that what the driver should do is disable the irq
in the handler, and then perform the regular work in the thread. After
all the pending data is processed, then it should reenable the interrupts.

Passing in a dummy thread function just looks wrong.

g.

> ---
>  drivers/spi/spi-davinci.c |   17 +++++++++++++++--
>  1 file changed, 15 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
> index 50bd2cd..8234d22 100644
> --- a/drivers/spi/spi-davinci.c
> +++ b/drivers/spi/spi-davinci.c
> @@ -702,6 +702,19 @@ err_alloc_dummy_buf:
>  }
>  
>  /**
> + * dummy_thread_fn - dummy thread function
> + * @irq: IRQ number for this SPI Master
> + * @context_data: structure for SPI Master controller davinci_spi
> + *
> + * This is to satisfy the request_threaded_irq() API so that the irq
> + * handler is called in interrupt context.
> + */
> +static irqreturn_t dummy_thread_fn(s32 irq, void *data)
> +{
> +	return IRQ_HANDLED;
> +}
> +
> +/**
>   * davinci_spi_irq - Interrupt handler for SPI Master Controller
>   * @irq: IRQ number for this SPI Master
>   * @context_data: structure for SPI Master controller davinci_spi
> @@ -899,8 +912,8 @@ static int davinci_spi_probe(struct platform_device *pdev)
>  		goto unmap_io;
>  	}
>  
> -	ret = request_irq(dspi->irq, davinci_spi_irq, 0, dev_name(&pdev->dev),
> -									dspi);
> +	ret = request_threaded_irq(dspi->irq, davinci_spi_irq, dummy_thread_fn,
> +				 0, dev_name(&pdev->dev), dspi);
>  	if (ret)
>  		goto unmap_io;
>  
> -- 
> 1.7.9.5
>
Murali Karicheri Jan. 2, 2013, 3:19 p.m. UTC | #2
On 12/22/2012 05:08 AM, Grant Likely wrote:
> On Fri, 21 Dec 2012 15:13:26 -0500, Murali Karicheri<m-karicheri2@ti.com>  wrote:
>> With RT pre-empt patch applied to Linux kernel, the irq handler will be
>> force converted to an irq thread. spi driver can get back to back messages
>> from the slave device. In such cases, IRQ thread doesn't get a chance to
>> run to read the slave data. Hence the irq handler must be run in hard irq
>> context to read/write data from slave device. Otherwise, the kernel goes
>> into a deadlock. This patch fixes this issue when PREEMPT_RT_FULL is
>> enabled in the kernel. A dummy thread function is provided to satisfy the
>> request_threaded_irq() API. Passing a NULL for function also causes the
>> irq handler to be executed in the thread context.
>>
>> Signed-off-by: Murali Karicheri<m-karicheri2@ti.com>
> Thomas, would you mind taking a look at this for me. My gut feel is that
> this is the wrong way to solve the problem that Murali is having and
> that it really just hacks something that works.
Grant,

Thanks for reviewing this. As per the RT patch, all of the IRQ handlers 
will be converted to thread by brute force. This breaks the SPI driver 
since the data is overwritten with back to back irq as thread is not 
getting a chance to read the word before next irq happens.  What my 
patch does is to keep the functionality as before by using a new irq 
API. So though this is not the best solution, this solves the problem 
and give an opportunity for improvement by splitting this into two part 
to handle the irq. But I am not convinced if this is really needed.

As you might know, there are 3 ways to process the SPI data transfer. 
Polling, IRQ and DMA. As part of the IRQ handling, basically, driver 
needs to write a register in the SPI controller chip to send a word of 
data, if available to send or receive a word. That means the amount of 
processing at irq handling is time taken for two register accesses and 
checks to see if we have completed the transaction. But if we are 
reading data from a NOR flash connected to the SPI bus, then mostly so 
many interrupts happens right after a write of a command to the SPI 
slave device and causes several interrupts and CPU usage for IRQ 
handling and may results in latency for other interrupts. We might be 
able to read the word and add it to a list as part of IRQ and handle it 
in a thread. Similarly if a write is required, handle it as part of the 
thread. But even then one SPI register read has to happen in the IRQ 
handler for the incoming word .
So in terms of CPU usage, we would save one register write, but will 
have to add additional code to add the word to a list. Does this warrant 
change in the code? If CPU usage is an issue, driver could be configured 
to do DMA. May be I am missing something that you or Thomas know.

I will wait for a response from Thomas.

Thanks.

Murali
> It seems to me that what the driver should do is disable the irq
> in the handler, and then perform the regular work in the thread. After
> all the pending data is processed, then it should reenable the interrupts.
>
> Passing in a dummy thread function just looks wrong.
>
> g.

>> ---
>>   drivers/spi/spi-davinci.c |   17 +++++++++++++++--
>>   1 file changed, 15 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
>> index 50bd2cd..8234d22 100644
>> --- a/drivers/spi/spi-davinci.c
>> +++ b/drivers/spi/spi-davinci.c
>> @@ -702,6 +702,19 @@ err_alloc_dummy_buf:
>>   }
>>
>>   /**
>> + * dummy_thread_fn - dummy thread function
>> + * @irq: IRQ number for this SPI Master
>> + * @context_data: structure for SPI Master controller davinci_spi
>> + *
>> + * This is to satisfy the request_threaded_irq() API so that the irq
>> + * handler is called in interrupt context.
>> + */
>> +static irqreturn_t dummy_thread_fn(s32 irq, void *data)
>> +{
>> +	return IRQ_HANDLED;
>> +}
>> +
>> +/**
>>    * davinci_spi_irq - Interrupt handler for SPI Master Controller
>>    * @irq: IRQ number for this SPI Master
>>    * @context_data: structure for SPI Master controller davinci_spi
>> @@ -899,8 +912,8 @@ static int davinci_spi_probe(struct platform_device *pdev)
>>   		goto unmap_io;
>>   	}
>>
>> -	ret = request_irq(dspi->irq, davinci_spi_irq, 0, dev_name(&pdev->dev),
>> -									dspi);
>> +	ret = request_threaded_irq(dspi->irq, davinci_spi_irq, dummy_thread_fn,
>> +				 0, dev_name(&pdev->dev), dspi);
>>   	if (ret)
>>   		goto unmap_io;
>>
>> -- 
>> 1.7.9.5
>>


------------------------------------------------------------------------------
Master Java SE, Java EE, Eclipse, Spring, Hibernate, JavaScript, jQuery
and much more. Keep your Java skills current with LearnJavaNow -
200+ hours of step-by-step video tutorials by Java experts.
SALE $49.99 this month only -- learn more at:
http://p.sf.net/sfu/learnmore_122612
Grant Likely Feb. 5, 2013, 5:13 p.m. UTC | #3
On Wed, 2 Jan 2013 10:19:08 -0500, Murali Karicheri <m-karicheri2@ti.com> wrote:
> On 12/22/2012 05:08 AM, Grant Likely wrote:
> > On Fri, 21 Dec 2012 15:13:26 -0500, Murali Karicheri<m-karicheri2@ti.com>  wrote:
> >> With RT pre-empt patch applied to Linux kernel, the irq handler will be
> >> force converted to an irq thread. spi driver can get back to back messages
> >> from the slave device. In such cases, IRQ thread doesn't get a chance to
> >> run to read the slave data. Hence the irq handler must be run in hard irq
> >> context to read/write data from slave device. Otherwise, the kernel goes
> >> into a deadlock. This patch fixes this issue when PREEMPT_RT_FULL is
> >> enabled in the kernel. A dummy thread function is provided to satisfy the
> >> request_threaded_irq() API. Passing a NULL for function also causes the
> >> irq handler to be executed in the thread context.
> >>
> >> Signed-off-by: Murali Karicheri<m-karicheri2@ti.com>
> > Thomas, would you mind taking a look at this for me. My gut feel is that
> > this is the wrong way to solve the problem that Murali is having and
> > that it really just hacks something that works.
> Grant,
> 
> Thanks for reviewing this. As per the RT patch, all of the IRQ handlers 
> will be converted to thread by brute force. This breaks the SPI driver 
> since the data is overwritten with back to back irq as thread is not 
> getting a chance to read the word before next irq happens.  What my 
> patch does is to keep the functionality as before by using a new irq 
> API. So though this is not the best solution, this solves the problem 
> and give an opportunity for improvement by splitting this into two part 
> to handle the irq. But I am not convinced if this is really needed.

Okay. Applied, thanks.

g.

------------------------------------------------------------------------------
Free Next-Gen Firewall Hardware Offer
Buy your Sophos next-gen firewall before the end March 2013 
and get the hardware for free! Learn more.
http://p.sf.net/sfu/sophos-d2d-feb
diff mbox

Patch

diff --git a/drivers/spi/spi-davinci.c b/drivers/spi/spi-davinci.c
index 50bd2cd..8234d22 100644
--- a/drivers/spi/spi-davinci.c
+++ b/drivers/spi/spi-davinci.c
@@ -702,6 +702,19 @@  err_alloc_dummy_buf:
 }
 
 /**
+ * dummy_thread_fn - dummy thread function
+ * @irq: IRQ number for this SPI Master
+ * @context_data: structure for SPI Master controller davinci_spi
+ *
+ * This is to satisfy the request_threaded_irq() API so that the irq
+ * handler is called in interrupt context.
+ */
+static irqreturn_t dummy_thread_fn(s32 irq, void *data)
+{
+	return IRQ_HANDLED;
+}
+
+/**
  * davinci_spi_irq - Interrupt handler for SPI Master Controller
  * @irq: IRQ number for this SPI Master
  * @context_data: structure for SPI Master controller davinci_spi
@@ -899,8 +912,8 @@  static int davinci_spi_probe(struct platform_device *pdev)
 		goto unmap_io;
 	}
 
-	ret = request_irq(dspi->irq, davinci_spi_irq, 0, dev_name(&pdev->dev),
-									dspi);
+	ret = request_threaded_irq(dspi->irq, davinci_spi_irq, dummy_thread_fn,
+				 0, dev_name(&pdev->dev), dspi);
 	if (ret)
 		goto unmap_io;