Commit eed889b1 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

Merge tag 'nfs-rdma-for-4.3' of git://git.linux-nfs.org/projects/anna/nfs-rdma 



NFS: NFS over RDMA Client Side Changes

These patches improve both client performance and scalability, most notably
by increasing the maixmum allowed rsize and wsize and by increasing the number
of RDMA "credits".  There are also several bugfixes, such as correcting how
WRITE compounds are encoded and fixing large NFS symlink operations.

Signed-off-by: default avatarAnna Schumaker <Anna.Schumaker@Netapp.com>
parents aff8d8dc d0f36c46

drivers/infiniband/core/verbs.c

+0 −67
Original line number Diff line number Diff line
@@ -1144,73 +1144,6 @@ struct ib_mr *ib_get_dma_mr(struct ib_pd *pd, int mr_access_flags) 
}

EXPORT_SYMBOL(ib_get_dma_mr);



struct ib_mr *ib_reg_phys_mr(struct ib_pd *pd,

			     struct ib_phys_buf *phys_buf_array,

			     int num_phys_buf,

			     int mr_access_flags,

			     u64 *iova_start)

{

	struct ib_mr *mr;

	int err;



	err = ib_check_mr_access(mr_access_flags);

	if (err)

		return ERR_PTR(err);



	if (!pd->device->reg_phys_mr)

		return ERR_PTR(-ENOSYS);



	mr = pd->device->reg_phys_mr(pd, phys_buf_array, num_phys_buf,

				     mr_access_flags, iova_start);



	if (!IS_ERR(mr)) {

		mr->device  = pd->device;

		mr->pd      = pd;

		mr->uobject = NULL;

		atomic_inc(&pd->usecnt);

		atomic_set(&mr->usecnt, 0);

	}



	return mr;

}

EXPORT_SYMBOL(ib_reg_phys_mr);



int ib_rereg_phys_mr(struct ib_mr *mr,

		     int mr_rereg_mask,

		     struct ib_pd *pd,

		     struct ib_phys_buf *phys_buf_array,

		     int num_phys_buf,

		     int mr_access_flags,

		     u64 *iova_start)

{

	struct ib_pd *old_pd;

	int ret;



	ret = ib_check_mr_access(mr_access_flags);

	if (ret)

		return ret;



	if (!mr->device->rereg_phys_mr)

		return -ENOSYS;



	if (atomic_read(&mr->usecnt))

		return -EBUSY;



	old_pd = mr->pd;



	ret = mr->device->rereg_phys_mr(mr, mr_rereg_mask, pd,

					phys_buf_array, num_phys_buf,

					mr_access_flags, iova_start);



	if (!ret && (mr_rereg_mask & IB_MR_REREG_PD)) {

		atomic_dec(&old_pd->usecnt);

		atomic_inc(&pd->usecnt);

	}



	return ret;

}

EXPORT_SYMBOL(ib_rereg_phys_mr);



int ib_query_mr(struct ib_mr *mr, struct ib_mr_attr *mr_attr)

{

	return mr->device->query_mr ?

fs/nfs/nfs3xdr.c

+1 −0
Original line number Diff line number Diff line
@@ -1103,6 +1103,7 @@ static void nfs3_xdr_enc_symlink3args(struct rpc_rqst *req, 
{

	encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen);

	encode_symlinkdata3(xdr, args);

	xdr->buf->flags |= XDRBUF_WRITE;

}



/*

fs/nfs/nfs4xdr.c

+3 −1
Original line number Diff line number Diff line
@@ -1154,7 +1154,9 @@ static void encode_create(struct xdr_stream *xdr, const struct nfs4_create_arg * 
	case NF4LNK:

		p = reserve_space(xdr, 4);

		*p = cpu_to_be32(create->u.symlink.len);

		xdr_write_pages(xdr, create->u.symlink.pages, 0, create->u.symlink.len);

		xdr_write_pages(xdr, create->u.symlink.pages, 0,

				create->u.symlink.len);

		xdr->buf->flags |= XDRBUF_WRITE;

		break;



	case NF4BLK: case NF4CHR:

include/linux/sunrpc/xprtrdma.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
 * a single chunk type per message is supported currently.

 */

#define RPCRDMA_MIN_SLOT_TABLE	(2U)

#define RPCRDMA_DEF_SLOT_TABLE	(32U)

#define RPCRDMA_DEF_SLOT_TABLE	(128U)

#define RPCRDMA_MAX_SLOT_TABLE	(256U)



#define RPCRDMA_DEF_INLINE  (1024)	/* default inline max */

include/rdma/ib_verbs.h

+0 −46
Original line number Diff line number Diff line
@@ -2759,52 +2759,6 @@ static inline void ib_dma_free_coherent(struct ib_device *dev, 
		dma_free_coherent(dev->dma_device, size, cpu_addr, dma_handle);

}



/**

 * ib_reg_phys_mr - Prepares a virtually addressed memory region for use

 *   by an HCA.

 * @pd: The protection domain associated assigned to the registered region.

 * @phys_buf_array: Specifies a list of physical buffers to use in the

 *   memory region.

 * @num_phys_buf: Specifies the size of the phys_buf_array.

 * @mr_access_flags: Specifies the memory access rights.

 * @iova_start: The offset of the region's starting I/O virtual address.

 */

struct ib_mr *ib_reg_phys_mr(struct ib_pd *pd,

			     struct ib_phys_buf *phys_buf_array,

			     int num_phys_buf,

			     int mr_access_flags,

			     u64 *iova_start);



/**

 * ib_rereg_phys_mr - Modifies the attributes of an existing memory region.

 *   Conceptually, this call performs the functions deregister memory region

 *   followed by register physical memory region.  Where possible,

 *   resources are reused instead of deallocated and reallocated.

 * @mr: The memory region to modify.

 * @mr_rereg_mask: A bit-mask used to indicate which of the following

 *   properties of the memory region are being modified.

 * @pd: If %IB_MR_REREG_PD is set in mr_rereg_mask, this field specifies

 *   the new protection domain to associated with the memory region,

 *   otherwise, this parameter is ignored.

 * @phys_buf_array: If %IB_MR_REREG_TRANS is set in mr_rereg_mask, this

 *   field specifies a list of physical buffers to use in the new

 *   translation, otherwise, this parameter is ignored.

 * @num_phys_buf: If %IB_MR_REREG_TRANS is set in mr_rereg_mask, this

 *   field specifies the size of the phys_buf_array, otherwise, this

 *   parameter is ignored.

 * @mr_access_flags: If %IB_MR_REREG_ACCESS is set in mr_rereg_mask, this

 *   field specifies the new memory access rights, otherwise, this

 *   parameter is ignored.

 * @iova_start: The offset of the region's starting I/O virtual address.

 */

int ib_rereg_phys_mr(struct ib_mr *mr,

		     int mr_rereg_mask,

		     struct ib_pd *pd,

		     struct ib_phys_buf *phys_buf_array,

		     int num_phys_buf,

		     int mr_access_flags,

		     u64 *iova_start);



/**

 * ib_query_mr - Retrieves information about a specific memory region.

 * @mr: The memory region to retrieve information about.

CRA Git | Maintained and supported by SUSTech CRA and CCSE