linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Jonathan Cameron <jic23@kernel.org>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Peter Meerwald <pmeerw@pmeerw.net>
Cc: linux-iio@vger.kernel.org, Lars-Peter Clausen <lars@metafoo.de>
Subject: [PATCH 8/8] DO NOT APPLY! __iio_update_buffers error path testing
Date: Wed, 13 May 2015 16:04:51 +0200	[thread overview]
Message-ID: <1431525891-19285-9-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1431525891-19285-1-git-send-email-lars@metafoo.de>

This patch is not meant to be applied. This is what I've been using to test
the error paths. I've included it in case somebody wants to re-test things
or future changes to __iio_update_buffers.

For testing I've basically kept the following script running for about 30
minutes:
	while true; do
		echo 1 > buffer/enable
		sleep 1
		echo 0.1 > buffer/enable
		sleep 0.1
	done;

After that I did set test_err_paths to 0 and things worked again as if
nothing happened. kmemleak didn't complain either.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/industrialio-buffer.c | 56 ++++++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 21 deletions(-)

diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
index 3a11a2a..13c45f6 100644
--- a/drivers/iio/industrialio-buffer.c
+++ b/drivers/iio/industrialio-buffer.c
@@ -13,6 +13,9 @@
  * - Better memory allocation techniques?
  * - Alternative access techniques?
  */
+
+#define DEBUG
+
 #include <linux/kernel.h>
 #include <linux/export.h>
 #include <linux/device.h>
@@ -27,6 +30,29 @@
 #include <linux/iio/sysfs.h>
 #include <linux/iio/buffer.h>
 
