This patch adds a simple queue selection function to macvlan
layer.  In most cases, this will just use the standard fallback
fuction, but when rx-queue has been recoreded we'll try to use
that value.

Signed-off-by: Vladislav Yasevich <vyase...@redhat.com>
---
 drivers/net/macvlan.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/drivers/net/macvlan.c b/drivers/net/macvlan.c
index 94e6888..213d587 100644
--- a/drivers/net/macvlan.c
+++ b/drivers/net/macvlan.c
@@ -1018,6 +1018,25 @@ static int macvlan_dev_get_iflink(const struct 
net_device *dev)
        return vlan->lowerdev->ifindex;
 }
 
+static u16 macvlan_select_queue(struct net_device *dev,
+                               struct sk_buff *skb,
+                               void *accel_priv,
+                               select_queue_fallback_t fallback)
+{
+       u16 txq = skb_rx_queue_recorded(skb) ? skb_get_rx_queue(skb) : 0;
+
+       if (!txq)
+               return fallback(dev, skb);
+
+       if (unlikely(txq >= dev->real_num_tx_queues)) {
+               do {
+                       txq -= dev->real_num_tx_queues;
+               } while (txq >= dev->real_num_tx_queues);
+       }
+       return txq;
+}
+
+
 static const struct ethtool_ops macvlan_ethtool_ops = {
        .get_link               = ethtool_op_get_link,
        .get_settings           = macvlan_ethtool_get_settings,
@@ -1048,6 +1067,7 @@ static const struct net_device_ops macvlan_netdev_ops = {
        .ndo_netpoll_setup      = macvlan_dev_netpoll_setup,
        .ndo_netpoll_cleanup    = macvlan_dev_netpoll_cleanup,
 #endif
+       .ndo_select_queue       = macvlan_select_queue,
        .ndo_get_iflink         = macvlan_dev_get_iflink,
        .ndo_features_check     = passthru_features_check,
 };
-- 
2.1.0

Reply via email to