@@ -3469,7 +3469,7 @@ static struct drm_driver driver = {
* deal with them for Intel hardware.
*/
.driver_features =
- DRIVER_GEM | DRIVER_PRIME |
+ DRIVER_GEM | DRIVER_PRIME | DRIVER_CGROUPS |
DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ,
.release = i915_driver_release,
.open = i915_driver_open,
@@ -53,6 +53,8 @@ i915_memory_region_put_pages_buddy(struct drm_i915_gem_object *obj,
mutex_unlock(&obj->memory_region->mm_lock);
obj->mm.dirty = false;
+ mem_cgroup_uncharge_direct(obj->base.memcg,
+ obj->base.size >> PAGE_SHIFT);
}
int
@@ -65,19 +67,29 @@ i915_memory_region_get_pages_buddy(struct drm_i915_gem_object *obj)
struct scatterlist *sg;
unsigned int sg_page_sizes;
unsigned long n_pages;
+ int err;
GEM_BUG_ON(!IS_ALIGNED(size, mem->mm.min_size));
GEM_BUG_ON(!list_empty(&obj->blocks));
+ err = mem_cgroup_try_charge_direct(obj->base.memcg, size >> PAGE_SHIFT);
+ if (err) {
+ DRM_DEBUG("MEMCG: try_charge failed for %lld\n", size);
+ return err;
+ }
+
st = kmalloc(sizeof(*st), GFP_KERNEL);
- if (!st)
- return -ENOMEM;
+ if (!st) {
+ err = -ENOMEM;
+ goto err_uncharge;
+ }
n_pages = div64_u64(size, mem->mm.min_size);
if (sg_alloc_table(st, n_pages, GFP_KERNEL)) {
kfree(st);
- return -ENOMEM;
+ err = -ENOMEM;
+ goto err_uncharge;
}
sg = st->sgl;
@@ -161,7 +173,11 @@ i915_memory_region_get_pages_buddy(struct drm_i915_gem_object *obj)
err_free_blocks:
memory_region_free_pages(obj, st);
mutex_unlock(&mem->mm_lock);
- return -ENXIO;
+ err = -ENXIO;
+err_uncharge:
+ mem_cgroup_uncharge_direct(obj->base.memcg,
+ obj->base.size >> PAGE_SHIFT);
+ return err;
}
int i915_memory_region_init_buddy(struct intel_memory_region *mem)
i915 driver now includes DRIVER_CGROUPS in feature bits. To charge device memory allocations, we need to (1) identify appropriate cgroup to charge (currently decided at object creation time), and (2) make the charging call at the time that memory pages are being allocated. For (1), see prior DRM patch which associates current task's cgroup with GEM objects as they are created. That cgroup will be charged/uncharged for all paging activity against the GEM object. For (2), we call mem_cgroup_try_charge_direct() in .get_pages callback for the GEM object type. Uncharging is done in .put_pages when the memory is marked such that it can be evicted. The try_charge() call will fail with -ENOMEM if the current memory allocation will exceed the cgroup device memory maximum, and allow for driver to perform memory reclaim. Cc: cgroups@vger.kernel.org Cc: linux-mm@kvack.org Cc: dri-devel@lists.freedesktop.org Cc: Matt Roper <matthew.d.roper@intel.com> Signed-off-by: Brian Welty <brian.welty@intel.com> --- drivers/gpu/drm/i915/i915_drv.c | 2 +- drivers/gpu/drm/i915/intel_memory_region.c | 24 ++++++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-)