Blame SOURCES/0026-ndctl-scrub-Reread-scrub-engine-status-at-start.patch

26ccd9
From 4e646fa490ba4b782afa188dd8818b94c419924e Mon Sep 17 00:00:00 2001
26ccd9
From: Dan Williams <dan.j.williams@intel.com>
26ccd9
Date: Wed, 26 May 2021 16:33:10 -0700
26ccd9
Subject: [PATCH 026/217] ndctl/scrub: Reread scrub-engine status at start
0670da
26ccd9
Given that the kernel has exponential backoff to cover the lack of
26ccd9
interrupts for scrub completion status there is a reasonable likelihood
26ccd9
that 'ndctl start-scrub' is issued while the hardware/platform scrub-state
26ccd9
is idle, but the kernel engine poll timer has not fired.
0670da
26ccd9
Trigger at least one poll cycle for the kernel to re-read the scrub-state
26ccd9
before reporting that ARS is busy.
0670da
26ccd9
Link: https://lore.kernel.org/r/162207199057.3715490.2469820075085914776.stgit@dwillia2-desk3.amr.corp.intel.com
26ccd9
Reported-by: Krzysztof Rusocki <krzysztof.rusocki@intel.com>
26ccd9
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
26ccd9
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
26ccd9
---
26ccd9
 ndctl/lib/libndctl.c | 12 +++++++++++-
26ccd9
 1 file changed, 11 insertions(+), 1 deletion(-)
0670da
0670da
diff --git a/ndctl/lib/libndctl.c b/ndctl/lib/libndctl.c
0670da
index e5641fe..536e142 100644
0670da
--- a/ndctl/lib/libndctl.c
0670da
+++ b/ndctl/lib/libndctl.c
0670da
@@ -1354,8 +1354,18 @@ static int __ndctl_bus_get_scrub_state(struct ndctl_bus *bus,
0670da
 NDCTL_EXPORT int ndctl_bus_start_scrub(struct ndctl_bus *bus)
0670da
 {
0670da
 	struct ndctl_ctx *ctx = ndctl_bus_get_ctx(bus);
0670da
+	int rc;
0670da
+
0670da
+	rc = sysfs_write_attr(ctx, bus->scrub_path, "1\n");
0670da
 
0670da
-	return sysfs_write_attr(ctx, bus->scrub_path, "1\n");
0670da
+	/*
0670da
+	 * Try at least 1 poll cycle before reporting busy in case this
0670da
+	 * request hits the kernel's exponential backoff while the
0670da
+	 * hardware/platform scrub state is idle.
0670da
+	 */
0670da
+	if (rc == -EBUSY && ndctl_bus_poll_scrub_completion(bus, 1, 1) == 0)
0670da
+		return sysfs_write_attr(ctx, bus->scrub_path, "1\n");
0670da
+	return rc;
0670da
 }
0670da
 
0670da
 NDCTL_EXPORT int ndctl_bus_get_scrub_state(struct ndctl_bus *bus)
26ccd9
-- 
26ccd9
2.27.0
26ccd9