1. 01 6月, 2017 12 次提交
    • J
      sched: add helper for updating statistics on all actions · d897a638
      Jakub Kicinski 提交于
      Forgetting to disable preemption around tcf_action_stats_update()
      seems to be a common mistake.  Add a helper function for updating
      stats on all actions of a filter.
      Signed-off-by: NJakub Kicinski <jakub.kicinski@netronome.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      d897a638
    • D
      Merge branch '10GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · c380e377
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      10GbE Intel Wired LAN Driver Updates 2017-05-31
      
      This series contains updates to ixgbe and ixgbevf only.
      
      Scott enables support for TSO & GSO for MPLS encapsulated packets for both
      ixgbe and ixgbevf.
      
      Liwei Song fixes an issue where seqcount/seqlock in ixgbe_get_stats64()
      are not initialized in time, so move the initialization into probe routine
      after the transmit and receive rings are initialized.
      
      Paul cleans up led_[on|off] for X550EM_X, since the firmware configures
      the PHY & MAC and we have no PHY access so LED on/off is not supported
      with this device.
      
      Emil provides several fixes, starting with enabling RSS on VF to VF
      traffic on the same PF.  Fixed PHY identification, where the previous
      method was unreliable, so use a different register to ensure proper
      identification.  Cleaned up the logic which could cause us to
      skip the link configuration, this skipping over the link configuration
      was leaving SFP+ PHY's in an unstable state, so always call
      setup_mac_link().  Added RS1 (rate select 1) support for ixgbe.  Lastly,
      fixed incorrect logic in the setting up of SFP+ link speed.
      
      Mark fixes the thermal sensor event logic, where it was being executed
      when there really was no thermal event.  So simplify the logic to only
      execute when there is a thermal event.
      
      Tony adds additional error checks and reporting when setting a VF MAC
      address to ensure that the MAC filter was successfully added.  Also
      fixed possible truncation warnings, as well as implicit fallthrough
      warnings.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      c380e377
    • D
      Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue · a99bbf6e
      David S. Miller 提交于
      Jeff Kirsher says:
      
      ====================
      40GbE Intel Wired LAN Driver Updates 2017-05-31
      
      This series contains updates to i40e and i40evf only.
      
      Jesse provides a couple of fixes, starting with cleaning up duplicate
      lines of code.  Fixed a missing line which enables RSS as a negotiated
      feature.  Since the VF does not have any way of reporting FCoE enabled,
      so just force the code to always report FCoE as disabled.
      
      Jake provides several fixes and changes, starting with fixing a race
      condition in i40e.  The hardware has a limitation on transmit PTP packets,
      which requires us to limit the driver to timestamping a single packet at
      once.  This is done using a state bitlock which enforces that only one
      timestamp request is honored at a time, unfortunately this suffers from
      a race condition.  Fixed a corner case where we failed to cleanup the
      bit lock after a failed transmit, and resulted in a state bit being
      locked forever.  Added a new statistic which tracks when a transmit
      timestamp request is skipped/ignored, since the driver can only handle
      one transmit timestamp request at a time.
      
      Christophe Jaillet fixes a NULL pointer dereference if kzalloc fails.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      a99bbf6e
    • M
      netvsc: Add #include's for csum_* function declarations · 8eb1b3c3
      Michael Kelley 提交于
      Add direct #include statements for declarations of csum_tcpudp_magic()
      and csum_ipv6_magic().  While the needed #include's are picked up
      indirectly for the x86 architecture, they aren't on other
      architectures, resulting in compile errors.
      Signed-off-by: NMichael Kelley <mikelley@microsoft.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8eb1b3c3
    • V
      rtnetlink: use the new rtnl_get_event() interface · 8c6c918d
      Vlad Yasevich 提交于
      Small clean-up to rtmsg_ifinfo() to use the rtnl_get_event()
      interface instead of using 'internal' values directly.
      Signed-off-by: NVladislav Yasevich <vyasevic@redhat.com>
      Acked-by: NDavid Ahern <dsahern@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      8c6c918d
    • J
      samples/bpf: bpf_load.c order of prog_fd[] should correspond with ELF order · 7bc57950
      Jesper Dangaard Brouer 提交于
      An eBPF ELF file generated with LLVM can contain several program
      section, which can be used for bpf tail calls.  The bpf prog file
      descriptors are accessible via array prog_fd[].
      
      At-least XDP samples assume ordering, and uses prog_fd[0] is the main
      XDP program to attach.  The actual order of array prog_fd[] depend on
      whether or not a bpf program section is referencing any maps or not.
      Not using a map result in being loaded/processed after all other
      prog section.  Thus, this can lead to some very strange and hard to
      debug situation, as the user can only see a FD and cannot correlated
      that with the ELF section name.
      
      The fix is rather simple, and even removes duplicate memcmp code.
      Simply load program sections as the last step, instead of
      load_and_attach while processing the relocation section.
      
      When working with tail calls, it become even more essential that the
      order of prog_fd[] is consistant, like the current dependency of the
      map_fd[] order.
      Signed-off-by: NJesper Dangaard Brouer <brouer@redhat.com>
      Acked-by: NAlexei Starovoitov <ast@kernel.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7bc57950
    • A
      net/mlxfw: select CONFIG_XZ_DEC · 9831724a
      Arnd Bergmann 提交于
      The new mlxfw code fails to build without the xz library:
      
      drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_xz_dec_run':
      :(.text.mlxfw_mfa2_xz_dec_run+0x8): undefined reference to `xz_dec_run'
      drivers/net/ethernet/mellanox/mlxfw/mlxfw_mfa2.o: In function `mlxfw_mfa2_file_component_get':
      :(.text.mlxfw_mfa2_file_component_get+0x218): undefined reference to `xz_dec_init'
      :(.text.mlxfw_mfa2_file_component_get+0x2c0): undefined reference to `xz_dec_end'
      
      This adds a Kconfig 'select' statement for it, which is also what
      the other user of that library has.
      
      Fixes: 410ed13c ("Add the mlxfw module for Mellanox firmware flash process")
      Signed-off-by: NArnd Bergmann <arnd@arndb.de>
      Acked-by: NYotam Gigi <yotamg@mellanox.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9831724a
    • V
      net: dsa: remove dev arg of dsa_register_switch · 23c9ee49
      Vivien Didelot 提交于
      The current dsa_register_switch function takes a useless struct device
      pointer argument, which always equals ds->dev.
      
      Drivers either call it with ds->dev, or with the same device pointer
      passed to dsa_switch_alloc, which ends up being assigned to ds->dev.
      
      This patch removes the second argument of the dsa_register_switch and
      _dsa_register_switch functions.
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      23c9ee49
    • D
      Merge branch 'dsa-mv88e6xxx-PHY-nitpicks' · 9525cc53
      David S. Miller 提交于
      Vivien Didelot says:
      
      ====================
      net: dsa: mv88e6xxx: PHY nitpicks
      
      This patchset isolates more PPU code into phy.c and makes distinction
      between PHY Registers read and write implementations vs. generic PHY
      routines.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      9525cc53
    • V
      net: dsa: mv88e6xxx: rename PHY PPU functions · b15a7c03
      Vivien Didelot 提交于
      Respect the implicit naming convention used in all register sets
      specific files, by renaming the mv88e6xxx_ppu_* functions with the
      mv88e6xxx_phy_* prefix.
      
      This is simply a s/xxx_ppu/xxx_phy_ppu/ substitution.
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b15a7c03
    • V
      net: dsa: mv88e6xxx: rename PHY PPU accessors · 7e20cfb5
      Vivien Didelot 提交于
      Make it clear that mv88e6xxx_phy_ppu_{read,write} are an implementation
      of the .phy_{read,write} operations, by renaming them with the mv88e6185
      prefix, since 88E6185 it is the reference switch model supported in an
      upstream board (ZII Dev Rev B), which makes use of them.
      
      Distinguish the signatures of implementation specific and generic PHY
      functions in the phy.h header.
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      7e20cfb5
    • V
      net: dsa: mv88e6xxx: provide a PHY setup helper · 1b17aedf
      Vivien Didelot 提交于
      Similarly to the VTU, PVT and ATU setup, provide a mv88e6xxx_phy_setup
      helper which wraps mv88e6xxx_ppu_enable, so that no more PPU-related
      functions are exposed outside of phy.c.
      
      Thus make mv88e6xxx_ppu_enable static.
      Signed-off-by: NVivien Didelot <vivien.didelot@savoirfairelinux.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      1b17aedf
  2. 31 5月, 2017 28 次提交