Skip to content

Commit dd0b0a4

Browse files
huww98keithbusch
huww98
authored and
keithbusch
committed
nvme: rename CDR/MORE/DNR to NVME_STATUS_*
CDR/MORE/DNR fields are not belonging to SC in the NVMe spec, rename them to NVME_STATUS_* to avoid confusion. Signed-off-by: Weiwen Hu <huweiwen@linux.alibaba.com> Reviewed-by: Sagi Grimberg <sagi@grimberg.me> Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Keith Busch <kbusch@kernel.org>
1 parent d89a5c6 commit dd0b0a4

16 files changed

Lines changed: 125 additions & 125 deletions

File tree

‎drivers/nvme/host/core.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static void nvme_retry_req(struct request *req)
307307
u16 crd;
308308

309309
/* The mask and shift result must be <= 3 */
310-
crd = (nvme_req(req)->status & NVME_SC_CRD) >> 11;
310+
crd = (nvme_req(req)->status & NVME_STATUS_CRD) >> 11;
311311
if (crd)
312312
delay = nvme_req(req)->ctrl->crdt[crd - 1] * 100;
313313

@@ -331,8 +331,8 @@ static void nvme_log_error(struct request *req)
331331
nvme_get_error_status_str(nr->status),
332332
NVME_SCT(nr->status), /* Status Code Type */
333333
nr->status & NVME_SC_MASK, /* Status Code */
334-
nr->status & NVME_SC_MORE ? "MORE " : "",
335-
nr->status & NVME_SC_DNR ? "DNR " : "");
334+
nr->status & NVME_STATUS_MORE ? "MORE " : "",
335+
nr->status & NVME_STATUS_DNR ? "DNR " : "");
336336
return;
337337
}
338338

@@ -343,8 +343,8 @@ static void nvme_log_error(struct request *req)
343343
nvme_get_error_status_str(nr->status),
344344
NVME_SCT(nr->status), /* Status Code Type */
345345
nr->status & NVME_SC_MASK, /* Status Code */
346-
nr->status & NVME_SC_MORE ? "MORE " : "",
347-
nr->status & NVME_SC_DNR ? "DNR " : "");
346+
nr->status & NVME_STATUS_MORE ? "MORE " : "",
347+
nr->status & NVME_STATUS_DNR ? "DNR " : "");
348348
}
349349

350350
static void nvme_log_err_passthru(struct request *req)
@@ -361,8 +361,8 @@ static void nvme_log_err_passthru(struct request *req)
361361
nvme_get_error_status_str(nr->status),
362362
NVME_SCT(nr->status), /* Status Code Type */
363363
nr->status & NVME_SC_MASK, /* Status Code */
364-
nr->status & NVME_SC_MORE ? "MORE " : "",
365-
nr->status & NVME_SC_DNR ? "DNR " : "",
364+
nr->status & NVME_STATUS_MORE ? "MORE " : "",
365+
nr->status & NVME_STATUS_DNR ? "DNR " : "",
366366
nr->cmd->common.cdw10,
367367
nr->cmd->common.cdw11,
368368
nr->cmd->common.cdw12,
@@ -384,7 +384,7 @@ static inline enum nvme_disposition nvme_decide_disposition(struct request *req)
384384
return COMPLETE;
385385

386386
if (blk_noretry_request(req) ||
387-
(nvme_req(req)->status & NVME_SC_DNR) ||
387+
(nvme_req(req)->status & NVME_STATUS_DNR) ||
388388
nvme_req(req)->retries >= nvme_max_retries)
389389
return COMPLETE;
390390

@@ -3940,7 +3940,7 @@ static void nvme_ns_remove_by_nsid(struct nvme_ctrl *ctrl, u32 nsid)
39403940

