From patchwork Wed Nov 22 18:57:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander H Duyck X-Patchwork-Id: 840498 X-Patchwork-Delegate: jeffrey.t.kirsher@intel.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=osuosl.org (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=intel-wired-lan-bounces@osuosl.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="RW/m57p1"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3yhssj51Mwz9ryQ for ; Thu, 23 Nov 2017 06:27:21 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D31D887081; Wed, 22 Nov 2017 19:27:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id C9BUjRVMrSLx; Wed, 22 Nov 2017 19:27:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 9C88687310; Wed, 22 Nov 2017 19:27:16 +0000 (UTC) X-Original-To: intel-wired-lan@lists.osuosl.org Delivered-To: intel-wired-lan@lists.osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id B928A1C2092 for ; Wed, 22 Nov 2017 19:06:01 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id B0C018797B for ; Wed, 22 Nov 2017 19:06:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id vAa09EP-SK0O for ; Wed, 22 Nov 2017 19:06:00 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pl0-f66.google.com (mail-pl0-f66.google.com [209.85.160.66]) by fraxinus.osuosl.org (Postfix) with ESMTPS id E169287500 for ; Wed, 22 Nov 2017 19:06:00 +0000 (UTC) Received: by mail-pl0-f66.google.com with SMTP id l16so1261481pli.6 for ; Wed, 22 Nov 2017 11:06:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:from:to:date:message-id:in-reply-to:references:user-agent :mime-version:content-transfer-encoding; bh=dHl8V+KgxY667Klhn2VmEjLz2nFatZ+fPIaPID66Kms=; b=RW/m57p1tFcoa3ArG1kH8O7cw4dElACrSph0Ihzv8zukv3Y268fveIVW/5dEOrUOFy 4U8usZS7Rva56nwH+j0q62nLbCtb670ITkzZyGLH78VNPyODVOxKNfTKMaLxc1WjqcBW 5Tg8zRL8M8nq+7uiVbgf1Uu2T3/WEcsCiSKa1Gukis2/Qqz5jhOKv+wmysntsSzc76fq XlMSrisgkqb6Gpu1xcwXfMDk7d9vAhLrsRlhISwUOq6nwhylGOmS9QzVwmyJ2NMynAx7 wGErW9EU0WGTZEtlCpoCyA4MdnJWoj3GqEUzylYjFjgwHBiZmaEKhUnEMyPHrO/brdYY LbRg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:date:message-id:in-reply-to :references:user-agent:mime-version:content-transfer-encoding; bh=dHl8V+KgxY667Klhn2VmEjLz2nFatZ+fPIaPID66Kms=; b=LIx67wrCCT6qHgo+eQB3F0KFeRm03RsLWNdg2zkHkFYo5WW5l7sbEJyOa1orVRPQlQ dQUz36J2ubwYzvK6MMqleWtv3UCL1MYidhOhxdnlJsyLlITw8QIM3Sib31pzxRgOGs8P wIenliLPqec2vWujgtxSuv0skWroFpBseRGMIiJP9GFsa+fSnYZinLVzna4cYe185GUj Fwovl9g10/e7qvKUo82wpTgBCzFGAA3ayrvmUS91E4NgEFBpii7oz/oCNqzNPtsZ1z5k EGSAQtlnWNe2gt72KWMqRB9tKDurA7t0Z0KFblCRTczI+9xpk7kwK1zyq92CFLmXzD3H +lLg== X-Gm-Message-State: AJaThX5c8ykLpl8Sk1xmeT56pDtbxZK2eaKy0j5TbfQ8Bd2ijIJ1WPSS 3dq5KnkK02I/wpUxXLUpo40CEHuw X-Google-Smtp-Source: AGs4zMaFTVEx5xnyZpZqDWiuGLP4afBvMg1Lmcub4zSoGbammGUZLYKxTeVoaZjoXCYIyb5PiX/2jQ== X-Received: by 10.84.176.3 with SMTP id u3mr9281090plb.242.1511377062340; Wed, 22 Nov 2017 10:57:42 -0800 (PST) Received: from localhost.localdomain ([2001:470:b:9c3:9e5c:8eff:fe4f:f2d0]) by smtp.gmail.com with ESMTPSA id 13sm13992742pfs.112.2017.11.22.10.57.41 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 22 Nov 2017 10:57:41 -0800 (PST) From: Alexander Duyck To: intel-wired-lan@lists.osuosl.org Date: Wed, 22 Nov 2017 10:57:41 -0800 Message-ID: <20171122185741.29785.75334.stgit@localhost.localdomain> In-Reply-To: <20171122185256.29785.93548.stgit@localhost.localdomain> References: <20171122185256.29785.93548.stgit@localhost.localdomain> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [Intel-wired-lan] [jkirsher/next-queue PATCH 15/16] net: Cap number of queues even with accel_priv X-BeenThere: intel-wired-lan@osuosl.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Intel Wired Ethernet Linux Kernel Driver Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-wired-lan-bounces@osuosl.org Sender: "Intel-wired-lan" From: Alexander Duyck With the recent fix to ixgbe we can cap the number of queues always regardless of if accel_priv is being used or not since the actual number of queues are being reported via real_num_tx_queues. Signed-off-by: Alexander Duyck Tested-by: Andrew Bowers --- net/core/dev.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index 8ee29f4f5fa9..8ad5634e92f2 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -3375,8 +3375,7 @@ struct netdev_queue *netdev_pick_tx(struct net_device *dev, else queue_index = __netdev_pick_tx(dev, skb); - if (!accel_priv) - queue_index = netdev_cap_txqueue(dev, queue_index); + queue_index = netdev_cap_txqueue(dev, queue_index); } skb_set_queue_mapping(skb, queue_index);