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 891712EE277; Tue, 17 Jun 2025 16:13:17 +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=1750176797; cv=none; b=aFy5wIP/MycLkJn334DwtBUbi0EMVnKcwFtUXeA4E6oZRfOvBP1oGco5cXn+mXs4/9bAAL6/sqixN6E+u04CrsPIzfRaa9qLT55+q6p4vAj6Dw0pl1zlonFgOoKwjmPYkiF3ML1I2s8Osp5G1eXr4UwGyRE7t1cbRXgv+XqQols= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750176797; c=relaxed/simple; bh=Xcb3Swoeh2X4FTV94Lsx/6CigMtcZVAOCYvSnb8CWqw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=axzsCcVMJ5sVVKL3wnOIajk6h6Xy/AjxqzeW4OlOxf7hHTjyoqvS8vIilWTuaH0PHptPKpTB8G0ym/+aCp7h0jhBhHhKdz84GForI56fT6IpRHnPPLtE/Rf0ym1f5zXYif8CAOQNOltmAN8qBNqnVAuyDy4sET9wgdxx3U3eQr4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=CrXJgx1a; 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="CrXJgx1a" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E5409C4CEE3; Tue, 17 Jun 2025 16:13:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750176797; bh=Xcb3Swoeh2X4FTV94Lsx/6CigMtcZVAOCYvSnb8CWqw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CrXJgx1aPe4Q+vPShjv2oqYuTRljWWBi30NYjr4q2QpWxrLicEZKyFIDEneQaMPLW yhoFG7VIK/2L6AEtMa4pZFX0eC2GO8WS3AwnLqMwu6R8VK4goaHyqy99ncqINPrORG jJ5ZcPGCL3cToXBqxlf1ZQPx++LUHaocrxrUYJ1E= 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.6 314/356] i40e: retry VFLR handling if there is ongoing VF reset Date: Tue, 17 Jun 2025 17:27:09 +0200 Message-ID: <20250617152350.801715791@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152338.212798615@linuxfoundation.org> References: <20250617152338.212798615@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.6-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 348869f05020f..80036942dc764 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -4332,7 +4332,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