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 8F2332FA643; Tue, 17 Jun 2025 16:54:11 +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=1750179251; cv=none; b=bVmJNwkSh8qQl/3JHaE2Aq46jn8O78kDTnBJBlZ6dNT93MEFXERxjQ3saH9Eqwx3wos3HmlV7l3I1NIkAXNwktb2unQDGcNYTlzMAmW1rNIiDXpiVDeK4U1p3y5ZKfvP1v+WWFvTOQfMev+QQSDwoOKU+cZO8DoqRMd7VymQZ/E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1750179251; c=relaxed/simple; bh=ohNXGaoJG3Ou+8nZL/K9dUyc4L2Pf5Ur+bdzGPwMVR0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=bmZ3yXtMAZkmyXXBo3v81Tw1RHkzx/qUvkPTNm4UO75cq26PTKLmVu8bCHi7l+343DZHJXbg7BpU46UR570jpY8g6YzlFWwk38K+L3D+YnPiK2Qd1lbtIEx2r/kD7+6GxjKFkLWQVA7pIL4QLFTFBrtzwKT5ozVN1NWE3QkvEak= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=1WqBHaKe; 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="1WqBHaKe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F1AACC4CEF0; Tue, 17 Jun 2025 16:54:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1750179251; bh=ohNXGaoJG3Ou+8nZL/K9dUyc4L2Pf5Ur+bdzGPwMVR0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1WqBHaKe1hkqyQ3/L8edJkt7OtArPWWoOQlgq6exrePkWx/X1FUEiMmU5OV6uIkmk n6x1KXwX28VhH64B4cKawNlW8Ts1htY3slSj9mQ0CczNuSlixHwa31m9B2SXoQobSZ +d6EJ+hOTJCFivUzapGisY5VltKiftpv6Wb4LdAU= 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 694/780] i40e: return false from i40e_reset_vf if reset is in progress Date: Tue, 17 Jun 2025 17:26:42 +0200 Message-ID: <20250617152519.756061318@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 a2c90d63b71223d69a813333c1abf4fdacddbbe5 ] The function i40e_vc_reset_vf attempts, up to 20 times, to handle a VF reset request, using the return value of i40e_reset_vf as an indicator of whether the reset was successfully triggered. Currently, i40e_reset_vf always returns true, which causes new reset requests to be ignored if a different VF reset is already in progress. This patch updates the return value of i40e_reset_vf to reflect when another VF reset is in progress, allowing the caller to properly use the retry mechanism. 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 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c index 1120f8e4bb670..22d5b1ec2289f 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c +++ b/drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c @@ -1546,8 +1546,8 @@ static void i40e_cleanup_reset_vf(struct i40e_vf *vf) * @vf: pointer to the VF structure * @flr: VFLR was issued or not * - * Returns true if the VF is in reset, resets successfully, or resets - * are disabled and false otherwise. + * Return: True if reset was performed successfully or if resets are disabled. + * False if reset is already in progress. **/ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) { @@ -1566,7 +1566,7 @@ bool i40e_reset_vf(struct i40e_vf *vf, bool flr) /* If VF is being reset already we don't need to continue. */ if (test_and_set_bit(I40E_VF_STATE_RESETTING, &vf->vf_states)) - return true; + return false; i40e_trigger_vf_reset(vf, flr); -- 2.39.5