• David Ahern's avatar
    net: mpls: Fix multipath selection for LSR use case · 9f427a0e
    David Ahern authored
    MPLS multipath for LSR is broken -- always selecting the first nexthop
    in the one label case. For example:
    
        $ ip -f mpls ro ls
        100
                nexthop as to 200 via inet 172.16.2.2  dev virt12
                nexthop as to 300 via inet 172.16.3.2  dev virt13
        101
                nexthop as to 201 via inet6 2000:2::2  dev virt12
                nexthop as to 301 via inet6 2000:3::2  dev virt13
    
    In this example incoming packets have a single MPLS labels which means
    BOS bit is set. The BOS bit is passed from mpls_forward down to
    mpls_multipath_hash which never processes the hash loop because BOS is 1.
    
    Update mpls_multipath_hash to process the entire label stack. mpls_hdr_len
    tracks the total mpls header length on each pass (on pass N mpls_hdr_len
    is N * sizeof(mpls_shim_hdr)). When the label is found with the BOS set
    it verifies the skb has sufficient header for ipv4 or ipv6, and find the
    IPv4 and IPv6 header by using the last mpls_hdr pointer and adding 1 to
    advance past it.
    
    With these changes I have verified the code correctly sees the label,
    BOS, IPv4 and IPv6 addresses in the network header and icmp/tcp/udp
    traffic for ipv4 and ipv6 are distributed across the nexthops.
    
    Fixes: 1c78efa8 ("mpls: flow-based multipath selection")
    Acked-by: default avatarRobert Shearman <rshearma@brocade.com>
    Signed-off-by: default avatarDavid Ahern <dsa@cumulusnetworks.com>
    Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
    9f427a0e
af_mpls.c 39.3 KB