net: bonding: Add support for IPV6 ns/na to balance-alb/balance-tlb mode

Since ipv6 neighbor solicitation and advertisement messages
isn't handled gracefully in bond6 driver, we can see packet
drop due to inconsistency between mac address in the option
message and source MAC .

Another examples is ipv6 neighbor solicitation and advertisement
messages from VM via tap attached to host bridge, the src mac
might be changed through balance-alb mode, but it is not synced
with Link-layer address in the option message.

The patch implements bond6's tx handle for ipv6 neighbor
solicitation and advertisement messages.

Suggested-by: Hu Yadi <huyd12@chinatelecom.cn>
Acked-by: Jay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: Sun Shouxin <sunshouxin@chinatelecom.cn>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/bonding/bond_alb.c b/drivers/net/bonding/bond_alb.c
index 533e476..c98a4b0 100644 (file)
--- a/drivers/net/bonding/bond_alb.c
+++ b/drivers/net/bonding/bond_alb.c
@@ -1269,6 +1269,27 @@ unwind:
        return res;
 }
 
+/* determine if the packet is NA or NS */
+static bool alb_determine_nd(struct sk_buff *skb, struct bonding *bond)
+{
+       struct ipv6hdr *ip6hdr;
+       struct icmp6hdr *hdr;
+
+       if (!pskb_network_may_pull(skb, sizeof(*ip6hdr)))
+               return true;
+
+       ip6hdr = ipv6_hdr(skb);
+       if (ip6hdr->nexthdr != IPPROTO_ICMPV6)
+               return false;
+
+       if (!pskb_network_may_pull(skb, sizeof(*ip6hdr) + sizeof(*hdr)))
+               return true;
+
+       hdr = icmp6_hdr(skb);
+       return hdr->icmp6_type == NDISC_NEIGHBOUR_ADVERTISEMENT ||
+               hdr->icmp6_type == NDISC_NEIGHBOUR_SOLICITATION;
+}
+
 /************************ exported alb functions ************************/
 
 int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
@@ -1348,8 +1369,11 @@ struct slave *bond_xmit_tlb_slave_get(struct bonding *bond,
        /* Do not TX balance any multicast or broadcast */
        if (!is_multicast_ether_addr(eth_data->h_dest)) {
                switch (skb->protocol) {
-               case htons(ETH_P_IP):
                case htons(ETH_P_IPV6):
+                       if (alb_determine_nd(skb, bond))
+                               break;
+                       fallthrough;
+               case htons(ETH_P_IP):
                        hash_index = bond_xmit_hash(bond, skb);
                        if (bond->params.tlb_dynamic_lb) {
                                tx_slave = tlb_choose_channel(bond,
@@ -1432,10 +1456,12 @@ struct slave *bond_xmit_alb_slave_get(struct bonding *bond,
                        break;
                }
 
-               if (!pskb_network_may_pull(skb, sizeof(*ip6hdr))) {
+               if (alb_determine_nd(skb, bond)) {
                        do_tx_balance = false;
                        break;
                }
+
+               /* The IPv6 header is pulled by alb_determine_nd */
                /* Additionally, DAD probes should not be tx-balanced as that
                 * will lead to false positives for duplicate addresses and
                 * prevent address configuration from working.