apply led update in bio_bs_state_set

Features: nvme
Signed-off-by: Tom Nabarro <thomas.nabarro@hpe.com>

Author: tanabarr

src/bio/bio_device.c

@@ -49,12 +49,6 @@ revive_dev(struct bio_xs_context *xs_ctxt, struct bio_bdev *d_bdev)
 	d_bdev->bb_trigger_reint = 1;
 	spdk_thread_send_msg(owner_thread(bbs), setup_bio_bdev, d_bdev);
 
-	/* Reset the LED of the VMD device once revived */
-	rc = bio_led_manage(xs_ctxt, NULL, d_bdev->bb_uuid, (unsigned int)CTL__LED_ACTION__RESET,
-			    NULL, 0);
-	if (rc != 0)
-		DL_ERROR(rc, "Reset LED on device:" DF_UUID " failed", DP_UUID(d_bdev->bb_uuid));
-
 	return 0;
 }
 

src/bio/bio_monitor.c

@@ -49,12 +49,6 @@ struct vid_opts {
 	uint16_t			 vid;
 };
 
-/* Used for managing LED on init xstream when auto-faulty is triggered */
-struct led_msg_arg {
-	struct bio_xs_context *xs;
-	uuid_t                 dev_uuid;
-};
-
 /* Collect space utilization for blobstore */
 static void
 collect_bs_usage(struct spdk_blob_store *bs, struct nvme_stats *stats)
@@ -739,45 +733,6 @@ is_bbs_faulty(struct bio_blobstore *bbs)
 	return false;
 }
 
-/* Callback to set LED on init xstream when auto-faulty is triggered */
-static void
-set_led_faulty(void *arg)
-{
-	struct led_msg_arg *led_msg   = arg;
-	Ctl__LedState       led_state = CTL__LED_STATE__ON;
-	int                 rc;
-
-	D_ASSERT(led_msg->xs != NULL);
-
-	rc = bio_led_manage(led_msg->xs, NULL, led_msg->dev_uuid,
-			    (unsigned int)CTL__LED_ACTION__SET, (unsigned int *)&led_state, 0);
-	if (rc != 0)
-		DL_ERROR(rc, "Failed to set LED to FAULTY state on device:" DF_UUID,
-			 DP_UUID(led_msg->dev_uuid));
-
-	D_FREE(led_msg);
-}
-
-static void
-send_set_led_faulty(struct bio_blobstore *bbs)
-{
-	struct led_msg_arg *led_msg;
-
-	/* Set LED to FAULTY state on init xstream */
-	if (init_thread() != NULL) {
-		D_ALLOC_PTR(led_msg);
-		if (led_msg == NULL) {
-			D_ERROR("Failed to allocate LED message for device:" DF_UUID "\n",
-				DP_UUID(bbs->bb_dev->bb_uuid));
-			return;
-		}
-
-		uuid_copy(led_msg->dev_uuid, bbs->bb_dev->bb_uuid);
-		led_msg->xs = bbs->bb_owner_xs;
-		spdk_thread_send_msg(init_thread(), set_led_faulty, led_msg);
-	}
-}
-
 void
 auto_faulty_detect(struct bio_blobstore *bbs)
 {
@@ -820,19 +775,14 @@ auto_faulty_detect(struct bio_blobstore *bbs)
 		smd_dev_free_info(dev_info);
 
 		rc = smd_dev_set_state(bbs->bb_dev->bb_uuid, SMD_DEV_FAULTY);
-		if (rc) {
+		if (rc)
 			DL_ERROR(rc, "Set device state failed.");
-		} else {
+		else
 			trigger_faulty_reaction(bbs);
-			send_set_led_faulty(bbs);
-		}
 	} else {
 		rc = bio_bs_state_set(bbs, BIO_BS_STATE_FAULTY);
-		if (rc) {
+		if (rc)
 			DL_ERROR(rc, "Failed to set FAULTY state.");
-		} else {
-			send_set_led_faulty(bbs);
-		}
 	}
 
 	if (rc == 0)

src/bio/bio_recovery.c

