Commit e8664a41 authored by Yonglong Liu's avatar Yonglong Liu Committed by Jiantao Xiao
Browse files

net: hns3: add barrier in vf mailbox reply process 

maillist inclusion
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8GVK7
CVE: NA

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=ac92c0a9a0603fb448e60f38e63302e4eebb8035



----------------------------------------------------------------------

In hclgevf_mbx_handler() and hclgevf_get_mbx_resp() functions,
there is a typical store-store and load-load scenario between
received_resp and additional_info. This patch adds barrier
to fix the problem.

Fixes: 4671042f ("net: hns3: add match_id to check mailbox response from PF to VF")
Signed-off-by: default avatarYonglong Liu <liuyonglong@huawei.com>
Signed-off-by: default avatarJijie Shao <shaojijie@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarJiantao Xiao <xiaojiantao1@h-partners.com>
parent ed4c58f9

drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c

+7 −0
Original line number Diff line number Diff line
@@ -63,6 +63,9 @@ static int hclgevf_get_mbx_resp(struct hclgevf_dev *hdev, u16 code0, u16 code1, 
		i++;

	}



	/* ensure additional_info will be seen after received_resp */

	smp_rmb();



	if (i >= HCLGEVF_MAX_TRY_TIMES) {

		dev_err(&hdev->pdev->dev,

			"VF could not get mbx(%u,%u) resp(=%d) from PF in %d tries\n",
@@ -178,6 +181,10 @@ static void hclgevf_handle_mbx_response(struct hclgevf_dev *hdev, 
	resp->resp_status = hclgevf_resp_to_errno(resp_status);

	memcpy(resp->additional_info, req->msg.resp_data,

	       HCLGE_MBX_MAX_RESP_DATA_SIZE * sizeof(u8));



	/* ensure additional_info will be seen before setting received_resp */

	smp_wmb();



	if (match_id) {

		/* If match_id is not zero, it means PF support match_id.

		 * if the match_id is right, VF get the right response, or