* Re: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration
@ 2025-03-23 3:22 kernel test robot
0 siblings, 0 replies; 8+ messages in thread
From: kernel test robot @ 2025-03-23 3:22 UTC (permalink / raw)
To: oe-kbuild; +Cc: lkp, Dan Carpenter
BCC: lkp@intel.com
CC: oe-kbuild-all@lists.linux.dev
In-Reply-To: <20250306222126.3382322-3-tomasz.lis@intel.com>
References: <20250306222126.3382322-3-tomasz.lis@intel.com>
TO: Tomasz Lis <tomasz.lis@intel.com>
TO: intel-xe@lists.freedesktop.org
CC: "Michał Winiarski" <michal.winiarski@intel.com>
CC: "Michał Wajdeczko" <michal.wajdeczko@intel.com>
CC: "Piotr Piórkowski" <piotr.piorkowski@intel.com>
Hi Tomasz,
kernel test robot noticed the following build warnings:
[auto build test WARNING on drm-xe/drm-xe-next]
[also build test WARNING on linus/master v6.14-rc7 next-20250321]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Tomasz-Lis/drm-drm_mm-Safe-macro-for-iterating-through-nodes-in-range/20250307-102511
base: https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe-next
patch link: https://lore.kernel.org/r/20250306222126.3382322-3-tomasz.lis%40intel.com
patch subject: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration
:::::: branch date: 2 weeks ago
:::::: commit date: 2 weeks ago
config: openrisc-randconfig-r073-20250321 (https://download.01.org/0day-ci/archive/20250323/202503231159.himCw1Ch-lkp@intel.com/config)
compiler: or1k-linux-gcc (GCC) 11.5.0
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <error27@gmail.com>
| Closes: https://lore.kernel.org/r/202503231159.himCw1Ch-lkp@intel.com/
smatch warnings:
drivers/gpu/drm/xe/xe_sriov_vf.c:191 vf_post_migration_fixup_ggtt_nodes() error: uninitialized symbol 'err'.
vim +/err +191 drivers/gpu/drm/xe/xe_sriov_vf.c
abd2202047fc75 Tomasz Lis 2024-11-04 173
253478de2cb134 Tomasz Lis 2025-03-06 174 static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe)
253478de2cb134 Tomasz Lis 2025-03-06 175 {
253478de2cb134 Tomasz Lis 2025-03-06 176 struct xe_tile *tile;
253478de2cb134 Tomasz Lis 2025-03-06 177 unsigned int id;
253478de2cb134 Tomasz Lis 2025-03-06 178 int err;
253478de2cb134 Tomasz Lis 2025-03-06 179
253478de2cb134 Tomasz Lis 2025-03-06 180 for_each_tile(tile, xe, id) {
253478de2cb134 Tomasz Lis 2025-03-06 181 struct xe_gt *gt = tile->primary_gt;
253478de2cb134 Tomasz Lis 2025-03-06 182 int ret;
253478de2cb134 Tomasz Lis 2025-03-06 183
253478de2cb134 Tomasz Lis 2025-03-06 184 /* media doesn't have its own ggtt */
253478de2cb134 Tomasz Lis 2025-03-06 185 if (xe_gt_is_media_type(gt))
253478de2cb134 Tomasz Lis 2025-03-06 186 continue;
253478de2cb134 Tomasz Lis 2025-03-06 187 ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt);
253478de2cb134 Tomasz Lis 2025-03-06 188 if (ret != ENODATA)
253478de2cb134 Tomasz Lis 2025-03-06 189 err = ret;
253478de2cb134 Tomasz Lis 2025-03-06 190 }
253478de2cb134 Tomasz Lis 2025-03-06 @191 return err;
253478de2cb134 Tomasz Lis 2025-03-06 192 }
253478de2cb134 Tomasz Lis 2025-03-06 193
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH v4 0/3] drm/xe/vf: Post-migration recovery of GGTT nodes and CTB @ 2025-03-06 22:21 Tomasz Lis 2025-03-06 22:21 ` [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration Tomasz Lis 0 siblings, 1 reply; 8+ messages in thread From: Tomasz Lis @ 2025-03-06 22:21 UTC (permalink / raw) To: intel-xe Cc: Michał Winiarski, Michał Wajdeczko, Piotr Piórkowski To support VF Migration, it is necessary to do fixups to any non-virtualized resources. These fixups need to be applied within VM, on the KMD working with VF. This series adds two fixup functions to the recovery worker: * for fixing drm_mm nodes which represent GGTT allocations * for fixing content of outgoing CTB buffer v2: Fixed missing include, made checkpatch happy v3: Moved some functs to xe_ggtt.c; moved shift computation to just after querying; improved documentation; switched some warns to asserts; skipping fixups when GGTT shift eq 0; iterating through tiles rather than gts; fixes in log messages v4: Updated kerneldocs, removed unused funct, properly allocate balloning nodes if non existent, removed inline keywords, enums for offsets in CTB messages, less error messages, if return unused then made functs void Tomasz Lis (3): drm/drm_mm: Safe macro for iterating through nodes in range drm/xe/sriov: Shifting GGTT area post migration drm/xe/vf: Fixup CTB send buffer messages after migration drivers/gpu/drm/xe/abi/guc_actions_abi.h | 7 + drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ drivers/gpu/drm/xe/xe_ggtt.h | 2 + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + drivers/gpu/drm/xe/xe_guc_ct.c | 147 +++++++++++++++++++ drivers/gpu/drm/xe/xe_guc_ct.h | 2 + drivers/gpu/drm/xe/xe_guc_submit.c | 4 + drivers/gpu/drm/xe/xe_sriov_vf.c | 40 ++++++ include/drm/drm_mm.h | 19 +++ 11 files changed, 413 insertions(+) -- 2.25.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2025-03-06 22:21 [PATCH v4 0/3] drm/xe/vf: Post-migration recovery of GGTT nodes and CTB Tomasz Lis @ 2025-03-06 22:21 ` Tomasz Lis 2025-03-14 18:22 ` Michal Wajdeczko 2025-03-24 5:58 ` Dan Carpenter 0 siblings, 2 replies; 8+ messages in thread From: Tomasz Lis @ 2025-03-06 22:21 UTC (permalink / raw) To: intel-xe Cc: Michał Winiarski, Michał Wajdeczko, Piotr Piórkowski We have only one GGTT for all IOV functions, with each VF having assigned a range of addresses for its use. After migration, a VF can receive a different range of addresses than it had initially. This implements shifting GGTT addresses within drm_mm nodes, so that VMAs stay valid after migration. This will make the driver use new addresses when accessing GGTT from the moment the shifting ends. By taking the ggtt->lock for the period of VMA fixups, this change also adds constraint on that mutex. Any locks used during the recovery cannot ever wait for hardware response - because after migration, the hardware will not do anything until fixups are finished. v2: Moved some functs to xe_ggtt.c; moved shift computation to just after querying; improved documentation; switched some warns to asserts; skipping fixups when GGTT shift eq 0; iterating through tiles (Michal) v3: Updated kerneldocs, removed unused funct, properly allocate balloning nodes if non existent Signed-off-by: Tomasz Lis <tomasz.lis@intel.com> --- drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ drivers/gpu/drm/xe/xe_ggtt.h | 2 + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + drivers/gpu/drm/xe/xe_sriov_vf.c | 22 +++ 6 files changed, 216 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c index 5fcb2b4c2c13..6865d1cdd676 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -489,6 +489,169 @@ void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node) xe_ggtt_node_fini(node); } +static u64 drm_mm_node_end(struct drm_mm_node *node) +{ + return node->start + node->size; +} + +static void xe_ggtt_mm_shift_nodes(struct xe_ggtt *ggtt, struct drm_mm_node *balloon_beg, + struct drm_mm_node *balloon_fin, s64 shift) +{ + struct drm_mm_node *node, *tmpn; + LIST_HEAD(temp_list_head); + int err; + + lockdep_assert_held(&ggtt->lock); + + /* + * Move nodes, from range previously assigned to this VF, into temp list. + * + * The balloon_beg and balloon_fin nodes are there to eliminate unavailable + * ranges from use: first reserves the GGTT area below the range for current VF, + * and second reserves area above. + * + * Below is a GGTT layout of example VF, with a certain address range assigned to + * said VF, and inaccessible areas above and below: + * + * 0 4GiB + * |<--------------------------- Total GGTT size ----------------------------->| + * WOPCM GUC_TOP + * |<-------------- Area mappable by xe_ggtt instance ---------------->| + * + * +---+---------------------------------+----------+----------------------+---+ + * |\\\|/////////////////////////////////| VF mem |//////////////////////|\\\| + * +---+---------------------------------+----------+----------------------+---+ + * + * Hardware enforced access rules before migration: + * + * |<------- inaccessible for VF ------->|<VF owned>|<-- inaccessible for VF ->| + * + * drm_mm nodes used for tracking allocations: + * + * |<----------- balloon ------------>|<- nodes->|<----- balloon ------>| + * + * After the migration, GGTT area assigned to the VF might have shifted, either + * to lower or to higher address. But we expect the total size and extra areas to + * be identical, as migration can only happen between matching platforms. + * Below is an example of GGTT layout of the VF after migration. Content of the + * GGTT for VF has been moved to a new area, and we receive its address from GuC: + * + * +---+----------------------+----------+---------------------------------+---+ + * |\\\|//////////////////////| VF mem |/////////////////////////////////|\\\| + * +---+----------------------+----------+---------------------------------+---+ + * + * Hardware enforced access rules after migration: + * + * |<- inaccessible for VF -->|<VF owned>|<------- inaccessible for VF ------->| + * + * So the VF has a new slice of GGTT assigned, and during migration process, the + * memory content was copied to that new area. But the drm_mm nodes within xe kmd + * are still tracking allocations using the old addresses. The nodes within VF + * owned area have to be shifted, and balloon nodes need to be resized to + * properly mask out areas not owned by the VF. + * + * Fixed drm_mm nodes used for tracking allocations: + * + * |<------ balloon ------>|<- nodes->|<----------- balloon ----------->| + * + * Due to use of GPU profiles, we do not expect the old and new GGTT ares to + * overlap; but our node shifting will fix addresses properly regardless. + * + */ + drm_mm_for_each_node_in_range_safe(node, tmpn, &ggtt->mm, + drm_mm_node_end(balloon_beg), + balloon_fin->start) { + drm_mm_remove_node(node); + list_add(&node->node_list, &temp_list_head); + } + + /* shift and re-add ballooning nodes */ + if (drm_mm_node_allocated(balloon_beg)) + drm_mm_remove_node(balloon_beg); + if (drm_mm_node_allocated(balloon_fin)) + drm_mm_remove_node(balloon_fin); + balloon_beg->size += shift; + balloon_fin->start += shift; + balloon_fin->size -= shift; + if (balloon_beg->size != 0) { + err = drm_mm_reserve_node(&ggtt->mm, balloon_beg); + xe_tile_assert(ggtt->tile, !err); + } + if (balloon_fin->size != 0) { + err = drm_mm_reserve_node(&ggtt->mm, balloon_fin); + xe_tile_assert(ggtt->tile, !err); + } + + /* + * Now the GGTT VM contains only nodes outside of area assigned to this VF. + * We can re-add all VF nodes with shifted offsets. + */ + list_for_each_entry_safe(node, tmpn, &temp_list_head, node_list) { + list_del(&node->node_list); + node->start += shift; + err = drm_mm_reserve_node(&ggtt->mm, node); + xe_tile_assert(ggtt->tile, !err); + } +} + +/** + * xe_ggtt_node_shift_nodes - Shift GGTT nodes to adjust for a change in usable address range. + * @ggtt: the &xe_ggtt struct instance + * @balloon_beg: ggtt balloon node which preceds the area provisioned for current VF + * @balloon_fin: ggtt balloon node which follows the area provisioned for current VF + * @shift: change to the location of area provisioned for current VF + */ +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, + struct xe_ggtt_node **balloon_fin, s64 shift) +{ + struct drm_mm_node *balloon_mm_beg, *balloon_mm_end; + struct xe_ggtt_node *node; + + if (!*balloon_beg) + { + node = xe_ggtt_node_init(ggtt); + if (IS_ERR(node)) + goto out; + node->base.color = 0; + node->base.flags = 0; + node->base.start = xe_wopcm_size(ggtt->tile->xe); + node->base.size = 0; + *balloon_beg = node; + } + balloon_mm_beg = &(*balloon_beg)->base; + + if (!*balloon_fin) + { + node = xe_ggtt_node_init(ggtt); + if (IS_ERR(node)) + goto out; + node->base.color = 0; + node->base.flags = 0; + node->base.start = GUC_GGTT_TOP; + node->base.size = 0; + *balloon_fin = node; + } + balloon_mm_end = &(*balloon_fin)->base; + + xe_tile_assert(ggtt->tile, (*balloon_beg)->ggtt); + xe_tile_assert(ggtt->tile, (*balloon_fin)->ggtt); + + xe_ggtt_mm_shift_nodes(ggtt, balloon_mm_beg, balloon_mm_end, shift); +out: + if (*balloon_beg && !xe_ggtt_node_allocated(*balloon_beg)) + { + node = *balloon_beg; + *balloon_beg = NULL; + xe_ggtt_node_fini(node); + } + if (*balloon_fin && !xe_ggtt_node_allocated(*balloon_fin)) + { + node = *balloon_fin; + *balloon_fin = NULL; + xe_ggtt_node_fini(node); + } +} + /** * xe_ggtt_node_insert_locked - Locked version to insert a &xe_ggtt_node into the GGTT * @node: the &xe_ggtt_node to be inserted diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h index 27e7d67de004..d9e133a155e6 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.h +++ b/drivers/gpu/drm/xe/xe_ggtt.h @@ -18,6 +18,8 @@ void xe_ggtt_node_fini(struct xe_ggtt_node *node); int xe_ggtt_node_insert_balloon(struct xe_ggtt_node *node, u64 start, u64 size); void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node); +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, + struct xe_ggtt_node **balloon_fin, s64 shift); int xe_ggtt_node_insert(struct xe_ggtt_node *node, u32 size, u32 align); int xe_ggtt_node_insert_locked(struct xe_ggtt_node *node, diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c index a439261bf4d7..dbd7010f0117 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c @@ -415,6 +415,7 @@ static int vf_get_ggtt_info(struct xe_gt *gt) xe_gt_sriov_dbg_verbose(gt, "GGTT %#llx-%#llx = %lluK\n", start, start + size - 1, size / SZ_1K); + config->ggtt_shift = start - (s64)config->ggtt_base; config->ggtt_base = start; config->ggtt_size = size; @@ -938,6 +939,31 @@ int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt) return err; } +/** + * xe_gt_sriov_vf_fixup_ggtt_nodes - Shift GGTT allocations to match assigned range. + * @gt: the &xe_gt struct instance + * Return: 0 on success, ENODATA if fixups are unnecessary + * + * Since Global GTT is not virtualized, each VF has an assigned range + * within the global space. This range might have changed during migration, + * which requires all memory addresses pointing to GGTT to be shifted. + */ +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt) +{ + struct xe_gt_sriov_vf_selfconfig *config = >->sriov.vf.self_config; + struct xe_tile *tile = gt_to_tile(gt); + struct xe_ggtt *ggtt = tile->mem.ggtt; + s64 ggtt_shift; + + mutex_lock(&ggtt->lock); + ggtt_shift = config->ggtt_shift; + if (ggtt_shift) + xe_ggtt_node_shift_nodes(ggtt, &tile->sriov.vf.ggtt_balloon[0], + &tile->sriov.vf.ggtt_balloon[1], ggtt_shift); + mutex_unlock(&ggtt->lock); + return ggtt_shift ? 0 : ENODATA; +} + static int vf_runtime_reg_cmp(const void *a, const void *b) { const struct vf_runtime_reg *ra = a; diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h index ba6c5d74e326..95a6c9c1dca0 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h @@ -18,6 +18,7 @@ int xe_gt_sriov_vf_query_config(struct xe_gt *gt); int xe_gt_sriov_vf_connect(struct xe_gt *gt); int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt); int xe_gt_sriov_vf_prepare_ggtt(struct xe_gt *gt); +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt); int xe_gt_sriov_vf_notify_resfix_done(struct xe_gt *gt); void xe_gt_sriov_vf_migrated_event_handler(struct xe_gt *gt); diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h index a57f13b5afcd..5ccbdf8d08b6 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h @@ -40,6 +40,8 @@ struct xe_gt_sriov_vf_selfconfig { u64 ggtt_base; /** @ggtt_size: assigned size of the GGTT region. */ u64 ggtt_size; + /** @ggtt_shift: difference in ggtt_base on last migration */ + s64 ggtt_shift; /** @lmem_size: assigned size of the LMEM. */ u64 lmem_size; /** @num_ctxs: assigned number of GuC submission context IDs. */ diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/xe_sriov_vf.c index c1275e64aa9c..4ee8fc70a744 100644 --- a/drivers/gpu/drm/xe/xe_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_sriov_vf.c @@ -7,6 +7,7 @@ #include "xe_assert.h" #include "xe_device.h" +#include "xe_gt.h" #include "xe_gt_sriov_printk.h" #include "xe_gt_sriov_vf.h" #include "xe_pm.h" @@ -170,6 +171,26 @@ static bool vf_post_migration_imminent(struct xe_device *xe) work_pending(&xe->sriov.vf.migration.worker); } +static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) +{ + struct xe_tile *tile; + unsigned int id; + int err; + + for_each_tile(tile, xe, id) { + struct xe_gt *gt = tile->primary_gt; + int ret; + + /* media doesn't have its own ggtt */ + if (xe_gt_is_media_type(gt)) + continue; + ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); + if (ret != ENODATA) + err = ret; + } + return err; +} + /* * Notify all GuCs about resource fixups apply finished. */ @@ -201,6 +222,7 @@ static void vf_post_migration_recovery(struct xe_device *xe) if (unlikely(err)) goto fail; + err = vf_post_migration_fixup_ggtt_nodes(xe); /* FIXME: add the recovery steps */ vf_post_migration_notify_resfix_done(xe); xe_pm_runtime_put(xe); -- 2.25.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2025-03-06 22:21 ` [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration Tomasz Lis @ 2025-03-14 18:22 ` Michal Wajdeczko 2025-03-14 23:45 ` Lis, Tomasz 2025-03-24 5:58 ` Dan Carpenter 1 sibling, 1 reply; 8+ messages in thread From: Michal Wajdeczko @ 2025-03-14 18:22 UTC (permalink / raw) To: Tomasz Lis, intel-xe; +Cc: Michał Winiarski, Piotr Piórkowski On 06.03.2025 23:21, Tomasz Lis wrote: > We have only one GGTT for all IOV functions, with each VF having assigned > a range of addresses for its use. After migration, a VF can receive a > different range of addresses than it had initially. > > This implements shifting GGTT addresses within drm_mm nodes, so that > VMAs stay valid after migration. This will make the driver use new > addresses when accessing GGTT from the moment the shifting ends. > > By taking the ggtt->lock for the period of VMA fixups, this change > also adds constraint on that mutex. Any locks used during the recovery > cannot ever wait for hardware response - because after migration, > the hardware will not do anything until fixups are finished. > > v2: Moved some functs to xe_ggtt.c; moved shift computation to just > after querying; improved documentation; switched some warns to asserts; > skipping fixups when GGTT shift eq 0; iterating through tiles (Michal) > v3: Updated kerneldocs, removed unused funct, properly allocate > balloning nodes if non existent > > Signed-off-by: Tomasz Lis <tomasz.lis@intel.com> > --- > drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ > drivers/gpu/drm/xe/xe_ggtt.h | 2 + > drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ > drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + > drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + > drivers/gpu/drm/xe/xe_sriov_vf.c | 22 +++ > 6 files changed, 216 insertions(+) > > diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c > index 5fcb2b4c2c13..6865d1cdd676 100644 > --- a/drivers/gpu/drm/xe/xe_ggtt.c > +++ b/drivers/gpu/drm/xe/xe_ggtt.c > @@ -489,6 +489,169 @@ void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node) > xe_ggtt_node_fini(node); > } > > +static u64 drm_mm_node_end(struct drm_mm_node *node) > +{ > + return node->start + node->size; > +} > + > +static void xe_ggtt_mm_shift_nodes(struct xe_ggtt *ggtt, struct drm_mm_node *balloon_beg, > + struct drm_mm_node *balloon_fin, s64 shift) > +{ > + struct drm_mm_node *node, *tmpn; > + LIST_HEAD(temp_list_head); > + int err; > + > + lockdep_assert_held(&ggtt->lock); > + > + /* > + * Move nodes, from range previously assigned to this VF, into temp list. > + * > + * The balloon_beg and balloon_fin nodes are there to eliminate unavailable > + * ranges from use: first reserves the GGTT area below the range for current VF, > + * and second reserves area above. > + * > + * Below is a GGTT layout of example VF, with a certain address range assigned to > + * said VF, and inaccessible areas above and below: > + * > + * 0 4GiB > + * |<--------------------------- Total GGTT size ----------------------------->| > + * WOPCM GUC_TOP > + * |<-------------- Area mappable by xe_ggtt instance ---------------->| > + * > + * +---+---------------------------------+----------+----------------------+---+ > + * |\\\|/////////////////////////////////| VF mem |//////////////////////|\\\| > + * +---+---------------------------------+----------+----------------------+---+ > + * > + * Hardware enforced access rules before migration: > + * > + * |<------- inaccessible for VF ------->|<VF owned>|<-- inaccessible for VF ->| > + * > + * drm_mm nodes used for tracking allocations: > + * > + * |<----------- balloon ------------>|<- nodes->|<----- balloon ------>| > + * > + * After the migration, GGTT area assigned to the VF might have shifted, either > + * to lower or to higher address. But we expect the total size and extra areas to > + * be identical, as migration can only happen between matching platforms. > + * Below is an example of GGTT layout of the VF after migration. Content of the > + * GGTT for VF has been moved to a new area, and we receive its address from GuC: > + * > + * +---+----------------------+----------+---------------------------------+---+ > + * |\\\|//////////////////////| VF mem |/////////////////////////////////|\\\| > + * +---+----------------------+----------+---------------------------------+---+ > + * > + * Hardware enforced access rules after migration: > + * > + * |<- inaccessible for VF -->|<VF owned>|<------- inaccessible for VF ------->| > + * > + * So the VF has a new slice of GGTT assigned, and during migration process, the > + * memory content was copied to that new area. But the drm_mm nodes within xe kmd > + * are still tracking allocations using the old addresses. The nodes within VF > + * owned area have to be shifted, and balloon nodes need to be resized to > + * properly mask out areas not owned by the VF. > + * > + * Fixed drm_mm nodes used for tracking allocations: > + * > + * |<------ balloon ------>|<- nodes->|<----------- balloon ----------->| > + * > + * Due to use of GPU profiles, we do not expect the old and new GGTT ares to > + * overlap; but our node shifting will fix addresses properly regardless. > + * > + */ > + drm_mm_for_each_node_in_range_safe(node, tmpn, &ggtt->mm, > + drm_mm_node_end(balloon_beg), > + balloon_fin->start) { > + drm_mm_remove_node(node); > + list_add(&node->node_list, &temp_list_head); > + } > + > + /* shift and re-add ballooning nodes */ > + if (drm_mm_node_allocated(balloon_beg)) > + drm_mm_remove_node(balloon_beg); > + if (drm_mm_node_allocated(balloon_fin)) > + drm_mm_remove_node(balloon_fin); > + balloon_beg->size += shift; > + balloon_fin->start += shift; > + balloon_fin->size -= shift; > + if (balloon_beg->size != 0) { > + err = drm_mm_reserve_node(&ggtt->mm, balloon_beg); > + xe_tile_assert(ggtt->tile, !err); > + } > + if (balloon_fin->size != 0) { > + err = drm_mm_reserve_node(&ggtt->mm, balloon_fin); > + xe_tile_assert(ggtt->tile, !err); > + } > + > + /* > + * Now the GGTT VM contains only nodes outside of area assigned to this VF. > + * We can re-add all VF nodes with shifted offsets. > + */ > + list_for_each_entry_safe(node, tmpn, &temp_list_head, node_list) { > + list_del(&node->node_list); > + node->start += shift; > + err = drm_mm_reserve_node(&ggtt->mm, node); > + xe_tile_assert(ggtt->tile, !err); > + } > +} > + > +/** > + * xe_ggtt_node_shift_nodes - Shift GGTT nodes to adjust for a change in usable address range. > + * @ggtt: the &xe_ggtt struct instance > + * @balloon_beg: ggtt balloon node which preceds the area provisioned for current VF > + * @balloon_fin: ggtt balloon node which follows the area provisioned for current VF > + * @shift: change to the location of area provisioned for current VF > + */ > +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, > + struct xe_ggtt_node **balloon_fin, s64 shift) > +{ > + struct drm_mm_node *balloon_mm_beg, *balloon_mm_end; > + struct xe_ggtt_node *node; > + > + if (!*balloon_beg) > + { > + node = xe_ggtt_node_init(ggtt); > + if (IS_ERR(node)) > + goto out; > + node->base.color = 0; > + node->base.flags = 0; > + node->base.start = xe_wopcm_size(ggtt->tile->xe); > + node->base.size = 0; > + *balloon_beg = node; > + } > + balloon_mm_beg = &(*balloon_beg)->base; > + > + if (!*balloon_fin) > + { > + node = xe_ggtt_node_init(ggtt); > + if (IS_ERR(node)) > + goto out; > + node->base.color = 0; > + node->base.flags = 0; > + node->base.start = GUC_GGTT_TOP; > + node->base.size = 0; > + *balloon_fin = node; > + } > + balloon_mm_end = &(*balloon_fin)->base; > + > + xe_tile_assert(ggtt->tile, (*balloon_beg)->ggtt); > + xe_tile_assert(ggtt->tile, (*balloon_fin)->ggtt); > + > + xe_ggtt_mm_shift_nodes(ggtt, balloon_mm_beg, balloon_mm_end, shift); > +out: > + if (*balloon_beg && !xe_ggtt_node_allocated(*balloon_beg)) > + { > + node = *balloon_beg; > + *balloon_beg = NULL; > + xe_ggtt_node_fini(node); > + } > + if (*balloon_fin && !xe_ggtt_node_allocated(*balloon_fin)) > + { > + node = *balloon_fin; > + *balloon_fin = NULL; > + xe_ggtt_node_fini(node); > + } > +} > + > /** > * xe_ggtt_node_insert_locked - Locked version to insert a &xe_ggtt_node into the GGTT > * @node: the &xe_ggtt_node to be inserted > diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h > index 27e7d67de004..d9e133a155e6 100644 > --- a/drivers/gpu/drm/xe/xe_ggtt.h > +++ b/drivers/gpu/drm/xe/xe_ggtt.h > @@ -18,6 +18,8 @@ void xe_ggtt_node_fini(struct xe_ggtt_node *node); > int xe_ggtt_node_insert_balloon(struct xe_ggtt_node *node, > u64 start, u64 size); > void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node); > +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, > + struct xe_ggtt_node **balloon_fin, s64 shift); > > int xe_ggtt_node_insert(struct xe_ggtt_node *node, u32 size, u32 align); > int xe_ggtt_node_insert_locked(struct xe_ggtt_node *node, > diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c > index a439261bf4d7..dbd7010f0117 100644 > --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c > +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c > @@ -415,6 +415,7 @@ static int vf_get_ggtt_info(struct xe_gt *gt) > xe_gt_sriov_dbg_verbose(gt, "GGTT %#llx-%#llx = %lluK\n", > start, start + size - 1, size / SZ_1K); > > + config->ggtt_shift = start - (s64)config->ggtt_base; btw, is it safe to keep ggtt_shift after we're done with fixups? > config->ggtt_base = start; > config->ggtt_size = size; > > @@ -938,6 +939,31 @@ int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt) > return err; > } > > +/** > + * xe_gt_sriov_vf_fixup_ggtt_nodes - Shift GGTT allocations to match assigned range. > + * @gt: the &xe_gt struct instance > + * Return: 0 on success, ENODATA if fixups are unnecessary if you really need to distinguish between nop/done then bool as return will be better, but I'm not sure that caller needs to know if we need to know whether there was a shift, and thus we need to start the fixup sequence, then maybe we should have a separate function that returns (and maybe clears) the ggtt_shift > + * > + * Since Global GTT is not virtualized, each VF has an assigned range > + * within the global space. This range might have changed during migration, > + * which requires all memory addresses pointing to GGTT to be shifted. > + */ > +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt) > +{ > + struct xe_gt_sriov_vf_selfconfig *config = >->sriov.vf.self_config; > + struct xe_tile *tile = gt_to_tile(gt); > + struct xe_ggtt *ggtt = tile->mem.ggtt; > + s64 ggtt_shift; > + > + mutex_lock(&ggtt->lock); > + ggtt_shift = config->ggtt_shift; > + if (ggtt_shift) > + xe_ggtt_node_shift_nodes(ggtt, &tile->sriov.vf.ggtt_balloon[0], > + &tile->sriov.vf.ggtt_balloon[1], ggtt_shift); maybe to make it a little simpler on the this xe_ggtt function side, we should remove our balloon nodes before requesting shift_nodes(), and then re-add balloon nodes here again? > + mutex_unlock(&ggtt->lock); > + return ggtt_shift ? 0 : ENODATA; and it's quite unusual to return positive errno codes... > +} > + > static int vf_runtime_reg_cmp(const void *a, const void *b) > { > const struct vf_runtime_reg *ra = a; > diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h > index ba6c5d74e326..95a6c9c1dca0 100644 > --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h > +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h > @@ -18,6 +18,7 @@ int xe_gt_sriov_vf_query_config(struct xe_gt *gt); > int xe_gt_sriov_vf_connect(struct xe_gt *gt); > int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt); > int xe_gt_sriov_vf_prepare_ggtt(struct xe_gt *gt); > +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt); > int xe_gt_sriov_vf_notify_resfix_done(struct xe_gt *gt); > void xe_gt_sriov_vf_migrated_event_handler(struct xe_gt *gt); > > diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h > index a57f13b5afcd..5ccbdf8d08b6 100644 > --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h > +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h > @@ -40,6 +40,8 @@ struct xe_gt_sriov_vf_selfconfig { > u64 ggtt_base; > /** @ggtt_size: assigned size of the GGTT region. */ > u64 ggtt_size; > + /** @ggtt_shift: difference in ggtt_base on last migration */ > + s64 ggtt_shift; > /** @lmem_size: assigned size of the LMEM. */ > u64 lmem_size; > /** @num_ctxs: assigned number of GuC submission context IDs. */ > diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/xe_sriov_vf.c > index c1275e64aa9c..4ee8fc70a744 100644 > --- a/drivers/gpu/drm/xe/xe_sriov_vf.c > +++ b/drivers/gpu/drm/xe/xe_sriov_vf.c > @@ -7,6 +7,7 @@ > > #include "xe_assert.h" > #include "xe_device.h" > +#include "xe_gt.h" > #include "xe_gt_sriov_printk.h" > #include "xe_gt_sriov_vf.h" > #include "xe_pm.h" > @@ -170,6 +171,26 @@ static bool vf_post_migration_imminent(struct xe_device *xe) > work_pending(&xe->sriov.vf.migration.worker); > } > > +static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) > +{ > + struct xe_tile *tile; > + unsigned int id; > + int err; > + > + for_each_tile(tile, xe, id) { > + struct xe_gt *gt = tile->primary_gt; > + int ret; > + > + /* media doesn't have its own ggtt */ > + if (xe_gt_is_media_type(gt)) primary_gt can't be MEDIA_TYPE > + continue; > + ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); > + if (ret != ENODATA) > + err = ret; for multi-tile platforms, this could overwrite previous error/status > + } > + return err; err might be still uninitialized here > +} > + > /* > * Notify all GuCs about resource fixups apply finished. > */ > @@ -201,6 +222,7 @@ static void vf_post_migration_recovery(struct xe_device *xe) > if (unlikely(err)) > goto fail; > > + err = vf_post_migration_fixup_ggtt_nodes(xe); > /* FIXME: add the recovery steps */ > vf_post_migration_notify_resfix_done(xe); > xe_pm_runtime_put(xe); ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2025-03-14 18:22 ` Michal Wajdeczko @ 2025-03-14 23:45 ` Lis, Tomasz 2025-03-15 14:27 ` Michal Wajdeczko 0 siblings, 1 reply; 8+ messages in thread From: Lis, Tomasz @ 2025-03-14 23:45 UTC (permalink / raw) To: Michal Wajdeczko, intel-xe; +Cc: Michał Winiarski, Piotr Piórkowski [-- Attachment #1: Type: text/plain, Size: 15850 bytes --] On 14.03.2025 19:22, Michal Wajdeczko wrote: > > On 06.03.2025 23:21, Tomasz Lis wrote: >> We have only one GGTT for all IOV functions, with each VF having assigned >> a range of addresses for its use. After migration, a VF can receive a >> different range of addresses than it had initially. >> >> This implements shifting GGTT addresses within drm_mm nodes, so that >> VMAs stay valid after migration. This will make the driver use new >> addresses when accessing GGTT from the moment the shifting ends. >> >> By taking the ggtt->lock for the period of VMA fixups, this change >> also adds constraint on that mutex. Any locks used during the recovery >> cannot ever wait for hardware response - because after migration, >> the hardware will not do anything until fixups are finished. >> >> v2: Moved some functs to xe_ggtt.c; moved shift computation to just >> after querying; improved documentation; switched some warns to asserts; >> skipping fixups when GGTT shift eq 0; iterating through tiles (Michal) >> v3: Updated kerneldocs, removed unused funct, properly allocate >> balloning nodes if non existent >> >> Signed-off-by: Tomasz Lis<tomasz.lis@intel.com> >> --- >> drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ >> drivers/gpu/drm/xe/xe_ggtt.h | 2 + >> drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ >> drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + >> drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + >> drivers/gpu/drm/xe/xe_sriov_vf.c | 22 +++ >> 6 files changed, 216 insertions(+) >> >> diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c >> index 5fcb2b4c2c13..6865d1cdd676 100644 >> --- a/drivers/gpu/drm/xe/xe_ggtt.c >> +++ b/drivers/gpu/drm/xe/xe_ggtt.c >> @@ -489,6 +489,169 @@ void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node) >> xe_ggtt_node_fini(node); >> } >> >> +static u64 drm_mm_node_end(struct drm_mm_node *node) >> +{ >> + return node->start + node->size; >> +} >> + >> +static void xe_ggtt_mm_shift_nodes(struct xe_ggtt *ggtt, struct drm_mm_node *balloon_beg, >> + struct drm_mm_node *balloon_fin, s64 shift) >> +{ >> + struct drm_mm_node *node, *tmpn; >> + LIST_HEAD(temp_list_head); >> + int err; >> + >> + lockdep_assert_held(&ggtt->lock); >> + >> + /* >> + * Move nodes, from range previously assigned to this VF, into temp list. >> + * >> + * The balloon_beg and balloon_fin nodes are there to eliminate unavailable >> + * ranges from use: first reserves the GGTT area below the range for current VF, >> + * and second reserves area above. >> + * >> + * Below is a GGTT layout of example VF, with a certain address range assigned to >> + * said VF, and inaccessible areas above and below: >> + * >> + * 0 4GiB >> + * |<--------------------------- Total GGTT size ----------------------------->| >> + * WOPCM GUC_TOP >> + * |<-------------- Area mappable by xe_ggtt instance ---------------->| >> + * >> + * +---+---------------------------------+----------+----------------------+---+ >> + * |\\\|/////////////////////////////////| VF mem |//////////////////////|\\\| >> + * +---+---------------------------------+----------+----------------------+---+ >> + * >> + * Hardware enforced access rules before migration: >> + * >> + * |<------- inaccessible for VF ------->|<VF owned>|<-- inaccessible for VF ->| >> + * >> + * drm_mm nodes used for tracking allocations: >> + * >> + * |<----------- balloon ------------>|<- nodes->|<----- balloon ------>| >> + * >> + * After the migration, GGTT area assigned to the VF might have shifted, either >> + * to lower or to higher address. But we expect the total size and extra areas to >> + * be identical, as migration can only happen between matching platforms. >> + * Below is an example of GGTT layout of the VF after migration. Content of the >> + * GGTT for VF has been moved to a new area, and we receive its address from GuC: >> + * >> + * +---+----------------------+----------+---------------------------------+---+ >> + * |\\\|//////////////////////| VF mem |/////////////////////////////////|\\\| >> + * +---+----------------------+----------+---------------------------------+---+ >> + * >> + * Hardware enforced access rules after migration: >> + * >> + * |<- inaccessible for VF -->|<VF owned>|<------- inaccessible for VF ------->| >> + * >> + * So the VF has a new slice of GGTT assigned, and during migration process, the >> + * memory content was copied to that new area. But the drm_mm nodes within xe kmd >> + * are still tracking allocations using the old addresses. The nodes within VF >> + * owned area have to be shifted, and balloon nodes need to be resized to >> + * properly mask out areas not owned by the VF. >> + * >> + * Fixed drm_mm nodes used for tracking allocations: >> + * >> + * |<------ balloon ------>|<- nodes->|<----------- balloon ----------->| >> + * >> + * Due to use of GPU profiles, we do not expect the old and new GGTT ares to >> + * overlap; but our node shifting will fix addresses properly regardless. >> + * >> + */ >> + drm_mm_for_each_node_in_range_safe(node, tmpn, &ggtt->mm, >> + drm_mm_node_end(balloon_beg), >> + balloon_fin->start) { >> + drm_mm_remove_node(node); >> + list_add(&node->node_list, &temp_list_head); >> + } >> + >> + /* shift and re-add ballooning nodes */ >> + if (drm_mm_node_allocated(balloon_beg)) >> + drm_mm_remove_node(balloon_beg); >> + if (drm_mm_node_allocated(balloon_fin)) >> + drm_mm_remove_node(balloon_fin); >> + balloon_beg->size += shift; >> + balloon_fin->start += shift; >> + balloon_fin->size -= shift; >> + if (balloon_beg->size != 0) { >> + err = drm_mm_reserve_node(&ggtt->mm, balloon_beg); >> + xe_tile_assert(ggtt->tile, !err); >> + } >> + if (balloon_fin->size != 0) { >> + err = drm_mm_reserve_node(&ggtt->mm, balloon_fin); >> + xe_tile_assert(ggtt->tile, !err); >> + } >> + >> + /* >> + * Now the GGTT VM contains only nodes outside of area assigned to this VF. >> + * We can re-add all VF nodes with shifted offsets. >> + */ >> + list_for_each_entry_safe(node, tmpn, &temp_list_head, node_list) { >> + list_del(&node->node_list); >> + node->start += shift; >> + err = drm_mm_reserve_node(&ggtt->mm, node); >> + xe_tile_assert(ggtt->tile, !err); >> + } >> +} >> + >> +/** >> + * xe_ggtt_node_shift_nodes - Shift GGTT nodes to adjust for a change in usable address range. >> + * @ggtt: the &xe_ggtt struct instance >> + * @balloon_beg: ggtt balloon node which preceds the area provisioned for current VF >> + * @balloon_fin: ggtt balloon node which follows the area provisioned for current VF >> + * @shift: change to the location of area provisioned for current VF >> + */ >> +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, >> + struct xe_ggtt_node **balloon_fin, s64 shift) >> +{ >> + struct drm_mm_node *balloon_mm_beg, *balloon_mm_end; >> + struct xe_ggtt_node *node; >> + >> + if (!*balloon_beg) >> + { >> + node = xe_ggtt_node_init(ggtt); >> + if (IS_ERR(node)) >> + goto out; >> + node->base.color = 0; >> + node->base.flags = 0; >> + node->base.start = xe_wopcm_size(ggtt->tile->xe); >> + node->base.size = 0; >> + *balloon_beg = node; >> + } >> + balloon_mm_beg = &(*balloon_beg)->base; >> + >> + if (!*balloon_fin) >> + { >> + node = xe_ggtt_node_init(ggtt); >> + if (IS_ERR(node)) >> + goto out; >> + node->base.color = 0; >> + node->base.flags = 0; >> + node->base.start = GUC_GGTT_TOP; >> + node->base.size = 0; >> + *balloon_fin = node; >> + } >> + balloon_mm_end = &(*balloon_fin)->base; >> + >> + xe_tile_assert(ggtt->tile, (*balloon_beg)->ggtt); >> + xe_tile_assert(ggtt->tile, (*balloon_fin)->ggtt); >> + >> + xe_ggtt_mm_shift_nodes(ggtt, balloon_mm_beg, balloon_mm_end, shift); >> +out: >> + if (*balloon_beg && !xe_ggtt_node_allocated(*balloon_beg)) >> + { >> + node = *balloon_beg; >> + *balloon_beg = NULL; >> + xe_ggtt_node_fini(node); >> + } >> + if (*balloon_fin && !xe_ggtt_node_allocated(*balloon_fin)) >> + { >> + node = *balloon_fin; >> + *balloon_fin = NULL; >> + xe_ggtt_node_fini(node); >> + } >> +} >> + >> /** >> * xe_ggtt_node_insert_locked - Locked version to insert a &xe_ggtt_node into the GGTT >> * @node: the &xe_ggtt_node to be inserted >> diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h >> index 27e7d67de004..d9e133a155e6 100644 >> --- a/drivers/gpu/drm/xe/xe_ggtt.h >> +++ b/drivers/gpu/drm/xe/xe_ggtt.h >> @@ -18,6 +18,8 @@ void xe_ggtt_node_fini(struct xe_ggtt_node *node); >> int xe_ggtt_node_insert_balloon(struct xe_ggtt_node *node, >> u64 start, u64 size); >> void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node); >> +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, >> + struct xe_ggtt_node **balloon_fin, s64 shift); >> >> int xe_ggtt_node_insert(struct xe_ggtt_node *node, u32 size, u32 align); >> int xe_ggtt_node_insert_locked(struct xe_ggtt_node *node, >> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >> index a439261bf4d7..dbd7010f0117 100644 >> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >> @@ -415,6 +415,7 @@ static int vf_get_ggtt_info(struct xe_gt *gt) >> xe_gt_sriov_dbg_verbose(gt, "GGTT %#llx-%#llx = %lluK\n", >> start, start + size - 1, size / SZ_1K); >> >> + config->ggtt_shift = start - (s64)config->ggtt_base; > btw, is it safe to keep ggtt_shift after we're done with fixups? its value is always set in `vf_post_migration_requery_guc()`. And fixup functions are only called after that, and will never be called outside of recovery. So, yes it's safe. > >> config->ggtt_base = start; >> config->ggtt_size = size; >> >> @@ -938,6 +939,31 @@ int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt) >> return err; >> } >> >> +/** >> + * xe_gt_sriov_vf_fixup_ggtt_nodes - Shift GGTT allocations to match assigned range. >> + * @gt: the &xe_gt struct instance >> + * Return: 0 on success, ENODATA if fixups are unnecessary > if you really need to distinguish between nop/done then bool as return > will be better, but I'm not sure that caller needs to know I don't really need this. Michal, this was introduced on your request. > if we need to know whether there was a shift, and thus we need to start > the fixup sequence, then maybe we should have a separate function that > returns (and maybe clears) the ggtt_shift No need to clear the shift. I did not checked for a zero shift in my original patch. I consider it pointless to complicate the flow with this skip. This was introduced on your request. If you agree please let me know and I will revert the changes which introduced this check. I can instead make a separate function iterating through tiles too, if that is your preference. >> + * >> + * Since Global GTT is not virtualized, each VF has an assigned range >> + * within the global space. This range might have changed during migration, >> + * which requires all memory addresses pointing to GGTT to be shifted. >> + */ >> +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt) >> +{ >> + struct xe_gt_sriov_vf_selfconfig *config = >->sriov.vf.self_config; >> + struct xe_tile *tile = gt_to_tile(gt); >> + struct xe_ggtt *ggtt = tile->mem.ggtt; >> + s64 ggtt_shift; >> + >> + mutex_lock(&ggtt->lock); >> + ggtt_shift = config->ggtt_shift; >> + if (ggtt_shift) >> + xe_ggtt_node_shift_nodes(ggtt, &tile->sriov.vf.ggtt_balloon[0], >> + &tile->sriov.vf.ggtt_balloon[1], ggtt_shift); > maybe to make it a little simpler on the this xe_ggtt function side, we > should remove our balloon nodes before requesting shift_nodes(), and > then re-add balloon nodes here again? I like having balloons re-added first, as that mimics the order in probe, and makes the flow more logical: define bounds first, then add the functional content. What would make this flow simpler is if the balloons always existed instead of having to be conditionally created. Having the balloons added at the end would not make the code easier to understand for new readers, but actually more convoluted. That would also mean in case of error we wouldn't just get few non-allocated nodes, but unset bounds. No reset would recover from that. > >> + mutex_unlock(&ggtt->lock); >> + return ggtt_shift ? 0 : ENODATA; > and it's quite unusual to return positive errno codes... right, will negate. > >> +} >> + >> static int vf_runtime_reg_cmp(const void *a, const void *b) >> { >> const struct vf_runtime_reg *ra = a; >> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >> index ba6c5d74e326..95a6c9c1dca0 100644 >> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >> @@ -18,6 +18,7 @@ int xe_gt_sriov_vf_query_config(struct xe_gt *gt); >> int xe_gt_sriov_vf_connect(struct xe_gt *gt); >> int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt); >> int xe_gt_sriov_vf_prepare_ggtt(struct xe_gt *gt); >> +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt); >> int xe_gt_sriov_vf_notify_resfix_done(struct xe_gt *gt); >> void xe_gt_sriov_vf_migrated_event_handler(struct xe_gt *gt); >> >> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >> index a57f13b5afcd..5ccbdf8d08b6 100644 >> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >> @@ -40,6 +40,8 @@ struct xe_gt_sriov_vf_selfconfig { >> u64 ggtt_base; >> /** @ggtt_size: assigned size of the GGTT region. */ >> u64 ggtt_size; >> + /** @ggtt_shift: difference in ggtt_base on last migration */ >> + s64 ggtt_shift; >> /** @lmem_size: assigned size of the LMEM. */ >> u64 lmem_size; >> /** @num_ctxs: assigned number of GuC submission context IDs. */ >> diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/xe_sriov_vf.c >> index c1275e64aa9c..4ee8fc70a744 100644 >> --- a/drivers/gpu/drm/xe/xe_sriov_vf.c >> +++ b/drivers/gpu/drm/xe/xe_sriov_vf.c >> @@ -7,6 +7,7 @@ >> >> #include "xe_assert.h" >> #include "xe_device.h" >> +#include "xe_gt.h" >> #include "xe_gt_sriov_printk.h" >> #include "xe_gt_sriov_vf.h" >> #include "xe_pm.h" >> @@ -170,6 +171,26 @@ static bool vf_post_migration_imminent(struct xe_device *xe) >> work_pending(&xe->sriov.vf.migration.worker); >> } >> >> +static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) >> +{ >> + struct xe_tile *tile; >> + unsigned int id; >> + int err; >> + >> + for_each_tile(tile, xe, id) { >> + struct xe_gt *gt = tile->primary_gt; >> + int ret; >> + >> + /* media doesn't have its own ggtt */ >> + if (xe_gt_is_media_type(gt)) > primary_gt can't be MEDIA_TYPE ok, will remove the condition. > >> + continue; >> + ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); >> + if (ret != ENODATA) >> + err = ret; > for multi-tile platforms, this could overwrite previous error/status Kerneldoc for `xe_gt_sriov_vf_fixup_ggtt_nodes` explains possible `ret` values. With that, the solution is correct. > >> + } >> + return err; > err might be still uninitialized here True. Will fix. -Tomasz > >> +} >> + >> /* >> * Notify all GuCs about resource fixups apply finished. >> */ >> @@ -201,6 +222,7 @@ static void vf_post_migration_recovery(struct xe_device *xe) >> if (unlikely(err)) >> goto fail; >> >> + err = vf_post_migration_fixup_ggtt_nodes(xe); >> /* FIXME: add the recovery steps */ >> vf_post_migration_notify_resfix_done(xe); >> xe_pm_runtime_put(xe); [-- Attachment #2: Type: text/html, Size: 18327 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2025-03-14 23:45 ` Lis, Tomasz @ 2025-03-15 14:27 ` Michal Wajdeczko 2025-03-28 17:52 ` Lis, Tomasz 0 siblings, 1 reply; 8+ messages in thread From: Michal Wajdeczko @ 2025-03-15 14:27 UTC (permalink / raw) To: Lis, Tomasz, intel-xe; +Cc: Michał Winiarski, Piotr Piórkowski On 15.03.2025 00:45, Lis, Tomasz wrote: > > On 14.03.2025 19:22, Michal Wajdeczko wrote: >> >> On 06.03.2025 23:21, Tomasz Lis wrote: >>> We have only one GGTT for all IOV functions, with each VF having >>> assigned >>> a range of addresses for its use. After migration, a VF can receive a >>> different range of addresses than it had initially. >>> >>> This implements shifting GGTT addresses within drm_mm nodes, so that >>> VMAs stay valid after migration. This will make the driver use new >>> addresses when accessing GGTT from the moment the shifting ends. >>> >>> By taking the ggtt->lock for the period of VMA fixups, this change >>> also adds constraint on that mutex. Any locks used during the recovery >>> cannot ever wait for hardware response - because after migration, >>> the hardware will not do anything until fixups are finished. >>> >>> v2: Moved some functs to xe_ggtt.c; moved shift computation to just >>> after querying; improved documentation; switched some warns to >>> asserts; >>> skipping fixups when GGTT shift eq 0; iterating through tiles >>> (Michal) >>> v3: Updated kerneldocs, removed unused funct, properly allocate >>> balloning nodes if non existent >>> >>> Signed-off-by: Tomasz Lis<tomasz.lis@intel.com> >>> --- >>> drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ >>> drivers/gpu/drm/xe/xe_ggtt.h | 2 + >>> drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ >>> drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + >>> drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + >>> drivers/gpu/drm/xe/xe_sriov_vf.c | 22 +++ >>> 6 files changed, 216 insertions(+) >>> >>> diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c >>> index 5fcb2b4c2c13..6865d1cdd676 100644 >>> --- a/drivers/gpu/drm/xe/xe_ggtt.c >>> +++ b/drivers/gpu/drm/xe/xe_ggtt.c >>> @@ -489,6 +489,169 @@ void xe_ggtt_node_remove_balloon(struct >>> xe_ggtt_node *node) >>> xe_ggtt_node_fini(node); >>> } >>> +static u64 drm_mm_node_end(struct drm_mm_node *node) >>> +{ >>> + return node->start + node->size; >>> +} >>> + >>> +static void xe_ggtt_mm_shift_nodes(struct xe_ggtt *ggtt, struct >>> drm_mm_node *balloon_beg, >>> + struct drm_mm_node *balloon_fin, s64 shift) >>> +{ >>> + struct drm_mm_node *node, *tmpn; >>> + LIST_HEAD(temp_list_head); >>> + int err; >>> + >>> + lockdep_assert_held(&ggtt->lock); >>> + >>> + /* >>> + * Move nodes, from range previously assigned to this VF, into >>> temp list. >>> + * >>> + * The balloon_beg and balloon_fin nodes are there to eliminate >>> unavailable >>> + * ranges from use: first reserves the GGTT area below the range >>> for current VF, >>> + * and second reserves area above. >>> + * >>> + * Below is a GGTT layout of example VF, with a certain address >>> range assigned to >>> + * said VF, and inaccessible areas above and below: >>> + * >>> + * >>> 0 4GiB >>> + * |<--------------------------- Total GGTT size >>> ----------------------------->| >>> + * >>> WOPCM GUC_TOP >>> + * |<-------------- Area mappable by xe_ggtt instance >>> ---------------->| >>> + * >>> + * +---+---------------------------------+---------- >>> +----------------------+---+ >>> + * |\\\|/////////////////////////////////| VF mem >>> |//////////////////////|\\\| >>> + * +---+---------------------------------+---------- >>> +----------------------+---+ >>> + * >>> + * Hardware enforced access rules before migration: >>> + * >>> + * |<------- inaccessible for VF ------->|<VF owned>|<-- >>> inaccessible for VF ->| >>> + * >>> + * drm_mm nodes used for tracking allocations: >>> + * >>> + * |<----------- balloon ------------>|<- nodes->|<----- >>> balloon ------>| >>> + * >>> + * After the migration, GGTT area assigned to the VF might have >>> shifted, either >>> + * to lower or to higher address. But we expect the total size >>> and extra areas to >>> + * be identical, as migration can only happen between matching >>> platforms. >>> + * Below is an example of GGTT layout of the VF after migration. >>> Content of the >>> + * GGTT for VF has been moved to a new area, and we receive its >>> address from GuC: >>> + * >>> + * +---+----------------------+---------- >>> +---------------------------------+---+ >>> + * |\\\|//////////////////////| VF mem >>> |/////////////////////////////////|\\\| >>> + * +---+----------------------+---------- >>> +---------------------------------+---+ >>> + * >>> + * Hardware enforced access rules after migration: >>> + * >>> + * |<- inaccessible for VF -->|<VF owned>|<------- inaccessible >>> for VF ------->| >>> + * >>> + * So the VF has a new slice of GGTT assigned, and during >>> migration process, the >>> + * memory content was copied to that new area. But the drm_mm >>> nodes within xe kmd >>> + * are still tracking allocations using the old addresses. The >>> nodes within VF >>> + * owned area have to be shifted, and balloon nodes need to be >>> resized to >>> + * properly mask out areas not owned by the VF. >>> + * >>> + * Fixed drm_mm nodes used for tracking allocations: >>> + * >>> + * |<------ balloon ------>|<- nodes->|<----------- balloon >>> ----------->| >>> + * >>> + * Due to use of GPU profiles, we do not expect the old and new >>> GGTT ares to >>> + * overlap; but our node shifting will fix addresses properly >>> regardless. >>> + * >>> + */ >>> + drm_mm_for_each_node_in_range_safe(node, tmpn, &ggtt->mm, >>> + drm_mm_node_end(balloon_beg), >>> + balloon_fin->start) { >>> + drm_mm_remove_node(node); >>> + list_add(&node->node_list, &temp_list_head); >>> + } >>> + >>> + /* shift and re-add ballooning nodes */ >>> + if (drm_mm_node_allocated(balloon_beg)) >>> + drm_mm_remove_node(balloon_beg); >>> + if (drm_mm_node_allocated(balloon_fin)) >>> + drm_mm_remove_node(balloon_fin); >>> + balloon_beg->size += shift; >>> + balloon_fin->start += shift; >>> + balloon_fin->size -= shift; >>> + if (balloon_beg->size != 0) { >>> + err = drm_mm_reserve_node(&ggtt->mm, balloon_beg); >>> + xe_tile_assert(ggtt->tile, !err); >>> + } >>> + if (balloon_fin->size != 0) { >>> + err = drm_mm_reserve_node(&ggtt->mm, balloon_fin); >>> + xe_tile_assert(ggtt->tile, !err); >>> + } >>> + >>> + /* >>> + * Now the GGTT VM contains only nodes outside of area assigned >>> to this VF. >>> + * We can re-add all VF nodes with shifted offsets. >>> + */ >>> + list_for_each_entry_safe(node, tmpn, &temp_list_head, node_list) { >>> + list_del(&node->node_list); >>> + node->start += shift; >>> + err = drm_mm_reserve_node(&ggtt->mm, node); >>> + xe_tile_assert(ggtt->tile, !err); >>> + } >>> +} >>> + >>> +/** >>> + * xe_ggtt_node_shift_nodes - Shift GGTT nodes to adjust for a >>> change in usable address range. >>> + * @ggtt: the &xe_ggtt struct instance >>> + * @balloon_beg: ggtt balloon node which preceds the area >>> provisioned for current VF >>> + * @balloon_fin: ggtt balloon node which follows the area >>> provisioned for current VF >>> + * @shift: change to the location of area provisioned for current VF >>> + */ >>> +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct >>> xe_ggtt_node **balloon_beg, >>> + struct xe_ggtt_node **balloon_fin, s64 shift) >>> +{ >>> + struct drm_mm_node *balloon_mm_beg, *balloon_mm_end; >>> + struct xe_ggtt_node *node; >>> + >>> + if (!*balloon_beg) >>> + { >>> + node = xe_ggtt_node_init(ggtt); >>> + if (IS_ERR(node)) >>> + goto out; >>> + node->base.color = 0; >>> + node->base.flags = 0; >>> + node->base.start = xe_wopcm_size(ggtt->tile->xe); >>> + node->base.size = 0; >>> + *balloon_beg = node; >>> + } >>> + balloon_mm_beg = &(*balloon_beg)->base; >>> + >>> + if (!*balloon_fin) >>> + { >>> + node = xe_ggtt_node_init(ggtt); >>> + if (IS_ERR(node)) >>> + goto out; >>> + node->base.color = 0; >>> + node->base.flags = 0; >>> + node->base.start = GUC_GGTT_TOP; >>> + node->base.size = 0; >>> + *balloon_fin = node; >>> + } >>> + balloon_mm_end = &(*balloon_fin)->base; >>> + >>> + xe_tile_assert(ggtt->tile, (*balloon_beg)->ggtt); >>> + xe_tile_assert(ggtt->tile, (*balloon_fin)->ggtt); >>> + >>> + xe_ggtt_mm_shift_nodes(ggtt, balloon_mm_beg, balloon_mm_end, >>> shift); >>> +out: >>> + if (*balloon_beg && !xe_ggtt_node_allocated(*balloon_beg)) >>> + { >>> + node = *balloon_beg; >>> + *balloon_beg = NULL; >>> + xe_ggtt_node_fini(node); >>> + } >>> + if (*balloon_fin && !xe_ggtt_node_allocated(*balloon_fin)) >>> + { >>> + node = *balloon_fin; >>> + *balloon_fin = NULL; >>> + xe_ggtt_node_fini(node); >>> + } >>> +} >>> + >>> /** >>> * xe_ggtt_node_insert_locked - Locked version to insert a >>> &xe_ggtt_node into the GGTT >>> * @node: the &xe_ggtt_node to be inserted >>> diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h >>> index 27e7d67de004..d9e133a155e6 100644 >>> --- a/drivers/gpu/drm/xe/xe_ggtt.h >>> +++ b/drivers/gpu/drm/xe/xe_ggtt.h >>> @@ -18,6 +18,8 @@ void xe_ggtt_node_fini(struct xe_ggtt_node *node); >>> int xe_ggtt_node_insert_balloon(struct xe_ggtt_node *node, >>> u64 start, u64 size); >>> void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node); >>> +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct >>> xe_ggtt_node **balloon_beg, >>> + struct xe_ggtt_node **balloon_fin, s64 shift); >>> int xe_ggtt_node_insert(struct xe_ggtt_node *node, u32 size, u32 >>> align); >>> int xe_ggtt_node_insert_locked(struct xe_ggtt_node *node, >>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/ >>> xe/xe_gt_sriov_vf.c >>> index a439261bf4d7..dbd7010f0117 100644 >>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >>> @@ -415,6 +415,7 @@ static int vf_get_ggtt_info(struct xe_gt *gt) >>> xe_gt_sriov_dbg_verbose(gt, "GGTT %#llx-%#llx = %lluK\n", >>> start, start + size - 1, size / SZ_1K); >>> + config->ggtt_shift = start - (s64)config->ggtt_base; >> btw, is it safe to keep ggtt_shift after we're done with fixups? > > its value is always set in `vf_post_migration_requery_guc()`. And fixup > functions are only called after that, and will never be called outside > of recovery. "called after" "called outside" is that somehow enforced? do we some asserts for that? > > So, yes it's safe. I would feel more safe if the ggtt_shift is guaranteed to be zero outside the recovery process > >> >>> config->ggtt_base = start; >>> config->ggtt_size = size; >>> @@ -938,6 +939,31 @@ int xe_gt_sriov_vf_query_runtime(struct xe_gt >>> *gt) >>> return err; >>> } >>> +/** >>> + * xe_gt_sriov_vf_fixup_ggtt_nodes - Shift GGTT allocations to match >>> assigned range. >>> + * @gt: the &xe_gt struct instance >>> + * Return: 0 on success, ENODATA if fixups are unnecessary >> if you really need to distinguish between nop/done then bool as return >> will be better, but I'm not sure that caller needs to know > I don't really need this. Michal, this was introduced on your request. hmm, I don't recall and can't find it now my prev reply... but likely my point was that if we can fail we should report that >> if we need to know whether there was a shift, and thus we need to start >> the fixup sequence, then maybe we should have a separate function that >> returns (and maybe clears) the ggtt_shift > > No need to clear the shift. but it could be easily used as indication of WIP vs DONE/NOP > > I did not checked for a zero shift in my original patch. I consider it > pointless to complicate what's so complicated in check for zero/non-zero? with zero shift there is nothing to do, so even with broken/unimplemented fixup code we should still be able to move on (by avoid calling fixup code at all or doing early exit if shift is 0) > > the flow with this skip. This was introduced on your request. If you > agree please let me > > know and I will revert the changes which introduced this check. I can > instead make a separate > > function iterating through tiles too, if that is your preference. > >>> + * >>> + * Since Global GTT is not virtualized, each VF has an assigned range >>> + * within the global space. This range might have changed during >>> migration, >>> + * which requires all memory addresses pointing to GGTT to be shifted. >>> + */ >>> +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt) what about xe_gt_sriov_vf_fixup_ggtt_nodes(gt, ggtt_shift) >>> +{ >>> + struct xe_gt_sriov_vf_selfconfig *config = >- >>> >sriov.vf.self_config; >>> + struct xe_tile *tile = gt_to_tile(gt); >>> + struct xe_ggtt *ggtt = tile->mem.ggtt; >>> + s64 ggtt_shift; >>> + then xe_gt_assert(gt, ggtt_shift); or if (!ggtt_shift) return >>> + mutex_lock(&ggtt->lock); >>> + ggtt_shift = config->ggtt_shift; >>> + if (ggtt_shift) >>> + xe_ggtt_node_shift_nodes(ggtt, &tile->sriov.vf.ggtt_balloon[0], >>> + &tile->sriov.vf.ggtt_balloon[1], ggtt_shift); >> maybe to make it a little simpler on the this xe_ggtt function side, we >> should remove our balloon nodes before requesting shift_nodes(), and >> then re-add balloon nodes here again? > > I like having balloons re-added first, as that mimics the order in > probe, and makes the flow more logical: define bounds first, then add > the functional content. but during the recovery there will be no new allocations, so we can drop the bounds/balloons, move existing nodes, and apply new bounds/balloons > > What would make this flow simpler is if the balloons always existed > instead of having to be conditionally created. it might be also simpler if we try to reuse existing ballooning code from xe_gt_sriov_vf_prepare_ggtt() - maybe all we need is to add xe_gt_sriov_vf_release_ggtt() that will release balloons on request > > Having the balloons added at the end would not make the code easier to > understand for new readers, but actually more convoluted. why? in xe_ggtt we might just focus on moving the nodes (maybe using drm_mm_shift from your [2] series) without worrying about any balloons and without the balloons (which are really outside of xe_ggtt logic right now) we know that nodes shifts shall be successful [2] https://lore.kernel.org/dri-devel/20250204224136.3183710-1-tomasz.lis@intel.com/ > > That would also mean in case of error we wouldn't just get few non- > allocated nodes, but unset bounds. hmm, so maybe the only problem is that right now, ie. after xe_ggtt_node refactoring, our balloon nodes are initialized (allocated) at the same time when we insert them into GGTT if in the VF code we split calls to xe_ggtt_node_init() and xe_ggtt_node_insert_balloon() then there could be no new allocations when re-adding balloons during recovery, so we can't fail due to this > > No reset would recover from that. > >> >>> + mutex_unlock(&ggtt->lock); >>> + return ggtt_shift ? 0 : ENODATA; >> and it's quite unusual to return positive errno codes... > right, will negate. negative codes usually means errors, but I guess we can't fail, and all you want is to say whether we need extra follow up steps (fixups) or not so bool return is likely a better choice >> >>> +} >>> + >>> static int vf_runtime_reg_cmp(const void *a, const void *b) >>> { >>> const struct vf_runtime_reg *ra = a; >>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/ >>> xe/xe_gt_sriov_vf.h >>> index ba6c5d74e326..95a6c9c1dca0 100644 >>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >>> @@ -18,6 +18,7 @@ int xe_gt_sriov_vf_query_config(struct xe_gt *gt); >>> int xe_gt_sriov_vf_connect(struct xe_gt *gt); >>> int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt); >>> int xe_gt_sriov_vf_prepare_ggtt(struct xe_gt *gt); >>> +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt); >>> int xe_gt_sriov_vf_notify_resfix_done(struct xe_gt *gt); >>> void xe_gt_sriov_vf_migrated_event_handler(struct xe_gt *gt); >>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/ >>> gpu/drm/xe/xe_gt_sriov_vf_types.h >>> index a57f13b5afcd..5ccbdf8d08b6 100644 >>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >>> @@ -40,6 +40,8 @@ struct xe_gt_sriov_vf_selfconfig { >>> u64 ggtt_base; >>> /** @ggtt_size: assigned size of the GGTT region. */ >>> u64 ggtt_size; >>> + /** @ggtt_shift: difference in ggtt_base on last migration */ >>> + s64 ggtt_shift; >>> /** @lmem_size: assigned size of the LMEM. */ >>> u64 lmem_size; >>> /** @num_ctxs: assigned number of GuC submission context IDs. */ >>> diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/ >>> xe_sriov_vf.c >>> index c1275e64aa9c..4ee8fc70a744 100644 >>> --- a/drivers/gpu/drm/xe/xe_sriov_vf.c >>> +++ b/drivers/gpu/drm/xe/xe_sriov_vf.c >>> @@ -7,6 +7,7 @@ >>> #include "xe_assert.h" >>> #include "xe_device.h" >>> +#include "xe_gt.h" >>> #include "xe_gt_sriov_printk.h" >>> #include "xe_gt_sriov_vf.h" >>> #include "xe_pm.h" >>> @@ -170,6 +171,26 @@ static bool vf_post_migration_imminent(struct >>> xe_device *xe) >>> work_pending(&xe->sriov.vf.migration.worker); >>> } >>> +static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) >>> +{ >>> + struct xe_tile *tile; >>> + unsigned int id; >>> + int err; >>> + >>> + for_each_tile(tile, xe, id) { >>> + struct xe_gt *gt = tile->primary_gt; >>> + int ret; >>> + >>> + /* media doesn't have its own ggtt */ >>> + if (xe_gt_is_media_type(gt)) >> primary_gt can't be MEDIA_TYPE > ok, will remove the condition. >> >>> + continue; >>> + ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); >>> + if (ret != ENODATA) >>> + err = ret; >> for multi-tile platforms, this could overwrite previous error/status > Kerneldoc for `xe_gt_sriov_vf_fixup_ggtt_nodes` explains possible `ret` > values. With that, the solution is correct. this is still error prone, as one day someone can add more error codes to xe_gt_sriov_vf_fixup_ggtt_nodes() hmm, and while the doc for xe_gt_sriov_vf_fixup_ggtt_nodes() says: Return: 0 on success, ENODATA if fixups are unnecessary what would be expected outcome of vf_post_migration_fixup_ggtt_nodes()? maybe with bool it will be simpler (for both functions): Return: true if fixups are necessary >> >>> + } >>> + return err; >> err might be still uninitialized here > > True. Will fix. > > -Tomasz > >> >>> +} >>> + >>> /* >>> * Notify all GuCs about resource fixups apply finished. >>> */ >>> @@ -201,6 +222,7 @@ static void vf_post_migration_recovery(struct >>> xe_device *xe) >>> if (unlikely(err)) >>> goto fail; >>> + err = vf_post_migration_fixup_ggtt_nodes(xe); >>> /* FIXME: add the recovery steps */ >>> vf_post_migration_notify_resfix_done(xe); >>> xe_pm_runtime_put(xe); ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2025-03-15 14:27 ` Michal Wajdeczko @ 2025-03-28 17:52 ` Lis, Tomasz 0 siblings, 0 replies; 8+ messages in thread From: Lis, Tomasz @ 2025-03-28 17:52 UTC (permalink / raw) To: Michal Wajdeczko, intel-xe; +Cc: Michał Winiarski, Piotr Piórkowski On 15.03.2025 15:27, Michal Wajdeczko wrote: > On 15.03.2025 00:45, Lis, Tomasz wrote: >> On 14.03.2025 19:22, Michal Wajdeczko wrote: >>> On 06.03.2025 23:21, Tomasz Lis wrote: >>>> We have only one GGTT for all IOV functions, with each VF having >>>> assigned >>>> a range of addresses for its use. After migration, a VF can receive a >>>> different range of addresses than it had initially. >>>> >>>> This implements shifting GGTT addresses within drm_mm nodes, so that >>>> VMAs stay valid after migration. This will make the driver use new >>>> addresses when accessing GGTT from the moment the shifting ends. >>>> >>>> By taking the ggtt->lock for the period of VMA fixups, this change >>>> also adds constraint on that mutex. Any locks used during the recovery >>>> cannot ever wait for hardware response - because after migration, >>>> the hardware will not do anything until fixups are finished. >>>> >>>> v2: Moved some functs to xe_ggtt.c; moved shift computation to just >>>> after querying; improved documentation; switched some warns to >>>> asserts; >>>> skipping fixups when GGTT shift eq 0; iterating through tiles >>>> (Michal) >>>> v3: Updated kerneldocs, removed unused funct, properly allocate >>>> balloning nodes if non existent >>>> >>>> Signed-off-by: Tomasz Lis<tomasz.lis@intel.com> >>>> --- >>>> drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ >>>> drivers/gpu/drm/xe/xe_ggtt.h | 2 + >>>> drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ >>>> drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + >>>> drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + >>>> drivers/gpu/drm/xe/xe_sriov_vf.c | 22 +++ >>>> 6 files changed, 216 insertions(+) >>>> >>>> diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c >>>> index 5fcb2b4c2c13..6865d1cdd676 100644 >>>> --- a/drivers/gpu/drm/xe/xe_ggtt.c >>>> +++ b/drivers/gpu/drm/xe/xe_ggtt.c >>>> @@ -489,6 +489,169 @@ void xe_ggtt_node_remove_balloon(struct >>>> xe_ggtt_node *node) >>>> xe_ggtt_node_fini(node); >>>> } >>>> +static u64 drm_mm_node_end(struct drm_mm_node *node) >>>> +{ >>>> + return node->start + node->size; >>>> +} >>>> + >>>> +static void xe_ggtt_mm_shift_nodes(struct xe_ggtt *ggtt, struct >>>> drm_mm_node *balloon_beg, >>>> + struct drm_mm_node *balloon_fin, s64 shift) >>>> +{ >>>> + struct drm_mm_node *node, *tmpn; >>>> + LIST_HEAD(temp_list_head); >>>> + int err; >>>> + >>>> + lockdep_assert_held(&ggtt->lock); >>>> + >>>> + /* >>>> + * Move nodes, from range previously assigned to this VF, into >>>> temp list. >>>> + * >>>> + * The balloon_beg and balloon_fin nodes are there to eliminate >>>> unavailable >>>> + * ranges from use: first reserves the GGTT area below the range >>>> for current VF, >>>> + * and second reserves area above. >>>> + * >>>> + * Below is a GGTT layout of example VF, with a certain address >>>> range assigned to >>>> + * said VF, and inaccessible areas above and below: >>>> + * >>>> + * >>>> 0 4GiB >>>> + * |<--------------------------- Total GGTT size >>>> ----------------------------->| >>>> + * >>>> WOPCM GUC_TOP >>>> + * |<-------------- Area mappable by xe_ggtt instance >>>> ---------------->| >>>> + * >>>> + * +---+---------------------------------+---------- >>>> +----------------------+---+ >>>> + * |\\\|/////////////////////////////////| VF mem >>>> |//////////////////////|\\\| >>>> + * +---+---------------------------------+---------- >>>> +----------------------+---+ >>>> + * >>>> + * Hardware enforced access rules before migration: >>>> + * >>>> + * |<------- inaccessible for VF ------->|<VF owned>|<-- >>>> inaccessible for VF ->| >>>> + * >>>> + * drm_mm nodes used for tracking allocations: >>>> + * >>>> + * |<----------- balloon ------------>|<- nodes->|<----- >>>> balloon ------>| >>>> + * >>>> + * After the migration, GGTT area assigned to the VF might have >>>> shifted, either >>>> + * to lower or to higher address. But we expect the total size >>>> and extra areas to >>>> + * be identical, as migration can only happen between matching >>>> platforms. >>>> + * Below is an example of GGTT layout of the VF after migration. >>>> Content of the >>>> + * GGTT for VF has been moved to a new area, and we receive its >>>> address from GuC: >>>> + * >>>> + * +---+----------------------+---------- >>>> +---------------------------------+---+ >>>> + * |\\\|//////////////////////| VF mem >>>> |/////////////////////////////////|\\\| >>>> + * +---+----------------------+---------- >>>> +---------------------------------+---+ >>>> + * >>>> + * Hardware enforced access rules after migration: >>>> + * >>>> + * |<- inaccessible for VF -->|<VF owned>|<------- inaccessible >>>> for VF ------->| >>>> + * >>>> + * So the VF has a new slice of GGTT assigned, and during >>>> migration process, the >>>> + * memory content was copied to that new area. But the drm_mm >>>> nodes within xe kmd >>>> + * are still tracking allocations using the old addresses. The >>>> nodes within VF >>>> + * owned area have to be shifted, and balloon nodes need to be >>>> resized to >>>> + * properly mask out areas not owned by the VF. >>>> + * >>>> + * Fixed drm_mm nodes used for tracking allocations: >>>> + * >>>> + * |<------ balloon ------>|<- nodes->|<----------- balloon >>>> ----------->| >>>> + * >>>> + * Due to use of GPU profiles, we do not expect the old and new >>>> GGTT ares to >>>> + * overlap; but our node shifting will fix addresses properly >>>> regardless. >>>> + * >>>> + */ >>>> + drm_mm_for_each_node_in_range_safe(node, tmpn, &ggtt->mm, >>>> + drm_mm_node_end(balloon_beg), >>>> + balloon_fin->start) { >>>> + drm_mm_remove_node(node); >>>> + list_add(&node->node_list, &temp_list_head); >>>> + } >>>> + >>>> + /* shift and re-add ballooning nodes */ >>>> + if (drm_mm_node_allocated(balloon_beg)) >>>> + drm_mm_remove_node(balloon_beg); >>>> + if (drm_mm_node_allocated(balloon_fin)) >>>> + drm_mm_remove_node(balloon_fin); >>>> + balloon_beg->size += shift; >>>> + balloon_fin->start += shift; >>>> + balloon_fin->size -= shift; >>>> + if (balloon_beg->size != 0) { >>>> + err = drm_mm_reserve_node(&ggtt->mm, balloon_beg); >>>> + xe_tile_assert(ggtt->tile, !err); >>>> + } >>>> + if (balloon_fin->size != 0) { >>>> + err = drm_mm_reserve_node(&ggtt->mm, balloon_fin); >>>> + xe_tile_assert(ggtt->tile, !err); >>>> + } >>>> + >>>> + /* >>>> + * Now the GGTT VM contains only nodes outside of area assigned >>>> to this VF. >>>> + * We can re-add all VF nodes with shifted offsets. >>>> + */ >>>> + list_for_each_entry_safe(node, tmpn, &temp_list_head, node_list) { >>>> + list_del(&node->node_list); >>>> + node->start += shift; >>>> + err = drm_mm_reserve_node(&ggtt->mm, node); >>>> + xe_tile_assert(ggtt->tile, !err); >>>> + } >>>> +} >>>> + >>>> +/** >>>> + * xe_ggtt_node_shift_nodes - Shift GGTT nodes to adjust for a >>>> change in usable address range. >>>> + * @ggtt: the &xe_ggtt struct instance >>>> + * @balloon_beg: ggtt balloon node which preceds the area >>>> provisioned for current VF >>>> + * @balloon_fin: ggtt balloon node which follows the area >>>> provisioned for current VF >>>> + * @shift: change to the location of area provisioned for current VF >>>> + */ >>>> +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct >>>> xe_ggtt_node **balloon_beg, >>>> + struct xe_ggtt_node **balloon_fin, s64 shift) >>>> +{ >>>> + struct drm_mm_node *balloon_mm_beg, *balloon_mm_end; >>>> + struct xe_ggtt_node *node; >>>> + >>>> + if (!*balloon_beg) >>>> + { >>>> + node = xe_ggtt_node_init(ggtt); >>>> + if (IS_ERR(node)) >>>> + goto out; >>>> + node->base.color = 0; >>>> + node->base.flags = 0; >>>> + node->base.start = xe_wopcm_size(ggtt->tile->xe); >>>> + node->base.size = 0; >>>> + *balloon_beg = node; >>>> + } >>>> + balloon_mm_beg = &(*balloon_beg)->base; >>>> + >>>> + if (!*balloon_fin) >>>> + { >>>> + node = xe_ggtt_node_init(ggtt); >>>> + if (IS_ERR(node)) >>>> + goto out; >>>> + node->base.color = 0; >>>> + node->base.flags = 0; >>>> + node->base.start = GUC_GGTT_TOP; >>>> + node->base.size = 0; >>>> + *balloon_fin = node; >>>> + } >>>> + balloon_mm_end = &(*balloon_fin)->base; >>>> + >>>> + xe_tile_assert(ggtt->tile, (*balloon_beg)->ggtt); >>>> + xe_tile_assert(ggtt->tile, (*balloon_fin)->ggtt); >>>> + >>>> + xe_ggtt_mm_shift_nodes(ggtt, balloon_mm_beg, balloon_mm_end, >>>> shift); >>>> +out: >>>> + if (*balloon_beg && !xe_ggtt_node_allocated(*balloon_beg)) >>>> + { >>>> + node = *balloon_beg; >>>> + *balloon_beg = NULL; >>>> + xe_ggtt_node_fini(node); >>>> + } >>>> + if (*balloon_fin && !xe_ggtt_node_allocated(*balloon_fin)) >>>> + { >>>> + node = *balloon_fin; >>>> + *balloon_fin = NULL; >>>> + xe_ggtt_node_fini(node); >>>> + } >>>> +} >>>> + >>>> /** >>>> * xe_ggtt_node_insert_locked - Locked version to insert a >>>> &xe_ggtt_node into the GGTT >>>> * @node: the &xe_ggtt_node to be inserted >>>> diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h >>>> index 27e7d67de004..d9e133a155e6 100644 >>>> --- a/drivers/gpu/drm/xe/xe_ggtt.h >>>> +++ b/drivers/gpu/drm/xe/xe_ggtt.h >>>> @@ -18,6 +18,8 @@ void xe_ggtt_node_fini(struct xe_ggtt_node *node); >>>> int xe_ggtt_node_insert_balloon(struct xe_ggtt_node *node, >>>> u64 start, u64 size); >>>> void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node); >>>> +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct >>>> xe_ggtt_node **balloon_beg, >>>> + struct xe_ggtt_node **balloon_fin, s64 shift); >>>> int xe_ggtt_node_insert(struct xe_ggtt_node *node, u32 size, u32 >>>> align); >>>> int xe_ggtt_node_insert_locked(struct xe_ggtt_node *node, >>>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/ >>>> xe/xe_gt_sriov_vf.c >>>> index a439261bf4d7..dbd7010f0117 100644 >>>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >>>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c >>>> @@ -415,6 +415,7 @@ static int vf_get_ggtt_info(struct xe_gt *gt) >>>> xe_gt_sriov_dbg_verbose(gt, "GGTT %#llx-%#llx = %lluK\n", >>>> start, start + size - 1, size / SZ_1K); >>>> + config->ggtt_shift = start - (s64)config->ggtt_base; >>> btw, is it safe to keep ggtt_shift after we're done with fixups? >> its value is always set in `vf_post_migration_requery_guc()`. And fixup >> functions are only called after that, and will never be called outside >> of recovery. > "called after" > "called outside" > > is that somehow enforced? do we some asserts for that? It is "enforced", by the flow of the code. Are you implying there is a need of protecting against someone reordering the lines of code within the function, or calling random functions from somewhere else? No, we do not and will not protect from that. We have the tools - a kernel thread can check whether it's a specific worker. It just makes no sense to check for that. >> So, yes it's safe. > I would feel more safe if the ggtt_shift is guaranteed to be zero > outside the recovery process No, I see no point in that. We do not clear unused variables in kernel. Because there's no point if they're unused (unless they cause a security risk, but it doesn't happen here). It wouldn't be hard to do - the value is only set within the worker, and we can only have one worker at once - so the shift could be cleared without any need of additional protection. It is just against the kernel development practices. >>>> config->ggtt_base = start; >>>> config->ggtt_size = size; >>>> @@ -938,6 +939,31 @@ int xe_gt_sriov_vf_query_runtime(struct xe_gt >>>> *gt) >>>> return err; >>>> } >>>> +/** >>>> + * xe_gt_sriov_vf_fixup_ggtt_nodes - Shift GGTT allocations to match >>>> assigned range. >>>> + * @gt: the &xe_gt struct instance >>>> + * Return: 0 on success, ENODATA if fixups are unnecessary >>> if you really need to distinguish between nop/done then bool as return >>> will be better, but I'm not sure that caller needs to know >> I don't really need this. Michal, this was introduced on your request. > hmm, I don't recall and can't find it now my prev reply... > > but likely my point was that if we can fail we should report that > >>> if we need to know whether there was a shift, and thus we need to start >>> the fixup sequence, then maybe we should have a separate function that >>> returns (and maybe clears) the ggtt_shift >> No need to clear the shift. > but it could be easily used as indication of WIP vs DONE/NOP Where do we need such a check? Even if we need it somewhere, how is that better from checking if the worker is active? >> I did not checked for a zero shift in my original patch. I consider it >> pointless to complicate > what's so complicated in check for zero/non-zero? > > with zero shift there is nothing to do, so even with > broken/unimplemented fixup code we should still be able to move on (by > avoid calling fixup code at all or doing early exit if shift is 0) I've often got requests of putting two, and sometimes even one line into a separate function. You know who requested these. Now we're discussing making a chunk of logic conditional, and you have no problem with complicating the code? What has changed? Secondly, what is the benefit? Faster recovery? No, we're saving microseconds. Error avoidance? If there is internal inconsistency somewhere, everything will fall regardless whether we iterate through some requests and messages or not. Making this conditional strikes me as an example of premature, completely unnecessary optimization. Thirdly, "nothing to do"? we still have to do the time-intensive part of the work in the exact same way - get provisioning, and send RESFIX_DONE at the end. All we're skipping is a set of 4 (some to be added later) functions, the ones which never wait for hardware so pass through at full CPU speed. Again, why are we doing this? If we're complicating the code, adding new conditions, then there must be a reason. Why make it "so complicated" only for the complication sake? Is there some kind of threshold for unnecessary complication? >> the flow with this skip. This was introduced on your request. If you >> agree please let me >> >> know and I will revert the changes which introduced this check. I can >> instead make a separate >> >> function iterating through tiles too, if that is your preference. >> >>>> + * >>>> + * Since Global GTT is not virtualized, each VF has an assigned range >>>> + * within the global space. This range might have changed during >>>> migration, >>>> + * which requires all memory addresses pointing to GGTT to be shifted. >>>> + */ >>>> +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt) > what about > > xe_gt_sriov_vf_fixup_ggtt_nodes(gt, ggtt_shift) We're often hiding arguments for functions, but this one requires an additional one? What is the reason? Why this one in particular? I do not see any reason for that change. >>>> +{ >>>> + struct xe_gt_sriov_vf_selfconfig *config = >- >>>>> sriov.vf.self_config; >>>> + struct xe_tile *tile = gt_to_tile(gt); >>>> + struct xe_ggtt *ggtt = tile->mem.ggtt; >>>> + s64 ggtt_shift; >>>> + > then > xe_gt_assert(gt, ggtt_shift); > or > if (!ggtt_shift) > return Why? What is the reason? What is the benefit for additional code? What are the savings? I don't see the necessity. The code will work perfectly fine with zero shift. >>>> + mutex_lock(&ggtt->lock); >>>> + ggtt_shift = config->ggtt_shift; >>>> + if (ggtt_shift) >>>> + xe_ggtt_node_shift_nodes(ggtt, &tile->sriov.vf.ggtt_balloon[0], >>>> + &tile->sriov.vf.ggtt_balloon[1], ggtt_shift); >>> maybe to make it a little simpler on the this xe_ggtt function side, we >>> should remove our balloon nodes before requesting shift_nodes(), and >>> then re-add balloon nodes here again? >> I like having balloons re-added first, as that mimics the order in >> probe, and makes the flow more logical: define bounds first, then add >> the functional content. > but during the recovery there will be no new allocations, so we can drop > the bounds/balloons, move existing nodes, and apply new bounds/balloons While I don't agree these arguments justify the change, the arguments below do justify it. >> What would make this flow simpler is if the balloons always existed >> instead of having to be conditionally created. > it might be also simpler if we try to reuse existing ballooning code > from xe_gt_sriov_vf_prepare_ggtt() - maybe all we need is to add > xe_gt_sriov_vf_release_ggtt() that will release balloons on request The code reuse is a good argument for this change. Will do, with all required locking changes. >> Having the balloons added at the end would not make the code easier to >> understand for new readers, but actually more convoluted. > why? in xe_ggtt we might just focus on moving the nodes (maybe using > drm_mm_shift from your [2] series) without worrying about any balloons > > and without the balloons (which are really outside of xe_ggtt logic > right now) we know that nodes shifts shall be successful > > [2] > https://lore.kernel.org/dri-devel/20250204224136.3183710-1-tomasz.lis@intel.com/ The kernel dev practices are to avoid using uncertain future changes as a justification for current code. But by heart I agree, this does help with future prospects. >> That would also mean in case of error we wouldn't just get few non- >> allocated nodes, but unset bounds. > hmm, so maybe the only problem is that right now, ie. after xe_ggtt_node > refactoring, our balloon nodes are initialized (allocated) at the same > time when we insert them into GGTT > > if in the VF code we split calls to xe_ggtt_node_init() and > xe_ggtt_node_insert_balloon() then there could be no new allocations > when re-adding balloons during recovery, so we can't fail due to this With the code reuse, the split is not only required due to error returns, but also to avoid creating lockdep relation between ggtt lock and memory allocation. >> No reset would recover from that. >> >>>> + mutex_unlock(&ggtt->lock); >>>> + return ggtt_shift ? 0 : ENODATA; >>> and it's quite unusual to return positive errno codes... >> right, will negate. > negative codes usually means errors, but I guess we can't fail, and all > you want is to say whether we need extra follow up steps (fixups) or not > > so bool return is likely a better choice > >>>> +} >>>> + >>>> static int vf_runtime_reg_cmp(const void *a, const void *b) >>>> { >>>> const struct vf_runtime_reg *ra = a; >>>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/ >>>> xe/xe_gt_sriov_vf.h >>>> index ba6c5d74e326..95a6c9c1dca0 100644 >>>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >>>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h >>>> @@ -18,6 +18,7 @@ int xe_gt_sriov_vf_query_config(struct xe_gt *gt); >>>> int xe_gt_sriov_vf_connect(struct xe_gt *gt); >>>> int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt); >>>> int xe_gt_sriov_vf_prepare_ggtt(struct xe_gt *gt); >>>> +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt); >>>> int xe_gt_sriov_vf_notify_resfix_done(struct xe_gt *gt); >>>> void xe_gt_sriov_vf_migrated_event_handler(struct xe_gt *gt); >>>> diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/ >>>> gpu/drm/xe/xe_gt_sriov_vf_types.h >>>> index a57f13b5afcd..5ccbdf8d08b6 100644 >>>> --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >>>> +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h >>>> @@ -40,6 +40,8 @@ struct xe_gt_sriov_vf_selfconfig { >>>> u64 ggtt_base; >>>> /** @ggtt_size: assigned size of the GGTT region. */ >>>> u64 ggtt_size; >>>> + /** @ggtt_shift: difference in ggtt_base on last migration */ >>>> + s64 ggtt_shift; >>>> /** @lmem_size: assigned size of the LMEM. */ >>>> u64 lmem_size; >>>> /** @num_ctxs: assigned number of GuC submission context IDs. */ >>>> diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/ >>>> xe_sriov_vf.c >>>> index c1275e64aa9c..4ee8fc70a744 100644 >>>> --- a/drivers/gpu/drm/xe/xe_sriov_vf.c >>>> +++ b/drivers/gpu/drm/xe/xe_sriov_vf.c >>>> @@ -7,6 +7,7 @@ >>>> #include "xe_assert.h" >>>> #include "xe_device.h" >>>> +#include "xe_gt.h" >>>> #include "xe_gt_sriov_printk.h" >>>> #include "xe_gt_sriov_vf.h" >>>> #include "xe_pm.h" >>>> @@ -170,6 +171,26 @@ static bool vf_post_migration_imminent(struct >>>> xe_device *xe) >>>> work_pending(&xe->sriov.vf.migration.worker); >>>> } >>>> +static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) >>>> +{ >>>> + struct xe_tile *tile; >>>> + unsigned int id; >>>> + int err; >>>> + >>>> + for_each_tile(tile, xe, id) { >>>> + struct xe_gt *gt = tile->primary_gt; >>>> + int ret; >>>> + >>>> + /* media doesn't have its own ggtt */ >>>> + if (xe_gt_is_media_type(gt)) >>> primary_gt can't be MEDIA_TYPE >> ok, will remove the condition. >>>> + continue; >>>> + ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); >>>> + if (ret != ENODATA) >>>> + err = ret; >>> for multi-tile platforms, this could overwrite previous error/status >> Kerneldoc for `xe_gt_sriov_vf_fixup_ggtt_nodes` explains possible `ret` >> values. With that, the solution is correct. > this is still error prone, as one day someone can add more error codes > to xe_gt_sriov_vf_fixup_ggtt_nodes() > > hmm, and while the doc for xe_gt_sriov_vf_fixup_ggtt_nodes() says: > > Return: 0 on success, ENODATA if fixups are unnecessary > > what would be expected outcome of vf_post_migration_fixup_ggtt_nodes()? > > maybe with bool it will be simpler (for both functions): > > Return: true if fixups are necessary What would be simpler is no unnecessary return value at all, like in my original series. But ok, I will switch the standard Linux error codes to just a bool. -Tomasz >>>> + } >>>> + return err; >>> err might be still uninitialized here >> True. Will fix. >> >> -Tomasz >> >>>> +} >>>> + >>>> /* >>>> * Notify all GuCs about resource fixups apply finished. >>>> */ >>>> @@ -201,6 +222,7 @@ static void vf_post_migration_recovery(struct >>>> xe_device *xe) >>>> if (unlikely(err)) >>>> goto fail; >>>> + err = vf_post_migration_fixup_ggtt_nodes(xe); >>>> /* FIXME: add the recovery steps */ >>>> vf_post_migration_notify_resfix_done(xe); >>>> xe_pm_runtime_put(xe); ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2025-03-06 22:21 ` [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration Tomasz Lis 2025-03-14 18:22 ` Michal Wajdeczko @ 2025-03-24 5:58 ` Dan Carpenter 1 sibling, 0 replies; 8+ messages in thread From: Dan Carpenter @ 2025-03-24 5:58 UTC (permalink / raw) To: oe-kbuild, Tomasz Lis, intel-xe Cc: lkp, oe-kbuild-all, Michał Winiarski, Michał Wajdeczko, Piotr Piórkowski Hi Tomasz, kernel test robot noticed the following build warnings: https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/Tomasz-Lis/drm-drm_mm-Safe-macro-for-iterating-through-nodes-in-range/20250307-102511 base: https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe-next patch link: https://lore.kernel.org/r/20250306222126.3382322-3-tomasz.lis%40intel.com patch subject: [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration config: openrisc-randconfig-r073-20250321 (https://download.01.org/0day-ci/archive/20250323/202503231159.himCw1Ch-lkp@intel.com/config) compiler: or1k-linux-gcc (GCC) 11.5.0 If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags | Reported-by: kernel test robot <lkp@intel.com> | Reported-by: Dan Carpenter <dan.carpenter@linaro.org> | Closes: https://lore.kernel.org/r/202503231159.himCw1Ch-lkp@intel.com/ smatch warnings: drivers/gpu/drm/xe/xe_sriov_vf.c:191 vf_post_migration_fixup_ggtt_nodes() error: uninitialized symbol 'err'. vim +/err +191 drivers/gpu/drm/xe/xe_sriov_vf.c 253478de2cb134 Tomasz Lis 2025-03-06 174 static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) 253478de2cb134 Tomasz Lis 2025-03-06 175 { 253478de2cb134 Tomasz Lis 2025-03-06 176 struct xe_tile *tile; 253478de2cb134 Tomasz Lis 2025-03-06 177 unsigned int id; 253478de2cb134 Tomasz Lis 2025-03-06 178 int err; 253478de2cb134 Tomasz Lis 2025-03-06 179 253478de2cb134 Tomasz Lis 2025-03-06 180 for_each_tile(tile, xe, id) { 253478de2cb134 Tomasz Lis 2025-03-06 181 struct xe_gt *gt = tile->primary_gt; 253478de2cb134 Tomasz Lis 2025-03-06 182 int ret; 253478de2cb134 Tomasz Lis 2025-03-06 183 253478de2cb134 Tomasz Lis 2025-03-06 184 /* media doesn't have its own ggtt */ 253478de2cb134 Tomasz Lis 2025-03-06 185 if (xe_gt_is_media_type(gt)) 253478de2cb134 Tomasz Lis 2025-03-06 186 continue; 253478de2cb134 Tomasz Lis 2025-03-06 187 ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); 253478de2cb134 Tomasz Lis 2025-03-06 188 if (ret != ENODATA) 253478de2cb134 Tomasz Lis 2025-03-06 189 err = ret; err isn't initialized on else path. 253478de2cb134 Tomasz Lis 2025-03-06 190 } 253478de2cb134 Tomasz Lis 2025-03-06 @191 return err; 253478de2cb134 Tomasz Lis 2025-03-06 192 } -- 0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 0/3] drm/xe/vf: Post-migration recovery of GGTT nodes and CTB @ 2024-12-20 23:34 Tomasz Lis 2024-12-20 23:34 ` [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration Tomasz Lis 0 siblings, 1 reply; 8+ messages in thread From: Tomasz Lis @ 2024-12-20 23:34 UTC (permalink / raw) To: intel-xe Cc: Michał Winiarski, Michał Wajdeczko, Piotr Piórkowski To support VF Migration, it is necessary to do fixups to any non-virtualized resources. These fixups need to be applied within VM, on the KMD working with VF. This series adds two fixup functions to the recovery worker: * for fixing drm_mm nodes which represent GGTT allocations * for fixing content of outgoing CTB buffer v2: Fixed missing include, made checkpatch happy v3: Moved some functs to xe_ggtt.c; moved shift computation to just after querying; improved documentation; switched some warns to asserts; skipping fixups when GGTT shift eq 0; iterating through tiles rather than gts; fixes in log messages v4: Updated kerneldocs, removed unused funct, properly allocate balloning nodes if non existent, removed inline keywords, enums for offsets in CTB messages, less error messages, if return unused then made functs void Tomasz Lis (3): drm/drm_mm: Safe macro for iterating through nodes in range drm/xe/sriov: Shifting GGTT area post migration drm/xe/vf: Fixup CTB send buffer messages after migration drivers/gpu/drm/xe/abi/guc_actions_abi.h | 7 + drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ drivers/gpu/drm/xe/xe_ggtt.h | 2 + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + drivers/gpu/drm/xe/xe_guc_ct.c | 144 +++++++++++++++++++ drivers/gpu/drm/xe/xe_guc_ct.h | 2 + drivers/gpu/drm/xe/xe_guc_submit.c | 4 + drivers/gpu/drm/xe/xe_sriov_vf.c | 40 ++++++ include/drm/drm_mm.h | 19 +++ 11 files changed, 410 insertions(+) -- 2.25.1 ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration 2024-12-20 23:34 [PATCH v4 0/3] drm/xe/vf: Post-migration recovery of GGTT nodes and CTB Tomasz Lis @ 2024-12-20 23:34 ` Tomasz Lis 0 siblings, 0 replies; 8+ messages in thread From: Tomasz Lis @ 2024-12-20 23:34 UTC (permalink / raw) To: intel-xe Cc: Michał Winiarski, Michał Wajdeczko, Piotr Piórkowski We have only one GGTT for all IOV functions, with each VF having assigned a range of addresses for its use. After migration, a VF can receive a different range of addresses than it had initially. This implements shifting GGTT addresses within drm_mm nodes, so that VMAs stay valid after migration. This will make the driver use new addresses when accessing GGTT from the moment the shifting ends. By taking the ggtt->lock for the period of VMA fixups, this change also adds constraint on that mutex. Any locks used during the recovery cannot ever wait for hardware response - because after migration, the hardware will not do anything until fixups are finished. v2: Moved some functs to xe_ggtt.c; moved shift computation to just after querying; improved documentation; switched some warns to asserts; skipping fixups when GGTT shift eq 0; iterating through tiles (Michal) v3: Updated kerneldocs, removed unused funct, properly allocate balloning nodes if non existent Signed-off-by: Tomasz Lis <tomasz.lis@intel.com> --- drivers/gpu/drm/xe/xe_ggtt.c | 163 ++++++++++++++++++++++ drivers/gpu/drm/xe/xe_ggtt.h | 2 + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 26 ++++ drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 2 + drivers/gpu/drm/xe/xe_sriov_vf.c | 22 +++ 6 files changed, 216 insertions(+) diff --git a/drivers/gpu/drm/xe/xe_ggtt.c b/drivers/gpu/drm/xe/xe_ggtt.c index 05154f9de1a6..284221d4558d 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.c +++ b/drivers/gpu/drm/xe/xe_ggtt.c @@ -489,6 +489,169 @@ void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node) xe_ggtt_node_fini(node); } +static u64 drm_mm_node_end(struct drm_mm_node *node) +{ + return node->start + node->size; +} + +static void xe_ggtt_mm_shift_nodes(struct xe_ggtt *ggtt, struct drm_mm_node *balloon_beg, + struct drm_mm_node *balloon_fin, s64 shift) +{ + struct drm_mm_node *node, *tmpn; + LIST_HEAD(temp_list_head); + int err; + + lockdep_assert_held(&ggtt->lock); + + /* + * Move nodes, from range previously assigned to this VF, into temp list. + * + * The balloon_beg and balloon_fin nodes are there to eliminate unavailable + * ranges from use: first reserves the GGTT area below the range for current VF, + * and second reserves area above. + * + * Below is a GGTT layout of example VF, with a certain address range assigned to + * said VF, and inaccessible areas above and below: + * + * 0 4GiB + * |<--------------------------- Total GGTT size ----------------------------->| + * WOPCM GUC_TOP + * |<-------------- Area mappable by xe_ggtt instance ---------------->| + * + * +---+---------------------------------+----------+----------------------+---+ + * |\\\|/////////////////////////////////| VF mem |//////////////////////|\\\| + * +---+---------------------------------+----------+----------------------+---+ + * + * Hardware enforced access rules before migration: + * + * |<------- inaccessible for VF ------->|<VF owned>|<-- inaccessible for VF ->| + * + * drm_mm nodes used for tracking allocations: + * + * |<----------- balloon ------------>|<- nodes->|<----- balloon ------>| + * + * After the migration, GGTT area assigned to the VF might have shifted, either + * to lower or to higher address. But we expect the total size and extra areas to + * be identical, as migration can only happen between matching platforms. + * Below is an example of GGTT layout of the VF after migration. Content of the + * GGTT for VF has been moved to a new area, and we receive its address from GuC: + * + * +---+----------------------+----------+---------------------------------+---+ + * |\\\|//////////////////////| VF mem |/////////////////////////////////|\\\| + * +---+----------------------+----------+---------------------------------+---+ + * + * Hardware enforced access rules after migration: + * + * |<- inaccessible for VF -->|<VF owned>|<------- inaccessible for VF ------->| + * + * So the VF has a new slice of GGTT assigned, and during migration process, the + * memory content was copied to that new area. But the drm_mm nodes within xe kmd + * are still tracking allocations using the old addresses. The nodes within VF + * owned area have to be shifted, and balloon nodes need to be resized to + * properly mask out areas not owned by the VF. + * + * Fixed drm_mm nodes used for tracking allocations: + * + * |<------ balloon ------>|<- nodes->|<----------- balloon ----------->| + * + * Due to use of GPU profiles, we do not expect the old and new GGTT ares to + * overlap; but our node shifting will fix addresses properly regardless. + * + */ + drm_mm_for_each_node_in_range_safe(node, tmpn, &ggtt->mm, + drm_mm_node_end(balloon_beg), + balloon_fin->start) { + drm_mm_remove_node(node); + list_add(&node->node_list, &temp_list_head); + } + + /* shift and re-add ballooning nodes */ + if (drm_mm_node_allocated(balloon_beg)) + drm_mm_remove_node(balloon_beg); + if (drm_mm_node_allocated(balloon_fin)) + drm_mm_remove_node(balloon_fin); + balloon_beg->size += shift; + balloon_fin->start += shift; + balloon_fin->size -= shift; + if (balloon_beg->size != 0) { + err = drm_mm_reserve_node(&ggtt->mm, balloon_beg); + xe_tile_assert(ggtt->tile, !err); + } + if (balloon_fin->size != 0) { + err = drm_mm_reserve_node(&ggtt->mm, balloon_fin); + xe_tile_assert(ggtt->tile, !err); + } + + /* + * Now the GGTT VM contains only nodes outside of area assigned to this VF. + * We can re-add all VF nodes with shifted offsets. + */ + list_for_each_entry_safe(node, tmpn, &temp_list_head, node_list) { + list_del(&node->node_list); + node->start += shift; + err = drm_mm_reserve_node(&ggtt->mm, node); + xe_tile_assert(ggtt->tile, !err); + } +} + +/** + * xe_ggtt_node_shift_nodes - Shift GGTT nodes to adjust for a change in usable address range. + * @ggtt: the &xe_ggtt struct instance + * @balloon_beg: ggtt balloon node which preceds the area provisioned for current VF + * @balloon_fin: ggtt balloon node which follows the area provisioned for current VF + * @shift: change to the location of area provisioned for current VF + */ +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, + struct xe_ggtt_node **balloon_fin, s64 shift) +{ + struct drm_mm_node *balloon_mm_beg, *balloon_mm_end; + struct xe_ggtt_node *node; + + if (!*balloon_beg) + { + node = xe_ggtt_node_init(ggtt); + if (IS_ERR(node)) + goto out; + node->base.color = 0; + node->base.flags = 0; + node->base.start = xe_wopcm_size(ggtt->tile->xe); + node->base.size = 0; + *balloon_beg = node; + } + balloon_mm_beg = &(*balloon_beg)->base; + + if (!*balloon_fin) + { + node = xe_ggtt_node_init(ggtt); + if (IS_ERR(node)) + goto out; + node->base.color = 0; + node->base.flags = 0; + node->base.start = GUC_GGTT_TOP; + node->base.size = 0; + *balloon_fin = node; + } + balloon_mm_end = &(*balloon_fin)->base; + + xe_tile_assert(ggtt->tile, (*balloon_beg)->ggtt); + xe_tile_assert(ggtt->tile, (*balloon_fin)->ggtt); + + xe_ggtt_mm_shift_nodes(ggtt, balloon_mm_beg, balloon_mm_end, shift); +out: + if (*balloon_beg && !xe_ggtt_node_allocated(*balloon_beg)) + { + node = *balloon_beg; + *balloon_beg = NULL; + xe_ggtt_node_fini(node); + } + if (*balloon_fin && !xe_ggtt_node_allocated(*balloon_fin)) + { + node = *balloon_fin; + *balloon_fin = NULL; + xe_ggtt_node_fini(node); + } +} + /** * xe_ggtt_node_insert_locked - Locked version to insert a &xe_ggtt_node into the GGTT * @node: the &xe_ggtt_node to be inserted diff --git a/drivers/gpu/drm/xe/xe_ggtt.h b/drivers/gpu/drm/xe/xe_ggtt.h index 27e7d67de004..d9e133a155e6 100644 --- a/drivers/gpu/drm/xe/xe_ggtt.h +++ b/drivers/gpu/drm/xe/xe_ggtt.h @@ -18,6 +18,8 @@ void xe_ggtt_node_fini(struct xe_ggtt_node *node); int xe_ggtt_node_insert_balloon(struct xe_ggtt_node *node, u64 start, u64 size); void xe_ggtt_node_remove_balloon(struct xe_ggtt_node *node); +void xe_ggtt_node_shift_nodes(struct xe_ggtt *ggtt, struct xe_ggtt_node **balloon_beg, + struct xe_ggtt_node **balloon_fin, s64 shift); int xe_ggtt_node_insert(struct xe_ggtt_node *node, u32 size, u32 align); int xe_ggtt_node_insert_locked(struct xe_ggtt_node *node, diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c index cca5d5732802..9513cfffe3d8 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.c @@ -389,6 +389,7 @@ static int vf_get_ggtt_info(struct xe_gt *gt) xe_gt_sriov_dbg_verbose(gt, "GGTT %#llx-%#llx = %lluK\n", start, start + size - 1, size / SZ_1K); + config->ggtt_shift = start - (s64)config->ggtt_base; config->ggtt_base = start; config->ggtt_size = size; @@ -912,6 +913,31 @@ int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt) return err; } +/** + * xe_gt_sriov_vf_fixup_ggtt_nodes - Shift GGTT allocations to match assigned range. + * @gt: the &xe_gt struct instance + * Return: 0 on success, ENODATA if fixups are unnecessary + * + * Since Global GTT is not virtualized, each VF has an assigned range + * within the global space. This range might have changed during migration, + * which requires all memory addresses pointing to GGTT to be shifted. + */ +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt) +{ + struct xe_gt_sriov_vf_selfconfig *config = >->sriov.vf.self_config; + struct xe_tile *tile = gt_to_tile(gt); + struct xe_ggtt *ggtt = tile->mem.ggtt; + s64 ggtt_shift; + + mutex_lock(&ggtt->lock); + ggtt_shift = config->ggtt_shift; + if (ggtt_shift) + xe_ggtt_node_shift_nodes(ggtt, &tile->sriov.vf.ggtt_balloon[0], + &tile->sriov.vf.ggtt_balloon[1], ggtt_shift); + mutex_unlock(&ggtt->lock); + return ggtt_shift ? 0 : ENODATA; +} + static int vf_runtime_reg_cmp(const void *a, const void *b) { const struct vf_runtime_reg *ra = a; diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h index 912d20814261..49af35484a57 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf.h +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf.h @@ -17,6 +17,7 @@ int xe_gt_sriov_vf_query_config(struct xe_gt *gt); int xe_gt_sriov_vf_connect(struct xe_gt *gt); int xe_gt_sriov_vf_query_runtime(struct xe_gt *gt); int xe_gt_sriov_vf_prepare_ggtt(struct xe_gt *gt); +int xe_gt_sriov_vf_fixup_ggtt_nodes(struct xe_gt *gt); int xe_gt_sriov_vf_notify_resfix_done(struct xe_gt *gt); void xe_gt_sriov_vf_migrated_event_handler(struct xe_gt *gt); diff --git a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h index a57f13b5afcd..5ccbdf8d08b6 100644 --- a/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h +++ b/drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h @@ -40,6 +40,8 @@ struct xe_gt_sriov_vf_selfconfig { u64 ggtt_base; /** @ggtt_size: assigned size of the GGTT region. */ u64 ggtt_size; + /** @ggtt_shift: difference in ggtt_base on last migration */ + s64 ggtt_shift; /** @lmem_size: assigned size of the LMEM. */ u64 lmem_size; /** @num_ctxs: assigned number of GuC submission context IDs. */ diff --git a/drivers/gpu/drm/xe/xe_sriov_vf.c b/drivers/gpu/drm/xe/xe_sriov_vf.c index c1275e64aa9c..4ee8fc70a744 100644 --- a/drivers/gpu/drm/xe/xe_sriov_vf.c +++ b/drivers/gpu/drm/xe/xe_sriov_vf.c @@ -7,6 +7,7 @@ #include "xe_assert.h" #include "xe_device.h" +#include "xe_gt.h" #include "xe_gt_sriov_printk.h" #include "xe_gt_sriov_vf.h" #include "xe_pm.h" @@ -170,6 +171,26 @@ static bool vf_post_migration_imminent(struct xe_device *xe) work_pending(&xe->sriov.vf.migration.worker); } +static int vf_post_migration_fixup_ggtt_nodes(struct xe_device *xe) +{ + struct xe_tile *tile; + unsigned int id; + int err; + + for_each_tile(tile, xe, id) { + struct xe_gt *gt = tile->primary_gt; + int ret; + + /* media doesn't have its own ggtt */ + if (xe_gt_is_media_type(gt)) + continue; + ret = xe_gt_sriov_vf_fixup_ggtt_nodes(gt); + if (ret != ENODATA) + err = ret; + } + return err; +} + /* * Notify all GuCs about resource fixups apply finished. */ @@ -201,6 +222,7 @@ static void vf_post_migration_recovery(struct xe_device *xe) if (unlikely(err)) goto fail; + err = vf_post_migration_fixup_ggtt_nodes(xe); /* FIXME: add the recovery steps */ vf_post_migration_notify_resfix_done(xe); xe_pm_runtime_put(xe); -- 2.25.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
end of thread, other threads:[~2025-03-28 17:52 UTC | newest] Thread overview: 8+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2025-03-23 3:22 [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration kernel test robot -- strict thread matches above, loose matches on Subject: below -- 2025-03-06 22:21 [PATCH v4 0/3] drm/xe/vf: Post-migration recovery of GGTT nodes and CTB Tomasz Lis 2025-03-06 22:21 ` [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration Tomasz Lis 2025-03-14 18:22 ` Michal Wajdeczko 2025-03-14 23:45 ` Lis, Tomasz 2025-03-15 14:27 ` Michal Wajdeczko 2025-03-28 17:52 ` Lis, Tomasz 2025-03-24 5:58 ` Dan Carpenter 2024-12-20 23:34 [PATCH v4 0/3] drm/xe/vf: Post-migration recovery of GGTT nodes and CTB Tomasz Lis 2024-12-20 23:34 ` [PATCH v4 2/3] drm/xe/sriov: Shifting GGTT area post migration Tomasz Lis
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.