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 CB9922E8E05; Tue, 17 Jun 2025 16:35:28 +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=1750178128; cv=none; b=ljqucXfpb3T2OfWZ6tnFdsHcq+sONwJIKok7oCzcvLimfN3kqIyi2UP3kZWv1T/4qxlywH4b6LoleEj3eUVuw64PC5ioCwfoJploVw60DRC9CIEsmsY39fkyagiXoam6gVWcIP2hVyK9SOg+WOnx+uovJS4WhsMlR4i1BDYJqes= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750178128; c=relaxed/simple; bh=X4MwqNwTFTAA2oh9Abis/kEIIfi11MGUSxVluYCSm38=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=lOxi19/J89d7b7BN87cw57yDWOtDuW/Nrh7dopx1wo/zbwF4hStyBscGgX2ybsgW+lY3AVtWl7cTD5eRRbzSlAic4wrZ4G4fREGoWWneAAeFTbmXcOzFcmCAgumxvdoPYryFVeg0+iQnaJ+V21FoW/4tpQkGcLMHViQOGPmGLqM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rSpuRMj9; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rSpuRMj9" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CFA0CC4CEE3; Tue, 17 Jun 2025 16:35:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750178128; bh=X4MwqNwTFTAA2oh9Abis/kEIIfi11MGUSxVluYCSm38=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rSpuRMj9ay5YQrb9Mj2NC9ThOCuGKhVy1o7qQlNggkEIcG5dHEL7VqR+dmJrTwtzL 9k7jB+Hx7vYXfoktCUg9Q24KARWXbAgOkU83eFdAuaySvLWsq32DWWtPzJt+rebxSR tnNkW9tQcYlRdRAe/b89h/xh4/thfpkImcSdfx8s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Robert Malz , Rafal Romanowski , Tony Nguyen , Sasha Levin Subject: [PATCH 6.12 450/512] i40e: retry VFLR handling if there is ongoing VF reset Date: Tue, 17 Jun 2025 17:26:56 +0200 Message-ID: <20250617152437.803326358@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152419.512865572@linuxfoundation.org> References: <20250617152419.512865572@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-stable review patch. If anyone has any objections, please let me know. ------------------ From: Robert Malz [ Upstream commit fb4e9239e029954a37a00818b21e837cebf2aa10 ] When a VFLR interrupt is received during a VF reset initiated from a different source, the VFLR may be not fully handled. This can leave the VF in an undefined state. To address this, set the I40E_VFLR_EVENT_PENDING bit again during VFLR handling if the reset is not yet complete. This ensures the driver will properly complete the VF reset in such scenarios. Fixes: 52424f974bc5 ("i40e: Fix VF hang when reset is triggered on another VF") Signed-off-by: Robert Malz Tested-by: Rafal Romanowski Signed-off-by: Tony Nguyen Signed-off-by: Sasha Levin --- drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index bde41d30c69ee..625fa93fc18bb 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -4328,7 +4328,10 @@ int i40e_vc_process_vflr_event(struct i40e_pf *pf) reg = rd32(hw, I40E_GLGEN_VFLRSTAT(reg_idx)); if (reg & BIT(bit_idx)) /* i40e_reset_vf will clear the bit in GLGEN_VFLRSTAT */ - i40e_reset_vf(vf, true); + if (!i40e_reset_vf(vf, true)) { + /* At least one VF did not finish resetting, retry next time */ + set_bit(__I40E_VFLR_EVENT_PENDING, pf->state); + } } return 0; -- 2.39.5