From nobody Tue Feb 10 06:04:37 2026 Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 61B89130A58 for ; Thu, 4 Apr 2024 18:15:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712254517; cv=none; b=b9kE2P8cs6BckkcCbgRCI7V5rISifXf9DzXPRET6REkxz+VjgrHAQdbCA4Dz4gwz9N1ELodjBYZXOAdhTBxZrBm3PH0uVBn541DZk0SCWg0Sx90qHdKbLium8Yzr86CvSShhugWxqKFEndGiFxcBnwPod0/ZT8n5D3hi89lHrhY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712254517; c=relaxed/simple; bh=9WVteE8/l/unSLKa7liIDhpua1SzUqUC58ee5t95ahA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=q1aSjCLtm1rmOAwaU6YS7xG19x2k5eZo8JH8SZ/wTQCTc0WCqSY1mqI5wHm46aaRL9S15pYr20aEkEOag+6B8aLv3lV2buDxAOiBX5Gu3xjfTHLfmyPcMJktRHr4Oht5IbaDbfD3TshDSio4QddqraPJ5wdpmwYSepOkKQvWfIQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=eyOowrZu; arc=none smtp.client-ip=209.85.221.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="eyOowrZu" Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-33ddd1624beso747955f8f.1 for ; Thu, 04 Apr 2024 11:15:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712254514; x=1712859314; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kY+E2shk9TTjvlmztMnEOs4NCqRmJnXfRKrkxZqUteg=; b=eyOowrZuGdpDccrIocDwB4odk2ZGkJMRRCWwY9kXTkMvqTfO1OX1yzIFdKzOwh9Fkt KTMA1zU4g+yWcealdByNtVykqCJOH3gnWMQozB4CFudw9g055h5ObALxBYM0yurteyQp X6aV/ccrd11qsj/7+avTY3YIa5SpSO8cHDnsHQPAFRBGGk9ZVRDYGHrLqRh6gTC3Nt1n uhZ6nvjqThNLV7NUnsRfPhkcIBQmYtgdEyq7yzdDJFQHD6ZAwk4BXt3gwqWTXsERe3M/ sappg2vsTG6+qZcXUeWiS/lw3NWCIWv5bEJ/mq0r35oQQOLlludwVmnH44/ueQ9fPHvL lbnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712254514; x=1712859314; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kY+E2shk9TTjvlmztMnEOs4NCqRmJnXfRKrkxZqUteg=; b=ojhq/4efveKUF/vWA3ZgCpRnCiPwhZOO0ieU8ZjEcCa8xyHQV6Y7InFpmrmPTs9UyS XQzpztNBEs/Yp03bE/csEeL4D6TgBSTdTJuG+H+oOIyrndJRTtlHSNhCdg0hVo1Jbj9/ +yg+XNF6QbYp1IYxi874W+H4BK0MfIpAQ/No+7jV4LPOG4a3TH/xx7BGPQj5nF+XDaNR m5sN4vESeggvkvXWNAehC2h3KcKYP2QJ4QNUMb0ZURpslePmr031/eMFP+pBd+DVNiFK bLVxG5TSzhs4qbfC52ajIgpFXc/VhkAkS6gS4L+Syy3UQLFU3oYiF16wExJvvbkhg1+F jG1w== X-Forwarded-Encrypted: i=1; AJvYcCXZn7HJYy2iAg44aTOUrkWGL/2WJp2iPZA+Z0JqGBpV2XjmKrq7WCVVFnZW7yssi89OCVXZO91ifjEiQgmMGArtOLbZpU7v69/aPLrE X-Gm-Message-State: AOJu0YyX1bSZdcCNUPhsGYGrU7dA85gD0pyzpzku/u8huKSVU6ZYFxPQ R3fV9RnQYS/9UoPK/eocnMcnejsAhegZn8m1WOgI58sHCrvrF32i X-Google-Smtp-Source: AGHT+IHey30qEJp/mXGAUejbX5U+sc9AsyKeLlyJm3AU7cl7lDPEg0sOe+zZaC4lHxBG8L9bfNGSWA== X-Received: by 2002:a5d:56c2:0:b0:341:c473:2919 with SMTP id m2-20020a5d56c2000000b00341c4732919mr206426wrw.14.1712254513709; Thu, 04 Apr 2024 11:15:13 -0700 (PDT) Received: from localhost (ec2-18-175-17-34.eu-west-2.compute.amazonaws.com. [18.175.17.34]) by smtp.gmail.com with ESMTPSA id s14-20020a5d4ece000000b00343dc6a0019sm136463wrv.68.2024.04.04.11.15.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Apr 2024 11:15:13 -0700 (PDT) From: Alex Constantino To: mripard@kernel.org Cc: 1054514@bugs.debian.org, airlied@redhat.com, carnil@debian.org, daniel@ffwll.ch, dreaming.about.electric.sheep@gmail.com, dri-devel@lists.freedesktop.org, kraxel@redhat.com, linux-kernel@vger.kernel.org, maarten.lankhorst@linux.intel.com, regressions@lists.linux.dev, spice-devel@lists.freedesktop.org, timo.lindfors@iki.fi, tzimmermann@suse.de, virtualization@lists.linux-foundation.org Subject: [PATCH v2 1/1] Revert "drm/qxl: simplify qxl_fence_wait" Date: Thu, 4 Apr 2024 19:14:48 +0100 Message-Id: <20240404181448.1643-2-dreaming.about.electric.sheep@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240404181448.1643-1-dreaming.about.electric.sheep@gmail.com> References: <20240327-cuddly-smooth-trogon-59c02d@houat> <20240404181448.1643-1-dreaming.about.electric.sheep@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" This reverts commit 5a838e5d5825c85556011478abde708251cc0776. Changes from commit 5a838e5d5825 ("drm/qxl: simplify qxl_fence_wait") would result in a '[TTM] Buffer eviction failed' exception whenever it reached a timeout. Due to a dependency to DMA_FENCE_WARN this also restores some code deleted by commit d72277b6c37d ("dma-buf: nuke DMA_FENCE_TRACE macros v2"). Fixes: 5a838e5d5825 ("drm/qxl: simplify qxl_fence_wait") Link: https://lore.kernel.org/regressions/ZTgydqRlK6WX_b29@eldamar.lan/ Reported-by: Timo Lindfors Closes: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=3D1054514 Signed-off-by: Alex Constantino --- drivers/gpu/drm/qxl/qxl_release.c | 50 +++++++++++++++++++++++++++---- include/linux/dma-fence.h | 7 +++++ 2 files changed, 52 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/qxl/qxl_release.c b/drivers/gpu/drm/qxl/qxl_re= lease.c index 368d26da0d6a..9febc8b73f09 100644 --- a/drivers/gpu/drm/qxl/qxl_release.c +++ b/drivers/gpu/drm/qxl/qxl_release.c @@ -58,16 +58,56 @@ static long qxl_fence_wait(struct dma_fence *fence, boo= l intr, signed long timeout) { struct qxl_device *qdev; + struct qxl_release *release; + int count =3D 0, sc =3D 0; + bool have_drawable_releases; unsigned long cur, end =3D jiffies + timeout; =20 qdev =3D container_of(fence->lock, struct qxl_device, release_lock); + release =3D container_of(fence, struct qxl_release, base); + have_drawable_releases =3D release->type =3D=3D QXL_RELEASE_DRAWABLE; =20 - if (!wait_event_timeout(qdev->release_event, - (dma_fence_is_signaled(fence) || - (qxl_io_notify_oom(qdev), 0)), - timeout)) - return 0; +retry: + sc++; + + if (dma_fence_is_signaled(fence)) + goto signaled; + + qxl_io_notify_oom(qdev); + + for (count =3D 0; count < 11; count++) { + if (!qxl_queue_garbage_collect(qdev, true)) + break; + + if (dma_fence_is_signaled(fence)) + goto signaled; + } + + if (dma_fence_is_signaled(fence)) + goto signaled; + + if (have_drawable_releases || sc < 4) { + if (sc > 2) + /* back off */ + usleep_range(500, 1000); + + if (time_after(jiffies, end)) + return 0; + + if (have_drawable_releases && sc > 300) { + DMA_FENCE_WARN(fence, + "failed to wait on release %llu after spincount %d\n", + fence->context & ~0xf0000000, sc); + goto signaled; + } + goto retry; + } + /* + * yeah, original sync_obj_wait gave up after 3 spins when + * have_drawable_releases is not set. + */ =20 +signaled: cur =3D jiffies; if (time_after(cur, end)) return 0; diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h index e06bad467f55..c3f9bb6602ba 100644 --- a/include/linux/dma-fence.h +++ b/include/linux/dma-fence.h @@ -682,4 +682,11 @@ static inline bool dma_fence_is_container(struct dma_f= ence *fence) return dma_fence_is_array(fence) || dma_fence_is_chain(fence); } =20 +#define DMA_FENCE_WARN(f, fmt, args...) \ + do { \ + struct dma_fence *__ff =3D (f); \ + pr_warn("f %llu#%llu: " fmt, __ff->context, __ff->seqno,\ + ##args); \ + } while (0) + #endif /* __LINUX_DMA_FENCE_H */ --=20 2.39.2