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

Commit 34b48b87 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:
 "This is pretty much just the usual array of smallish driver bugs.

   - remove bouncing addresses from the MAINTAINERS file

   - kernel oops and bad error handling fixes for hfi, i40iw, cxgb4, and
     hns drivers

   - various small LOC behavioral/operational bugs in mlx5, hns, qedr
     and i40iw drivers

   - two fixes for patches already sent during the merge window

   - a long-standing bug related to not decreasing the pinned pages
     count in the right MM was found and fixed"

* tag 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma: (28 commits)
  RDMA/hns: Move the location for initializing tmp_len
  RDMA/hns: Bugfix for cq record db for kernel
  IB/uverbs: Fix uverbs_attr_get_obj
  RDMA/qedr: Fix doorbell bar mapping for dpi > 1
  IB/umem: Use the correct mm during ib_umem_release
  iw_cxgb4: Fix an error handling path in 'c4iw_get_dma_mr()'
  RDMA/i40iw: Avoid panic when reading back the IRQ affinity hint
  RDMA/i40iw: Avoid reference leaks when processing the AEQ
  RDMA/i40iw: Avoid panic when objects are being created and destroyed
  RDMA/hns: Fix the bug with NULL pointer
  RDMA/hns: Set NULL for __internal_mr
  RDMA/hns: Enable inner_pa_vld filed of mpt
  RDMA/hns: Set desc_dma_addr for zero when free cmq desc
  RDMA/hns: Fix the bug with rq sge
  RDMA/hns: Not support qp transition from reset to reset for hip06
  RDMA/hns: Add return operation when configured global param fail
  RDMA/hns: Update convert function of endian format
  RDMA/hns: Load the RoCE dirver automatically
  RDMA/hns: Bugfix for rq record db for kernel
  RDMA/hns: Add rq inline flags judgement
  ...
parents d7b66b4a 55ba49cb

MAINTAINERS

+0 −6
Original line number Diff line number Diff line
@@ -5388,7 +5388,6 @@ S: Maintained 
F:	drivers/iommu/exynos-iommu.c



EZchip NPS platform support

M:	Elad Kanfi <eladkan@mellanox.com>

M:	Vineet Gupta <vgupta@synopsys.com>

S:	Supported

F:	arch/arc/plat-eznps
@@ -9021,7 +9020,6 @@ Q: http://patchwork.ozlabs.org/project/netdev/list/ 
F:	drivers/net/ethernet/mellanox/mlx5/core/en_*



MELLANOX ETHERNET INNOVA DRIVER

M:	Ilan Tayari <ilant@mellanox.com>