39413941
static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_info *info)
39423942
{
3943-
int ret = NVME_SC_INVALID_NS | NVME_SC_DNR;
3943+
int ret = NVME_SC_INVALID_NS | NVME_STATUS_DNR;
39443944

39453945
if (!nvme_ns_ids_equal(&ns->head->ids, &info->ids)) {
39463946
dev_err(ns->ctrl->device,
@@ -3956,7 +3956,7 @@ static void nvme_validate_ns(struct nvme_ns *ns, struct nvme_ns_info *info)
39563956
*
39573957
* TODO: we should probably schedule a delayed retry here.
39583958
*/
3959-
if (ret > 0 && (ret & NVME_SC_DNR))
3959+
if (ret > 0 && (ret & NVME_STATUS_DNR))
39603960
nvme_ns_remove(ns);
39613961
}
39623962

@@ -4147,7 +4147,7 @@ static void nvme_scan_work(struct work_struct *work)
41474147
* they report) but don't actually support it.
41484148
*/
41494149
ret = nvme_scan_ns_list(ctrl);
4150-
if (ret > 0 && ret & NVME_SC_DNR)
4150+
if (ret > 0 && ret & NVME_STATUS_DNR)
41514151
nvme_scan_ns_sequential(ctrl);
41524152
}
41534153
mutex_unlock(&ctrl->scan_lock);

‎drivers/nvme/host/fabrics.c‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 *val)
187187
if (unlikely(ret != 0))
188188
dev_err(ctrl->device,
189189
"Property Get error: %d, offset %#x\n",
190-
ret > 0 ? ret & ~NVME_SC_DNR : ret, off);
190+
ret > 0 ? ret & ~NVME_STATUS_DNR : ret, off);
191191

