From patchwork Mon Oct 24 11:31:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 8858 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp433062wru; Mon, 24 Oct 2022 05:48:30 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5Uy8NMia0WMDL2q8H++ulHg+5wKpyeKMdf2bJAz/vm9QCuvt7HAnRNiF6C2gBbzzID1kHy X-Received: by 2002:a17:90a:c306:b0:211:8e5e:9a66 with SMTP id g6-20020a17090ac30600b002118e5e9a66mr27743686pjt.152.1666615710378; Mon, 24 Oct 2022 05:48:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666615710; cv=none; d=google.com; s=arc-20160816; b=HDxOoxMjfSC6BlMIf7GvKlXJGBmxTBkcOOK7V7pCtc5c11m/+YeZM7e2vCVpQ0neDf /V7KX0AnhM26XGHrSbo0ca9EGTpcU5DZW0AmdaXnCd10IeRv0ileH0LzJGK2TWOuQCfH og2hVB6RF2nST0hh0SofjVbCuKK9fkSJtBsyDK+4GUu1gbtJg+zM2WApbzmyW7yMIWzn 6HqzEkE1eBjBlLdOzcN6a2LiSTNdT/4aOrwAqNWSG0avzcopT+lgfco0ika2oQyCMGrs 67W/50Vp06snF6RGOdxubpfVr+v7Ob3uAnkWkdacnpUmXSQhNNPV50hGmzNd0CpwAgsZ drNg== 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=XtDRhPPwHXNon0FrE7eUw5MG1CpN+Fr0WFNJKzq7zjw=; b=C7CZyIUBSvYM4gAR/ad+2GZKwz390lxxIUtzmG5xdQ6kWdZoql+pKvg7g7QRbT5v2o /6u3BigYW6TDSxSr09gMwjL1wR34f7PG6YTYNReDHDqrNt/JJib8+HiwOZRtdQDrpe7i d3LOrbLHk/umGC65WMyiaLEPxFBfNJQNAjDWuEr3IfXmXnXBXP71SSlo7zQyay5taDWR qGVLmPAFvW94/+CQTcM482C+XK2L+nR8vPpguo8R8ksvCw02GbCdKXDXZymH4DcNoeK/ Wey+HR1Cffj6UsXuxxa8M1Hpzoi3XZJ2ZkRoHROFCjN6O+Ic7YAEYoOwbhkIY5HRO5Jj z+Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=Pux5b9MF; 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 iz4-20020a170902ef8400b00186b1bb14a0si1623637plb.559.2022.10.24.05.48.13; Mon, 24 Oct 2022 05:48:30 -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=Pux5b9MF; 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 S232142AbiJXMgx (ORCPT + 99 others); Mon, 24 Oct 2022 08:36:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53848 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234393AbiJXMaM (ORCPT ); Mon, 24 Oct 2022 08:30:12 -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 837B53C8FA; Mon, 24 Oct 2022 05:04:15 -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 44E7CB811B2; Mon, 24 Oct 2022 11:51:44 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9A643C433C1; Mon, 24 Oct 2022 11:51:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666612303; bh=7BCEeXtMurlzH+XH4KqgBzBeshKByJRUGnyql6ZfYFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Pux5b9MFpXDh8sdNarUl8RnThUQHfRzTMnPhchsATAhzV+cSJPJitmbxgyjwoB5vV Brp2gu1+ZZlUcrlPmdpT6iomLZB1GFxRofuJvn/jtps3CU3z95gPatNL7rHsebG23r YMZVWTcpzGaKtsmFjtf7Nn/OdSY2aAOXKRhXv8dQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dave Jiang , Vinod Koul , Sasha Levin Subject: [PATCH 4.14 147/210] dmaengine: ioat: stop mod_timer from resurrecting deleted timer in __cleanup() Date: Mon, 24 Oct 2022 13:31:04 +0200 Message-Id: <20221024113001.743869123@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024112956.797777597@linuxfoundation.org> References: <20221024112956.797777597@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?1747573235257253307?= X-GMAIL-MSGID: =?utf-8?q?1747573235257253307?= From: Dave Jiang [ Upstream commit 898ec89dbb55b8294695ad71694a0684e62b2a73 ] User reports observing timer event report channel halted but no error observed in CHANERR register. The driver finished self-test and released channel resources. Debug shows that __cleanup() can call mod_timer() after the timer has been deleted and thus resurrect the timer. While harmless, it causes suprious error message to be emitted. Use mod_timer_pending() call to prevent deleted timer from being resurrected. Fixes: 3372de5813e4 ("dmaengine: ioatdma: removal of dma_v3.c and relevant ioat3 references") Signed-off-by: Dave Jiang Link: https://lore.kernel.org/r/166360672197.3851724.17040290563764838369.stgit@djiang5-desk3.ch.intel.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/ioat/dma.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/dma/ioat/dma.c b/drivers/dma/ioat/dma.c index 4c2b41beaf63..6f167a082832 100644 --- a/drivers/dma/ioat/dma.c +++ b/drivers/dma/ioat/dma.c @@ -654,7 +654,7 @@ static void __cleanup(struct ioatdma_chan *ioat_chan, dma_addr_t phys_complete) if (active - i == 0) { dev_dbg(to_dev(ioat_chan), "%s: cancel completion timeout\n", __func__); - mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); + mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); } /* microsecond delay by sysfs variable per pending descriptor */ @@ -680,7 +680,7 @@ static void ioat_cleanup(struct ioatdma_chan *ioat_chan) if (chanerr & (IOAT_CHANERR_HANDLE_MASK | IOAT_CHANERR_RECOVER_MASK)) { - mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); + mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); ioat_eh(ioat_chan); } } @@ -872,7 +872,7 @@ static void check_active(struct ioatdma_chan *ioat_chan) } if (test_and_clear_bit(IOAT_CHAN_ACTIVE, &ioat_chan->state)) - mod_timer(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); + mod_timer_pending(&ioat_chan->timer, jiffies + IDLE_TIMEOUT); } void ioat_timer_event(unsigned long data)