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 3C14EC4828D for ; Tue, 6 Feb 2024 23:37:10 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84E28112F74; Tue, 6 Feb 2024 23:37:09 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="HjjQUv/i"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [198.175.65.21]) by gabe.freedesktop.org (Postfix) with ESMTPS id A4E5C112F6D for ; Tue, 6 Feb 2024 23:36:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1707262615; x=1738798615; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=MqgtFjf0MMIrvCtTJnU2nTKGxw2TOcBLtaUtd69ImqM=; b=HjjQUv/iv5VGrNL+JN3JzUOa7haAdB98pn49aDjsKe1EOiMMRGgs3Ei9 WkD3L7pK9Xtg/FyX3x0qIhSVUl/DoFW16QriZS5LP+GQzyre/jhPUH0tm jHWpwAECnC/Bbnzdqf+lSo2eLVsj92j/9Csgun3DwLbyUYRUfY5mA9+KU c5f4/HYl1caWf5/iWJXRLVnbwPzwkuszMH8690S9rgn9/ruzyFsMqvCwT OuWBoYk0y4iVPRSwppdO6d3dFx9SP1nQlbe5EHTscadjwfl8Xk3gXKxHw ZrLy9IgnaTYi7AYxUAZvwW6IhbLo9rH7JHoKcF9RUvyV4LnJl1XZQVIRe w==; X-IronPort-AV: E=McAfee;i="6600,9927,10976"; a="776804" X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="776804" Received: from orviesa003.jf.intel.com ([10.64.159.143]) by orvoesa113.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 15:36:53 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.05,248,1701158400"; d="scan'208";a="5793847" Received: from lstrano-desk.jf.intel.com ([10.54.39.91]) by ORVIESA003-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 06 Feb 2024 15:36:53 -0800 From: Matthew Brost To: Cc: , Matthew Brost Subject: [PATCH v3 21/22] drm/xe: Don't use migrate exec queue for page fault binds Date: Tue, 6 Feb 2024 15:37:28 -0800 Message-Id: <20240206233729.3173206-22-matthew.brost@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240206233729.3173206-1-matthew.brost@intel.com> References: <20240206233729.3173206-1-matthew.brost@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" Now that the CPU is always used for binds even in jobs, CPU bind jobs can pass GPU jobs in the same exec queue resulting dma-fences signaling out-of-order. Use a dedicated exec queue for binds issued from page faults to avoid ordering issues. Signed-off-by: Matthew Brost --- drivers/gpu/drm/xe/xe_gt_pagefault.c | 2 +- drivers/gpu/drm/xe/xe_migrate.c | 22 +++++++++++++++++++++- drivers/gpu/drm/xe/xe_migrate.h | 1 + 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/xe/xe_gt_pagefault.c b/drivers/gpu/drm/xe/xe_gt_pagefault.c index 2beba426517e..a30bcf314589 100644 --- a/drivers/gpu/drm/xe/xe_gt_pagefault.c +++ b/drivers/gpu/drm/xe/xe_gt_pagefault.c @@ -210,7 +210,7 @@ static int handle_pagefault(struct xe_gt *gt, struct pagefault *pf) if (ret) goto unlock_dma_resv; vm->dummy_ops.vops.pt_update_ops[tile->id].q = - xe_tile_migrate_exec_queue(tile); + xe_tile_migrate_bind_exec_queue(tile); fence = xe_vm_ops_execute(vm, &vm->dummy_ops.vops); xe_vma_ops_free(&vm->dummy_ops.vops); if (IS_ERR(fence)) { diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c index 7d752e424b3b..1dd73e2117ea 100644 --- a/drivers/gpu/drm/xe/xe_migrate.c +++ b/drivers/gpu/drm/xe/xe_migrate.c @@ -40,6 +40,8 @@ struct xe_migrate { /** @q: Default exec queue used for migration */ struct xe_exec_queue *q; + /** @bind_q: Default exec queue used for binds */ + struct xe_exec_queue *bind_q; /** @tile: Backpointer to the tile this struct xe_migrate belongs to. */ struct xe_tile *tile; /** @job_mutex: Timeline mutex for @eng. */ @@ -96,6 +98,11 @@ struct xe_exec_queue *xe_tile_migrate_exec_queue(struct xe_tile *tile) return tile->migrate->q; } +struct xe_exec_queue *xe_tile_migrate_bind_exec_queue(struct xe_tile *tile) +{ + return tile->migrate->bind_q; +} + static void xe_migrate_fini(struct drm_device *dev, void *arg) { struct xe_migrate *m = arg; @@ -110,6 +117,8 @@ static void xe_migrate_fini(struct drm_device *dev, void *arg) mutex_destroy(&m->job_mutex); xe_vm_close_and_put(m->q->vm); xe_exec_queue_put(m->q); + if (m->bind_q) + xe_exec_queue_put(m->bind_q); } static u64 xe_migrate_vm_addr(u64 slot, u32 level) @@ -367,6 +376,15 @@ struct xe_migrate *xe_migrate_init(struct xe_tile *tile) if (!hwe || !logical_mask) return ERR_PTR(-EINVAL); + m->bind_q = xe_exec_queue_create(xe, vm, logical_mask, 1, hwe, + EXEC_QUEUE_FLAG_KERNEL | + EXEC_QUEUE_FLAG_PERMANENT | + EXEC_QUEUE_FLAG_HIGH_PRIORITY, 0); + if (IS_ERR(m->bind_q)) { + xe_vm_close_and_put(vm); + return ERR_CAST(m->bind_q); + } + m->q = xe_exec_queue_create(xe, vm, logical_mask, 1, hwe, EXEC_QUEUE_FLAG_KERNEL | EXEC_QUEUE_FLAG_PERMANENT | @@ -378,6 +396,8 @@ struct xe_migrate *xe_migrate_init(struct xe_tile *tile) EXEC_QUEUE_FLAG_PERMANENT); } if (IS_ERR(m->q)) { + if (m->bind_q) + xe_exec_queue_put(m->bind_q); xe_vm_close_and_put(vm); return ERR_CAST(m->q); } @@ -1185,7 +1205,7 @@ __xe_migrate_update_pgtables(struct xe_migrate *m, struct xe_tile *tile = m->tile; struct xe_sched_job *job; struct dma_fence *fence; - bool is_migrate = pt_update_ops->q == m->q; + bool is_migrate = pt_update_ops->q == m->bind_q; int err; if (is_migrate) diff --git a/drivers/gpu/drm/xe/xe_migrate.h b/drivers/gpu/drm/xe/xe_migrate.h index f80c94bb8f4c..701bb27349b0 100644 --- a/drivers/gpu/drm/xe/xe_migrate.h +++ b/drivers/gpu/drm/xe/xe_migrate.h @@ -119,5 +119,6 @@ xe_migrate_update_pgtables(struct xe_migrate *m, void xe_migrate_wait(struct xe_migrate *m); struct xe_exec_queue *xe_tile_migrate_exec_queue(struct xe_tile *tile); +struct xe_exec_queue *xe_tile_migrate_bind_exec_queue(struct xe_tile *tile); #endif -- 2.34.1