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 DB02C2FA647; Tue, 17 Jun 2025 16:54:14 +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=1750179255; cv=none; b=Q4DRHzNm1NDTVGfnNn5bn+vfHZM1AYmF3SONw4LsmTPs35jQBHDBV+CnjohfkJx4eE10CmDVGhzj3VLVKmZaACves+VPUdstUYnXr76tgODLBqMaBynphKVqEvHZvSkd6dKDo+jfx/YH3imZEGG5DkB83TeEa31ZwKgw+rBZEuY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750179255; c=relaxed/simple; bh=RCjCOo0uuHUxVs5jGeurtDb7xDHx28ul/ncYWNb4Kfk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kUBh9kiyOgKKDM0CMFlubpa4kDhYysWWYnZ3PxB4usawoIYIKLkgrBAal94PfdvBA8eFuTiRY7KY9eNDaifCodjH3Rv+S9AyMVrwC43c3qIv7fPEXwxg3kvsT6vLPwB1ZmFQFwPpWhTAsjUp/fBPEWPVA1EiucjVttfBFRyo89Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y4EM3h0h; 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="Y4EM3h0h" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 40CF3C4CEE7; Tue, 17 Jun 2025 16:54:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750179254; bh=RCjCOo0uuHUxVs5jGeurtDb7xDHx28ul/ncYWNb4Kfk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y4EM3h0hbH3LN2PKiaYmi3tizAL1uG9xv/rYzC84gc5YYsvkM0MxKyqwhFEEK4/tt f2YuSGXU1sEcwzAQfVclPLgxkRQTQXCkEY+0sdNO6eNCoUEM9T2sHbX/nM7C0pakOS 09GsZudRZkBP3/u9DwXClb1H/r7jYF/5u71huF0Y= 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.15 695/780] i40e: retry VFLR handling if there is ongoing VF reset Date: Tue, 17 Jun 2025 17:26:43 +0200 Message-ID: <20250617152519.801783118@linuxfoundation.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250617152451.485330293@linuxfoundation.org> References: <20250617152451.485330293@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.15-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 22d5b1ec2289f..88e6bef69342c 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