From patchwork Mon Oct 24 11:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10242 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp643341wru; Mon, 24 Oct 2022 13:41:18 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7nwjR0wJ4v04paLb8CIizlhHU3fE5YODRmf26nZzbgJHPc1FMUrMjA2zTGUapfa9JX4o0X X-Received: by 2002:a17:902:9a07:b0:178:8024:1393 with SMTP id v7-20020a1709029a0700b0017880241393mr35250983plp.128.1666644066983; Mon, 24 Oct 2022 13:41:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666644066; cv=none; d=google.com; s=arc-20160816; b=Yi5MLGrDHiWrGyFUSywiFrTPaeppE00YgGDkGftin9U02BHITHn/Mn7ED8V0EvJ2AX g+m3D+dAFwpm5ZF8ydUhyBrcgecEWBfUcy+1C+N0NYl0PLPOL1SttZ9LhxxKDtjv8BN3 YUaAeXghmFfQyt8WMiZJSAqZP8GdK7MjrWrAd04hoKsJMQ3BHNYxNWAJtnZRhcnZk/K2 uZFBWvRYl2ipuEPmQqr5aPWPLoUhaCem6asw8Mib+ZWZfs7nkfk3LOke8ab2xQS4YAzF Q7Pr6tYymFZFNRSw3Iid0fva6is9Tqbx1XItAjAf6+D7VXQNZCC3YhBN95Fdh0TqXCVx OAZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=4JfWa4/pLrxu+M1UnZK1vW7j1sAH1s5jsGiqSpF1riA=; b=h6WySI3Yba+o5F9KlrIDQ+PTG/tPjL++B/l1aQhYyGXesiqSU5ll8rKwPmiXGWrMpW 44bZ8txStF30+zOfIbjHtdYT40RUCrVWZT8jUgfRQtcU0EleNE4oy0zcmxEWpJyw81Qe nIlYrvBaJEc4ILjFcUXXkGtFu+71g5R9hAEIlyFpyGJaBp7sp+3u0V2dl47ffAKwCIqJ 6Sk7pBmphTxN/hb9W1bLZ3QxPwNAmHwnoCIYqgi4/M2e0fleXSrzPwGBK1lFjwG8rKls 9JWq6Gz9sxX6bG8td+vTTStKV1FHeiVrwNhQOWfftu5bvyWMxi3epRwCAHC9yo/YE0ra Ee+w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kOPnyxYk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id z6-20020a17090a7b8600b0020055731860si934459pjc.105.2022.10.24.13.40.51; Mon, 24 Oct 2022 13:41:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=kOPnyxYk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234706AbiJXUkO (ORCPT + 99 others); Mon, 24 Oct 2022 16:40:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42894 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234776AbiJXUjK (ORCPT ); Mon, 24 Oct 2022 16:39:10 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 641E354CB4; Mon, 24 Oct 2022 11:50:08 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id A5A5DB818CA; Mon, 24 Oct 2022 12:47:17 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0A468C433D6; Mon, 24 Oct 2022 12:47:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615636; bh=t/ybkTw5o5DQeKuhsC3Y22PxU+b6JRca7y1WVn2fkBM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kOPnyxYk6njV6MTx27RrzH0nl03L51e0wHVGRMSFwNp7ATvgNghboeZNOYhYt2jUG 09pjF8iWfkRvHxYeI6GYKmTVIvbIt2dLNxWLJocYW6KMRgUbNTXfA9xsqfbPfMAPJe SOKmTXx3jbt+seuYxBf9KJgnTtBs9QkFdGwu99xE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jie Hai , Zhou Wang , Vinod Koul , Sasha Levin Subject: [PATCH 5.15 296/530] dmaengine: hisilicon: Add multi-thread support for a DMA channel Date: Mon, 24 Oct 2022 13:30:40 +0200 Message-Id: <20221024113058.463935931@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747602969199530494?= X-GMAIL-MSGID: =?utf-8?q?1747602969199530494?= From: Jie Hai [ Upstream commit 2cbb95883c990d0002a77e13d3278913ab26ad79 ] When we get a DMA channel and try to use it in multiple threads it will cause oops and hanging the system. % echo 100 > /sys/module/dmatest/parameters/threads_per_chan % echo 100 > /sys/module/dmatest/parameters/iterations % echo 1 > /sys/module/dmatest/parameters/run [383493.327077] Unable to handle kernel paging request at virtual address dead000000000108 [383493.335103] Mem abort info: [383493.335103] ESR = 0x96000044 [383493.335105] EC = 0x25: DABT (current EL), IL = 32 bits [383493.335107] SET = 0, FnV = 0 [383493.335108] EA = 0, S1PTW = 0 [383493.335109] FSC = 0x04: level 0 translation fault [383493.335110] Data abort info: [383493.335111] ISV = 0, ISS = 0x00000044 [383493.364739] CM = 0, WnR = 1 [383493.367793] [dead000000000108] address between user and kernel address ranges [383493.375021] Internal error: Oops: 96000044 [#1] PREEMPT SMP [383493.437574] CPU: 63 PID: 27895 Comm: dma0chan0-copy2 Kdump: loaded Tainted: GO 5.17.0-rc4+ #2 [383493.457851] pstate: 204000c9 (nzCv daIF +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [383493.465331] pc : vchan_tx_submit+0x64/0xa0 [383493.469957] lr : vchan_tx_submit+0x34/0xa0 This occurs because the transmission timed out, and that's due to data race. Each thread rewrite channels's descriptor as soon as device_issue_pending is called. It leads to the situation that the driver thinks that it uses the right descriptor in interrupt handler while channels's descriptor has been changed by other thread. The descriptor which in fact reported interrupt will not be handled any more, as well as its tx->callback. That's why timeout reports. With current fixes channels' descriptor changes it's value only when it has been used. A new descriptor is acquired from vc->desc_issued queue that is already filled with descriptors that are ready to be sent. Threads have no direct access to DMA channel descriptor. In case of channel's descriptor is busy, try to submit to HW again when a descriptor is completed. In this case, vc->desc_issued may be empty when hisi_dma_start_transfer is called, so delete error reporting on this. Now it is just possible to queue a descriptor for further processing. Fixes: e9f08b65250d ("dmaengine: hisilicon: Add Kunpeng DMA engine support") Signed-off-by: Jie Hai Acked-by: Zhou Wang Link: https://lore.kernel.org/r/20220830062251.52993-4-haijie1@huawei.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/hisi_dma.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/dma/hisi_dma.c b/drivers/dma/hisi_dma.c index 9e6ce3731ca5..df6be7ca340c 100644 --- a/drivers/dma/hisi_dma.c +++ b/drivers/dma/hisi_dma.c @@ -271,7 +271,6 @@ static void hisi_dma_start_transfer(struct hisi_dma_chan *chan) vd = vchan_next_desc(&chan->vc); if (!vd) { - dev_err(&hdma_dev->pdev->dev, "no issued task!\n"); chan->desc = NULL; return; } @@ -303,7 +302,7 @@ static void hisi_dma_issue_pending(struct dma_chan *c) spin_lock_irqsave(&chan->vc.lock, flags); - if (vchan_issue_pending(&chan->vc)) + if (vchan_issue_pending(&chan->vc) && !chan->desc) hisi_dma_start_transfer(chan); spin_unlock_irqrestore(&chan->vc.lock, flags); @@ -441,11 +440,10 @@ static irqreturn_t hisi_dma_irq(int irq, void *data) chan->qp_num, chan->cq_head); if (FIELD_GET(STATUS_MASK, cqe->w0) == STATUS_SUCC) { vchan_cookie_complete(&desc->vd); + hisi_dma_start_transfer(chan); } else { dev_err(&hdma_dev->pdev->dev, "task error!\n"); } - - chan->desc = NULL; } spin_unlock(&chan->vc.lock);