RDMA/hns: Optimize eqe buffer allocation flow
Subsystems (2)
PATCH 1/1 RDMA/hns: Optimize eqe buffer allocation flow
From: Xi Wang <[email protected]>
The eqe has a private multi-hop addressing implementation, but there is already a set of interfaces in the hns driver that can achieve this.
So, simplify the eqe buffer allocation process by using the mtr interface and remove large amount of repeated logic.
--- drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 481 ++++++---------------------- 2 files changed, 108 insertions(+), 383 deletions(-)
drivers/infiniband/hw/hns/hns_roce_device.h +2 -8
@@ -757,14 +757,8 @@ struct hns_roce_eq {int eqe_ba_pg_sz;int eqe_buf_pg_sz;int hop_num; -u64 *bt_l0;/* Base address table for L0 */ -u64 **bt_l1;/* Base address table for L1 */ -u64 **buf; -dma_addr_t l0_dma; -dma_addr_t *l1_dma; -dma_addr_t *buf_dma; -u32 l0_last_num;/* L0 last chunk num */ -u32 l1_last_num;/* L1 last chunk num */ +struct hns_roce_mtr mtr; +struct hns_roce_buf buf;int eq_max_cnt;int eq_period;int shift;
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +106 -375
588 lines not on this page · raw message
Signature · 1 line
2.8.1
Quoted 316 lines · Weihang Li
From: Xi Wang <[email protected]>
The eqe has a private multi-hop addressing implementation, but there is already a set of interfaces in the hns driver that can achieve this.
So, simplify the eqe buffer allocation process by using the mtr interface and remove large amount of repeated logic.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 481 ++++++---------------------- 2 files changed, 108 insertions(+), 383 deletions(-)drivers/infiniband/hw/hns/hns_roce_device.h +2
-8@@ -757,14 +757,8 @@ struct hns_roce_eq {int eqe_ba_pg_sz;int eqe_buf_pg_sz;int hop_num; -u64 *bt_l0;/* Base address table for L0 */ -u64 **bt_l1;/* Base address table for L1 */ -u64 **buf; -dma_addr_t l0_dma; -dma_addr_t *l1_dma; -dma_addr_t *buf_dma; -u32 l0_last_num;/* L0 last chunk num */ -u32 l1_last_num;/* L1 last chunk num */ +struct hns_roce_mtr mtr; +struct hns_roce_buf buf;int eq_max_cnt;int eq_period;int shift;drivers/infiniband/hw/hns/hns_roce_hw_v2.c +39
-177@@ -5287,44 +5287,24 @@ static void set_eq_cons_index_v2(struct hns_roce_eq *eq)hns_roce_write64 (hr_dev, doorbell, eq->doorbell); } -static struct hns_roce_aeqe *get_aeqe_v2 (struct hns_roce_eq *eq,u32 entry) +static inline void *get_eqe_buf (struct hns_roce_eq *eq,unsigned long offset) {u32 buf_chk_sz; -unsigned long off; buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -return (struct hns_roce_aeqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_aeqe *mhop_get_aeqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_aeqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); +if (eq->buf.nbufs ==1 ) +return eq->buf.direct.buf + offset % buf_chk_sz;else -return (struct hns_roce_aeqe *)((u8 *) - (eq->buf[off / buf_chk_sz]) + off % buf_chk_sz); +return eq->buf.page_list[offset / buf_chk_sz].buf + + offset % buf_chk_sz; }static struct hns_roce_aeqe *next_aeqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_aeqe *aeqe; -if (!eq->hop_num) - aeqe =get_aeqe_v2 (eq, eq->cons_index); -else - aeqe =mhop_get_aeqe (eq, eq->cons_index); - + aeqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_AEQ_ENTRY_SIZE );return (roce_get_bit (aeqe->asyn,HNS_ROCE_V2_AEQ_AEQE_OWNER_S ) ^ !!(eq->cons_index & eq->entries)) ? aeqe :NULL ; }@@ -5417,44 +5397,12 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev,return aeqe_found; } -static struct hns_roce_ceqe *get_ceqe_v2 (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -return (struct hns_roce_ceqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_ceqe *mhop_get_ceqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_ceqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); -else -return (struct hns_roce_ceqe *)((u8 *)(eq->buf[off / - buf_chk_sz]) + off % buf_chk_sz); -} -static struct hns_roce_ceqe *next_ceqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_ceqe *ceqe; -if (!eq->hop_num) - ceqe =get_ceqe_v2 (eq, eq->cons_index); -else - ceqe =mhop_get_ceqe (eq, eq->cons_index); - + ceqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_CEQ_ENTRY_SIZE );return (!!(roce_get_bit (ceqe->comp,HNS_ROCE_V2_CEQ_CEQE_OWNER_S ))) ^ (!!(eq->cons_index & eq->entries)) ? ceqe :NULL ; }@@ -5614,90 +5562,11 @@ static void hns_roce_v2_destroy_eqc(struct hns_roce_dev *hr_dev, int eqn)dev_err (dev,"[mailbox cmd] destroy eqc(%d) failed.\n" , eqn); } -static void hns_roce_mhop_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static void free_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq) { -struct device *dev = hr_dev->dev; -u64 idx; -u64 size; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -int eqe_alloc; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); - -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -dma_free_coherent (dev, (unsigned int )(eq->entries * - eq->eqe_size), eq->bt_l0, eq->l0_dma); -return ; - } - -dma_free_coherent (dev, bt_chk_sz, eq->bt_l0, eq->l0_dma); -if (mhop_num ==1 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -if (i == eq->l0_last_num -1 ) { - eqe_alloc = i * (buf_chk_sz / eq->eqe_size); - size = (eq->entries - eqe_alloc) * eq->eqe_size; -dma_free_coherent (dev, size, eq->buf[i], - eq->buf_dma[i]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[i], - eq->buf_dma[i]); - } - }else if (mhop_num ==2 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -dma_free_coherent (dev, bt_chk_sz, eq->bt_l1[i], - eq->l1_dma[i]); - -for (j =0 ; j < bt_chk_sz /BA_BYTE_LEN ; j++) { - idx = i * (bt_chk_sz /BA_BYTE_LEN ) + j; -if ((i == eq->l0_last_num -1 ) - && j == eq->l1_last_num -1 ) { - eqe_alloc = (buf_chk_sz / eq->eqe_size) - * idx; - size = (eq->entries - eqe_alloc) - * eq->eqe_size; -dma_free_coherent (dev, size, - eq->buf[idx], - eq->buf_dma[idx]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[idx], - eq->buf_dma[idx]); - } - } - } -kfree (eq->buf_dma); -kfree (eq->buf); -kfree (eq->l1_dma); -kfree (eq->bt_l1); - eq->buf_dma =NULL ; - eq->buf =NULL ; - eq->l1_dma =NULL ; - eq->bt_l1 =NULL ; -} - -static void hns_roce_v2_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) -{ -u32 buf_chk_sz; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - -if (hr_dev->caps.eqe_hop_num) { -hns_roce_mhop_free_eq (hr_dev, eq); -return ; - } - -dma_free_coherent (hr_dev->dev, buf_chk_sz, eq->buf_list->buf, - eq->buf_list->map); -kfree (eq->buf_list); +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) +hns_roce_mtr_cleanup (hr_dev, &eq->mtr); +hns_roce_buf_free (hr_dev, eq->buf.size, &eq->buf); } static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev,@@ -5705,6 +5574,8 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, void *mb_buf) {struct hns_roce_eq_context *eqc; +u64 ba[MTT_MIN_COUNT ] = {0 }; +int count; eqc = mb_buf;memset (eqc,0 ,sizeof (struct hns_roce_eq_context ));@@ -5720,10 +5591,23 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, eq->eqe_buf_pg_sz = hr_dev->caps.eqe_buf_pg_sz; eq->shift =ilog2 ((unsigned int )eq->entries); -if (!eq->hop_num) - eq->eqe_ba = eq->buf_list->map; -else - eq->eqe_ba = eq->l0_dma; +/* if not muti-hop, eqe buffer only use one trunk */ +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) { + eq->eqe_ba = eq->buf.direct.map; + eq->cur_eqe_ba = eq->eqe_ba; +if (eq->buf.npages >1 ) + eq->nxt_eqe_ba = eq->eqe_ba + (1 << eq->eqe_buf_pg_sz); +else + eq->nxt_eqe_ba = eq->eqe_ba; + }else { + count =hns_roce_mtr_find (hr_dev, &eq->mtr,0 , ba, +MTT_MIN_COUNT , &eq->eqe_ba); + eq->cur_eqe_ba = ba[0 ]; +if (count >1 ) + eq->nxt_eqe_ba = ba[1 ]; +else + eq->nxt_eqe_ba = ba[0 ]; + }/* set eqc state */ roce_set_field(eqc->byte_4, HNS_ROCE_EQC_EQ_ST_M, HNS_ROCE_EQC_EQ_ST_S,@@ -5821,220 +5705,97 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, HNS_ROCE_EQC_NXT_EQE_BA_H_S, eq->nxt_eqe_ba >> 44); } -static int hns_roce_mhop_alloc_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static int map_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq, +u32 page_shift) { -struct device *dev = hr_dev->dev; -int eq_alloc_done =0 ; -int eq_buf_cnt =0 ; -int eqe_alloc; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -u64 size; -u64 idx; +struct hns_roce_buf_region region = {}; +dma_addr_t *buf_list =NULL ;int ba_num; -int bt_num; -int record_i; -int record_j; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); +int ret; ba_num =DIV_ROUND_UP (PAGE_ALIGN (eq->entries * eq->eqe_size), - buf_chk_sz); - bt_num =DIV_ROUND_UP (ba_num, bt_chk_sz /BA_BYTE_LEN ); +1 << page_shift); +hns_roce_init_buf_region (®ion, hr_dev->caps.eqe_hop_num,0 , ba_num); -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -if (eq->entries > buf_chk_sz / eq->eqe_size) { -dev_err (dev,"eq entries %d is larger than buf_pg_sz!" , - eq->entries); -return -EINVAL ; - } - eq->bt_l0 = dma_alloc_coherent(dev, eq->entries * eq->eqe_size,
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-6- &(eq->l0_dma), GFP_KERNEL); -if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );
The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Thanks
Quoted 331 lines · Leon Romanovsky
Quoted 316 lines · Weihang Li
From: Xi Wang <[email protected]>
The eqe has a private multi-hop addressing implementation, but there is already a set of interfaces in the hns driver that can achieve this.
So, simplify the eqe buffer allocation process by using the mtr interface and remove large amount of repeated logic.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 481 ++++++---------------------- 2 files changed, 108 insertions(+), 383 deletions(-)drivers/infiniband/hw/hns/hns_roce_device.h +2
-8@@ -757,14 +757,8 @@ struct hns_roce_eq {int eqe_ba_pg_sz;int eqe_buf_pg_sz;int hop_num; -u64 *bt_l0;/* Base address table for L0 */ -u64 **bt_l1;/* Base address table for L1 */ -u64 **buf; -dma_addr_t l0_dma; -dma_addr_t *l1_dma; -dma_addr_t *buf_dma; -u32 l0_last_num;/* L0 last chunk num */ -u32 l1_last_num;/* L1 last chunk num */ +struct hns_roce_mtr mtr; +struct hns_roce_buf buf;int eq_max_cnt;int eq_period;int shift;drivers/infiniband/hw/hns/hns_roce_hw_v2.c +39
-177@@ -5287,44 +5287,24 @@ static void set_eq_cons_index_v2(struct hns_roce_eq *eq)hns_roce_write64 (hr_dev, doorbell, eq->doorbell); } -static struct hns_roce_aeqe *get_aeqe_v2 (struct hns_roce_eq *eq,u32 entry) +static inline void *get_eqe_buf (struct hns_roce_eq *eq,unsigned long offset) {u32 buf_chk_sz; -unsigned long off; buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -return (struct hns_roce_aeqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_aeqe *mhop_get_aeqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_aeqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); +if (eq->buf.nbufs ==1 ) +return eq->buf.direct.buf + offset % buf_chk_sz;else -return (struct hns_roce_aeqe *)((u8 *) - (eq->buf[off / buf_chk_sz]) + off % buf_chk_sz); +return eq->buf.page_list[offset / buf_chk_sz].buf + + offset % buf_chk_sz; }static struct hns_roce_aeqe *next_aeqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_aeqe *aeqe; -if (!eq->hop_num) - aeqe =get_aeqe_v2 (eq, eq->cons_index); -else - aeqe =mhop_get_aeqe (eq, eq->cons_index); - + aeqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_AEQ_ENTRY_SIZE );return (roce_get_bit (aeqe->asyn,HNS_ROCE_V2_AEQ_AEQE_OWNER_S ) ^ !!(eq->cons_index & eq->entries)) ? aeqe :NULL ; }@@ -5417,44 +5397,12 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev,return aeqe_found; } -static struct hns_roce_ceqe *get_ceqe_v2 (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -return (struct hns_roce_ceqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_ceqe *mhop_get_ceqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_ceqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); -else -return (struct hns_roce_ceqe *)((u8 *)(eq->buf[off / - buf_chk_sz]) + off % buf_chk_sz); -} -static struct hns_roce_ceqe *next_ceqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_ceqe *ceqe; -if (!eq->hop_num) - ceqe =get_ceqe_v2 (eq, eq->cons_index); -else - ceqe =mhop_get_ceqe (eq, eq->cons_index); - + ceqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_CEQ_ENTRY_SIZE );return (!!(roce_get_bit (ceqe->comp,HNS_ROCE_V2_CEQ_CEQE_OWNER_S ))) ^ (!!(eq->cons_index & eq->entries)) ? ceqe :NULL ; }@@ -5614,90 +5562,11 @@ static void hns_roce_v2_destroy_eqc(struct hns_roce_dev *hr_dev, int eqn)dev_err (dev,"[mailbox cmd] destroy eqc(%d) failed.\n" , eqn); } -static void hns_roce_mhop_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static void free_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq) { -struct device *dev = hr_dev->dev; -u64 idx; -u64 size; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -int eqe_alloc; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); - -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -dma_free_coherent (dev, (unsigned int )(eq->entries * - eq->eqe_size), eq->bt_l0, eq->l0_dma); -return ; - } - -dma_free_coherent (dev, bt_chk_sz, eq->bt_l0, eq->l0_dma); -if (mhop_num ==1 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -if (i == eq->l0_last_num -1 ) { - eqe_alloc = i * (buf_chk_sz / eq->eqe_size); - size = (eq->entries - eqe_alloc) * eq->eqe_size; -dma_free_coherent (dev, size, eq->buf[i], - eq->buf_dma[i]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[i], - eq->buf_dma[i]); - } - }else if (mhop_num ==2 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -dma_free_coherent (dev, bt_chk_sz, eq->bt_l1[i], - eq->l1_dma[i]); - -for (j =0 ; j < bt_chk_sz /BA_BYTE_LEN ; j++) { - idx = i * (bt_chk_sz /BA_BYTE_LEN ) + j; -if ((i == eq->l0_last_num -1 ) - && j == eq->l1_last_num -1 ) { - eqe_alloc = (buf_chk_sz / eq->eqe_size) - * idx; - size = (eq->entries - eqe_alloc) - * eq->eqe_size; -dma_free_coherent (dev, size, - eq->buf[idx], - eq->buf_dma[idx]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[idx], - eq->buf_dma[idx]); - } - } - } -kfree (eq->buf_dma); -kfree (eq->buf); -kfree (eq->l1_dma); -kfree (eq->bt_l1); - eq->buf_dma =NULL ; - eq->buf =NULL ; - eq->l1_dma =NULL ; - eq->bt_l1 =NULL ; -} - -static void hns_roce_v2_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) -{ -u32 buf_chk_sz; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - -if (hr_dev->caps.eqe_hop_num) { -hns_roce_mhop_free_eq (hr_dev, eq); -return ; - } - -dma_free_coherent (hr_dev->dev, buf_chk_sz, eq->buf_list->buf, - eq->buf_list->map); -kfree (eq->buf_list); +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) +hns_roce_mtr_cleanup (hr_dev, &eq->mtr); +hns_roce_buf_free (hr_dev, eq->buf.size, &eq->buf); } static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev,@@ -5705,6 +5574,8 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, void *mb_buf) {struct hns_roce_eq_context *eqc; +u64 ba[MTT_MIN_COUNT ] = {0 }; +int count; eqc = mb_buf;memset (eqc,0 ,sizeof (struct hns_roce_eq_context ));@@ -5720,10 +5591,23 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, eq->eqe_buf_pg_sz = hr_dev->caps.eqe_buf_pg_sz; eq->shift =ilog2 ((unsigned int )eq->entries); -if (!eq->hop_num) - eq->eqe_ba = eq->buf_list->map; -else - eq->eqe_ba = eq->l0_dma; +/* if not muti-hop, eqe buffer only use one trunk */ +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) { + eq->eqe_ba = eq->buf.direct.map; + eq->cur_eqe_ba = eq->eqe_ba; +if (eq->buf.npages >1 ) + eq->nxt_eqe_ba = eq->eqe_ba + (1 << eq->eqe_buf_pg_sz); +else + eq->nxt_eqe_ba = eq->eqe_ba; + }else { + count =hns_roce_mtr_find (hr_dev, &eq->mtr,0 , ba, +MTT_MIN_COUNT , &eq->eqe_ba); + eq->cur_eqe_ba = ba[0 ]; +if (count >1 ) + eq->nxt_eqe_ba = ba[1 ]; +else + eq->nxt_eqe_ba = ba[0 ]; + }/* set eqc state */ roce_set_field(eqc->byte_4, HNS_ROCE_EQC_EQ_ST_M, HNS_ROCE_EQC_EQ_ST_S,@@ -5821,220 +5705,97 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, HNS_ROCE_EQC_NXT_EQE_BA_H_S, eq->nxt_eqe_ba >> 44); } -static int hns_roce_mhop_alloc_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static int map_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq, +u32 page_shift) { -struct device *dev = hr_dev->dev; -int eq_alloc_done =0 ; -int eq_buf_cnt =0 ; -int eqe_alloc; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -u64 size; -u64 idx; +struct hns_roce_buf_region region = {}; +dma_addr_t *buf_list =NULL ;int ba_num; -int bt_num; -int record_i; -int record_j; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); +int ret; ba_num =DIV_ROUND_UP (PAGE_ALIGN (eq->entries * eq->eqe_size), - buf_chk_sz); - bt_num =DIV_ROUND_UP (ba_num, bt_chk_sz /BA_BYTE_LEN ); +1 << page_shift); +hns_roce_init_buf_region (®ion, hr_dev->caps.eqe_hop_num,0 , ba_num); -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -if (eq->entries > buf_chk_sz / eq->eqe_size) { -dev_err (dev,"eq entries %d is larger than buf_pg_sz!" , - eq->entries); -return -EINVAL ; - } - eq->bt_l0 = dma_alloc_coherent(dev, eq->entries * eq->eqe_size,drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-6- &(eq->l0_dma), GFP_KERNEL); -if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 3 lines
Thanks
.
OK, thank you.
Weihang
Quoted 1 line
Quoted 331 lines · Leon Romanovsky
Quoted 316 lines · Weihang Li
From: Xi Wang <[email protected]>
The eqe has a private multi-hop addressing implementation, but there is already a set of interfaces in the hns driver that can achieve this.
So, simplify the eqe buffer allocation process by using the mtr interface and remove large amount of repeated logic.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 481 ++++++---------------------- 2 files changed, 108 insertions(+), 383 deletions(-)drivers/infiniband/hw/hns/hns_roce_device.h +2
-8@@ -757,14 +757,8 @@ struct hns_roce_eq {int eqe_ba_pg_sz;int eqe_buf_pg_sz;int hop_num; -u64 *bt_l0;/* Base address table for L0 */ -u64 **bt_l1;/* Base address table for L1 */ -u64 **buf; -dma_addr_t l0_dma; -dma_addr_t *l1_dma; -dma_addr_t *buf_dma; -u32 l0_last_num;/* L0 last chunk num */ -u32 l1_last_num;/* L1 last chunk num */ +struct hns_roce_mtr mtr; +struct hns_roce_buf buf;int eq_max_cnt;int eq_period;int shift;drivers/infiniband/hw/hns/hns_roce_hw_v2.c +39
-177@@ -5287,44 +5287,24 @@ static void set_eq_cons_index_v2(struct hns_roce_eq *eq)hns_roce_write64 (hr_dev, doorbell, eq->doorbell); } -static struct hns_roce_aeqe *get_aeqe_v2 (struct hns_roce_eq *eq,u32 entry) +static inline void *get_eqe_buf (struct hns_roce_eq *eq,unsigned long offset) {u32 buf_chk_sz; -unsigned long off; buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -return (struct hns_roce_aeqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_aeqe *mhop_get_aeqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_aeqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); +if (eq->buf.nbufs ==1 ) +return eq->buf.direct.buf + offset % buf_chk_sz;else -return (struct hns_roce_aeqe *)((u8 *) - (eq->buf[off / buf_chk_sz]) + off % buf_chk_sz); +return eq->buf.page_list[offset / buf_chk_sz].buf + + offset % buf_chk_sz; }static struct hns_roce_aeqe *next_aeqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_aeqe *aeqe; -if (!eq->hop_num) - aeqe =get_aeqe_v2 (eq, eq->cons_index); -else - aeqe =mhop_get_aeqe (eq, eq->cons_index); - + aeqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_AEQ_ENTRY_SIZE );return (roce_get_bit (aeqe->asyn,HNS_ROCE_V2_AEQ_AEQE_OWNER_S ) ^ !!(eq->cons_index & eq->entries)) ? aeqe :NULL ; }@@ -5417,44 +5397,12 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev,return aeqe_found; } -static struct hns_roce_ceqe *get_ceqe_v2 (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -return (struct hns_roce_ceqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_ceqe *mhop_get_ceqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_ceqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); -else -return (struct hns_roce_ceqe *)((u8 *)(eq->buf[off / - buf_chk_sz]) + off % buf_chk_sz); -} -static struct hns_roce_ceqe *next_ceqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_ceqe *ceqe; -if (!eq->hop_num) - ceqe =get_ceqe_v2 (eq, eq->cons_index); -else - ceqe =mhop_get_ceqe (eq, eq->cons_index); - + ceqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_CEQ_ENTRY_SIZE );return (!!(roce_get_bit (ceqe->comp,HNS_ROCE_V2_CEQ_CEQE_OWNER_S ))) ^ (!!(eq->cons_index & eq->entries)) ? ceqe :NULL ; }@@ -5614,90 +5562,11 @@ static void hns_roce_v2_destroy_eqc(struct hns_roce_dev *hr_dev, int eqn)dev_err (dev,"[mailbox cmd] destroy eqc(%d) failed.\n" , eqn); } -static void hns_roce_mhop_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static void free_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq) { -struct device *dev = hr_dev->dev; -u64 idx; -u64 size; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -int eqe_alloc; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); - -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -dma_free_coherent (dev, (unsigned int )(eq->entries * - eq->eqe_size), eq->bt_l0, eq->l0_dma); -return ; - } - -dma_free_coherent (dev, bt_chk_sz, eq->bt_l0, eq->l0_dma); -if (mhop_num ==1 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -if (i == eq->l0_last_num -1 ) { - eqe_alloc = i * (buf_chk_sz / eq->eqe_size); - size = (eq->entries - eqe_alloc) * eq->eqe_size; -dma_free_coherent (dev, size, eq->buf[i], - eq->buf_dma[i]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[i], - eq->buf_dma[i]); - } - }else if (mhop_num ==2 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -dma_free_coherent (dev, bt_chk_sz, eq->bt_l1[i], - eq->l1_dma[i]); - -for (j =0 ; j < bt_chk_sz /BA_BYTE_LEN ; j++) { - idx = i * (bt_chk_sz /BA_BYTE_LEN ) + j; -if ((i == eq->l0_last_num -1 ) - && j == eq->l1_last_num -1 ) { - eqe_alloc = (buf_chk_sz / eq->eqe_size) - * idx; - size = (eq->entries - eqe_alloc) - * eq->eqe_size; -dma_free_coherent (dev, size, - eq->buf[idx], - eq->buf_dma[idx]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[idx], - eq->buf_dma[idx]); - } - } - } -kfree (eq->buf_dma); -kfree (eq->buf); -kfree (eq->l1_dma); -kfree (eq->bt_l1); - eq->buf_dma =NULL ; - eq->buf =NULL ; - eq->l1_dma =NULL ; - eq->bt_l1 =NULL ; -} - -static void hns_roce_v2_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) -{ -u32 buf_chk_sz; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - -if (hr_dev->caps.eqe_hop_num) { -hns_roce_mhop_free_eq (hr_dev, eq); -return ; - } - -dma_free_coherent (hr_dev->dev, buf_chk_sz, eq->buf_list->buf, - eq->buf_list->map); -kfree (eq->buf_list); +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) +hns_roce_mtr_cleanup (hr_dev, &eq->mtr); +hns_roce_buf_free (hr_dev, eq->buf.size, &eq->buf); } static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev,@@ -5705,6 +5574,8 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, void *mb_buf) {struct hns_roce_eq_context *eqc; +u64 ba[MTT_MIN_COUNT ] = {0 }; +int count; eqc = mb_buf;memset (eqc,0 ,sizeof (struct hns_roce_eq_context ));@@ -5720,10 +5591,23 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, eq->eqe_buf_pg_sz = hr_dev->caps.eqe_buf_pg_sz; eq->shift =ilog2 ((unsigned int )eq->entries); -if (!eq->hop_num) - eq->eqe_ba = eq->buf_list->map; -else - eq->eqe_ba = eq->l0_dma; +/* if not muti-hop, eqe buffer only use one trunk */ +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) { + eq->eqe_ba = eq->buf.direct.map; + eq->cur_eqe_ba = eq->eqe_ba; +if (eq->buf.npages >1 ) + eq->nxt_eqe_ba = eq->eqe_ba + (1 << eq->eqe_buf_pg_sz); +else + eq->nxt_eqe_ba = eq->eqe_ba; + }else { + count =hns_roce_mtr_find (hr_dev, &eq->mtr,0 , ba, +MTT_MIN_COUNT , &eq->eqe_ba); + eq->cur_eqe_ba = ba[0 ]; +if (count >1 ) + eq->nxt_eqe_ba = ba[1 ]; +else + eq->nxt_eqe_ba = ba[0 ]; + }/* set eqc state */ roce_set_field(eqc->byte_4, HNS_ROCE_EQC_EQ_ST_M, HNS_ROCE_EQC_EQ_ST_S,@@ -5821,220 +5705,97 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, HNS_ROCE_EQC_NXT_EQE_BA_H_S, eq->nxt_eqe_ba >> 44); } -static int hns_roce_mhop_alloc_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static int map_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq, +u32 page_shift) { -struct device *dev = hr_dev->dev; -int eq_alloc_done =0 ; -int eq_buf_cnt =0 ; -int eqe_alloc; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -u64 size; -u64 idx; +struct hns_roce_buf_region region = {}; +dma_addr_t *buf_list =NULL ;int ba_num; -int bt_num; -int record_i; -int record_j; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); +int ret; ba_num =DIV_ROUND_UP (PAGE_ALIGN (eq->entries * eq->eqe_size), - buf_chk_sz); - bt_num =DIV_ROUND_UP (ba_num, bt_chk_sz /BA_BYTE_LEN ); +1 << page_shift); +hns_roce_init_buf_region (®ion, hr_dev->caps.eqe_hop_num,0 , ba_num); -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -if (eq->entries > buf_chk_sz / eq->eqe_size) { -dev_err (dev,"eq entries %d is larger than buf_pg_sz!" , - eq->entries); -return -EINVAL ; - } - eq->bt_l0 = dma_alloc_coherent(dev, eq->entries * eq->eqe_size,drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-6- &(eq->l0_dma), GFP_KERNEL); -if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 2 lines
Thanks
Hi Leon,
map_eq_buf() is called before ib_register_device(), so we can't use ibdev_* here.
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 2 lines
.
Quoted 334 lines · Weihang Li
Quoted 331 lines · Leon Romanovsky
Quoted 316 lines · Weihang Li
From: Xi Wang <[email protected]>
The eqe has a private multi-hop addressing implementation, but there is already a set of interfaces in the hns driver that can achieve this.
So, simplify the eqe buffer allocation process by using the mtr interface and remove large amount of repeated logic.
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 481 ++++++---------------------- 2 files changed, 108 insertions(+), 383 deletions(-)drivers/infiniband/hw/hns/hns_roce_device.h +2
-8@@ -757,14 +757,8 @@ struct hns_roce_eq {int eqe_ba_pg_sz;int eqe_buf_pg_sz;int hop_num; -u64 *bt_l0;/* Base address table for L0 */ -u64 **bt_l1;/* Base address table for L1 */ -u64 **buf; -dma_addr_t l0_dma; -dma_addr_t *l1_dma; -dma_addr_t *buf_dma; -u32 l0_last_num;/* L0 last chunk num */ -u32 l1_last_num;/* L1 last chunk num */ +struct hns_roce_mtr mtr; +struct hns_roce_buf buf;int eq_max_cnt;int eq_period;int shift;drivers/infiniband/hw/hns/hns_roce_hw_v2.c +39
-177@@ -5287,44 +5287,24 @@ static void set_eq_cons_index_v2(struct hns_roce_eq *eq)hns_roce_write64 (hr_dev, doorbell, eq->doorbell); } -static struct hns_roce_aeqe *get_aeqe_v2 (struct hns_roce_eq *eq,u32 entry) +static inline void *get_eqe_buf (struct hns_roce_eq *eq,unsigned long offset) {u32 buf_chk_sz; -unsigned long off; buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -return (struct hns_roce_aeqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_aeqe *mhop_get_aeqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_AEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_aeqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); +if (eq->buf.nbufs ==1 ) +return eq->buf.direct.buf + offset % buf_chk_sz;else -return (struct hns_roce_aeqe *)((u8 *) - (eq->buf[off / buf_chk_sz]) + off % buf_chk_sz); +return eq->buf.page_list[offset / buf_chk_sz].buf + + offset % buf_chk_sz; }static struct hns_roce_aeqe *next_aeqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_aeqe *aeqe; -if (!eq->hop_num) - aeqe =get_aeqe_v2 (eq, eq->cons_index); -else - aeqe =mhop_get_aeqe (eq, eq->cons_index); - + aeqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_AEQ_ENTRY_SIZE );return (roce_get_bit (aeqe->asyn,HNS_ROCE_V2_AEQ_AEQE_OWNER_S ) ^ !!(eq->cons_index & eq->entries)) ? aeqe :NULL ; }@@ -5417,44 +5397,12 @@ static int hns_roce_v2_aeq_int(struct hns_roce_dev *hr_dev,return aeqe_found; } -static struct hns_roce_ceqe *get_ceqe_v2 (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -return (struct hns_roce_ceqe *)((char *)(eq->buf_list->buf) + - off % buf_chk_sz); -} - -static struct hns_roce_ceqe *mhop_get_ceqe (struct hns_roce_eq *eq,u32 entry) -{ -u32 buf_chk_sz; -unsigned long off; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - - off = (entry & (eq->entries -1 )) *HNS_ROCE_CEQ_ENTRY_SIZE ; - -if (eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) -return (struct hns_roce_ceqe *)((u8 *)(eq->bt_l0) + - off % buf_chk_sz); -else -return (struct hns_roce_ceqe *)((u8 *)(eq->buf[off / - buf_chk_sz]) + off % buf_chk_sz); -} -static struct hns_roce_ceqe *next_ceqe_sw_v2 (struct hns_roce_eq *eq) {struct hns_roce_ceqe *ceqe; -if (!eq->hop_num) - ceqe =get_ceqe_v2 (eq, eq->cons_index); -else - ceqe =mhop_get_ceqe (eq, eq->cons_index); - + ceqe =get_eqe_buf (eq, (eq->cons_index & (eq->entries -1 )) * +HNS_ROCE_CEQ_ENTRY_SIZE );return (!!(roce_get_bit (ceqe->comp,HNS_ROCE_V2_CEQ_CEQE_OWNER_S ))) ^ (!!(eq->cons_index & eq->entries)) ? ceqe :NULL ; }@@ -5614,90 +5562,11 @@ static void hns_roce_v2_destroy_eqc(struct hns_roce_dev *hr_dev, int eqn)dev_err (dev,"[mailbox cmd] destroy eqc(%d) failed.\n" , eqn); } -static void hns_roce_mhop_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static void free_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq) { -struct device *dev = hr_dev->dev; -u64 idx; -u64 size; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -int eqe_alloc; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); - -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -dma_free_coherent (dev, (unsigned int )(eq->entries * - eq->eqe_size), eq->bt_l0, eq->l0_dma); -return ; - } - -dma_free_coherent (dev, bt_chk_sz, eq->bt_l0, eq->l0_dma); -if (mhop_num ==1 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -if (i == eq->l0_last_num -1 ) { - eqe_alloc = i * (buf_chk_sz / eq->eqe_size); - size = (eq->entries - eqe_alloc) * eq->eqe_size; -dma_free_coherent (dev, size, eq->buf[i], - eq->buf_dma[i]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[i], - eq->buf_dma[i]); - } - }else if (mhop_num ==2 ) { -for (i =0 ; i < eq->l0_last_num; i++) { -dma_free_coherent (dev, bt_chk_sz, eq->bt_l1[i], - eq->l1_dma[i]); - -for (j =0 ; j < bt_chk_sz /BA_BYTE_LEN ; j++) { - idx = i * (bt_chk_sz /BA_BYTE_LEN ) + j; -if ((i == eq->l0_last_num -1 ) - && j == eq->l1_last_num -1 ) { - eqe_alloc = (buf_chk_sz / eq->eqe_size) - * idx; - size = (eq->entries - eqe_alloc) - * eq->eqe_size; -dma_free_coherent (dev, size, - eq->buf[idx], - eq->buf_dma[idx]); -break ; - } -dma_free_coherent (dev, buf_chk_sz, eq->buf[idx], - eq->buf_dma[idx]); - } - } - } -kfree (eq->buf_dma); -kfree (eq->buf); -kfree (eq->l1_dma); -kfree (eq->bt_l1); - eq->buf_dma =NULL ; - eq->buf =NULL ; - eq->l1_dma =NULL ; - eq->bt_l1 =NULL ; -} - -static void hns_roce_v2_free_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) -{ -u32 buf_chk_sz; - - buf_chk_sz =1 << (eq->eqe_buf_pg_sz +PAGE_SHIFT ); - -if (hr_dev->caps.eqe_hop_num) { -hns_roce_mhop_free_eq (hr_dev, eq); -return ; - } - -dma_free_coherent (hr_dev->dev, buf_chk_sz, eq->buf_list->buf, - eq->buf_list->map); -kfree (eq->buf_list); +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) +hns_roce_mtr_cleanup (hr_dev, &eq->mtr); +hns_roce_buf_free (hr_dev, eq->buf.size, &eq->buf); } static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev,@@ -5705,6 +5574,8 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, void *mb_buf) {struct hns_roce_eq_context *eqc; +u64 ba[MTT_MIN_COUNT ] = {0 }; +int count; eqc = mb_buf;memset (eqc,0 ,sizeof (struct hns_roce_eq_context ));@@ -5720,10 +5591,23 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, eq->eqe_buf_pg_sz = hr_dev->caps.eqe_buf_pg_sz; eq->shift =ilog2 ((unsigned int )eq->entries); -if (!eq->hop_num) - eq->eqe_ba = eq->buf_list->map; -else - eq->eqe_ba = eq->l0_dma; +/* if not muti-hop, eqe buffer only use one trunk */ +if (!eq->hop_num || eq->hop_num ==HNS_ROCE_HOP_NUM_0 ) { + eq->eqe_ba = eq->buf.direct.map; + eq->cur_eqe_ba = eq->eqe_ba; +if (eq->buf.npages >1 ) + eq->nxt_eqe_ba = eq->eqe_ba + (1 << eq->eqe_buf_pg_sz); +else + eq->nxt_eqe_ba = eq->eqe_ba; + }else { + count =hns_roce_mtr_find (hr_dev, &eq->mtr,0 , ba, +MTT_MIN_COUNT , &eq->eqe_ba); + eq->cur_eqe_ba = ba[0 ]; +if (count >1 ) + eq->nxt_eqe_ba = ba[1 ]; +else + eq->nxt_eqe_ba = ba[0 ]; + }/* set eqc state */ roce_set_field(eqc->byte_4, HNS_ROCE_EQC_EQ_ST_M, HNS_ROCE_EQC_EQ_ST_S,@@ -5821,220 +5705,97 @@ static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, HNS_ROCE_EQC_NXT_EQE_BA_H_S, eq->nxt_eqe_ba >> 44); } -static int hns_roce_mhop_alloc_eq (struct hns_roce_dev *hr_dev, -struct hns_roce_eq *eq) +static int map_eq_buf (struct hns_roce_dev *hr_dev,struct hns_roce_eq *eq, +u32 page_shift) { -struct device *dev = hr_dev->dev; -int eq_alloc_done =0 ; -int eq_buf_cnt =0 ; -int eqe_alloc; -u32 buf_chk_sz; -u32 bt_chk_sz; -u32 mhop_num; -u64 size; -u64 idx; +struct hns_roce_buf_region region = {}; +dma_addr_t *buf_list =NULL ;int ba_num; -int bt_num; -int record_i; -int record_j; -int i =0 ; -int j =0 ; - - mhop_num = hr_dev->caps.eqe_hop_num; - buf_chk_sz =1 << (hr_dev->caps.eqe_buf_pg_sz +PAGE_SHIFT ); - bt_chk_sz =1 << (hr_dev->caps.eqe_ba_pg_sz +PAGE_SHIFT ); +int ret; ba_num =DIV_ROUND_UP (PAGE_ALIGN (eq->entries * eq->eqe_size), - buf_chk_sz); - bt_num =DIV_ROUND_UP (ba_num, bt_chk_sz /BA_BYTE_LEN ); +1 << page_shift); +hns_roce_init_buf_region (®ion, hr_dev->caps.eqe_hop_num,0 , ba_num); -if (mhop_num ==HNS_ROCE_HOP_NUM_0 ) { -if (eq->entries > buf_chk_sz / eq->eqe_size) { -dev_err (dev,"eq entries %d is larger than buf_pg_sz!" , - eq->entries); -return -EINVAL ; - } - eq->bt_l0 = dma_alloc_coherent(dev, eq->entries * eq->eqe_size,drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 10 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-6- &(eq->l0_dma), GFP_KERNEL); -if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 7 lines
Quoted 2 lines
Thanks
Hi Leon,
map_eq_buf()is called beforeib_register_device(), so we can't use ibdev_* here.
As long as map_eq_buf() is called after ib_alloc_device(), you will be fine.
Thanks
Quoted 9 lines
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 2 lines
.
Quoted 14 lines · Leon Romanovsky
Quoted 14 lines
Quoted 14 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 9 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-5-if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Thanks
Quoted 7 lines
Quoted 4 lines
Hi Leon,
map_eq_buf()is called beforeib_register_device(), so we can't use ibdev_* here.As long as
map_eq_buf()is called afterib_alloc_device(), you will be fine.Thanks
Hi Leon,
eq is used to queue hardware event, it should be ready before hardware is initialized. So we can't call map_eq_buf() after ib_alloc_device().
Thanks
Weihang
Quoted 10 lines
Quoted 8 lines
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 2 lines
.
.
Quoted 21 lines · Weihang Li
Quoted 18 lines · Leon Romanovsky
Quoted 18 lines
Quoted 12 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 9 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-5-if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 2 lines
Thanks
Hi Leon,
map_eq_buf()is called beforeib_register_device(), so we can't use ibdev_* here.
Quoted 8 lines
Quoted 3 lines
As long as
map_eq_buf()is called afterib_alloc_device(), you will be fine.Thanks
Hi Leon,
eq is used to queue hardware event, it should be ready before hardware is initialized. So we can't call
map_eq_buf()afterib_alloc_device().
How can it be that your newly added function has hns_roce_dev in the signature and you didn't call to ib_alloc_device()?
+static int map_eq_buf(struct hns_roce_dev *hr_dev, struct hns_roce_eq *eq,
+ u32 page_shift)
Thanks
Quoted 15 lines
Thanks
WeihangQuoted 10 lines
Quoted 8 lines
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 2 lines
.
.
Quoted 31 lines · Leon Romanovsky
Quoted 21 lines · Weihang Li
Quoted 18 lines · Leon Romanovsky
Quoted 18 lines
Quoted 12 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c static void hns_roce_config_eqc(struct hns_roce_dev *hr_dev, · line 5723
Quoted 9 lines
drivers/infiniband/hw/hns/hns_roce_hw_v2.c +4
-5-if (!eq->bt_l0) -return -ENOMEM ; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba =0 ; +/* alloc a tmp list for storing eq buf address */ + ret =hns_roce_alloc_buf_list (®ion, &buf_list,1 ); +if (ret) { +dev_err (hr_dev->dev,"alloc eq buf_list error\n" );The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 2 lines
Thanks
Hi Leon,
map_eq_buf()is called beforeib_register_device(), so we can't use ibdev_* here.Quoted 8 lines
Quoted 3 lines
As long as
map_eq_buf()is called afterib_alloc_device(), you will be fine.Thanks
Hi Leon,
eq is used to queue hardware event, it should be ready before hardware is initialized. So we can't call
map_eq_buf()afterib_alloc_device().
Quoted 8 lines
How can it be that your newly added function has
hns_roce_devin the signature and you didn't call toib_alloc_device()?+static int map_eq_buf(struct
hns_roce_dev*hr_dev, structhns_roce_eq*eq,
+ u32page_shift)Thanks
Sorry, I confused ib_alloc_device() and ib_register_device(). What I was about to say is ib_register_device().
Order of these functions in hns driver is:
1. ib_alloc_device()
2. map_eq_buf()
3. ib_register_device()
Refer to code in __ibdev_printk():
else if (ibdev)
printk("%s%s: %pV",
level, dev_name(&ibdev->dev), vaf);If we called ibdev_*() before ib_register_device(), it will print "null" for the device name. And I make a simple test, it will print like this:
[ 41.400347] (null): -------------- This is a test!----------
Because map_eq_buf() should be finished before ib_register_device(), so I think we have to use dev_*() in it.
Quoted 18 lines
Quoted 15 lines
Thanks
WeihangQuoted 10 lines
Quoted 8 lines
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 2 lines
.
.
.
Quoted 59 lines · Weihang Li
Quoted 31 lines · Leon Romanovsky
Quoted 21 lines · Weihang Li
Quoted 18 lines · Leon Romanovsky
Quoted 18 lines
Quoted 12 lines
Review
Quoted 9 lines
(quoted diff) +4
-5- if (!eq->bt_l0) - return -ENOMEM; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba = 0; + /* alloc a tmp list for storing eq buf address */ + ret = hns_roce_alloc_buf_list(®ion, &buf_list, 1); + if (ret) { + dev_err(hr_dev->dev, "alloc eq buf_list error\n");The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 2 lines
Thanks
Hi Leon,
map_eq_buf()is called beforeib_register_device(), so we can't use ibdev_* here.Quoted 8 lines
Quoted 3 lines
As long as
map_eq_buf()is called afterib_alloc_device(), you will be fine.Thanks
Hi Leon,
eq is used to queue hardware event, it should be ready before hardware is initialized. So we can't call
map_eq_buf()afterib_alloc_device().Quoted 8 lines
How can it be that your newly added function has
hns_roce_devin the signature and you didn't call toib_alloc_device()?+static int map_eq_buf(struct
hns_roce_dev*hr_dev, structhns_roce_eq*eq,
+ u32page_shift)Thanks
Sorry, I confused
ib_alloc_device()andib_register_device(). What I was about to say isib_register_device().Order of these functions in hns driver is:
1.
ib_alloc_device()
2.map_eq_buf()
3.ib_register_device()Refer to code in
__ibdev_printk():else if (ibdev) printk("%s%s: %pV", level, dev_name(&ibdev->dev), vaf);
Quoted 7 lines
If we called ibdev_*() before
ib_register_device(), it will print "null" for the device name. And I make a simple test, it will print like this:[ 41.400347] (null): -------------- This is a test!----------Because
map_eq_buf()should be finished beforeib_register_device(), so I think we have to use dev_*() in it.
Interesting, I wonder why "ibdev->dev" is set so late. I afraid that it is a bug in hns.
Thanks
Quoted 20 lines
Quoted 19 lines
Quoted 16 lines
Thanks
WeihangQuoted 10 lines
Quoted 8 lines
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 2 lines
.
.
.
Quoted 65 lines · Leon Romanovsky
Quoted 64 lines · Weihang Li
Quoted 31 lines · Leon Romanovsky
Quoted 21 lines · Weihang Li
Quoted 18 lines · Leon Romanovsky
Quoted 18 lines
Quoted 12 lines
Review
Quoted 9 lines
(quoted diff) +4
-5- if (!eq->bt_l0) - return -ENOMEM; - - eq->cur_eqe_ba = eq->l0_dma; - eq->nxt_eqe_ba = 0; + /* alloc a tmp list for storing eq buf address */ + ret = hns_roce_alloc_buf_list(®ion, &buf_list, 1); + if (ret) { + dev_err(hr_dev->dev, "alloc eq buf_list error\n");The same comment like we gave for bnxt driver, no dev_* prints inside driver, use ibdev_*.
Quoted 2 lines
Thanks
Hi Leon,
map_eq_buf()is called beforeib_register_device(), so we can't use ibdev_* here.Quoted 8 lines
Quoted 3 lines
As long as
map_eq_buf()is called afterib_alloc_device(), you will be fine.Thanks
Hi Leon,
eq is used to queue hardware event, it should be ready before hardware is initialized. So we can't call
map_eq_buf()afterib_alloc_device().Quoted 8 lines
How can it be that your newly added function has
hns_roce_devin the signature and you didn't call toib_alloc_device()?+static int map_eq_buf(struct
hns_roce_dev*hr_dev, structhns_roce_eq*eq,
+ u32page_shift)Thanks
Sorry, I confused
ib_alloc_device()andib_register_device(). What I was about to say isib_register_device().Order of these functions in hns driver is:
1.
ib_alloc_device()
2.map_eq_buf()
3.ib_register_device()Refer to code in
__ibdev_printk():else if (ibdev) printk("%s%s: %pV", level, dev_name(&ibdev->dev), vaf);If we called ibdev_*() before
ib_register_device(), it will print "null" for the device name. And I make a simple test, it will print like this:[ 41.400347] (null): -------------- This is a test!----------
Quoted 8 lines
Quoted 2 lines
Because
map_eq_buf()should be finished beforeib_register_device(), so I think we have to use dev_*() in it.Interesting, I wonder why "
ibdev->dev" is set so late. I afraid that it is a bug in hns.Thanks
I will check the code in hns and ib core to find out the reasons. Thank you.
Weihang
Quoted 23 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Thanks
WeihangQuoted 6 lines
Quoted 6 lines
Thanks for your reminder, another patch that replace other dev_* in hns driver with ibdev_* is on preparing.
Weihang
Quoted 9 lines
Quoted 8 lines
Quoted 5 lines
Quoted 4 lines
Quoted 2 lines
Quoted 2 lines
.
.
.
.
Jason Gunthorpe
AppliedQuoted 8 lines · Weihang Li
From: Xi Wang <[email protected]>
The eqe has a private multi-hop addressing implementation, but there is already a set of interfaces in the hns driver that can achieve this.
So, simplify the eqe buffer allocation process by using the mtr interface and remove large amount of repeated logic.
Quoted 6 lines
Signed-off-by Xi Wang <[email protected]>Signed-off-by Weihang Li <[email protected]>--- drivers/infiniband/hw/hns/hns_roce_device.h | 10 +- drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 481 ++++++---------------------- 2 files changed, 108 insertions(+), 383 deletions(-)
Applied to for-next thanks
Jason