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

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