Commit ab425feb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma 

Pull rdma updates from Jason Gunthorpe:
 "Usual size of updates, a new driver, and most of the bulk focusing on
  rxe:

   - Usual typos, style, and language updates

   - Driver updates for mlx5, irdma, siw, rts, srp, hfi1, hns, erdma,
     mlx4, srp

   - Lots of RXE updates:
      * Improve reply error handling for bad MR operations
      * Code tidying
      * Debug printing uses common loggers
      * Remove half implemented RD related stuff
      * Support IBA's recently defined Atomic Write and Flush operations

   - erdma support for atomic operations

   - New driver 'mana' for Ethernet HW available in Azure VMs. This
     driver only supports DPDK"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (122 commits)
  IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces
  RDMA: Add missed netdev_put() for the netdevice_tracker
  RDMA/rxe: Enable RDMA FLUSH capability for rxe device
  RDMA/cm: Make QP FLUSHABLE for supported device
  RDMA/rxe: Implement flush completion
  RDMA/rxe: Implement flush execution in responder side
  RDMA/rxe: Implement RC RDMA FLUSH service in requester side
  RDMA/rxe: Extend rxe packet format to support flush
  RDMA/rxe: Allow registering persistent flag for pmem MR only
  RDMA/rxe: Extend rxe user ABI to support flush
  RDMA: Extend RDMA kernel verbs ABI to support flush
  RDMA: Extend RDMA user ABI to support flush
  RDMA/rxe: Fix incorrect responder length checking
  RDMA/rxe: Fix oops with zero length reads
  RDMA/mlx5: Remove not-used IB_FLOW_SPEC_IB define
  RDMA/hns: Fix XRC caps on HIP08
  RDMA/hns: Fix error code of CMD
  RDMA/hns: Fix page size cap from firmware
  RDMA/hns: Fix PBL page MTR find
  RDMA/hns: Fix AH attr queried by query_qp
  ...
parents 08cdc215 dbc94a0f

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -13806,6 +13806,15 @@ F: drivers/scsi/smartpqi/smartpqi*.[ch] 
F:	include/linux/cciss*.h

F:	include/uapi/linux/cciss*.h









MICROSOFT MANA RDMA DRIVER









M:	Long Li <longli@microsoft.com>









M:	Ajay Sharma <sharmaajay@microsoft.com>









L:	linux-rdma@vger.kernel.org









S:	Supported









F:	drivers/infiniband/hw/mana/









F:	include/net/mana









F:	include/uapi/rdma/mana-abi.h

















MICROSOFT SURFACE AGGREGATOR TABLET-MODE SWITCH









M:	Maximilian Luz <luzmaximilian@gmail.com>









L:	platform-driver-x86@vger.kernel.org
































drivers/infiniband/Kconfig



+3
−0






























Original line number
Diff line number
Diff line







@@ -78,6 +78,7 @@ config INFINIBAND_VIRT_DMA







	def_bool !HIGHMEM



















if INFINIBAND_USER_ACCESS || !INFINIBAND_USER_ACCESS









if !UML









source "drivers/infiniband/hw/bnxt_re/Kconfig"









source "drivers/infiniband/hw/cxgb4/Kconfig"









source "drivers/infiniband/hw/efa/Kconfig"








@@ -85,6 +86,7 @@ source "drivers/infiniband/hw/erdma/Kconfig"







source "drivers/infiniband/hw/hfi1/Kconfig"









source "drivers/infiniband/hw/hns/Kconfig"









source "drivers/infiniband/hw/irdma/Kconfig"









source "drivers/infiniband/hw/mana/Kconfig"









source "drivers/infiniband/hw/mlx4/Kconfig"









source "drivers/infiniband/hw/mlx5/Kconfig"









source "drivers/infiniband/hw/mthca/Kconfig"








@@ -94,6 +96,7 @@ source "drivers/infiniband/hw/qib/Kconfig"







source "drivers/infiniband/hw/usnic/Kconfig"









source "drivers/infiniband/hw/vmw_pvrdma/Kconfig"









source "drivers/infiniband/sw/rdmavt/Kconfig"









endif # !UML









source "drivers/infiniband/sw/rxe/Kconfig"









source "drivers/infiniband/sw/siw/Kconfig"









endif
































drivers/infiniband/core/cache.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -1422,7 +1422,7 @@ int rdma_read_gid_l2_fields(const struct ib_gid_attr *attr,







			*vlan_id = vlan_dev_vlan_id(ndev);









		} else {









			/* If the netdev is upper device and if it's lower









			 * device is vlan device, consider vlan id of the









			 * device is vlan device, consider vlan id of









			 * the lower vlan device for this gid entry.









			 */









			netdev_walk_all_lower_dev_rcu(attr->ndev,
































drivers/infiniband/core/cm.c



+11
−2






























Original line number
Diff line number
Diff line







@@ -4094,9 +4094,18 @@ static int cm_init_qp_init_attr(struct cm_id_private *cm_id_priv,







		*qp_attr_mask = IB_QP_STATE | IB_QP_ACCESS_FLAGS |









				IB_QP_PKEY_INDEX | IB_QP_PORT;









		qp_attr->qp_access_flags = IB_ACCESS_REMOTE_WRITE;









		if (cm_id_priv->responder_resources)









		if (cm_id_priv->responder_resources) {









			struct ib_device *ib_dev = cm_id_priv->id.device;









			u64 support_flush = ib_dev->attrs.device_cap_flags &









			  (IB_DEVICE_FLUSH_GLOBAL | IB_DEVICE_FLUSH_PERSISTENT);









			u32 flushable = support_flush ?









					(IB_ACCESS_FLUSH_GLOBAL |









					 IB_ACCESS_FLUSH_PERSISTENT) : 0;



















			qp_attr->qp_access_flags |= IB_ACCESS_REMOTE_READ |









						    IB_ACCESS_REMOTE_ATOMIC;









						    IB_ACCESS_REMOTE_ATOMIC |









						    flushable;









		}









		qp_attr->pkey_index = cm_id_priv->av.pkey_index;









		if (cm_id_priv->av.port)









			qp_attr->port_num = cm_id_priv->av.port->port_num;
































drivers/infiniband/core/cma.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -47,7 +47,7 @@ MODULE_LICENSE("Dual BSD/GPL");







#define CMA_CM_RESPONSE_TIMEOUT 20









#define CMA_MAX_CM_RETRIES 15









#define CMA_CM_MRA_SETTING (IB_CM_MRA_FLAG_DELAY | 24)









#define CMA_IBOE_PACKET_LIFETIME 18









#define CMA_IBOE_PACKET_LIFETIME 16









#define CMA_PREFERRED_ROCE_GID_TYPE IB_GID_TYPE_ROCE_UDP_ENCAP



















static const char * const cma_events[] = {