+#include <linux/module.h>
+#include <linux/random.h>
+
+static int test_err_path = 1;
+module_param(test_err_path, int, 0644);
+MODULE_PARM_DESC(test_err_path, "test");
+
+static int _random_err(const char *func)
+{
+	if (test_err_path && (prandom_u32() & 0xf) == 0) {
+		pr_info("Injected error for %s\n", func);
+		return -EIO;
+	}
+
+	return 0;
+}
+
+#define random_err(x) (_random_err(#x) ?: (x))
+#define random_err_callback(x, ...) \
+	(_random_err(#x) ?: (x ? x(__VA_ARGS__) : 0))
+#define random_err_callback2(x, ...) \
+	((x ? (x(__VA_ARGS__) ?: _random_err(#x)) : _random_err(#x)))
+
 static const char * const iio_endian_prefix[] = {
 	[IIO_BE] = "be",
 	[IIO_LE] = "le",
@@ -568,15 +594,13 @@ static int iio_buffer_request_update(struct iio_dev *indio_dev,
 	int ret;
 
 	iio_buffer_update_bytes_per_datum(indio_dev, buffer);
-	if (buffer->access->request_update) {
-		ret = buffer->access->request_update(buffer);
+		ret = random_err_callback(buffer->access->request_update, buffer);
 		if (ret) {
 			dev_dbg(&indio_dev->dev,
 			       "Buffer not started: buffer parameter update failed (%d)\n",
 				ret);
 			return ret;
 		}
-	}
 
 	return 0;
 }
@@ -686,17 +710,13 @@ static int iio_disable_buffers(struct iio_dev *indio_dev)
 	 * encountered.
 	 */
 
-	if (indio_dev->setup_ops->predisable) {
-		ret2 = indio_dev->setup_ops->predisable(indio_dev);
+		ret2 = random_err_callback2(indio_dev->setup_ops->predisable, indio_dev);
 		if (ret2 && !ret)
 			ret = ret2;
-	}
 
-	if (indio_dev->setup_ops->postdisable) {
-		ret = indio_dev->setup_ops->postdisable(indio_dev);
+		ret2 = random_err_callback2(indio_dev->setup_ops->postdisable, indio_dev);
 		if (ret2 && !ret)
 			ret = ret2;
-	}
 
 	indio_dev->currentmode = INDIO_DIRECT_MODE;
 	iio_free_scan_mask(indio_dev, indio_dev->active_scan_mask);
@@ -718,18 +738,15 @@ static int iio_enable_buffers(struct iio_dev *indio_dev,
 	iio_update_demux(indio_dev);
 
 	/* Wind up again */
-	if (indio_dev->setup_ops->preenable) {
-		ret = indio_dev->setup_ops->preenable(indio_dev);
+		ret = random_err_callback(indio_dev->setup_ops->preenable, indio_dev);
 		if (ret) {
 			dev_dbg(&indio_dev->dev,
 			       "Buffer not started: buffer preenable failed (%d)\n", ret);
 			goto err_undo_config;
 		}
-	}
 
-	if (indio_dev->info->update_scan_mode) {
-		ret = indio_dev->info
-			->update_scan_mode(indio_dev,
+		ret = random_err_callback(indio_dev->info
+			->update_scan_mode, indio_dev,
 					   indio_dev->active_scan_mask);
 		if (ret < 0) {
 			dev_dbg(&indio_dev->dev,
@@ -737,16 +754,13 @@ static int iio_enable_buffers(struct iio_dev *indio_dev,
 				ret);
 			goto err_run_postdisable;
 		}
-	}
 
-	if (indio_dev->setup_ops->postenable) {
-		ret = indio_dev->setup_ops->postenable(indio_dev);
+		ret = random_err_callback(indio_dev->setup_ops->postenable, indio_dev);
 		if (ret) {
 			dev_dbg(&indio_dev->dev,
 			       "Buffer not started: postenable failed (%d)\n", ret);
 			goto err_run_postdisable;
 		}
-	}
 
 	return 0;
 
@@ -767,8 +781,8 @@ static int __iio_update_buffers(struct iio_dev *indio_dev,
 	struct iio_device_config new_config;
 	int ret;
 
-	ret = iio_verify_update(indio_dev, insert_buffer, remove_buffer,
-		&new_config);
+	ret = random_err(iio_verify_update(indio_dev, insert_buffer, remove_buffer,
+		&new_config));
 	if (ret)
 		return ret;
 
-- 
1.8.0


      parent reply	other threads:[~2015-05-13 14:05 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-13 14:04 [PATCH 0/8] iio: Refactor __iio_update_buffers() Lars-Peter Clausen
2015-05-13 14:04 ` [PATCH 1/8] iio: Replace printk in __iio_update_buffers with dev_dbg Lars-Peter Clausen
2015-05-17  8:42   ` Jonathan Cameron
2015-05-13 14:04 ` [PATCH 2/8] iio: __iio_update_buffers: Slightly refactor scan mask memory management Lars-Peter Clausen
2015-05-17  8:48   ` Jonathan Cameron
2015-05-13 14:04 ` [PATCH 3/8] iio: __iio_update_buffers: Perform request_update() only for new buffers Lars-Peter Clausen
2015-05-17  9:01   ` Jonathan Cameron
2015-05-13 14:04 ` [PATCH 4/8] iio: __iio_update_buffers: Update mode before preenable/after postdisable Lars-Peter Clausen
2015-05-17  9:10   ` Jonathan Cameron
2015-05-17 11:38     ` Lars-Peter Clausen
2015-05-17 11:44       ` Jonathan Cameron
2015-05-13 14:04 ` [PATCH 5/8] iio: __iio_update_buffers: Verify configuration before starting to apply it Lars-Peter Clausen
2015-05-17  9:14   ` Jonathan Cameron
2015-05-13 14:04 ` [PATCH 6/8] iio: __iio_update_buffers: Split enable and disable path into helper functions Lars-Peter Clausen
2015-05-17  9:17   ` Jonathan Cameron
2015-05-13 14:04 ` [PATCH 7/8] iio: __iio_update_buffers: Leave device in sane state on error Lars-Peter Clausen
2015-05-17  9:22   ` Jonathan Cameron
2015-05-13 14:04 ` Lars-Peter Clausen [this message]

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=1431525891-19285-9-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=pmeerw@pmeerw.net \
    /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;
as well as URLs for NNTP newsgroup(s).