DMA Engine development
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Dan Williams <dan.j.williams@intel.com>,
	Vinod Koul <vkoul@kernel.org>,
	dmaengine@vger.kernel.org
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Seraj Alijan <seraj.alijan@sondrel.com>
Subject: [PATCH v1 2/6] dmaengine: dmatest: Fix process hang when reading 'wait' parameter
Date: Fri, 24 Apr 2020 19:11:43 +0300	[thread overview]
Message-ID: <20200424161147.16895-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20200424161147.16895-1-andriy.shevchenko@linux.intel.com>

If we do

  % echo 1 > /sys/module/dmatest/parameters/run
  [  115.851124] dmatest: Could not start test, no channels configured

  % echo dma8chan7 > /sys/module/dmatest/parameters/channel
  [  127.563872] dmatest: Added 1 threads using dma8chan7

  % cat /sys/module/dmatest/parameters/wait
  ... !!! HANG !!! ...

The culprit is the commit 6138f967bccc

  ("dmaengine: dmatest: Use fixed point div to calculate iops")

which makes threads not to run, but pending and being kicked off by writing
to the 'run' node. However, it forgot to consider 'wait' routine to avoid
above mentioned case.

In order to fix this, check for really running threads, i.e. with pending
and done flags unset.

It's pity the culprit commit hadn't updated documentation and tested all
possible scenarios.

Fixes: 6138f967bccc ("dmaengine: dmatest: Use fixed point div to calculate iops")
Cc: Seraj Alijan <seraj.alijan@sondrel.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 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 4993e3e5c5b01..307622e765996 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -240,7 +240,7 @@ static bool is_threaded_test_run(struct dmatest_info *info)
 		struct dmatest_thread *thread;
 
 		list_for_each_entry(thread, &dtc->threads, node) {
-			if (!thread->done)
+			if (!thread->done && !thread->pending)
 				return true;
 		}
 	}
@@ -1192,7 +1192,7 @@ static int dmatest_chan_set(const char *val, const struct kernel_param *kp)
 		mutex_unlock(&info->lock);
 		return ret;
 	}
-	/*Clear any previously run threads */
+	/* Clear any previously run threads */
 	if (!is_threaded_test_run(info) && !is_threaded_test_pending(info))
 		stop_threaded_test(info);
 	/* Reject channels that are already registered */
-- 
2.26.2


  reply	other threads:[~2020-04-24 16:11 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-04-24 16:11 [PATCH v1 1/6] dmaengine: dmatest: Fix iteration non-stop logic Andy Shevchenko
2020-04-24 16:11 ` Andy Shevchenko [this message]
2020-04-27 16:16   ` [PATCH v1 2/6] dmaengine: dmatest: Fix process hang when reading 'wait' parameter Vinod Koul
2020-04-24 16:11 ` [PATCH v1 3/6] Revert "dmaengine: dmatest: timeout value of -1 should specify infinite wait" Andy Shevchenko
2020-04-27 16:18   ` Vinod Koul
2020-04-24 16:11 ` [PATCH v1 4/6] dmaengine: dmatest: Allow negative timeout value to specify infinite wait Andy Shevchenko
2020-04-27 16:18   ` Vinod Koul
2020-04-24 16:11 ` [PATCH v1 5/6] dmaengine: dmatest: Describe members of struct dmatest_params Andy Shevchenko
2020-04-27 16:21   ` Vinod Koul
2020-04-24 16:11 ` [PATCH v1 6/6] dmaengine: dmatest: Describe members of struct dmatest_info Andy Shevchenko
2020-04-27 16:22   ` Vinod Koul
2020-04-27  8:09 ` [PATCH v1 1/6] dmaengine: dmatest: Fix iteration non-stop logic Nicolas Ferre
2020-04-27 16:16 ` Vinod Koul

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200424161147.16895-2-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=seraj.alijan@sondrel.com \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox