Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177643101
D61628.1794930567.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None
D61628.1794930567.diff
View Options
diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h
--- a/sys/dev/nvme/nvme.h
+++ b/sys/dev/nvme/nvme.h
@@ -2142,7 +2142,7 @@
uint8_t feature, uint32_t cdw11,
void *payload, uint32_t payload_size,
nvme_cb_fn_t cb_fn, void *cb_arg);
-void nvme_ctrlr_cmd_get_log_page(struct nvme_controller *ctrlr,
+int nvme_ctrlr_cmd_get_log_page(struct nvme_controller *ctrlr,
uint8_t log_page, uint32_t nsid,
void *payload, uint32_t payload_size,
nvme_cb_fn_t cb_fn, void *cb_arg);
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
@@ -1394,13 +1394,15 @@
aer->log_page_size = 0;
len = nvme_ctrlr_get_log_page_size(aer->ctrlr, aer->log_page_id);
- nvme_ctrlr_cmd_get_log_page(aer->ctrlr, aer->log_page_id,
+ if (nvme_ctrlr_cmd_get_log_page(aer->ctrlr, aer->log_page_id,
NVME_GLOBAL_NAMESPACE_TAG, aer->log_page_buffer, len,
- nvme_ctrlr_aer_done, aer);
- mtx_lock(&aer->mtx);
- while (aer->log_page_size == 0)
- mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0);
- mtx_unlock(&aer->mtx);
+ nvme_ctrlr_aer_done, aer) == 0) {
+ mtx_lock(&aer->mtx);
+ while (aer->log_page_size == 0)
+ mtx_sleep(aer, &aer->mtx, PRIBIO, "nvme_pt", 0);
+ mtx_unlock(&aer->mtx);
+ } else
+ aer->log_page_size = (uint32_t)-1;
if (aer->log_page_size == (uint32_t)-1) {
/*
diff --git a/sys/dev/nvme/nvme_ctrlr_cmd.c b/sys/dev/nvme/nvme_ctrlr_cmd.c
--- a/sys/dev/nvme/nvme_ctrlr_cmd.c
+++ b/sys/dev/nvme/nvme_ctrlr_cmd.c
@@ -256,7 +256,7 @@
cdw11, 0, 0, 0, 0, NULL, 0, cb_fn, cb_arg);
}
-void
+int
nvme_ctrlr_cmd_get_log_page(struct nvme_controller *ctrlr, uint8_t log_page,
uint32_t nsid, void *payload, uint32_t payload_size, nvme_cb_fn_t cb_fn,
void *cb_arg)
@@ -270,6 +270,8 @@
*/
req = nvme_allocate_request_vaddr(payload, payload_size,
M_NOWAIT, cb_fn, cb_arg);
+ if (req == NULL)
+ return (ENOMEM);
cmd = &req->cmd;
cmd->opc = NVME_OPC_GET_LOG_PAGE;
@@ -279,9 +281,10 @@
cmd->cdw10 = htole32(cmd->cdw10);
nvme_ctrlr_submit_admin_request(ctrlr, req);
+ return (0);
}
-void
+int
nvme_ctrlr_cmd_get_error_page(struct nvme_controller *ctrlr,
struct nvme_error_information_entry *payload, uint32_t num_entries,
nvme_cb_fn_t cb_fn, void *cb_arg)
@@ -296,30 +299,31 @@
if (num_entries > (ctrlr->cdata.elpe + 1))
num_entries = ctrlr->cdata.elpe + 1;
- nvme_ctrlr_cmd_get_log_page(ctrlr, NVME_LOG_ERROR,
+ return (nvme_ctrlr_cmd_get_log_page(ctrlr, NVME_LOG_ERROR,
NVME_GLOBAL_NAMESPACE_TAG, payload, sizeof(*payload) * num_entries,
- cb_fn, cb_arg);
+ cb_fn, cb_arg));
}
-void
+int
nvme_ctrlr_cmd_get_health_information_page(struct nvme_controller *ctrlr,
uint32_t nsid, struct nvme_health_information_page *payload,
nvme_cb_fn_t cb_fn, void *cb_arg)
{
- nvme_ctrlr_cmd_get_log_page(ctrlr, NVME_LOG_HEALTH_INFORMATION,
- nsid, payload, sizeof(*payload), cb_fn, cb_arg);
+ return (nvme_ctrlr_cmd_get_log_page(ctrlr,
+ NVME_LOG_HEALTH_INFORMATION, nsid, payload, sizeof(*payload),
+ cb_fn, cb_arg));
}
-void
+int
nvme_ctrlr_cmd_get_firmware_page(struct nvme_controller *ctrlr,
struct nvme_firmware_page *payload, nvme_cb_fn_t cb_fn, void *cb_arg)
{
- nvme_ctrlr_cmd_get_log_page(ctrlr, NVME_LOG_FIRMWARE_SLOT,
+ return (nvme_ctrlr_cmd_get_log_page(ctrlr, NVME_LOG_FIRMWARE_SLOT,
NVME_GLOBAL_NAMESPACE_TAG, payload, sizeof(*payload), cb_fn,
- cb_arg);
+ cb_arg));
}
-void
+int
nvme_ctrlr_cmd_abort(struct nvme_controller *ctrlr, uint16_t cid,
uint16_t sqid, nvme_cb_fn_t cb_fn, void *cb_arg)
{
@@ -331,10 +335,13 @@
* context and abort commands as part of that.
*/
req = nvme_allocate_request_null(M_NOWAIT, cb_fn, cb_arg);
+ if (req == NULL)
+ return (ENOMEM);
cmd = &req->cmd;
cmd->opc = NVME_OPC_ABORT;
cmd->cdw10 = htole32((cid << 16) | sqid);
nvme_ctrlr_submit_admin_request(ctrlr, req);
+ return (0);
}
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
@@ -416,17 +416,17 @@
void *cb_arg);
void nvme_ctrlr_cmd_set_arbitration(struct nvme_controller *ctrlr,
uint32_t cdw11, nvme_cb_fn_t cb_fn, void *cb_arg);
-void nvme_ctrlr_cmd_get_error_page(struct nvme_controller *ctrlr,
+int nvme_ctrlr_cmd_get_error_page(struct nvme_controller *ctrlr,
struct nvme_error_information_entry *payload,
uint32_t num_entries, /* 0 = max */
nvme_cb_fn_t cb_fn,
void *cb_arg);
-void nvme_ctrlr_cmd_get_health_information_page(struct nvme_controller *ctrlr,
+int nvme_ctrlr_cmd_get_health_information_page(struct nvme_controller *ctrlr,
uint32_t nsid,
struct nvme_health_information_page *payload,
nvme_cb_fn_t cb_fn,
void *cb_arg);
-void nvme_ctrlr_cmd_get_firmware_page(struct nvme_controller *ctrlr,
+int nvme_ctrlr_cmd_get_firmware_page(struct nvme_controller *ctrlr,
struct nvme_firmware_page *payload,
nvme_cb_fn_t cb_fn,
void *cb_arg);
@@ -448,7 +448,7 @@
void nvme_ctrlr_cmd_set_async_event_config(struct nvme_controller *ctrlr,
uint32_t state,
nvme_cb_fn_t cb_fn, void *cb_arg);
-void nvme_ctrlr_cmd_abort(struct nvme_controller *ctrlr, uint16_t cid,
+int nvme_ctrlr_cmd_abort(struct nvme_controller *ctrlr, uint16_t cid,
uint16_t sqid, nvme_cb_fn_t cb_fn, void *cb_arg);
void nvme_completion_poll_cb(void *arg, const struct nvme_completion *cpl);
diff --git a/sys/dev/nvme/nvme_qpair.c b/sys/dev/nvme/nvme_qpair.c
--- a/sys/dev/nvme/nvme_qpair.c
+++ b/sys/dev/nvme/nvme_qpair.c
@@ -1015,10 +1015,21 @@
naborts = i;
mtx_unlock(&qpair->lock);
- for (i = 0; i < naborts; i++)
- nvme_ctrlr_cmd_abort(ctrlr,
- qpair->cid_base + abort_tr[i]->cid, qpair->id,
- nvme_abort_complete, abort_tr[i]);
+ for (i = 0; i < naborts; i++) {
+ tr = abort_tr[i];
+ if (nvme_ctrlr_cmd_abort(ctrlr,
+ qpair->cid_base + tr->cid, qpair->id,
+ nvme_abort_complete, tr) == 0)
+ continue;
+
+ /* No memory; retry on a later pass. */
+ mtx_lock(&qpair->lock);
+ if (qpair->act_tr[tr->cid] == tr &&
+ tr->abort_state == NVME_ABORT_SENT)
+ tr->abort_state = NVME_ABORT_NONE;
+ mtx_unlock(&qpair->lock);
+ atomic_subtract_int(&ctrlr->outstanding_aborts, 1);
+ }
break;
case RECOVERY_WAITING:
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Nov 17, 3:49 PM (18 h, 18 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41802424
Default Alt Text
D61628.1794930567.diff (6 KB)
Attached To
Mode
D61628: nvme: handle request allocation failure in the AER and abort paths
Attached
Detach File
Event Timeline