From: Dave Airlie <[email protected]> This adds support for adding a obj cgroup to a buffer object, and passing in the placement flags to make sure it's accounted properly.
Signed-off-by: Dave Airlie <[email protected]> --- drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 13 +++++++++---- drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 ++ mm/memcontrol.c | 1 + 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c index b7ebae289bea..85ff70a399bc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c @@ -225,6 +225,7 @@ int amdgpu_gem_object_create(struct amdgpu_device *adev, unsigned long size, bp.domain = initial_domain; bp.bo_ptr_size = sizeof(struct amdgpu_bo); bp.xcp_id_plus1 = xcp_id_plus1; + bp.objcg = get_obj_cgroup_from_current(); r = amdgpu_bo_create_user(adev, &bp, &ubo); if (r) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c index e08f58de4b17..d6a6f7e17a2a 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.c @@ -167,7 +167,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain) places[c].mem_type = abo->flags & AMDGPU_GEM_CREATE_PREEMPTIBLE ? AMDGPU_PL_PREEMPT : TTM_PL_TT; - places[c].flags = 0; + places[c].flags = TTM_PL_FLAG_MEMCG; /* * When GTT is just an alternative to VRAM make sure that we * only use it as fallback and still try to fill up VRAM first. @@ -182,7 +182,7 @@ void amdgpu_bo_placement_from_domain(struct amdgpu_bo *abo, u32 domain) places[c].fpfn = 0; places[c].lpfn = 0; places[c].mem_type = TTM_PL_SYSTEM; - places[c].flags = 0; + places[c].flags = TTM_PL_FLAG_MEMCG; c++; } @@ -662,16 +662,21 @@ int amdgpu_bo_create(struct amdgpu_device *adev, size = ALIGN(size, PAGE_SIZE); } - if (!amdgpu_bo_validate_size(adev, size, bp->domain)) + if (!amdgpu_bo_validate_size(adev, size, bp->domain)) { + obj_cgroup_put(bp->objcg); return -ENOMEM; + } BUG_ON(bp->bo_ptr_size < sizeof(struct amdgpu_bo)); *bo_ptr = NULL; bo = kvzalloc(bp->bo_ptr_size, GFP_KERNEL); - if (bo == NULL) + if (bo == NULL) { + obj_cgroup_put(bp->objcg); return -ENOMEM; + } drm_gem_private_object_init(adev_to_drm(adev), &bo->tbo.base, size); + ttm_bo_set_cgroup(&bo->tbo, bp->objcg); /* hand the reference to the ttm bo */ bo->tbo.base.funcs = &amdgpu_gem_object_funcs; bo->vm_bo = NULL; bo->preferred_domains = bp->preferred_domain ? bp->preferred_domain : diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h index 656b8a931dae..b07a168a6665 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_object.h @@ -55,6 +55,7 @@ struct amdgpu_bo_param { enum ttm_bo_type type; bool no_wait_gpu; struct dma_resv *resv; + struct obj_cgroup *objcg; void (*destroy)(struct ttm_buffer_object *bo); /* xcp partition number plus 1, 0 means any partition */ int8_t xcp_id_plus1; diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c index bcab4a83137b..7642c17ebda7 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c @@ -152,11 +152,13 @@ static void amdgpu_evict_flags(struct ttm_buffer_object *bo, amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_GTT | AMDGPU_GEM_DOMAIN_CPU); } + abo->placements[0].flags &= ~TTM_PL_FLAG_MEMCG; break; case TTM_PL_TT: case AMDGPU_PL_PREEMPT: default: amdgpu_bo_placement_from_domain(abo, AMDGPU_GEM_DOMAIN_CPU); + abo->placements[0].flags &= ~TTM_PL_FLAG_MEMCG; break; } *placement = abo->placement; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ece340f3e391..b5782f6d21c2 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2721,6 +2721,7 @@ __always_inline struct obj_cgroup *current_obj_cgroup(void) return objcg; } +EXPORT_SYMBOL_GPL(current_obj_cgroup); struct obj_cgroup *get_obj_cgroup_from_folio(struct folio *folio) { -- 2.51.0
