From mboxrd@z Thu Jan 1 00:00:00 1970 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 C8F07C4345F for ; Mon, 15 Apr 2024 22:05:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88B03112834; Mon, 15 Apr 2024 22:05:59 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="KA7kLG7h"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.14]) by gabe.freedesktop.org (Postfix) with ESMTPS id C2CC9112834 for ; Mon, 15 Apr 2024 22:05:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1713218758; x=1744754758; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=va1YkpzezPyGl1FlnmU1QCXprNjVtLxYoYCEjEzNtvk=; b=KA7kLG7hL8mx2YoxbSuMNo1uLBydmGcfQMTdltatkyVd0mITKzk/P+lN TGeIlI41W2eB1bWP42MdzhYOYHSX9zLgpk7SAsM1J6t/Y987vFIhBfjXo FhwwVdbKPBmrngl0TjPxExVdTn4B73kK/cBWF5UoN6TSg7S4c80ce6j60 YuYLUZIJnMkZJfBwzYS8TxV9IvPm3vZSbQ/yGbaMQlSBOkAOLaq5mCxz2 2iRnMkcVv3Za0dAy2MwTjfXdDyY98gmNcaqKB1VRBJmlfTEUDre4lgoBa ETI4qRU6QvLZLlQTDqvdFAq/H04BVFabfPfA746vGitLzJacu5JH632Il Q==; X-CSE-ConnectionGUID: 3BmnrbJFRnqb3I+B5RWOSw== X-CSE-MsgGUID: 09cFtzJNQQGrw6gxCdMkdw== X-IronPort-AV: E=McAfee;i="6600,9927,11045"; a="12478154" X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="12478154" Received: from fmviesa009.fm.intel.com ([10.60.135.149]) by orvoesa106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 15:05:58 -0700 X-CSE-ConnectionGUID: h3WGCSZAQuu4DUAlPPiPvA== X-CSE-MsgGUID: crmNlfeKSGWaHWwC0hWECQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.07,204,1708416000"; d="scan'208";a="22117577" Received: from dut-internal-9dd7.jf.intel.com ([10.165.21.194]) by fmviesa009-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Apr 2024 15:05:30 -0700 From: Jonathan Cavitt To: intel-xe@lists.freedesktop.org Cc: jonathan.cavitt@intel.com, saurabhg.gupta@intel.com, niranjana.vishwanathapura@intel.com, brian.welty@intel.com, matthew.d.roper@intel.com, matthew.brost@intel.com, john.c.harrison@intel.com Subject: [PATCH v6 2/4] drm/xe/xe_guc_submit: Fix exec queue stop race condition Date: Mon, 15 Apr 2024 14:50:10 -0700 Message-Id: <20240415215012.2978778-2-jonathan.cavitt@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240415215012.2978778-1-jonathan.cavitt@intel.com> References: <20240415215012.2978778-1-jonathan.cavitt@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: intel-xe@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel Xe graphics driver List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-xe-bounces@lists.freedesktop.org Sender: "Intel-xe" Reorder the xe_sched_tdr_queue_imm and set_exec_queue_banned calls in guc_exec_queue_stop. This prevents a possible race condition between the two events in which it's possible for xe_sched_tdr_queue_imm to wake the ufence waiter before the exec queue is banned, causing the ufence waiter to miss the banned state. Suggested-by: Matthew Brost Signed-off-by: Jonathan Cavitt Reviewed-by: Matthew Brost Reviewed-by: Stuart Summers --- v2: Expand on cause of race condition drivers/gpu/drm/xe/xe_guc_submit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c index ecd1085619b30..09331dc41ebdb 100644 --- a/drivers/gpu/drm/xe/xe_guc_submit.c +++ b/drivers/gpu/drm/xe/xe_guc_submit.c @@ -1428,8 +1428,8 @@ static void guc_exec_queue_stop(struct xe_guc *guc, struct xe_exec_queue *q) !xe_sched_job_completed(job)) || xe_sched_invalidate_job(job, 2)) { trace_xe_sched_job_ban(job); - xe_sched_tdr_queue_imm(&q->guc->sched); set_exec_queue_banned(q); + xe_sched_tdr_queue_imm(&q->guc->sched); } } } -- 2.25.1