Skip to content
  1. Nov 01, 2016
  2. Oct 31, 2016
    • Gao Feng's avatar
      driver: tun: Use new macro SOCK_IOC_TYPE instead of literal number 0x89 · 20861f26
      Gao Feng authored
      
      
      The current codes use _IOC_TYPE(cmd) == 0x89 to check if the cmd is one
      socket ioctl command like SIOCGIFHWADDR. But the literal number 0x89 may
      confuse readers. So create one macro SOCK_IOC_TYPE to enhance the readability.
      
      Signed-off-by: default avatarGao Feng <fgao@ikuai8.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      20861f26
    • Andrey Vagin's avatar
      net: add an ioctl to get a socket network namespace · c62cce2c
      Andrey Vagin authored
      
      
      Each socket operates in a network namespace where it has been created,
      so if we want to dump and restore a socket, we have to know its network
      namespace.
      
      We have a socket_diag to get information about sockets, it doesn't
      report sockets which are not bound or connected.
      
      This patch introduces a new socket ioctl, which is called SIOCGSKNS
      and used to get a file descriptor for a socket network namespace.
      
      A task must have CAP_NET_ADMIN in a target network namespace to
      use this ioctl.
      
      Cc: "David S. Miller" <davem@davemloft.net>
      Cc: Eric W. Biederman <ebiederm@xmission.com>
      Signed-off-by: default avatarAndrei Vagin <avagin@openvz.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c62cce2c
    • David S. Miller's avatar
      mv643xx_eth: Properly resolve merge conflict. · 2a43ca0a
      David S. Miller authored
      
      
      The second SET_NETDEV_DEV() in the hunk should be
      removed.
      
      Reported-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2a43ca0a
    • David S. Miller's avatar
      mv643xx_eth: Fix merge error. · d8e4aa07
      David S. Miller authored
      
      
      One merge conflict block wasn't resolved.
      
      Reported-by: default avatarAndrew Lunn <andrew@lunn.ch>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d8e4aa07
    • David S. Miller's avatar
      Merge tag 'shared-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma · 0a6ce1e3
      David S. Miller authored
      
      
      Saeed Mahameed says:
      
      ====================
      Mellanox mlx5 core driver updates 2016-10-25
      
      This series contains some updates and fixes of mlx5 core and
      IB drivers with the addition of two features that demand
      new low level commands and infrastructure updates.
       - SRIOV VF max rate limit support
       - mlx5e tc support for FWD rules with counter.
      
      Needed for both net and rdma subsystems.
      
      Updates and Fixes:
      From Saeed Mahameed (2):
        - mlx5 IB: Skip handling unknown mlx5 events
        - Add ConnectX-5 PCIe 4.0 VF device ID
      
      From Artemy Kovalyov (2):
        - Update struct mlx5_ifc_xrqc_bits
        - Ensure SRQ physical address structure endianness
      
      From Eugenia Emantayev (1):
        - Fix length of async_event_mask
      
      New Features:
      From Mohamad Haj Yahia (3): mlx5 SRIOV VF max rate limit support
        - Introduce TSAR manipulation firmware commands
        - Introduce E-switch QoS management
        - Add SRIOV VF max rate configuration support
      
      From Mark Bloch (7): mlx5e Tc support for FWD rule with counter
        - Don't unlock fte while still using it
        - Use fte status to decide on firmware command
        - Refactor find_flow_rule
        - Group similar rules under the same fte
        - Add multi dest support
        - Add option to add fwd rule with counter
        - mlx5e tc support for FWD rule with counter
        Mark here fixed two trivial issues with the flow steering core, and did
        some refactoring in the flow steering API to support adding mulit destination
        rules to the same hardware flow table entry at once.  In the last two patches
        added the ability to populate a flow rule with a flow counter to the same flow entry.
      
      V2: Dropped some patches that added new structures without adding any usage of them.
          Added SRIOV VF max rate configuration support patch that introduces
          the usage of the TSAR infrastructure.
          Added flow steering fixes and refactoring in addition to mlx5 tc
          support for forward rule with counter.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0a6ce1e3
    • Philippe Reynes's avatar
      net: bonding: use new api ethtool_{get|set}_link_ksettings · d46b6349
      Philippe Reynes authored
      
      
      The ethtool api {get|set}_settings is deprecated.
      We move this driver to new api {get|set}_link_ksettings.
      
      Signed-off-by: default avatarPhilippe Reynes <tremyfr@gmail.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d46b6349
    • David S. Miller's avatar
      Merge branch 'mlxsw-IB' · 2701c3b3
      David S. Miller authored
      
      
      Jiri Pirko says:
      
      ====================
      mlxsw: Add Infiniband support for Mellanox switches
      
      This patchset adds basic Infiniband support for SwitchX-2, Switch-IB
      and Switch-IB-2 ASIC drivers.
      
      SwitchX-2 ASIC is VPI capable, which means each port can be either
      Ethernet or Infiniband. When the port is configured as Infiniband,
      the Subnet Management Agent (SMA) is managed by the SwitchX-2 firmware
      and not by the host. Port configuration, MTU and more are configured
      remotely by the Subnet Manager (SM).
      
      Usage:
              $ devlink port show
              pci/0000:03:00.0/1: type eth netdev eth0
              pci/0000:03:00.0/3: type eth netdev eth1
              pci/0000:03:00.0/5: type eth netdev eth2
              pci/0000:03:00.0/6: type eth netdev eth3
              pci/0000:03:00.0/8: type eth netdev eth4
      
              $ devlink port set pci/0000:03:00.0/1 type ib
      
              $ devlink port show
              pci/0000:03:00.0/1: type ib
      
      Switch-IB (FDR) and Switch-IB-2 (EDR 100Gbs) ASICs are Infiniband-only
      switches. The support provided in the mlxsw_switchib.ko driver is port
      initialization only. The firmware running in the Silicon implements
      the SMA.
      
      Please note that this patchset does only very basic port initialization.
      ib_device or RDMA implementations are not part of this patchset.
      ====================
      
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      2701c3b3
    • Elad Raz's avatar
      mlxsw: switchib: Introduce SwitchIB and SwitchIB silicon driver · d1ba5263
      Elad Raz authored
      
      
      SwitchIB and SwitchIB-2 are Infiniband switches with up to 36 ports. This
      driver initialize the hardware and Firmware which implements the IB
      management and connection with the SM.
      
      Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d1ba5263
    • Elad Raz's avatar
      mlxsw: switchx2: Add IB port support · 64b92b01
      Elad Raz authored
      
      
      SwitchX-2 is IB capable device. This patch add a support to change the
      port type between Ethernet and Infiniband.
      
      When the port is set to IB, the FW implements the Subnet Management Agent
      (SMA) manage the port. All port attributes can be control remotely by
      the SM.
      
      Usage:
      	$ devlink port show
      	pci/0000:03:00.0/1: type eth netdev eth0
      	pci/0000:03:00.0/3: type eth netdev eth1
      	pci/0000:03:00.0/5: type eth netdev eth2
      	pci/0000:03:00.0/6: type eth netdev eth3
      	pci/0000:03:00.0/8: type eth netdev eth4
      
      	$ devlink port set pci/0000:03:00.0/1 type ib
      
      	$ devlink port show
      	pci/0000:03:00.0/1: type ib
      
      Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      64b92b01
    • Elad Raz's avatar
      mlxsw: switchx2: Add eth prefix to port create and remove · 03ddb787
      Elad Raz authored
      
      
      Since we are about to add Infiniband port remove and create we will add
      "eth" prefix to port create and remove APIs.
      
      Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      03ddb787
    • Elad Raz's avatar
      mlxsw: core: Add port type (Eth/IB) set API · 0c81ea5d
      Elad Raz authored
      
      
      Add "port_type_set" API to mlxsw core. The core layer send the change type
      callback to the port along with it's private information.
      
      Signed-off-by: default avatarElad Raz <eladr@mellanox.com>
      Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      0c81ea5d