Commit f7e97ce2 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:
 "Many small changes across the subystem, some highlights:

   - Usual driver cleanups in qedr, siw, erdma, hfi1, mlx4/5, irdma,
     mthca, hns, and bnxt_re

   - siw now works over tunnel and other netdevs with a MAC address by
     removing assumptions about a MAC/GID from the connection manager

   - "Doorbell Pacing" for bnxt_re - this is a best effort scheme to
     allow userspace to slow down the doorbell rings if the HW gets full

   - irdma egress VLAN priority, better QP/WQ sizing

   - rxe bug fixes in queue draining and srq resizing

   - Support more ethernet speed options in the core layer

   - DMABUF support for bnxt_re

   - Multi-stage MTT support for erdma to allow much bigger MR
     registrations

   - A irdma fix with a CVE that came in too late to go to -rc, missing
     bounds checking for 0 length MRs"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (87 commits)
  IB/hfi1: Reduce printing of errors during driver shut down
  RDMA/hfi1: Move user SDMA system memory pinning code to its own file
  RDMA/hfi1: Use list_for_each_entry() helper
  RDMA/mlx5: Fix trailing */ formatting in block comment
  RDMA/rxe: Fix redundant break statement in switch-case.
  RDMA/efa: Fix wrong resources deallocation order
  RDMA/siw: Call llist_reverse_order in siw_run_sq
  RDMA/siw: Correct wrong debug message
  RDMA/siw: Balance the reference of cep->kref in the error path
  Revert "IB/isert: Fix incorrect release of isert connection"
  RDMA/bnxt_re: Fix kernel doc errors
  RDMA/irdma: Prevent zero-length STAG registration
  RDMA/erdma: Implement hierarchical MTT
  RDMA/erdma: Refactor the storage structure of MTT entries
  RDMA/erdma: Renaming variable names and field names of struct erdma_mem
  RDMA/hns: Support hns HW stats
  RDMA/hns: Dump whole QP/CQ/MR resource in raw
  RDMA/irdma: Add missing kernel-doc in irdma_setup_umode_qp()
  RDMA/mlx4: Copy union directly
  RDMA/irdma: Drop unused kernel push code
  ...
parents 2fcbb038 f5acc36b

drivers/infiniband/core/cache.c

+11 −0
Original line number Diff line number Diff line
@@ -1457,6 +1457,17 @@ static int config_non_roce_gid_cache(struct ib_device *device, 
				 i);

			goto err;

		}



		if (rdma_protocol_iwarp(device, port)) {

			struct net_device *ndev;



			ndev = ib_device_get_netdev(device, port);

			if (!ndev)

				continue;

			RCU_INIT_POINTER(gid_attr.ndev, ndev);

			dev_put(ndev);

		}



		gid_attr.index = i;

		tprops->subnet_prefix =

			be64_to_cpu(gid_attr.gid.global.subnet_prefix);

drivers/infiniband/core/cma.c

+27 −5
Original line number Diff line number Diff line
@@ -686,30 +686,52 @@ cma_validate_port(struct ib_device *device, u32 port, 
		  struct rdma_id_private *id_priv)

{

	struct rdma_dev_addr *dev_addr = &id_priv->id.route.addr.dev_addr;

	const struct ib_gid_attr *sgid_attr = ERR_PTR(-ENODEV);

	int bound_if_index = dev_addr->bound_dev_if;

	const struct ib_gid_attr *sgid_attr;

	int dev_type = dev_addr->dev_type;

	struct net_device *ndev = NULL;



	if (!rdma_dev_access_netns(device, id_priv->id.route.addr.dev_addr.net))

		return ERR_PTR(-ENODEV);

		goto out;



	if ((dev_type == ARPHRD_INFINIBAND) && !rdma_protocol_ib(device, port))

		return ERR_PTR(-ENODEV);

		goto out;



	if ((dev_type != ARPHRD_INFINIBAND) && rdma_protocol_ib(device, port))

		return ERR_PTR(-ENODEV);

		goto out;



	/*

	 * For drivers that do not associate more than one net device with

	 * their gid tables, such as iWARP drivers, it is sufficient to

	 * return the first table entry.

	 *

	 * Other driver classes might be included in the future.

	 */

	if (rdma_protocol_iwarp(device, port)) {

		sgid_attr = rdma_get_gid_attr(device, port, 0);

		if (IS_ERR(sgid_attr))

			goto out;



		rcu_read_lock();

		ndev = rcu_dereference(sgid_attr->ndev);

		if (!net_eq(dev_net(ndev), dev_addr->net) ||

		    ndev->ifindex != bound_if_index)

			sgid_attr = ERR_PTR(-ENODEV);

		rcu_read_unlock();

		goto out;

	}



