Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 018c6837 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 subsystem updates from Jason Gunthorpe:
 "This cycle mainly saw lots of bug fixes and clean up code across the
  core code and several drivers, few new functional changes were made.

   - Many cleanup and bug fixes for hns

   - Various small bug fixes and cleanups in hfi1, mlx5, usnic, qed,
     bnxt_re, efa

   - Share the query_port code between all the iWarp drivers

   - General rework and cleanup of the ODP MR umem code to fit better
     with the mmu notifier get/put scheme

   - Support rdma netlink in non init_net name spaces

   - mlx5 support for XRC devx and DC ODP"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (99 commits)
  RDMA: Fix double-free in srq creation error flow
  RDMA/efa: Fix incorrect error print
  IB/mlx5: Free mpi in mp_slave mode
  IB/mlx5: Use the original address for the page during free_pages
  RDMA/bnxt_re: Fix spelling mistake "missin_resp" -> "missing_resp"
  RDMA/hns: Package operations of rq inline buffer into separate functions
  RDMA/hns: Optimize cmd init and mode selection for hip08
  IB/hfi1: Define variables as unsigned long to fix KASAN warning
  IB/{rdmavt, hfi1, qib}: Add a counter for credit waits
  IB/hfi1: Add traces for TID RDMA READ
  RDMA/siw: Relax from kmap_atomic() use in TX path
  IB/iser: Support up to 16MB data transfer in a single command
  RDMA/siw: Fix page address mapping in TX path
  RDMA: Fix goto target to release the allocated memory
  RDMA/usnic: Avoid overly large buffers on stack
  RDMA/odp: Add missing cast for 32 bit
  RDMA/hns: Use devm_platform_ioremap_resource() to simplify code
  Documentation/infiniband: update name of some functions
  RDMA/cma: Fix false error message
  RDMA/hns: Fix wrong assignment of qp_access_flags
  ...
parents 84da111d 3eca7fc2

Documentation/infiniband/core_locking.rst

+4 −4
Original line number Diff line number Diff line
@@ -29,10 +29,10 @@ Sleeping and interrupt context 
  The corresponding functions exported to upper level protocol

  consumers:



    - ib_create_ah

    - ib_modify_ah

    - ib_query_ah

    - ib_destroy_ah

    - rdma_create_ah

    - rdma_modify_ah

    - rdma_query_ah

    - rdma_destroy_ah

    - ib_post_send

    - ib_post_recv

    - ib_req_notify_cq

drivers/infiniband/core/addr.c

+1 −1
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ static int ib_nl_ip_send_msg(struct rdma_dev_addr *dev_addr, 


	/* Repair the nlmsg header length */

	nlmsg_end(skb, nlh);

	rdma_nl_multicast(skb, RDMA_NL_GROUP_LS, GFP_KERNEL);

	rdma_nl_multicast(&init_net, skb, RDMA_NL_GROUP_LS, GFP_KERNEL);



	/* Make the request retry, so when we get the response from userspace

	 * we will have something.

drivers/infiniband/core/cache.c

+1 −0
Original line number Diff line number Diff line
@@ -810,6 +810,7 @@ static void release_gid_table(struct ib_device *device, 
	if (leak)

		return;



	mutex_destroy(&table->lock);

	kfree(table->data_vec);

	kfree(table);

}

drivers/infiniband/core/cma.c

+1 −1
Original line number Diff line number Diff line
@@ -3046,7 +3046,7 @@ static void addr_handler(int status, struct sockaddr *src_addr, 
		if (status)

			pr_debug_ratelimited("RDMA CM: ADDR_ERROR: failed to acquire device. status %d\n",

					     status);

	} else {

	} else if (status) {

		pr_debug_ratelimited("RDMA CM: ADDR_ERROR: failed to resolve IP. status %d\n", status);

	}

drivers/infiniband/core/cma_configfs.c

+7 −1
Original line number Diff line number Diff line
@@ -342,12 +342,18 @@ static struct configfs_subsystem cma_subsys = { 


int __init cma_configfs_init(void)

{

	int ret;



	config_group_init(&cma_subsys.su_group);

	mutex_init(&cma_subsys.su_mutex);

	return configfs_register_subsystem(&cma_subsys);

	ret = configfs_register_subsystem(&cma_subsys);

	if (ret)

		mutex_destroy(&cma_subsys.su_mutex);

	return ret;

}



void __exit cma_configfs_exit(void)

{

	configfs_unregister_subsystem(&cma_subsys);

	mutex_destroy(&cma_subsys.su_mutex);

}