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

Commit c1c2fef6 authored by Doug Ledford's avatar Doug Ledford
Browse files

Merge branches 'cve-fixup', 'ipoib', 'iser', 'misc-4.1', 'or-mlx4' and 'srp' into for-4.1

parents 66578b0b ca9b590c ba943fb2 59d2d18c 56c1d233 9f5d32af

Documentation/filesystems/nfs/nfs-rdma.txt

+6 −3
Original line number Diff line number Diff line
@@ -187,8 +187,10 @@ Check RDMA and NFS Setup 
    To further test the InfiniBand software stack, use IPoIB (this

    assumes you have two IB hosts named host1 and host2):



    host1$ ifconfig ib0 a.b.c.x

    host2$ ifconfig ib0 a.b.c.y

    host1$ ip link set dev ib0 up

    host1$ ip address add dev ib0 a.b.c.x

    host2$ ip link set dev ib0 up

    host2$ ip address add dev ib0 a.b.c.y

    host1$ ping a.b.c.y

    host2$ ping a.b.c.x
@@ -229,7 +231,8 @@ NFS/RDMA Setup 


    $ modprobe ib_mthca

    $ modprobe ib_ipoib

    $ ifconfig ib0 a.b.c.d

    $ ip li set dev ib0 up

    $ ip addr add dev ib0 a.b.c.d



    NOTE: use unique addresses for the client and server

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -8791,6 +8791,15 @@ W: http://www.emulex.com 
S:	Supported

F:	drivers/net/ethernet/emulex/benet/



EMULEX ONECONNECT ROCE DRIVER

M:	Selvin Xavier <selvin.xavier@emulex.com>

M:	Devesh Sharma <devesh.sharma@emulex.com>

M:	Mitesh Ahuja <mitesh.ahuja@emulex.com>

L:	linux-rdma@vger.kernel.org

W:	http://www.emulex.com

S:	Supported

F:	drivers/infiniband/hw/ocrdma/



SFC NETWORK DRIVER

M:	Solarflare linux maintainers <linux-net-drivers@solarflare.com>

M:	Shradha Shah <sshah@solarflare.com>

drivers/infiniband/core/uverbs_main.c

+11 −11
Original line number Diff line number Diff line
@@ -246,6 +246,17 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, 
		kfree(uqp);

	}



	list_for_each_entry_safe(uobj, tmp, &context->srq_list, list) {

		struct ib_srq *srq = uobj->object;

		struct ib_uevent_object *uevent =

			container_of(uobj, struct ib_uevent_object, uobject);



		idr_remove_uobj(&ib_uverbs_srq_idr, uobj);

		ib_destroy_srq(srq);

		ib_uverbs_release_uevent(file, uevent);

		kfree(uevent);

	}



	list_for_each_entry_safe(uobj, tmp, &context->cq_list, list) {

		struct ib_cq *cq = uobj->object;

		struct ib_uverbs_event_file *ev_file = cq->cq_context;
@@ -258,17 +269,6 @@ static int ib_uverbs_cleanup_ucontext(struct ib_uverbs_file *file, 
		kfree(ucq);

	}



	list_for_each_entry_safe(uobj, tmp, &context->srq_list, list) {

		struct ib_srq *srq = uobj->object;

		struct ib_uevent_object *uevent =

			container_of(uobj, struct ib_uevent_object, uobject);



		idr_remove_uobj(&ib_uverbs_srq_idr, uobj);

		ib_destroy_srq(srq);

		ib_uverbs_release_uevent(file, uevent);

		kfree(uevent);

	}



	list_for_each_entry_safe(uobj, tmp, &context->mr_list, list) {

		struct ib_mr *mr = uobj->object;

drivers/infiniband/hw/mlx4/alias_GUID.c

+335 −122

File changed.

Preview size limit exceeded, changes collapsed.

drivers/infiniband/hw/mlx4/mad.c

+9 −0
Original line number Diff line number Diff line
@@ -1430,6 +1430,10 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
							tun_qp->ring[i].addr,

							rx_buf_size,

							DMA_FROM_DEVICE);

		if (ib_dma_mapping_error(ctx->ib_dev, tun_qp->ring[i].map)) {

			kfree(tun_qp->ring[i].addr);

			goto err;

		}

	}



	for (i = 0; i < MLX4_NUM_TUNNEL_BUFS; i++) {
@@ -1442,6 +1446,11 @@ static int mlx4_ib_alloc_pv_bufs(struct mlx4_ib_demux_pv_ctx *ctx, 
					  tun_qp->tx_ring[i].buf.addr,

					  tx_buf_size,

					  DMA_TO_DEVICE);

		if (ib_dma_mapping_error(ctx->ib_dev,

					 tun_qp->tx_ring[i].buf.map)) {

			kfree(tun_qp->tx_ring[i].buf.addr);

			goto tx_err;

		}

		tun_qp->tx_ring[i].ah = NULL;

	}

	spin_lock_init(&tun_qp->tx_lock);