linux-kernel - [PATCH 3/3] drm/amdgpu: Switch to interrupted wait to recover from ring hang.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <1524583836-12130-4-git-send-email-andrey.grodzovsky@amd.com>
Date:   Tue, 24 Apr 2018 11:30:36 -0400
From:   Andrey Grodzovsky <andrey.grodzovsky@....com>
To:     <linux-kernel@...r.kernel.org>, <amd-gfx@...ts.freedesktop.org>
CC:     <Alexander.Deucher@....com>, <Christian.Koenig@....com>,
        <David.Panariti@....com>, <oleg@...hat.com>,
        <akpm@...ux-foundation.org>, <ebiederm@...ssion.com>,
        Andrey Grodzovsky <andrey.grodzovsky@....com>
Subject: [PATCH 3/3] drm/amdgpu: Switch to interrupted wait to recover from ring hang.

If the ring is hanging for some reason allow to recover the waiting
by sending fatal signal.

Originally-by: David Panariti <David.Panariti@....com>
Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@....com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
index eb80edf..37a36af 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c
@@ -421,10 +421,16 @@ int amdgpu_ctx_wait_prev_fence(struct amdgpu_ctx *ctx, unsigned ring_id)
 
 	if (other) {
 		signed long r;
-		r = dma_fence_wait_timeout(other, false, MAX_SCHEDULE_TIMEOUT);
-		if (r < 0) {
-			DRM_ERROR("Error (%ld) waiting for fence!\n", r);
-			return r;
+
+		while (true) {
+			if ((r = dma_fence_wait_timeout(other, true,
+					MAX_SCHEDULE_TIMEOUT)) >= 0)
+				return 0;
+
+			if (fatal_signal_pending(current)) {
+				DRM_ERROR("Error (%ld) waiting for fence!\n", r);
+				return r;
+			}
 		}
 	}
 
-- 
2.7.4