14 Apr, 2017

1 commit


09 Feb, 2017

1 commit

  • This fixes a bug and cleans up tunnelid range size
    calculation code by using consistent variable names
    and checks in size calculation and fill functions.

    tested for a few cases of vlan-vni range mappings:
    (output from patched iproute2):
    $bridge vlan showtunnel
    port vid tunid
    vxlan0 100-105 1000-1005
    200 2000
    210 2100
    211-213 2100-2102
    214 2104
    216-217 2108-2109
    219 2119

    Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
    Reported-by: Colin Ian King
    Signed-off-by: Roopa Prabhu
    Signed-off-by: David S. Miller

    Roopa Prabhu
     

08 Feb, 2017

2 commits

  • vtbegin should not be NULL in this function, Its already checked by the
    caller.

    this should silence the below smatch complaint:
    net/bridge/br_netlink_tunnel.c:144 br_fill_vlan_tinfo_range()
    error: we previously assumed 'vtbegin' could be null (see line 130)

    net/bridge/br_netlink_tunnel.c
    129
    130 if (vtbegin && vtend && (vtend->vid - vtbegin->vid) > 0) {
    ^^^^^^^
    Check for NULL.

    Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
    Reported-By: Dan Carpenter
    Signed-off-by: Roopa Prabhu
    Signed-off-by: David S. Miller

    Roopa Prabhu
     
  • These checks should go after the attributes have been parsed otherwise
    we're using tb uninitialized.

    Fixes: efa5356b0d97 ("bridge: per vlan dst_metadata netlink support")
    Reported-by: Colin Ian King
    Signed-off-by: Nikolay Aleksandrov
    Signed-off-by: David S. Miller

    Nikolay Aleksandrov
     

04 Feb, 2017

1 commit

  • This patch adds support to attach per vlan tunnel info dst
    metadata. This enables bridge driver to map vlan to tunnel_info
    at ingress and egress. It uses the kernel dst_metadata infrastructure.

    The initial use case is vlan to vni bridging, but the api is generic
    to extend to any tunnel_info in the future:
    - Uapi to configure/unconfigure/dump per vlan tunnel data
    - netlink functions to configure vlan and tunnel_info mapping
    - Introduces bridge port flag BR_LWT_VLAN to enable attach/detach
    dst_metadata to bridged packets on ports. off by default.
    - changes to existing code is mainly refactor some existing vlan
    handling netlink code + hooks for new vlan tunnel code
    - I have kept the vlan tunnel code isolated in separate files.
    - most of the netlink vlan tunnel code is handling of vlan-tunid
    ranges (follows the vlan range handling code). To conserve space
    vlan-tunid by default are always dumped in ranges if applicable.

    Use case:
    example use for this is a vxlan bridging gateway or vtep
    which maps vlans to vn-segments (or vnis).

    iproute2 example (patched and pruned iproute2 output to just show
    relevant fdb entries):
    example shows same host mac learnt on two vni's and
    vlan 100 maps to vni 1000, vlan 101 maps to vni 1001

    before (netdev per vni):
    $bridge fdb show | grep "00:02:00:00:00:03"
    00:02:00:00:00:03 dev vxlan1001 vlan 101 master bridge
    00:02:00:00:00:03 dev vxlan1001 dst 12.0.0.8 self
    00:02:00:00:00:03 dev vxlan1000 vlan 100 master bridge
    00:02:00:00:00:03 dev vxlan1000 dst 12.0.0.8 self

    after this patch with collect metdata in bridged mode (single netdev):
    $bridge fdb show | grep "00:02:00:00:00:03"
    00:02:00:00:00:03 dev vxlan0 vlan 101 master bridge
    00:02:00:00:00:03 dev vxlan0 src_vni 1001 dst 12.0.0.8 self
    00:02:00:00:00:03 dev vxlan0 vlan 100 master bridge
    00:02:00:00:00:03 dev vxlan0 src_vni 1000 dst 12.0.0.8 self

    CC: Nikolay Aleksandrov
    Signed-off-by: Roopa Prabhu
    Signed-off-by: David S. Miller

    Roopa Prabhu