RDMA/hns: Add support for userspace Direct WQE
Subsystems (2)
cover RDMA/hns: Add support for userspace Direct WQE
Direct wqe is a mechanism to fill wqe directly into the hardware. In the case of light load, the wqe will be filled into pcie bar space of the hardware, this will reduce one memory access operation and therefore reduce the latency.
This series first refactor current uar mmap process to add branch for direct wqe, then the feature is enabled.
The related userspace series is named "libhns: Add support for direct WQE".
Xi Wang (1):
RDMA/hns: Refactor hns uar mmap flow
Yixing Liu (1):
RDMA/hns: Support direct WQE of userspace
drivers/infiniband/hw/hns/hns_roce_device.h | 7 ++- drivers/infiniband/hw/hns/hns_roce_main.c | 72 +++++++++++++++++++++++++++-- drivers/infiniband/hw/hns/hns_roce_pd.c | 8 +++- drivers/infiniband/hw/hns/hns_roce_qp.c | 5 ++ include/uapi/rdma/hns-abi.h | 6 +++ 5 files changed, 89 insertions(+), 9 deletions(-)
Signature · 1 line
2.7.4
PATCH 1/2 RDMA/hns: Refactor hns uar mmap flow
From: Xi Wang <[email protected]>
Classify the uar address by wrapping the uar type and start page as offset for hns rdma io mmap.
--- drivers/infiniband/hw/hns/hns_roce_main.c | 27 ++++++++++++++++++++++++--- include/uapi/rdma/hns-abi.h | 4 ++++ 2 files changed, 28 insertions(+), 3 deletions(-)
drivers/infiniband/hw/hns/hns_roce_main.c +24 -3
@@ -338,12 +338,23 @@ static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext)hns_roce_uar_free (to_hr_dev (ibcontext->device), &context->uar); } -static int hns_roce_mmap (struct ib_ucontext *context, -struct vm_area_struct *vma) +/* command value is offset[15:8] */ +static inline int hns_roce_mmap_get_command (unsigned long offset) +{ +return (offset >>8 ) &0xff ; +} + +/* index value is offset[63:16] | offset[7:0] */ +static inline unsigned long hns_roce_mmap_get_index (unsigned long offset) +{ +return ((offset >>16 ) <<8 ) | (offset &0xff ); +} + +static int mmap_uar (struct ib_ucontext *context,struct vm_area_struct *vma) {struct hns_roce_dev *hr_dev =to_hr_dev (context->device); -switch (vma->vm_pgoff) { +switch (hns_roce_mmap_get_index (vma->vm_pgoff)) {case 0 : return rdma_user_mmap_io(context, vma, to_hr_ucontext(context)->uar.pfn,
@@ -370,6 +381,16 @@ static int hns_roce_mmap(struct ib_ucontext *context, } } +static int hns_roce_mmap (struct ib_ucontext *uctx,struct vm_area_struct *vma) +{ +switch (hns_roce_mmap_get_command (vma->vm_pgoff)) { +case HNS_ROCE_MMAP_REGULAR_PAGE : +return mmap_uar (uctx, vma); +default : +return -EINVAL ; + } +} +static int hns_roce_port_immutable (struct ib_device *ib_dev,u32 port_num,struct ib_port_immutable *immutable) {
include/uapi/rdma/hns-abi.h +4 -0
@@ -94,4 +94,8 @@ struct hns_roce_ib_alloc_pd_resp { __u32 pdn; }; +enum { +HNS_ROCE_MMAP_REGULAR_PAGE , +}; +#endif /* HNS_ABI_USER_H */
Signature · 1 line
2.7.4
Re: [PATCH for-next 1/2] RDMA/hns: Refactor hns uar mmap flow
Quoted 23 lines · Weihang Li
From: Xi Wang <[email protected]>
Classify the uar address by wrapping the uar type and start page as offset for hns rdma io mmap.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_main.c | 27 ++++++++++++++++++++++++--- include/uapi/rdma/hns-abi.h | 4 ++++ 2 files changed, 28 insertions(+), 3 deletions(-)drivers/infiniband/hw/hns/hns_roce_main.c +1
-2@@ -338,12 +338,23 @@ static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext)hns_roce_uar_free (to_hr_dev (ibcontext->device), &context->uar); } -static int hns_roce_mmap (struct ib_ucontext *context, -struct vm_area_struct *vma) +/* command value is offset[15:8] */
drivers/infiniband/hw/hns/hns_roce_main.c static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext) · line 351
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_main.c +10
-0+static inline int hns_roce_mmap_get_command (unsigned long offset) +{ +return (offset >>8 ) &0xff ; +} + +/* index value is offset[63:16] | offset[7:0] */ +static inline unsigned long hns_roce_mmap_get_index (unsigned long offset) +{ +return ((offset >>16 ) <<8 ) | (offset &0xff ); +}
Let's follow the common practice and don't introduce inline functions in .c files.
Thanks
Re: [PATCH for-next 1/2] RDMA/hns: Refactor hns uar mmap flow
Quoted 37 lines · Leon Romanovsky
Quoted 23 lines · Weihang Li
From: Xi Wang <[email protected]>
Classify the uar address by wrapping the uar type and start page as offset for hns rdma io mmap.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_main.c | 27 ++++++++++++++++++++++++--- include/uapi/rdma/hns-abi.h | 4 ++++ 2 files changed, 28 insertions(+), 3 deletions(-)drivers/infiniband/hw/hns/hns_roce_main.c +1
-2@@ -338,12 +338,23 @@ static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext)hns_roce_uar_free (to_hr_dev (ibcontext->device), &context->uar); } -static int hns_roce_mmap (struct ib_ucontext *context, -struct vm_area_struct *vma) +/* command value is offset[15:8] */ drivers/infiniband/hw/hns/hns_roce_main.c static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext) · line 351
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_main.c +10
-0+static inline int hns_roce_mmap_get_command (unsigned long offset) +{ +return (offset >>8 ) &0xff ; +} + +/* index value is offset[63:16] | offset[7:0] */ +static inline unsigned long hns_roce_mmap_get_index (unsigned long offset) +{ +return ((offset >>16 ) <<8 ) | (offset &0xff ); +}Let's follow the common practice and don't introduce inline functions in .c files.
Quoted 2 lines
Thanks
Sure, thanks.
Weihang
PATCH 2/2 RDMA/hns: Support direct WQE of userspace
In reply to Weihang LiFrom: Yixing Liu <[email protected]>
Enable direct WQE of userspace and add address mapping for it.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 7 ++-- drivers/infiniband/hw/hns/hns_roce_main.c | 59 +++++++++++++++++++++++++---- drivers/infiniband/hw/hns/hns_roce_pd.c | 8 +++- drivers/infiniband/hw/hns/hns_roce_qp.c | 5 +++ include/uapi/rdma/hns-abi.h | 2 + 5 files changed, 68 insertions(+), 13 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +3 -4
@@ -187,6 +187,7 @@ enum {HNS_ROCE_CAP_FLAG_FRMR =BIT (8 ),HNS_ROCE_CAP_FLAG_QP_FLOW_CTRL =BIT (9 ),HNS_ROCE_CAP_FLAG_ATOMIC =BIT (10 ), +HNS_ROCE_CAP_FLAG_DIRECT_WQE =BIT (12 ),HNS_ROCE_CAP_FLAG_SDI_MODE =BIT (14 ), HNS_ROCE_CAP_FLAG_STASH = BIT(17), };
@@ -226,6 +227,7 @@ enum {struct hns_roce_uar {u64 pfn; +u64 dwqe_page;unsigned long index;unsigned long logic_idx; };
@@ -608,10 +610,6 @@ struct hns_roce_work {u32 queue_num; }; -enum { -HNS_ROCE_QP_CAP_DIRECT_WQE =BIT (5 ), -}; -struct hns_roce_qp {struct ib_qp ibqp;struct hns_roce_wq rq;
@@ -656,6 +654,7 @@ struct hns_roce_qp {struct list_head node;/* all qps are on a list */ struct list_head rq_node;/* all recv qps are on a list */ struct list_head sq_node;/* all send qps are on a list */ +bool has_mmaped;/* mark qp of direct wqe */ };struct hns_roce_ib_iboe {
drivers/infiniband/hw/hns/hns_roce_main.c +52 -7
77 lines not on this page · raw message
drivers/infiniband/hw/hns/hns_roce_pd.c +6 -2
@@ -112,8 +112,12 @@ int hns_roce_uar_alloc(struct hns_roce_dev *hr_dev, struct hns_roce_uar *uar) } uar->pfn = ((res->start) >>PAGE_SHIFT ) + uar->index; }else { - uar->pfn = ((pci_resource_start (hr_dev->pci_dev,2 )) - >>PAGE_SHIFT ); + uar->pfn =pci_resource_start (hr_dev->pci_dev,2 ) >>PAGE_SHIFT ; + +if (hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_DIRECT_WQE ) + uar->dwqe_page = +pci_resource_start (hr_dev->pci_dev,4 ) >> +PAGE_SHIFT ; }return 0 ;
drivers/infiniband/hw/hns/hns_roce_qp.c +5 -0
@@ -768,6 +768,10 @@ static int alloc_qp_buf(struct hns_roce_dev *hr_dev, struct hns_roce_qp *hr_qp, goto err_inline; } +if ((PAGE_SIZE <=HNS_ROCE_DWQE_SIZE ) && + hr_dev->caps.flags &HNS_ROCE_CAP_FLAG_DIRECT_WQE ) + hr_qp->en_flags |=HNS_ROCE_QP_CAP_DIRECT_WQE ; +return 0 ; err_inline:free_rq_inline_buf (hr_qp);
@@ -1060,6 +1064,7 @@ static int hns_roce_create_qp_common(struct hns_roce_dev *hr_dev, }if (udata) { + resp.cap_flags = hr_qp->en_flags; ret =ib_copy_to_udata (udata, &resp,min (udata->outlen,sizeof (resp)));if (ret) {
include/uapi/rdma/hns-abi.h +2 -0
@@ -77,6 +77,7 @@ enum hns_roce_qp_cap_flags {HNS_ROCE_QP_CAP_RQ_RECORD_DB =1 <<0 ,HNS_ROCE_QP_CAP_SQ_RECORD_DB =1 <<1 ,HNS_ROCE_QP_CAP_OWNER_DB =1 <<2 , + HNS_ROCE_QP_CAP_DIRECT_WQE = 1 << 5, }; struct hns_roce_ib_create_qp_resp {
@@ -96,6 +97,7 @@ struct hns_roce_ib_alloc_pd_resp {enum {HNS_ROCE_MMAP_REGULAR_PAGE , +HNS_ROCE_MMAP_DWQE_PAGE , };#endif /* HNS_ABI_USER_H */
Signature · 1 line
2.7.4