| Message ID | 20241023075302.27194-7-maarten.lankhorst@linux.intel.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | kernel/cgroups: Add "dev" memory accounting cgroup. | expand |
On Wed, 23 Oct 2024, Maarten Lankhorst <maarten.lankhorst@linux.intel.com> wrote: > We will probably want to make this a proper region in TTM for > everything, so that we can charge VRAM twice, once for mapped > in sysmem, once for mapped in vram. That way we don't need to > deal with evict failing from lack of available memory in mapped. > > Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> > Signed-off-by: Maxime Ripard <mripard@kernel.org> > --- > drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 14 ++++++++++++++ > 1 file changed, 14 insertions(+) > > diff --git a/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c b/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c > index 9844a8edbfe19..20fa8ec8925ef 100644 > --- a/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c > +++ b/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c > @@ -101,6 +101,18 @@ static void ttm_sys_mgr_fini(struct drm_device *drm, void *arg) > ttm_set_driver_manager(&xe->ttm, XE_PL_TT, NULL); > } > > +static inline void apply_cg(struct xe_device *xe, > + struct ttm_resource_manager *man, > + u64 gtt_size) Ditto here about static inline in .c. > +{ > + int cgregion = xe->cg.num_regions++; > + > + xe->cg.regions[cgregion].size = gtt_size; > + xe->cg.regions[cgregion].name = "mapped"; > + man->cgdev = &xe->cg; > + man->cgidx = cgregion; > + > +} > int xe_ttm_sys_mgr_init(struct xe_device *xe) > { > struct ttm_resource_manager *man = &xe->mem.sys_mgr; > @@ -116,6 +128,8 @@ int xe_ttm_sys_mgr_init(struct xe_device *xe) > man->func = &xe_ttm_sys_mgr_func; > ttm_resource_manager_init(man, &xe->ttm, gtt_size >> PAGE_SHIFT); > ttm_set_driver_manager(&xe->ttm, XE_PL_TT, man); > + apply_cg(xe, man, gtt_size); > + > ttm_resource_manager_set_used(man, true); > return drmm_add_action_or_reset(&xe->drm, ttm_sys_mgr_fini, xe); > }
diff --git a/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c b/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c index 9844a8edbfe19..20fa8ec8925ef 100644 --- a/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c +++ b/drivers/gpu/drm/xe/xe_ttm_sys_mgr.c @@ -101,6 +101,18 @@ static void ttm_sys_mgr_fini(struct drm_device *drm, void *arg) ttm_set_driver_manager(&xe->ttm, XE_PL_TT, NULL); } +static inline void apply_cg(struct xe_device *xe, + struct ttm_resource_manager *man, + u64 gtt_size) +{ + int cgregion = xe->cg.num_regions++; + + xe->cg.regions[cgregion].size = gtt_size; + xe->cg.regions[cgregion].name = "mapped"; + man->cgdev = &xe->cg; + man->cgidx = cgregion; + +} int xe_ttm_sys_mgr_init(struct xe_device *xe) { struct ttm_resource_manager *man = &xe->mem.sys_mgr; @@ -116,6 +128,8 @@ int xe_ttm_sys_mgr_init(struct xe_device *xe) man->func = &xe_ttm_sys_mgr_func; ttm_resource_manager_init(man, &xe->ttm, gtt_size >> PAGE_SHIFT); ttm_set_driver_manager(&xe->ttm, XE_PL_TT, man); + apply_cg(xe, man, gtt_size); + ttm_resource_manager_set_used(man, true); return drmm_add_action_or_reset(&xe->drm, ttm_sys_mgr_fini, xe); }