On 12/13/2018 12:38 AM, Sagi Grimberg wrote: > Pass poll bool to indicate that we need it to poll. This prepares us for > polling support in nvmf since connect is an I/O that will be queued > and has to be polled in order to complete. > > Signed-off-by: Sagi Grimberg <[email protected]> > --- > drivers/nvme/host/core.c | 13 ++++++++----- > drivers/nvme/host/fabrics.c | 10 +++++----- > drivers/nvme/host/nvme.h | 2 +- > 3 files changed, 14 insertions(+), 11 deletions(-) > > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index f90576862736..eb1c10b0eaf0 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -713,7 +713,7 @@ EXPORT_SYMBOL_GPL(nvme_setup_cmd); > int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, > union nvme_result *result, void *buffer, unsigned bufflen, > unsigned timeout, int qid, int at_head, > - blk_mq_req_flags_t flags) > + blk_mq_req_flags_t flags, bool poll) > { > struct request *req; > int ret; > @@ -730,7 +730,10 @@ int __nvme_submit_sync_cmd(struct request_queue *q, > struct nvme_command *cmd, > goto out; > } > > - blk_execute_rq(req->q, NULL, req, at_head); > + if (poll) > + blk_execute_rq_polled(req->q, NULL, req, at_head); > + else > + blk_execute_rq(req->q, NULL, req, at_head); > if (result) > *result = nvme_req(req)->result; > if (nvme_req(req)->flags & NVME_REQ_CANCELLED) > @@ -747,7 +750,7 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct > nvme_command *cmd, > void *buffer, unsigned bufflen) > { > return __nvme_submit_sync_cmd(q, cmd, NULL, buffer, bufflen, 0, > - NVME_QID_ANY, 0, 0); > + NVME_QID_ANY, 0, 0, false); > } > EXPORT_SYMBOL_GPL(nvme_submit_sync_cmd); > > @@ -1058,7 +1061,7 @@ static int nvme_set_features(struct nvme_ctrl *dev, > unsigned fid, unsigned dword > c.features.dword11 = cpu_to_le32(dword11); > > ret = __nvme_submit_sync_cmd(dev->admin_q, &c, &res, > - buffer, buflen, 0, NVME_QID_ANY, 0, 0); > + buffer, buflen, 0, NVME_QID_ANY, 0, 0, false); > if (ret >= 0 && result) > *result = le32_to_cpu(res.u32); > return ret; > @@ -1703,7 +1706,7 @@ int nvme_sec_submit(void *data, u16 spsp, u8 secp, void > *buffer, size_t len, > cmd.common.cdw10[1] = cpu_to_le32(len); > > return __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, buffer, len, > - ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0); > + ADMIN_TIMEOUT, NVME_QID_ANY, 1, 0, false); > } > EXPORT_SYMBOL_GPL(nvme_sec_submit); > #endif /* CONFIG_BLK_SED_OPAL */ > diff --git a/drivers/nvme/host/fabrics.c b/drivers/nvme/host/fabrics.c > index 19ff0eae4582..d93a169f6403 100644 > --- a/drivers/nvme/host/fabrics.c > +++ b/drivers/nvme/host/fabrics.c > @@ -159,7 +159,7 @@ int nvmf_reg_read32(struct nvme_ctrl *ctrl, u32 off, u32 > *val) > cmd.prop_get.offset = cpu_to_le32(off); > > ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, &res, NULL, 0, 0, > - NVME_QID_ANY, 0, 0); > + NVME_QID_ANY, 0, 0, false); > > if (ret >= 0) > *val = le64_to_cpu(res.u64); > @@ -206,7 +206,7 @@ int nvmf_reg_read64(struct nvme_ctrl *ctrl, u32 off, u64 > *val) > cmd.prop_get.offset = cpu_to_le32(off); > > ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, &res, NULL, 0, 0, > - NVME_QID_ANY, 0, 0); > + NVME_QID_ANY, 0, 0, false); > > if (ret >= 0) > *val = le64_to_cpu(res.u64); > @@ -252,7 +252,7 @@ int nvmf_reg_write32(struct nvme_ctrl *ctrl, u32 off, u32 > val) > cmd.prop_set.value = cpu_to_le64(val); > > ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, NULL, NULL, 0, 0, > - NVME_QID_ANY, 0, 0); > + NVME_QID_ANY, 0, 0, false); > if (unlikely(ret)) > dev_err(ctrl->device, > "Property Set error: %d, offset %#x\n", > @@ -406,7 +406,7 @@ int nvmf_connect_admin_queue(struct nvme_ctrl *ctrl) > > ret = __nvme_submit_sync_cmd(ctrl->admin_q, &cmd, &res, > data, sizeof(*data), 0, NVME_QID_ANY, 1, > - BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT); > + BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT, false); > if (ret) { > nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32), > &cmd, data); > @@ -468,7 +468,7 @@ int nvmf_connect_io_queue(struct nvme_ctrl *ctrl, u16 qid) > > ret = __nvme_submit_sync_cmd(ctrl->connect_q, &cmd, &res, > data, sizeof(*data), 0, qid, 1, > - BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT); > + BLK_MQ_REQ_RESERVED | BLK_MQ_REQ_NOWAIT, false); > if (ret) { > nvmf_log_connect_error(ctrl, ret, le32_to_cpu(res.u32), > &cmd, data); > diff --git a/drivers/nvme/host/nvme.h b/drivers/nvme/host/nvme.h > index 8e0ec365ce8d..75ed640a5ef0 100644 > --- a/drivers/nvme/host/nvme.h > +++ b/drivers/nvme/host/nvme.h > @@ -444,7 +444,7 @@ int nvme_submit_sync_cmd(struct request_queue *q, struct > nvme_command *cmd, > int __nvme_submit_sync_cmd(struct request_queue *q, struct nvme_command *cmd, > union nvme_result *result, void *buffer, unsigned bufflen, > unsigned timeout, int qid, int at_head, > - blk_mq_req_flags_t flags); > + blk_mq_req_flags_t flags, bool flag);
Shouldn't the above be 'bool poll'? Reviewed-by: Steve Wise <[email protected]>
