Commit 0da8aa00 authored by Sun Shouxin's avatar Sun Shouxin Committed by David S. Miller

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: default avatarHu Yadi <huyd12@chinatelecom.cn>
Acked-by: default avatarJay Vosburgh <jay.vosburgh@canonical.com>
Signed-off-by: default avatarSun Shouxin <sunshouxin@chinatelecom.cn>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 4f0e3040
...@@ -1269,6 +1269,27 @@ static int alb_set_mac_address(struct bonding *bond, void *addr) ...@@ -1269,6 +1269,27 @@ static int alb_set_mac_address(struct bonding *bond, void *addr)
return res; 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 ************************/ /************************ exported alb functions ************************/
int bond_alb_initialize(struct bonding *bond, int rlb_enabled) int bond_alb_initialize(struct bonding *bond, int rlb_enabled)
...@@ -1348,8 +1369,11 @@ struct slave *bond_xmit_tlb_slave_get(struct bonding *bond, ...@@ -1348,8 +1369,11 @@ struct slave *bond_xmit_tlb_slave_get(struct bonding *bond,
/* Do not TX balance any multicast or broadcast */ /* Do not TX balance any multicast or broadcast */
if (!is_multicast_ether_addr(eth_data->h_dest)) { if (!is_multicast_ether_addr(eth_data->h_dest)) {
switch (skb->protocol) { switch (skb->protocol) {
case htons(ETH_P_IP):
case htons(ETH_P_IPV6): 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); hash_index = bond_xmit_hash(bond, skb);
if (bond->params.tlb_dynamic_lb) { if (bond->params.tlb_dynamic_lb) {
tx_slave = tlb_choose_channel(bond, tx_slave = tlb_choose_channel(bond,
...@@ -1432,10 +1456,12 @@ struct slave *bond_xmit_alb_slave_get(struct bonding *bond, ...@@ -1432,10 +1456,12 @@ struct slave *bond_xmit_alb_slave_get(struct bonding *bond,
break; break;
} }
if (!pskb_network_may_pull(skb, sizeof(*ip6hdr))) { if (alb_determine_nd(skb, bond)) {
do_tx_balance = false; do_tx_balance = false;
break; break;
} }
/* The IPv6 header is pulled by alb_determine_nd */
/* Additionally, DAD probes should not be tx-balanced as that /* Additionally, DAD probes should not be tx-balanced as that
* will lead to false positives for duplicate addresses and * will lead to false positives for duplicate addresses and
* prevent address configuration from working. * prevent address configuration from working.
......
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