drmcg initialization involves allocating a per cgroup, per device data structure and setting the defaults. There are two entry points for drmcg init:
1) When struct drmcg is created via css_alloc, initialization is done for each device
2) When DRM devices are created after drmcgs are created a) Per device drmcg data structure is allocated at the beginning of DRM device creation such that drmcg can begin tracking usage statistics b) At the end of DRM device creation, drmcg_device_update is called in case device specific defaults need to be applied.
Entry point #2 usually applies to the root cgroup since it can be created before DRM devices are available. The drmcg controller will go through all existing drm cgroups and initialize them with the new device accordingly.
Change-Id: I908ee6975ea0585e4c30eafde4599f87094d8c65 Signed-off-by: Kenny Ho Kenny.Ho@amd.com --- drivers/gpu/drm/drm_drv.c | 7 +++ include/drm/drm_cgroup.h | 27 ++++++++ include/drm/drm_device.h | 7 +++ include/drm/drm_drv.h | 9 +++ include/linux/cgroup_drm.h | 13 ++++ kernel/cgroup/drm.c | 123 +++++++++++++++++++++++++++++++++++++ 6 files changed, 186 insertions(+) create mode 100644 include/drm/drm_cgroup.h
diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 000cddabd970..94265eba68ca 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -37,6 +37,7 @@ #include <drm/drm_client.h> #include <drm/drm_drv.h> #include <drm/drmP.h> +#include <drm/drm_cgroup.h>
#include "drm_crtc_internal.h" #include "drm_legacy.h" @@ -672,6 +673,7 @@ int drm_dev_init(struct drm_device *dev, mutex_init(&dev->filelist_mutex); mutex_init(&dev->clientlist_mutex); mutex_init(&dev->master_mutex); + mutex_init(&dev->drmcg_mutex);
dev->anon_inode = drm_fs_inode_new(); if (IS_ERR(dev->anon_inode)) { @@ -708,6 +710,7 @@ int drm_dev_init(struct drm_device *dev, if (ret) goto err_setunique;
+ drmcg_device_early_init(dev); return 0;
err_setunique: @@ -722,6 +725,7 @@ int drm_dev_init(struct drm_device *dev, drm_fs_inode_free(dev->anon_inode); err_free: put_device(dev->dev); + mutex_destroy(&dev->drmcg_mutex); mutex_destroy(&dev->master_mutex); mutex_destroy(&dev->clientlist_mutex); mutex_destroy(&dev->filelist_mutex); @@ -798,6 +802,7 @@ void drm_dev_fini(struct drm_device *dev)
put_device(dev->dev);
+ mutex_destroy(&dev->drmcg_mutex); mutex_destroy(&dev->master_mutex); mutex_destroy(&dev->clientlist_mutex); mutex_destroy(&dev->filelist_mutex); @@ -1008,6 +1013,8 @@ int drm_dev_register(struct drm_device *dev, unsigned long flags) dev->dev ? dev_name(dev->dev) : "virtual device", dev->primary->index);
+ drmcg_device_update(dev); + goto out_unlock;
err_minors: diff --git a/include/drm/drm_cgroup.h b/include/drm/drm_cgroup.h new file mode 100644 index 000000000000..bef9f9245924 --- /dev/null +++ b/include/drm/drm_cgroup.h @@ -0,0 +1,27 @@ +/* SPDX-License-Identifier: MIT + * Copyright 2019 Advanced Micro Devices, Inc. + */ +#ifndef __DRM_CGROUP_H__ +#define __DRM_CGROUP_H__ + +/** + * Per DRM device properties for DRM cgroup controller for the purpose + * of storing per device defaults + */ +struct drmcg_props { +}; + +#ifdef CONFIG_CGROUP_DRM + +void drmcg_device_update(struct drm_device *device); +void drmcg_device_early_init(struct drm_device *device); +#else +static inline void drmcg_device_update(struct drm_device *device) +{ +} + +static inline void drmcg_device_early_init(struct drm_device *device) +{ +} +#endif /* CONFIG_CGROUP_DRM */ +#endif /* __DRM_CGROUP_H__ */ diff --git a/include/drm/drm_device.h b/include/drm/drm_device.h index 7f9ef709b2b6..5d7d779a5083 100644 --- a/include/drm/drm_device.h +++ b/include/drm/drm_device.h @@ -8,6 +8,7 @@
#include <drm/drm_hashtab.h> #include <drm/drm_mode_config.h> +#include <drm/drm_cgroup.h>
struct drm_driver; struct drm_minor; @@ -304,6 +305,12 @@ struct drm_device { */ struct drm_fb_helper *fb_helper;
+ /** \name DRM Cgroup */ + /*@{ */ + struct mutex drmcg_mutex; + struct drmcg_props drmcg_props; + /*@} */ + /* Everything below here is for legacy driver, never use! */ /* private: */ #if IS_ENABLED(CONFIG_DRM_LEGACY) diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h index 24f8d054c570..c8a37a08d98d 100644 --- a/include/drm/drm_drv.h +++ b/include/drm/drm_drv.h @@ -660,6 +660,15 @@ struct drm_driver { struct drm_device *dev, uint32_t handle);
+ /** + * @drmcg_custom_init + * + * Optional callback used to initialize drm cgroup per device properties + * such as resource limit defaults. + */ + void (*drmcg_custom_init)(struct drm_device *dev, + struct drmcg_props *props); + /** * @gem_vm_ops: Driver private ops for this object */ diff --git a/include/linux/cgroup_drm.h b/include/linux/cgroup_drm.h index 971166f9dd78..4ecd44f2ac27 100644 --- a/include/linux/cgroup_drm.h +++ b/include/linux/cgroup_drm.h @@ -6,13 +6,26 @@
#ifdef CONFIG_CGROUP_DRM
+#include <linux/mutex.h> #include <linux/cgroup.h> +#include <drm/drm_file.h> + +/* limit defined per the way drm_minor_alloc operates */ +#define MAX_DRM_DEV (64 * DRM_MINOR_RENDER) + +/** + * Per DRM cgroup, per device resources (such as statistics and limits) + */ +struct drmcg_device_resource { + /* for per device stats */ +};
/** * The DRM cgroup controller data structure. */ struct drmcg { struct cgroup_subsys_state css; + struct drmcg_device_resource *dev_resources[MAX_DRM_DEV]; };
/** diff --git a/kernel/cgroup/drm.c b/kernel/cgroup/drm.c index e97861b3cb30..135fdcdc4b51 100644 --- a/kernel/cgroup/drm.c +++ b/kernel/cgroup/drm.c @@ -1,28 +1,103 @@ // SPDX-License-Identifier: MIT // Copyright 2019 Advanced Micro Devices, Inc. +#include <linux/export.h> #include <linux/slab.h> #include <linux/cgroup.h> +#include <linux/fs.h> +#include <linux/seq_file.h> +#include <linux/mutex.h> #include <linux/cgroup_drm.h> +#include <linux/kernel.h> +#include <drm/drm_file.h> +#include <drm/drm_drv.h> +#include <drm/drm_device.h> +#include <drm/drm_cgroup.h> + +/* global mutex for drmcg across all devices */ +static DEFINE_MUTEX(drmcg_mutex);
static struct drmcg *root_drmcg __read_mostly;
+static int drmcg_css_free_fn(int id, void *ptr, void *data) +{ + struct drm_minor *minor = ptr; + struct drmcg *drmcg = data; + + if (minor->type != DRM_MINOR_PRIMARY) + return 0; + + kfree(drmcg->dev_resources[minor->index]); + + return 0; +} + static void drmcg_css_free(struct cgroup_subsys_state *css) { struct drmcg *drmcg = css_to_drmcg(css);
+ drm_minor_for_each(&drmcg_css_free_fn, drmcg); + kfree(drmcg); }
+static inline int init_drmcg_single(struct drmcg *drmcg, struct drm_device *dev) +{ + int minor = dev->primary->index; + struct drmcg_device_resource *ddr = drmcg->dev_resources[minor]; + + if (ddr == NULL) { + ddr = kzalloc(sizeof(struct drmcg_device_resource), + GFP_KERNEL); + + if (!ddr) + return -ENOMEM; + } + + mutex_lock(&dev->drmcg_mutex); + drmcg->dev_resources[minor] = ddr; + + /* set defaults here */ + + mutex_unlock(&dev->drmcg_mutex); + return 0; +} + +static int init_drmcg_fn(int id, void *ptr, void *data) +{ + struct drm_minor *minor = ptr; + struct drmcg *drmcg = data; + + if (minor->type != DRM_MINOR_PRIMARY) + return 0; + + return init_drmcg_single(drmcg, minor->dev); +} + +static inline int init_drmcg(struct drmcg *drmcg, struct drm_device *dev) +{ + if (dev != NULL) + return init_drmcg_single(drmcg, dev); + + return drm_minor_for_each(&init_drmcg_fn, drmcg); +} + static struct cgroup_subsys_state * drmcg_css_alloc(struct cgroup_subsys_state *parent_css) { struct drmcg *parent = css_to_drmcg(parent_css); struct drmcg *drmcg; + int rc;
drmcg = kzalloc(sizeof(struct drmcg), GFP_KERNEL); if (!drmcg) return ERR_PTR(-ENOMEM);
+ rc = init_drmcg(drmcg, NULL); + if (rc) { + drmcg_css_free(&drmcg->css); + return ERR_PTR(rc); + } + if (!parent) root_drmcg = drmcg;
@@ -40,3 +115,51 @@ struct cgroup_subsys drm_cgrp_subsys = { .legacy_cftypes = files, .dfl_cftypes = files, }; + +static inline void drmcg_update_cg_tree(struct drm_device *dev) +{ + /* init cgroups created before registration (i.e. root cgroup) */ + if (root_drmcg != NULL) { + struct cgroup_subsys_state *pos; + struct drmcg *child; + + rcu_read_lock(); + css_for_each_descendant_pre(pos, &root_drmcg->css) { + child = css_to_drmcg(pos); + init_drmcg(child, dev); + } + rcu_read_unlock(); + } +} + +/** + * drmcg_device_update - update DRM cgroups defaults + * @dev: the target DRM device + * + * If @dev has a drmcg_custom_init for the DRM cgroup controller, it will be called + * to set device specific defaults and set the initial values for all existing + * cgroups created prior to @dev become available. + */ +void drmcg_device_update(struct drm_device *dev) +{ + if (dev->driver->drmcg_custom_init) + { + dev->driver->drmcg_custom_init(dev, &dev->drmcg_props); + + drmcg_update_cg_tree(dev); + } +} +EXPORT_SYMBOL(drmcg_device_update); + +/** + * drmcg_device_early_init - initialize device specific resources for DRM cgroups + * @dev: the target DRM device + * + * Allocate and initialize device specific resources for existing DRM cgroups. + * Typically only the root cgroup exists before the initialization of @dev. + */ +void drmcg_device_early_init(struct drm_device *dev) +{ + drmcg_update_cg_tree(dev); +} +EXPORT_SYMBOL(drmcg_device_early_init);