Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2438845imj; Mon, 18 Feb 2019 06:06:09 -0800 (PST) X-Google-Smtp-Source: AHgI3IaH5GpoUKlb3+yrbrpH6GVzjGP81Bcy1f0Jpsp6QQWrlUPGpJyHcVPw1Q19SCy6uPxlMAFd X-Received: by 2002:a62:6303:: with SMTP id x3mr24997604pfb.110.1550498769631; Mon, 18 Feb 2019 06:06:09 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550498769; cv=none; d=google.com; s=arc-20160816; b=QvbtYMMpODkcveiduoy8ihFxtx23Kqdhj1e5EB0D6NqoUZ27eA+r46cf+Wz1uhBRof a+bsQrClDLVKWa1EV1a/cr3PVVnz6SAkO52eveNiktR7oWSJTGauAL2Br2Ll7DRmz7n2 gy9HxMIH4sG4VMlXzuhr1NsxBa6ZMQs99kGXkbnMmCzHGSsknjUEDZAd6M9aXQtNQkc0 MmSRpBoSZKTcFYa/ixmrzHtCGwYvk97XEd9BsT1FfCa5TXW3fqj74QeCuvB7Vhm1nx11 B00LD8t5+r9kp+rV+uJt55+D/3hOl0ueB4uVo65GMQmVEd6WqoF2YcRFWAzLarDlQL2b CEjQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=3XiBs7Ol5LVBzwPEJhilKGtkOwW7Gma3TfsPc2o6CTM=; b=IxhaYH2W4ed//qNgcGsKDgp0OvUPfuNiWWPUUsNS0kRvOc1JkpksIqjvvlUyc+6cFP D5MCeSvgLzMkjuVbYV/7uDBx5bq7k6yw0ATNGnSxKdUJ5c2eO3MN3iC9CvzLbkM10TWg jk2cohKMfOVoHbYZnc915/7n0LlYSGmrEAVy6X/55rrOdsgBslxTraVDlSkIT4irUclh TNDnh+IJKBZybSYrZozE1Pt97pCwA9PWQQMJtVoQuhBd7ZDdxcaDG1Y1Rv3A9lTfA8eb 07EeUFgqocnvnaAk22qGAzbLAyNbgeVKeCHpu3QaINoujp1qNKrsAfRUJtmpZZCGAHJ0 P0Ew== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0fW1g2Xa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c4si2389861pfn.83.2019.02.18.06.05.53; Mon, 18 Feb 2019 06:06:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=0fW1g2Xa; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390017AbfBROEv (ORCPT + 99 others); Mon, 18 Feb 2019 09:04:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:47348 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389973AbfBROEs (ORCPT ); Mon, 18 Feb 2019 09:04:48 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.ziggo.nl [83.86.89.107]) (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 7A23221908; Mon, 18 Feb 2019 14:04:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498688; bh=f2fdH5ehsZ0A9l2BluGcts9s4Bp2gfTz43PVkdcGBN0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0fW1g2Xa6sflkzJVnIxn1m66w/uACRS3hOQheN9buOzoYE3xM4Uf6keFz4AwF/fQm GOgjvupLMokEsOgNGI8r03ovv2LDmFotpZzoFfzDa5MxZPMAjSA6SAmb8foYOSa8el H3UEVcLXOMSaTML0w5aTB2syxJGcToVMPWC47wC0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Leonid Iziumtsev , Vinod Koul Subject: [PATCH 4.4 088/143] dmaengine: imx-dma: fix wrong callback invoke Date: Mon, 18 Feb 2019 14:43:36 +0100 Message-Id: <20190218133532.278858029@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Leonid Iziumtsev commit 341198eda723c8c1cddbb006a89ad9e362502ea2 upstream. 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. Signed-off-by: Leonid Iziumtsev Signed-off-by: Vinod Koul Cc: stable@vger.kernel.org Signed-off-by: Greg Kroah-Hartman --- drivers/dma/imx-dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) --- a/drivers/dma/imx-dma.c +++ b/drivers/dma/imx-dma.c @@ -619,7 +619,7 @@ static void imxdma_tasklet(unsigned long { 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); @@ -649,10 +649,10 @@ static void imxdma_tasklet(unsigned long 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); }