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

Commit b2a239df authored by Matan Barak's avatar Matan Barak Committed by Doug Ledford
Browse files

IB/core: Add vendor's specific data to alloc mw 



Passing udata to the vendor's driver in order to pass data from the
user-space driver to the kernel-space driver. This data will be
used in downstream patches.

Signed-off-by: default avatarMatan Barak <matanb@mellanox.com>
Reviewed-by: default avatarYishai Hadas <yishaih@mellanox.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent a606b0f6

drivers/infiniband/core/uverbs_cmd.c

+7 −1
Original line number Diff line number Diff line
@@ -1174,6 +1174,7 @@ ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file, 
	struct ib_uobject             *uobj;

	struct ib_pd                  *pd;

	struct ib_mw                  *mw;

	struct ib_udata		       udata;

	int                            ret;



	if (out_len < sizeof(resp))
@@ -1195,7 +1196,12 @@ ssize_t ib_uverbs_alloc_mw(struct ib_uverbs_file *file, 
		goto err_free;

	}



	mw = pd->device->alloc_mw(pd, cmd.mw_type);

	INIT_UDATA(&udata, buf + sizeof(cmd),

		   (unsigned long)cmd.response + sizeof(resp),

		   in_len - sizeof(cmd) - sizeof(struct ib_uverbs_cmd_hdr),

		   out_len - sizeof(resp));



	mw = pd->device->alloc_mw(pd, cmd.mw_type, &udata);

	if (IS_ERR(mw)) {

		ret = PTR_ERR(mw);

		goto err_put;

drivers/infiniband/hw/cxgb3/iwch_provider.c

+2 −1
Original line number Diff line number Diff line
@@ -657,7 +657,8 @@ static struct ib_mr *iwch_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	return ERR_PTR(err);

}



static struct ib_mw *iwch_alloc_mw(struct ib_pd *pd, enum ib_mw_type type)

static struct ib_mw *iwch_alloc_mw(struct ib_pd *pd, enum ib_mw_type type,

				   struct ib_udata *udata)

{

	struct iwch_dev *rhp;

	struct iwch_pd *php;

drivers/infiniband/hw/cxgb4/iw_cxgb4.h

+2 −1
Original line number Diff line number Diff line
@@ -961,7 +961,8 @@ int c4iw_map_mr_sg(struct ib_mr *ibmr, 
		   struct scatterlist *sg,

		   int sg_nents);

int c4iw_dealloc_mw(struct ib_mw *mw);

struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type);

struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type,

			    struct ib_udata *udata);

struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start,

					   u64 length, u64 virt, int acc,

					   struct ib_udata *udata);

drivers/infiniband/hw/cxgb4/mem.c

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/moduleparam.h>

#include <rdma/ib_umem.h>

#include <linux/atomic.h>

#include <rdma/ib_user_verbs.h>



#include "iw_cxgb4.h"
@@ -552,7 +553,8 @@ struct ib_mr *c4iw_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
	return ERR_PTR(err);

}



struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type)

struct ib_mw *c4iw_alloc_mw(struct ib_pd *pd, enum ib_mw_type type,

			    struct ib_udata *udata)

{

	struct c4iw_dev *rhp;

	struct c4iw_pd *php;

drivers/infiniband/hw/mlx4/mlx4_ib.h

+2 −1
Original line number Diff line number Diff line
@@ -711,7 +711,8 @@ struct ib_mr *mlx4_ib_reg_user_mr(struct ib_pd *pd, u64 start, u64 length, 
				  u64 virt_addr, int access_flags,

				  struct ib_udata *udata);

int mlx4_ib_dereg_mr(struct ib_mr *mr);

struct ib_mw *mlx4_ib_alloc_mw(struct ib_pd *pd, enum ib_mw_type type);

struct ib_mw *mlx4_ib_alloc_mw(struct ib_pd *pd, enum ib_mw_type type,

			       struct ib_udata *udata);

int mlx4_ib_dealloc_mw(struct ib_mw *mw);

struct ib_mr *mlx4_ib_alloc_mr(struct ib_pd *pd,

			       enum ib_mr_type mr_type,