Commit ed04642f authored by Eric Dumazet's avatar Eric Dumazet Committed by David S. Miller

net: check the return value of ndo_select_queue()

Check the return value of ndo_select_queue(). If the value isn't smaller
than the real_num_tx_queues, print a warning message, and reset it to zero.
Signed-off-by: default avatarChangli Gao <xiaosuo@gmail.com>
Signed-off-by: default avatarEric Dumazet <eric.dumazet@gmail.com>
----
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9c2b5bde
...@@ -1848,6 +1848,20 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb) ...@@ -1848,6 +1848,20 @@ u16 skb_tx_hash(const struct net_device *dev, const struct sk_buff *skb)
} }
EXPORT_SYMBOL(skb_tx_hash); EXPORT_SYMBOL(skb_tx_hash);
static inline u16 dev_cap_txqueue(struct net_device *dev, u16 queue_index)
{
if (unlikely(queue_index >= dev->real_num_tx_queues)) {
if (net_ratelimit()) {
WARN(1, "%s selects TX queue %d, but "
"real number of TX queues is %d\n",
dev->name, queue_index,
dev->real_num_tx_queues);
}
return 0;
}
return queue_index;
}
static struct netdev_queue *dev_pick_tx(struct net_device *dev, static struct netdev_queue *dev_pick_tx(struct net_device *dev,
struct sk_buff *skb) struct sk_buff *skb)
{ {
...@@ -1861,6 +1875,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev, ...@@ -1861,6 +1875,7 @@ static struct netdev_queue *dev_pick_tx(struct net_device *dev,
if (ops->ndo_select_queue) { if (ops->ndo_select_queue) {
queue_index = ops->ndo_select_queue(dev, skb); queue_index = ops->ndo_select_queue(dev, skb);
queue_index = dev_cap_txqueue(dev, queue_index);
} else { } else {
queue_index = 0; queue_index = 0;
if (dev->real_num_tx_queues > 1) if (dev->real_num_tx_queues > 1)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment