nvme: introduce nvme_is_fabrics to check fabrics cmd
Subsystems (3)
PATCH 1/1 nvme: introduce nvme_is_fabrics to check fabrics cmd
This patch introduces a nvme_is_fabrics() inline function to check whether or not the given command structure is for fabrics.
Cc Keith Busch <kbusch at kernel.org>
Cc Jens Axboe <axboe at fb.com>
Cc Christoph Hellwig <hch at lst.de>
Cc Sagi Grimberg <sagi at grimberg.me>
Signed-off-by Minwoo Im <minwoo.im.dev at gmail.com>
Reviewed-by Sagi Grimberg <sagi at grimberg.me>
--- drivers/nvme/host/fabrics.c | 2 +- drivers/nvme/target/core.c | 2 +- drivers/nvme/target/fabrics-cmd.c | 2 +- drivers/nvme/target/fc.c | 2 +- include/linux/nvme.h | 7 ++++++- 5 files changed, 10 insertions(+), 5 deletions(-)
drivers/nvme/host/fabrics.c +1 -1
@@ -578,7 +578,7 @@ bool __nvmf_check_ready(struct nvme_ctrl *ctrl, struct request *rq,switch (ctrl->state) {case NVME_CTRL_NEW :case NVME_CTRL_CONNECTING : -if (req->cmd->common.opcode == nvme_fabrics_command && +if (nvme_is_fabrics (req->cmd) && req->cmd->fabrics.fctype == nvme_fabrics_type_connect)return true;break ;
drivers/nvme/target/core.c +1 -1
@@ -871,7 +871,7 @@ bool nvmet_req_init(struct nvmet_req *req, struct nvmet_cq *cq, status =nvmet_parse_connect_cmd (req); else if (likely(req->sq->qid != 0)) status =nvmet_parse_io_cmd (req); - else if (req->cmd->common.opcode == nvme_fabrics_command) + else if (nvme_is_fabrics(req->cmd)) status =nvmet_parse_fabrics_cmd (req); else if (req->sq->ctrl->subsys->type == NVME_NQN_DISC) status =nvmet_parse_discovery_cmd (req);
drivers/nvme/target/fabrics-cmd.c +1 -1
@@ -268,7 +268,7 @@ u16 nvmet_parse_connect_cmd(struct nvmet_req *req) {struct nvme_command *cmd = req->cmd; -if (cmd->common.opcode != nvme_fabrics_command) { +if (!nvme_is_fabrics (cmd)) {pr_err ("invalid command 0x%x on unconnected queue.\n" , cmd->fabrics.opcode); req->error_loc = offsetof(struct nvme_common_command , opcode);
drivers/nvme/target/fc.c +1 -1
@@ -1806,7 +1806,7 @@ nvmet_fc_prep_fcp_rsp(struct nvmet_fc_tgtport *tgtport,*/ rspcnt =atomic_inc_return (&fod->queue->zrspcnt); if (!(rspcnt % fod->queue->ersp_ratio) || - sqe->opcode == nvme_fabrics_command || + nvme_is_fabrics((struct nvme_command *) sqe) || xfr_length != fod->req.transfer_len || (le16_to_cpu(cqe->status) & 0xFFFE) || cqewd[0] || cqewd[1] || (sqe->flags & (NVME_CMD_FUSE_FIRST | NVME_CMD_FUSE_SECOND)) ||
include/linux/nvme.h +6 -1
@@ -1165,6 +1165,11 @@ struct nvme_command { }; }; +static inline bool nvme_is_fabrics (struct nvme_command *cmd) +{ +return cmd->common.opcode == nvme_fabrics_command; +} +struct nvme_error_slot {__le64 error_count;__le16 sqid;
@@ -1186,7 +1191,7 @@ static inline bool nvme_is_write(struct nvme_command *cmd)* * Why can't we simply have a Fabrics In and Fabrics out command? */ -if (unlikely (cmd->common.opcode == nvme_fabrics_command)) +if (unlikely (nvme_is_fabrics (cmd)))return cmd->fabrics.fctype &1 ;return cmd->common.opcode &1 ; }
Signature · 1 line
2.21.0
Christoph Hellwig
maintainerPATCH 1/1 nvme: introduce nvme_is_fabrics to check fabrics cmd
Quoted 2 lines · Minwoo Im
This patch introduces a
nvme_is_fabrics()inline function to check whether or not the given command structure is for fabrics.
Looks good,
Reviewed-by Christoph Hellwig <hch at lst.de>
PATCH 1/1 nvme: introduce nvme_is_fabrics to check fabrics cmd
In reply to Minwoo ImApplied to nvme-5.3
Thanks.