Commit 5d24ae67 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:
 "This has been a fairly typical cycle, with the usual sorts of driver
  updates. Several series continue to come through which improve and
  modernize various parts of the core code, and we finally are starting
  to get the uAPI command interface cleaned up.

   - Various driver fixes for bnxt_re, cxgb3/4, hfi1, hns, i40iw, mlx4,
     mlx5, qib, rxe, usnic

   - Rework the entire syscall flow for uverbs to be able to run over
     ioctl(). Finally getting past the historic bad choice to use
     write() for command execution

   - More functional coverage with the mlx5 'devx' user API

   - Start of the HFI1 series for 'TID RDMA'

   - SRQ support in the hns driver

   - Support for new IBTA defined 2x lane widths

   - A big series to consolidate all the driver function pointers into a
     big struct and have drivers provide a 'static const' version of the
     struct instead of open coding initialization

   - New 'advise_mr' uAPI to control device caching/loading of page
     tables

   - Support for inline data in SRPT

   - Modernize how umad uses the driver core and creates cdev's and
     sysfs files

   - First steps toward removing 'uobject' from the view of the drivers"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (193 commits)
  RDMA/srpt: Use kmem_cache_free() instead of kfree()
  RDMA/mlx5: Signedness bug in UVERBS_HANDLER()
  IB/uverbs: Signedness bug in UVERBS_HANDLER()
  IB/mlx5: Allocate the per-port Q counter shared when DEVX is supported
  IB/umad: Start using dev_groups of class
  IB/umad: Use class_groups and let core create class file
  IB/umad: Refactor code to use cdev_device_add()
  IB/umad: Avoid destroying device while it is accessed
  IB/umad: Simplify and avoid dynamic allocation of class
  IB/mlx5: Fix wrong error unwind
  IB/mlx4: Remove set but not used variable 'pd'
  RDMA/iwcm: Don't copy past the end of dev_name() string
  IB/mlx5: Fix long EEH recover time with NVMe offloads
  IB/mlx5: Simplify netdev unbinding
  IB/core: Move query port to ioctl
  RDMA/nldev: Expose port_cap_flags2
  IB/core: uverbs copy to struct or zero helper
  IB/rxe: Reuse code which sets port state
  IB/rxe: Make counters thread safe
  IB/mlx5: Use the correct commands for UMEM and UCTX allocation
  ...
parents 938edb8a f617e5ff

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -3688,6 +3688,8 @@ F: drivers/net/ethernet/cisco/enic/ 


CISCO VIC LOW LATENCY NIC DRIVER

M:	Christian Benvenuti <benve@cisco.com>

M:	Nelson Escobar <neescoba@cisco.com>

M:	Parvi Kaustubhi <pkaustub@cisco.com>

S:	Supported

F:	drivers/infiniband/hw/usnic/

drivers/infiniband/core/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -38,4 +38,4 @@ ib_uverbs-y := uverbs_main.o uverbs_cmd.o uverbs_marshall.o \ 
				uverbs_std_types_cq.o \

				uverbs_std_types_flow_action.o uverbs_std_types_dm.o \

				uverbs_std_types_mr.o uverbs_std_types_counters.o \

				uverbs_uapi.o
 
				uverbs_uapi.o uverbs_std_types_device.o

drivers/infiniband/core/agent.c

+2 −2
Original line number Diff line number Diff line
@@ -137,13 +137,13 @@ void agent_send_response(const struct ib_mad_hdr *mad_hdr, const struct ib_grh * 
err2:

	ib_free_send_mad(send_buf);

err1:

	rdma_destroy_ah(ah);

	rdma_destroy_ah(ah, RDMA_DESTROY_AH_SLEEPABLE);

}



static void agent_send_handler(struct ib_mad_agent *mad_agent,

			       struct ib_mad_send_wc *mad_send_wc)

{

	rdma_destroy_ah(mad_send_wc->send_buf->ah);

	rdma_destroy_ah(mad_send_wc->send_buf->ah, RDMA_DESTROY_AH_SLEEPABLE);