192192
return ret;
193193
}
@@ -233,7 +233,7 @@ int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 *val)
233233
if (unlikely(ret != 0))
234234
dev_err(ctrl->device,
235235
"Property Get error: %d, offset %#x\n",
236-
ret > 0 ? ret & ~NVME_SC_DNR : ret, off);
236+
ret > 0 ? ret & ~NVME_STATUS_DNR : ret, off);
237237
return ret;
238238
}
239239
EXPORT_SYMBOL_GPL(nvmf_reg_read64);
@@ -275,7 +275,7 @@ int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 val)
275275
if (unlikely(ret))
276276
dev_err(ctrl->device,
277277
"Property Set error: %d, offset %#x\n",
278-
ret > 0 ? ret & ~NVME_SC_DNR : ret, off);
278+
ret > 0 ? ret & ~NVME_STATUS_DNR : ret, off);
279279
return ret;
280280
}
281281
EXPORT_SYMBOL_GPL(nvmf_reg_write32);
@@ -295,7 +295,7 @@ static void nvmf_log_connect_error(struct nvme_ctrl *ctrl,
295295
int errval, int offset, struct nvme_command *cmd,
296296
struct nvmf_connect_data *data)
297297
{
298-
int err_sctype = errval & ~NVME_SC_DNR;
298+
int err_sctype = errval & ~NVME_STATUS_DNR;
299299

300300
if (errval < 0) {
301301
dev_err(ctrl->device,
@@ -573,7 +573,7 @@ EXPORT_SYMBOL_GPL(nvmf_connect_io_queue);
573573
*/
574574
bool nvmf_should_reconnect(struct nvme_ctrl *ctrl, int status)
575575
{
576-
if (status > 0 && (status & NVME_SC_DNR))
576+
if (status > 0 && (status & NVME_STATUS_DNR))
577577
return false;
578578

579579
if (status == -EKEYREJECTED)

‎drivers/nvme/host/fault_inject.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ void nvme_should_fail(struct request *req)
7575
/* inject status code and DNR bit */
7676
status = fault_inject->status;
7777
if (fault_inject->dont_retry)
78-
status |= NVME_SC_DNR;
78+
status |= NVME_STATUS_DNR;
7979
nvme_req(req)->status = status;
8080
}
8181
}

‎drivers/nvme/host/fc.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3132,15 +3132,15 @@ nvme_fc_create_association(struct nvme_fc_ctrl *ctrl)
31323132
if (ctrl->ctrl.icdoff) {
31333133
dev_err(ctrl->ctrl.device, "icdoff %d is not supported!\n",
31343134
ctrl->ctrl.icdoff);
3135-
ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
3135+
ret = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
31363136
goto out_stop_keep_alive;
31373137
}
31383138

31393139
/* FC-NVME supports normal SGL Data Block Descriptors */
31403140
if (!nvme_ctrl_sgl_supported(&ctrl->ctrl)) {
31413141
dev_err(ctrl->ctrl.device,
31423142
"Mandatory sgls are not supported!\n");
3143-
ret = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
3143+
ret = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
31443144
goto out_stop_keep_alive;
31453145
}
31463146

@@ -3325,7 +3325,7 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)
33253325
queue_delayed_work(nvme_wq, &ctrl->connect_work, recon_delay);
33263326
} else {
33273327
if (portptr->port_state == FC_OBJSTATE_ONLINE) {
3328-
if (status > 0 && (status & NVME_SC_DNR))
3328+
if (status > 0 && (status & NVME_STATUS_DNR))
33293329
dev_warn(ctrl->ctrl.device,
33303330
"NVME-FC{%d}: reconnect failure\n",
33313331
ctrl->cnum);

‎drivers/nvme/host/nvme.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -878,7 +878,7 @@ enum {
878878
NVME_SUBMIT_NOWAIT = (__force nvme_submit_flags_t)(1 << 1),
879879
/* Set BLK_MQ_REQ_RESERVED when allocating request */
880880
NVME_SUBMIT_RESERVED = (__force nvme_submit_flags_t)(1 << 2),
881-
/* Retry command when NVME_SC_DNR is not set in the result */
881+
/* Retry command when NVME_STATUS_DNR is not set in the result */
882882
NVME_SUBMIT_RETRY = (__force nvme_submit_flags_t)(1 << 3),
883883
};
884884

‎drivers/nvme/target/admin-cmd.c‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -344,7 +344,7 @@ static void nvmet_execute_get_log_page(struct nvmet_req *req)
344344
pr_debug("unhandled lid %d on qid %d\n",
345345
req->cmd->get_log_page.lid, req->sq->qid);
346346
req->error_loc = offsetof(struct nvme_get_log_page_command, lid);
347-
nvmet_req_complete(req, NVME_SC_INVALID_FIELD | NVME_SC_DNR);
347+
nvmet_req_complete(req, NVME_SC_INVALID_FIELD | NVME_STATUS_DNR);
348348
}
349349

350350
static void nvmet_execute_identify_ctrl(struct nvmet_req *req)
@@ -496,7 +496,7 @@ static void nvmet_execute_identify_ns(struct nvmet_req *req)
496496

497497
if (le32_to_cpu(req->cmd->identify.nsid) == NVME_NSID_ALL) {
498498
req->error_loc = offsetof(struct nvme_identify, nsid);
499-
status = NVME_SC_INVALID_NS | NVME_SC_DNR;
499+
status = NVME_SC_INVALID_NS | NVME_STATUS_DNR;
500500
goto out;
501501
}
502502

@@ -662,7 +662,7 @@ static void nvmet_execute_identify_desclist(struct nvmet_req *req)
662662

663663
if (sg_zero_buffer(req->sg, req->sg_cnt, NVME_IDENTIFY_DATA_SIZE - off,
664664
off) != NVME_IDENTIFY_DATA_SIZE - off)
665-
status = NVME_SC_INTERNAL | NVME_SC_DNR;
665+
status = NVME_SC_INTERNAL | NVME_STATUS_DNR;
666666

667667
out:
668668
nvmet_req_complete(req, status);
@@ -724,7 +724,7 @@ static void nvmet_execute_identify(struct nvmet_req *req)
724724
pr_debug("unhandled identify cns %d on qid %d\n",
725725
req->cmd->identify.cns, req->sq->qid);
726726
req->error_loc = offsetof(struct nvme_identify, cns);
727-
nvmet_req_complete(req, NVME_SC_INVALID_FIELD | NVME_SC_DNR);
727+
nvmet_req_complete(req, NVME_SC_INVALID_FIELD | NVME_STATUS_DNR);
728728
}
729729

