From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: dmaengine: imx-dma: fix wrong callback invoke From: Vinod Koul Message-Id: <20190120105257.GP4635@vkoul-mobl> Date: Sun, 20 Jan 2019 16:22:57 +0530 To: Leonid Iziumtsev , Fabio Estevam Cc: dmaengine@vger.kernel.org, Dan Williams , linux-kernel@vger.kernel.org, m.grzeschik@pengutronix.de List-ID: T24gMTUtMDEtMTksIDE3OjE1LCBMZW9uaWQgSXppdW10c2V2IHdyb3RlOgo+IE9uY2UgdGhlICJs ZF9xdWV1ZSIgbGlzdCBpcyBub3QgZW1wdHksIG5leHQgZGVzY3JpcHRvciB3aWxsIG1pZ3JhdGUK PiBpbnRvICJsZF9hY3RpdmUiIGxpc3QuIFRoZSAiZGVzYyIgdmFyaWFibGUgd2lsbCBiZSBvdmVy d3JpdHRlbgo+IGR1cmluZyB0aGF0IHRyYW5zaXRpb24uIEFuZCBsYXRlciB0aGUgZG1hZW5naW5l X2Rlc2NfZ2V0X2NhbGxiYWNrX2ludm9rZSgpCj4gd2lsbCB1c2UgaXQgYXMgYW4gYXJndW1lbnQu IEFzIHJlc3VsdCB3ZSBpbnZva2Ugd3JvbmcgY2FsbGJhY2suCj4gCj4gVGhhdCBiZWhhdmlvdXIg d2FzIGluIHBsYWNlIHNpbmNlOgo+IGNvbW1pdCBmY2FhYmE2YzcxMzYgKCJkbWFlbmdpbmU6IGlt eC1kbWE6IGZpeCBjYWxsYmFjayBwYXRoIGluIHRhc2tsZXQiKS4KPiBCdXQgYWZ0ZXIgY29tbWl0 IDRjZDEzYzIxYjIwNyAoInNvZnRpcnE6IExldCBrc29mdGlycWQgZG8gaXRzIGpvYiIpCj4gdGhp bmdzIGdvdCB3b3JzZSwgc2luY2UgcG9zc2libGUgZGVsYXkgYmV0d2VlbiB0YXNrbGV0X3NjaGVk dWxlKCkKPiBmcm9tIERNQSBpcnEgaGFuZGxlciBhbmQgYWN0dWFsIHRhc2tsZXQgZnVuY3Rpb24g ZXhlY3V0aW9uIGdvdCBiaWdnZXIuCj4gQW5kIHRoYXQgZ2F2ZSBtb3JlIHRpbWUgZm9yIG5ldyBE TUEgcmVxdWVzdCB0byBiZSBzdWJtaXR0ZWQgYW5kCj4gdG8gYmUgcHV0IGludG8gImxkX3F1ZXVl IiBsaXN0Lgo+IAo+IEl0IGhhcyBiZWVuIG5vdGljZWQgdGhhdCBETUEgaXNzdWUgaXMgY2F1c2lu ZyBwcm9ibGVtcyBmb3IgIm14Yy1tbWMiCj4gZHJpdmVyLiBXaGlsZSBzdHJlc3NpbmcgdGhlIHN5 c3RlbSB3aXRoIGhlYXZ5IG5ldHdvcmsgdHJhZmZpYyBhbmQKPiB3cml0aW5nL3JlYWRpbmcgdG8v ZnJvbSBzZCBjYXJkIHNpbXVsdGFuZW91c2x5IHRoZSB0aW1lb3V0IG1heSBoYXBwZW46Cj4gCj4g MTAwMTMwMDAuc2RoY2k6IG14Y21jaV93YXRjaGRvZzogcmVhZCB0aW1lIG91dCAoc3RhdHVzID0g MHgzMDAwNDkwMCkKPiAKPiBUaGF0IG9mdGVuIGxlYWQgdG8gZmlsZSBzeXN0ZW0gY29ycnVwdGlv bi4KClRoaXMgbG9va3MgcmVhc29uYWJsZSB0byBtZSBhbmQgSSB0aGluayBzaG91bGQgZ28gdG8g c3RhYmxlIGFzIHdlbGwuCkZhYmlvIGNhbiB3ZSBnZXQgc29tZSB0ZXN0aW5nIGRvbmUgb24gdGhp cyBwYXRjaAoKPiAKPiBTaWduZWQtb2ZmLWJ5OiBMZW9uaWQgSXppdW10c2V2IDxsZW9uaWQuaXpp dW10c2V2QGdtYWlsLmNvbT4KPiAtLS0KPiAgZHJpdmVycy9kbWEvaW14LWRtYS5jIHwgOCArKysr LS0tLQo+ICAxIGZpbGUgY2hhbmdlZCwgNCBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygtKQo+ IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2RtYS9pbXgtZG1hLmMgYi9kcml2ZXJzL2RtYS9pbXgt ZG1hLmMKPiBpbmRleCBjMmZmZjNmNmM5Y2EuLjRhMDlhZjNjZDU0NiAxMDA2NDQKPiAtLS0gYS9k cml2ZXJzL2RtYS9pbXgtZG1hLmMKPiArKysgYi9kcml2ZXJzL2RtYS9pbXgtZG1hLmMKPiBAQCAt NjE4LDcgKzYxOCw3IEBAIHN0YXRpYyB2b2lkIGlteGRtYV90YXNrbGV0KHVuc2lnbmVkIGxvbmcg ZGF0YSkKPiAgewo+ICAJc3RydWN0IGlteGRtYV9jaGFubmVsICppbXhkbWFjID0gKHZvaWQgKilk YXRhOwo+ICAJc3RydWN0IGlteGRtYV9lbmdpbmUgKmlteGRtYSA9IGlteGRtYWMtPmlteGRtYTsK PiAtCXN0cnVjdCBpbXhkbWFfZGVzYyAqZGVzYzsKPiArCXN0cnVjdCBpbXhkbWFfZGVzYyAqZGVz YywgKm5leHRfZGVzYzsKPiAgCXVuc2lnbmVkIGxvbmcgZmxhZ3M7Cj4gIAo+ICAJc3Bpbl9sb2Nr X2lycXNhdmUoJmlteGRtYS0+bG9jaywgZmxhZ3MpOwo+IEBAIC02NDgsMTAgKzY0OCwxMCBAQCBz dGF0aWMgdm9pZCBpbXhkbWFfdGFza2xldCh1bnNpZ25lZCBsb25nIGRhdGEpCj4gIAlsaXN0X21v dmVfdGFpbChpbXhkbWFjLT5sZF9hY3RpdmUubmV4dCwgJmlteGRtYWMtPmxkX2ZyZWUpOwo+ICAK PiAgCWlmICghbGlzdF9lbXB0eSgmaW14ZG1hYy0+bGRfcXVldWUpKSB7Cj4gLQkJZGVzYyA9IGxp c3RfZmlyc3RfZW50cnkoJmlteGRtYWMtPmxkX3F1ZXVlLCBzdHJ1Y3QgaW14ZG1hX2Rlc2MsCj4g LQkJCQkJbm9kZSk7Cj4gKwkJbmV4dF9kZXNjID0gbGlzdF9maXJzdF9lbnRyeSgmaW14ZG1hYy0+ bGRfcXVldWUsCj4gKwkJCQkJICAgICBzdHJ1Y3QgaW14ZG1hX2Rlc2MsIG5vZGUpOwo+ICAJCWxp c3RfbW92ZV90YWlsKGlteGRtYWMtPmxkX3F1ZXVlLm5leHQsICZpbXhkbWFjLT5sZF9hY3RpdmUp Owo+IC0JCWlmIChpbXhkbWFfeGZlcl9kZXNjKGRlc2MpIDwgMCkKPiArCQlpZiAoaW14ZG1hX3hm ZXJfZGVzYyhuZXh0X2Rlc2MpIDwgMCkKPiAgCQkJZGV2X3dhcm4oaW14ZG1hLT5kZXYsICIlczog Y2hhbm5lbDogJWQgY291bGRuJ3QgeGZlciBkZXNjXG4iLAo+ICAJCQkJIF9fZnVuY19fLCBpbXhk bWFjLT5jaGFubmVsKTsKPiAgCX0KPiAtLSAKPiAyLjExLjAK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.6 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 02311C61CE4 for ; Sun, 20 Jan 2019 10:54:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C67152085B for ; Sun, 20 Jan 2019 10:54:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547981675; bh=YKlpKIB0/oY4FSN+nkVKyT6Fh0aGcZimjlQ4v5EeFr8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:List-ID:From; b=QfXB9SRo+WT0T+8zIyQtdx1NF+LyLXZphSpKaJfhSjQkO2uEvReRwikt4ZN+lckCG wA1SiGqhhQYzNqSnep/NfByOtDWBklt7aOKUXvvm1QE3gx5lK4xYlvQDoeiQJHyVfz WbLBrRqtNPlmLNBjFKXDeB3+kdmtc7ECtkcx7m68= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730549AbfATKye (ORCPT ); Sun, 20 Jan 2019 05:54:34 -0500 Received: from mail.kernel.org ([198.145.29.99]:50156 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730531AbfATKyd (ORCPT ); Sun, 20 Jan 2019 05:54:33 -0500 Received: from localhost (unknown [122.178.235.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 607C02084C; Sun, 20 Jan 2019 10:54:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1547981673; bh=YKlpKIB0/oY4FSN+nkVKyT6Fh0aGcZimjlQ4v5EeFr8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=jtU41so6/uQ3kbIP1UEcXfjIxmxpk3wP2xxy/ejOn+Q/35oybemBKIDA0m3jcD0+O wvb0lHfYQ3e3FAwTlNPTA5o8iOTjxE/8ck5qoAgEK2xDZNlSbOYR00ynNIxHUG76i2 wfUgF7DQlpgPY5jrq3uN4B/9CEKSAlawsxLJ2rzI= Date: Sun, 20 Jan 2019 16:22:57 +0530 From: Vinod Koul To: Leonid Iziumtsev , Fabio Estevam Cc: dmaengine@vger.kernel.org, Dan Williams , linux-kernel@vger.kernel.org, m.grzeschik@pengutronix.de Subject: Re: [PATCH] dmaengine: imx-dma: fix wrong callback invoke Message-ID: <20190120105257.GP4635@vkoul-mobl> References: <20190115171523.702-1-leonid.iziumtsev@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190115171523.702-1-leonid.iziumtsev@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 15-01-19, 17:15, Leonid Iziumtsev wrote: > Once the "ld_queue" list is not empty, next descriptor will migrate > into "ld_active" list. The "desc" variable will be overwritten > during that transition. And later the dmaengine_desc_get_callback_invoke() > will use it as an argument. As result we invoke wrong callback. > > That behaviour was in place since: > commit fcaaba6c7136 ("dmaengine: imx-dma: fix callback path in tasklet"). > But after commit 4cd13c21b207 ("softirq: Let ksoftirqd do its job") > things got worse, since possible delay between tasklet_schedule() > from DMA irq handler and actual tasklet function execution got bigger. > And that gave more time for new DMA request to be submitted and > to be put into "ld_queue" list. > > It has been noticed that DMA issue is causing problems for "mxc-mmc" > driver. While stressing the system with heavy network traffic and > writing/reading to/from sd card simultaneously the timeout may happen: > > 10013000.sdhci: mxcmci_watchdog: read time out (status = 0x30004900) > > That often lead to file system corruption. This looks reasonable to me and I think should go to stable as well. Fabio can we get some testing done on this patch > > Signed-off-by: Leonid Iziumtsev > --- > drivers/dma/imx-dma.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/drivers/dma/imx-dma.c b/drivers/dma/imx-dma.c > index c2fff3f6c9ca..4a09af3cd546 100644 > --- a/drivers/dma/imx-dma.c > +++ b/drivers/dma/imx-dma.c > @@ -618,7 +618,7 @@ static void imxdma_tasklet(unsigned long data) > { > struct imxdma_channel *imxdmac = (void *)data; > struct imxdma_engine *imxdma = imxdmac->imxdma; > - struct imxdma_desc *desc; > + struct imxdma_desc *desc, *next_desc; > unsigned long flags; > > spin_lock_irqsave(&imxdma->lock, flags); > @@ -648,10 +648,10 @@ static void imxdma_tasklet(unsigned long data) > list_move_tail(imxdmac->ld_active.next, &imxdmac->ld_free); > > if (!list_empty(&imxdmac->ld_queue)) { > - desc = list_first_entry(&imxdmac->ld_queue, struct imxdma_desc, > - node); > + next_desc = list_first_entry(&imxdmac->ld_queue, > + struct imxdma_desc, node); > list_move_tail(imxdmac->ld_queue.next, &imxdmac->ld_active); > - if (imxdma_xfer_desc(desc) < 0) > + if (imxdma_xfer_desc(next_desc) < 0) > dev_warn(imxdma->dev, "%s: channel: %d couldn't xfer desc\n", > __func__, imxdmac->channel); > } > -- > 2.11.0 -- ~Vinod