From patchwork Thu Dec 3 03:41:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kashyap Desai X-Patchwork-Id: 338178 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.6 required=3.0 tests=BAYES_00, DATE_IN_PAST_06_12, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,MIME_HEADER_CTYPE_ONLY,SPF_HELO_NONE,SPF_PASS, T_TVD_MIME_NO_HEADERS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D20B6C71156 for ; Thu, 3 Dec 2020 11:42:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 7830822201 for ; Thu, 3 Dec 2020 11:42:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727431AbgLCLmj (ORCPT ); Thu, 3 Dec 2020 06:42:39 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42416 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726710AbgLCLmi (ORCPT ); Thu, 3 Dec 2020 06:42:38 -0500 Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B46F3C061A55 for ; Thu, 3 Dec 2020 03:41:25 -0800 (PST) Received: by mail-pg1-x544.google.com with SMTP id g18so1252647pgk.1 for ; Thu, 03 Dec 2020 03:41:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=RWdFY2dWgBVg6h17dUVnKXYep9f/WzJQSk/ZNioV5sc=; b=GDWemtRJtl27L8xD/WHI6WtEssrUA20PM/GqLjDkmKpBec2zvUnQMwqZkBQuXUb5Xb ozKcrIsLFFEKlqo+ijWGd2k4yPRp5WECGHNbxEn36QkrSQ+fmID9jEqD1IM0rJaurV2l cTae2mQEUFN1ObUMVKju7+9gk/UQU3AtI2rf4= 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:in-reply-to :references; bh=RWdFY2dWgBVg6h17dUVnKXYep9f/WzJQSk/ZNioV5sc=; b=EClShKaRwDGixfuyRJNZK4PT/RDu6UTpXWjJG9wxtket4lAZwrnuqtWZe9ND368XRS MI809rQ8kCYcl10BRp9f9tcJXPE1CHqWgA16Gh3WXzKYbzgBhMb8KRToamXTv004UbD4 sN+8m3FaSi4l5OxfWgSDcbHkH+jlgo+d3byFjbUvPEqpWrHSoGHIySX1fj5IYFenXmYT TtUiMb+N3awfBLmsM1knW6Rk3fSPS83bBdlUTrZ+USpdGo48lXa3TEKMllbxPS7UZAB4 0ZonRRIY/mpYtSL3VU/kzk+rTbIfiL+PckzrLGDk6jnc8LKySifm5gRf+w66RwG1copr HiEg== X-Gm-Message-State: AOAM533ck3vJGSpd88ukJOE2hkab5uJbRI/XZQ0ZxfqbCRpZBZe5Ro0m mDTP2ZJ0AkwqU/tR+AVu4grQ9HCfprLutnY/t0udy4O72O7d1DELR41Wfo0qBeHd2vbftGcgN3v tq/4RRe+r2q93F61zA63opaKL/k0Pu2BeF7+qRClk4a9URxpH1qiLZUlQidAbKGCGiPYlZYm6Ht A1Xx3o+pab X-Google-Smtp-Source: ABdhPJye/Ci5DATvInEYzk74uhlLB4/c/ofVz+kISYybmc1UVyM9qQhMf28PfZaeAzV5EpKupAdZFw== X-Received: by 2002:aa7:8c12:0:b029:18b:9939:9798 with SMTP id c18-20020aa78c120000b029018b99399798mr2614361pfd.44.1606995684768; Thu, 03 Dec 2020 03:41:24 -0800 (PST) Received: from drv-bst-rhel8.dhcp.broadcom.net ([192.19.234.250]) by smtp.gmail.com with ESMTPSA id cl23sm1310331pjb.23.2020.12.03.03.41.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 03 Dec 2020 03:41:24 -0800 (PST) From: Kashyap Desai To: linux-scsi@vger.kernel.org Cc: Kashyap Desai Subject: [PATCH v2 4/4] scsi: set shost as hctx driver_data Date: Thu, 3 Dec 2020 09:11:00 +0530 Message-Id: <20201203034100.29716-5-kashyap.desai@broadcom.com> X-Mailer: git-send-email 2.18.1 In-Reply-To: <20201203034100.29716-1-kashyap.desai@broadcom.com> References: <20201203034100.29716-1-kashyap.desai@broadcom.com> Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org hctx->driver_data is not set for SCSI currently. Separately set hctx->driver_data = shost. Suggested-by: John Garry Signed-off-by: Kashyap Desai --- drivers/scsi/scsi_lib.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 8675900ccc27..892315c21b70 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -1789,9 +1789,7 @@ static void scsi_mq_exit_request(struct blk_mq_tag_set *set, struct request *rq, 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; + struct Scsi_Host *shost = hctx->driver_data; if (shost->hostt->mq_poll) return shost->hostt->mq_poll(shost, hctx->queue_num); @@ -1799,6 +1797,15 @@ static int scsi_mq_poll(struct blk_mq_hw_ctx *hctx) return 0; } +static int scsi_init_hctx(struct blk_mq_hw_ctx *hctx, void *data, + unsigned int hctx_idx) +{ + struct Scsi_Host *shost = data; + + hctx->driver_data = shost; + 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); @@ -1866,15 +1873,14 @@ 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, + .init_hctx = scsi_init_hctx, .poll = scsi_mq_poll, }; static void scsi_commit_rqs(struct blk_mq_hw_ctx *hctx) { - struct request_queue *q = hctx->queue; - struct scsi_device *sdev = q->queuedata; - struct Scsi_Host *shost = sdev->host; + struct Scsi_Host *shost = hctx->driver_data; shost->hostt->commit_rqs(shost, hctx->queue_num); } @@ -1895,6 +1901,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, + .init_hctx = scsi_init_hctx, .poll = scsi_mq_poll, };