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 9F1DE2D7BF; Tue, 3 Dec 2024 15:24: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=1733239454; cv=none; b=g8OBS0+GSDIoDf7h9t059WfL9J39dRZJU6DA873xRYau/4+0o1Gp02XsQmN/pfi/9o5uR3DjmqP3KN4RBkBFPI2xUbdna069jkY3CKGDtJl9wiKu0JqzA8S2FIQ8KRaKLQNewpmz5ZgW85Cl/PjUS2HgeOua+89ATZtqE5WCA4c= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733239454; c=relaxed/simple; bh=/GBCHz1u8tL/WdKeYNS9ipXlpsB1D7kRrHBTVQ2jwDk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=CcSGYN9xIkjXcAVmiucDh0AvhuGzpLC97XeWnm2npuQsPJg4WnF9xK3u4RFY5/OTADQn/aJAHCT62YgHZgsURb7oFYd4jvQIKe2WlPohy+runmzlVVLhJP8NWZrOfsiCz8X2Sb/fMLd+UWwex7WPg62mE6FC9nECUU1ES31UWMs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Y3tzBWZm; 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="Y3tzBWZm" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC1B8C4CECF; Tue, 3 Dec 2024 15:24:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1733239454; bh=/GBCHz1u8tL/WdKeYNS9ipXlpsB1D7kRrHBTVQ2jwDk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Y3tzBWZmFqlsNgZ2ryEZi8MtVMnakYWVssX7Z1izIbHZkwGqxwQhiP1wTG4oIj+/M Tp5zDctdXyuV06/McME5wh4bY/IeJeILfxeT4imp5ds2O/jsIKRV6YCZFFMh7heS59 jyu2cchUAZeIeGCUiyhKXq6pUKgCG2Z5iOFWSKX0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Matthew Brost , Nirmoy Das , =?UTF-8?q?Thomas=20Hellstr=C3=B6m?= , Sasha Levin Subject: [PATCH 6.11 620/817] drm/xe/ufence: Wake up waiters after setting ufence->signalled Date: Tue, 3 Dec 2024 15:43:12 +0100 Message-ID: <20241203144020.136577901@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241203143955.605130076@linuxfoundation.org> References: <20241203143955.605130076@linuxfoundation.org> User-Agent: quilt/0.67 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.11-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nirmoy Das [ Upstream commit 37a1cf288e4538eb39b38dbc745fe0da7ae53d94 ] If a previous ufence is not signalled, vm_bind will return -EBUSY. Delaying the modification of ufence->signalled can cause issues if the UMD reuses the same ufence so update ufence->signalled before waking up waiters. Cc: Matthew Brost Link: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/3233 Fixes: 977e5b82e090 ("drm/xe: Expose user fence from xe_sync_entry") Reviewed-by: Matthew Brost Link: https://patchwork.freedesktop.org/patch/msgid/20241114150537.4161573-1-nirmoy.das@intel.com Signed-off-by: Nirmoy Das (cherry picked from commit 553a5d14fcd927194c409b10faced6a6dbc678d1) Signed-off-by: Thomas Hellström Signed-off-by: Sasha Levin --- drivers/gpu/drm/xe/xe_sync.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_sync.c b/drivers/gpu/drm/xe/xe_sync.c index 9d77f2d4096f5..6e17bace67dd1 100644 --- a/drivers/gpu/drm/xe/xe_sync.c +++ b/drivers/gpu/drm/xe/xe_sync.c @@ -85,8 +85,12 @@ static void user_fence_worker(struct work_struct *w) mmput(ufence->mm); } - wake_up_all(&ufence->xe->ufence_wq); + /* + * Wake up waiters only after updating the ufence state, allowing the UMD + * to safely reuse the same ufence without encountering -EBUSY errors. + */ WRITE_ONCE(ufence->signalled, 1); + wake_up_all(&ufence->xe->ufence_wq); user_fence_put(ufence); } -- 2.43.0