[PATCH] dmaengine: dmatest: add a maximum number of test iterations

[PATCH] dmaengine: dmatest: add a maximum number of test iterations

[Nicolas Ferre]

The dmatest usually waits for the killing of its kthreads to stop
running tests.  This patch adds a parameter that sets a maximum
number of test iterations.

This feature is quite interesting for debugging when you set a lot of
traces in your dmaengine controller driver.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 drivers/dma/dmatest.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index fb7da51..0131a1f 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -38,6 +38,11 @@ module_param(max_channels, uint, S_IRUGO);
 MODULE_PARM_DESC(max_channels,
 		"Maximum number of channels to use (default: all)");
 
+static unsigned int iteration_nbr = 0;
+module_param(iteration_nbr, uint, S_IRUGO);
+MODULE_PARM_DESC(iteration_nbr,
+		"Iteration number before stopping test (default: infinite)");
+
 static unsigned int xor_sources = 3;
 module_param(xor_sources, uint, S_IRUGO);
 MODULE_PARM_DESC(xor_sources,
@@ -270,7 +275,8 @@ static int dmatest_func(void *data)
 
 	flags = DMA_CTRL_ACK | DMA_COMPL_SKIP_DEST_UNMAP | DMA_PREP_INTERRUPT;
 
-	while (!kthread_should_stop()) {
+	while (!kthread_should_stop()
+	       && !(iteration_nbr && total_tests >= iteration_nbr)) {
 		struct dma_device *dev = chan->device;
 		struct dma_async_tx_descriptor *tx = NULL;
 		dma_addr_t dma_srcs[src_cnt];
@@ -416,6 +422,13 @@ err_srcbuf:
 err_srcs:
 	pr_notice("%s: terminating after %u tests, %u failures (status %d)\n",
 			thread_name, total_tests, failed_tests, ret);
+
+	if (iteration_nbr > 0)
+		while (!kthread_should_stop()) {
+			DECLARE_WAIT_QUEUE_HEAD(wait_dmatest_exit);
+			interruptible_sleep_on(&wait_dmatest_exit);
+		}
+
 	return ret;
 }
 
-- 
1.5.3.7

[PATCH] dmaengine: dmatest: add a maximum number of test iterations

[Nicolas Ferre]

The dmatest usually waits for the killing of its kthreads to stop
running tests.  This patch adds a parameter that sets a maximum
number of test iterations.

This feature is quite interesting for debugging when you set a lot of
traces in your dmaengine controller driver.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
---
 drivers/dma/dmatest.c |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
index fb7da51..0131a1f 100644
--- a/drivers/dma/dmatest.c
+++ b/drivers/dma/dmatest.c
@@ -38,6 +38,11 @@ module_param(max_channels, uint, S_IRUGO);
 MODULE_PARM_DESC(max_channels,
 		"Maximum number of channels to use (default: all)");
 
+static unsigned int iteration_nbr = 0;
+module_param(iteration_nbr, uint, S_IRUGO);
+MODULE_PARM_DESC(iteration_nbr,
+		"Iteration number before stopping test (default: infinite)");
+
 static unsigned int xor_sources = 3;
 module_param(xor_sources, uint, S_IRUGO);
 MODULE_PARM_DESC(xor_sources,
@@ -270,7 +275,8 @@ static int dmatest_func(void *data)
 
 	flags = DMA_CTRL_ACK | DMA_COMPL_SKIP_DEST_UNMAP | DMA_PREP_INTERRUPT;
 
-	while (!kthread_should_stop()) {
+	while (!kthread_should_stop()
+	       && !(iteration_nbr && total_tests >= iteration_nbr)) {
 		struct dma_device *dev = chan->device;
 		struct dma_async_tx_descriptor *tx = NULL;
 		dma_addr_t dma_srcs[src_cnt];
@@ -416,6 +422,13 @@ err_srcbuf:
 err_srcs:
 	pr_notice("%s: terminating after %u tests, %u failures (status %d)\n",
 			thread_name, total_tests, failed_tests, ret);
+
+	if (iteration_nbr > 0)
+		while (!kthread_should_stop()) {
+			DECLARE_WAIT_QUEUE_HEAD(wait_dmatest_exit);
+			interruptible_sleep_on(&wait_dmatest_exit);
+		}
+
 	return ret;
 }
 
-- 
1.5.3.7

Re: [PATCH] dmaengine: dmatest: add a maximum number of test iterations

[Dan Williams]

On Fri, Jul 3, 2009 at 10:26 AM, Nicolas Ferre<nicolas.ferre@atmel.com> wrote:
> The dmatest usually waits for the killing of its kthreads to stop
> running tests.  This patch adds a parameter that sets a maximum
> number of test iterations.
>
> This feature is quite interesting for debugging when you set a lot of
> traces in your dmaengine controller driver.
>
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
> ---
>  drivers/dma/dmatest.c |   15 ++++++++++++++-
>  1 files changed, 14 insertions(+), 1 deletions(-)
>
> diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
> index fb7da51..0131a1f 100644
> --- a/drivers/dma/dmatest.c
> +++ b/drivers/dma/dmatest.c
> @@ -38,6 +38,11 @@ module_param(max_channels, uint, S_IRUGO);
>  MODULE_PARM_DESC(max_channels,
>                "Maximum number of channels to use (default: all)");
>
> +static unsigned int iteration_nbr = 0;
> +module_param(iteration_nbr, uint, S_IRUGO);
> +MODULE_PARM_DESC(iteration_nbr,
> +               "Iteration number before stopping test (default: infinite)");
> +

This is a minor nit, but for a user facing interface I don't think we
should export abbreviated variable names.  I'll apply this with the
following fixups:

s/iteration_nbr/iterations/
s/Iteration number/Iterations/

...as well as a fix for the checkpatch violation of initializing a static to 0.

Thanks,
Dan

Re: [PATCH] dmaengine: dmatest: add a maximum number of test iterations

[Nicolas Ferre]

Dan Williams :
> On Fri, Jul 3, 2009 at 10:26 AM, Nicolas Ferre<nicolas.ferre@atmel.com> wrote:
>> The dmatest usually waits for the killing of its kthreads to stop
>> running tests.  This patch adds a parameter that sets a maximum
>> number of test iterations.
>>
>> This feature is quite interesting for debugging when you set a lot of
>> traces in your dmaengine controller driver.
>>
>> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
>> ---
>>  drivers/dma/dmatest.c |   15 ++++++++++++++-
>>  1 files changed, 14 insertions(+), 1 deletions(-)
>>
>> diff --git a/drivers/dma/dmatest.c b/drivers/dma/dmatest.c
>> index fb7da51..0131a1f 100644
>> --- a/drivers/dma/dmatest.c
>> +++ b/drivers/dma/dmatest.c
>> @@ -38,6 +38,11 @@ module_param(max_channels, uint, S_IRUGO);
>>  MODULE_PARM_DESC(max_channels,
>>                "Maximum number of channels to use (default: all)");
>>
>> +static unsigned int iteration_nbr = 0;
>> +module_param(iteration_nbr, uint, S_IRUGO);
>> +MODULE_PARM_DESC(iteration_nbr,
>> +               "Iteration number before stopping test (default: infinite)");
>> +
> 
> This is a minor nit, but for a user facing interface I don't think we
> should export abbreviated variable names.  I'll apply this with the
> following fixups:
> 
> s/iteration_nbr/iterations/
> s/Iteration number/Iterations/
> 
> ...as well as a fix for the checkpatch violation of initializing a static to 0.

Ok fine.
(initialization to 0 has also been corrected by Andrew Morton in his
patch series).

Thanks Dan, Bye,
-- 
Nicolas Ferre

RE: [PATCH] dmaengine: dmatest: add a maximum number of test iterations

[Sosnowski, Maciej]

Nicolas Ferre wrote:
> The dmatest usually waits for the killing of its kthreads to stop
> running tests.  This patch adds a parameter that sets a maximum
> number of test iterations.
> 
> This feature is quite interesting for debugging when you set a lot of
> traces in your dmaengine controller driver.
> 
> Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

Acked-by: Maciej Sosnowski <maciej.sosnowski@intel.com>