	if (dev_type == ARPHRD_ETHER && rdma_protocol_roce(device, port)) {

		ndev = dev_get_by_index(dev_addr->net, bound_if_index);

		if (!ndev)

			return ERR_PTR(-ENODEV);

			goto out;

	} else {

		gid_type = IB_GID_TYPE_IB;

	}



	sgid_attr = rdma_find_gid_by_port(device, gid, gid_type, port, ndev);

	dev_put(ndev);

out:

	return sgid_attr;

}

drivers/infiniband/core/iwpm_util.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int iwpm_get_remote_info(struct sockaddr_storage *mapped_loc_addr, 
struct iwpm_nlmsg_request *iwpm_get_nlmsg_request(__u32 nlmsg_seq,

					u8 nl_client, gfp_t gfp)

{

	struct iwpm_nlmsg_request *nlmsg_request = NULL;

	struct iwpm_nlmsg_request *nlmsg_request;

	unsigned long flags;



	nlmsg_request = kzalloc(sizeof(struct iwpm_nlmsg_request), gfp);

drivers/infiniband/core/netlink.c

+1 −1
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ static bool is_nl_msg_valid(unsigned int type, unsigned int op) 
	if (type >= RDMA_NL_NUM_CLIENTS)

		return false;



	return (op < max_num_ops[type]) ? true : false;

	return op < max_num_ops[type];

}



static const struct rdma_nl_cbs *

drivers/infiniband/core/uverbs_main.c

+18 −17
Original line number Diff line number Diff line
@@ -72,12 +72,23 @@ enum { 
#define IB_UVERBS_BASE_DEV	MKDEV(IB_UVERBS_MAJOR, IB_UVERBS_BASE_MINOR)



static dev_t dynamic_uverbs_dev;

static struct class *uverbs_class;



static DEFINE_IDA(uverbs_ida);

static int ib_uverbs_add_one(struct ib_device *device);

static void ib_uverbs_remove_one(struct ib_device *device, void *client_data);



static char *uverbs_devnode(const struct device *dev, umode_t *mode)

{

	if (mode)

		*mode = 0666;

	return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));

}



static const struct class uverbs_class = {

	.name = "infiniband_verbs",

	.devnode = uverbs_devnode,

};



/*

 * Must be called with the ufile->device->disassociate_srcu held, and the lock

 * must be held until use of the ucontext is finished.
@@ -1117,7 +1128,7 @@ static int ib_uverbs_add_one(struct ib_device *device) 
	}



	device_initialize(&uverbs_dev->dev);

	uverbs_dev->dev.class = uverbs_class;

	uverbs_dev->dev.class = &uverbs_class;

	uverbs_dev->dev.parent = device->dev.parent;

	uverbs_dev->dev.release = ib_uverbs_release_dev;

	uverbs_dev->groups[0] = &dev_attr_group;
@@ -1235,13 +1246,6 @@ static void ib_uverbs_remove_one(struct ib_device *device, void *client_data) 
	put_device(&uverbs_dev->dev);

}



static char *uverbs_devnode(const struct device *dev, umode_t *mode)

{

	if (mode)

		*mode = 0666;

	return kasprintf(GFP_KERNEL, "infiniband/%s", dev_name(dev));

}



static int __init ib_uverbs_init(void)

{

	int ret;
@@ -1262,16 +1266,13 @@ static int __init ib_uverbs_init(void) 
		goto out_alloc;

	}



	uverbs_class = class_create("infiniband_verbs");

	if (IS_ERR(uverbs_class)) {

		ret = PTR_ERR(uverbs_class);

	ret = class_register(&uverbs_class);

	if (ret) {

		pr_err("user_verbs: couldn't create class infiniband_verbs\n");

		goto out_chrdev;

	}



	uverbs_class->devnode = uverbs_devnode;



	ret = class_create_file(uverbs_class, &class_attr_abi_version.attr);

	ret = class_create_file(&uverbs_class, &class_attr_abi_version.attr);

	if (ret) {

		pr_err("user_verbs: couldn't create abi_version attribute\n");

		goto out_class;
@@ -1286,7 +1287,7 @@ static int __init ib_uverbs_init(void) 
	return 0;



out_class:

	class_destroy(uverbs_class);

	class_unregister(&uverbs_class);



out_chrdev:

	unregister_chrdev_region(dynamic_uverbs_dev,
@@ -1303,7 +1304,7 @@ static int __init ib_uverbs_init(void) 
static void __exit ib_uverbs_cleanup(void)

{

	ib_unregister_client(&uverbs_client);

	class_destroy(uverbs_class);

	class_unregister(&uverbs_class);

	unregister_chrdev_region(IB_UVERBS_BASE_DEV,

				 IB_UVERBS_NUM_FIXED_MINOR);

	unregister_chrdev_region(dynamic_uverbs_dev,