1. 17 3月, 2017 12 次提交
    • J
      net: mvneta: support suspend and resume · 9768b45c
      Jane Li 提交于
      Add basic support for handling suspend and resume.
      Signed-off-by: NJane Li <jiel@marvell.com>
      Reviewed-by: NJisheng Zhang <jszhang@marvell.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9768b45c
    • D
      Merge branch 'mlxsw-vrf' · 7e3f4f3a
      David S. Miller 提交于
      Jiri Pirko says:
      
      ====================
      mlxsw: Enable VRF offload
      
      Ido says:
      
      Packets received from netdevs enslaved to different VRF devices are
      forwarded using different FIB tables. In the Spectrum ASIC this is
      achieved by binding different router interfaces (RIFs) to different
      virtual routers (VRs). Each RIF represents an enslaved netdev and each
      VR has its own FIB table according to which packets are forwarded.
      
      The first three patches add an helper to check if a FIB rule is a
      default rule and extend the FIB notification chain to include the rule's
      info as part of the RULE_{ADD,DEL} events. This allows offloading
      drivers to sanitize the rules they don't support and flush their tables.
      
      The fourth patch introduces a small change in the VRF driver to allow
      capable drivers to more easily offload VRFs.
      
      Finally, the last patches gradually add support for VRFs in the mlxsw
      driver. First, on top of port netdevs, stacked LAG and VLAN devices and
      then on top of bridges.
      
      Some limitations I would like to point out:
      
      1) The old model where 'oif' / 'iif' rules were programmed for each L3
      master device isn't supported. Upon insertion of these rules the driver
      will flush its tables and forwarding will be done by the kernel instead.
      It's inferior in every way to the single 'l3mdev' rule, so this shouldn't
      be an issue.
      
      2) Inter-VRF routes pointing to a VRF device aren't offloaded. Packets
      hitting these routes will be forwarded by the kernel. Inter-VRF routes
      pointing to netdevs enslaved to a different VRF are offloaded.
      
      3) There's a small discrepancy between the kernel's datapath and the
      device's. By default, packets forwarded by the kernel first do a lookup
      in the local table and then in the VRF's table (assuming no match). In
      the device, lookup is done only in the VRF's table, which is probably
      the intended behavior. Changes in v2 allow user to properly re-order the
      default rules without triggering the abort mechanism.
      
      Changes in v3:
      * Remove 'l3mdev' from the matchall list, as it's related to the action
        and not the selector (David Ahern).
      * Use container_of() instead of typecasting (David Ahern).
      * Add David's Acked-by to the second patch.
      * Add an helper in IPv4 code to check if rule is a default rule (David
        Ahern).
      
      Changes in v2:
      * Drop default rule indication and allow re-ordering of default rules
        (David Ahern).
      * Remove ifdef around 'struct fib_rule_notifier_info' and drop redundant
        dependency on IP_MULTIPLE_TABLES from rocker and mlxsw.
      * Add David's Acked-by to the fourth patch.
      * Remove netif_is_vrf_master() and use netif_is_l3_master() instead
        (David Ahern).
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7e3f4f3a
    • I
      mlxsw: spectrum_router: Don't abort on l3mdev rules · c7f6e665
      Ido Schimmel 提交于
      Now that port netdevs can be enslaved to a VRF master we need to make
      sure the device's routing tables won't be flushed upon the insertion of
      a l3mdev rule.
      
      Note that we assume the notified l3mdev rule is a simple rule as used by
      the VRF master. We don't check for the presence of other selectors such
      as 'iif' and 'oif'.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c7f6e665
    • I
      mlxsw: spectrum_router: Add support for VRFs on top of bridges · 3d70e458
      Ido Schimmel 提交于
      In a similar fashion to the previous patch, allow bridges and VLAN
      devices on top of bridges to be enslaved to a VRF master device.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3d70e458
    • I
      mlxsw: spectrum_router: Add support for VRFs · 7179eb5a
      Ido Schimmel 提交于
      Allow port netdevs, LAG and VLAN devices stacked on top of these to be
      enslaved to a VRF master device.
      
      Upon enslavement, create a router interface (RIF) for the enslaved
      netdev and associate it with a virtual router (VR) based on the VRF's
      table ID.
      
      If a RIF already exists for the netdev (f.e., due to the existence of an
      IP address), then it's deleted and a new one is created with the
      appropriate VR binding.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7179eb5a
    • I
      mlxsw: spectrum_router: Don't destroy RIF if L3 slave · 9db032bb
      Ido Schimmel 提交于
      We usually destroy the netdev's router interface (RIF) when the last IP
      address is removed from it.
      
      However, we shouldn't do that if it's enslaved to an L3 master device.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9db032bb
    • I
      mlxsw: spectrum_router: Associate RIFs with correct VR · 57837885
      Ido Schimmel 提交于
      When a router interface (RIF) is created due to a netdev being enslaved
      to a VRF master, then it should be associated with the appropriate
      virtual router (VR) and not the default one.
      
      If netdev is a VRF slave, lookup the VR based on the VRF's table ID.
      Otherwise default to the MAIN table.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      57837885
    • I
      net: vrf: Set slave's private flag before linking · fdeea7be
      Ido Schimmel 提交于
      Allow listeners of the subsequent CHANGEUPPER notification to retrieve
      the VRF's table ID by calling l3mdev_fib_table() with the slave netdev.
      Without this change, the netdev won't be considered an L3 slave and the
      function would return 0.
      
      This is consistent with other master device such as bridge and bond that
      set the slave's private flag before linking. It also makes
      do_vrf_{add,del}_slave() symmetric.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Acked-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      fdeea7be
    • I
      ipv4: fib_rules: Dump FIB rules when registering FIB notifier · 5d7bfd14
      Ido Schimmel 提交于
      In commit c3852ef7 ("ipv4: fib: Replay events when registering FIB
      notifier") we dumped the FIB tables and replayed the events to the
      passed notification block.
      
      However, we merely sent a RULE_ADD notification in case custom rules
      were in use. As explained in previous patches, this approach won't work
      anymore. Instead, we should notify the caller about all the FIB rules
      and let it act accordingly.
      
      Upon registration to the FIB notification chain, replay a RULE_ADD
      notification for each programmed FIB rule, custom or not. The integrity
      of the dump is ensured by the mechanism introduced in the above
      mentioned commit.
      
      Prevent regressions by making sure current listeners correctly sanitize
      the notified rules.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Acked-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      5d7bfd14
    • I
      ipv4: fib_rules: Add notifier info to FIB rules notifications · 6a003a5f
      Ido Schimmel 提交于
      Whenever a FIB rule is added or removed, a notification is sent in the
      FIB notification chain. However, listeners don't have a way to tell
      which rule was added or removed.
      
      This is problematic as we would like to give listeners the ability to
      decide which action to execute based on the notified rule. Specifically,
      offloading drivers should be able to determine if they support the
      reflection of the notified FIB rule and flush their LPM tables in case
      they don't.
      
      Do that by adding a notifier info to these notifications and embed the
      common FIB rule struct in it.
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Acked-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6a003a5f
    • I
      ipv4: fib_rules: Check if rule is a default rule · 3c71006d
      Ido Schimmel 提交于
      Currently, when non-default (custom) FIB rules are used, devices capable
      of layer 3 offloading flush their tables and let the kernel do the
      forwarding instead.
      
      When these devices' drivers are loaded they register to the FIB
      notification chain, which lets them know about the existence of any
      custom FIB rules. This is done by sending a RULE_ADD notification based
      on the value of 'net->ipv4.fib_has_custom_rules'.
      
      This approach is problematic when VRF offload is taken into account, as
      upon the creation of the first VRF netdev, a l3mdev rule is programmed
      to direct skbs to the VRF's table.
      
      Instead of merely reading the above value and sending a single RULE_ADD
      notification, we should iterate over all the FIB rules and send a
      detailed notification for each, thereby allowing offloading drivers to
      sanitize the rules they don't support and potentially flush their
      tables.
      
      While l3mdev rules are uniquely marked, the default rules are not.
      Therefore, when they are being notified they might invoke offloading
      drivers to unnecessarily flush their tables.
      
      Solve this by adding an helper to check if a FIB rule is a default rule.
      Namely, its selector should match all packets and its action should
      point to the local, main or default tables.
      
      As noted by David Ahern, uniquely marking the default rules is
      insufficient. When using VRFs, it's common to avoid false hits by moving
      the rule for the local table to just before the main table:
      
      Default configuration:
      $ ip rule show
      0:      from all lookup local
      32766:  from all lookup main
      32767:  from all lookup default
      
      Common configuration with VRFs:
      $ ip rule show
      1000:   from all lookup [l3mdev-table]
      32765:  from all lookup local
      32766:  from all lookup main
      32767:  from all lookup default
      Signed-off-by: NIdo Schimmel <idosch@mellanox.com>
      Signed-off-by: NJiri Pirko <jiri@mellanox.com>
      Acked-by: NDavid Ahern <dsa@cumulusnetworks.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      3c71006d
    • H
      r8152: simply the arguments · ce594e98
      hayeswang 提交于
      Replace &tp->napi with napi and tp->netdev with netdev.
      Signed-off-by: NHayes Wang <hayeswang@realtek.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      ce594e98
  2. 16 3月, 2017 28 次提交