From patchwork Tue Nov 28 19:34:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10080935 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 89F35602DC for ; Tue, 28 Nov 2017 19:35:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7DD9E26D05 for ; Tue, 28 Nov 2017 19:35:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 729D1292E2; Tue, 28 Nov 2017 19:35:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 11402289B8 for ; Tue, 28 Nov 2017 19:35:20 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932153AbdK1TfS (ORCPT ); Tue, 28 Nov 2017 14:35:18 -0500 Received: from mail-by2nam03on0052.outbound.protection.outlook.com ([104.47.42.52]:4638 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752410AbdK1TfO (ORCPT ); Tue, 28 Nov 2017 14:35:14 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=1mneJ2jEZGO7QFPW3wD1N2k1idyFXAv7XwsLBi+eD/0=; b=YujHN84/aNO2JnqZOt+YXjYl3F0DuGLREcO1vhJ8aeioA/9zGITVysnKoIf+BoguimYpbun5XwEEl41KOIYHYNKZnAWzVXcSQ3sJMqNLr4BClAYHYg+fJzhehE0ysZkGaIdqCI99DSuGHu6QV8zHBXgsR2M2Pj7QHHYDpcTEUTE= Received: from CO2PR07CA0044.namprd07.prod.outlook.com (2603:10b6:100::12) by MWHPR0701MB3820.namprd07.prod.outlook.com (2603:10b6:301:7f::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Tue, 28 Nov 2017 19:35:12 +0000 Received: from BY2FFO11FD017.protection.gbl (2a01:111:f400:7c0c::151) by CO2PR07CA0044.outlook.office365.com (2603:10b6:100::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.282.5 via Frontend Transport; Tue, 28 Nov 2017 19:35:12 +0000 Authentication-Results: spf=none (sender IP is 50.232.66.26) smtp.mailfrom=cavium.com; vger.kernel.org; dkim=none (message not signed) header.d=none; vger.kernel.org; dmarc=none action=none header.from=cavium.com; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) Received: from CAEXCH02.caveonetworks.com (50.232.66.26) by BY2FFO11FD017.mail.protection.outlook.com (10.1.14.105) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.218.12 via Frontend Transport; Tue, 28 Nov 2017 19:35:12 +0000 Received: from dut1171.mv.qlogic.com (172.29.51.171) by CAEXCH02.caveonetworks.com (10.17.4.29) with Microsoft SMTP Server id 14.2.347.0; Tue, 28 Nov 2017 11:35:04 -0800 Received: from dut1171.mv.qlogic.com (localhost [127.0.0.1]) by dut1171.mv.qlogic.com (8.14.7/8.14.7) with ESMTP id vASJZ4ed013746; Tue, 28 Nov 2017 11:35:04 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id vASJZ4FF013745; Tue, 28 Nov 2017 11:35:04 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 04/22] qla2xxx: Skip IRQ affinity for Target QPairs Date: Tue, 28 Nov 2017 11:34:45 -0800 Message-ID: <20171128193503.13695-5-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171128193503.13695-1-himanshu.madhani@cavium.com> References: <20171128193503.13695-1-himanshu.madhani@cavium.com> MIME-Version: 1.0 X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:50.232.66.26; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(346002)(376002)(2980300002)(428002)(189002)(199003)(8936002)(42186006)(106466001)(50226002)(50986999)(8676002)(316002)(81166006)(81156014)(101416001)(76176999)(356003)(189998001)(305945005)(69596002)(80596001)(51416003)(47776003)(110136005)(5660300001)(478600001)(2906002)(105586002)(4326008)(54906003)(6666003)(48376002)(50466002)(86362001)(72206003)(16586007)(36756003)(1076002)(2950100002)(87636003)(33646002); DIR:OUT; SFP:1101; SCL:1; SRVR:MWHPR0701MB3820; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD017; 1:zssxU1Nimlks7kgSkhoLyyBDZQvKwo8ZXnk6h1QzEe9ORkTIjrufQShQqg12TUJstSx+D8LGbn78G3mALIwRcfGsvxHf+HFHXmkfuM9TrM8Hy/ZDlrlN3ILVjcb77Lyn X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 829c3e0f-9add-47e3-d268-08d53697248e X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(5600026)(4604075)(2017052603258); SRVR:MWHPR0701MB3820; X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3820; 3:vliOCf9lecjsIuvX/2xgFGiiY660srbp7eoNRfZBb9CXye6E4l5McmhFnVrtEGfDRmpQGQTva6CxomoIB81gqeWafbjLd47L2IZUc0QePyVj4Kp77ov3yOSgu99xnfF5n2yekuR9J+spS+nX3eZJ7D8bXL5xDEj+7hdtpkHS9KtnZH6phYNdTHtSYjcqDu/RhlZ+KHRVuIfbwTctTCdlqlhPTcXpnfuiV5naWoQ6ulRE09cKhbOqylhzSb7PkfZ27rKiNHvOC9kUtxUXXZUBSaU5g5988wmjBZoJW/bjiTHQwPx32xMRtMEf+MeytUq2EiKnyO/BOOA2ZDklTFKN8if30YLRO8rSOzzhT5z9CD0=; 25:fxj2qJexuzLBlFGXDbpLW+MYQZlbnVsS060CdyK3SmeU9EIOnyxW3X74b4BwYbYwWb+M649ugjcRPMndQEcCr7gxv1PVhwAx5RD9LI6gSwOlXHz1996mFI+KLPgmcY3Rsjr6eXpibWNw6kYXjeaOnYr62LYRonWVqkCegq2w6nZvAq2P4T3Gn4GSItIkmqwybKQMi+ACVoqK+nbqboS3CmZZlJ4Ex4dl4Z3m30rJc1133GDugbrJ6hfzWC9KuxiFxlXJjaFnZa8rTqUbPM4Q6VeBpSYeTNaWNH86nB9YtvO3vdzkC6Pmf0iKB+mhbvRnG3FH9bfdjqZ2KZFvXqAN3w== X-MS-TrafficTypeDiagnostic: MWHPR0701MB3820: X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3820; 31:IKDgqGfFr5sMgTUmyroYHthRt3usp8O/hUxU4v0ZNG2fmbn7Dml8ku5Unqy6BVU2htyjH+2reir5uVHi9YlLi6TRvVYDCzZVYQUbKFeAWMxJYNL2PBd3t+9ZMyyR+4XALTuBHeq5ZSGZEZu9eQxLSEQsepId08NU1/XEJXKqkVkAyq11SlF6SEDX0lM1SZi1a0MkfZBRv5wY3bkl0POWcfRb0mKid3E5avqSKCINU0I=; 20:bLkRqZOLLJ+p8aBvmwrVVR0J57pFZ+8sNlE7GCI/3Bzxutj6LkLKNSCYKHpx6uuOgYPOJN58MFaIoYzhsxEEdJO9/BTI5LnrwPISHLMWYWPapwpewZB88DBMEdgG5doV424d+Upo25cANK3xubABSJmpqqzw9+O6SS9FOObzN3h2oJ8kPLRQrWdSiln5YJ2tHXL4eE3dPG2TIoLun3/wBrPi6Ao35FQFpYhsXjnGMdBZTIuZ7RA2z2jGgtb9nq93mhpil+DCNU2hL+MKItjTzgWALjJg3zZvdxvxYruv61j7s9Hd8G1rewaqAwjMOActeUNGhsYQVEdFf4w9sZ0eouT70g6l1EU5c7SeHzzP1K0NzzYQCtOreux8GIu8QIL5zGWvwgrtr7gUEI0OhX67x7SME3OQu2lmbWs0Uj8gBhMa9bFYQXOBANsGKVcxdm/M05ygZLL68NPpmlEj1npCOQYN1yjYqik/obwTCLGRj4yfuZP23aIYYIgmcRkLRS+X X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(5005006)(8121501046)(3002001)(93006095)(93001095)(3231022)(10201501046)(6041248)(20161123558100)(20161123555025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123564025)(20161123562025)(20161123560025)(6072148)(201708071742011); SRVR:MWHPR0701MB3820; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:MWHPR0701MB3820; X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3820; 4:2rmQRIywdN4hGYICXzWvdr+gwJFo2ZS5xSpZsuqSJuncesl6UGbrOMJn/7oQgwp8b//UMiZeDXhEU6CUM6dERQFTa8myD/3O2EWSU0qhRAuJyh+/ancSGJvAN7yZPyj079Ed8s4O1oWj8SfbkBUEJP9I3SB/sj99vJF4IavV4pEoC0r4Va5Sf6vgkEx5BYjw7JPsPXMzm3xDOTVe6azg/wMpQp2stDi3MBvf6Wfwj5nc95P1SS12uxLxMPa1DIkx0dfBHtcroCTY+Bq1+mm5HLPakMVF7tqSu/rkjOsJLP7V9KQCj1xokY071k8Vu8hu X-Forefront-PRVS: 0505147DDB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; MWHPR0701MB3820; 23:1e9MMLvihrE4JwGYeUVfWHSNDbfLn30Pw+KkJrV?= =?us-ascii?Q?am4/N5SjbUZi5hZSqX5CvjNA+dsApUC3I2M/Bwe7YQ1GkVRRbGyyJgYBclqx?= =?us-ascii?Q?Yd6wJlSnHiF5279JBYPUc8hA2xeixW7RozjLu3IrdfyiG3tllX0w5wsn+wye?= =?us-ascii?Q?P94DIz9yKSN/lQaREz4Q51BmonEzYGWC/CjKJ7la4n4gzsJxZCJlWHEDV8Eq?= =?us-ascii?Q?ouiu1ct6QT9CwAsZz8sO+hkQ8bvbkO1GVHoZz0vRLRX6KRxKPhHkEjS2L5sP?= =?us-ascii?Q?Z+mtv0MBN41n9LWWBHcX0Zl7woEn7/SG9qLmoAxrBIHc5/SHU6GPkzFRmmCv?= =?us-ascii?Q?l9Nl87uIM5b44hXLwWSy8dwmVgxsDlFI3ZSfxfZ6200GU5vfCFl3tw+3c1y/?= =?us-ascii?Q?LZlc7vJo0xeOgpLFOJlhhcIof7isL+sPdNUVCsIjnlAtg5GX7TUdD8urf/wD?= =?us-ascii?Q?J8nBe6vAtEVsXRHr0G+tIVppBs+zqEymiRrFcVy+2444AdlZV51SNe03HDF4?= =?us-ascii?Q?leA8aFxHSo+immnENEync4psOHVubTd1CA6qZSXecptEeYTL1ziCZQqyNeOY?= =?us-ascii?Q?92oI4QIBtSjggdix+mEanVnE50BlnUXf/Tk+fu69Jic4iIc5nnG+tfAOy8QX?= =?us-ascii?Q?dDIBFsI7Eo8uLDQh50DJ5xUnYK5MGmmIK/o5oFvmQUq2GpPwSbdE3ZrDR6/o?= =?us-ascii?Q?PqQ51mo8WMO2OZNuRO2KVXRBCaQtATCdUs1M9OM5pRL5NPSDG7Hg+eaWch52?= =?us-ascii?Q?6MMncffnswdLJA3/kBIF3az5bOIC5wDmITOrxcLknf+kf6h+R1lWLtMSzRnm?= =?us-ascii?Q?zpnnlj7RLVrEas0l+t2qgEGevidpOcIJXrWMw6cwNoyNDf453oZKQhk/1bfn?= =?us-ascii?Q?qmbl3yUV5dVXlOrs3dm6NhfYCgfA5+I103TAcYgmb/TF9aUw7bmtAsCvK5rU?= =?us-ascii?Q?alLlYOL3nlkAPJblhni0ST3og7ecYuBgA/m6jRgL6XC/Cr2jXkD9ez8egrs8?= =?us-ascii?Q?BMWoSyxrDJo66fgLzjeWJTNwH?= X-Microsoft-Exchange-Diagnostics: 1; MWHPR0701MB3820; 6:th26SMx0ne3J9qoAskZq03e91nWPZSZIuvXFeMAkRQr7SjWazxX2d9Pl/vVqdHZE6tG3hfa+l0FsjVm8Xw1POLcArV6WIfU5n+ki9h3gG08flZtHIvU3MVPqCl4fh/jWWgzAr4hyn5E55KlzCqVTZpPtlcQcLl1lTJJG19SK5Cmjbntv7XnYv3jm2YDps6rQkIHv5yGe6yPObugFRvSC54iwwF5aUpr0pLQhAZ3EiOmkq5cKsRNqYdViSQQcKKfUJW8Cl6HEgABNTVuOrxdM8nm+fY8YqJ2vG7xYSNqhiWa+NDfElZoR6P2/AVp2sl7Eza5wCsoCcWvnpofmviH7rHQs4jKcwXmw2Cx/lqnPPZE=; 5:GR+pOhmIkQO6w2U3weX483sPajzJzax83Xm2/7RlTnbgVxGmvKmuCKTnIc3VaEPu9WJkAxRCOQ21ePk9xLOXxaocOmSU+cadpNMalXWrkHHDZz9Hf4KG3O0cUgJX1RhCzoRDgpQADIGdAaducRUv7cQzTvhK8t7gm1PeHIJv1YY=; 24:x4VwKYEo49Qvo3pwhMTQ8KNAl7winzJgUhAOYgTidm0bpM1e9FPM3OVi/Opy5myfIQzsckfzXn58PuguEucchvzNcPUfGyOJCi4jEsqvlh4=; 7:mlIVRq4xBNrxk+4jSJa2KNkxVhbM3PQRwFQRVFmEs80N/yxZOOad4hzcfoFyZ2Jrvefnk7SEOTTqbA7z4Ex0YxSwxlIGOYLTmM/hQTrcLDmORfRHuo50gM/H+qsT3ZBIcoGruU3PSNBrCtifiWrxNIGer2aZF6WTUyutlXOBskOZ57IPeIAQUAdol6WipUMhZ/n5A1cQs09BP04w41R7/7SUzn7HAQc5pNAeHF+bZcMjKE2D+yNaEIZBIT1RK3JJ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2017 19:35:12.1910 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 829c3e0f-9add-47e3-d268-08d53697248e X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=711e4ccf-2e9b-4bcf-a551-4094005b6194; Ip=[50.232.66.26]; Helo=[CAEXCH02.caveonetworks.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: MWHPR0701MB3820 Sender: linux-scsi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-scsi@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Quinn Tran Fix co-existence between Block MQ and Target Mode. Block MQ and initiator mode requires midlayer queue mapping to check for IRQ to be affinitize. For target mode, it's not the case. Fixes: 09620eeb62c41 ("scsi: qla2xxx: Add debug knob for user control workload") Cc: # 4.12+ Signed-off-by: Quinn Tran Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_os.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/scsi/qla2xxx/qla_os.c b/drivers/scsi/qla2xxx/qla_os.c index dfbf82e716b0..428e1bfaa83b 100644 --- a/drivers/scsi/qla2xxx/qla_os.c +++ b/drivers/scsi/qla2xxx/qla_os.c @@ -6609,9 +6609,14 @@ qla83xx_disable_laser(scsi_qla_host_t *vha) static int qla2xxx_map_queues(struct Scsi_Host *shost) { + int rc; scsi_qla_host_t *vha = (scsi_qla_host_t *)shost->hostdata; - return blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev); + if (USER_CTRL_IRQ(vha->hw)) + rc = blk_mq_map_queues(&shost->tag_set); + else + rc = blk_mq_pci_map_queues(&shost->tag_set, vha->hw->pdev); + return rc; } static const struct pci_error_handlers qla2xxx_err_handler = {