R:	Boris Pismenny <borisp@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported
@@ -9031,7 +9029,6 @@ F: drivers/net/ethernet/mellanox/mlx5/core/fpga/* 
F:	include/linux/mlx5/mlx5_ifc_fpga.h



MELLANOX ETHERNET INNOVA IPSEC DRIVER

M:	Ilan Tayari <ilant@mellanox.com>

R:	Boris Pismenny <borisp@mellanox.com>

L:	netdev@vger.kernel.org

S:	Supported
@@ -9087,7 +9084,6 @@ F: include/uapi/rdma/mlx4-abi.h 


MELLANOX MLX5 core VPI driver

M:	Saeed Mahameed <saeedm@mellanox.com>

M:	Matan Barak <matanb@mellanox.com>

M:	Leon Romanovsky <leonro@mellanox.com>

L:	netdev@vger.kernel.org

L:	linux-rdma@vger.kernel.org
@@ -9098,7 +9094,6 @@ F: drivers/net/ethernet/mellanox/mlx5/core/ 
F:	include/linux/mlx5/



MELLANOX MLX5 IB driver

M:	Matan Barak <matanb@mellanox.com>

M:	Leon Romanovsky <leonro@mellanox.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.mellanox.com
@@ -9832,7 +9827,6 @@ F: net/netfilter/xt_CONNSECMARK.c 
F:	net/netfilter/xt_SECMARK.c



NETWORKING [TLS]

M:	Ilya Lesokhin <ilyal@mellanox.com>

M:	Aviad Yehezkel <aviadye@mellanox.com>

M:	Dave Watson <davejwatson@fb.com>

L:	netdev@vger.kernel.org

drivers/infiniband/core/umem.c

+1 −6
Original line number Diff line number Diff line
@@ -119,7 +119,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 
	umem->length     = size;

	umem->address    = addr;

	umem->page_shift = PAGE_SHIFT;

	umem->pid	 = get_task_pid(current, PIDTYPE_PID);

	/*

	 * We ask for writable memory if any of the following

	 * access flags are set.  "Local write" and "remote write"
@@ -132,7 +131,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 
		 IB_ACCESS_REMOTE_ATOMIC | IB_ACCESS_MW_BIND));



	if (access & IB_ACCESS_ON_DEMAND) {

		put_pid(umem->pid);

		ret = ib_umem_odp_get(context, umem, access);

		if (ret) {

			kfree(umem);
@@ -148,7 +146,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 


	page_list = (struct page **) __get_free_page(GFP_KERNEL);

	if (!page_list) {

		put_pid(umem->pid);

		kfree(umem);

		return ERR_PTR(-ENOMEM);

	}
@@ -231,7 +228,6 @@ struct ib_umem *ib_umem_get(struct ib_ucontext *context, unsigned long addr, 
	if (ret < 0) {

		if (need_release)

			__ib_umem_release(context->device, umem, 0);

		put_pid(umem->pid);

		kfree(umem);

	} else

		current->mm->pinned_vm = locked;
@@ -274,8 +270,7 @@ void ib_umem_release(struct ib_umem *umem) 


	__ib_umem_release(umem->context->device, umem, 1);



	task = get_pid_task(umem->pid, PIDTYPE_PID);

	put_pid(umem->pid);

	task = get_pid_task(umem->context->tgid, PIDTYPE_PID);

	if (!task)

		goto out;

	mm = get_task_mm(task);

drivers/infiniband/hw/cxgb4/mem.c

+2 −2
Original line number Diff line number Diff line
@@ -489,10 +489,10 @@ struct ib_mr *c4iw_get_dma_mr(struct ib_pd *pd, int acc) 
err_dereg_mem:

	dereg_mem(&rhp->rdev, mhp->attr.stag, mhp->attr.pbl_size,

		  mhp->attr.pbl_addr, mhp->dereg_skb, mhp->wr_waitp);

err_free_wr_wait:

	c4iw_put_wr_wait(mhp->wr_waitp);

err_free_skb:

	kfree_skb(mhp->dereg_skb);

err_free_wr_wait:

	c4iw_put_wr_wait(mhp->wr_waitp);

err_free_mhp:

	kfree(mhp);

	return ERR_PTR(ret);

drivers/infiniband/hw/hfi1/chip.c

+4 −0
Original line number Diff line number Diff line
@@ -5944,6 +5944,7 @@ static void is_sendctxt_err_int(struct hfi1_devdata *dd, 
	u64 status;

	u32 sw_index;

	int i = 0;

	unsigned long irq_flags;



	sw_index = dd->hw_to_sw[hw_context];

	if (sw_index >= dd->num_send_contexts) {
@@ -5953,10 +5954,12 @@ static void is_sendctxt_err_int(struct hfi1_devdata *dd, 
		return;

	}

	sci = &dd->send_contexts[sw_index];

	spin_lock_irqsave(&dd->sc_lock, irq_flags);

	sc = sci->sc;

	if (!sc) {

		dd_dev_err(dd, "%s: context %u(%u): no sc?\n", __func__,

			   sw_index, hw_context);

		spin_unlock_irqrestore(&dd->sc_lock, irq_flags);

		return;

	}
@@ -5978,6 +5981,7 @@ static void is_sendctxt_err_int(struct hfi1_devdata *dd, 
	 */

	if (sc->type != SC_USER)

		queue_work(dd->pport->hfi1_wq, &sc->halt_work);

	spin_unlock_irqrestore(&dd->sc_lock, irq_flags);



	/*

	 * Update the counters for the corresponding status bits.

drivers/infiniband/hw/hns/hns_roce_cq.c

+1 −0
Original line number Diff line number Diff line
@@ -377,6 +377,7 @@ struct ib_cq *hns_roce_ib_create_cq(struct ib_device *ib_dev, 


			hr_cq->set_ci_db = hr_cq->db.db_record;

			*hr_cq->set_ci_db = 0;

			hr_cq->db_en = 1;

		}



		/* Init mmt table and write buff address to mtt table */