@@ -1,6 +1,6 @@
 /**
  * (C) Copyright 2018-2024 Intel Corporation.
- * (C) Copyright 2025 Hewlett Packard Enterprise Development LP
+ * (C) Copyright 2025-2026 Hewlett Packard Enterprise Development LP
  *
  * SPDX-License-Identifier: BSD-2-Clause-Patent
  */
@@ -95,7 +95,7 @@ teardown_xs_bs(void *arg)
 
 		bio_blob_close(ioc, true);
 	}
- 
+
 	if (opened_blobs) {
 		D_DEBUG(DB_MGMT, "blobstore:%p has %d opened blobs\n",
 			bxb->bxb_blobstore, opened_blobs);
@@ -426,6 +426,52 @@ on_setup(struct bio_blobstore *bbs)
 	return rc;
 }
 
+/* Used for managing LED on init xstream when auto-faulty is triggered */
+struct led_msg_arg {
+	struct bio_xs_context *xs;
+	Ctl__LedState          state;
+	uuid_t                 dev_uuid;
+};
+
+/* Callback to set LED on init xstream when auto-faulty is triggered */
+static void
+set_led(void *arg)
+{
+	struct led_msg_arg *led_msg = arg;
+	int                 rc;
+
+	D_ASSERT(led_msg->xs != NULL);
+
+	rc = bio_led_manage(led_msg->xs, NULL, led_msg->dev_uuid,
+			    (unsigned int)CTL__LED_ACTION__SET, (unsigned int *)&led_msg->state, 0);
+	if (rc != 0)
+		DL_ERROR(rc, "Failed to set LED to FAULTY state on device:" DF_UUID,
+			 DP_UUID(led_msg->dev_uuid));
+
+	D_FREE(led_msg);
+}
+
+static void
+send_set_led(struct bio_blobstore *bbs, Ctl__LedState led_state)
+{
+	struct led_msg_arg *led_msg;
+
+	/* Set LED to FAULTY state on init xstream */
+	if (init_thread() != NULL) {
+		D_ALLOC_PTR(led_msg);
+		if (led_msg == NULL) {
+			D_ERROR("Failed to allocate LED message for device:" DF_UUID "\n",
+				DP_UUID(bbs->bb_dev->bb_uuid));
+			return;
+		}
+
+		uuid_copy(led_msg->dev_uuid, bbs->bb_dev->bb_uuid);
+		led_msg->xs    = bbs->bb_owner_xs;
+		led_msg->state = led_state;
+		spdk_thread_send_msg(init_thread(), set_led, led_msg);
+	}
+}
+
 int
 bio_bs_state_set(struct bio_blobstore *bbs, enum bio_bs_state new_state)
 {
@@ -496,6 +542,9 @@ bio_bs_state_set(struct bio_blobstore *bbs, enum bio_bs_state new_state)
 			if (rc)
 				D_ERROR("Set device state failed. "DF_RC"\n",
 					DP_RC(rc));
+			send_set_led(bbs, CTL__LED_STATE__ON);
+		} else {
+			send_set_led(bbs, CTL__LED_STATE__OFF);
 		}
 	}
 	ABT_mutex_unlock(bbs->bb_mutex);

src/bio/bio_xstream.c

@@ -2059,7 +2059,7 @@ scan_bio_bdevs(struct bio_xs_context *ctxt, uint64_t now)
 }
 
 void
-bio_led_event_monitor(struct bio_xs_context *ctxt, uint64_t now)
+bio_led_reset_on_timeout(struct bio_xs_context *ctxt, uint64_t now)
 {
 	struct bio_bdev         *d_bdev;
 	int			 rc;
@@ -2125,7 +2125,7 @@ bio_nvme_poll(struct bio_xs_context *ctxt)
 	/* Detect new plugged device, manage LED on init xstream */
 	if (is_init_xstream(ctxt)) {
 		scan_bio_bdevs(ctxt, now);
-		bio_led_event_monitor(ctxt, now);
+		bio_led_reset_on_timeout(ctxt, now);
 	}
 
 	/* Detect stalled I/Os */