From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id E8F2AA09DF for ; Thu, 3 Dec 2020 11:00:04 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B8B34C954; Thu, 3 Dec 2020 11:00:03 +0100 (CET) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by dpdk.org (Postfix) with ESMTP id 60B04C940 for ; Thu, 3 Dec 2020 11:00:01 +0100 (CET) IronPort-SDR: eR6sW+cm+ajp9mzI6xz4nrjM7/27ttxMuxOnEz9acd25YKaZACJvQ4Kv+tK4GNqC9xZGFFc0uQ fWAbXEN6EFvw== X-IronPort-AV: E=McAfee;i="6000,8403,9823"; a="173325779" X-IronPort-AV: E=Sophos;i="5.78,389,1599548400"; d="scan'208";a="173325779" X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 03 Dec 2020 01:59:59 -0800 IronPort-SDR: UNLV7K8RBL6LepmWGX9ahzlcjE4LemhuhiDW1bNAQOEfNeUDbjuXXffKU4YBIWlSzOPiWnyAPw WlmDbRQu6kcw== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.78,389,1599548400"; d="scan'208";a="365689343" Received: from npg-dpdk-cvl-jeffguo-01.sh.intel.com ([10.67.111.128]) by fmsmga004.fm.intel.com with ESMTP; 03 Dec 2020 01:59:57 -0800 From: Jeff Guo To: ktraynor@redhat.com Cc: stable@dpdk.org, jia.guo@intel.com, Hailin Xu , Qi Zhang Date: Thu, 3 Dec 2020 17:47:00 +0800 Message-Id: <20201203094702.25734-1-jia.guo@intel.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 18.11 1/3] net/avf: fix command after PF reset X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" [ upstream commit 1eab95fe2e36e191ad85a9aacf82a44e7c8011fc ] If PF reset is finished but VF reset is pending, VF should no need to send any invalid cmd to PF. That would avoid mass unexpected behaviors affecting the robust. Fixes: 22b123a36d07 ("net/avf: initialize PMD") Signed-off-by: Jeff Guo Tested-by: Hailin Xu Acked-by: Qi Zhang --- drivers/net/avf/avf.h | 2 +- drivers/net/avf/avf_ethdev.c | 3 +++ drivers/net/avf/avf_vchnl.c | 3 +++ 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/net/avf/avf.h b/drivers/net/avf/avf.h index bef66a258c..112a5337a4 100644 --- a/drivers/net/avf/avf.h +++ b/drivers/net/avf/avf.h @@ -98,7 +98,7 @@ struct avf_info { enum virtchnl_link_speed link_speed; struct avf_vsi vsi; - bool vf_reset; + bool vf_reset; /* true for VF reset pending, false for no VF reset */ uint64_t flags; uint8_t *rss_lut; diff --git a/drivers/net/avf/avf_ethdev.c b/drivers/net/avf/avf_ethdev.c index 1a1d10e79f..35a7debf64 100644 --- a/drivers/net/avf/avf_ethdev.c +++ b/drivers/net/avf/avf_ethdev.c @@ -1136,6 +1136,9 @@ avf_init_vf(struct rte_eth_dev *dev) goto err_rss; } } + + vf->vf_reset = false; + return 0; err_rss: rte_free(vf->rss_key); diff --git a/drivers/net/avf/avf_vchnl.c b/drivers/net/avf/avf_vchnl.c index 7806014e80..29ef485184 100644 --- a/drivers/net/avf/avf_vchnl.c +++ b/drivers/net/avf/avf_vchnl.c @@ -76,6 +76,9 @@ avf_execute_vf_cmd(struct avf_adapter *adapter, struct avf_cmd_info *args) if (_atomic_set_cmd(vf, args->ops)) return -1; + if (vf->vf_reset) + return -EIO; + ret = avf_aq_send_msg_to_pf(hw, args->ops, AVF_SUCCESS, args->in_args, args->in_args_size, NULL); if (ret) { -- 2.20.1