Received: by 2002:ac0:946b:0:0:0:0:0 with SMTP id j40csp2713468imj; Mon, 11 Feb 2019 07:23:00 -0800 (PST) X-Google-Smtp-Source: AHgI3IbXVbO+vhXjpVMMbBbXyRadEEQJgOfTj0NeVdx1CdZ/cXZpFs0dPyYYDuA6sEP0e5eCvV4J X-Received: by 2002:a63:8948:: with SMTP id v69mr13911877pgd.140.1549898580625; Mon, 11 Feb 2019 07:23:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1549898580; cv=none; d=google.com; s=arc-20160816; b=fq3Ws+0GoogLrBWQra+lytCgxzMa5vLPXLZ96XC0slXVGGJ29jBpWdxe5/ymBbaCbI hTAm/r7+ZV6JWYfxfcSp+yLjb1C/acbDnRVW+XfAZE80M16UVDJ3KXwaftL+S9uhmQdR g1WLoqyxO1oUk8E2zyiBU/AnUyVpbVD/IS1++8UK+MhBBkNEK1k05FcuBSKOfPTGjm/d 4wbuFXFqdNN3ygRin4gRKVvConhHaJzukdPeTXZMsQb/7MlnGP0yiubK3H+oetPBkkmZ ygvhK2ZK3xhEYtyInfKTTNsvgur/839P9uzKGxdYTeLYFqAAe/0GGHGtuaZa1/QGZalu VbOw== 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=gVC68hFTc96q2BrRM7f654OeAkPMAO/kw/dAI+M+HbE=; b=sa6iMf3ElI6sxpmb8Phel0/uQQu9uCX/nlU40mlwe23mpZ+b3J/m7430pr5wDSy5am +BdkZq+vNgGvArC9EJL3zyRhxj4TSuiI04rB/ZmONIKpufMdPvY2C+lTOFFoabVOvnvv w5ptlpfXutqdeKgX/gSSs51RQp8+5L28MQCBPJbms2pWqUxbLMhH7QzjbuQAbQZn2pnD hFIussK47KTGakESRuqK/NQvCZvYcabrY0enzVupu6EmwygO5ulurrrJDBh6pVn9r2xT 6Y5RB1ETUhv/+UQMd03p9qAUT/fuwHPvviMBSZJnf/zzx5lLTbRgEwqLd3shH+NO063v HEzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=BK6Wb7gU; 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 q2si5368850plh.79.2019.02.11.07.22.30; Mon, 11 Feb 2019 07:23:00 -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=BK6Wb7gU; 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 S2390800AbfBKPEa (ORCPT + 99 others); Mon, 11 Feb 2019 10:04:30 -0500 Received: from mail.kernel.org ([198.145.29.99]:53496 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729551AbfBKPE3 (ORCPT ); Mon, 11 Feb 2019 10:04:29 -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 B6516222B0; Mon, 11 Feb 2019 15:04:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897468; bh=IQ/zWVScjqhYrr+OJSup8jh86bkLNU2Fpca9/2P2ghg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BK6Wb7gUCMBIR51LQrAAYBcNigaAeXtS7vzaG6iY04N2480SyCHGRyNqw+TZPHukl S4/rQ7Tuho/Y0Ne97wUJp7m3JzMciP1sVQ/mkWOo7XWhx6xLZCEvMFLZIBmj8ErQsB y0pWMQGXV6ijD/ajTp6409ct30E20fovx2L7MXuA= 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.14 182/205] dmaengine: imx-dma: fix wrong callback invoke Date: Mon, 11 Feb 2019 15:19:40 +0100 Message-Id: <20190211141840.289756490@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141827.214852402@linuxfoundation.org> References: <20190211141827.214852402@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.14-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 @@ -623,7 +623,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); @@ -653,10 +653,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); }