	ib_free_send_mad(mad_send_wc->send_buf);

}

drivers/infiniband/core/cache.c

+8 −9
Original line number Diff line number Diff line
@@ -215,10 +215,6 @@ static void free_gid_entry_locked(struct ib_gid_table_entry *entry) 
	dev_dbg(&device->dev, "%s port=%d index=%d gid %pI6\n", __func__,

		port_num, entry->attr.index, entry->attr.gid.raw);



	if (rdma_cap_roce_gid_table(device, port_num) &&

	    entry->state != GID_TABLE_ENTRY_INVALID)

		device->del_gid(&entry->attr, &entry->context);



	write_lock_irq(&table->rwlock);



	/*
@@ -324,7 +320,7 @@ static int add_roce_gid(struct ib_gid_table_entry *entry) 
		return -EINVAL;

	}

	if (rdma_cap_roce_gid_table(attr->device, attr->port_num)) {

		ret = attr->device->add_gid(attr, &entry->context);

		ret = attr->device->ops.add_gid(attr, &entry->context);

		if (ret) {

			dev_err(&attr->device->dev,

				"%s GID add failed port=%d index=%d\n",
@@ -364,6 +360,9 @@ static void del_gid(struct ib_device *ib_dev, u8 port, 
		table->data_vec[ix] = NULL;

	write_unlock_irq(&table->rwlock);



	if (rdma_cap_roce_gid_table(ib_dev, port))

		ib_dev->ops.del_gid(&entry->attr, &entry->context);



	put_gid_entry_locked(entry);

}
@@ -548,8 +547,8 @@ int ib_cache_gid_add(struct ib_device *ib_dev, u8 port, 
	unsigned long mask;

	int ret;



	if (ib_dev->get_netdev) {

		idev = ib_dev->get_netdev(ib_dev, port);

	if (ib_dev->ops.get_netdev) {

		idev = ib_dev->ops.get_netdev(ib_dev, port);

		if (idev && attr->ndev != idev) {

			union ib_gid default_gid;
@@ -1296,9 +1295,9 @@ static int config_non_roce_gid_cache(struct ib_device *device, 


	mutex_lock(&table->lock);

	for (i = 0; i < gid_tbl_len; ++i) {

		if (!device->query_gid)

		if (!device->ops.query_gid)

			continue;

		ret = device->query_gid(device, port, i, &gid_attr.gid);

		ret = device->ops.query_gid(device, port, i, &gid_attr.gid);

		if (ret) {

			dev_warn(&device->dev,

				 "query_gid failed (%d) for index %d\n", ret,

drivers/infiniband/core/cm.c

+3 −3
Original line number Diff line number Diff line
@@ -343,7 +343,7 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv, 
		ret = -ENODEV;

		goto out;

	}

	ah = rdma_create_ah(mad_agent->qp->pd, &av->ah_attr);

	ah = rdma_create_ah(mad_agent->qp->pd, &av->ah_attr, 0);

	if (IS_ERR(ah)) {

		ret = PTR_ERR(ah);

		goto out;
@@ -355,7 +355,7 @@ static int cm_alloc_msg(struct cm_id_private *cm_id_priv, 
			       GFP_ATOMIC,

			       IB_MGMT_BASE_VERSION);

	if (IS_ERR(m)) {

		rdma_destroy_ah(ah);

		rdma_destroy_ah(ah, 0);

		ret = PTR_ERR(m);

		goto out;

	}
@@ -400,7 +400,7 @@ static int cm_create_response_msg_ah(struct cm_port *port, 
static void cm_free_msg(struct ib_mad_send_buf *msg)

{

	if (msg->ah)

		rdma_destroy_ah(msg->ah);

		rdma_destroy_ah(msg->ah, 0);

	if (msg->context[0])

		cm_deref_id(msg->context[0]);

	ib_free_send_mad(msg);

CRA Git | Maintained and supported by SUSTech CRA and CCSE