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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 1216EC38A24 for ; Thu, 7 May 2020 14:31:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id E299F2073A for ; Thu, 7 May 2020 14:31:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861908; bh=wePsFmqJ7mZw7fVqHVy88Ek5wS2DY9kKE6u0r5yOkmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=Yb370sQ1fLt4cHkZ4tUH3O9rSpGvecuTzoCI/bz16NuEdJbaWB9GL+fSJkSa6xoe8 Lv4MazUuLM+vxRQDgHYyoXMlYpSgu81YjywVjFsauaaRo+Wx5F+I970KOUMl7P/vn8 xY9fg7uP7q4q4UhtISeOVw9AGmA/xTs3w0SBBgmY= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728732AbgEGObr (ORCPT ); Thu, 7 May 2020 10:31:47 -0400 Received: from mail.kernel.org ([198.145.29.99]:58866 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728116AbgEGOaN (ORCPT ); Thu, 7 May 2020 10:30:13 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9458420870; Thu, 7 May 2020 14:30:11 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588861812; bh=wePsFmqJ7mZw7fVqHVy88Ek5wS2DY9kKE6u0r5yOkmc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0VVcUUnUqrf5v8eEOgoPjNiaVFqLEklgEwf6GPZduD4JiQ7K2+cGDT03FP7fzZqoX s4VuvAQAwVUofmA43LefElrurJNCL3++GwLqxyiQ9hvC4TCM7xlcrpI7sv158ALuWO mOXkCQjAew+5eTxKxKpkXuWmiGtJ0XdXOmACfvgQ= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , Dan Williams , Nicolas Ferre , Vinod Koul , Sasha Levin , dmaengine@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 07/11] dmaengine: dmatest: Fix iteration non-stop logic Date: Thu, 7 May 2020 10:29:59 -0400 Message-Id: <20200507143003.27047-7-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200507143003.27047-1-sashal@kernel.org> References: <20200507143003.27047-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Shevchenko [ Upstream commit b9f960201249f20deea586b4ec814669b4c6b1c0 ] Under some circumstances, i.e. when test is still running and about to time out and user runs, for example, grep -H . /sys/module/dmatest/parameters/* the iterations parameter is not respected and test is going on and on until user gives echo 0 > /sys/module/dmatest/parameters/run This is not what expected. The history of this bug is interesting. I though that the commit 2d88ce76eb98 ("dmatest: add a 'wait' parameter") is a culprit, but looking closer to the code I think it simple revealed the broken logic from the day one, i.e. in the commit 0a2ff57d6fba ("dmaengine: dmatest: add a maximum number of test iterations") which adds iterations parameter. So, to the point, the conditional of checking the thread to be stopped being first part of conjunction logic prevents to check iterations. Thus, we have to always check both conditions to be able to stop after given iterations. Since it wasn't visible before second commit appeared, I add a respective Fixes tag. Fixes: 2d88ce76eb98 ("dmatest: add a 'wait' parameter") Cc: Dan Williams Cc: Nicolas Ferre Signed-off-by: Andy Shevchenko Acked-by: Nicolas Ferre Link: https://lore.kernel.org/r/20200424161147.16895-1-andriy.shevchenko@linux.intel.com Signed-off-by: Vinod Koul Signed-off-by: Sasha Levin --- drivers/dma/dmatest.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c index 7dd46cf5ed845..7a028b57a7efb 100644 --- a/drivers/dma/dmatest.c +++ b/drivers/dma/dmatest.c @@ -505,8 +505,8 @@ static int dmatest_func(void *data) flags = DMA_CTRL_ACK | DMA_PREP_INTERRUPT; ktime = ktime_get(); - while (!kthread_should_stop() - && !(params->iterations && total_tests >= params->iterations)) { + while (!(kthread_should_stop() || + (params->iterations && total_tests >= params->iterations))) { struct dma_async_tx_descriptor *tx = NULL; struct dmaengine_unmap_data *um; dma_addr_t srcs[src_cnt]; -- 2.20.1