From patchwork Fri Oct 18 17:12:28 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Gordeev X-Patchwork-Id: 284830 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 6F7ED2C011C for ; Sat, 19 Oct 2013 17:40:15 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750964Ab3JSGkN (ORCPT ); Sat, 19 Oct 2013 02:40:13 -0400 Received: from 221-186-24-89.in-addr.arpa ([89.24.186.221]:12571 "EHLO dhcp-26-207.brq.redhat.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1750881Ab3JSGkM (ORCPT ); Sat, 19 Oct 2013 02:40:12 -0400 Received: from dhcp-26-207.brq.redhat.com (localhost [127.0.0.1]) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5) with ESMTP id r9IHE0DD004831; Fri, 18 Oct 2013 19:14:00 +0200 Received: (from agordeev@localhost) by dhcp-26-207.brq.redhat.com (8.14.5/8.14.5/Submit) id r9IHDxfI004830; Fri, 18 Oct 2013 19:13:59 +0200 From: Alexander Gordeev To: linux-kernel@vger.kernel.org Cc: Alexander Gordeev , Bjorn Helgaas , Michael Ellerman , Benjamin Herrenschmidt , Tejun Heo , Ben Hutchings , David Laight , Mark Lord , "H. Peter Anvin" , linux-pci@vger.kernel.org Subject: [PATCH RFC v2 28/29] vmxnet3: Limit number of rx queues to 1 if per-queue MSI-Xs failed Date: Fri, 18 Oct 2013 19:12:28 +0200 Message-Id: <48b60dd6eda8df93f1eb8e8356e3c80c673550e3.1382103786.git.agordeev@redhat.com> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: References: Sender: linux-pci-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pci@vger.kernel.org Signed-off-by: Alexander Gordeev --- drivers/net/vmxnet3/vmxnet3_drv.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) diff --git a/drivers/net/vmxnet3/vmxnet3_drv.c b/drivers/net/vmxnet3/vmxnet3_drv.c index 3df7f32..d33802c 100644 --- a/drivers/net/vmxnet3/vmxnet3_drv.c +++ b/drivers/net/vmxnet3/vmxnet3_drv.c @@ -2814,23 +2814,21 @@ vmxnet3_alloc_intr_resources(struct vmxnet3_adapter *adapter) err = vmxnet3_acquire_msix_vectors(adapter, adapter->intr.num_intrs); - /* If we cannot allocate one MSIx vector per queue - * then limit the number of rx queues to 1 - */ - if (err == VMXNET3_LINUX_MIN_MSIX_VECT) { - if (adapter->share_intr != VMXNET3_INTR_BUDDYSHARE - || adapter->num_rx_queues != 1) { + if (!err) { + /* If we cannot allocate one MSIx vector per queue + * then limit the number of rx queues to 1 + */ + if ((adapter->intr.num_intrs == + VMXNET3_LINUX_MIN_MSIX_VECT) && + ((adapter->share_intr != VMXNET3_INTR_BUDDYSHARE) || + (adapter->num_rx_queues != 1))) { adapter->share_intr = VMXNET3_INTR_TXSHARE; netdev_err(adapter->netdev, "Number of rx queues : 1\n"); adapter->num_rx_queues = 1; - adapter->intr.num_intrs = - VMXNET3_LINUX_MIN_MSIX_VECT; } return; } - if (!err) - return; /* If we cannot allocate MSIx vectors use only one rx queue */ dev_info(&adapter->pdev->dev,