From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 77582E555 for ; Mon, 29 Sep 2025 15:02:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759158124; cv=none; b=ltlJUOmlsXnxLo6+6t6HHTwsebl38e7WFzdk0U23L5EdoGSxykUCCZ10upglFtpmuccuR0h+W7lrvVdNZii6Rke8smngdyQ8j7P4TQzZCugXxpjiLpZhPS0SeimJspdAOdToOJjyJzc1U56Ik1xEEiRQYsBJyCkEyerDEDKiP6E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1759158124; c=relaxed/simple; bh=6rqKCWbeGBM168VWKr1hv2R0ihN+wWjGpGiIEfeI6Bk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SP8wnKBYePKIih7E468adJvVEJ4T9v2bf6M3yzvVA3Vwdn+Utpd+PYW42mzDbNa7fHl6lRbe+17CJ8MmcrtcCXC88WfYwN87iwX5aJkaR3kfR8lyOPKCLlGm6+pqdSi5fWacmHGY/24XZVR0nHgqC74DYiWlL2FcgnwXnKcF4O0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=WuXjuoVw; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="WuXjuoVw" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2E485C4CEF4; Mon, 29 Sep 2025 15:02:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1759158124; bh=6rqKCWbeGBM168VWKr1hv2R0ihN+wWjGpGiIEfeI6Bk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WuXjuoVwIjznUcdOEtU1Yq4lUm5OuV5SNBFFLLHRPwQInnifL9+d4hK+sspRnnq66 wLKHnJZOWdLP1DcLZXfPy6OLtfqqD5NbE5t/2AiIBOdlqHTKkdgAUhPXX6rkVttNL8 w+Be+jupf5qJhIiF9rbHbzT84B3hvP7KN305SvN32nJgveZ0gkmuHsrzzFBymU3C61 KWIaSVXeOL9Q57Z/xeLlSgRFPjsnt4ui82IN+bL98VYmR71oRjTbakWb0Sfw0lOZHR S8SUb0bfwpL1pQBvf7km6PnFrPZPc7hh52yydxKKWm59p9tj1dEhErVy0M1m/b4K/e UF8hMGV0T9uqA== From: Sasha Levin To: stable@vger.kernel.org Cc: Lukasz Czapnik , Aleksandr Loktionov , Przemek Kitszel , Simon Horman , Rafal Romanowski , Tony Nguyen , Sasha Levin Subject: [PATCH 5.4.y] i40e: fix validation of VF state in get resources Date: Mon, 29 Sep 2025 11:02:01 -0400 Message-ID: <20250929150201.114123-1-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <2025092913-monotype-pouch-f2e0@gregkh> References: <2025092913-monotype-pouch-f2e0@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Lukasz Czapnik [ Upstream commit 877b7e6ffc23766448236e8732254534c518ba42 ] VF state I40E_VF_STATE_ACTIVE is not the only state in which VF is actually active so it should not be used to determine if a VF is allowed to obtain resources. Use I40E_VF_STATE_RESOURCES_LOADED that is set only in i40e_vc_get_vf_resources_msg() and cleared during reset. Fixes: 61125b8be85d ("i40e: Fix failed opcode appearing if handling messages from VF") Cc: stable@vger.kernel.org Signed-off-by: Lukasz Czapnik Reviewed-by: Aleksandr Loktionov Signed-off-by: Przemek Kitszel Reviewed-by: Simon Horman Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen [ Adjust context ] Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 7 ++++++- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index d8ba409122032..a6ae0ade76798 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -1375,6 +1375,7 @@ static void i40e_trigger_vf_reset(struct i40e_vf *vf, bool flr) * functions that may still be running at this point. */ clear_bit(I40E_VF_STATE_INIT, &vf->vf_states); + clear_bit(I40E_VF_STATE_RESOURCES_LOADED, &vf->vf_states); /* In the case of a VFLR, the HW has already reset the VF and we * just need to clean up, so don't hit the VFRTRIG register. @@ -2048,7 +2049,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) size_t len = 0; int ret; - if (!i40e_sync_vf_state(vf, I40E_VF_STATE_INIT)) { + i40e_sync_vf_state(vf, I40E_VF_STATE_INIT); + + if (!test_bit(I40E_VF_STATE_INIT, &vf->vf_states) || + test_bit(I40E_VF_STATE_RESOURCES_LOADED, &vf->vf_states)) { aq_ret = I40E_ERR_PARAM; goto err; } @@ -2144,6 +2148,7 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) vf->default_lan_addr.addr); } set_bit(I40E_VF_STATE_ACTIVE, &vf->vf_states); + set_bit(I40E_VF_STATE_RESOURCES_LOADED, &vf->vf_states); err: /* send the response back to the VF */ diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h index 75d916714ad8a..de04b5b545b9f 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h @@ -41,7 +41,8 @@ enum i40e_vf_states { I40E_VF_STATE_MC_PROMISC, I40E_VF_STATE_UC_PROMISC, I40E_VF_STATE_PRE_ENABLE, - I40E_VF_STATE_RESETTING + I40E_VF_STATE_RESETTING, + I40E_VF_STATE_RESOURCES_LOADED, }; /* VF capabilities */ -- 2.51.0