]> git.karo-electronics.de Git - linux-beck.git/commitdiff
bonding: refine IFF_XMIT_DST_RELEASE capability
authorEric Dumazet <edumazet@google.com>
Tue, 17 Jul 2012 12:19:48 +0000 (12:19 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 18 Jul 2012 16:31:25 +0000 (09:31 -0700)
Some workloads greatly benefit of IFF_XMIT_DST_RELEASE capability
on output net device, avoiding dirtying dst refcount.

bonding currently disables IFF_XMIT_DST_RELEASE unconditionally.

If all slaves have the IFF_XMIT_DST_RELEASE bit set, then
bonding master can also have it in its priv_flags

Signed-off-by: Eric Dumazet <edumazet@google.com>
Cc: Jay Vosburgh <fubar@us.ibm.com>
Cc: Andy Gospodarek <andy@greyhouse.net>
Cc: Tom Herbert <therbert@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/bonding/bond_main.c

index 1eb3979d0af583a9cc14ba61e6e8507220dd8c07..3960b1b2617814f7c32f21a6ec99e2aa39957e1a 100644 (file)
@@ -1382,6 +1382,7 @@ static void bond_compute_features(struct bonding *bond)
        netdev_features_t vlan_features = BOND_VLAN_FEATURES;
        unsigned short max_hard_header_len = ETH_HLEN;
        int i;
+       unsigned int flags, dst_release_flag = IFF_XMIT_DST_RELEASE;
 
        read_lock(&bond->lock);
 
@@ -1392,6 +1393,7 @@ static void bond_compute_features(struct bonding *bond)
                vlan_features = netdev_increment_features(vlan_features,
                        slave->dev->vlan_features, BOND_VLAN_FEATURES);
 
+               dst_release_flag &= slave->dev->priv_flags;
                if (slave->dev->hard_header_len > max_hard_header_len)
                        max_hard_header_len = slave->dev->hard_header_len;
        }
@@ -1400,6 +1402,9 @@ done:
        bond_dev->vlan_features = vlan_features;
        bond_dev->hard_header_len = max_hard_header_len;
 
+       flags = bond_dev->priv_flags & ~IFF_XMIT_DST_RELEASE;
+       bond_dev->priv_flags = flags | dst_release_flag;
+
        read_unlock(&bond->lock);
 
        netdev_change_features(bond_dev);