From patchwork Thu Nov 30 03:40:29 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10084183 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 25814602B9 for ; Thu, 30 Nov 2017 03:41:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1BE4129935 for ; Thu, 30 Nov 2017 03:41:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 10E9C29B05; Thu, 30 Nov 2017 03:41:14 +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 91D3F29935 for ; Thu, 30 Nov 2017 03:41:13 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753272AbdK3DlD (ORCPT ); Wed, 29 Nov 2017 22:41:03 -0500 Received: from mail-bl2nam02on0061.outbound.protection.outlook.com ([104.47.38.61]:11136 "EHLO NAM02-BL2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753237AbdK3DlA (ORCPT ); Wed, 29 Nov 2017 22:41:00 -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=Wa5Pk9dvIDudd1kBjhKkVQE277BfMcGkwy8BEjU+AvrW+s7uLykU+d8ylhvMBiYXgMI+WwX1mWDj28/38TOzyCIMu4j5nu8M0Zgoi30zq0lp1NkiaHBg9xnS7WXYJqWB7vBVEmvSB/rFEzd7+r8mYZ4uMP1Of9HLuk7Cfj47IQQ= Received: from SN1PR0701CA0015.namprd07.prod.outlook.com (2a01:111:e400:5173::25) by SN4PR0701MB3824.namprd07.prod.outlook.com (2603:10b6:803:4f::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.260.4; Thu, 30 Nov 2017 03:40:58 +0000 Received: from BL2FFO11FD056.protection.gbl (2a01:111:f400:7c09::148) by SN1PR0701CA0015.outlook.office365.com (2a01:111:e400:5173::25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.282.5 via Frontend Transport; Thu, 30 Nov 2017 03:40:58 +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 BL2FFO11FD056.mail.protection.outlook.com (10.173.161.184) 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; Thu, 30 Nov 2017 03:40:58 +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; Wed, 29 Nov 2017 19:40:48 -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 vAU3em2J015122; Wed, 29 Nov 2017 19:40:48 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id vAU3emV4015120; Wed, 29 Nov 2017 19:40:48 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH v2 04/22] qla2xxx: Skip IRQ affinity for Target QPairs Date: Wed, 29 Nov 2017 19:40:29 -0800 Message-ID: <20171130034047.15070-5-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171130034047.15070-1-himanshu.madhani@cavium.com> References: <20171130034047.15070-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)(376002)(346002)(2980300002)(428002)(199003)(189002)(72206003)(81156014)(101416001)(8676002)(81166006)(87636003)(478600001)(48376002)(69596002)(50466002)(80596001)(50986010)(76176010)(189998001)(8936002)(33646002)(356003)(36756003)(50226002)(305945005)(42186006)(4326008)(2906002)(6666003)(105586002)(2950100002)(47776003)(16586007)(5660300001)(316002)(86362001)(54906003)(110136005)(106466001)(51416003)(1076002); DIR:OUT; SFP:1101; SCL:1; SRVR:SN4PR0701MB3824; H:CAEXCH02.caveonetworks.com; FPR:; SPF:None; PTR:50-232-66-26-static.hfc.comcastbusiness.net; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD056; 1:+FKJXYEZz/aWaKmK1VV7Sere/QR8nxWT23DpfWXg1qufQDxD2Vygf1I+yBxp+gnQ2t58qb4MfL62Fz8PZz3nDvccDxs8TZsduO/HNayBwpEQR8MrO/Vk/hfminKeB+Dy X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7c101570-7406-4a63-f4ef-08d537a42b7a X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199); SRVR:SN4PR0701MB3824; X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3824; 3:7seg3IZHhR7P+DHAkXBoSnVUW5CDLQICT3rtlbau/xpVNWeBflBRoZAJwfVQoRCf3vAjssKDEmbXzjnG3JEi/ntxKaKxSGfYh6ISAM3/S16KsGr2mg/fu/L2IWrv7ku9zFri4ZBQfxOkJUttM71EVWLDR1UId5r+lgFttRwUwYyPxgy+JYqIJUVKc5nUnPGLxh2hjUqFv/1LbyIjXwE3uq+KwdaJe6n7J1G1+VVSBvWlv3w+DrFKmg+9dYbjHCxJtQ3W6W/Gtzm6/gIP5tTk8WTn4PAD4QoYH7AGVKxW9x4FvSHipdlCOXoPYJ+r8A/cjBNqzBCAFn22hIraySowoB9O0eFXP3MjbnHvWD1zsrU=; 25:hQkHlc78sV6MAvlIjq1zw2zrUobvBh1dqof8uEidjYVU+xh5dgxeEdNtqs5joDt/fvqqK2Uuzskzt1AllKIz3dgK/4hl1HBl4qPuQBUtZBvWaaCbF+01x/gZeFQssGQ0dKnuYJsfCnMei14Y2lquY0FC6TfSEBWVfJSnDx1XSvT03cwMzOD9hjsSsv5dbXizvl/0TpqoY4Be84sBzZ8PCCwaui7byXTasPNB01rkQZB9s718VMcXrFOxJSBU8wArERdHFJxZ9kNtPgT3uR5nl/5/dVPbSg+CtD2n1VqxlFj52JUpya/LNXGbQEAr7y4bfDhmK6j8UkVoHqMj8UJ6rA== X-MS-TrafficTypeDiagnostic: SN4PR0701MB3824: X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3824; 31:a9HkPCv+XD37G9IYio96pHQu0MsHriwCLot3VZ80r+RuviQ6IINDgKCePPxJSQrFocrj+2Nb/6uoQiOyM6gedi6tj54dtRkAfogIUz30/r/2QfaMzOR5fVktXFZ690KZ1EXmAUEujgGf6ck+wHkpygmqwpnfEBDAAgIGhLaSDnBhnGIOEDqznyc4JpS/XP/d7+sTP0pDB3+wDc6fKjVs91hmLPQHBM/mMeMWxi7fgkQ=; 20:D8xd8XD+YWd0jgCOUpnRIRCdVikbyDk0058JVdc0RUxQ8t5JRSvgJSBSD5kVm56wGzhZmuo79IqWn+Ap9D7UsIhPt7u0aoAi3PRv+YRHs4q/969GrSnQkvb9jEKvWluVs1TnEQSk0H95jAc0gbsn4s/kAcdvBegdLNUI814a+PzdJPfboR7UhsCTmeXceNy3gH3HHAMibeZ24hSU13QGd6RGM9NVmTN3U8g39QQNNxk3afVc8gsjTXjW7d7XsiSQjXcvGpn0CKGHo6SkGTrbM//oqDeohwpTGOUlC42dj0nuKEy96iUKTjQqc0z8DOMO4qIjgxX7nvni9EqiVaPEtHrb2uHhqWqR/WGe2tfPonP292hu7l+nDhvGORb1LfPis7yBKgnpqBNYXhKiWoeLN32yhpZm/enY8C27B5+OSfifqAxbOzBUoEf+zBUWz9rcrx9wQlg7v48N+cKMEVtDze1ms58fe7BOXAikalCpPWu0atklHHAoa68KDUsgaGYC X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(2401047)(8121501046)(5005006)(93006095)(93001095)(3002001)(3231022)(10201501046)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123558100)(20161123564025)(20161123562025)(20161123560025)(20161123555025)(6072148)(201708071742011); SRVR:SN4PR0701MB3824; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:SN4PR0701MB3824; X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3824; 4:0MM5kLndZytPlsW8+skF4XKVLfTpC+/XgrxdJZyWhTs8Bk9GQgRvUpOw7jGSYDiPQ3vBw2MelBvKhvvgKxtXIl+ssuk19lZfKSj0lS8E7NMy8/EHhRdhDu8S4blLSTYYbOUZ0UwjuVTvmMY6AVV7Oh5HJDwArrfMlJiOMGbW1DbmovSNB+J8uuAsp1UjcCWah7Qz6H8Obl00+LkN4PnFvCI5vqd0mTd4nbq9cMDba60DCx6ftsT0rpTn4JrN9krtTMC/5zuB7UJ39Dx6DH7cR7/S+YiQxM+pV6GuD0rVqnmibzSJThE+x7xlotI1a8NI X-Forefront-PRVS: 05079D8470 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN4PR0701MB3824; 23:LJQB1aTjJy/phWGyMF6hbr41kv5ynbmOP4gZ8Mm?= =?us-ascii?Q?UgkRxTYAhBn5zQ6D9pGxyqkcUeaWR7Jfu0hNSXbL0icqLS3QvmqIryHih9L0?= =?us-ascii?Q?GZd20+G/2/pS/aG08kBoRlI5KeQvJZXP4K792SU+mRYOEP0eXe0UP1STCD3s?= =?us-ascii?Q?EDDnyTinzwHSNucPg63lZvTb7VECH8AHnbBmrr/Qoq+6JgVpZlyErGf4vORG?= =?us-ascii?Q?FJM5xtW34GsM61d4JePob2QyeqPACm1ZJxc5uOBdgzQU1pkdS2AEoVoCsBiY?= =?us-ascii?Q?hUvUb7R1/UFunS9Y7Tv9lx2EekMvMukVSrm0tXw8p5Pqi/29NdBXlOhRWlqj?= =?us-ascii?Q?fo/LrLJmMxgn2O4uuovy669DDLv2CCiD719ixcjx4f/b6CHR/1jcMLKZi37t?= =?us-ascii?Q?pWrvf1RMFJW++KVVjhYkzO2eQC+GWgLHZW+y+FTsh5nlhGgwMzAk/CFqWTFV?= =?us-ascii?Q?VVdBWrAI/NJbgP0BIxwVFqvwfnjriwKPheDakoLlYZGch2RudrQHWU+Mocpm?= =?us-ascii?Q?cp33IhMrvJZ/SLF4CKdSaTICUFu/alm+oWiTV6O/9V5AAfL5LbVGaJIEK+nT?= =?us-ascii?Q?DJ4YDiygeTEepZiTX64unTTFSzZOfSqXIYbNXh9w39nwDeFcHQ878aWmPPSe?= =?us-ascii?Q?c6SlGavWw04NsDslYELQ4P0Ph+/eLpozbzRwzWcztOfP8xWnG6XCaGPjch1I?= =?us-ascii?Q?M5Ramt6OKI32PtArdScZ+9ZcdBJRp6xLphaFVnaNRNJzBRHF0ln/DOoNv843?= =?us-ascii?Q?BRHUE2pnRyT8PpwIQn5Te8jcfGGes6HCxMCZ3T/DuY+YPdHYpzgVJdIT8hA0?= =?us-ascii?Q?aWD4xgPX8JZ8wS5gDiSHP4CEFvDWgl0yQTsVJrtSZRONs1UrRoPLoHC4tFYq?= =?us-ascii?Q?2ot7KCoSW+eK9lr+Oh1qdDGlRhuUsMgtGK8NIAD4oTyNiULjZbfu2fbUlItY?= =?us-ascii?Q?Zz+m3JyYp/Cb2SLbPGpPlB6w6FcQzqrl17YScmv+rcdFcbkAp3cB5mWl7ME5?= =?us-ascii?Q?Nl2NwE5XzUTGIymPlKoGSx5PI?= X-Microsoft-Exchange-Diagnostics: 1; SN4PR0701MB3824; 6:0E0CNVFf+6an2lsu3rjAukwGfaId/Z0edPwtrxXjTvjklR6jR3ZZlTUJ1+Dfs65yj0TWFsEIyirLJ/B10sSOCkrmGbJGu7nBmefgsMxi3X3n0G4q31U8m4VhKivCssXPTgh4vUP6YOW7wMbrFa0iK9uQummmMK7NO+rI16dg5ktkVfUPuu8nAgmg8U20NMcGvDeDenAWikt7UZYJm9xv4d5a/AxdGAduij8yBtyLqHft/d1eoEqePv5JFadHBxbIQGZq2Ruw8DuI2lHOYLK1fIBhcXPeTxxE/GNObT/colYW/MmCtNP0LOV8Kv4TeOWwjb0z3APVfxPvqDtN7NGrH6OigFFOQ77tod2z0kD8zV4=; 5:DFsgIhKJJcqP/x0r7qYPnatZEjTIFuPr4qkqG5AYw1N4j+K/VJ6gcUsC1RsZDark/xYM//Md0ZdajeeOLNn+u0ZtQ1jHGX88PC2BVhQbYye/ujKKwmpDblsJGzOMoczJoOa64CqUpfQrX2MQoORUNFGU6egVK+WKVDyZFFExRDI=; 24:pOhQ0xM50kzn0TGCI4BY/G0MEfzOAolRBGcWeBewWY2Fz6OkH5iJ4/4HPrWlKOkzjFJ7PC3zgEkMQ5W5W+ePFzGxvqyoBP+qDd7GclKlUlI=; 7:HDvlTer7jtmVuLC9RGQqxlHujhPezxTDoIeuJ5mRHLhZBG2RPwFX2cjKtdlZoRqftSa9tNQE+l9KN1Z1kbkHR1G1KxSpuW6IbJghzjPq6Ep0925+GtZ5pvaqFvNAtHVMq5sCSrmYQ419Eu6P947UqVsbl5K48V5AQzxsWP9oUDno55WG9iM9pgZBFAh/iZDMUHQzuL8PbrL+Am7jYPcxfKvz3PkSvC0dYIp3ii7N1mUxM6pfxx1pYF/do64nIkmF SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2017 03:40:58.3003 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 7c101570-7406-4a63-f4ef-08d537a42b7a 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: SN4PR0701MB3824 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 Reviewed-by: Hannes Reinecke --- 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 = {