diff mbox series

[v2,for-next] RDMA/hns: Add a new mmap implementation

Message ID 20211012124155.12329-1-liangwenpeng@huawei.com (mailing list archive)
State Superseded
Delegated to: Jason Gunthorpe
Headers show
Series [v2,for-next] RDMA/hns: Add a new mmap implementation | expand

Commit Message

Wenpeng Liang Oct. 12, 2021, 12:41 p.m. UTC 
From: Chengchang Tang <tangchengchang@huawei.com>

Add a new implementation for mmap by using the new mmap entry API.

The new implementation prepares for subsequent features and is compatible
with the old implementation. And the old implementation using hard-coded
offset will not be extended in the future.

Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
---
 drivers/infiniband/hw/hns/hns_roce_device.h |  23 +++
 drivers/infiniband/hw/hns/hns_roce_main.c   | 208 +++++++++++++++++---
 include/uapi/rdma/hns-abi.h                 |  21 +-
 3 files changed, 225 insertions(+), 27 deletions(-)

Comments

Jason Gunthorpe Oct. 20, 2021, 11:15 p.m. UTC | #1 
On Tue, Oct 12, 2021 at 08:41:55PM +0800, Wenpeng Liang wrote:
> From: Chengchang Tang <tangchengchang@huawei.com>
> 
> Add a new implementation for mmap by using the new mmap entry API.
> 
> The new implementation prepares for subsequent features and is compatible
> with the old implementation. And the old implementation using hard-coded
> offset will not be extended in the future.
> 
> Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
>  drivers/infiniband/hw/hns/hns_roce_device.h |  23 +++
>  drivers/infiniband/hw/hns/hns_roce_main.c   | 208 +++++++++++++++++---
>  include/uapi/rdma/hns-abi.h                 |  21 +-
>  3 files changed, 225 insertions(+), 27 deletions(-)
> 
> diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
> index 9467c39e3d28..1d4cf3f083c2 100644
> +++ b/drivers/infiniband/hw/hns/hns_roce_device.h
> @@ -225,11 +225,25 @@ struct hns_roce_uar {
>  	unsigned long	logic_idx;
>  };
>  
> +struct hns_user_mmap_entry {
> +	struct rdma_user_mmap_entry rdma_entry;
> +	u64 address;
> +	u8 mmap_flag;

Call this mmap_type and use the enum:

 enum hns_roce_mmap_type mmap_type

> +struct hns_user_mmap_entry *hns_roce_user_mmap_entry_insert(
> +				struct ib_ucontext *ucontext, u64 address,
> +				size_t length, u8 mmap_flag)
> +{
> +#define HNS_ROCE_PGOFFSET_TPTR 1
> +#define HNS_ROCE_PGOFFSET_DB 0
> +	struct hns_roce_ucontext *context = to_hr_ucontext(ucontext);
> +	struct hns_user_mmap_entry *entry;
> +	int ret;
> +
> +	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
> +	if (!entry)
> +		return NULL;
> +
> +	entry->address = address;
> +	entry->mmap_flag = mmap_flag;
> +
> +	if (context->mmap_key_support) {
> +		ret = rdma_user_mmap_entry_insert(ucontext, &entry->rdma_entry,
> +						  length);
> +	} else {
> +		switch (mmap_flag) {
> +		case HNS_ROCE_MMAP_TYPE_DB:
> +			ret = rdma_user_mmap_entry_insert_range(ucontext,
> +						&entry->rdma_entry, length,
> +						HNS_ROCE_PGOFFSET_DB,
> +						HNS_ROCE_PGOFFSET_DB);

Please add this to avoid the odd #defines:

static inline int
rdma_user_mmap_entry_insert_exact(struct ib_ucontext *ucontext,
                                  struct rdma_user_mmap_entry *entry,
                                  size_t length, u32 pgoff)
{
        return rdma_user_mmap_entry_insert_range(ucontext, entry, length, pgoff,
                                                 pgoff);
}

> -static int hns_roce_mmap(struct ib_ucontext *context,
> -			 struct vm_area_struct *vma)
> +static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma)
>  {
> -	struct hns_roce_dev *hr_dev = to_hr_dev(context->device);
> -
> -	switch (vma->vm_pgoff) {
> -	case 0:
> -		return rdma_user_mmap_io(context, vma,
> -					 to_hr_ucontext(context)->uar.pfn,
> -					 PAGE_SIZE,
> -					 pgprot_noncached(vma->vm_page_prot),
> -					 NULL);
> -
> -	/* vm_pgoff: 1 -- TPTR */
> -	case 1:
> -		if (!hr_dev->tptr_dma_addr || !hr_dev->tptr_size)
> -			return -EINVAL;
> +	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
> +	struct ib_device *ibdev = &hr_dev->ib_dev;
> +	struct rdma_user_mmap_entry *rdma_entry;
> +	struct hns_user_mmap_entry *entry;
> +	phys_addr_t pfn;
> +	pgprot_t prot;
> +	int ret;
> +
> +	rdma_entry = rdma_user_mmap_entry_get_pgoff(uctx, vma->vm_pgoff);
> +	if (!rdma_entry) {
> +		ibdev_err(ibdev, "Invalid entry vm_pgoff %lu.\n",
> +			  vma->vm_pgoff);
> +		return -EINVAL;
> +	}
> +
> +	entry = to_hns_mmap(rdma_entry);
> +	pfn = entry->address >> PAGE_SHIFT;
> +	prot = vma->vm_page_prot;

Just write

 if (entry->mmap_type != HNS_ROCE_MMAP_TYPE_TPTR)
    prot = pgprot_noncached(prot);
 ret = rdma_user_mmap_io(uctx, vma, pfn,
			rdma_entry->npages * PAGE_SIZE,
			pgprot_noncached(prot), rdma_entry);

No need for the big case statement

> diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
> index 42b177655560..ce1e39f21d73 100644
> +++ b/include/uapi/rdma/hns-abi.h
> @@ -83,11 +83,30 @@ struct hns_roce_ib_create_qp_resp {
>  	__aligned_u64 cap_flags;
>  };
>  
> +enum hns_roce_alloc_uctx_comp_flag {
> +	HNS_ROCE_ALLOC_UCTX_COMP_CONFIG = 1 << 0,
> +};
> +
> +enum hns_roce_alloc_uctx_resp_config {
> +	HNS_ROCE_UCTX_RESP_MMAP_KEY_EN = 1 << 0,
> +};
> +
> +enum hns_roce_alloc_uctx_req_config {
> +	HNS_ROCE_UCTX_REQ_MMAP_KEY_EN = 1 << 0,
> +};
> +
> +struct hns_roce_ib_alloc_ucontext {
> +	__u32 comp;
> +	__u32 config;
> +};
> +
>  struct hns_roce_ib_alloc_ucontext_resp {
>  	__u32	qp_tab_size;
>  	__u32	cqe_size;
>  	__u32	srq_tab_size;
> -	__u32	reserved;
> +	__u8    config;
> +	__u8    rsv[3];
> +	__aligned_u64 db_mmap_key;

I'm confused, this doesn't change the uAPI, so why add this stuff?
This should go in a later patch?

Jason
Wenpeng Liang Oct. 22, 2021, 8:56 a.m. UTC | #2 
On 2021/10/21 7:15, Jason Gunthorpe wrote:
> On Tue, Oct 12, 2021 at 08:41:55PM +0800, Wenpeng Liang wrote:
>> From: Chengchang Tang <tangchengchang@huawei.com>
>>
>> Add a new implementation for mmap by using the new mmap entry API.
>>
>> The new implementation prepares for subsequent features and is compatible
>> with the old implementation. And the old implementation using hard-coded
>> offset will not be extended in the future.
>>
>> Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
>> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
>>  drivers/infiniband/hw/hns/hns_roce_device.h |  23 +++
>>  drivers/infiniband/hw/hns/hns_roce_main.c   | 208 +++++++++++++++++---
>>  include/uapi/rdma/hns-abi.h                 |  21 +-
>>  3 files changed, 225 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
>> index 9467c39e3d28..1d4cf3f083c2 100644
>> +++ b/drivers/infiniband/hw/hns/hns_roce_device.h
>> @@ -225,11 +225,25 @@ struct hns_roce_uar {
>>  	unsigned long	logic_idx;
>>  };
>>  
>> +struct hns_user_mmap_entry {
>> +	struct rdma_user_mmap_entry rdma_entry;
>> +	u64 address;
>> +	u8 mmap_flag;
> 
> Call this mmap_type and use the enum:
> 
>  enum hns_roce_mmap_type mmap_type
> 

I will fix it in v3, thanks!

>> +struct hns_user_mmap_entry *hns_roce_user_mmap_entry_insert(
>> +				struct ib_ucontext *ucontext, u64 address,
>> +				size_t length, u8 mmap_flag)
>> +{
>> +#define HNS_ROCE_PGOFFSET_TPTR 1
>> +#define HNS_ROCE_PGOFFSET_DB 0
>> +	struct hns_roce_ucontext *context = to_hr_ucontext(ucontext);
>> +	struct hns_user_mmap_entry *entry;
>> +	int ret;
>> +
>> +	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
>> +	if (!entry)
>> +		return NULL;
>> +
>> +	entry->address = address;
>> +	entry->mmap_flag = mmap_flag;
>> +
>> +	if (context->mmap_key_support) {
>> +		ret = rdma_user_mmap_entry_insert(ucontext, &entry->rdma_entry,
>> +						  length);
>> +	} else {
>> +		switch (mmap_flag) {
>> +		case HNS_ROCE_MMAP_TYPE_DB:
>> +			ret = rdma_user_mmap_entry_insert_range(ucontext,
>> +						&entry->rdma_entry, length,
>> +						HNS_ROCE_PGOFFSET_DB,
>> +						HNS_ROCE_PGOFFSET_DB);
> 
> Please add this to avoid the odd #defines:
> 
> static inline int
> rdma_user_mmap_entry_insert_exact(struct ib_ucontext *ucontext,
>                                   struct rdma_user_mmap_entry *entry,
>                                   size_t length, u32 pgoff)
> {
>         return rdma_user_mmap_entry_insert_range(ucontext, entry, length, pgoff,
>                                                  pgoff);
> }
> 

ditto.

>> -static int hns_roce_mmap(struct ib_ucontext *context,
>> -			 struct vm_area_struct *vma)
>> +static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma)
>>  {
>> -	struct hns_roce_dev *hr_dev = to_hr_dev(context->device);
>> -
>> -	switch (vma->vm_pgoff) {
>> -	case 0:
>> -		return rdma_user_mmap_io(context, vma,
>> -					 to_hr_ucontext(context)->uar.pfn,
>> -					 PAGE_SIZE,
>> -					 pgprot_noncached(vma->vm_page_prot),
>> -					 NULL);
>> -
>> -	/* vm_pgoff: 1 -- TPTR */
>> -	case 1:
>> -		if (!hr_dev->tptr_dma_addr || !hr_dev->tptr_size)
>> -			return -EINVAL;
>> +	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
>> +	struct ib_device *ibdev = &hr_dev->ib_dev;
>> +	struct rdma_user_mmap_entry *rdma_entry;
>> +	struct hns_user_mmap_entry *entry;
>> +	phys_addr_t pfn;
>> +	pgprot_t prot;
>> +	int ret;
>> +
>> +	rdma_entry = rdma_user_mmap_entry_get_pgoff(uctx, vma->vm_pgoff);
>> +	if (!rdma_entry) {
>> +		ibdev_err(ibdev, "Invalid entry vm_pgoff %lu.\n",
>> +			  vma->vm_pgoff);
>> +		return -EINVAL;
>> +	}
>> +
>> +	entry = to_hns_mmap(rdma_entry);
>> +	pfn = entry->address >> PAGE_SHIFT;
>> +	prot = vma->vm_page_prot;
> 
> Just write
> 
>  if (entry->mmap_type != HNS_ROCE_MMAP_TYPE_TPTR)
>     prot = pgprot_noncached(prot);
>  ret = rdma_user_mmap_io(uctx, vma, pfn,
> 			rdma_entry->npages * PAGE_SIZE,
> 			pgprot_noncached(prot), rdma_entry);
> 
> No need for the big case statement
> 

There will be new features added to this switch branch in a later patch.

>> diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
>> index 42b177655560..ce1e39f21d73 100644
>> +++ b/include/uapi/rdma/hns-abi.h
>> @@ -83,11 +83,30 @@ struct hns_roce_ib_create_qp_resp {
>>  	__aligned_u64 cap_flags;
>>  };
>>  
>> +enum hns_roce_alloc_uctx_comp_flag {
>> +	HNS_ROCE_ALLOC_UCTX_COMP_CONFIG = 1 << 0,
>> +};
>> +
>> +enum hns_roce_alloc_uctx_resp_config {
>> +	HNS_ROCE_UCTX_RESP_MMAP_KEY_EN = 1 << 0,
>> +};
>> +
>> +enum hns_roce_alloc_uctx_req_config {
>> +	HNS_ROCE_UCTX_REQ_MMAP_KEY_EN = 1 << 0,
>> +};
>> +
>> +struct hns_roce_ib_alloc_ucontext {
>> +	__u32 comp;
>> +	__u32 config;
>> +};
>> +
>>  struct hns_roce_ib_alloc_ucontext_resp {
>>  	__u32	qp_tab_size;
>>  	__u32	cqe_size;
>>  	__u32	srq_tab_size;
>> -	__u32	reserved;
>> +	__u8    config;
>> +	__u8    rsv[3];
>> +	__aligned_u64 db_mmap_key;
> 
> I'm confused, this doesn't change the uAPI, so why add this stuff?
> This should go in a later patch?
> 
> Jason
> .
> 

The related userspace series is named "libhns: Add a new mmap implementation".

Thanks,
Wenpeng
Wenpeng Liang Oct. 22, 2021, 9:31 a.m. UTC | #3 
Sorry, the reply is incomplete, please ignore this email.

On 2021/10/22 16:56, Wenpeng Liang wrote:
> On 2021/10/21 7:15, Jason Gunthorpe wrote:
>> On Tue, Oct 12, 2021 at 08:41:55PM +0800, Wenpeng Liang wrote:
>>> From: Chengchang Tang <tangchengchang@huawei.com>
>>>
>>> Add a new implementation for mmap by using the new mmap entry API.
>>>
>>> The new implementation prepares for subsequent features and is compatible
>>> with the old implementation. And the old implementation using hard-coded
>>> offset will not be extended in the future.
>>>
>>> Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
>>> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
>>>  drivers/infiniband/hw/hns/hns_roce_device.h |  23 +++
>>>  drivers/infiniband/hw/hns/hns_roce_main.c   | 208 +++++++++++++++++---
>>>  include/uapi/rdma/hns-abi.h                 |  21 +-
>>>  3 files changed, 225 insertions(+), 27 deletions(-)
>>>
>>> diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
>>> index 9467c39e3d28..1d4cf3f083c2 100644
>>> +++ b/drivers/infiniband/hw/hns/hns_roce_device.h
>>> @@ -225,11 +225,25 @@ struct hns_roce_uar {
>>>  	unsigned long	logic_idx;
>>>  };
>>>  
>>> +struct hns_user_mmap_entry {
>>> +	struct rdma_user_mmap_entry rdma_entry;
>>> +	u64 address;
>>> +	u8 mmap_flag;
>>
>> Call this mmap_type and use the enum:
>>
>>  enum hns_roce_mmap_type mmap_type
>>
> 
> I will fix it in v3, thanks!
> 
>>> +struct hns_user_mmap_entry *hns_roce_user_mmap_entry_insert(
>>> +				struct ib_ucontext *ucontext, u64 address,
>>> +				size_t length, u8 mmap_flag)
>>> +{
>>> +#define HNS_ROCE_PGOFFSET_TPTR 1
>>> +#define HNS_ROCE_PGOFFSET_DB 0
>>> +	struct hns_roce_ucontext *context = to_hr_ucontext(ucontext);
>>> +	struct hns_user_mmap_entry *entry;
>>> +	int ret;
>>> +
>>> +	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
>>> +	if (!entry)
>>> +		return NULL;
>>> +
>>> +	entry->address = address;
>>> +	entry->mmap_flag = mmap_flag;
>>> +
>>> +	if (context->mmap_key_support) {
>>> +		ret = rdma_user_mmap_entry_insert(ucontext, &entry->rdma_entry,
>>> +						  length);
>>> +	} else {
>>> +		switch (mmap_flag) {
>>> +		case HNS_ROCE_MMAP_TYPE_DB:
>>> +			ret = rdma_user_mmap_entry_insert_range(ucontext,
>>> +						&entry->rdma_entry, length,
>>> +						HNS_ROCE_PGOFFSET_DB,
>>> +						HNS_ROCE_PGOFFSET_DB);
>>
>> Please add this to avoid the odd #defines:
>>
>> static inline int
>> rdma_user_mmap_entry_insert_exact(struct ib_ucontext *ucontext,
>>                                   struct rdma_user_mmap_entry *entry,
>>                                   size_t length, u32 pgoff)
>> {
>>         return rdma_user_mmap_entry_insert_range(ucontext, entry, length, pgoff,
>>                                                  pgoff);
>> }
>>
> 
> ditto.
> 
>>> -static int hns_roce_mmap(struct ib_ucontext *context,
>>> -			 struct vm_area_struct *vma)
>>> +static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma)
>>>  {
>>> -	struct hns_roce_dev *hr_dev = to_hr_dev(context->device);
>>> -
>>> -	switch (vma->vm_pgoff) {
>>> -	case 0:
>>> -		return rdma_user_mmap_io(context, vma,
>>> -					 to_hr_ucontext(context)->uar.pfn,
>>> -					 PAGE_SIZE,
>>> -					 pgprot_noncached(vma->vm_page_prot),
>>> -					 NULL);
>>> -
>>> -	/* vm_pgoff: 1 -- TPTR */
>>> -	case 1:
>>> -		if (!hr_dev->tptr_dma_addr || !hr_dev->tptr_size)
>>> -			return -EINVAL;
>>> +	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
>>> +	struct ib_device *ibdev = &hr_dev->ib_dev;
>>> +	struct rdma_user_mmap_entry *rdma_entry;
>>> +	struct hns_user_mmap_entry *entry;
>>> +	phys_addr_t pfn;
>>> +	pgprot_t prot;
>>> +	int ret;
>>> +
>>> +	rdma_entry = rdma_user_mmap_entry_get_pgoff(uctx, vma->vm_pgoff);
>>> +	if (!rdma_entry) {
>>> +		ibdev_err(ibdev, "Invalid entry vm_pgoff %lu.\n",
>>> +			  vma->vm_pgoff);
>>> +		return -EINVAL;
>>> +	}
>>> +
>>> +	entry = to_hns_mmap(rdma_entry);
>>> +	pfn = entry->address >> PAGE_SHIFT;
>>> +	prot = vma->vm_page_prot;
>>
>> Just write
>>
>>  if (entry->mmap_type != HNS_ROCE_MMAP_TYPE_TPTR)
>>     prot = pgprot_noncached(prot);
>>  ret = rdma_user_mmap_io(uctx, vma, pfn,
>> 			rdma_entry->npages * PAGE_SIZE,
>> 			pgprot_noncached(prot), rdma_entry);
>>
>> No need for the big case statement
>>
> 
> There will be new features added to this switch branch in a later patch.
> 
>>> diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
>>> index 42b177655560..ce1e39f21d73 100644
>>> +++ b/include/uapi/rdma/hns-abi.h
>>> @@ -83,11 +83,30 @@ struct hns_roce_ib_create_qp_resp {
>>>  	__aligned_u64 cap_flags;
>>>  };
>>>  
>>> +enum hns_roce_alloc_uctx_comp_flag {
>>> +	HNS_ROCE_ALLOC_UCTX_COMP_CONFIG = 1 << 0,
>>> +};
>>> +
>>> +enum hns_roce_alloc_uctx_resp_config {
>>> +	HNS_ROCE_UCTX_RESP_MMAP_KEY_EN = 1 << 0,
>>> +};
>>> +
>>> +enum hns_roce_alloc_uctx_req_config {
>>> +	HNS_ROCE_UCTX_REQ_MMAP_KEY_EN = 1 << 0,
>>> +};
>>> +
>>> +struct hns_roce_ib_alloc_ucontext {
>>> +	__u32 comp;
>>> +	__u32 config;
>>> +};
>>> +
>>>  struct hns_roce_ib_alloc_ucontext_resp {
>>>  	__u32	qp_tab_size;
>>>  	__u32	cqe_size;
>>>  	__u32	srq_tab_size;
>>> -	__u32	reserved;
>>> +	__u8    config;
>>> +	__u8    rsv[3];
>>> +	__aligned_u64 db_mmap_key;
>>
>> I'm confused, this doesn't change the uAPI, so why add this stuff?
>> This should go in a later patch?
>>
>> Jason
>> .
>>
> 
> The related userspace series is named "libhns: Add a new mmap implementation".
> 
> Thanks,
> Wenpeng
> .
>
Wenpeng Liang Oct. 22, 2021, 9:46 a.m. UTC | #4 
On 2021/10/21 7:15, Jason Gunthorpe wrote:
> On Tue, Oct 12, 2021 at 08:41:55PM +0800, Wenpeng Liang wrote:
>> From: Chengchang Tang <tangchengchang@huawei.com>
>>
>> Add a new implementation for mmap by using the new mmap entry API.
>>
>> The new implementation prepares for subsequent features and is compatible
>> with the old implementation. And the old implementation using hard-coded
>> offset will not be extended in the future.
>>
>> Signed-off-by: Chengchang Tang <tangchengchang@huawei.com>
>> Signed-off-by: Wenpeng Liang <liangwenpeng@huawei.com>
>>  drivers/infiniband/hw/hns/hns_roce_device.h |  23 +++
>>  drivers/infiniband/hw/hns/hns_roce_main.c   | 208 +++++++++++++++++---
>>  include/uapi/rdma/hns-abi.h                 |  21 +-
>>  3 files changed, 225 insertions(+), 27 deletions(-)
>>
>> diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
>> index 9467c39e3d28..1d4cf3f083c2 100644
>> +++ b/drivers/infiniband/hw/hns/hns_roce_device.h
>> @@ -225,11 +225,25 @@ struct hns_roce_uar {
>>  	unsigned long	logic_idx;
>>  };
>>  
>> +struct hns_user_mmap_entry {
>> +	struct rdma_user_mmap_entry rdma_entry;
>> +	u64 address;
>> +	u8 mmap_flag;
> 
> Call this mmap_type and use the enum:
> 
>  enum hns_roce_mmap_type mmap_type
> 

I will fix it in v3, thanks!

>> +struct hns_user_mmap_entry *hns_roce_user_mmap_entry_insert(
>> +				struct ib_ucontext *ucontext, u64 address,
>> +				size_t length, u8 mmap_flag)
>> +{
>> +#define HNS_ROCE_PGOFFSET_TPTR 1
>> +#define HNS_ROCE_PGOFFSET_DB 0
>> +	struct hns_roce_ucontext *context = to_hr_ucontext(ucontext);
>> +	struct hns_user_mmap_entry *entry;
>> +	int ret;
>> +
>> +	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
>> +	if (!entry)
>> +		return NULL;
>> +
>> +	entry->address = address;
>> +	entry->mmap_flag = mmap_flag;
>> +
>> +	if (context->mmap_key_support) {
>> +		ret = rdma_user_mmap_entry_insert(ucontext, &entry->rdma_entry,
>> +						  length);
>> +	} else {
>> +		switch (mmap_flag) {
>> +		case HNS_ROCE_MMAP_TYPE_DB:
>> +			ret = rdma_user_mmap_entry_insert_range(ucontext,
>> +						&entry->rdma_entry, length,
>> +						HNS_ROCE_PGOFFSET_DB,
>> +						HNS_ROCE_PGOFFSET_DB);
> 
> Please add this to avoid the odd #defines:
> 
> static inline int
> rdma_user_mmap_entry_insert_exact(struct ib_ucontext *ucontext,
>                                   struct rdma_user_mmap_entry *entry,
>                                   size_t length, u32 pgoff)
> {
>         return rdma_user_mmap_entry_insert_range(ucontext, entry, length, pgoff,
>                                                  pgoff);
> }
> 

ditto.

>> -static int hns_roce_mmap(struct ib_ucontext *context,
>> -			 struct vm_area_struct *vma)
>> +static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma)
>>  {
>> -	struct hns_roce_dev *hr_dev = to_hr_dev(context->device);
>> -
>> -	switch (vma->vm_pgoff) {
>> -	case 0:
>> -		return rdma_user_mmap_io(context, vma,
>> -					 to_hr_ucontext(context)->uar.pfn,
>> -					 PAGE_SIZE,
>> -					 pgprot_noncached(vma->vm_page_prot),
>> -					 NULL);
>> -
>> -	/* vm_pgoff: 1 -- TPTR */
>> -	case 1:
>> -		if (!hr_dev->tptr_dma_addr || !hr_dev->tptr_size)
>> -			return -EINVAL;
>> +	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
>> +	struct ib_device *ibdev = &hr_dev->ib_dev;
>> +	struct rdma_user_mmap_entry *rdma_entry;
>> +	struct hns_user_mmap_entry *entry;
>> +	phys_addr_t pfn;
>> +	pgprot_t prot;
>> +	int ret;
>> +
>> +	rdma_entry = rdma_user_mmap_entry_get_pgoff(uctx, vma->vm_pgoff);
>> +	if (!rdma_entry) {
>> +		ibdev_err(ibdev, "Invalid entry vm_pgoff %lu.\n",
>> +			  vma->vm_pgoff);
>> +		return -EINVAL;
>> +	}
>> +
>> +	entry = to_hns_mmap(rdma_entry);
>> +	pfn = entry->address >> PAGE_SHIFT;
>> +	prot = vma->vm_page_prot;
> 
> Just write
> 
>  if (entry->mmap_type != HNS_ROCE_MMAP_TYPE_TPTR)
>     prot = pgprot_noncached(prot);
>  ret = rdma_user_mmap_io(uctx, vma, pfn,
> 			rdma_entry->npages * PAGE_SIZE,
> 			pgprot_noncached(prot), rdma_entry);
> 
> No need for the big case statement
> 

In the future, we will have multiple new features that will add
new branches to this switch. We hope to reduce the coupling
between subsequent patches, so we hope to keep this switch.

>> diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
>> index 42b177655560..ce1e39f21d73 100644
>> +++ b/include/uapi/rdma/hns-abi.h
>> @@ -83,11 +83,30 @@ struct hns_roce_ib_create_qp_resp {
>>  	__aligned_u64 cap_flags;
>>  };
>>  
>> +enum hns_roce_alloc_uctx_comp_flag {
>> +	HNS_ROCE_ALLOC_UCTX_COMP_CONFIG = 1 << 0,
>> +};
>> +
>> +enum hns_roce_alloc_uctx_resp_config {
>> +	HNS_ROCE_UCTX_RESP_MMAP_KEY_EN = 1 << 0,
>> +};
>> +
>> +enum hns_roce_alloc_uctx_req_config {
>> +	HNS_ROCE_UCTX_REQ_MMAP_KEY_EN = 1 << 0,
>> +};
>> +
>> +struct hns_roce_ib_alloc_ucontext {
>> +	__u32 comp;
>> +	__u32 config;
>> +};
>> +
>>  struct hns_roce_ib_alloc_ucontext_resp {
>>  	__u32	qp_tab_size;
>>  	__u32	cqe_size;
>>  	__u32	srq_tab_size;
>> -	__u32	reserved;
>> +	__u8    config;
>> +	__u8    rsv[3];
>> +	__aligned_u64 db_mmap_key;
> 
> I'm confused, this doesn't change the uAPI, so why add this stuff?
> This should go in a later patch?
> 
> Jason
> .
> 

The related userspace has also been modified, the link is:
https://www.spinics.net/lists/linux-rdma/msg106056.html

I don’t know if I understood your question correctly. These fields
are used for compatibility, so they are necessary. The user space
and kernel space of different versions are handshake through 'config'.

Thanks,
Wenpeng
Jason Gunthorpe Oct. 25, 2021, 12:55 p.m. UTC | #5 
On Fri, Oct 22, 2021 at 05:46:19PM +0800, Wenpeng Liang wrote:
> > Just write
> > 
> >  if (entry->mmap_type != HNS_ROCE_MMAP_TYPE_TPTR)
> >     prot = pgprot_noncached(prot);
> >  ret = rdma_user_mmap_io(uctx, vma, pfn,
> > 			rdma_entry->npages * PAGE_SIZE,
> > 			pgprot_noncached(prot), rdma_entry);
> > 
> > No need for the big case statement
> > 
> 
> In the future, we will have multiple new features that will add
> new branches to this switch. We hope to reduce the coupling
> between subsequent patches, so we hope to keep this switch.

Why? The only choice that should be made at mmap time is if this is
noncached or not - the address and everything else should be setup
during the creation of the entry.

> >>  struct hns_roce_ib_alloc_ucontext_resp {
> >>  	__u32	qp_tab_size;
> >>  	__u32	cqe_size;
> >>  	__u32	srq_tab_size;
> >> -	__u32	reserved;
> >> +	__u8    config;
> >> +	__u8    rsv[3];
> >> +	__aligned_u64 db_mmap_key;
> > 
> > I'm confused, this doesn't change the uAPI, so why add this stuff?
> > This should go in a later patch?
> > 
> 
> The related userspace has also been modified, the link is:
> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.spinics.net%2Flists%2Flinux-rdma%2Fmsg106056.html&amp;data=04%7C01%7Cjgg%40nvidia.com%7Cffac1b9f0afb458a4da308d99540ce99%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637704927843133708%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=BAszHlXQWWh%2F8hrb%2F8qEStm3VBrhvbMshfPN3pc6wKI%3D&amp;reserved=0
> 
> I don’t know if I understood your question correctly. These fields
> are used for compatibility, so they are necessary. The user space
> and kernel space of different versions are handshake through 'config'.

That is for later patches, this patch doesn't seem to change the uAPI
at all. The compat mmaps remain at the same offsets they were always
at, there is nothing to negotiate at this point.

Move it to a later series?

Jason
Wenpeng Liang Oct. 26, 2021, 1:02 p.m. UTC | #6 
On 2021/10/25 20:55, Jason Gunthorpe wrote:
> On Fri, Oct 22, 2021 at 05:46:19PM +0800, Wenpeng Liang wrote:
>>> Just write
>>>
>>>  if (entry->mmap_type != HNS_ROCE_MMAP_TYPE_TPTR)
>>>     prot = pgprot_noncached(prot);
>>>  ret = rdma_user_mmap_io(uctx, vma, pfn,
>>> 			rdma_entry->npages * PAGE_SIZE,
>>> 			pgprot_noncached(prot), rdma_entry);
>>>
>>> No need for the big case statement
>>>
>>
>> In the future, we will have multiple new features that will add
>> new branches to this switch. We hope to reduce the coupling
>> between subsequent patches, so we hope to keep this switch.
> 
> Why? The only choice that should be made at mmap time is if this is
> noncached or not - the address and everything else should be setup
> during the creation of the entry.
> 

Thanks for your comment, I will merge 'HNS_ROCE_MMAP_TYPE_TPTR' and
'HNS_ROCE_MMAP_TYPE_DB' into one statement in v3.

>>>>  struct hns_roce_ib_alloc_ucontext_resp {
>>>>  	__u32	qp_tab_size;
>>>>  	__u32	cqe_size;
>>>>  	__u32	srq_tab_size;
>>>> -	__u32	reserved;
>>>> +	__u8    config;
>>>> +	__u8    rsv[3];
>>>> +	__aligned_u64 db_mmap_key;
>>>
>>> I'm confused, this doesn't change the uAPI, so why add this stuff?
>>> This should go in a later patch?
>>>
>>
>> The related userspace has also been modified, the link is:
>> https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww.spinics.net%2Flists%2Flinux-rdma%2Fmsg106056.html&amp;data=04%7C01%7Cjgg%40nvidia.com%7Cffac1b9f0afb458a4da308d99540ce99%7C43083d15727340c1b7db39efd9ccc17a%7C0%7C0%7C637704927843133708%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=BAszHlXQWWh%2F8hrb%2F8qEStm3VBrhvbMshfPN3pc6wKI%3D&amp;reserved=0
>>
>> I don’t know if I understood your question correctly. These fields
>> are used for compatibility, so they are necessary. The user space
>> and kernel space of different versions are handshake through 'config'.
> 
> That is for later patches, this patch doesn't seem to change the uAPI
> at all. The compat mmaps remain at the same offsets they were always
> at, there is nothing to negotiate at this point.
> 
> Move it to a later series?
> 
> Jason
> .
> 

Thanks, I will remove it in v3.

Wenpeng
diff mbox series

Patch

diff --git a/drivers/infiniband/hw/hns/hns_roce_device.h b/drivers/infiniband/hw/hns/hns_roce_device.h
index 9467c39e3d28..1d4cf3f083c2 100644
--- a/drivers/infiniband/hw/hns/hns_roce_device.h
+++ b/drivers/infiniband/hw/hns/hns_roce_device.h
@@ -225,11 +225,25 @@  struct hns_roce_uar {
 	unsigned long	logic_idx;
 };
 
+struct hns_user_mmap_entry {
+	struct rdma_user_mmap_entry rdma_entry;
+	u64 address;
+	u8 mmap_flag;
+};
+
+enum hns_roce_mmap_type {
+	HNS_ROCE_MMAP_TYPE_DB = 1,
+	HNS_ROCE_MMAP_TYPE_TPTR,
+};
+
 struct hns_roce_ucontext {
 	struct ib_ucontext	ibucontext;
 	struct hns_roce_uar	uar;
 	struct list_head	page_list;
 	struct mutex		page_mutex;
+	bool			mmap_key_support;
+	struct hns_user_mmap_entry *db_mmap_entry;
+	struct hns_user_mmap_entry *tptr_mmap_entry;
 };
 
 struct hns_roce_pd {
@@ -1049,6 +1063,12 @@  static inline struct hns_roce_srq *to_hr_srq(struct ib_srq *ibsrq)
 	return container_of(ibsrq, struct hns_roce_srq, ibsrq);
 }
 
+static inline struct hns_user_mmap_entry *to_hns_mmap(
+		struct rdma_user_mmap_entry *rdma_entry)
+{
+	return container_of(rdma_entry, struct hns_user_mmap_entry, rdma_entry);
+}
+
 static inline void hns_roce_write64_k(__le32 val[2], void __iomem *dest)
 {
 	writeq(*(u64 *)val, dest);
@@ -1259,4 +1279,7 @@  int hns_roce_init(struct hns_roce_dev *hr_dev);
 void hns_roce_exit(struct hns_roce_dev *hr_dev);
 int hns_roce_fill_res_cq_entry(struct sk_buff *msg,
 			       struct ib_cq *ib_cq);
+struct hns_user_mmap_entry *hns_roce_user_mmap_entry_insert(
+				struct ib_ucontext *ucontext, u64 address,
+				size_t length, u8 mmap_flag);
 #endif /* _HNS_ROCE_DEVICE_H */
diff --git a/drivers/infiniband/hw/hns/hns_roce_main.c b/drivers/infiniband/hw/hns/hns_roce_main.c
index 5d39bd08582a..e1170d16feed 100644
--- a/drivers/infiniband/hw/hns/hns_roce_main.c
+++ b/drivers/infiniband/hw/hns/hns_roce_main.c
@@ -291,6 +291,126 @@  static int hns_roce_modify_device(struct ib_device *ib_dev, int mask,
 	return 0;
 }
 
+struct hns_user_mmap_entry *hns_roce_user_mmap_entry_insert(
+				struct ib_ucontext *ucontext, u64 address,
+				size_t length, u8 mmap_flag)
+{
+#define HNS_ROCE_PGOFFSET_TPTR 1
+#define HNS_ROCE_PGOFFSET_DB 0
+	struct hns_roce_ucontext *context = to_hr_ucontext(ucontext);
+	struct hns_user_mmap_entry *entry;
+	int ret;
+
+	entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+	if (!entry)
+		return NULL;
+
+	entry->address = address;
+	entry->mmap_flag = mmap_flag;
+
+	if (context->mmap_key_support) {
+		ret = rdma_user_mmap_entry_insert(ucontext, &entry->rdma_entry,
+						  length);
+	} else {
+		switch (mmap_flag) {
+		case HNS_ROCE_MMAP_TYPE_DB:
+			ret = rdma_user_mmap_entry_insert_range(ucontext,
+						&entry->rdma_entry, length,
+						HNS_ROCE_PGOFFSET_DB,
+						HNS_ROCE_PGOFFSET_DB);
+			break;
+		case HNS_ROCE_MMAP_TYPE_TPTR:
+			ret = rdma_user_mmap_entry_insert_range(ucontext,
+						&entry->rdma_entry, length,
+						HNS_ROCE_PGOFFSET_TPTR,
+						HNS_ROCE_PGOFFSET_TPTR);
+			break;
+		default:
+			ret = -EINVAL;
+		}
+
+	}
+	if (ret)
+		goto err;
+
+	return entry;
+
+err:
+	kfree(entry);
+	return NULL;
+}
+
+static void hns_roce_dealloc_uar_entry(struct hns_roce_ucontext *context)
+{
+	if (context->db_mmap_entry)
+		rdma_user_mmap_entry_remove(
+				&context->db_mmap_entry->rdma_entry);
+
+	if (context->tptr_mmap_entry)
+		rdma_user_mmap_entry_remove(
+				&context->tptr_mmap_entry->rdma_entry);
+}
+
+static int hns_roce_alloc_uar_entry(struct ib_ucontext *uctx)
+{
+	struct hns_roce_ucontext *context = to_hr_ucontext(uctx);
+	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
+	u64 address;
+	int ret;
+
+	address = context->uar.pfn << PAGE_SHIFT;
+	context->db_mmap_entry =
+		hns_roce_user_mmap_entry_insert(uctx, address, PAGE_SIZE,
+						HNS_ROCE_MMAP_TYPE_DB);
+	if (!context->db_mmap_entry)
+		return -ENOMEM;
+
+	if (!hr_dev->tptr_dma_addr || !hr_dev->tptr_size)
+		return 0;
+
+	context->tptr_mmap_entry =
+		hns_roce_user_mmap_entry_insert(uctx, hr_dev->tptr_dma_addr,
+						hr_dev->tptr_size,
+						HNS_ROCE_MMAP_TYPE_TPTR);
+	if (!context->tptr_mmap_entry) {
+		ret = -ENOMEM;
+		goto err;
+	}
+
+	return 0;
+
+err:
+	hns_roce_dealloc_uar_entry(context);
+	return ret;
+}
+
+static void ucontext_get_config(struct hns_roce_ucontext *context,
+				struct hns_roce_ib_alloc_ucontext *ucmd)
+{
+	struct hns_roce_dev *hr_dev = to_hr_dev(context->ibucontext.device);
+
+	if (ucmd->comp & HNS_ROCE_ALLOC_UCTX_COMP_CONFIG &&
+	    hr_dev->hw_rev != HNS_ROCE_HW_VER1)
+		context->mmap_key_support = ucmd->config &
+					    HNS_ROCE_UCTX_REQ_MMAP_KEY_EN;
+}
+
+static void ucontext_set_resp(struct hns_roce_ucontext *context,
+			      struct hns_roce_ib_alloc_ucontext_resp *resp)
+{
+	struct hns_roce_dev *hr_dev = to_hr_dev(context->ibucontext.device);
+	struct rdma_user_mmap_entry *rdma_entry;
+
+	resp->qp_tab_size = hr_dev->caps.num_qps;
+	resp->cqe_size = hr_dev->caps.cqe_sz;
+	resp->srq_tab_size = hr_dev->caps.num_srqs;
+	if (context->mmap_key_support) {
+		resp->config |= HNS_ROCE_UCTX_RESP_MMAP_KEY_EN;
+		rdma_entry = &context->db_mmap_entry->rdma_entry;
+		resp->db_mmap_key = rdma_user_mmap_get_offset(rdma_entry);
+	}
+}
+
 static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx,
 				   struct ib_udata *udata)
 {
@@ -298,24 +418,35 @@  static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx,
 	struct hns_roce_ucontext *context = to_hr_ucontext(uctx);
 	struct hns_roce_ib_alloc_ucontext_resp resp = {};
 	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
+	struct hns_roce_ib_alloc_ucontext ucmd = {};
 
 	if (!hr_dev->active)
 		return -EAGAIN;
 
-	resp.qp_tab_size = hr_dev->caps.num_qps;
-	resp.srq_tab_size = hr_dev->caps.num_srqs;
+	if (udata->inlen) {
+		ret = ib_copy_from_udata(&ucmd, udata,
+					 min(udata->inlen, sizeof(ucmd)));
+		if (ret)
+			return ret;
+	}
+
+	ucontext_get_config(context, &ucmd);
 
 	ret = hns_roce_uar_alloc(hr_dev, &context->uar);
 	if (ret)
 		goto error_fail_uar_alloc;
 
+	ret = hns_roce_alloc_uar_entry(uctx);
+	if (ret)
+		goto error_fail_uar_entry;
+
 	if (hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_CQ_RECORD_DB ||
 	    hr_dev->caps.flags & HNS_ROCE_CAP_FLAG_QP_RECORD_DB) {
 		INIT_LIST_HEAD(&context->page_list);
 		mutex_init(&context->page_mutex);
 	}
 
-	resp.cqe_size = hr_dev->caps.cqe_sz;
+	ucontext_set_resp(context, &resp);
 
 	ret = ib_copy_to_udata(udata, &resp,
 			       min(udata->outlen, sizeof(resp)));
@@ -325,6 +456,9 @@  static int hns_roce_alloc_ucontext(struct ib_ucontext *uctx,
 	return 0;
 
 error_fail_copy_to_udata:
+	hns_roce_dealloc_uar_entry(context);
+
+error_fail_uar_entry:
 	ida_free(&hr_dev->uar_ida.ida, (int)context->uar.logic_idx);
 
 error_fail_uar_alloc:
@@ -336,39 +470,60 @@  static void hns_roce_dealloc_ucontext(struct ib_ucontext *ibcontext)
 	struct hns_roce_ucontext *context = to_hr_ucontext(ibcontext);
 	struct hns_roce_dev *hr_dev = to_hr_dev(ibcontext->device);
 
+	hns_roce_dealloc_uar_entry(context);
+
 	ida_free(&hr_dev->uar_ida.ida, (int)context->uar.logic_idx);
 }
 
-static int hns_roce_mmap(struct ib_ucontext *context,
-			 struct vm_area_struct *vma)
+static int hns_roce_mmap(struct ib_ucontext *uctx, struct vm_area_struct *vma)
 {
-	struct hns_roce_dev *hr_dev = to_hr_dev(context->device);
-
-	switch (vma->vm_pgoff) {
-	case 0:
-		return rdma_user_mmap_io(context, vma,
-					 to_hr_ucontext(context)->uar.pfn,
-					 PAGE_SIZE,
-					 pgprot_noncached(vma->vm_page_prot),
-					 NULL);
-
-	/* vm_pgoff: 1 -- TPTR */
-	case 1:
-		if (!hr_dev->tptr_dma_addr || !hr_dev->tptr_size)
-			return -EINVAL;
+	struct hns_roce_dev *hr_dev = to_hr_dev(uctx->device);
+	struct ib_device *ibdev = &hr_dev->ib_dev;
+	struct rdma_user_mmap_entry *rdma_entry;
+	struct hns_user_mmap_entry *entry;
+	phys_addr_t pfn;
+	pgprot_t prot;
+	int ret;
+
+	rdma_entry = rdma_user_mmap_entry_get_pgoff(uctx, vma->vm_pgoff);
+	if (!rdma_entry) {
+		ibdev_err(ibdev, "Invalid entry vm_pgoff %lu.\n",
+			  vma->vm_pgoff);
+		return -EINVAL;
+	}
+
+	entry = to_hns_mmap(rdma_entry);
+	pfn = entry->address >> PAGE_SHIFT;
+	prot = vma->vm_page_prot;
+	switch (entry->mmap_flag) {
+	case HNS_ROCE_MMAP_TYPE_DB:
+		ret = rdma_user_mmap_io(uctx, vma, pfn,
+					rdma_entry->npages * PAGE_SIZE,
+					pgprot_noncached(prot), rdma_entry);
+		break;
+	case HNS_ROCE_MMAP_TYPE_TPTR:
 		/*
 		 * FIXME: using io_remap_pfn_range on the dma address returned
 		 * by dma_alloc_coherent is totally wrong.
 		 */
-		return rdma_user_mmap_io(context, vma,
-					 hr_dev->tptr_dma_addr >> PAGE_SHIFT,
-					 hr_dev->tptr_size,
-					 vma->vm_page_prot,
-					 NULL);
-
+		ret = rdma_user_mmap_io(uctx, vma, pfn,
+					rdma_entry->npages * PAGE_SIZE,
+					vma->vm_page_prot, rdma_entry);
+		break;
 	default:
-		return -EINVAL;
+		ret = -EINVAL;
 	}
+
+	rdma_user_mmap_entry_put(rdma_entry);
+
+	return ret;
+}
+
+static void hns_roce_free_mmap(struct rdma_user_mmap_entry *rdma_entry)
+{
+	struct hns_user_mmap_entry *entry = to_hns_mmap(rdma_entry);
+
+	kfree(entry);
 }
 
 static int hns_roce_port_immutable(struct ib_device *ib_dev, u32 port_num,
@@ -444,6 +599,7 @@  static const struct ib_device_ops hns_roce_dev_ops = {
 	.get_link_layer = hns_roce_get_link_layer,
 	.get_port_immutable = hns_roce_port_immutable,
 	.mmap = hns_roce_mmap,
+	.mmap_free = hns_roce_free_mmap,
 	.modify_device = hns_roce_modify_device,
 	.modify_qp = hns_roce_modify_qp,
 	.query_ah = hns_roce_query_ah,
diff --git a/include/uapi/rdma/hns-abi.h b/include/uapi/rdma/hns-abi.h
index 42b177655560..ce1e39f21d73 100644
--- a/include/uapi/rdma/hns-abi.h
+++ b/include/uapi/rdma/hns-abi.h
@@ -83,11 +83,30 @@  struct hns_roce_ib_create_qp_resp {
 	__aligned_u64 cap_flags;
 };
 
+enum hns_roce_alloc_uctx_comp_flag {
+	HNS_ROCE_ALLOC_UCTX_COMP_CONFIG = 1 << 0,
+};
+
+enum hns_roce_alloc_uctx_resp_config {
+	HNS_ROCE_UCTX_RESP_MMAP_KEY_EN = 1 << 0,
+};
+
+enum hns_roce_alloc_uctx_req_config {
+	HNS_ROCE_UCTX_REQ_MMAP_KEY_EN = 1 << 0,
+};
+
+struct hns_roce_ib_alloc_ucontext {
+	__u32 comp;
+	__u32 config;
+};
+
 struct hns_roce_ib_alloc_ucontext_resp {
 	__u32	qp_tab_size;
 	__u32	cqe_size;
 	__u32	srq_tab_size;
-	__u32	reserved;
+	__u8    config;
+	__u8    rsv[3];
+	__aligned_u64 db_mmap_key;
 };
 
 struct hns_roce_ib_alloc_pd_resp {