From patchwork Tue Jun 5 11:42:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Salil Mehta X-Patchwork-Id: 137713 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp850646lji; Tue, 5 Jun 2018 04:43:48 -0700 (PDT) X-Google-Smtp-Source: ADUXVKI81UNZzcNrydso5T8zyVX+UPuZxhjBHLV3LfAe7+iALOhABZ+tax+bxFdHWDin8H+x6Eyy X-Received: by 2002:a63:6dce:: with SMTP id i197-v6mr14985920pgc.215.1528199027878; Tue, 05 Jun 2018 04:43:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528199027; cv=none; d=google.com; s=arc-20160816; b=mkVNf+8IBCyvxCNpBjQiOqsxczKZGGeK+nj6krvSAl1bKtp0l9SPSsnkGjkvz11EEY 0H5DEqflJ2K5hVNnaQF5RxaYTkYKJPo4nObNniDfubSLTTLoGVvKTjYytT+ptSn74JGp 8zkErBvhgSCHz3s5gedIF9EODCYywWZLs7m6v7MoDNIYkox0Iw89U2WOQSQbAugLlhBC 6Z3kJWAahZXGB4xjwJWs0ds65Ge1ipY/F4D5x57rNHYL6YgBGwn+31zUGiuKyuuxQnaU eo8mAa7k9zQiNXA9xIwxOzC9fXC3U0/vUXk7k4VEaEcSL+aPji2Yc4PFW2w/Ucq/rxB3 UQsg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:arc-authentication-results; bh=vGS1L2WqciQtHTFWZci1SxLp953fa3RmW7nswYfC9ak=; b=EIqi4o1PWFAS4QhHViKcyC1rVdmguOYfNeqNnGR/yLbVHsm+ErfEbgyLivhxhcRlKh POStc6oS0QPztW5BcXoBe781YR+dpSKwGPnO9B+RGqCPsTFANqy5+IqXgxzCH6atmReF sWTN6g/ss2uhC+r/16i2WHloM07ekxHnfj3uLuaoNsoDMNL4XXzdkyuH99kOSAj2M2iF 2+4BPNTNRqkJ+hEypqqfRUHrbLhwaSQ46Y5f+S0R2vQ4UeKoVKaVWZpGOSP2JVa+VrJc +TvHWIX2MBvqLAAXqaT3bi7DiHPXlGKW40g4qboCed9mlvFniUg8cniqEx6jEsm6Qotg svJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k5-v6si8598725pgs.680.2018.06.05.04.43.47; Tue, 05 Jun 2018 04:43:47 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751969AbeFELnp (ORCPT + 30 others); Tue, 5 Jun 2018 07:43:45 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:8696 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751866AbeFELnK (ORCPT ); Tue, 5 Jun 2018 07:43:10 -0400 Received: from DGGEMS412-HUB.china.huawei.com (unknown [172.30.72.59]) by Forcepoint Email with ESMTP id 8CD26CDE3E4FF; Tue, 5 Jun 2018 19:42:53 +0800 (CST) Received: from S00293818-DELL1.china.huawei.com (10.202.227.234) by DGGEMS412-HUB.china.huawei.com (10.3.19.212) with Microsoft SMTP Server id 14.3.382.0; Tue, 5 Jun 2018 19:42:48 +0800 From: Salil Mehta To: CC: , , , , , , , Xi Wang Subject: [PATCH net-next 2/3] net: hns3: Fix for VF mailbox receiving unknown message Date: Tue, 5 Jun 2018 12:42:00 +0100 Message-ID: <20180605114201.29900-3-salil.mehta@huawei.com> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20180605114201.29900-1-salil.mehta@huawei.com> References: <20180605114201.29900-1-salil.mehta@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.202.227.234] X-CFilter-Loop: Reflected Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Xi Wang Before the firmware updates the crq's tail pointer, if the VF driver reads the data in the crq, the data may be incomplete at this time, which will lead to the driver read an unknown message. This patch fixes it by checking if crq is empty before reading the message. Fixes: b11a0bb231f3 ("net: hns3: Add mailbox support to VF driver") Signed-off-by: Xi Wang Signed-off-by: Peng Li Signed-off-by: Salil Mehta --- .../ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c | 23 +++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) -- 2.7.4 diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c index a286184..173ca27 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_mbx.c @@ -126,6 +126,13 @@ int hclgevf_send_mbx_msg(struct hclgevf_dev *hdev, u16 code, u16 subcode, return status; } +static bool hclgevf_cmd_crq_empty(struct hclgevf_hw *hw) +{ + u32 tail = hclgevf_read_dev(hw, HCLGEVF_NIC_CRQ_TAIL_REG); + + return tail == hw->cmq.crq.next_to_use; +} + void hclgevf_mbx_handler(struct hclgevf_dev *hdev) { struct hclgevf_mbx_resp_status *resp; @@ -140,11 +147,22 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev) resp = &hdev->mbx_resp; crq = &hdev->hw.cmq.crq; - flag = le16_to_cpu(crq->desc[crq->next_to_use].flag); - while (hnae_get_bit(flag, HCLGEVF_CMDQ_RX_OUTVLD_B)) { + while (!hclgevf_cmd_crq_empty(&hdev->hw)) { desc = &crq->desc[crq->next_to_use]; req = (struct hclge_mbx_pf_to_vf_cmd *)desc->data; + flag = le16_to_cpu(crq->desc[crq->next_to_use].flag); + if (unlikely(!hnae3_get_bit(flag, HCLGEVF_CMDQ_RX_OUTVLD_B))) { + dev_warn(&hdev->pdev->dev, + "dropped invalid mailbox message, code = %d\n", + req->msg[0]); + + /* dropping/not processing this invalid message */ + crq->desc[crq->next_to_use].flag = 0; + hclge_mbx_ring_ptr_move_crq(crq); + continue; + } + /* synchronous messages are time critical and need preferential * treatment. Therefore, we need to acknowledge all the sync * responses as quickly as possible so that waiting tasks do not @@ -205,7 +223,6 @@ void hclgevf_mbx_handler(struct hclgevf_dev *hdev) } crq->desc[crq->next_to_use].flag = 0; hclge_mbx_ring_ptr_move_crq(crq); - flag = le16_to_cpu(crq->desc[crq->next_to_use].flag); } /* Write back CMDQ_RQ header pointer, M7 need this pointer */