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

Commit 76b584d3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull rdma updates from Doug Ledford:
 "Primary 4.7 merge window changes

   - Updates to the new Intel X722 iWARP driver
   - Updates to the hfi1 driver
   - Fixes for the iw_cxgb4 driver
   - Misc core fixes
   - Generic RDMA READ/WRITE API addition
   - SRP updates
   - Misc ipoib updates
   - Minor mlx5 updates"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dledford/rdma: (148 commits)
  IB/mlx5: Fire the CQ completion handler from tasklet
  net/mlx5_core: Use tasklet for user-space CQ completion events
  IB/core: Do not require CAP_NET_ADMIN for packet sniffing
  IB/mlx4: Fix unaligned access in send_reply_to_slave
  IB/mlx5: Report Scatter FCS device capability when supported
  IB/mlx5: Add Scatter FCS support for Raw Packet QP
  IB/core: Add Scatter FCS create flag
  IB/core: Add Raw Scatter FCS device capability
  IB/core: Add extended device capability flags
  i40iw: pass hw_stats by reference rather than by value
  i40iw: Remove unnecessary synchronize_irq() before free_irq()
  i40iw: constify i40iw_vf_cqp_ops structure
  IB/mlx5: Add UARs write-combining and non-cached mapping
  IB/mlx5: Allow mapping the free running counter on PROT_EXEC
  IB/mlx4: Use list_for_each_entry_safe
  IB/SA: Use correct free function
  IB/core: Fix a potential array overrun in CMA and SA agent
  IB/core: Remove unnecessary check in ibnl_rcv_msg
  IB/IWPM: Fix a potential skb leak
  RDMA/nes: replace custom print_hex_dump()
  ...
parents 7992893c c16d2750

drivers/infiniband/core/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ obj-$(CONFIG_INFINIBAND_USER_MAD) += ib_umad.o 
obj-$(CONFIG_INFINIBAND_USER_ACCESS) +=	ib_uverbs.o ib_ucm.o \

					$(user_access-y)



ib_core-y :=			packer.o ud_header.o verbs.o cq.o sysfs.o \

ib_core-y :=			packer.o ud_header.o verbs.o cq.o rw.o sysfs.o \

				device.o fmr_pool.o cache.o netlink.o \

				roce_gid_mgmt.o

				roce_gid_mgmt.o mr_pool.o

ib_core-$(CONFIG_INFINIBAND_USER_MEM) += umem.o

ib_core-$(CONFIG_INFINIBAND_ON_DEMAND_PAGING) += umem_odp.o umem_rbtree.o

drivers/infiniband/core/cma.c