730730
/*
@@ -807,7 +807,7 @@ u16 nvmet_set_feat_async_event(struct nvmet_req *req, u32 mask)
807807

808808
if (val32 & ~mask) {
809809
req->error_loc = offsetof(struct nvme_common_command, cdw11);
810-
return NVME_SC_INVALID_FIELD | NVME_SC_DNR;
810+
return NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
811811
}
812812

813813
WRITE_ONCE(req->sq->ctrl->aen_enabled, val32);
@@ -833,7 +833,7 @@ void nvmet_execute_set_features(struct nvmet_req *req)
833833
ncqr = (cdw11 >> 16) & 0xffff;
834834
nsqr = cdw11 & 0xffff;
835835
if (ncqr == 0xffff || nsqr == 0xffff) {
836-
status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
836+
status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
837837
break;
838838
}
839839
nvmet_set_result(req,
@@ -846,14 +846,14 @@ void nvmet_execute_set_features(struct nvmet_req *req)
846846
status = nvmet_set_feat_async_event(req, NVMET_AEN_CFG_ALL);
847847
break;
848848
case NVME_FEAT_HOST_ID:
849-
status = NVME_SC_CMD_SEQ_ERROR | NVME_SC_DNR;
849+
status = NVME_SC_CMD_SEQ_ERROR | NVME_STATUS_DNR;
850850
break;
851851
case NVME_FEAT_WRITE_PROTECT:
852852
status = nvmet_set_feat_write_protect(req);
853853
break;
854854
default:
855855
req->error_loc = offsetof(struct nvme_common_command, cdw10);
856-
status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
856+
status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
857857
break;
858858
}
859859

@@ -939,7 +939,7 @@ void nvmet_execute_get_features(struct nvmet_req *req)
939939
if (!(req->cmd->common.cdw11 & cpu_to_le32(1 << 0))) {
940940
req->error_loc =
941941
offsetof(struct nvme_common_command, cdw11);
942-
status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
942+
status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
943943
break;
944944
}
945945

@@ -952,7 +952,7 @@ void nvmet_execute_get_features(struct nvmet_req *req)
952952
default:
953953
req->error_loc =
954954
offsetof(struct nvme_common_command, cdw10);
955-
status = NVME_SC_INVALID_FIELD | NVME_SC_DNR;
955+
status = NVME_SC_INVALID_FIELD | NVME_STATUS_DNR;
956956
break;
957957
}
958958

@@ -969,7 +969,7 @@ void nvmet_execute_async_event(struct nvmet_req *req)
969969
mutex_lock(&ctrl->lock);
970970
if (ctrl->nr_async_event_cmds >= NVMET_ASYNC_EVENTS) {
971971
mutex_unlock(&ctrl->lock);
972-
nvmet_req_complete(req, NVME_SC_ASYNC_LIMIT | NVME_SC_DNR);
972+
nvmet_req_complete(req, NVME_SC_ASYNC_LIMIT | NVME_STATUS_DNR);
973973
return;
974974
}
975975
ctrl->async_event_cmds[ctrl->nr_async_event_cmds++] = req;
@@ -1006,7 +1006,7 @@ u16 nvmet_parse_admin_cmd(struct nvmet_req *req)
10061006
if (nvme_is_fabrics(cmd))
10071007
return nvmet_parse_fabrics_admin_cmd(req);
10081008
if (unlikely(!nvmet_check_auth_status(req)))
1009-
return NVME_SC_AUTH_REQUIRED | NVME_SC_DNR;
1009+
return NVME_SC_AUTH_REQUIRED | NVME_STATUS_DNR;
10101010
if (nvmet_is_disc_subsys(nvmet_req_subsys(req)))
10111011
return nvmet_parse_discovery_cmd(req);
10121012

0 commit comments

Comments
 (0)