From patchwork Wed Feb 15 23:37:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Madhani, Himanshu" X-Patchwork-Id: 9575725 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 7C35760209 for ; Wed, 15 Feb 2017 23:38:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6D90828592 for ; Wed, 15 Feb 2017 23:38:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6124C28598; Wed, 15 Feb 2017 23:38:35 +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 C7AF428592 for ; Wed, 15 Feb 2017 23:38:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755479AbdBOXid (ORCPT ); Wed, 15 Feb 2017 18:38:33 -0500 Received: from mail-by2nam01on0076.outbound.protection.outlook.com ([104.47.34.76]:21408 "EHLO NAM01-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755553AbdBOXi3 (ORCPT ); Wed, 15 Feb 2017 18:38:29 -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=3xLxOMiG23gp6ZEk45iC7j5wbxepODdotRyBg/wkcaw=; b=Tjj4feSybhlLRrJNEBRlMnwA30scvI50gKYJF4Z/+fZtx5mOeRWoHmy6yY9n4fWcMFBcVGXQv6OKGpJWq/ME1lZ3Q7OGhEVFX79OBPNgDHseo6d3MBgE5EggaxqT2TxfESi7dvNDPzLc8OAfvMmbYd9QdnLpOYTkQ83QGzQ2KWI= Received: from DM2PR07CA0047.namprd07.prod.outlook.com (10.141.52.175) by CO2PR07MB2629.namprd07.prod.outlook.com (10.166.213.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16; Wed, 15 Feb 2017 23:38:22 +0000 Received: from BY2FFO11FD032.protection.gbl (2a01:111:f400:7c0c::174) by DM2PR07CA0047.outlook.office365.com (2a01:111:e400:2414::47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.888.16 via Frontend Transport; Wed, 15 Feb 2017 23:38:21 +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 BY2FFO11FD032.mail.protection.outlook.com (10.1.14.210) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA_P384) id 15.1.904.16 via Frontend Transport; Wed, 15 Feb 2017 23:38:21 +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; Wed, 15 Feb 2017 15:37:50 -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 v1FNbaYI028887; Wed, 15 Feb 2017 15:37:36 -0800 Received: (from root@localhost) by dut1171.mv.qlogic.com (8.14.7/8.14.7/Submit) id v1FNba5T028886; Wed, 15 Feb 2017 15:37:36 -0800 From: Himanshu Madhani To: , CC: , Subject: [PATCH 3/3] qla2xxx: Fix Regression introduced by pci_alloc_irq_vectors_affinity call. Date: Wed, 15 Feb 2017 15:37:21 -0800 Message-ID: <1487201841-28846-4-git-send-email-himanshu.madhani@cavium.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1487201841-28846-1-git-send-email-himanshu.madhani@cavium.com> References: <1487201841-28846-1-git-send-email-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)(7916002)(39450400003)(2980300002)(428002)(189002)(199003)(81166006)(33646002)(50986999)(81156014)(47776003)(42186005)(76176999)(105586002)(50466002)(106466001)(69596002)(101416001)(2906002)(6666003)(80596001)(5003940100001)(626004)(36756003)(4326007)(8936002)(92566002)(5660300001)(48376002)(189998001)(4720700003)(8676002)(50226002)(38730400002)(2950100002)(54906002)(356003)(575784001)(389900002)(86362001)(305945005)(87636001); DIR:OUT; SFP:1101; SCL:1; SRVR:CO2PR07MB2629; 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; BY2FFO11FD032; 1:5xtnpgrpT1M+ssvTANJ4Ws3QlDCoyE9cXG6kFWfRRY/sxr0/GiGf0pAxUYARyoeeGaZvULzZGyS9Ghbt27ISnPPO1exUlSzm6eJnEQc9TnIKhhVE9shAJF5KaWEmyEv07KpjvfQzACFJkEGbDjEiGWRWgMSlXVC5XE3amgXEpqKCNjl14GprZ0dikI0gpU43OdmbthPYxFlaJ+KtpPaF4PbPsaw2vePqYc2WoIqbxsR17rphGx0bxI7bL1UusrkkY8hdUBJ0Nyz0kBJwHjSAOysbJXM+wCb/s0cZGxskRJzztWxSiKwxJyWfPSlLkfKwNhmtZvOkpYsbvpAzwSgWjX3zBc8kQhHAspSkFBDGLnK3/3QQ1C0xrem0rLakWbnlYFOhnFeS+WflP1vzwO0ZqePRzFdYMtDR6peTs86uymTbqmDwEUQCjYArc+4XWTfdivy3WHbrJyczE6Rf9g2rNp14n3PXI4y4INTtqBHTfOLayRGRtoyxKCMWkeQoXH656agh3qydzSPmF3Y5Dqp7Vg== X-MS-Office365-Filtering-Correlation-Id: 3aff6a26-74ca-44ea-a874-08d455fbba33 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CO2PR07MB2629; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2629; 3:BChBcEyeY6yb1ZKWVySluWX2j2VLoMpTAgsPJMZnJG81RatUOx2cSKbJrBELlRaVvyl4+fH+vYVGbOszz/jEGSW/WGMmlJps33xsfWOqC9jD9/JbI8En/xRn4P/fBD22awTe0k8a16As80Le3hBt6DbugLEFYjQ3z6M0/yIzlLhBW2p1RsGvLEjSurj1eeMQGp303voTRuTWw4jZc1wrUGaw/tl9M9ady0ezi/dCIQMHtDtFuXHG4derysyu/mBffaG4kqzSw4Zhw/XB1onN7JcdcwR28QEMXh/zwsbP6XJBd53hE1I/NSQacolK2sPZuCRjAoWiSULajvlGs3A3r29WmgwURaxZ3/FwxquxyMez/wxpCLg7i7sf8qg1R9Wn; 25:bx4oJpPrh47T0XBYS6Aj4SQuhXyKkQceuwvu+gsWg7Wyfc+4T3WRFGbAqcwkoMp+m13aQNYrMZyekOyvZCREJyU36TPbjUhLSA0UJ+62BcdBRljuBCl849z8RGeChtbngIgwU1CO1l9PZhoHCu4l3MQosLkogMjvXNlAMCKJrw9yyYXWVMQOkHvfuvqgN64AwNqOaLGei4Iw85zOtMZRJ5T1VbGWQNR0w7lNetcI944wJiMmbKd997Rse8DgGqcVlpS769Pmb2BftFvkZXH9W4dS2/iQJo0oaAeGJs8zjmqgsT9NY4p/Mmnjc7A1n/AnR3yLMPewxrU4ofZlzNcdcsKKhozpFHOkuRV8wygXeAT3kiGx/EETgpeiqoU/ekNcuk6KuB+hxaCvKp9bZUtgC+B84lWe5qnPHMQz8K9SMu4aioxZSMBSoMXajYEE8XCwXP2rrFVCT/fCP9ZxYvU9kQ== X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2629; 31:G1mSdj9TRhY2WY8SAYEJRzSNOf/XrLBku39Ib02zLO/LBYvoG4eu+ZbEWwN5j5h6dxJJvd0eRwbqKFTi9wjsXEeg8+hsr/LOx311kwDaVhAtZz8aT1iX3hrUYlRljpIKJxW+XG8tbPTRkKBobB2MfepEZZKX949siasG/T+p8bNZTyzC6P8rtBUxosAUixEjPiBNBMfaJwrFZAhp3lCS7nUIHO4xjo/YHsL5+RuI9MI/qAWS9GeD7LjHzEKjJ0Df1vX/06907scDmru2AA5Llw==; 20:xnK1KjINrEQeqbv7uQOSDQx96DYJCR1WSHtwoL9lemjqJK6LYdhcf/HerXyXWuGzP4UqriaNvkQTtDvEjzEflahN2xClNuYIL59g5wNdxv7YN6l6jACDch0XZjq/r2dU4a4ZEX9wgk7mVxm5h5GvIS5VNO4RetOIJpiznwxgDoPH8V7xm7qXgwJwYs3/bEN7Q1nLsYOvPwTPv0hIii9sMuoR8hq8dPmidrM9jG/Qn7DfIeB1u/EZqN0WGwuZO5PYFcBFQaq0Iq5+mLWUkoq9BbnBbi9JgPveTyg7zYhE3wkfhESguO2wD3z3RviA3yy4grA3uat33xkxFLA6IoFsfW1d21k1L4twd5u+yu+p8rgiL5RMr91P3+7bjjn4a9fi/rPMqqCf0TQ3s7MMKa/vWN3h4PJwz48//FC7l42rlvVg3e+rTJ/0LzddsW+rLDMEyNABSXkqKu5iuDhNTrY8TyjT/Xln0H44grbqS0CVicw4nrw6jUJxELDzYI0uAaC3 X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040375)(601004)(2401047)(13023025)(13015025)(13017025)(13024025)(13018025)(8121501046)(5005006)(10201501046)(3002001)(6041248)(20161123555025)(20161123558025)(20161123562025)(20161123560025)(20161123564025)(6072148); SRVR:CO2PR07MB2629; BCL:0; PCL:0; RULEID:; SRVR:CO2PR07MB2629; X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2629; 4:0US7Mm9AI11qjReeRpC+NMSZE0BvwcYk52/QALcUNGMJPM+ctTuHHVZQdlYfA1cWjKht5gAoU4CvNZ/H+iehccGbc2r1NgHqm10C/R3Ig43Jfc5yWC/HVS7AA3/fTi4gvUGGqV+pY/pv/YNqexw/leGt8GsrWnfa7Csjkrgq5UEHDW+hYqKVnlBs5Tc7+pnOCTnAyJxV6Ff5+t3rZrKgyOzOFL1HNPmrb8IlMAJUo1CSmkgj71eo6EvdmHQGr10aqMzwITyyzECzvynSCT30lc382HYEy8+Pt0TD6qz4LirbpwChZ+2d4/+ZqBjnh1DZtaofroTanwLa+o7sWUxYQRpjb3jkDtB5kx/PpKbFbol9JilZT5jQmKSqOuGA+UC05icNR4yrloRCWT4rWeJthVEnaBH/FKJIpqjk1o//XYkzlgikb3GuM6auULqttjXK3mA1gkW+ntVjqEXStERtx/aatyJEcF7Tupa0qRfC51Ic5GtkWhgTHZ3oVvRYEHpPgZd2KY+S7D3hRkJHbzEIVyDXjzNGMozfLev9bnfgETgPbcyVsTHtmai1sND+bJydnRSL3a82hZ5Tb8Al9zEbmWMnrU5t9kCZj2gzLobHCtgGxE9qhgHx7G3IALj4dGgsPO0noiTPm/SgDw23vvU85PeBtgDRAnmwqt0eA9LsR+bz/7JR6bB+6/6h4UwcPs2+fDyb8X2AWwQQ2JD1PZp0xw== X-Forefront-PRVS: 021975AE46 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CO2PR07MB2629; 23:m1IHcHEN2N+9ZN9MZU8wgV+rEgwpNTIGH2cTRR3Rb?= =?us-ascii?Q?SiXpi5wjcoOClgp9AeASJOQq2vntp9TkwCAz4H6qFyhNUyO1yqpaaeYcS5j8?= =?us-ascii?Q?yJUYjYRQ4ChtluEbcDSfUV7bKzJN1srH4hcfFfibN6E/4nUedj/zfvWw7ta2?= =?us-ascii?Q?qE0zl+HJO1f6IBoIjTlfzDYLFzppplJh5FVucYfAxpxvA38wCUffVLIBXf10?= =?us-ascii?Q?4hl4UCPd2/766la7mMyYn+FdcQ5MnA+5KYW4s6D+RimKsvvG1+mwjxVWsQzt?= =?us-ascii?Q?5JeYd+CKPb7rpefWRVcE6S5IGktb9fgAnsEtjP32rqP5VmRTEKyF6X1v4H4f?= =?us-ascii?Q?o2AFjugmacwWp81tvob5Qv9DDujSrJu+IZ6ZvCNcPa92O2uW/REL/4G3oFS5?= =?us-ascii?Q?vbT2SOnh+kqSqv6dZvUZc5JMH2PuX7OaSH75995UVlT0Pu6znOgmaLfo1o0A?= =?us-ascii?Q?nch03kkhexwDC7xBefODOX79xj9Rc0Gz26aw9ETL0F/NQeLMDZG5/sKvlgl+?= =?us-ascii?Q?qZ29cv9k68BSamxGFP5J97GiVOLQuujDO3LsJPDuXoLidV8trt/F9AinqEN+?= =?us-ascii?Q?HzVrzR0MINKEW4QBcps5elWK8NhrGJn1a8+gx3oWkSVuE4icoxSl9Iss1ZjP?= =?us-ascii?Q?u6JvCIijE0f6jZoaFS4aMDThZpvjAC9bQMYUysb+G1BtQbfmXM05rHTr1Q1G?= =?us-ascii?Q?kj1bhhFqKwf6bgO0Y7xBEiW+LtABbOkHhQJgYYEPrO8byicz8KuFAhIMUhG0?= =?us-ascii?Q?GUT3GKRmhW1+CuRZOBUeLfyrBtr4BtxCPsgwdRZVYjs8WJWhZFyj8TMjVwBS?= =?us-ascii?Q?HdC2UheZed/JQGzKOwJLq3HFAE6+LxxrJdoj8H5wcoMv6/XkEeAwM9hwV/b1?= =?us-ascii?Q?PuiyM36dM86i0GSV9aeAe+Ol9HY42OfbSgMXTAcbso6x1RWX8fVOR9dAw8q1?= =?us-ascii?Q?M/1jkYcDsoyXEDPEWgHvtF4jAgFzmSbKvUSt262UhoFuUvAj7DPIYjLhFoMc?= =?us-ascii?Q?wCtakyGMr+OAj+N0yYNoyVc7Qaw4I+kdSJstLe6rSrf6s8aCux3kGcEKhYSY?= =?us-ascii?Q?fYOHMY=3D?= X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2629; 6:hEaJCV5yZ2wFeDC+9ROq7N8cvVdKYdKu8HRx6qEDpT98gOT7IomdQikErZxGznwQEL4796iLgkhFV3ciCYYg2QOx1wGEXkf2UCDRAcd2ilUusZlTY1urmLatFG5yuED+y2QZiJdysR12GfnCmF3laRNQ7O9fXqkcuNYJViiHxEYzAP88NqMIm1XS+ka91FouS1mGQfCRoRZEmUluKg/fE7By8+4khGxbup97YwC0mg3uB51LLifLSVwF53pcK42dbcuSdizwn8wR9PoU9iDvg+yT524N2Aodofi7g9TRXqrJsuSlFBSCwWoje027lqu+I8mdRgQPDgQL+GhIoam1DpmJJIl7RIM5XS49b+kh9You2k/3UdBD00C4/EzhMdSKb64hB3OgmtaaTNF9Erbrcg==; 5:WrcuX00qgskA26gTmgrf6PXgpF758QI7uhiNDV4qTttCkLfW7MHkKgEzwJ+StwPPo0nyqSEqIJQUNJ9/+s3srkQwiEUQohrV83Htea4m/tzYsG42S5syFBIJ1u01aFHSL58lXzn1RRrWYuVRttJ8EQ==; 24:9QR04V2qc9w4EuikB1Udm7q5wt3Ga8dyDHkqGhFckBIySddCoL9/OL90TIFmPxGvzKnTdgvtS0nhlbGdys5EkerMpZA0BdrcpRrnX5n2Hv8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CO2PR07MB2629; 7:v+MkNoVxVkj/+LoQuO+ofu0tm6vcv5OWvNrBvcF+7gZPdEqw7pVzeASbUmfCDw+YsjGfA0NT6MNYrERZZ03JcJ+ByBPLb6kGhdIXhP+3XTAW0gg00qrQmQEQtNfFj1mdVSo3YlXFAJTjna7SF4DC43KOFmgeNQXcOw2nU8Am1tmQf9Y1ge9c+8EVMXtER9z9rODpFnonlCURlI4z9sC3Q+KhS/1Z+VABY4CcL3Ad3B7zVadG59TNW0MWMwgqG4N/dHKMmazXXmAHN58P3C/aX7lp26pUA28vTYxXzGKaeZvNdAqfl9bROdjfVZMRKeCuZayKVhHmTMnnNFHKWfieTg== X-OriginatorOrg: cavium.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Feb 2017 23:38:21.2998 (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: CO2PR07MB2629 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 For target mode, we need to increase minimum vectors value by one to account for ATIO queue. Following stack trace will be seen Call Trace: qla24xx_config_rings+0x15a/0x230 [qla2xxx] qla2x00_init_rings+0x1a1/0x3a0 [qla2xxx] qla2x00_restart_isp+0x5c/0x120 [qla2xxx] qla2x00_abort_isp+0x138/0x430 [qla2xxx] ? __schedule+0x260/0x580 qla2x00_do_dpc+0x3bc/0x920 [qla2xxx] ? qla2x00_relogin+0x290/0x290 [qla2xxx] ? schedule+0x3a/0xa0 ? qla2x00_relogin+0x290/0x290 [qla2xxx] kthread+0x103/0x140 ? __kthread_init_worker+0x40/0x40 ret_from_fork+0x29/0x40 RIP: qlt_24xx_config_rings+0x6c/0x90 Fixes: 17e5fc5 ("scsi: qla2xxx: fix MSI-X vector affinity") Signed-off-by: Michael Hernandez Signed-off-by: Himanshu Madhani --- drivers/scsi/qla2xxx/qla_isr.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/qla2xxx/qla_isr.c b/drivers/scsi/qla2xxx/qla_isr.c index 6e0a0f1..6b324ac 100644 --- a/drivers/scsi/qla2xxx/qla_isr.c +++ b/drivers/scsi/qla2xxx/qla_isr.c @@ -3013,14 +3013,17 @@ struct qla_init_msix_entry { int i, ret; struct qla_msix_entry *qentry; scsi_qla_host_t *vha = pci_get_drvdata(ha->pdev); + int min_vecs = QLA_BASE_VECTORS; struct irq_affinity desc = { .pre_vectors = QLA_BASE_VECTORS, }; - if (QLA_TGT_MODE_ENABLED() && IS_ATIO_MSIX_CAPABLE(ha)) + if (QLA_TGT_MODE_ENABLED() && IS_ATIO_MSIX_CAPABLE(ha)) { desc.pre_vectors++; + min_vecs++; + } - ret = pci_alloc_irq_vectors_affinity(ha->pdev, QLA_BASE_VECTORS, + ret = pci_alloc_irq_vectors_affinity(ha->pdev, min_vecs, ha->msix_count, PCI_IRQ_MSIX | PCI_IRQ_AFFINITY, &desc);