From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C630C433F7 for ; Tue, 14 Jul 2020 19:04:04 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 25D1422AAF for ; Tue, 14 Jul 2020 19:04:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594753444; bh=HdD+zjhNHTtx9jtvQ4QzA4QAaCJhqfArhQrSAfv6lMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=LCocXYBuApnlBv+oB80A24jCX1pg0U3LdlIRVRQdOv6gnWbPkvn0hqqya4rZ3sGNr HHonRwC2pSuQwy9Vng9p3/JRlpw2qa/do7o9+YCPxSmLIx5581dnvzug7LgVz743wS ANAkvIDkneEEA9SG1S6kX21MHtTiS15NCLDsM7RU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731006AbgGNS4i (ORCPT ); Tue, 14 Jul 2020 14:56:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:54566 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730997AbgGNS4d (ORCPT ); Tue, 14 Jul 2020 14:56:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id CAF14229CA; Tue, 14 Jul 2020 18:56:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1594752993; bh=HdD+zjhNHTtx9jtvQ4QzA4QAaCJhqfArhQrSAfv6lMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WDM8ODjh6JG7l9caRfXnzCL26H8BfJurfIjb+SM5aJZWjVK53FYeKPqMIURhLbJ6e Slr3g+VtduUcMYcGzN8lqSqLR/4TMqNEaBgFg8RP+FoG6+eTtZ6DJd0pLwPMNYphch USdHl9Ezt5wATqhs+ehpSI7rrE5UltS5iZbCXLuw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Huazhong Tan , "David S. Miller" , Sasha Levin Subject: [PATCH 5.7 078/166] net: hns3: fix for mishandle of asserting VF reset fail Date: Tue, 14 Jul 2020 20:44:03 +0200 Message-Id: <20200714184119.586712582@linuxfoundation.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20200714184115.844176932@linuxfoundation.org> References: <20200714184115.844176932@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Huazhong Tan [ Upstream commit cddd5648926d7a6e84526dadd8bfb21609a14fb7 ] When asserts VF reset fail, flag HCLGEVF_STATE_CMD_DISABLE and handshake status should not set, otherwise the retry will fail. So adds a check for asserting VF reset and returns directly when fails. Fixes: ef5f8e507ec9 ("net: hns3: stop handling command queue while resetting VF") Signed-off-by: Huazhong Tan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c index e02d427131eeb..e6cdd06925e6b 100644 --- a/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c +++ b/drivers/net/ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c @@ -1527,6 +1527,11 @@ static int hclgevf_reset_prepare_wait(struct hclgevf_dev *hdev) if (hdev->reset_type == HNAE3_VF_FUNC_RESET) { hclgevf_build_send_msg(&send_msg, HCLGE_MBX_RESET, 0); ret = hclgevf_send_mbx_msg(hdev, &send_msg, true, NULL, 0); + if (ret) { + dev_err(&hdev->pdev->dev, + "failed to assert VF reset, ret = %d\n", ret); + return ret; + } hdev->rst_stats.vf_func_rst_cnt++; } -- 2.25.1