[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-ID: <4FE9983C.2060006@broadcom.com>
Date: Tue, 26 Jun 2012 14:08:44 +0300
From: "Yuval Mintz" <yuvalmin@...adcom.com>
To: "Alexander Duyck" <alexander.h.duyck@...el.com>
cc: eilong@...adcom.com, davem@...emloft.net, netdev@...r.kernel.org,
"Jeff Kirsher" <jeffrey.t.kirsher@...el.com>,
"John Fastabend" <john.r.fastabend@...el.com>
Subject: Re: [RFC net-next (v2) 12/14] ixgbe: set maximal number of
default 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;
>>
> This makes much more sense, but still needs a few minor changes.
Well, what about this one:
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
index af1a531..0dd1e51 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_lib.c
@@ -277,6 +277,7 @@ 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;
@@ -376,7 +377,7 @@ static inline bool ixgbe_set_dcb_queues(struct ixgbe_adapter *adapter)
/* Map queue offset and counts onto allocated tx queues */
per_tc_q = min_t(unsigned int, dev->num_tx_queues / tcs, DCB_QUEUE_CAP);
- q = min_t(int, num_online_cpus(), per_tc_q);
+ q = min_t(int, netif_get_num_default_rss_queues(), per_tc_q);
for (i = 0; i < tcs; i++) {
netdev_set_tc_queue(dev, i, q, offset);
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists