From patchwork Wed Oct 14 12:25:07 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kashyap Desai X-Patchwork-Id: 11837587 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AFEA914B2 for ; Wed, 14 Oct 2020 12:25:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 733902222C for ; Wed, 14 Oct 2020 12:25:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="TTpd86Bc" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729548AbgJNMZo (ORCPT ); Wed, 14 Oct 2020 08:25:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40444 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727247AbgJNMZo (ORCPT ); Wed, 14 Oct 2020 08:25:44 -0400 Received: from mail-pl1-x642.google.com (mail-pl1-x642.google.com [IPv6:2607:f8b0:4864:20::642]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E130BC061755 for ; Wed, 14 Oct 2020 05:25:43 -0700 (PDT) Received: by mail-pl1-x642.google.com with SMTP id w21so1680271plq.3 for ; Wed, 14 Oct 2020 05:25:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id; bh=mjc0dpVSW7tdTRSp5b9bS9V1F4UZwqFdTKvQ0g6zBak=; b=TTpd86Bc08HrR0sPYmb4f9jERWUUz1d/YjbweeehsuRXRi4x6DMqcuKSx3I+t+xES/ CsKWjfZH5erTecugD3KrHwgXUOtaKNAW4MxKoWiHs0CQrbGoJCtvTbJo83RQHtM/f90q w8EKYsSrbHH1WTD2phKN9/kUXTVBAmoTFjig4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=mjc0dpVSW7tdTRSp5b9bS9V1F4UZwqFdTKvQ0g6zBak=; b=smbx6rIG5dQVc4YB/QUG6ZAKwEgX0Ot2a1GtfoaEIcq0cIYObxPBheVYsOORv2JYVK TjZcntHzWF9hdTbNh5kyAyTOPMaZ6iSr6deSlGSyAXw1lvg+TMHLBrlttSXLpv6S8bwj LBcmaXfBtJatIDTpBdFbql41YwZnsFDoERFzterK6FOqAzRvPjXt+JIXd3bSD0fh4oUL POKauplolm13Q6r7A/kRW4Xpxba2caxBqiVmfGbAkUoiM348o9WLmNdB3cig1MdHhfcx PA1r7vxCRx2XzYI+lXvPx+sgmrdUYKJYXr41COBxon4bvvs5LaBL3sUGSXGMa1q5K/ov KJuA== X-Gm-Message-State: AOAM531o5jYL7XUxdpB4WzisEZ7s5UbTei1zNIM/2W+Q/DHxFRtnA7qQ DqSgVEfrLv9N22jpDAQKgwKUyw== X-Google-Smtp-Source: ABdhPJxtUh14l0aLvB6TkimexhAeRlCCPTS2d8+YcOWmQlEHMsHLBa29WKuRookdeDxaqSgrS/29Nw== X-Received: by 2002:a17:90a:fd02:: with SMTP id cv2mr3010543pjb.63.1602678343297; Wed, 14 Oct 2020 05:25:43 -0700 (PDT) Received: from drv-bst-rhel8.static.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id 17sm3043977pgv.58.2020.10.14.05.25.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Oct 2020 05:25:42 -0700 (PDT) From: Kashyap Desai To: --to=linux-scsi@vger.kernel.org Cc: Kashyap Desai , sumit.saxena@broadcom.com, chandrakanth.patil@broadcom.com, linux-block@vger.kernel.org Subject: [PATCH 1/3] add io_uring with IOPOLL support in scsi layer Date: Wed, 14 Oct 2020 17:55:07 +0530 Message-Id: <20201014122507.201162-1-kashyap.desai@broadcom.com> X-Mailer: git-send-email 2.18.1 Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org io_uring with IOPOLL is not currently supported in scsi mid layer. Outside of that everything else should work and no extra support in the driver is needed. Currently io_uring with IOPOLL support is only available in block layer. This patch is to extend support of mq_poll in scsi layer. Signed-off-by: Kashyap Desai Cc: sumit.saxena@broadcom.com Cc: chandrakanth.patil@broadcom.com Cc: linux-block@vger.kernel.org --- drivers/scsi/scsi_lib.c | 16 ++++++++++++++++ include/scsi/scsi_cmnd.h | 1 + include/scsi/scsi_host.h | 11 +++++++++++ 3 files changed, 28 insertions(+) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index a89478a0c588..0140d9aac64b 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1757,6 +1757,19 @@ static void scsi_mq_exit_request(struct blk_mq_tag_set *set, struct request *rq, cmd->sense_buffer); } + +static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx) +{ + struct request_queue *q = hctx->queue; + struct scsi_device *sdev = q->queuedata; + struct Scsi_Host *shost = sdev->host; + + if (shost->hostt->mq_poll) + return shost->hostt->mq_poll(shost, hctx->queue_num); + + return 0; +} + static int scsi_map_queues(struct blk_mq_tag_set *set) { struct Scsi_Host *shost = container_of(set, struct Scsi_Host, tag_set); @@ -1824,6 +1837,7 @@ static const struct blk_mq_ops scsi_mq_ops_no_commit = { .cleanup_rq = scsi_cleanup_rq, .busy = scsi_mq_lld_busy, .map_queues = scsi_map_queues, + .poll = scsi_mq_poll, }; @@ -1852,6 +1866,7 @@ static const struct blk_mq_ops scsi_mq_ops = { .cleanup_rq = scsi_cleanup_rq, .busy = scsi_mq_lld_busy, .map_queues = scsi_map_queues, + .poll = scsi_mq_poll, }; struct request_queue *scsi_mq_alloc_queue(struct scsi_device *sdev) @@ -1884,6 +1899,7 @@ int scsi_mq_setup_tags(struct Scsi_Host *shost) else tag_set->ops = &scsi_mq_ops_no_commit; tag_set->nr_hw_queues = shost->nr_hw_queues ? : 1; + tag_set->nr_maps = shost->nr_maps ? : 1; tag_set->queue_depth = shost->can_queue; tag_set->cmd_size = cmd_size; tag_set->numa_node = NUMA_NO_NODE; diff --git a/include/scsi/scsi_cmnd.h b/include/scsi/scsi_cmnd.h index e76bac4d14c5..5844374a85b1 100644 --- a/include/scsi/scsi_cmnd.h +++ b/include/scsi/scsi_cmnd.h @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h index 701f178b20ae..905ee6b00c55 100644 --- a/include/scsi/scsi_host.h +++ b/include/scsi/scsi_host.h @@ -270,6 +270,16 @@ struct scsi_host_template { */ int (* map_queues)(struct Scsi_Host *shost); + /* + * SCSI interface of blk_poll - poll for IO completions. + * Possible interface only if scsi LLD expose multiple h/w queues. + * + * Return values: Number of completed entries found. + * + * Status: OPTIONAL + */ + int (* mq_poll)(struct Scsi_Host *shost, unsigned int queue_num); + /* * Check if scatterlists need to be padded for DMA draining. * @@ -610,6 +620,7 @@ struct Scsi_Host { * the total queue depth is can_queue. */ unsigned nr_hw_queues; + unsigned nr_maps; unsigned active_mode:2; unsigned unchecked_isa_dma:1;