From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C76AEC4332F for ; Thu, 19 May 2022 07:37:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232019AbiESHhU (ORCPT ); Thu, 19 May 2022 03:37:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47720 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229548AbiESHhT (ORCPT ); Thu, 19 May 2022 03:37:19 -0400 Received: from mail-oi1-x230.google.com (mail-oi1-x230.google.com [IPv6:2607:f8b0:4864:20::230]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9D379A7E22; Thu, 19 May 2022 00:37:18 -0700 (PDT) Received: by mail-oi1-x230.google.com with SMTP id v65so5489939oig.10; Thu, 19 May 2022 00:37:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=v2SLSqGyEqCVCFyRJjJ1FWWgUfwr+NH72nZQlIiDXkE=; b=WGH+dwO8se/FhSCRNeba5p0sFNVXE9263uBNF4pPqfMXnry5rIkoWqXyxpL05G1WrY QpxdnWeESUL2Jcw7W14nVn/l0UsamZ+cLeNPpzInyI78mdma0Gqa6mPR9tSH91PqtKEe d+F1slgbSCjdeKXdikIAyUP/P7nSmCCjYqk5UzVkJyM7k49wQ1ZUKOb145UGggRpKkmq ww5c1wwpsiPAl7YyV2GRnKQFZQdOzanHh+pqPm+lTBYHCI22FGFFy3JmGBjpCyKQMJlc LIv8+o8zZwSij2D7xzGuAqyCPY/9/aSLfrZTwnqvMyRptI1JbMZ6laihx3nCxyU2pg1z Ndig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=v2SLSqGyEqCVCFyRJjJ1FWWgUfwr+NH72nZQlIiDXkE=; b=auZ/gpcvQDzMnqpTef0Y8LNDvx8o1M5BQasqsmAWNqVB2ke3KwBM6m8wuD5GMDOHfJ T3nJ1CBX7p60DfKRM71c9a+cKp6EmipcfyDx28VUdU/+M4MMOkXffs9OczhsrQb8Cxhp zlbS9w2O4Qek+pfRt3LY6yCUl8m1FtxtUuR2X8GPmAvQs8dVtMFlfM26JCkKs0B+oEY9 CicCD8LQpb9/sOUyJC2x7GfP984PB9FE23BJ0q9Qha7m1pWwu4C2QC/k9EJ66Mc+ctBo JTf2pqE377BW+SNuzzKMagZst0O5rZJgTX5s8LbALEVSpErp5yn0XOPctc0mJZ8N0TUt ar8w== X-Gm-Message-State: AOAM530GrcyI6COM1d0VJGcTRuRyCg1U9bqgMPq0LguWfWgF+bl/gDZx 4ey5qJOrDA0F3OL8ZQAkPKyhs89G3kQoxEmm7AoPq0HYwIo= X-Google-Smtp-Source: ABdhPJxItnrTnSxOkneZOHQL9ziiuGMoBB3E3m/OksHC5WeGBfxAGNmnO1Z75T1qIL7SU2nLEi+149x6QZzHgSL53EU= X-Received: by 2002:a05:6808:180d:b0:328:b7dc:d68b with SMTP id bh13-20020a056808180d00b00328b7dcd68bmr1988751oib.15.1652945837787; Thu, 19 May 2022 00:37:17 -0700 (PDT) MIME-Version: 1.0 References: <20220517064901.3059255-1-hch@lst.de> <20220517064901.3059255-4-hch@lst.de> In-Reply-To: <20220517064901.3059255-4-hch@lst.de> From: Kanchan Joshi Date: Thu, 19 May 2022 13:06:51 +0530 Message-ID: Subject: Re: [PATCH 3/3] blk-mq: remove the done argument to blk_execute_rq_nowait To: Christoph Hellwig Cc: Jens Axboe , Ming Lei , linux-block@vger.kernel.org, linux-nvme@lists.infradead.org, linux-scsi@vger.kernel.org, target-devel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org On Tue, May 17, 2022 at 12:27 PM Christoph Hellwig wrote: > > Let the caller set it together with the end_io_data instead of passing > a pointless argument. Note the the target code did in fact already > set it and then just overrode it again by calling blk_execute_rq_nowait. > > Signed-off-by: Christoph Hellwig > --- > block/blk-mq.c | 5 +---- > drivers/block/sx8.c | 4 ++-- > drivers/nvme/host/core.c | 3 ++- > drivers/nvme/host/ioctl.c | 3 ++- > drivers/nvme/host/pci.c | 10 +++++++--- > drivers/nvme/target/passthru.c | 3 ++- > drivers/scsi/scsi_error.c | 5 +++-- > drivers/scsi/sg.c | 3 ++- > drivers/scsi/st.c | 3 ++- > drivers/scsi/ufs/ufshpb.c | 6 ++++-- > drivers/target/target_core_pscsi.c | 3 +-- > include/linux/blk-mq.h | 3 +-- > 12 files changed, 29 insertions(+), 22 deletions(-) > > diff --git a/block/blk-mq.c b/block/blk-mq.c > index 0169b624edda1..c832011bc90dd 100644 > --- a/block/blk-mq.c > +++ b/block/blk-mq.c > @@ -1189,7 +1189,6 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) > * blk_execute_rq_nowait - insert a request to I/O scheduler for execution > * @rq: request to insert > * @at_head: insert request at head or tail of queue > - * @done: I/O completion handler > * > * Description: > * Insert a fully prepared request at the back of the I/O scheduler queue > @@ -1198,13 +1197,11 @@ static void blk_add_rq_to_plug(struct blk_plug *plug, struct request *rq) > * Note: > * This function will invoke @done directly if the queue is dead. > */ > -void blk_execute_rq_nowait(struct request *rq, bool at_head, rq_end_io_fn *done) > +void blk_execute_rq_nowait(struct request *rq, bool at_head) > { > WARN_ON(irqs_disabled()); > WARN_ON(!blk_rq_is_passthrough(rq)); > > - rq->end_io = done; > - > blk_account_io_start(rq); > if (current->plug) > blk_add_rq_to_plug(current->plug, rq); > diff --git a/drivers/block/sx8.c b/drivers/block/sx8.c > index b361583944b94..63b4f6431d2e6 100644 > --- a/drivers/block/sx8.c > +++ b/drivers/block/sx8.c > @@ -540,7 +540,7 @@ static int carm_array_info (struct carm_host *host, unsigned int array_idx) > spin_unlock_irq(&host->lock); > > DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag); > - blk_execute_rq_nowait(rq, true, NULL); > + blk_execute_rq_nowait(rq, true); > > return 0; > > @@ -579,7 +579,7 @@ static int carm_send_special (struct carm_host *host, carm_sspc_t func) > crq->msg_bucket = (u32) rc; > > DPRINTK("blk_execute_rq_nowait, tag == %u\n", rq->tag); > - blk_execute_rq_nowait(rq, true, NULL); > + blk_execute_rq_nowait(rq, true); > > return 0; > } > diff --git a/drivers/nvme/host/core.c b/drivers/nvme/host/core.c > index 510e3860358bb..22aa5780623da 100644 > --- a/drivers/nvme/host/core.c > +++ b/drivers/nvme/host/core.c > @@ -1206,8 +1206,9 @@ static void nvme_keep_alive_work(struct work_struct *work) > nvme_init_request(rq, &ctrl->ka_cmd); > > rq->timeout = ctrl->kato * HZ; > + rq->end_io = nvme_keep_alive_end_io; > rq->end_io_data = ctrl; > - blk_execute_rq_nowait(rq, false, nvme_keep_alive_end_io); > + blk_execute_rq_nowait(rq, false); > } > > static void nvme_start_keep_alive(struct nvme_ctrl *ctrl) > diff --git a/drivers/nvme/host/ioctl.c b/drivers/nvme/host/ioctl.c > index 7b0e2c9cdcae3..a92cc686ffbc0 100644 > --- a/drivers/nvme/host/ioctl.c > +++ b/drivers/nvme/host/ioctl.c > @@ -453,6 +453,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, > blk_flags); > if (IS_ERR(req)) > return PTR_ERR(req); > + req->end_io = nvme_uring_cmd_end_io; > req->end_io_data = ioucmd; > > /* to free bio on completion, as req->bio will be null at that time */ > @@ -461,7 +462,7 @@ static int nvme_uring_cmd_io(struct nvme_ctrl *ctrl, struct nvme_ns *ns, > pdu->meta_buffer = nvme_to_user_ptr(d.metadata); > pdu->meta_len = d.metadata_len; > > - blk_execute_rq_nowait(req, 0, nvme_uring_cmd_end_io); > + blk_execute_rq_nowait(req, false); > return -EIOCBQUEUED; > } > > diff --git a/drivers/nvme/host/pci.c b/drivers/nvme/host/pci.c > index 3aacf1c0d5a5f..068dbb00c5ea9 100644 > --- a/drivers/nvme/host/pci.c > +++ b/drivers/nvme/host/pci.c > @@ -1438,8 +1438,9 @@ static enum blk_eh_timer_return nvme_timeout(struct request *req, bool reserved) > } > nvme_init_request(abort_req, &cmd); > > + abort_req->end_io = abort_endio; > abort_req->end_io_data = NULL; > - blk_execute_rq_nowait(abort_req, false, abort_endio); > + blk_execute_rq_nowait(abort_req, false); > > /* > * The aborted req will be completed on receiving the abort req. > @@ -2483,11 +2484,14 @@ static int nvme_delete_queue(struct nvme_queue *nvmeq, u8 opcode) > return PTR_ERR(req); > nvme_init_request(req, &cmd); > > + if (opcode == nvme_admin_delete_cq) > + req->end_io = nvme_del_cq_end; > + else > + req->end_io = nvme_del_queue_end; > req->end_io_data = nvmeq; > > init_completion(&nvmeq->delete_done); > - blk_execute_rq_nowait(req, false, opcode == nvme_admin_delete_cq ? > - nvme_del_cq_end : nvme_del_queue_end); > + blk_execute_rq_nowait(req, false); > return 0; > } > > diff --git a/drivers/nvme/target/passthru.c b/drivers/nvme/target/passthru.c > index 5247c24538eba..3cc4d6709c93c 100644 > --- a/drivers/nvme/target/passthru.c > +++ b/drivers/nvme/target/passthru.c > @@ -285,8 +285,9 @@ static void nvmet_passthru_execute_cmd(struct nvmet_req *req) > req->p.rq = rq; > queue_work(nvmet_wq, &req->p.work); > } else { > + rq->end_io = nvmet_passthru_req_done; > rq->end_io_data = req; > - blk_execute_rq_nowait(rq, false, nvmet_passthru_req_done); > + blk_execute_rq_nowait(rq, false); > } > > if (ns) > diff --git a/drivers/scsi/scsi_error.c b/drivers/scsi/scsi_error.c > index cdaca13ac1f1c..49ef864df5816 100644 > --- a/drivers/scsi/scsi_error.c > +++ b/drivers/scsi/scsi_error.c > @@ -2039,12 +2039,13 @@ static void scsi_eh_lock_door(struct scsi_device *sdev) > scmd->cmnd[4] = SCSI_REMOVAL_PREVENT; > scmd->cmnd[5] = 0; > scmd->cmd_len = COMMAND_SIZE(scmd->cmnd[0]); > + scmd->allowed = 5; > > req->rq_flags |= RQF_QUIET; > req->timeout = 10 * HZ; > - scmd->allowed = 5; > + req->end_io = eh_lock_door_done; > > - blk_execute_rq_nowait(req, true, eh_lock_door_done); > + blk_execute_rq_nowait(req, true); > } > > /** > diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c > index cbffa712b9f3e..118c7b4a8af2c 100644 > --- a/drivers/scsi/sg.c > +++ b/drivers/scsi/sg.c > @@ -831,7 +831,8 @@ sg_common_write(Sg_fd * sfp, Sg_request * srp, > > srp->rq->timeout = timeout; > kref_get(&sfp->f_ref); /* sg_rq_end_io() does kref_put(). */ > - blk_execute_rq_nowait(srp->rq, at_head, sg_rq_end_io); > + srp->rq->end_io = sg_rq_end_io; > + blk_execute_rq_nowait(srp->rq, at_head); > return 0; > } > > diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c > index 56a093a90b922..850172a2b8f14 100644 > --- a/drivers/scsi/st.c > +++ b/drivers/scsi/st.c > @@ -579,9 +579,10 @@ static int st_scsi_execute(struct st_request *SRpnt, const unsigned char *cmd, > memcpy(scmd->cmnd, cmd, scmd->cmd_len); > req->timeout = timeout; > scmd->allowed = retries; > + req->end_io = st_scsi_execute_end; > req->end_io_data = SRpnt; > > - blk_execute_rq_nowait(req, true, st_scsi_execute_end); > + blk_execute_rq_nowait(req, true); > return 0; > } > > diff --git a/drivers/scsi/ufs/ufshpb.c b/drivers/scsi/ufs/ufshpb.c > index 81099b68bbfbd..796a9773bf3de 100644 > --- a/drivers/scsi/ufs/ufshpb.c > +++ b/drivers/scsi/ufs/ufshpb.c > @@ -671,11 +671,12 @@ static void ufshpb_execute_umap_req(struct ufshpb_lu *hpb, > > req->timeout = 0; > req->end_io_data = umap_req; > + req->end_io = ufshpb_umap_req_compl_fn; > > ufshpb_set_unmap_cmd(scmd->cmnd, rgn); > scmd->cmd_len = HPB_WRITE_BUFFER_CMD_LENGTH; > > - blk_execute_rq_nowait(req, true, ufshpb_umap_req_compl_fn); > + blk_execute_rq_nowait(req, true); > > hpb->stats.umap_req_cnt++; > } > @@ -707,6 +708,7 @@ static int ufshpb_execute_map_req(struct ufshpb_lu *hpb, > blk_rq_append_bio(req, map_req->bio); > > req->end_io_data = map_req; > + req->end_io = ufshpb_map_req_compl_fn; > > if (unlikely(last)) > mem_size = hpb->last_srgn_entries * HPB_ENTRY_SIZE; > @@ -716,7 +718,7 @@ static int ufshpb_execute_map_req(struct ufshpb_lu *hpb, > map_req->rb.srgn_idx, mem_size); > scmd->cmd_len = HPB_READ_BUFFER_CMD_LENGTH; > > - blk_execute_rq_nowait(req, true, ufshpb_map_req_compl_fn); > + blk_execute_rq_nowait(req, true) Missing semicolon here. Otherwise, looks good. Reviewed-by: Kanchan Joshi