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 CF42CCD5BD2 for ; Fri, 29 May 2026 09:44:30 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6FAF810FC05; Fri, 29 May 2026 09:44:30 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=intel.com header.i=@intel.com header.b="Snbt1D1H"; dkim-atps=neutral Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.8]) by gabe.freedesktop.org (Postfix) with ESMTPS id B3C5110FC05 for ; Fri, 29 May 2026 09:44:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1780047868; x=1811583868; h=date:from:to:cc:subject:message-id:references: mime-version:in-reply-to; bh=W9jQ+hTD52JEWHgR3uj4X4NaEWY9WsSKO03GMeadz5M=; b=Snbt1D1HIFijBEHHfQEXBlC8h0WI4Bj/vsBX3GAvWGD20h7Nj5sHzGTK 5Nd2OWMjZVBtRgH3aSd4jrj80aeUn9mibuEAf3GlIEakhk+ulM56Ck2A+ SBoUR6nzmFJpzVGf0aWknHHOsVaxuMdmwqhmVaxPnq7VI4zYdh3mqN2am 3B92C3M/NXthT3OsVY69oC4EUCBeT3kZBAYouuONHqDevZ8RLXq5TSDLD wdMQUMk7P4I9ZLJivIJkD1hxMbjBYq8LqajP7BEhORYzlcb6Px/uEUFQG AE0Ldrf/ujreFrkVkxGk4qAe4jt2HPLcW8PtXzzWD8n/12PYabvFWLIGd w==; X-CSE-ConnectionGUID: Uv44FvrPRVa+KRuqIN5kiw== X-CSE-MsgGUID: D+WyE54FQsqVLlCeHSqRxQ== X-IronPort-AV: E=McAfee;i="6800,10657,11800"; a="98470975" X-IronPort-AV: E=Sophos;i="6.24,175,1774335600"; d="scan'208";a="98470975" Received: from orviesa001.jf.intel.com ([10.64.159.141]) by fmvoesa102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2026 02:44:28 -0700 X-CSE-ConnectionGUID: HbKC90BrSSmXcfScBWzFpg== X-CSE-MsgGUID: Nz6F0jE5TIuPp7wHTkhmUQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.24,175,1774335600"; d="scan'208";a="280925146" Received: from black.igk.intel.com ([10.91.253.5]) by orviesa001.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 29 May 2026 02:44:24 -0700 Date: Fri, 29 May 2026 11:44:21 +0200 From: Raag Jadav To: Daniele Ceraolo Spurio Cc: intel-xe@lists.freedesktop.org, matthew.brost@intel.com, rodrigo.vivi@intel.com, thomas.hellstrom@linux.intel.com, riana.tauro@intel.com, michal.wajdeczko@intel.com, matthew.d.roper@intel.com, michal.winiarski@intel.com, matthew.auld@intel.com, dev@lankhorst.se, jani.nikula@intel.com, lukasz.laguna@intel.com, zhanjun.dong@intel.com, lukas@wunner.de, badal.nilawar@intel.com Subject: Re: [PATCH v7 6/8] drm/xe/migrate: Introduce xe_migrate_reinit() Message-ID: References: <20260516093131.27442-1-raag.jadav@intel.com> <20260516093131.27442-7-raag.jadav@intel.com> <434530c7-352b-4802-a3f8-50dc9d6486b1@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <434530c7-352b-4802-a3f8-50dc9d6486b1@intel.com> 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" On Wed, May 27, 2026 at 04:27:56PM -0700, Daniele Ceraolo Spurio wrote: > On 5/16/2026 2:31 AM, Raag Jadav wrote: > > In preparation of usecases which require re-initializing migrate context > > after PCIe FLR, introduce xe_migrate_reinit() helper. Migrate exec queue > > and pt_bo already exist in migrate structure but since their contents live > > on VRAM, they are lost on PCIe FLR and need re-initialization. > > > > Signed-off-by: Raag Jadav > > Reviewed-by: Matthew Brost > > Tested-by: Lukasz Laguna > > --- > > v2: Re-initialize migrate context (Matthew Brost) > > --- > > drivers/gpu/drm/xe/xe_gt.c | 10 ++++++++++ > > drivers/gpu/drm/xe/xe_migrate.c | 12 ++++++++++++ > > drivers/gpu/drm/xe/xe_migrate.h | 1 + > > 3 files changed, 23 insertions(+) > > > > diff --git a/drivers/gpu/drm/xe/xe_gt.c b/drivers/gpu/drm/xe/xe_gt.c > > index acc28389b0d8..a60e04c4d885 100644 > > --- a/drivers/gpu/drm/xe/xe_gt.c > > +++ b/drivers/gpu/drm/xe/xe_gt.c > > @@ -928,6 +928,16 @@ void xe_gt_flr_prepare(struct xe_gt *gt) > > */ > > int xe_gt_reinit(struct xe_gt *gt) > > { > > + int err; > > + > > + if (xe_gt_is_main_type(gt)) { > > + struct xe_tile *tile = gt_to_tile(gt); > > + > > + err = xe_migrate_reinit(tile->migrate); > > + if (err) > > + return err; > > + } > > + > > return xe_uc_reinit(>->uc); > > } > > diff --git a/drivers/gpu/drm/xe/xe_migrate.c b/drivers/gpu/drm/xe/xe_migrate.c > > index 9428dd5e7760..9e1754028e1f 100644 > > --- a/drivers/gpu/drm/xe/xe_migrate.c > > +++ b/drivers/gpu/drm/xe/xe_migrate.c > > @@ -454,6 +454,18 @@ static int xe_migrate_lock_prepare_vm(struct xe_tile *tile, struct xe_migrate *m > > return err; > > } > > +/** > > + * xe_migrate_reinit() - Re-initialize a migrate context > > + * @m: The migration context > > + * > > + * Returns: 0 on success, negative error code otherwise. > > + */ > > +int xe_migrate_reinit(struct xe_migrate *m) > > +{ > > + xe_migrate_prepare_vm(m->tile, m, m->q->vm, NULL); > > + return xe_exec_queue_reinit(m->q); > > I'm not sold on calling xe_exec_queue_reinit from here. Wouldn't it be > easier to just destroy and re-create the migration queue, instead of adding > support for a new re-init flow that's only used during FLR? This flow is to be reused for multiple usecases where we need device level reinit. I remember trying destroy/re-create at some point but I saw TLB invalidation errors. I didn't know how to investigate those and gave up on that direction. IMO it's more performative to just restore existing stuff without dealing with memory (which'd also make it a bit prone to failures) in this path. > IMO the re-init would be more valuable if we went with a gt-level function > where we loop through all queues and re-init all the kernel-owned ones. That > way if we add another queue that needs to be re-initialized it will > automatically be picked up by the loop, instead of having to hook up a new > callback in the FLR flow. I went through some of the data structures and found that the queues are maintained by individual components that use them. One way I could think of would be to have a centralized list of queues (like we have for kernel bos) that we can restore without worrying about which component owns it, but it looks like something that needs to be done as a prerequisite and perhaps requires significant refactoring. Thoughts? Raag > > +} > > + > > /** > > * xe_migrate_init() - Initialize a migrate context > > * @m: The migration context > > diff --git a/drivers/gpu/drm/xe/xe_migrate.h b/drivers/gpu/drm/xe/xe_migrate.h > > index 965c45889c72..49d8c717b957 100644 > > --- a/drivers/gpu/drm/xe/xe_migrate.h > > +++ b/drivers/gpu/drm/xe/xe_migrate.h > > @@ -112,6 +112,7 @@ struct xe_migrate_pt_update { > > struct xe_migrate *xe_migrate_alloc(struct xe_tile *tile); > > int xe_migrate_init(struct xe_migrate *m); > > +int xe_migrate_reinit(struct xe_migrate *m); > > struct dma_fence *xe_migrate_to_vram(struct xe_migrate *m, > > unsigned long npages, >