IB: Pass uverbs_attr_bundle down ib_x destroy path
The uverbs_attr_bundle with the ucontext is sent down to the drivers ib_x destroy path as ib_udata. The next patch will use the ib_udata to free the drivers destroy path from the dependency in 'uobject->context' as we already did for the create path. Signed-off-by: Shamir Rabinovitch <shamir.rabinovitch@oracle.com> Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
This commit is contained in:
Shamir Rabinovitch
committed by
Jason Gunthorpe
Jason Gunthorpe
parent
a6a3797df2
commit
c4367a2635
@@ -2396,13 +2396,13 @@ struct ib_device_ops {
|
||||
void (*disassociate_ucontext)(struct ib_ucontext *ibcontext);
|
||||
int (*alloc_pd)(struct ib_pd *pd, struct ib_ucontext *context,
|
||||
struct ib_udata *udata);
|
||||
void (*dealloc_pd)(struct ib_pd *pd);
|
||||
void (*dealloc_pd)(struct ib_pd *pd, struct ib_udata *udata);
|
||||
struct ib_ah *(*create_ah)(struct ib_pd *pd,
|
||||
struct rdma_ah_attr *ah_attr, u32 flags,
|
||||
struct ib_udata *udata);
|
||||
int (*modify_ah)(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
|
||||
int (*query_ah)(struct ib_ah *ah, struct rdma_ah_attr *ah_attr);
|
||||
int (*destroy_ah)(struct ib_ah *ah, u32 flags);
|
||||
int (*destroy_ah)(struct ib_ah *ah, u32 flags, struct ib_udata *udata);
|
||||
struct ib_srq *(*create_srq)(struct ib_pd *pd,
|
||||
struct ib_srq_init_attr *srq_init_attr,
|
||||
struct ib_udata *udata);
|
||||
@@ -2410,7 +2410,7 @@ struct ib_device_ops {
|
||||
enum ib_srq_attr_mask srq_attr_mask,
|
||||
struct ib_udata *udata);
|
||||
int (*query_srq)(struct ib_srq *srq, struct ib_srq_attr *srq_attr);
|
||||
int (*destroy_srq)(struct ib_srq *srq);
|
||||
int (*destroy_srq)(struct ib_srq *srq, struct ib_udata *udata);
|
||||
struct ib_qp *(*create_qp)(struct ib_pd *pd,
|
||||
struct ib_qp_init_attr *qp_init_attr,
|
||||
struct ib_udata *udata);
|
||||
@@ -2418,13 +2418,13 @@ struct ib_device_ops {
|
||||
int qp_attr_mask, struct ib_udata *udata);
|
||||
int (*query_qp)(struct ib_qp *qp, struct ib_qp_attr *qp_attr,
|
||||
int qp_attr_mask, struct ib_qp_init_attr *qp_init_attr);
|
||||
int (*destroy_qp)(struct ib_qp *qp);
|
||||
int (*destroy_qp)(struct ib_qp *qp, struct ib_udata *udata);
|
||||
struct ib_cq *(*create_cq)(struct ib_device *device,
|
||||
const struct ib_cq_init_attr *attr,
|
||||
struct ib_ucontext *context,
|
||||
struct ib_udata *udata);
|
||||
int (*modify_cq)(struct ib_cq *cq, u16 cq_count, u16 cq_period);
|
||||
int (*destroy_cq)(struct ib_cq *cq);
|
||||
int (*destroy_cq)(struct ib_cq *cq, struct ib_udata *udata);
|
||||
int (*resize_cq)(struct ib_cq *cq, int cqe, struct ib_udata *udata);
|
||||
struct ib_mr *(*get_dma_mr)(struct ib_pd *pd, int mr_access_flags);
|
||||
struct ib_mr *(*reg_user_mr)(struct ib_pd *pd, u64 start, u64 length,
|
||||
@@ -2433,9 +2433,9 @@ struct ib_device_ops {
|
||||
int (*rereg_user_mr)(struct ib_mr *mr, int flags, u64 start, u64 length,
|
||||
u64 virt_addr, int mr_access_flags,
|
||||
struct ib_pd *pd, struct ib_udata *udata);
|
||||
int (*dereg_mr)(struct ib_mr *mr);
|
||||
int (*dereg_mr)(struct ib_mr *mr, struct ib_udata *udata);
|
||||
struct ib_mr *(*alloc_mr)(struct ib_pd *pd, enum ib_mr_type mr_type,
|
||||
u32 max_num_sg);
|
||||
u32 max_num_sg, struct ib_udata *udata);
|
||||
int (*advise_mr)(struct ib_pd *pd,
|
||||
enum ib_uverbs_advise_mr_advice advice, u32 flags,
|
||||
struct ib_sge *sg_list, u32 num_sge,
|
||||
@@ -2458,7 +2458,7 @@ struct ib_device_ops {
|
||||
struct ib_xrcd *(*alloc_xrcd)(struct ib_device *device,
|
||||
struct ib_ucontext *ucontext,
|
||||
struct ib_udata *udata);
|
||||
int (*dealloc_xrcd)(struct ib_xrcd *xrcd);
|
||||
int (*dealloc_xrcd)(struct ib_xrcd *xrcd, struct ib_udata *udata);
|
||||
struct ib_flow *(*create_flow)(struct ib_qp *qp,
|
||||
struct ib_flow_attr *flow_attr,
|
||||
int domain, struct ib_udata *udata);
|
||||
@@ -2483,7 +2483,7 @@ struct ib_device_ops {
|
||||
struct ib_wq *(*create_wq)(struct ib_pd *pd,
|
||||
struct ib_wq_init_attr *init_attr,
|
||||
struct ib_udata *udata);
|
||||
int (*destroy_wq)(struct ib_wq *wq);
|
||||
int (*destroy_wq)(struct ib_wq *wq, struct ib_udata *udata);
|
||||
int (*modify_wq)(struct ib_wq *wq, struct ib_wq_attr *attr,
|
||||
u32 wq_attr_mask, struct ib_udata *udata);
|
||||
struct ib_rwq_ind_table *(*create_rwq_ind_table)(
|
||||
@@ -2495,7 +2495,7 @@ struct ib_device_ops {
|
||||
struct ib_ucontext *context,
|
||||
struct ib_dm_alloc_attr *attr,
|
||||
struct uverbs_attr_bundle *attrs);
|
||||
int (*dealloc_dm)(struct ib_dm *dm);
|
||||
int (*dealloc_dm)(struct ib_dm *dm, struct uverbs_attr_bundle *attrs);
|
||||
struct ib_mr *(*reg_dm_mr)(struct ib_pd *pd, struct ib_dm *dm,
|
||||
struct ib_dm_mr_attr *attr,
|
||||
struct uverbs_attr_bundle *attrs);
|
||||
@@ -3252,9 +3252,27 @@ enum ib_pd_flags {
|
||||
|
||||
struct ib_pd *__ib_alloc_pd(struct ib_device *device, unsigned int flags,
|
||||
const char *caller);
|
||||
|
||||
#define ib_alloc_pd(device, flags) \
|
||||
__ib_alloc_pd((device), (flags), KBUILD_MODNAME)
|
||||
void ib_dealloc_pd(struct ib_pd *pd);
|
||||
|
||||
/**
|
||||
* ib_dealloc_pd_user - Deallocate kernel/user PD
|
||||
* @pd: The protection domain
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
void ib_dealloc_pd_user(struct ib_pd *pd, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_dealloc_pd - Deallocate kernel PD
|
||||
* @pd: The protection domain
|
||||
*
|
||||
* NOTE: for user PD use ib_dealloc_pd_user with valid udata!
|
||||
*/
|
||||
static inline void ib_dealloc_pd(struct ib_pd *pd)
|
||||
{
|
||||
ib_dealloc_pd_user(pd, NULL);
|
||||
}
|
||||
|
||||
enum rdma_create_ah_flags {
|
||||
/* In a sleepable context */
|
||||
@@ -3367,11 +3385,24 @@ enum rdma_destroy_ah_flags {
|
||||
};
|
||||
|
||||
/**
|
||||
* rdma_destroy_ah - Destroys an address handle.
|
||||
* rdma_destroy_ah_user - Destroys an address handle.
|
||||
* @ah: The address handle to destroy.
|
||||
* @flags: Destroy address handle flags (see enum rdma_destroy_ah_flags).
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
int rdma_destroy_ah(struct ib_ah *ah, u32 flags);
|
||||
int rdma_destroy_ah_user(struct ib_ah *ah, u32 flags, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* rdma_destroy_ah - Destroys an kernel address handle.
|
||||
* @ah: The address handle to destroy.
|
||||
* @flags: Destroy address handle flags (see enum rdma_destroy_ah_flags).
|
||||
*
|
||||
* NOTE: for user ah use rdma_destroy_ah_user with valid udata!
|
||||
*/
|
||||
static inline int rdma_destroy_ah(struct ib_ah *ah, u32 flags)
|
||||
{
|
||||
return rdma_destroy_ah_user(ah, flags, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_create_srq - Creates a SRQ associated with the specified protection
|
||||
@@ -3415,10 +3446,22 @@ int ib_query_srq(struct ib_srq *srq,
|
||||
struct ib_srq_attr *srq_attr);
|
||||
|
||||
/**
|
||||
* ib_destroy_srq - Destroys the specified SRQ.
|
||||
* ib_destroy_srq_user - Destroys the specified SRQ.
|
||||
* @srq: The SRQ to destroy.
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
int ib_destroy_srq(struct ib_srq *srq);
|
||||
int ib_destroy_srq_user(struct ib_srq *srq, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_destroy_srq - Destroys the specified kernel SRQ.
|
||||
* @srq: The SRQ to destroy.
|
||||
*
|
||||
* NOTE: for user srq use ib_destroy_srq_user with valid udata!
|
||||
*/
|
||||
static inline int ib_destroy_srq(struct ib_srq *srq)
|
||||
{
|
||||
return ib_destroy_srq_user(srq, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_post_srq_recv - Posts a list of work requests to the specified SRQ.
|
||||
@@ -3438,15 +3481,34 @@ static inline int ib_post_srq_recv(struct ib_srq *srq,
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_create_qp - Creates a QP associated with the specified protection
|
||||
* ib_create_qp_user - Creates a QP associated with the specified protection
|
||||
* domain.
|
||||
* @pd: The protection domain associated with the QP.
|
||||
* @qp_init_attr: A list of initial attributes required to create the
|
||||
* QP. If QP creation succeeds, then the attributes are updated to
|
||||
* the actual capabilities of the created QP.
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
struct ib_qp *ib_create_qp(struct ib_pd *pd,
|
||||
struct ib_qp_init_attr *qp_init_attr);
|
||||
struct ib_qp *ib_create_qp_user(struct ib_pd *pd,
|
||||
struct ib_qp_init_attr *qp_init_attr,
|
||||
struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_create_qp - Creates a kernel QP associated with the specified protection
|
||||
* domain.
|
||||
* @pd: The protection domain associated with the QP.
|
||||
* @qp_init_attr: A list of initial attributes required to create the
|
||||
* QP. If QP creation succeeds, then the attributes are updated to
|
||||
* the actual capabilities of the created QP.
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*
|
||||
* NOTE: for user qp use ib_create_qp_user with valid udata!
|
||||
*/
|
||||
static inline struct ib_qp *ib_create_qp(struct ib_pd *pd,
|
||||
struct ib_qp_init_attr *qp_init_attr)
|
||||
{
|
||||
return ib_create_qp_user(pd, qp_init_attr, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_modify_qp_with_udata - Modifies the attributes for the specified QP.
|
||||
@@ -3496,8 +3558,20 @@ int ib_query_qp(struct ib_qp *qp,
|
||||
/**
|
||||
* ib_destroy_qp - Destroys the specified QP.
|
||||
* @qp: The QP to destroy.
|
||||
* @udata: Valid udata or NULL for kernel objects
|
||||
*/
|
||||
int ib_destroy_qp(struct ib_qp *qp);
|
||||
int ib_destroy_qp_user(struct ib_qp *qp, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_destroy_qp - Destroys the specified kernel QP.
|
||||
* @qp: The QP to destroy.
|
||||
*
|
||||
* NOTE: for user qp use ib_destroy_qp_user with valid udata!
|
||||
*/
|
||||
static inline int ib_destroy_qp(struct ib_qp *qp)
|
||||
{
|
||||
return ib_destroy_qp_user(qp, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_open_qp - Obtain a reference to an existing sharable QP.
|
||||
@@ -3557,13 +3631,66 @@ static inline int ib_post_recv(struct ib_qp *qp,
|
||||
return qp->device->ops.post_recv(qp, recv_wr, bad_recv_wr ? : &dummy);
|
||||
}
|
||||
|
||||
struct ib_cq *__ib_alloc_cq(struct ib_device *dev, void *private,
|
||||
int nr_cqe, int comp_vector,
|
||||
enum ib_poll_context poll_ctx, const char *caller);
|
||||
#define ib_alloc_cq(device, priv, nr_cqe, comp_vect, poll_ctx) \
|
||||
__ib_alloc_cq((device), (priv), (nr_cqe), (comp_vect), (poll_ctx), KBUILD_MODNAME)
|
||||
struct ib_cq *__ib_alloc_cq_user(struct ib_device *dev, void *private,
|
||||
int nr_cqe, int comp_vector,
|
||||
enum ib_poll_context poll_ctx,
|
||||
const char *caller, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_alloc_cq_user: Allocate kernel/user CQ
|
||||
* @dev: The IB device
|
||||
* @private: Private data attached to the CQE
|
||||
* @nr_cqe: Number of CQEs in the CQ
|
||||
* @comp_vector: Completion vector used for the IRQs
|
||||
* @poll_ctx: Context used for polling the CQ
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
static inline struct ib_cq *ib_alloc_cq_user(struct ib_device *dev,
|
||||
void *private, int nr_cqe,
|
||||
int comp_vector,
|
||||
enum ib_poll_context poll_ctx,
|
||||
struct ib_udata *udata)
|
||||
{
|
||||
return __ib_alloc_cq_user(dev, private, nr_cqe, comp_vector, poll_ctx,
|
||||
KBUILD_MODNAME, udata);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_alloc_cq: Allocate kernel CQ
|
||||
* @dev: The IB device
|
||||
* @private: Private data attached to the CQE
|
||||
* @nr_cqe: Number of CQEs in the CQ
|
||||
* @comp_vector: Completion vector used for the IRQs
|
||||
* @poll_ctx: Context used for polling the CQ
|
||||
*
|
||||
* NOTE: for user cq use ib_alloc_cq_user with valid udata!
|
||||
*/
|
||||
static inline struct ib_cq *ib_alloc_cq(struct ib_device *dev, void *private,
|
||||
int nr_cqe, int comp_vector,
|
||||
enum ib_poll_context poll_ctx)
|
||||
{
|
||||
return ib_alloc_cq_user(dev, private, nr_cqe, comp_vector, poll_ctx,
|
||||
NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_free_cq_user - Free kernel/user CQ
|
||||
* @cq: The CQ to free
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
void ib_free_cq_user(struct ib_cq *cq, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_free_cq - Free kernel CQ
|
||||
* @cq: The CQ to free
|
||||
*
|
||||
* NOTE: for user cq use ib_free_cq_user with valid udata!
|
||||
*/
|
||||
static inline void ib_free_cq(struct ib_cq *cq)
|
||||
{
|
||||
ib_free_cq_user(cq, NULL);
|
||||
}
|
||||
|
||||
void ib_free_cq(struct ib_cq *cq);
|
||||
int ib_process_cq_direct(struct ib_cq *cq, int budget);
|
||||
|
||||
/**
|
||||
@@ -3607,10 +3734,22 @@ int ib_resize_cq(struct ib_cq *cq, int cqe);
|
||||
int rdma_set_cq_moderation(struct ib_cq *cq, u16 cq_count, u16 cq_period);
|
||||
|
||||
/**
|
||||
* ib_destroy_cq - Destroys the specified CQ.
|
||||
* ib_destroy_cq_user - Destroys the specified CQ.
|
||||
* @cq: The CQ to destroy.
|
||||
* @udata: Valid user data or NULL for kernel objects
|
||||
*/
|
||||
int ib_destroy_cq(struct ib_cq *cq);
|
||||
int ib_destroy_cq_user(struct ib_cq *cq, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_destroy_cq - Destroys the specified kernel CQ.
|
||||
* @cq: The CQ to destroy.
|
||||
*
|
||||
* NOTE: for user cq use ib_destroy_cq_user with valid udata!
|
||||
*/
|
||||
static inline int ib_destroy_cq(struct ib_cq *cq)
|
||||
{
|
||||
return ib_destroy_cq_user(cq, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_poll_cq - poll a CQ for completion(s)
|
||||
@@ -3864,17 +4003,37 @@ static inline void ib_dma_free_coherent(struct ib_device *dev,
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_dereg_mr - Deregisters a memory region and removes it from the
|
||||
* ib_dereg_mr_user - Deregisters a memory region and removes it from the
|
||||
* HCA translation table.
|
||||
* @mr: The memory region to deregister.
|
||||
* @udata: Valid user data or NULL for kernel object
|
||||
*
|
||||
* This function can fail, if the memory region has memory windows bound to it.
|
||||
*/
|
||||
int ib_dereg_mr_user(struct ib_mr *mr, struct ib_udata *udata);
|
||||
|
||||
/**
|
||||
* ib_dereg_mr - Deregisters a kernel memory region and removes it from the
|
||||
* HCA translation table.
|
||||
* @mr: The memory region to deregister.
|
||||
*
|
||||
* This function can fail, if the memory region has memory windows bound to it.
|
||||
*
|
||||
* NOTE: for user mr use ib_dereg_mr_user with valid udata!
|
||||
*/
|
||||
int ib_dereg_mr(struct ib_mr *mr);
|
||||
static inline int ib_dereg_mr(struct ib_mr *mr)
|
||||
{
|
||||
return ib_dereg_mr_user(mr, NULL);
|
||||
}
|
||||
|
||||
struct ib_mr *ib_alloc_mr(struct ib_pd *pd,
|
||||
enum ib_mr_type mr_type,
|
||||
u32 max_num_sg);
|
||||
struct ib_mr *ib_alloc_mr_user(struct ib_pd *pd, enum ib_mr_type mr_type,
|
||||
u32 max_num_sg, struct ib_udata *udata);
|
||||
|
||||
static inline struct ib_mr *ib_alloc_mr(struct ib_pd *pd,
|
||||
enum ib_mr_type mr_type, u32 max_num_sg)
|
||||
{
|
||||
return ib_alloc_mr_user(pd, mr_type, max_num_sg, NULL);
|
||||
}
|
||||
|
||||
/**
|
||||
* ib_update_fast_reg_key - updates the key portion of the fast_reg MR
|
||||
@@ -3972,8 +4131,9 @@ struct ib_xrcd *__ib_alloc_xrcd(struct ib_device *device, const char *caller);
|
||||
/**
|
||||
* ib_dealloc_xrcd - Deallocates an XRC domain.
|
||||
* @xrcd: The XRC domain to deallocate.
|
||||
* @udata: Valid user data or NULL for kernel object
|
||||
*/
|
||||
int ib_dealloc_xrcd(struct ib_xrcd *xrcd);
|
||||
int ib_dealloc_xrcd(struct ib_xrcd *xrcd, struct ib_udata *udata);
|
||||
|
||||
static inline int ib_check_mr_access(int flags)
|
||||
{
|
||||
@@ -4049,7 +4209,7 @@ struct net_device *ib_device_netdev(struct ib_device *dev, u8 port);
|
||||
|
||||
struct ib_wq *ib_create_wq(struct ib_pd *pd,
|
||||
struct ib_wq_init_attr *init_attr);
|
||||
int ib_destroy_wq(struct ib_wq *wq);
|
||||
int ib_destroy_wq(struct ib_wq *wq, struct ib_udata *udata);
|
||||
int ib_modify_wq(struct ib_wq *wq, struct ib_wq_attr *attr,
|
||||
u32 wq_attr_mask);
|
||||
struct ib_rwq_ind_table *ib_create_rwq_ind_table(struct ib_device *device,
|
||||
|
||||
Reference in New Issue
Block a user