Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177643069
D61626.1794930451.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D61626.1794930451.diff
View Options
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
@@ -1244,8 +1244,10 @@
void
nvme_admin_qpair_enable(struct nvme_qpair *qpair)
{
+ STAILQ_HEAD(, nvme_request) aborts, temp;
struct nvme_tracker *tr;
struct nvme_tracker *tr_temp;
+ struct nvme_request *req;
bool rpt;
/*
@@ -1269,8 +1271,28 @@
mtx_lock(&qpair->recovery);
mtx_lock(&qpair->lock);
nvme_qpair_enable(qpair);
+
+ /* A queued Abort names a command the reset has completed. */
+ STAILQ_INIT(&aborts);
+ STAILQ_INIT(&temp);
+ STAILQ_SWAP(&qpair->queued_req, &temp, nvme_request);
+ while ((req = STAILQ_FIRST(&temp)) != NULL) {
+ STAILQ_REMOVE_HEAD(&temp, stailq);
+ if (req->cmd.opc == NVME_OPC_ABORT)
+ STAILQ_INSERT_TAIL(&aborts, req, stailq);
+ else
+ _nvme_qpair_submit_request(qpair, req);
+ }
+
mtx_unlock(&qpair->lock);
mtx_unlock(&qpair->recovery);
+
+ while ((req = STAILQ_FIRST(&aborts)) != NULL) {
+ STAILQ_REMOVE_HEAD(&aborts, stailq);
+ nvme_qpair_manual_complete_request(qpair, req,
+ NVME_SCT_GENERIC, NVME_SC_ABORTED_BY_REQUEST, 1,
+ ERROR_PRINT_NONE);
+ }
}
void
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Nov 17, 3:47 PM (18 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41801893
Default Alt Text
D61626.1794930451.diff (1 KB)
Attached To
Mode
D61626: nvme: submit queued admin requests when the admin qpair is enabled
Attached
Detach File
Event Timeline