From: Shuah Khan <skhan@linuxfoundation.org>
To: gregkh@linuxfoundation.org, rafael@kernel.org,
keescook@chromium.org, peterz@infradead.org
Cc: Shuah Khan <skhan@linuxfoundation.org>, linux-kernel@vger.kernel.org
Subject: [PATCH v2 05/13] drivers/base/test/test_async_driver_probe: convert to use seqnum_ops
Date: Fri, 13 Nov 2020 10:46:07 -0700 [thread overview]
Message-ID: <633b231ad210279f0a5af0508db016812c8da496.1605287778.git.skhan@linuxfoundation.org> (raw)
In-Reply-To: <cover.1605287778.git.skhan@linuxfoundation.org>
Sequence Number api provides interfaces for unsigned atomic up counters
leveraging atomic_t and atomic64_t ops underneath.
atomic_t variables used to count errors, warns, keep track of timeout,
and async completion are counters. Convert them to use seqnum32 and init
counters to 0.
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
---
drivers/base/test/test_async_driver_probe.c | 28 +++++++++++++--------
1 file changed, 17 insertions(+), 11 deletions(-)
diff --git a/drivers/base/test/test_async_driver_probe.c b/drivers/base/test/test_async_driver_probe.c
index 3bb7beb127a9..75a3b617dcac 100644
--- a/drivers/base/test/test_async_driver_probe.c
+++ b/drivers/base/test/test_async_driver_probe.c
@@ -14,11 +14,15 @@
#include <linux/numa.h>
#include <linux/nodemask.h>
#include <linux/topology.h>
+#include <linux/seqnum_ops.h>
#define TEST_PROBE_DELAY (5 * 1000) /* 5 sec */
#define TEST_PROBE_THRESHOLD (TEST_PROBE_DELAY / 2)
-static atomic_t warnings, errors, timeout, async_completed;
+static struct seqnum32 warnings = SEQNUM_INIT(0);
+static struct seqnum32 errors = SEQNUM_INIT(0);
+static struct seqnum32 timeout = SEQNUM_INIT(0);
+static struct seqnum32 async_completed = SEQNUM_INIT(0);
static int test_probe(struct platform_device *pdev)
{
@@ -29,9 +33,9 @@ static int test_probe(struct platform_device *pdev)
* have then report it as an error, otherwise we wil sleep for the
* required amount of time and then report completion.
*/
- if (atomic_read(&timeout)) {
+ if (seqnum32_fetch(&timeout)) {
dev_err(dev, "async probe took too long\n");
- atomic_inc(&errors);
+ seqnum32_inc_return(&errors);
} else {
dev_dbg(&pdev->dev, "sleeping for %d msecs in probe\n",
TEST_PROBE_DELAY);
@@ -48,10 +52,10 @@ static int test_probe(struct platform_device *pdev)
dev_to_node(dev) != numa_node_id()) {
dev_warn(dev, "NUMA node mismatch %d != %d\n",
dev_to_node(dev), numa_node_id());
- atomic_inc(&warnings);
+ seqnum32_inc_return(&warnings);
}
- atomic_inc(&async_completed);
+ seqnum32_inc_return(&async_completed);
}
return 0;
@@ -244,11 +248,12 @@ static int __init test_async_probe_init(void)
* Otherwise if they completed without errors or warnings then
* report successful completion.
*/
- if (atomic_read(&async_completed) != async_id) {
+ if (seqnum32_fetch(&async_completed) != async_id) {
pr_err("async events still pending, forcing timeout\n");
- atomic_inc(&timeout);
+ seqnum32_inc_return(&timeout);
err = -ETIMEDOUT;
- } else if (!atomic_read(&errors) && !atomic_read(&warnings)) {
+ } else if (!seqnum32_fetch(&errors) &&
+ !seqnum32_fetch(&warnings)) {
pr_info("completed successfully\n");
return 0;
}
@@ -271,12 +276,13 @@ static int __init test_async_probe_init(void)
* errors or warnings being reported by the probe routine.
*/
if (err)
- atomic_inc(&errors);
+ seqnum32_inc_return(&errors);
else
err = -EINVAL;
- pr_err("Test failed with %d errors and %d warnings\n",
- atomic_read(&errors), atomic_read(&warnings));
+ pr_err("Test failed with %u errors and %u warnings\n",
+ seqnum32_fetch(&errors),
+ seqnum32_fetch(&warnings));
return err;
}
--
2.27.0
next prev parent reply other threads:[~2020-11-13 17:47 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-13 17:46 [PATCH v2 00/13] Introduce seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 01/13] seqnum_ops: Introduce Sequence Number Ops Shuah Khan
2020-11-13 21:03 ` Matthew Wilcox
2020-11-16 14:49 ` Peter Zijlstra
2020-11-16 14:58 ` Peter Zijlstra
2020-11-17 14:50 ` Shuah Khan
2020-11-17 15:21 ` Peter Zijlstra
2020-11-17 16:34 ` Shuah Khan
2020-11-17 17:38 ` Matthew Wilcox
2020-11-17 18:23 ` Shuah Khan
2020-11-17 18:24 ` Shuah Khan
2020-11-16 14:53 ` Peter Zijlstra
2020-11-17 16:15 ` Shuah Khan
2020-11-13 17:46 ` [PATCH v2 02/13] selftests: lib:test_seqnum_ops: add new test for seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 03/13] drivers/acpi: convert seqno seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 04/13] drivers/acpi/apei: convert seqno to seqnum_ops Shuah Khan
2020-11-13 17:46 ` Shuah Khan [this message]
2020-11-13 17:46 ` [PATCH v2 06/13] drivers/char/ipmi: convert stats to use seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 07/13] drivers/edac: convert pci counters to seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 08/13] drivers/oprofile: convert stats to use seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 09/13] drivers/staging/rtl8723bs: " Shuah Khan
2020-11-13 17:46 ` [PATCH v2 10/13] usb: usbip/vhci: convert seqno to seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 11/13] drivers/staging/rtl8188eu: convert stats to use seqnum_ops Shuah Khan
2020-11-13 17:46 ` [PATCH v2 12/13] drivers/staging/unisys/visorhba: " Shuah Khan
2020-11-13 17:46 ` [PATCH v2 13/13] security/integrity/ima: converts stats to seqnum_ops Shuah Khan
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=633b231ad210279f0a5af0508db016812c8da496.1605287778.git.skhan@linuxfoundation.org \
--to=skhan@linuxfoundation.org \
--cc=gregkh@linuxfoundation.org \
--cc=keescook@chromium.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peterz@infradead.org \
--cc=rafael@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
all inboxes | Powered by JetHome®