From mboxrd@z Thu Jan 1 00:00:00 1970 From: vinod.koul@intel.com (Vinod Koul) Date: Thu, 4 Jun 2015 19:49:38 +0530 Subject: [PATCH 1/2] dmaengine: at_xdmac: lock fixes In-Reply-To: <1433343154-5613-1-git-send-email-ludovic.desroches@atmel.com> References: <1433343154-5613-1-git-send-email-ludovic.desroches@atmel.com> Message-ID: <20150604141938.GO3140@localhost> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Wed, Jun 03, 2015 at 04:52:26PM +0200, Ludovic Desroches wrote: > Using _bh variant for spin locks causes this kind of warning: > Starting logging: ------------[ cut here ]------------ > WARNING: CPU: 0 PID: 3 at /ssd_drive/linux/kernel/softirq.c:151 > __local_bh_enable_ip+0xe8/0xf4() > Modules linked in: > CPU: 0 PID: 3 Comm: ksoftirqd/0 Not tainted 4.1.0-rc2+ #94 > Hardware name: Atmel SAMA5 > [] (unwind_backtrace) from [] (show_stack+0x10/0x14) > [] (show_stack) from [] > (warn_slowpath_common+0x80/0xac) > [] (warn_slowpath_common) from [] > (warn_slowpath_null+0x1c/0x24) > [] (warn_slowpath_null) from [] > (__local_bh_enable_ip+0xe8/0xf4) > [] (__local_bh_enable_ip) from [] > (at_xdmac_device_terminate_all+0xf4/0x100) > [] (at_xdmac_device_terminate_all) from [] > (atmel_complete_tx_dma+0x34/0xf4) > [] (atmel_complete_tx_dma) from [] > (at_xdmac_tasklet+0x14c/0x1ac) > [] (at_xdmac_tasklet) from [] > (tasklet_action+0x68/0xb4) > [] (tasklet_action) from [] > (__do_softirq+0xfc/0x238) > [] (__do_softirq) from [] (run_ksoftirqd+0x28/0x34) > [] (run_ksoftirqd) from [] > (smpboot_thread_fn+0x138/0x18c) > [] (smpboot_thread_fn) from [] (kthread+0xdc/0xf0) > [] (kthread) from [] (ret_from_fork+0x14/0x34) > ---[ end trace b57b14a99c1d8812 ]--- > > It comes from the fact that devices can called some code from the DMA > controller with irq disabled. _bh variant is not intended to be used in > this case since it can enable irqs. Switch to irqsave/irqrestore variant to > avoid this situation. > > Signed-off-by: Ludovic Desroches > Cc: stable at vger.kernel.org # 4.0 and later > --- > drivers/dma/at_xdmac.c | 85 ++++++++++++++++++++++++++++---------------------- > 1 file changed, 48 insertions(+), 37 deletions(-) > > diff --git a/drivers/dma/at_xdmac.c b/drivers/dma/at_xdmac.c > index 9b602a6..4a7e9c6 100644 > --- a/drivers/dma/at_xdmac.c > +++ b/drivers/dma/at_xdmac.c > @@ -421,8 +421,9 @@ static dma_cookie_t at_xdmac_tx_submit(struct dma_async_tx_descriptor *tx) > struct at_xdmac_desc *desc = txd_to_at_desc(tx); > struct at_xdmac_chan *atchan = to_at_xdmac_chan(tx->chan); > dma_cookie_t cookie; > + unsigned long irqflags; > > - spin_lock_bh(&atchan->lock); > + spin_lock_irqsave(&atchan->lock, irqflags); > cookie = dma_cookie_assign(tx); > > dev_vdbg(chan2dev(tx->chan), "%s: atchan 0x%p, add desc 0x%p to xfers_list\n", > @@ -431,7 +432,7 @@ static dma_cookie_t at_xdmac_tx_submit(struct dma_async_tx_descriptor *tx) > if (list_is_singular(&atchan->xfers_list)) > at_xdmac_start_xfer(atchan, desc); > > - spin_unlock_bh(&atchan->lock); > + spin_unlock_irqrestore(&atchan->lock, irqflags); > return cookie; > } > > @@ -591,11 +592,13 @@ at_xdmac_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl, > unsigned int sg_len, enum dma_transfer_direction direction, > unsigned long flags, void *context) > { > - struct at_xdmac_chan *atchan = to_at_xdmac_chan(chan); > - struct at_xdmac_desc *first = NULL, *prev = NULL; > - struct scatterlist *sg; > - int i; > - unsigned int xfer_size = 0; > + struct at_xdmac_chan *atchan = to_at_xdmac_chan(chan); > + struct at_xdmac_desc *first = NULL, *prev = NULL; > + struct scatterlist *sg; > + int i; > + unsigned int xfer_size = 0; > + unsigned long irqflags; > + struct dma_async_tx_descriptor *ret = NULL; This doesnt comply with stable rules, and you should not keep this in fixes either :( - It cannot contain any "trivial" fixes in it (spelling changes, whitespace cleanups, etc). -- ~Vinod