From patchwork Mon Dec 4 22:44:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 10091695 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 9F4FA600C5 for ; Mon, 4 Dec 2017 22:45:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9051429387 for ; Mon, 4 Dec 2017 22:45:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 84DC029446; Mon, 4 Dec 2017 22:45:42 +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 EE9CE29387 for ; Mon, 4 Dec 2017 22:45:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752380AbdLDWpk (ORCPT ); Mon, 4 Dec 2017 17:45:40 -0500 Received: from mail-bn3nam01on0050.outbound.protection.outlook.com ([104.47.33.50]:64416 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1752283AbdLDWpd (ORCPT ); Mon, 4 Dec 2017 17:45:33 -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=yF/8/34hFZKuQ/CfHPp+2O2i8/IPL9jNUx5hoER8pw8=; b=Eh/Rz8dgrhvS94eIRFtmZnDGDgbk1sCtqtfCdOYJLKTYHD5XJWcXbtgcZdKTe5/5MdwBYxrTgoMaXLsFEJU6gTOtbhHEfrJguoXI37tHlwA4gEmnWGuir7nrfop98r84tsAC+2VwJAjqW2EGqArjwxetfvt2xPOaXtPk939OgBE= Received: from SN1PR0701CA0084.namprd07.prod.outlook.com (2a01:111:e400:52fd::52) by DM5PR0701MB3816.namprd07.prod.outlook.com (2603:10b6:4:7f::26) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.282.5; Mon, 4 Dec 2017 22:45:31 +0000 Received: from BL2FFO11FD008.protection.gbl (2a01:111:f400:7c09::127) by SN1PR0701CA0084.outlook.office365.com (2a01:111:e400:52fd::52) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.282.5 via Frontend Transport; Mon, 4 Dec 2017 22:45:31 +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 BL2FFO11FD008.mail.protection.outlook.com (10.173.161.4) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.20.239.4 via Frontend Transport; Mon, 4 Dec 2017 22:45:30 +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; Mon, 4 Dec 2017 14:45:19 -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 vB4MjII4003461; Mon, 4 Dec 2017 14:45:18 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id vB4MjIk8003460; Mon, 4 Dec 2017 14:45:18 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH v3 04/22] qla2xxx: Skip IRQ affinity for Target QPairs Date: Mon, 4 Dec 2017 14:44:59 -0800 Message-ID: <20171204224517.3409-5-himanshu.madhani@cavium.com> X-Mailer: git-send-email 2.12.0 In-Reply-To: <20171204224517.3409-1-himanshu.madhani@cavium.com> References: <20171204224517.3409-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)(199003)(189002)(50226002)(86362001)(101416001)(5660300001)(305945005)(47776003)(51416003)(76176011)(106466001)(8676002)(81166006)(478600001)(81156014)(33646002)(8936002)(4326008)(87636003)(105586002)(72206003)(54906003)(48376002)(36756003)(16586007)(316002)(110136005)(42186006)(189998001)(80596001)(1076002)(356003)(2950100002)(50466002)(69596002)(6666003)(2906002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR0701MB3816; 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; BL2FFO11FD008; 1:DuL6TAhjcNXo0snZ+0xqoTgF4a5Wga3pCSQOPI6OhsMxNSo/WIirQmQiomimmrVJnm1XOQ+ssVcdVaBNJxOAYd0W6dOI9LKMq8zB4UCrFs9IX/X7S9K0KW3BO9YeILB2 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 42be6d49-eeb8-43bf-1015-08d53b68b8fe X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(5600026)(4604075)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603286); SRVR:DM5PR0701MB3816; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 3:ACgAWCgGxGyTnpHja0X7jkRawTvd/LDWWTbc5aphhP1T99lfuokbJb87sOAijXXmgj0OLr9wdhnD/buDrRkPwXvmLCc63ZXMQ7PR2xoUtrmA5WAgxaItqTab44CCUmvv7wjYXRGNEIAoDlYI+/nbWyBuH+pNX5NGbDKC7utHgQQk/BWiJqgMkD6kFMCAJ7dJq8jpQUIsetTMPrpULdIgepmpPd/mxOqhHxDABWuZBJusUmBQhMeGIgQz5ebIb/LS98y1tG23jjhETVUWOt/Gxvxo5AKPVZrwixEi+CXWOe02K5XzuLWsCqgS5FMGCn5yiJg6zpPAcGpaomYjxfGjdeOZ0E9rjxsjN1sng1MdJgw=; 25:N9LLGtMqvD1GErziFI4SdNYd+qtMLhf0IBReuXyDb4IQnBn8C6O3cPgNku3CSs+H8eDIoSQo7EYzfEnZMRUIfe3gw9+jEjE7iRJ1rplnRfxxj9SEluvrjkv2SAy8kcWM2IuHr6ApgT3YBOm0DTXgEhUqwZJbYEbOb0iMdkfnf9We9OO/NHeMDRpr7JAjHsYI9uINpl92bI1TKTj0FXBiU+kkwWbrHVxu6S0WDR2+DWkBrmnNs9lcwz5Gdowetq9MU3WZ/419C/sngWnsq8aI3CMXcnlpRujyIcvM8ZSBCdMlnrHhWIyOE5hVeVxolTc3HseSnI+J/q0Z5KcEKxF2cg== X-MS-TrafficTypeDiagnostic: DM5PR0701MB3816: X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 31:3vLxEHKdrDb2kSoD8WLw3GkdhRyg530HIT9BZRJjwm+ZNcDZKBTshf3jCoZSuDEe6C+Uo9858OHhCqF/hWlP9D48711u7Oaa5djvIpx1bt+uLhRlib+Bg0d4lqxvF/kb0LsHdvECE5ix/DTtTEn235pK3qzPgHoTRhbAL9V7GZDEq4WNWMmYUQSSy8bkfHlXB0mmseTXrJX3QT8gBgTvLgXyJ0XRzpfbYXMWJO5znw8=; 20:CG+/a97UGriUeqZjbGpzaf76kaiUyyMN2TCVzNNxKOrSnfPEdcPvb+s5y9BnD8bRyZenv0huzNOj7hDa+wliD0a3VcwxC8YoqwyOPX5RwHVki9EJYWuHjzZpNhbCgBysAUOVOAl2qxoavcaY3LX0sJM0d0Y3NdHTDoijXJQ5o+GLWL4GvxxsQU/RZ6REgLof/l0snQKYi9fRHBtQ3pTMLpbtzAqenOq7OPAy36tgPOOe6AjfXcEwm7Y+CL/dfBRV9iraed81w4oPz0KJk0YW+ajFHHvMOMaK5Ha2Av9AAV+n7H606JJ6NEbn+lI4CfLy64gcNtZBY7Ez1ZubOnfKkWhQYCRFQCR4C4O9FydcPSIU+whcF6Ml4fxld8wIWB0KmstrAQxYGwTDXtyoCPCQnkXegzhBliuOdFzbADpBjdyZLfLV550Bz+BKNLbQydBDcwBNmzudrrsfRjOa3xoNmL5YHCfDimNAj/ubo2wALicnxLEGWKOLFoUPK2S+FZce 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)(3231022)(3002001)(10201501046)(93006095)(93001095)(6041248)(20161123560025)(20161123555025)(20161123558100)(20161123564025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(6072148)(201708071742011); SRVR:DM5PR0701MB3816; BCL:0; PCL:0; RULEID:(100000803101)(100110400095); SRVR:DM5PR0701MB3816; X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 4:Np/OkWN/w1tsVWH7i1cKcHkbQje/RD3dFzUEyS1zx6IoGLlir+33c2azWIHLVjiqykThwFY1G5clIHJO1dAND1oFF5BUNE5lNqkN22XpvzQpFvhqQh97VUJcEvbZ9X8BFqphtnqlf/HIkNDwsFmEXHPpgr4BGADYCnWUUHHX4gikbmPjzBEP47izV/T8dU65xXy4c64WSUktoR+x+xNMP/je7+jhm/0VyvVGhw63cGDeZYC3EHgIZcGrLv3wepDXFn0AjfIiyLSY5H1BRyFBQFvzyPUh28BOu56w9aM9RhtYawJkEBiVROAZY1LkxCZf X-Forefront-PRVS: 051158ECBB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM5PR0701MB3816; 23:QbXTjWx672YZ8z3VgJUkm9hhiey9JpVNh8SrncD?= =?us-ascii?Q?EzXYDfe4cJDewf6er0Kl7Yb+8cJbz4K+hNWvRPoqWkYEYI1vNnW4ORiYLS5E?= =?us-ascii?Q?br5XBdJoJJxcyoisuEUd+lcXC3jwEzpM2eEvc7Hmbs96ugwfrH1HjRNJ8kuM?= =?us-ascii?Q?zsF7zz/fuoKReYsrhAHJXZbpxvwqqdh1hbyoLY8usIz3/u/BUEhEHjmoKShN?= =?us-ascii?Q?GnakJBMsVvswOTNI4sMyDV5q2TXvnMOT0Oizb6Qig9DeHgCbCarEi7Ce4HUj?= =?us-ascii?Q?B0O6MVqVksjhnyTayp5EAOU9MFzAFkeDwaftyKjXIZt7C1WCGO6Fl3QQMwwV?= =?us-ascii?Q?CSkl7R+bj28Qh5mN/O5Mp058Aozk4n8JaDhD1hDb00GGpcNRLxHr9BNIOcY1?= =?us-ascii?Q?uZQQ4YkURkOlbJIn3NNjvrYKZnoDSXz3DuyPTyzaeNp0wf3kmgaIlfYMO3Yz?= =?us-ascii?Q?zIvm1nHfokKce5pXqDEzAqGO092CQqzT955TZeLqE56CSGj7TrTwb7grtoVn?= =?us-ascii?Q?RmWZVfUJDmsnPIfaDpZms/Fcv6Kp3ifq11PllsS/sltx54ITcSIFV2WYrLmK?= =?us-ascii?Q?ESvgC1Q3e1xFKfYFVEikL7oYMW29z/XZUn7RxEjkUWYvOHDkLazN8N8U+0qN?= =?us-ascii?Q?L3fmJU1U/V5Phg06shpD2mdNsbhEXqDQhktiAgsf6g56GZNmesgMIO2jm2A3?= =?us-ascii?Q?iBOm6vP3/i/e+zopFdPvbUzxuPhwhD78G0kZXP8bpOqGaKUmShDZb9qwuEN3?= =?us-ascii?Q?f/t/wDHmj7OGQR+Lo5fOWxgQlnkBIe6G2KdvF082bQTwFI9N7kmG+xmKiNB8?= =?us-ascii?Q?klVKKcM3JQqOEBbl3Wvj3GFaJg43/EkJ2cCir73oY/CLVTTVfthvoXzQRivx?= =?us-ascii?Q?hfsjLjvxcHMRwmAYdT5beVPSGME+NiSaiFtaZdamYkjwREHIwQBSR60p35nN?= =?us-ascii?Q?xsfocf/U9NjIMkY+Avp9viNWuA9Stq9wQN8I1J6zg3rR4qA+54EZtGhH4H6x?= =?us-ascii?Q?ik4w=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM5PR0701MB3816; 6:wBwBgMXksOu55071pD8JsiZ4mh+0LbW+FvmQThbMYYqgprEiucBPV/QeVACtFFyN1UuWhSBVp9IQZujFTYBN+0W02LHcgjCFX7/3fSOFRKmbTqK/lHg0vptYLU2U0pEJVLVTJ2CXaBJ1Udb52oeMZsRbmYpGu4HUYzX5TQ1kEwV1SeTYq4RWRgWdwtGBEQ1WJmUQgUlvdsmcgFvuFQ0cQXLGXxUlmajZcL4gV7FdrKO4hj9oC2M75N0aoZ4kcFeOQ6vYjMwL3gRxVFcwaMPb/qlX/RBTtieeya+jFHDfoZuQETFJmgHAhKdswXqn65lf4shEr7ZX/UnAy7lT5ocLxymbYaCj3fKnQdAV7gAUEw8=; 5:H0rNLFA/rQIHJ+6BkvtQLKyvN5iyQzQI1eBxkeaZhyh7O2JAPq4YRkUxNDOGY7jZrF1wQXqjivlPIr4+9VkkkNfABZLs2BzzOvPPqzsKn/wrE+HPXOsq9le2hwdzCAweePa2KNxoJQpd6N0owV/7vaAxjpl5sohoZC/5XilGEdQ=; 24:iVmm19BGLAnv0JE6/iA2NXw8cTdQhYOM3SvA2aPvHp9pdryW539GAHmx+VzMTJT4Q1JN5pR7h1Lxn7rOUDgOS1EY1jD+zQ8zOK24i7YPygk=; 7:YzOkQvpLj+W3Fyml1Cb4aCyAfmYiFHC9gIeJ2PsAlAfpEKqAsCEmfQO9BBb1BAjyl0u+NxoXa6fYHi/zxpblsk+WHRwmx0oPlXDCdOUGvV7YWfpy2ZId1pl3qeL6Q1qQPoNcZOwLfc1fV54FG5rgOtKqK45SUN7h3YgiQE9VfCpYVa3AfxqQo4B+NYK1C3c98Nvyu3n27AM2NOMq3psMS+5lB4rrSNtvBX4JzzIVHHjXXHESwa+FH5G+lrkpAF/i SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 04 Dec 2017 22:45:30.5500 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 42be6d49-eeb8-43bf-1015-08d53b68b8fe 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: DM5PR0701MB3816 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 = {