From patchwork Tue Feb 21 17:34:33 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9585227 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 82ECF600C1 for ; Tue, 21 Feb 2017 17:35:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CD8428597 for ; Tue, 21 Feb 2017 17:35:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5F92B28617; Tue, 21 Feb 2017 17:35:12 +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 C828428597 for ; Tue, 21 Feb 2017 17:35:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754105AbdBURfL (ORCPT ); Tue, 21 Feb 2017 12:35:11 -0500 Received: from mail-dm3nam03on0088.outbound.protection.outlook.com ([104.47.41.88]:45520 "EHLO NAM03-DM3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753036AbdBURfJ (ORCPT ); Tue, 21 Feb 2017 12:35:09 -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=1L9WZMIETG1QpOMW1b1DdsDfBcMJO/xJxix4p+fMUiI=; b=LfYUNVT+LvS4Ly8nVEyz9mGKWpUNi1LzoUVSfm+UeiAiSbKSA6MZa9MQWkm3QCwUSC0RML8ydQn8x9wUXMhlljDijZ6slOzQt3KSNRXxZYWH5XVt5W7ZEcwI0AgB4VvCVa0A51rdvEpCnXpU6dQy4Qg5xzFgZbjZWMJ7YNx9FRs= Received: from CO2PR07CA0038.namprd07.prod.outlook.com (10.141.194.176) by CY1PR07MB2634.namprd07.prod.outlook.com (10.167.16.148) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13; Tue, 21 Feb 2017 17:35:05 +0000 Received: from BN1AFFO11FD047.protection.gbl (2a01:111:f400:7c10::115) by CO2PR07CA0038.outlook.office365.com (2a01:111:e400:1414::48) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.919.13 via Frontend Transport; Tue, 21 Feb 2017 17:35:05 +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 BN1AFFO11FD047.mail.protection.outlook.com (10.58.53.62) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.919.10 via Frontend Transport; Tue, 21 Feb 2017 17:35:05 +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.309.2; Tue, 21 Feb 2017 09:35:01 -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 v1LHYlbe004200; Tue, 21 Feb 2017 09:34:47 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v1LHYlWc004199; Tue, 21 Feb 2017 09:34:47 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH] PCI/MSI: Only disable affinity settings if pre and post vector count is equal to max_vecs and not min_vecs Date: Tue, 21 Feb 2017 09:34:33 -0800 Message-ID: <1487698473-4171-1-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 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)(7916002)(39450400003)(2980300002)(428002)(189002)(199003)(50466002)(8936002)(305945005)(106466001)(81166006)(47776003)(105586002)(50986999)(101416001)(8676002)(33646002)(42186005)(81156014)(69596002)(5660300001)(50226002)(189998001)(86362001)(6666003)(92566002)(48376002)(4720700003)(80596001)(54906002)(356003)(38730400002)(626004)(5003940100001)(36756003)(4326007)(2906002)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR07MB2634; 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; BN1AFFO11FD047; 1:yXNf/lSdeK2Ov6yufx4qUUUWKewbJAqc0LoDxHdmtLaWGmi0kEUesHWzvLJ2tiGQDXXRcvtrDw32vo1VwIBF4p5y44mdFTCbD9D2y+brnO5gwN4TGh4eZ6gMWyXxA5Zts6UWiLdA24pTNCisGoQc7Xrjmtwk7G9MDgsG/ZU1ia0DMAyTvL646mIPiooXktWFkKvlhjNvnJ+ccRw52oeIqLobZC6jQKy9+5zFu1JB9EXdxtK8/WIuNaVLvxK01ddzA7QrYPguJimHKhO8K4f862b62H5sZeUqgSomqH/jNBkmFiHSKkW/kyYrXcgxj2BOup78PXi2KmFoo8WduG/nMMwWMbigT1UZ231S7TNWD1VQMgiw3tLwDf7mJL8tX1K6uTJJQkj6x8yIvG7/c9E9s7QyS3YuSPxibopfOvDWfoWbHYjQ7YFQTPerE5vjrBcZNybFWJ5L2kWuORsLahgWRJ9f99m+YtSVBW1FCUXQ5ixofRIXDH/vXjSw6ppqU0Jm1DUfuvYpJW8N9x7r66OlcQ== X-MS-Office365-Filtering-Correlation-Id: 9d3d4322-7251-4039-482d-08d45a7ff936 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR07MB2634; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2634; 3:/DUly8Q1eTqbFWUkCp4o5mM7UycgBtD71GlEhDzFjx+ngcsmIIe/RA27ZUPb8E0Astz9vvG5ziw8h10wdPSLPeHYgHVFTk8EYsL0fJY4h5zXMmQqiKuzg76nhubWgcwVBF1hCyqnatOvHCJLodc8CdT8bkoLxsTF3IsICjPwOhlvfaxgLU9qrHobaIqiXEl+FTrfv0IKrxbMU3/tapo0lvXk6TgQ7FHJJ5MHDqRpnZDNjM8l97jxU5o+7VdVQom4i8x+BVExASPSQyU3wZ4fH8wZvR5+UUFrE7PiOv3bAtc/+mSNs1q4pMkA48iXiut0azgEd8qFj9OCPy1S6fgybjEI7efxUC7nwhxXzSZyUX088ZbDWi7qQNyF0uSrdxQp; 25:GbeM2ALcZ8AiLhIbSPfQqkQJ/Rtl0l8cpdKI6hFDc/mDYFwPGr7Imc0SCfypay7syDmGdqENXasg+n7CV3Wo/C0C+ZI7cqiZczKzKP7tBaIcuzOd+ReZ5e+vzVi30G/Qus8J2rpKiwtdAZzU2hQhE2tK8Mas25Hv6PJ9Fj07Gz+/0uM0izbcIb4hNd47VbSwBvehTiqOluKjUEh+EhAniEgCQQ2faHdxq5tErY1+stgmFMYTTLN0znjFm3LIjRf/egzpApUEsq3iZDVbBglnYSIXvN3OwktXV52u4nt2djGOcbAeaAQDOeFoLqrsfJ3KzJycvIjeeJPYdvrFtC82IDCQFLUjtOs91aKpUpjvpdLgQLqvrVwGoJdcDfsERyX56ioOrCe3NLRtTbbXM5hePicyRIn7UPQeRsyoKByfCDW5XnHrq0oMZU2qk8jytVvBPlp2beddvlappEI5I6DIdw== X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2634; 31:VdJ8t645FPuxTjkhFJRltGHaqu2xUbrcwKt1ItaRbb4yhQKAp/RAIQaNJk+vOMOUMGYlHUQiBykhti6wKisyiy+R6aAYtJuBr650qzarbY8Pp1g++02HGf92QW+yCrqsPz3FIQRcB7371oXLCGvI9DDN1o10jMZWZRT1ZZepASUBEx3TuMVHi8LgGG1dGeEWJNqkALDKPqFdCHzh87PArd7Bac8swrxg0AQOwoGt3UjgSo0Td/fW+UD9NFPJYPrMsH13qVWaOjMCZwtDTUlfIA==; 20:Mb+6xTGA6ijYBTyY2uAlRWtY2554cOGri/5FSYJb3PVDzgpaXMBBdLwqEaDVtREry8rVEr9WOLZX08GyM9bJG8J6vybaXIiY5RYhu3Ai/TjuTbI60nzmPzFAedvSAihruVijwE3w3BD5C7BOo+HiUIJ99bq2XxQNwj5SJASntZSBGf9i/sGHL7zSeDCOP00UyKPCmDQne0mVxAPMlJakTmUXYDSjY9JAvwiWhoGlMRzpbrNB1whQ5qRNAWwdwSGE/t0WxpqpfeIT3va2bJhD/NlunOH3TiHNWFSRdzy5/zbPsQayDqTIkwi5HtJ6anM9Pkc+9ph1R1D/e8dRa/umugo7iB3OxRRV6uEmi3TuFL5KBKcyAqzuiHKUe9nfdbiaHv/crAlJfnXz95ZqguhtpqFF3NcTuDmf2kmKB5lBMGxeg28v4R2dqjwCCMjU/u3M2clNOfXRxXpBwbOyhzPg88g0BMGuR9bXjkElmNwJC2H9B4iSuW4CicdCfpn0r/0F X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(9452136761055); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(8121501046)(5005006)(13015025)(13017025)(13023025)(13024025)(13018025)(3002001)(10201501046)(6041248)(20161123560025)(20161123558025)(20161123564025)(20161123562025)(20161123555025)(6072148); SRVR:CY1PR07MB2634; BCL:0; PCL:0; RULEID:; SRVR:CY1PR07MB2634; X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2634; 4:LN03ur/0889WpHYL/6l0SdOtZRabiHbt1L7m/8/b53YeV1waU0P4pDunwrPmqM0r4/NuzNiSkh6rmpDNbde5A9s4mRlbDxMzDNa2Niy8pEbw7WiehgNvkNxC1WXKWVqX4BoFD9l7xFE6wgFzeUHXml2cNkmyPHemBOQ6AaOR1uM/zJwwdFJ4rqSrfb7nvMWqLlDCw6Pkzo9zxyctLyffqZJhixZi97jbSfJbePZIguDd7Z5TAbdMs6FIReUW+se7EQSjx4rkFdAEqWl4a4pBLr6eS21dzK65rseI8oGKblJKPczGmaZklIeqsJWBimak8k2YN+PUjCtV3M9jOuuIvJlVxvsnXswAOpdETpuIXIYJPRIPMBaAGYBpHHTSxEW646pCGqchM6MSbMn9KsNq1xBUgLspKskqRwtGUX84CyAbv7eBQaRcjJ8bufzBgflB6aFZTNO+XO89cqFD8FuqNJA4UfpdDT2IpLDjoksxoUWeueAczhqBXFWmrcAvGadXjJoP4KL3fC6JXMpYuxFUpwI8EMx+9ciyUs20W98fYjNTXTW2+SlrPGFjNTViZzhtM3F0Xn0+e8rcG7YBLlQv8vTc3ynQ9BhCbQ3PxAKNCwuB4jQswLu7mghNPu+020G+sxF8gwGla1nP0h+lh7Dtqt2pMzIegpdh2PDsV/oUsfBAFJ9du2tJuYoGqds+B0JZqrcnr/dMHQYm2JfA4+FTb8nYct+vpLz064cxyO+BgDY= X-Forefront-PRVS: 0225B0D5BC X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR07MB2634; 23:9Np4ydblSq5pR8gKaBcz+5UvBU3eZKm7+eoK+5CT2?= =?us-ascii?Q?4OmKPTBMOefJtdwGzS8M3mk/XUTIqCkKCBY8Q36gzcTs0WETq/YKRBKc0y8t?= =?us-ascii?Q?gsjWO6OanT3PFT3WD1yTwMNgYc9dvTDJkPu/PFgOlgLqOVznbRdoCvbdwa4n?= =?us-ascii?Q?7TwmE+O5CIJ5eAWZ2aHLRWwJX+91I26+dJWVO8C9LVwRF+ODg0WH3f/T8Mv+?= =?us-ascii?Q?ZPwCuPnWKA8csRqZaP5d7jQGsnK5ITJCgurwWs4Cswl5ejcsjPtMUHH+FZLD?= =?us-ascii?Q?riF/sV6s7mUQtIy823EHK5m4L40BhCg/olB1hrm6wScMekRdeM3jEVh2m/q7?= =?us-ascii?Q?B/y7pZVPzZGVbsf+XNa8TANRLPFAGv/a9O+CzH5wQOYOV8PZli+HZy30Xu6p?= =?us-ascii?Q?Yp/+4ttX3pmI2V6d0elZ4RtJoM7IgmcSGSqALFzZ9+9MoO5lF9X/JJZeoin4?= =?us-ascii?Q?YE2y6oQHzxW3esxF+8a69k39pdzneUNlG1+u9DCmLoBs1zDrah4tVff5UNtm?= =?us-ascii?Q?EY+o6gkAur7MW0DzFiojlX/Sq765YE8934CSTDuJJ3RsNkRm9MbW52DQNWSQ?= =?us-ascii?Q?HuxYyhCbyV3qvuMAomXZkIigKkCcBQn4QZXYJ5ekrf2HBslvL9LjlVtFtNx0?= =?us-ascii?Q?wfbb1ZBkIJVqSyHl50+mRojOBRXulhKsTcBGM6ueLUtHkw0nqKLyzHpbYbgk?= =?us-ascii?Q?bqJPANCIFVeNKKuPkO0hT7uNQsWXoJxdpxviUnYyfJrKTrJJxYdU82iF5lHQ?= =?us-ascii?Q?lL2F7wonIHDTwk4gAAqR3yy/rtF3t9HMaN10bv3ZddI/748/tcX8emxjbUby?= =?us-ascii?Q?io5Kw+0fbKC51jBM4Mg5/qzkiJBCCbQXzUi6qUiJzshDY3oKpqojwdABSAN1?= =?us-ascii?Q?Bp7ABr7+nMrlvXMPwE2siqLLu3QfrXOBMSCUOVbjwdlzA0P6iQEEdAv50P1J?= =?us-ascii?Q?0mGeU2mYBGpWt1LOQHgUh9w91yhyAi5KVBRJMBIuQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2634; 6:Gxu/XChGMveDCDRheq2+J5/Yx7ETBy9jKh1f1Tbfo/zMMAnFQHLR4Jj0hyxcuuaHwjAN/vXcVLuVXTL3ZbtwpXywGesU4dyS7+kNvBy6ckF65/gJYzqJd7rvbgiDqqDAJZF1mHhVY+wGAv4lewI5ES7oh8D4s3QM40YAZ0TANmlscALNwDfHxqt/XtvUs10PAHHofNWS7RNpSPkwMl2cv4l3hULH5Hmn+LorLP3u9YqRRcomuSGzVn++oAzD4vKcMXPkv/a3ui7yGCM3kCQADDtfyCtMzOd8o75DqQKjXA5Yywx8/iYOW/cMIWM8lKCv1Xskzo3Bk3xxK8hBCFN6wnozI5CS1s6J00WFzCw1HT2KlHXTfloB4Zv+Dsy7/nLKRjWW0sbqLttZ5Q3xDhUOiQ==; 5:j04k26sGc07mVsHb7MHK9X2ZxDi8+0hGYfg5KzB81D25fEsNQ3EaS2r0HEhZpmkc95olt8VjcRMfU46vjzetTArYoNcevd1Z+rvRajXjXYJD4+83juZ+43QKNf+u1BbpXXe3BqEAqyHfX9o3+lEZ/w==; 24:p/wCJqg9Jqc0P28BKFcIJoFZvaGOt8bA940Nu2pQG4iSZJH+XrrvWYq5yCOIk8x+SjYiSzyq6QkDzzrRfIUFsYhqyLXGuTWC74xdcFzTFkk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR07MB2634; 7:1sHcsSQpqNU8y4hbbkaeU6/PVzJGPEBZyZ0hSBvbb01XVMRlQbHHYshZgqylcfjaue0tBKBMtW+liqV4TMKRrpj+qxvgqlbGcfMo+YdFVXOhPhl2A7p6mIygUD3UL8lr7lYm1J0gZDcdZxKUQciJZjTE55/SZL5uFUcidz7d9S72GVGRLOYc4tcEYTai6Pi11RCITzKAeVLzjfdNqFWnfHnYtN9MhD3AKPwkERxQd93FM9SuXzkHfh9LDolKc+Cr394D456H6606lUW1uqWQmEbVFRiaXSRiyx82PvBh1cMOZwuBHPjc3tHo4/j+/SoTZ6mVenLHQR/za6DTNdRnsA== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Feb 2017 17:35:05.1081 (UTC) 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: CY1PR07MB2634 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: Michael Hernandez min_vecs is the minimum amount of vectors needed to operate in MSI-X mode which may just include the vectors that don't need affinity. Disabling affinity settings causes the qla2xxx driver scsi_add_host to fail when blk_mq is enabled as the blk_mq_pci_map_queues expects affinity masks on each vector. Fixes: dfef358 ("PCI/MSI: Don't apply affinity if there aren't enough vectors left") Signed-off-by: Michael Hernandez Signed-off-by: Himanshu Madhani Cc: Christoph Hellwig Cc: stable@vger.kernel.org --- drivers/pci/msi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index 7f73bac..5823348 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c @@ -1214,7 +1214,7 @@ int pci_alloc_irq_vectors_affinity(struct pci_dev *dev, unsigned int min_vecs, * If there aren't any vectors left after applying the pre/post * vectors don't bother with assigning affinity. */ - if (affd->pre_vectors + affd->post_vectors == min_vecs) + if (affd->pre_vectors + affd->post_vectors == max_vecs) affd = NULL; } else { if (WARN_ON(affd))