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 8287D198E77; Thu, 5 Sep 2024 09:48:22 +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=1725529702; cv=none; b=LFb1ygdmpskJ/JQLJ2bIbcjkFsFwaAoJHpxO/yMHo3DJ6xkLDeJ23Q3g5e1W6z1C/W7G8OjbSTKzo9rAJHaG/AcAoz/CafLKKmgUszUrHTRQu6dxUp3MTq5I30bs8OMqcbyl/UMOyo+R8iSFyMyagdSXsHNoQO/a+/IvOqgEJUs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725529702; c=relaxed/simple; bh=sLCq/3ac6z+KZ3urSf4yxXxakRhVNxlUzYxxkr4uTRI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=npT72qTtdP+KQi2VTUouKpx3bPSWoU46o9Y8CTlL3bqj4sXI5W6us440Ap1bqLy1TkYRkyAMr5TndQRhvoI2a6j94aBp9ZNgi2FZ/Tj0PFs2aN6YkKQfrAvkEXfhI/u2qK4ZDXyZvKrkTGiLa6E1cs2SMS35ciinIDc6jVqL7QI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Vqy+iEsD; 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="Vqy+iEsD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0ACC4C4CEC3; Thu, 5 Sep 2024 09:48:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725529702; bh=sLCq/3ac6z+KZ3urSf4yxXxakRhVNxlUzYxxkr4uTRI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vqy+iEsD91cBhgbzw1W3ouZWKz4jYeSVEjq0TsO7g199I9xV7y3ZHn9FjZdoqDDtz ly3PRIqhq+sivlr5Yx8lqEu8SAyjK2gRT2xYsp8+5ScOhcUgwoSH+0KmupDOvNRHXf UT56tCJrVFOpZVhRdMsFYTHhC+pnBQDFg+E37dKk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Victor Skvortsov , Zhigang Luo , Alex Deucher , Sasha Levin Subject: [PATCH 6.10 116/184] drm/amdgpu: Queue KFD reset workitem in VF FED Date: Thu, 5 Sep 2024 11:40:29 +0200 Message-ID: <20240905093736.759129867@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240905093732.239411633@linuxfoundation.org> References: <20240905093732.239411633@linuxfoundation.org> User-Agent: quilt/0.67 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.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Victor Skvortsov [ Upstream commit 5434bc03f52de2ec57d6ce684b1853928f508cbc ] The guest recovery sequence is buggy in Fatal Error when both FLR & KFD reset workitems are queued at the same time. In addition, FLR guest recovery sequence is out of order when PF/VF communication breaks due to a GPU fatal error As a temporary work around, perform a KFD style reset (Initiate reset request from the guest) inside the pf2vf thread on FED. Signed-off-by: Victor Skvortsov Reviewed-by: Zhigang Luo Signed-off-by: Alex Deucher Signed-off-by: Sasha Levin --- drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index 761fff80ec1f..923d51f16ec8 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c @@ -602,7 +602,7 @@ static void amdgpu_virt_update_vf2pf_work_item(struct work_struct *work) amdgpu_sriov_runtime(adev) && !amdgpu_in_reset(adev)) { amdgpu_ras_set_fed(adev, true); if (amdgpu_reset_domain_schedule(adev->reset_domain, - &adev->virt.flr_work)) + &adev->kfd.reset_work)) return; else dev_err(adev->dev, "Failed to queue work! at %s", __func__); -- 2.43.0