Page MenuHomeFreeBSD

D61636.1794930466.diff
No OneTemporary

Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None

D61636.1794930466.diff

diff --git a/sys/dev/nvme/nvme_ctrlr.c b/sys/dev/nvme/nvme_ctrlr.c
--- a/sys/dev/nvme/nvme_ctrlr.c
+++ b/sys/dev/nvme/nvme_ctrlr.c
@@ -862,6 +862,7 @@
} else
ctrlr->async_event_config |= NVME_CRIT_WARN_ST_TEMPERATURE;
+ ctrlr->crit_warn_masked = 0;
nvme_ctrlr_cmd_set_async_event_config(ctrlr,
ctrlr->async_event_config, NULL, NULL);
@@ -1388,6 +1389,39 @@
mtx_unlock(&aer->mtx);
}
+static void
+nvme_ctrlr_health_task(void *arg, int pending)
+{
+ struct nvme_completion_poll_status status;
+ struct nvme_controller *ctrlr = arg;
+ struct nvme_health_information_page *hp;
+ uint32_t cleared;
+
+ if (ctrlr->is_failed || ctrlr->is_failed_admin || ctrlr->is_dying ||
+ ctrlr->is_resetting || ctrlr->crit_warn_masked == 0)
+ return;
+
+ hp = malloc(sizeof(*hp), M_NVME, M_WAITOK);
+ status.done = 0;
+ nvme_ctrlr_cmd_get_health_information_page(ctrlr,
+ NVME_GLOBAL_NAMESPACE_TAG, hp, nvme_completion_poll_cb, &status);
+ nvme_completion_poll(&status);
+ if (!nvme_completion_is_error(&status.cpl)) {
+ cleared = ctrlr->crit_warn_masked & ~hp->critical_warning;
+ if (cleared != 0) {
+ atomic_clear_32(&ctrlr->crit_warn_masked, cleared);
+ atomic_set_32(&ctrlr->async_event_config, cleared);
+ nvme_ctrlr_cmd_set_async_event_config(ctrlr,
+ ctrlr->async_event_config, NULL, NULL);
+ }
+ }
+ free(hp, M_NVME);
+
+ if (ctrlr->crit_warn_masked != 0)
+ taskqueue_enqueue_timeout(ctrlr->taskqueue,
+ &ctrlr->health_task, hz * NVME_HEALTH_POLL_PERIOD);
+}
+
static void
nvme_ctrlr_aer_task(void *arg, int pending)
{
@@ -1481,10 +1515,15 @@
*/
nvme_ctrlr_log_critical_warnings(aer->ctrlr,
health_info->critical_warning);
- aer->ctrlr->async_event_config &=
- ~health_info->critical_warning;
+ atomic_set_32(&aer->ctrlr->crit_warn_masked,
+ health_info->critical_warning &
+ aer->ctrlr->async_event_config);
+ atomic_clear_32(&aer->ctrlr->async_event_config,
+ health_info->critical_warning);
nvme_ctrlr_cmd_set_async_event_config(aer->ctrlr,
aer->ctrlr->async_event_config, NULL, NULL);
+ taskqueue_enqueue_timeout(aer->ctrlr->taskqueue,
+ &aer->ctrlr->health_task, hz * NVME_HEALTH_POLL_PERIOD);
} else if (aer->log_page_id == NVME_LOG_CHANGED_NAMESPACE) {
device_t *children;
int n_children;
@@ -1973,6 +2012,8 @@
TASK_INIT(&ctrlr->reset_task, 0, nvme_ctrlr_reset_task, ctrlr);
TIMEOUT_TASK_INIT(ctrlr->taskqueue, &ctrlr->timestamp_task, 0,
nvme_ctrlr_timestamp_task, ctrlr);
+ TIMEOUT_TASK_INIT(ctrlr->taskqueue, &ctrlr->health_task, 0,
+ nvme_ctrlr_health_task, ctrlr);
for (int i = 0; i < NVME_MAX_ASYNC_EVENTS; i++) {
struct nvme_async_event_request *aer = &ctrlr->aer[i];
@@ -2074,6 +2115,7 @@
if (ctrlr->taskqueue) {
taskqueue_drain_timeout(ctrlr->taskqueue,
&ctrlr->timestamp_task);
+ taskqueue_drain_timeout(ctrlr->taskqueue, &ctrlr->health_task);
taskqueue_free(ctrlr->taskqueue);
for (int i = 0; i < NVME_MAX_ASYNC_EVENTS; i++) {
struct nvme_async_event_request *aer = &ctrlr->aer[i];
diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h
--- a/sys/dev/nvme/nvme_private.h
+++ b/sys/dev/nvme/nvme_private.h
@@ -78,6 +78,7 @@
#define NVME_MAX_NAMESPACES (16)
#define NVME_MAX_ASYNC_EVENTS (8)
+#define NVME_HEALTH_POLL_PERIOD (60) /* seconds */
#define NVME_ADMIN_TIMEOUT_PERIOD (60) /* in seconds */
#define NVME_DEFAULT_TIMEOUT_PERIOD (30) /* in seconds */
@@ -325,6 +326,8 @@
/** bit mask of event types currently enabled for async events */
uint32_t async_event_config;
+ uint32_t crit_warn_masked;
+ struct timeout_task health_task;
uint32_t num_aers;
struct nvme_async_event_request aer[NVME_MAX_ASYNC_EVENTS];

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 17, 3:47 PM (18 h, 16 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41802425
Default Alt Text
D61636.1794930466.diff (3 KB)

Event Timeline