From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Eilon Greenstein" Subject: Re: [RFC net-next (v2) 12/14] ixgbe: set maximal number of default RSS queues Date: Mon, 25 Jun 2012 20:53:38 +0300 Message-ID: <1340646818.2486.27.camel@lb-tlvb-eilong.il.broadcom.com> References: <1340624745-8650-1-git-send-email-yuvalmin@broadcom.com> <1340624745-8650-13-git-send-email-yuvalmin@broadcom.com> <4FE88770.7070007@intel.com> Reply-To: eilong@broadcom.com Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Cc: "Yuval Mintz" , davem@davemloft.net, netdev@vger.kernel.org, "Jeff Kirsher" , "John Fastabend" To: "Alexander Duyck" Return-path: Received: from mms1.broadcom.com ([216.31.210.17]:1754 "EHLO mms1.broadcom.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029Ab2FYRxy (ORCPT ); Mon, 25 Jun 2012 13:53:54 -0400 In-Reply-To: <4FE88770.7070007@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: On Mon, 2012-06-25 at 08:44 -0700, Alexander Duyck wrote: > This doesn't limit queues, only interrupt vectors. As I told you before > you should look at the ixgbe_set_rss_queues function if you actually > want to limit the number of RSS queues. How about this: diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c index af1a531..23a8609 100644 --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c @@ -277,6 +277,8 @@ static inline bool ixgbe_set_rss_queues(struct ixgbe_adapter *adapter) bool ret = false; struct ixgbe_ring_feature *f = &adapter->ring_feature[RING_F_RSS]; + f->indices = min_t(int, netif_get_num_default_rss_queues(), f->indices); + if (adapter->flags & IXGBE_FLAG_RSS_ENABLED) { f->mask = 0xF; adapter->num_rx_queues = f->indices; @@ -302,7 +304,9 @@ static inline bool ixgbe_set_fdir_queues(struct ixgbe_adapter *adapter) bool ret = false; struct ixgbe_ring_feature *f_fdir = &adapter->ring_feature[RING_F_FDIR]; - f_fdir->indices = min_t(int, num_online_cpus(), f_fdir->indices); + f_fdir->indices = min_t(int, netif_get_num_default_rss_queues(), + f_fdir->indices); + f_fdir->mask = 0; /* @@ -339,8 +343,7 @@ static inline bool ixgbe_set_fcoe_queues(struct ixgbe_adapter *adapter) if (!(adapter->flags & IXGBE_FLAG_FCOE_ENABLED)) return false; - f->indices = min_t(int, num_online_cpus(), f->indices); - + f->indices = min_t(int, f->indices, netif_get_num_default_rss_queues()); adapter->num_rx_queues = 1; adapter->num_tx_queues = 1;