Commit 4fa56ad0 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 fixes from Jason Gunthorpe:
 "Nothing very exciting here, just a few small bug fixes. No red flags
  for this release have shown up.

   - Regression from the last pull request in cxgb4 related to the ipv6
     fixes

   - KASAN crasher in rtrs

   - oops in hfi1 related to a buggy BIOS

   - Userspace could oops qedr's XRC support

   - Uninitialized memory when parsing a LS_NLA_TYPE_DGID netlink
     message"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
  RDMA/addr: Be strict with gid size
  RDMA/qedr: Fix kernel panic when trying to access recv_cq
  IB/hfi1: Fix probe time panic when AIP is enabled with a buggy BIOS
  RDMA/cxgb4: check for ipv6 address properly while destroying listener
  RDMA/rtrs-clt: Close rtrs client conn before destroying rtrs clt session files
parents 3fb4f979 d1c803a9

drivers/infiniband/core/addr.c

+3 −1
Original line number Diff line number Diff line
@@ -76,7 +76,9 @@ static struct workqueue_struct *addr_wq; 


static const struct nla_policy ib_nl_addr_policy[LS_NLA_TYPE_MAX] = {

	[LS_NLA_TYPE_DGID] = {.type = NLA_BINARY,

		.len = sizeof(struct rdma_nla_ls_gid)},

		.len = sizeof(struct rdma_nla_ls_gid),

		.validation_type = NLA_VALIDATE_MIN,

		.min = sizeof(struct rdma_nla_ls_gid)},

};



static inline bool ib_nl_is_good_ip_resp(const struct nlmsghdr *nlh)

drivers/infiniband/hw/cxgb4/cm.c

+2 −1
Original line number Diff line number Diff line
@@ -3616,7 +3616,8 @@ int c4iw_destroy_listen(struct iw_cm_id *cm_id) 
		c4iw_init_wr_wait(ep->com.wr_waitp);

		err = cxgb4_remove_server(

				ep->com.dev->rdev.lldi.ports[0], ep->stid,

				ep->com.dev->rdev.lldi.rxq_ids[0], true);

				ep->com.dev->rdev.lldi.rxq_ids[0],

				ep->com.local_addr.ss_family == AF_INET6);

		if (err)

			goto done;

		err = c4iw_wait_for_reply(&ep->com.dev->rdev, ep->com.wr_waitp,

drivers/infiniband/hw/hfi1/affinity.c

+5 −16
Original line number Diff line number Diff line
@@ -632,22 +632,11 @@ static void _dev_comp_vect_cpu_mask_clean_up(struct hfi1_devdata *dd, 
 */

int hfi1_dev_affinity_init(struct hfi1_devdata *dd)

{

	int node = pcibus_to_node(dd->pcidev->bus);

	struct hfi1_affinity_node *entry;

	const struct cpumask *local_mask;

	int curr_cpu, possible, i, ret;

	bool new_entry = false;



	/*

	 * If the BIOS does not have the NUMA node information set, select

	 * NUMA 0 so we get consistent performance.

	 */

	if (node < 0) {

		dd_dev_err(dd, "Invalid PCI NUMA node. Performance may be affected\n");

		node = 0;

	}

	dd->node = node;



	local_mask = cpumask_of_node(dd->node);

	if (cpumask_first(local_mask) >= nr_cpu_ids)

		local_mask = topology_core_cpumask(0);
@@ -660,7 +649,7 @@ int hfi1_dev_affinity_init(struct hfi1_devdata *dd) 
	 * create an entry in the global affinity structure and initialize it.

	 */

	if (!entry) {

		entry = node_affinity_allocate(node);

		entry = node_affinity_allocate(dd->node);

		if (!entry) {

			dd_dev_err(dd,

				   "Unable to allocate global affinity node\n");
@@ -751,6 +740,7 @@ int hfi1_dev_affinity_init(struct hfi1_devdata *dd) 
	if (new_entry)

		node_affinity_add_tail(entry);



	dd->affinity_entry = entry;

	mutex_unlock(&node_affinity.lock);



	return 0;
@@ -766,10 +756,9 @@ void hfi1_dev_affinity_clean_up(struct hfi1_devdata *dd) 
{

	struct hfi1_affinity_node *entry;



	if (dd->node < 0)

		return;



	mutex_lock(&node_affinity.lock);

	if (!dd->affinity_entry)

		goto unlock;

	entry = node_affinity_lookup(dd->node);

	if (!entry)

		goto unlock;
@@ -780,8 +769,8 @@ void hfi1_dev_affinity_clean_up(struct hfi1_devdata *dd) 
	 */

	_dev_comp_vect_cpu_mask_clean_up(dd, entry);

unlock:

	dd->affinity_entry = NULL;

	mutex_unlock(&node_affinity.lock);

	dd->node = NUMA_NO_NODE;

}



/*

drivers/infiniband/hw/hfi1/hfi.h

+1 −0
Original line number Diff line number Diff line
@@ -1409,6 +1409,7 @@ struct hfi1_devdata { 
	spinlock_t irq_src_lock;

	int vnic_num_vports;

	struct net_device *dummy_netdev;

	struct hfi1_affinity_node *affinity_entry;



	/* Keeps track of IPoIB RSM rule users */

	atomic_t ipoib_rsm_usr_num;

drivers/infiniband/hw/hfi1/init.c

+9 −1
Original line number Diff line number Diff line
@@ -1277,7 +1277,6 @@ static struct hfi1_devdata *hfi1_alloc_devdata(struct pci_dev *pdev, 
	dd->pport = (struct hfi1_pportdata *)(dd + 1);

	dd->pcidev = pdev;

	pci_set_drvdata(pdev, dd);

	dd->node = NUMA_NO_NODE;



	ret = xa_alloc_irq(&hfi1_dev_table, &dd->unit, dd, xa_limit_32b,

			GFP_KERNEL);
@@ -1287,6 +1286,15 @@ static struct hfi1_devdata *hfi1_alloc_devdata(struct pci_dev *pdev, 
		goto bail;

	}

	rvt_set_ibdev_name(&dd->verbs_dev.rdi, "%s_%d", class_name(), dd->unit);

	/*

	 * If the BIOS does not have the NUMA node information set, select

	 * NUMA 0 so we get consistent performance.

	 */

	dd->node = pcibus_to_node(pdev->bus);

	if (dd->node == NUMA_NO_NODE) {

		dd_dev_err(dd, "Invalid PCI NUMA node. Performance may be affected\n");

		dd->node = 0;

	}



	/*

	 * Initialize all locks for the device. This needs to be as early as