hinic: mailbox channel enhancement
Subsystems (3)
v2 cover hinic: mailbox channel enhancement
add support to generate mailbox random id for VF to ensure that the mailbox message from VF is valid and PF should check whether the cmd from VF is supported before passing it to hw.
Luo bin (2):
hinic: add generating mailbox random index support
hinic: add check for mailbox msg from VF
.../net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 8 + .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 13 + .../net/ethernet/huawei/hinic/hinic_hw_mbox.c | 309 +++++++++++++++++- .../net/ethernet/huawei/hinic/hinic_hw_mbox.h | 22 ++ .../net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 2 + .../net/ethernet/huawei/hinic/hinic_sriov.c | 69 +++- 6 files changed, 421 insertions(+), 2 deletions(-)
Signature · 1 line
2.17.1
PATCH v2 1/2 hinic: add generating mailbox random index support
add support to generate mailbox random id of VF to ensure that mailbox messages PF received are from the correct VF.
--- .../net/ethernet/huawei/hinic/hinic_hw_dev.h | 13 ++ .../net/ethernet/huawei/hinic/hinic_hw_mbox.c | 136 ++++++++++++++++++ .../net/ethernet/huawei/hinic/hinic_hw_mbox.h | 8 ++ .../net/ethernet/huawei/hinic/hinic_hw_mgmt.h | 2 + .../net/ethernet/huawei/hinic/hinic_sriov.c | 7 + 5 files changed, 166 insertions(+)
drivers/net/ethernet/huawei/hinic/hinic_hw_dev.h +13 -0
@@ -28,6 +28,8 @@#define HINIC_MGMT_STATUS_EXIST 0x6#define HINIC_MGMT_CMD_UNSUPPORTED 0xFF +#define HINIC_CMD_VER_FUNC_ID 2 +struct hinic_cap {u16 max_qps;u16 num_qps;
@@ -313,6 +315,17 @@ struct hinic_msix_config {u8 rsvd1[3 ]; }; +struct hinic_set_random_id { +u8 status; +u8 version; +u8 rsvd0[6 ]; + +u8 vf_in_pf; +u8 rsvd1; +u16 func_idx; +u32 random_id; +}; +struct hinic_board_info {u32 board_type;u32 port_num;
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +136 -0
151 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h +8 -0
@@ -22,6 +22,8 @@#define HINIC_FUNC_CSR_MAILBOX_RESULT_H_OFF 0x0108#define HINIC_FUNC_CSR_MAILBOX_RESULT_L_OFF 0x010C +#define MAX_FUNCTION_NUM 512 +enum hinic_mbox_ack_type {MBOX_ACK ,MBOX_NO_ACK ,
@@ -100,6 +102,10 @@ struct hinic_mbox_func_to_func {/* lock for mbox event flag */ spinlock_t mbox_lock; + +u32 vf_mbx_old_rand_id[MAX_FUNCTION_NUM ]; +u32 vf_mbx_rand_id[MAX_FUNCTION_NUM ]; +bool support_vf_random; };struct hinic_mbox_work {
@@ -151,4 +157,6 @@ int hinic_mbox_to_vf(struct hinic_hwdev *hwdev, enum hinic_mod_type mod, u16 vf_id, u8 cmd, void *buf_in, u16 in_size, void *buf_out, u16 *out_size, u32 timeout); +int hinic_vf_mbox_random_id_init (struct hinic_hwdev *hwdev); +#endif
drivers/net/ethernet/huawei/hinic/hinic_hw_mgmt.h +2 -0
@@ -93,6 +93,8 @@ enum hinic_comm_cmd {HINIC_COMM_CMD_WATCHDOG_INFO =0x56 , +HINIC_MGMT_CMD_SET_VF_RANDOM_ID =0x61 , + HINIC_COMM_CMD_MAX, };
drivers/net/ethernet/huawei/hinic/hinic_sriov.c +7 -0
@@ -1108,6 +1108,13 @@ int hinic_vf_func_init(struct hinic_hwdev *hwdev)int err =0 ;u32 size, i; + err =hinic_vf_mbox_random_id_init (hwdev); +if (err) { +dev_err (&hwdev->hwif->pdev->dev,"Failed to init vf mbox random id, err: %d\n" , + err); +return err; + } + nic_io = &hwdev->func_to_io;if (HINIC_IS_VF (hwdev->hwif)) {
Signature · 1 line
2.17.1
Jakub Kicinski
maintainerRe: [PATCH net-next v2 1/2] hinic: add generating mailbox random index support
Quoted 16 lines · On Fri, 31 Jul 2020 09:56:41 +0800 Luo bin wrote:
add support to generate mailbox random id of VF to ensure that mailbox messages PF received are from the correct VF.
Signed-off-by Luo bin <[email protected]>drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +3
-0@@ -486,6 +486,111 @@ static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func,kfree (rcv_mbox_temp); } +static int set_vf_mbox_random_id (struct hinic_hwdev *hwdev,u16 func_id) +{ +struct hinic_mbox_func_to_func *func_to_func = hwdev->func_to_func;
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func, · line 501
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +10
-0+struct hinic_set_random_id rand_info = {0 }; +u16 out_size =sizeof (rand_info); +struct hinic_pfhwdev *pfhwdev; +int ret; + + pfhwdev = container_of(hwdev, struct hinic_pfhwdev, hwdev); + + rand_info.version =HINIC_CMD_VER_FUNC_ID ; + rand_info.func_idx = func_id; + rand_info.vf_in_pf = (u8)(func_id -hinic_glb_pf_vf_offset (hwdev->hwif));
this cast is unnecessary
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func, · line 502
Quoted 1 line
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +1
-0+get_random_bytes (&rand_info.random_id,sizeof (u32));
get_random_u32()
Quoted 46 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +45
-0+ + func_to_func->vf_mbx_rand_id[func_id] = rand_info.random_id; + + ret =hinic_msg_to_mgmt (&pfhwdev->pf_to_mgmt,HINIC_MOD_COMM , +HINIC_MGMT_CMD_SET_VF_RANDOM_ID , + &rand_info,sizeof (rand_info), + &rand_info, &out_size,HINIC_MGMT_MSG_SYNC ); +if ((rand_info.status !=HINIC_MGMT_CMD_UNSUPPORTED && + rand_info.status) || !out_size || ret) { +dev_err (&hwdev->hwif->pdev->dev,"Set VF random id failed, err: %d, status: 0x%x, out size: 0x%x\n" , + ret, rand_info.status, out_size); +return -EIO ; + } + +if (rand_info.status ==HINIC_MGMT_CMD_UNSUPPORTED ) +return rand_info.status; + + func_to_func->vf_mbx_old_rand_id[func_id] = + func_to_func->vf_mbx_rand_id[func_id]; + +return 0 ; +} +static bool check_vf_mbox_random_id (struct hinic_mbox_func_to_func *func_to_func, +u8 *header) +{ +struct hinic_hwdev *hwdev = func_to_func->hwdev; +struct hinic_mbox_work *mbox_work =NULL ; +u64 mbox_header = *((u64 *)header); +u16 offset, src; +u32 random_id; +int vf_in_pf; + + src =HINIC_MBOX_HEADER_GET (mbox_header,SRC_GLB_FUNC_IDX ); + +if (IS_PF_OR_PPF_SRC (src) || !func_to_func->support_vf_random) +return true; + +if (!HINIC_IS_PPF (hwdev->hwif)) { + offset =hinic_glb_pf_vf_offset (hwdev->hwif); + vf_in_pf = src - offset; + +if (vf_in_pf <1 || vf_in_pf > hwdev->nic_cap.max_vf) { + dev_warn(&hwdev->hwif->pdev->dev, + "Receive vf id(0x%x) is invalid, vf id should be from 0x%x to 0x%x\n", + src, offset + 1,
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func, · line 574
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +10
-0+ hwdev->nic_cap.max_vf + offset); +return false; + } + } + + random_id =be32_to_cpu (*(u32 *)(header +MBOX_SEG_LEN + +MBOX_HEADER_SZ )); + +if (random_id == func_to_func->vf_mbx_rand_id[src] || + random_id == func_to_func->vf_mbx_old_rand_id[src])
What guarantees src < MAX_FUNCTION_NUM ?
Quoted 20 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +19
-0+return true; + +dev_warn (&hwdev->hwif->pdev->dev, +"The mailbox random id(0x%x) of func_id(0x%x) doesn't match with pf reservation(0x%x)\n" , + random_id, src, func_to_func->vf_mbx_rand_id[src]); + + mbox_work =kzalloc (sizeof (*mbox_work),GFP_KERNEL ); +if (!mbox_work) +return false; + + mbox_work->func_to_func = func_to_func; + mbox_work->src_func_idx = src; + +INIT_WORK (&mbox_work->work, update_random_id_work_handler); +queue_work (func_to_func->workq, &mbox_work->work); + +return false; +} +int hinic_vf_mbox_random_id_init (struct hinic_hwdev *hwdev)
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func,
Quoted 10 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +10
-0+{ +u8 vf_in_pf; +int err =0 ; + +if (HINIC_IS_VF (hwdev->hwif)) +return 0 ; + +for (vf_in_pf =1 ; vf_in_pf <= hwdev->nic_cap.max_vf; vf_in_pf++) { + err =set_vf_mbox_random_id (hwdev,hinic_glb_pf_vf_offset + (hwdev->hwif) + vf_in_pf);
Parenthesis around hwdev->hwif not necessary
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c void hinic_func_to_func_free(struct hinic_hwdev *hwdev) · line 1338
Quoted 6 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +6
-0+if (err) +break ; + } + +if (err ==HINIC_MGMT_CMD_UNSUPPORTED ) { + hwdev->func_to_func->support_vf_random = false;
So all VFs need to support the feature for it to be used?
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c void hinic_func_to_func_free(struct hinic_hwdev *hwdev) · line 1344
Quoted 6 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +6
-0+ err =0 ; +dev_warn (&hwdev->hwif->pdev->dev,"Mgmt is unsupported to set VF%d random id\n" , + vf_in_pf -1 ); + }else if (!err) { + hwdev->func_to_func->support_vf_random = true; +dev_info (&hwdev->hwif->pdev->dev,"PF Set VF random id success\n" );
Is this info message really necessary?
Quoted 1 line
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +1
-0+ }
Re: [PATCH net-next v2 1/2] hinic: add generating mailbox random index support
Quoted 14 lines · Jakub Kicinski
Quoted 13 lines · On Fri, 31 Jul 2020 09:56:41 +0800 Luo bin wrote:
add support to generate mailbox random id of VF to ensure that mailbox messages PF received are from the correct VF.
Signed-off-by Luo bin <[email protected]>drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +0
-0@@ -486,6 +486,111 @@ static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func,kfree (rcv_mbox_temp); }
Quoted 16 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func, · line 501
Quoted 13 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +13
-0+static int set_vf_mbox_random_id (struct hinic_hwdev *hwdev,u16 func_id) +{ +struct hinic_mbox_func_to_func *func_to_func = hwdev->func_to_func; +struct hinic_set_random_id rand_info = {0 }; +u16 out_size =sizeof (rand_info); +struct hinic_pfhwdev *pfhwdev; +int ret; + + pfhwdev = container_of(hwdev, struct hinic_pfhwdev, hwdev); + + rand_info.version =HINIC_CMD_VER_FUNC_ID ; + rand_info.func_idx = func_id; + rand_info.vf_in_pf = (u8)(func_id -hinic_glb_pf_vf_offset (hwdev->hwif));this cast is unnecessary
Will fix. Thanks for your review.
Quoted 4 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func, · line 502
Quoted 1 line
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +1
-0+get_random_bytes (&rand_info.random_id,sizeof (u32));
get_random_u32()
Will fix. Thanks for your review.
Quoted 50 lines
Quoted 50 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +49
-0+ + func_to_func->vf_mbx_rand_id[func_id] = rand_info.random_id; + + ret =hinic_msg_to_mgmt (&pfhwdev->pf_to_mgmt,HINIC_MOD_COMM , +HINIC_MGMT_CMD_SET_VF_RANDOM_ID , + &rand_info,sizeof (rand_info), + &rand_info, &out_size,HINIC_MGMT_MSG_SYNC ); +if ((rand_info.status !=HINIC_MGMT_CMD_UNSUPPORTED && + rand_info.status) || !out_size || ret) { +dev_err (&hwdev->hwif->pdev->dev,"Set VF random id failed, err: %d, status: 0x%x, out size: 0x%x\n" , + ret, rand_info.status, out_size); +return -EIO ; + } + +if (rand_info.status ==HINIC_MGMT_CMD_UNSUPPORTED ) +return rand_info.status; + + func_to_func->vf_mbx_old_rand_id[func_id] = + func_to_func->vf_mbx_rand_id[func_id]; + +return 0 ; +} +static bool check_vf_mbox_random_id (struct hinic_mbox_func_to_func *func_to_func, +u8 *header) +{ +struct hinic_hwdev *hwdev = func_to_func->hwdev; +struct hinic_mbox_work *mbox_work =NULL ; +u64 mbox_header = *((u64 *)header); +u16 offset, src; +u32 random_id; +int vf_in_pf; + + src =HINIC_MBOX_HEADER_GET (mbox_header,SRC_GLB_FUNC_IDX ); + +if (IS_PF_OR_PPF_SRC (src) || !func_to_func->support_vf_random) +return true; + +if (!HINIC_IS_PPF (hwdev->hwif)) { + offset =hinic_glb_pf_vf_offset (hwdev->hwif); + vf_in_pf = src - offset; + +if (vf_in_pf <1 || vf_in_pf > hwdev->nic_cap.max_vf) { +dev_warn (&hwdev->hwif->pdev->dev, +"Receive vf id(0x%x) is invalid, vf id should be from 0x%x to 0x%x\n" , + src, offset +1 , + hwdev->nic_cap.max_vf + offset); +return false; + } + }
Quoted 9 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c static void recv_mbox_handler(struct hinic_mbox_func_to_func *func_to_func, · line 574
Quoted 6 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +6
-0+ + random_id =be32_to_cpu (*(u32 *)(header +MBOX_SEG_LEN + +MBOX_HEADER_SZ )); + +if (random_id == func_to_func->vf_mbx_rand_id[src] || + random_id == func_to_func->vf_mbx_old_rand_id[src])What guarantees src <
MAX_FUNCTION_NUM?
It has been checked if src >= MAX_FUNCTION_NUM in hinic_mbox_func_aeqe_handler before calling this function.
Quoted 19 lines
Quoted 18 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +18
-0+return true; + +dev_warn (&hwdev->hwif->pdev->dev, +"The mailbox random id(0x%x) of func_id(0x%x) doesn't match with pf reservation(0x%x)\n" , + random_id, src, func_to_func->vf_mbx_rand_id[src]); + + mbox_work =kzalloc (sizeof (*mbox_work),GFP_KERNEL ); +if (!mbox_work) +return false; + + mbox_work->func_to_func = func_to_func; + mbox_work->src_func_idx = src; + +INIT_WORK (&mbox_work->work, update_random_id_work_handler); +queue_work (func_to_func->workq, &mbox_work->work); + +return false; +}
Quoted 13 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c void hinic_func_to_func_free(struct hinic_hwdev *hwdev) · line 1332
Quoted 11 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +11
-0+int hinic_vf_mbox_random_id_init (struct hinic_hwdev *hwdev) +{ +u8 vf_in_pf; +int err =0 ; + +if (HINIC_IS_VF (hwdev->hwif)) +return 0 ; + +for (vf_in_pf =1 ; vf_in_pf <= hwdev->nic_cap.max_vf; vf_in_pf++) { + err =set_vf_mbox_random_id (hwdev,hinic_glb_pf_vf_offset + (hwdev->hwif) + vf_in_pf);Parenthesis around
hwdev->hwifnot necessary
hwdev->hwif is the parameter of hinic_glb_pf_vf_offset function.
Quoted 9 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c void hinic_func_to_func_free(struct hinic_hwdev *hwdev) · line 1338
Quoted 7 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +6
-0+if (err) +break ; + } + +if (err ==HINIC_MGMT_CMD_UNSUPPORTED ) { + hwdev->func_to_func->support_vf_random = false;So all VFs need to support the feature for it to be used?
If this feature is not supported by fw, VFs can also be used, so we return success.
Quoted 9 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c void hinic_func_to_func_free(struct hinic_hwdev *hwdev) · line 1344
Quoted 7 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +6
-0+ err =0 ; +dev_warn (&hwdev->hwif->pdev->dev,"Mgmt is unsupported to set VF%d random id\n" , + vf_in_pf -1 ); + }else if (!err) { + hwdev->func_to_func->support_vf_random = true; +dev_info (&hwdev->hwif->pdev->dev,"PF Set VF random id success\n" );Is this info message really necessary?
I'll remove this info message. Thanks.
Quoted 5 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c
Quoted 2 lines
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +1
-0+ }.
PATCH v2 2/2 hinic: add check for mailbox msg from VF
In reply to Luo binPF should check whether the cmd from VF is supported and its content is right before passing it to hw.
---
V1~V2: fix W=1 C=1 warnings
.../net/ethernet/huawei/hinic/hinic_hw_cmdq.h | 8 + .../net/ethernet/huawei/hinic/hinic_hw_mbox.c | 173 +++++++++++++++++- .../net/ethernet/huawei/hinic/hinic_hw_mbox.h | 14 ++ .../net/ethernet/huawei/hinic/hinic_sriov.c | 62 ++++++- 4 files changed, 255 insertions(+), 2 deletions(-)
drivers/net/ethernet/huawei/hinic/hinic_hw_cmdq.h +8 -0
@@ -31,6 +31,10 @@ (((u64)(val) & HINIC_CMDQ_CTXT_##member##_MASK) \ << HINIC_CMDQ_CTXT_##member##_SHIFT) +#define HINIC_CMDQ_CTXT_PAGE_INFO_GET (val, member) \ + (((u64)(val) >> HINIC_CMDQ_CTXT_##member##_SHIFT) \ + & HINIC_CMDQ_CTXT_##member##_MASK) +#define HINIC_CMDQ_CTXT_PAGE_INFO_CLEAR (val, member) \ ((val) & (~((u64)HINIC_CMDQ_CTXT_##member##_MASK \ << HINIC_CMDQ_CTXT_##member##_SHIFT)))
@@ -45,6 +49,10 @@ (((u64)(val) & HINIC_CMDQ_CTXT_##member##_MASK) \ << HINIC_CMDQ_CTXT_##member##_SHIFT) +#define HINIC_CMDQ_CTXT_BLOCK_INFO_GET (val, member) \ + (((u64)(val) >> HINIC_CMDQ_CTXT_##member##_SHIFT) \ + & HINIC_CMDQ_CTXT_##member##_MASK) +#define HINIC_CMDQ_CTXT_BLOCK_INFO_CLEAR (val, member) \ ((val) & (~((u64)HINIC_CMDQ_CTXT_##member##_MASK \ << HINIC_CMDQ_CTXT_##member##_SHIFT)))
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.c +172 -1
200 lines not on this page · raw message
drivers/net/ethernet/huawei/hinic/hinic_hw_mbox.h +14 -0
@@ -24,6 +24,12 @@#define MAX_FUNCTION_NUM 512 +struct vf_cmd_check_handle { +u8 cmd; +bool (*check_cmd)(struct hinic_hwdev *hwdev,u16 src_func_idx, +void *buf_in,u16 in_size); +}; +enum hinic_mbox_ack_type {MBOX_ACK ,MBOX_NO_ACK ,
@@ -122,6 +128,14 @@ struct vf_cmd_msg_handle { void *buf_out, u16 *out_size); }; +bool hinic_mbox_check_func_id_8B (struct hinic_hwdev *hwdev,u16 func_idx, +void *buf_in,u16 in_size); + +bool hinic_mbox_check_cmd_valid (struct hinic_hwdev *hwdev, +struct vf_cmd_check_handle *cmd_handle, +u16 vf_id,u8 cmd,void *buf_in, +u16 in_size,u8 size); +int hinic_register_pf_mbox_cb (struct hinic_hwdev *hwdev,enum hinic_mod_type mod,hinic_pf_mbox_cb callback);
drivers/net/ethernet/huawei/hinic/hinic_sriov.c +61 -1
86 lines not on this page · raw message
Signature · 1 line
2.17.1