Skip to content

Commit d387d4b

Browse files
Chengchang Tangrleon
authored andcommitted
RDMA/hns: Fix missing pagesize and alignment check in FRMR
The offset requires 128B alignment and the page size ranges from 4K to 128M. Fixes: 68a997c ("RDMA/hns: Add FRMR support for hip08") Signed-off-by: Chengchang Tang <[email protected]> Signed-off-by: Junxian Huang <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Leon Romanovsky <[email protected]>
1 parent 543fb98 commit d387d4b

File tree

2 files changed

+9
-0
lines changed

2 files changed

+9
-0
lines changed

drivers/infiniband/hw/hns/hns_roce_device.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
#define MR_TYPE_DMA 0x03
8484

8585
#define HNS_ROCE_FRMR_MAX_PA 512
86+
#define HNS_ROCE_FRMR_ALIGN_SIZE 128
8687

8788
#define PKEY_ID 0xffff
8889
#define NODE_DESC_SIZE 64
@@ -189,6 +190,9 @@ enum {
189190
#define HNS_HW_PAGE_SHIFT 12
190191
#define HNS_HW_PAGE_SIZE (1 << HNS_HW_PAGE_SHIFT)
191192

193+
#define HNS_HW_MAX_PAGE_SHIFT 27
194+
#define HNS_HW_MAX_PAGE_SIZE (1 << HNS_HW_MAX_PAGE_SHIFT)
195+
192196
struct hns_roce_uar {
193197
u64 pfn;
194198
unsigned long index;

drivers/infiniband/hw/hns/hns_roce_mr.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,6 +443,11 @@ int hns_roce_map_mr_sg(struct ib_mr *ibmr, struct scatterlist *sg, int sg_nents,
443443
struct hns_roce_mtr *mtr = &mr->pbl_mtr;
444444
int ret, sg_num = 0;
445445

446+
if (!IS_ALIGNED(*sg_offset, HNS_ROCE_FRMR_ALIGN_SIZE) ||
447+
ibmr->page_size < HNS_HW_PAGE_SIZE ||
448+
ibmr->page_size > HNS_HW_MAX_PAGE_SIZE)
449+
return sg_num;
450+
446451
mr->npages = 0;
447452
mr->page_list = kvcalloc(mr->pbl_mtr.hem_cfg.buf_pg_count,
448453
sizeof(dma_addr_t), GFP_KERNEL);

0 commit comments

Comments
 (0)