Commit ff6acd69 authored by Dennis Dalessandro's avatar Dennis Dalessandro Committed by Doug Ledford
Browse files

IB/rdmavt: Add device structure allocation 



This patch adds rdmavt device structure allocation in rdamvt. The
ib_device alloc is now done in rdmavt instead of the driver. Drivers
need to tell rdmavt the number of ports when calling.

A side of effect of this patch is fixing a bug with port initialization
where the device structure port array was allocated over top of an
existing one.

Reviewed-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarDennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: default avatarDoug Ledford <dledford@redhat.com>
parent e85ec33d

drivers/infiniband/sw/rdmavt/vt.c

+18 −12
Original line number Diff line number Diff line
@@ -67,6 +67,24 @@ static void rvt_cleanup(void) 
}

module_exit(rvt_cleanup);



struct rvt_dev_info *rvt_alloc_device(size_t size, int nports)

{

	struct rvt_dev_info *rdi = ERR_PTR(-ENOMEM);



	rdi = (struct rvt_dev_info *)ib_alloc_device(size);

	if (!rdi)

		return rdi;



	rdi->ports = kcalloc(nports,

			     sizeof(struct rvt_ibport **),

			     GFP_KERNEL);

	if (!rdi->ports)

		ib_dealloc_device(&rdi->ibdev);



	return rdi;

}

EXPORT_SYMBOL(rvt_alloc_device);



static int rvt_query_device(struct ib_device *ibdev,

			    struct ib_device_attr *props,

			    struct ib_udata *uhw)
@@ -434,18 +452,6 @@ EXPORT_SYMBOL(rvt_unregister_device); 
int rvt_init_port(struct rvt_dev_info *rdi, struct rvt_ibport *port,

		  int portnum, u16 *pkey_table)

{

	if (!rdi->dparms.nports) {

		rvt_pr_err(rdi, "Driver says it has no ports.\n");

		return -EINVAL;

	}



	rdi->ports = kcalloc(rdi->dparms.nports,

			     sizeof(struct rvt_ibport **),

			     GFP_KERNEL);

	if (!rdi->ports) {

		rvt_pr_err(rdi, "Could not allocate port mem.\n");

		return -ENOMEM;

	}



	rdi->ports[portnum] = port;

	rdi->ports[portnum]->pkey_table = pkey_table;

include/rdma/rdma_vt.h

+1 −0
Original line number Diff line number Diff line
@@ -394,6 +394,7 @@ static inline struct rvt_qp *rvt_lookup_qpn(struct rvt_dev_info *rdi, 
	return qp;

}



struct rvt_dev_info *rvt_alloc_device(size_t size, int nports);

int rvt_register_device(struct rvt_dev_info *rvd);

void rvt_unregister_device(struct rvt_dev_info *rvd);

int rvt_check_ah(struct ib_device *ibdev, struct ib_ah_attr *ah_attr);

CRA Git | Maintained and supported by SUSTech CRA and CCSE