Skip to content
  1. Jan 28, 2017
    • Eric Dumazet's avatar
      net: adjust skb->truesize in pskb_expand_head() · 158f323b
      Eric Dumazet authored
      Slava Shwartsman reported a warning in skb_try_coalesce(), when we
      detect skb->truesize is completely wrong.
      
      In his case, issue came from IPv6 reassembly coping with malicious
      datagrams, that forced various pskb_may_pull() to reallocate a bigger
      skb->head than the one allocated by NIC driver before entering GRO
      layer.
      
      Current code does not change skb->truesize, leaving this burden to
      callers if they care enough.
      
      Blindly changing skb->truesize in pskb_expand_head() is not
      easy, as some producers might track skb->truesize, for example
      in xmit path for back pressure feedback (sk->sk_wmem_alloc)
      
      We can detect the cases where it should be safe to change
      skb->truesize :
      
      1) skb is not attached to a socket.
      2) If it is attached to a socket, destructor is sock_edemux()
      
      My audit gave only two callers doing their own skb->truesize
      manipulation.
      
      I had to remove skb parameter in sock_edemux macro when
      CONFIG_INET is not set to avoid a compile error.
      
      Signed-off-by...
      158f323b
    • David S. Miller's avatar
      Merge branch 'sfc-encapsulated-filters' · b41fd8fd
      David S. Miller authored
      
      
      Edward Cree says:
      
      ====================
      sfc: encapsulated filters
      
      This series adds support for setting up filters for encapsulated traffic on
      SFC 8000-series adapters, which recognise VXLAN, GENEVE and NVGRE packets by
      parsing packet headers.  (VXLAN and GENEVE will only be recognised if the
      driver on the primary PF has notified the firmware of relevant UDP ports,
      which this driver does not yet do.)
      While the driver currently has no way of using these filters for flow
      steering, it is nonetheless necessary to insert catch-all (aka 'default')
      filters to direct this traffic, similar to the existing unencapsulated uni-
      and multi-cast catch-all filters, as otherwise the traffic will be dropped
      by the NIC - implementation details of the hardware filtering mean that the
      traffic will not get matched on outer MAC address to unencapsulated catch-
      all filters.  (Yes, this is a mess.)
      Although this is, therefore, fixing a bug in the existing driver, it's a bug
      which has existed since 8000 series support was added, and the fix involves
      quite a big patch with an 'adding features' flavour to it, hence why this is
      for net-next rather than net and stable.
      
      v2: move netif_cond_dbg into netdevice.h and its own patch
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      b41fd8fd
    • Edward Cree's avatar
      sfc: insert catch-all filters for encapsulated traffic · 9b410801
      Edward Cree authored
      
      
      8000 series adapters support filtering VXLAN, NVGRE and GENEVE traffic
       based on inner fields, and when the NIC recognises such traffic, it
       does not match unencapsulated traffic filters any more.  So add catch-
       all filters for encapsulated traffic on supporting platforms.
      Although recognition of VXLAN and GENEVE is based on UDP ports, and thus
       will not occur until the driver (on the primary PF) notifies the
       firmware of UDP ports to use, NVGRE will always be recognised, hence
       without this patch 8000 series adapters will drop all NVGRE traffic.
      
      Partly based on patches by Jon Cooper <jcooper@solarflare.com>.
      
      Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      9b410801
    • Jon Cooper's avatar
      sfc: refactor debug-or-warnings printks · 34e7aefb
      Jon Cooper authored
      
      
      Rationalise several debug-or-warnings printks using netif_cond_dbg
       to make output more consistent.
      
      Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      34e7aefb
    • Edward Cree's avatar
      net: implement netif_cond_dbg macro · f617f276
      Edward Cree authored
      
      
      For reporting things that may or may not be serious, depending on some
       condition, netif_cond_dbg will check the condition and print the report
       at either dbg (if the condition is true) or the specified level.
      
      Suggested-by: default avatarJon Cooper <jcooper@solarflare.com>
      Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      f617f276
    • Jon Cooper's avatar
      sfc: fixes to filter restore handling · 2d3d4ec0
      Jon Cooper authored
      
      
      If the NIC is switched from full-featured to low-latency, encapsulated
       filters are no longer available, and this causes errors. This patch
       removes those filters from the filter table on restore.
      Also, if filters which are removed by the above, or which we fail to
       insert when restoring filters, were UC, MC or broadcast default
       filters, invalidate the corresponding vlan->default_filters entry.
      
      Signed-off-by: default avatarEdward Cree <ecree@solarflare.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2d3d4ec0
    • Tobias Klauser's avatar
      net: wan: Remove unused stats member from struct frad_local · 2b368b23
      Tobias Klauser authored
      
      
      The stats member of struct frad_locl is used neither by the dlci nor the
      sdla driver, so it might as well be removed.
      
      Signed-off-by: default avatarTobias Klauser <tklauser@distanz.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2b368b23
    • Rafał Miłecki's avatar
      net: phy: broadcom: add support for BCM54210E · 0fc9ae10
      Rafał Miłecki authored
      
      
      It's Broadcom PHY simply described as single-port
      RGMII 10/100/1000BASE-T PHY. It requires disabling delay skew and GTXCLK
      bits.
      
      Signed-off-by: default avatarRafał Miłecki <rafal@milecki.pl>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0fc9ae10
    • David S. Miller's avatar
      Merge tag 'linux-can-next-for-4.11-20170124' of... · a00ebc46
      David S. Miller authored
      
      Merge tag 'linux-can-next-for-4.11-20170124' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next
      
      Marc Kleine-Budde says:
      
      ====================
      pull-request: can-next 2017-01-24
      
      this is a pull request of 4 patches for net-next/master.
      
      The first patch by Oliver Hartkopp adds a netlink API to configure the
      interface termination of a CAN card. The next two patches are by me and
      add a netlink API to query and configure CAN interfaces that only
      support fixed bitrates. The last patch by Colin Ian King simplifies the
      return path in the softing_cs driver's softingcs_probe() function.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      a00ebc46
  2. Jan 27, 2017
  3. Jan 26, 2017