From patchwork Fri Nov 18 10:42:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Janusz Krzysztofik X-Patchwork-Id: 13048043 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A463C43219 for ; Fri, 18 Nov 2022 10:43:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id ACEB410E6C4; Fri, 18 Nov 2022 10:43:37 +0000 (UTC) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by gabe.freedesktop.org (Postfix) with ESMTPS id BE00E10E231; Fri, 18 Nov 2022 10:43:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1668768200; x=1700304200; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=HKuO+ywfg/O9J1nzXBEvA/H7AWf2qFV/Zf1R4tWV8vU=; b=GcliOn+XtGbEdxV2+Oc4fwPkopkv2q1CTEFRrXDSqsubcW7GUUWCkxFP +p8SsSjEUTb07kxQ4yRxnBT01ilnb5EnLwYzqcfd2VWfbpxcYCoIA5khI b1veRKG+2QPwIhD9DW8Bpjn0uh86h3goq3abrrJnb4ymIMD3nQk3DPTVp yjWJts4MIVUqyRRYkGS7cip0FbAit05naiOvTbdg1vXWikU/xWzhXxsfX mwJdsOqjz9E9bDy5rTBpaux0vdBal74p2MTUbBoTLnV0OaVXyfQ39pdx5 5QgaoTLEKDpIn7EQu4TmZ24hP9e6eQGG6nfVNm+6xKNA+vexFtzisJiy9 Q==; X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="311812878" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="311812878" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2022 02:43:20 -0800 X-IronPort-AV: E=McAfee;i="6500,9779,10534"; a="729188087" X-IronPort-AV: E=Sophos;i="5.96,174,1665471600"; d="scan'208";a="729188087" Received: from jkrzyszt-mobl1.ger.corp.intel.com ([10.213.29.15]) by fmsmga003-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Nov 2022 02:43:16 -0800 From: Janusz Krzysztofik To: Tvrtko Ursulin , Joonas Lahtinen Subject: [PATCH v2 2/2] drm/i915: Never return 0 if not all requests retired Date: Fri, 18 Nov 2022 11:42:22 +0100 Message-Id: <20221118104222.57328-3-janusz.krzysztofik@linux.intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20221118104222.57328-1-janusz.krzysztofik@linux.intel.com> References: <20221118104222.57328-1-janusz.krzysztofik@linux.intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Matthew Brost , intel-gfx@lists.freedesktop.org, Chris Wilson , dri-devel@lists.freedesktop.org, Andrzej Hajda , Janusz Krzysztofik , John Harrison , Nirmoy Das Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Users of intel_gt_retire_requests_timeout() expect 0 return value on success. However, we have no protection from passing back 0 potentially returned by a call to dma_fence_wait_timeout() when it succedes right after its timeout has expired. Replace 0 with -ETIME before potentially using the timeout value as return code, so -ETIME is returned if there are still some requests not retired after timeout, 0 otherwise. v2: Move the added lines down so flush_submission() is not affected. Fixes: f33a8a51602c ("drm/i915: Merge wait_for_timelines with retire_request") Signed-off-by: Janusz Krzysztofik Cc: stable@vger.kernel.org # v5.5+ Reviewed-by: Andrzej Hajda --- drivers/gpu/drm/i915/gt/intel_gt_requests.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/i915/gt/intel_gt_requests.c b/drivers/gpu/drm/i915/gt/intel_gt_requests.c index edb881d756309..3ac4603eeb4ee 100644 --- a/drivers/gpu/drm/i915/gt/intel_gt_requests.c +++ b/drivers/gpu/drm/i915/gt/intel_gt_requests.c @@ -199,6 +199,9 @@ out_active: spin_lock(&timelines->lock); if (remaining_timeout) *remaining_timeout = timeout; + if (!timeout) + timeout = -ETIME; + return active_count ? timeout : 0; }