+3 −1
Original line number Diff line number Diff line
@@ -800,6 +800,7 @@ int rdma_create_qp(struct rdma_cm_id *id, struct ib_pd *pd, 
	if (id->device != pd->device)

		return -EINVAL;



	qp_init_attr->port_num = id->port_num;

	qp = ib_create_qp(pd, qp_init_attr);

	if (IS_ERR(qp))

		return PTR_ERR(qp);
@@ -4294,7 +4295,8 @@ static int __init cma_init(void) 
	if (ret)

		goto err;



	if (ibnl_add_client(RDMA_NL_RDMA_CM, RDMA_NL_RDMA_CM_NUM_OPS, cma_cb_table))

	if (ibnl_add_client(RDMA_NL_RDMA_CM, ARRAY_SIZE(cma_cb_table),

			    cma_cb_table))

		pr_warn("RDMA CMA: failed to add netlink callback\n");

	cma_configfs_init();

drivers/infiniband/core/iwcm.c

+2 −2
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static void iw_cm_check_wildcard(struct sockaddr_storage *pm_addr, 
	if (pm_addr->ss_family == AF_INET) {

		struct sockaddr_in *pm4_addr = (struct sockaddr_in *)pm_addr;



		if (pm4_addr->sin_addr.s_addr == INADDR_ANY) {

		if (pm4_addr->sin_addr.s_addr == htonl(INADDR_ANY)) {

			struct sockaddr_in *cm4_addr =

				(struct sockaddr_in *)cm_addr;

			struct sockaddr_in *cm4_outaddr =
@@ -1175,7 +1175,7 @@ static int __init iw_cm_init(void) 
	if (ret)

		pr_err("iw_cm: couldn't init iwpm\n");



	ret = ibnl_add_client(RDMA_NL_IWCM, RDMA_NL_IWPM_NUM_OPS,

	ret = ibnl_add_client(RDMA_NL_IWCM, ARRAY_SIZE(iwcm_nl_cb_table),

			      iwcm_nl_cb_table);

	if (ret)

		pr_err("iw_cm: couldn't register netlink callbacks\n");

drivers/infiniband/core/iwpm_util.c

+1 −0
Original line number Diff line number Diff line
@@ -634,6 +634,7 @@ static int send_nlmsg_done(struct sk_buff *skb, u8 nl_client, int iwpm_pid) 
	if (!(ibnl_put_msg(skb, &nlh, 0, 0, nl_client,

			   RDMA_NL_IWPM_MAPINFO, NLM_F_MULTI))) {

		pr_warn("%s Unable to put NLMSG_DONE\n", __func__);

		dev_kfree_skb(skb);

		return -ENOMEM;

	}

	nlh->nlmsg_type = NLMSG_DONE;

drivers/infiniband/core/mr_pool.c

0 → 100644
+86 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2016 HGST, a Western Digital Company.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,

 * version 2, as published by the Free Software Foundation.

 *

 * This program is distributed in the hope it will be useful, but WITHOUT

 * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or

 * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for

 * more details.

 */

#include <rdma/ib_verbs.h>

#include <rdma/mr_pool.h>



struct ib_mr *ib_mr_pool_get(struct ib_qp *qp, struct list_head *list)

{

	struct ib_mr *mr;

	unsigned long flags;



	spin_lock_irqsave(&qp->mr_lock, flags);

	mr = list_first_entry_or_null(list, struct ib_mr, qp_entry);

	if (mr) {

		list_del(&mr->qp_entry);

		qp->mrs_used++;

	}

	spin_unlock_irqrestore(&qp->mr_lock, flags);



	return mr;

}

EXPORT_SYMBOL(ib_mr_pool_get);



void ib_mr_pool_put(struct ib_qp *qp, struct list_head *list, struct ib_mr *mr)

{

	unsigned long flags;



	spin_lock_irqsave(&qp->mr_lock, flags);

	list_add(&mr->qp_entry, list);

	qp->mrs_used--;

	spin_unlock_irqrestore(&qp->mr_lock, flags);

}

EXPORT_SYMBOL(ib_mr_pool_put);



int ib_mr_pool_init(struct ib_qp *qp, struct list_head *list, int nr,

		enum ib_mr_type type, u32 max_num_sg)

{

	struct ib_mr *mr;

	unsigned long flags;

	int ret, i;



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

		mr = ib_alloc_mr(qp->pd, type, max_num_sg);

		if (IS_ERR(mr)) {

			ret = PTR_ERR(mr);

			goto out;

		}



		spin_lock_irqsave(&qp->mr_lock, flags);

		list_add_tail(&mr->qp_entry, list);

		spin_unlock_irqrestore(&qp->mr_lock, flags);

	}



	return 0;

out:

	ib_mr_pool_destroy(qp, list);

	return ret;

}

EXPORT_SYMBOL(ib_mr_pool_init);



void ib_mr_pool_destroy(struct ib_qp *qp, struct list_head *list)

{

	struct ib_mr *mr;

	unsigned long flags;



	spin_lock_irqsave(&qp->mr_lock, flags);

	while (!list_empty(list)) {

		mr = list_first_entry(list, struct ib_mr, qp_entry);

		list_del(&mr->qp_entry);



		spin_unlock_irqrestore(&qp->mr_lock, flags);

		ib_dereg_mr(mr);

		spin_lock_irqsave(&qp->mr_lock, flags);

	}

	spin_unlock_irqrestore(&qp->mr_lock, flags);

}

EXPORT_SYMBOL(ib_mr_pool_destroy);