From 51380022fd7896e2d0b56a6436ebb83b0434abbf Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Mon, 23 Sep 2024 04:47:38 -0400 Subject: [PATCH] Fixes for 6.10 Signed-off-by: Sasha Levin --- ...use-xarray-instead-of-idr-for-minors.patch | 442 ++++++++++++++++++ ...-drm-device-number-to-full-minorbits.patch | 69 +++ ...use-xarray-instead-of-idr-for-minors.patch | 197 ++++++++ ..._rapl-add-support-for-amd-family-1ah.patch | 36 ++ ...apl-fix-the-energy-pkg-event-for-amd.patch | 126 +++++ queue-6.10/series | 5 + 6 files changed, 875 insertions(+) create mode 100644 queue-6.10/accel-use-xarray-instead-of-idr-for-minors.patch create mode 100644 queue-6.10/drm-expand-max-drm-device-number-to-full-minorbits.patch create mode 100644 queue-6.10/drm-use-xarray-instead-of-idr-for-minors.patch create mode 100644 queue-6.10/powercap-intel_rapl-add-support-for-amd-family-1ah.patch create mode 100644 queue-6.10/powercap-intel_rapl-fix-the-energy-pkg-event-for-amd.patch diff --git a/queue-6.10/accel-use-xarray-instead-of-idr-for-minors.patch b/queue-6.10/accel-use-xarray-instead-of-idr-for-minors.patch new file mode 100644 index 00000000000..634074dfee6 --- /dev/null +++ b/queue-6.10/accel-use-xarray-instead-of-idr-for-minors.patch @@ -0,0 +1,442 @@ +From 72fe4d5640f7c82da8efe129887c2824d8be9b1e Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Aug 2024 18:30:47 +0200 +Subject: accel: Use XArray instead of IDR for minors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michał Winiarski + +[ Upstream commit 45c4d994b82b08f0ce5eb50f8da29379c92a391e ] + +Accel minor management is based on DRM (and is also using struct +drm_minor internally), since DRM is using XArray for minors, it makes +sense to also convert accel. +As the two implementations are identical (only difference being the +underlying xarray), move the accel_minor_* functionality to DRM. + +Signed-off-by: Michał Winiarski +Acked-by: James Zhu +Acked-by: Christian König +Link: https://patchwork.freedesktop.org/patch/msgid/20240823163048.2676257-3-michal.winiarski@intel.com +Signed-off-by: Christian König +Signed-off-by: Sasha Levin +--- + drivers/accel/drm_accel.c | 110 +++------------------------------ + drivers/gpu/drm/drm_drv.c | 66 ++++++++++---------- + drivers/gpu/drm/drm_file.c | 2 +- + drivers/gpu/drm/drm_internal.h | 4 -- + include/drm/drm_accel.h | 18 +----- + include/drm/drm_file.h | 5 ++ + 6 files changed, 47 insertions(+), 158 deletions(-) + +diff --git a/drivers/accel/drm_accel.c b/drivers/accel/drm_accel.c +index 16c3edb8c46ee..aa826033b0ceb 100644 +--- a/drivers/accel/drm_accel.c ++++ b/drivers/accel/drm_accel.c +@@ -8,7 +8,7 @@ + + #include + #include +-#include ++#include + + #include + #include +@@ -18,8 +18,7 @@ + #include + #include + +-static DEFINE_SPINLOCK(accel_minor_lock); +-static struct idr accel_minors_idr; ++DEFINE_XARRAY_ALLOC(accel_minors_xa); + + static struct dentry *accel_debugfs_root; + +@@ -117,99 +116,6 @@ void accel_set_device_instance_params(struct device *kdev, int index) + kdev->type = &accel_sysfs_device_minor; + } + +-/** +- * accel_minor_alloc() - Allocates a new accel minor +- * +- * This function access the accel minors idr and allocates from it +- * a new id to represent a new accel minor +- * +- * Return: A new id on success or error code in case idr_alloc failed +- */ +-int accel_minor_alloc(void) +-{ +- unsigned long flags; +- int r; +- +- spin_lock_irqsave(&accel_minor_lock, flags); +- r = idr_alloc(&accel_minors_idr, NULL, 0, ACCEL_MAX_MINORS, GFP_NOWAIT); +- spin_unlock_irqrestore(&accel_minor_lock, flags); +- +- return r; +-} +- +-/** +- * accel_minor_remove() - Remove an accel minor +- * @index: The minor id to remove. +- * +- * This function access the accel minors idr and removes from +- * it the member with the id that is passed to this function. +- */ +-void accel_minor_remove(int index) +-{ +- unsigned long flags; +- +- spin_lock_irqsave(&accel_minor_lock, flags); +- idr_remove(&accel_minors_idr, index); +- spin_unlock_irqrestore(&accel_minor_lock, flags); +-} +- +-/** +- * accel_minor_replace() - Replace minor pointer in accel minors idr. +- * @minor: Pointer to the new minor. +- * @index: The minor id to replace. +- * +- * This function access the accel minors idr structure and replaces the pointer +- * that is associated with an existing id. Because the minor pointer can be +- * NULL, we need to explicitly pass the index. +- * +- * Return: 0 for success, negative value for error +- */ +-void accel_minor_replace(struct drm_minor *minor, int index) +-{ +- unsigned long flags; +- +- spin_lock_irqsave(&accel_minor_lock, flags); +- idr_replace(&accel_minors_idr, minor, index); +- spin_unlock_irqrestore(&accel_minor_lock, flags); +-} +- +-/* +- * Looks up the given minor-ID and returns the respective DRM-minor object. The +- * refence-count of the underlying device is increased so you must release this +- * object with accel_minor_release(). +- * +- * The object can be only a drm_minor that represents an accel device. +- * +- * As long as you hold this minor, it is guaranteed that the object and the +- * minor->dev pointer will stay valid! However, the device may get unplugged and +- * unregistered while you hold the minor. +- */ +-static struct drm_minor *accel_minor_acquire(unsigned int minor_id) +-{ +- struct drm_minor *minor; +- unsigned long flags; +- +- spin_lock_irqsave(&accel_minor_lock, flags); +- minor = idr_find(&accel_minors_idr, minor_id); +- if (minor) +- drm_dev_get(minor->dev); +- spin_unlock_irqrestore(&accel_minor_lock, flags); +- +- if (!minor) { +- return ERR_PTR(-ENODEV); +- } else if (drm_dev_is_unplugged(minor->dev)) { +- drm_dev_put(minor->dev); +- return ERR_PTR(-ENODEV); +- } +- +- return minor; +-} +- +-static void accel_minor_release(struct drm_minor *minor) +-{ +- drm_dev_put(minor->dev); +-} +- + /** + * accel_open - open method for ACCEL file + * @inode: device inode +@@ -227,7 +133,7 @@ int accel_open(struct inode *inode, struct file *filp) + struct drm_minor *minor; + int retcode; + +- minor = accel_minor_acquire(iminor(inode)); ++ minor = drm_minor_acquire(&accel_minors_xa, iminor(inode)); + if (IS_ERR(minor)) + return PTR_ERR(minor); + +@@ -246,7 +152,7 @@ int accel_open(struct inode *inode, struct file *filp) + + err_undo: + atomic_dec(&dev->open_count); +- accel_minor_release(minor); ++ drm_minor_release(minor); + return retcode; + } + EXPORT_SYMBOL_GPL(accel_open); +@@ -257,7 +163,7 @@ static int accel_stub_open(struct inode *inode, struct file *filp) + struct drm_minor *minor; + int err; + +- minor = accel_minor_acquire(iminor(inode)); ++ minor = drm_minor_acquire(&accel_minors_xa, iminor(inode)); + if (IS_ERR(minor)) + return PTR_ERR(minor); + +@@ -274,7 +180,7 @@ static int accel_stub_open(struct inode *inode, struct file *filp) + err = 0; + + out: +- accel_minor_release(minor); ++ drm_minor_release(minor); + + return err; + } +@@ -290,15 +196,13 @@ void accel_core_exit(void) + unregister_chrdev(ACCEL_MAJOR, "accel"); + debugfs_remove(accel_debugfs_root); + accel_sysfs_destroy(); +- idr_destroy(&accel_minors_idr); ++ WARN_ON(!xa_empty(&accel_minors_xa)); + } + + int __init accel_core_init(void) + { + int ret; + +- idr_init(&accel_minors_idr); +- + ret = accel_sysfs_init(); + if (ret < 0) { + DRM_ERROR("Cannot create ACCEL class: %d\n", ret); +diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c +index 40cd4faca2b1e..a5f7b24324e30 100644 +--- a/drivers/gpu/drm/drm_drv.c ++++ b/drivers/gpu/drm/drm_drv.c +@@ -55,7 +55,7 @@ MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl"); + MODULE_DESCRIPTION("DRM shared core routines"); + MODULE_LICENSE("GPL and additional rights"); + +-static DEFINE_XARRAY_ALLOC(drm_minors_xa); ++DEFINE_XARRAY_ALLOC(drm_minors_xa); + + /* + * If the drm core fails to init for whatever reason, +@@ -83,6 +83,18 @@ DEFINE_STATIC_SRCU(drm_unplug_srcu); + * registered and unregistered dynamically according to device-state. + */ + ++static struct xarray *drm_minor_get_xa(enum drm_minor_type type) ++{ ++ if (type == DRM_MINOR_PRIMARY || type == DRM_MINOR_RENDER) ++ return &drm_minors_xa; ++#if IS_ENABLED(CONFIG_DRM_ACCEL) ++ else if (type == DRM_MINOR_ACCEL) ++ return &accel_minors_xa; ++#endif ++ else ++ return ERR_PTR(-EOPNOTSUPP); ++} ++ + static struct drm_minor **drm_minor_get_slot(struct drm_device *dev, + enum drm_minor_type type) + { +@@ -106,18 +118,18 @@ static void drm_minor_alloc_release(struct drm_device *dev, void *data) + + put_device(minor->kdev); + +- if (minor->type == DRM_MINOR_ACCEL) +- accel_minor_remove(minor->index); +- else +- xa_erase(&drm_minors_xa, minor->index); ++ xa_erase(drm_minor_get_xa(minor->type), minor->index); + } + +-#define DRM_MINOR_LIMIT(t) ({ typeof(t) _t = (t); XA_LIMIT(64 * _t, 64 * _t + 63); }) ++#define DRM_MINOR_LIMIT(t) ({ \ ++ typeof(t) _t = (t); \ ++ _t == DRM_MINOR_ACCEL ? XA_LIMIT(0, ACCEL_MAX_MINORS) : XA_LIMIT(64 * _t, 64 * _t + 63); \ ++}) + + static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + { + struct drm_minor *minor; +- int index, r; ++ int r; + + minor = drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL); + if (!minor) +@@ -126,18 +138,11 @@ static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + minor->type = type; + minor->dev = dev; + +- if (type == DRM_MINOR_ACCEL) { +- r = accel_minor_alloc(); +- index = r; +- } else { +- r = xa_alloc(&drm_minors_xa, &index, NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL); +- } +- ++ r = xa_alloc(drm_minor_get_xa(type), &minor->index, ++ NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL); + if (r < 0) + return r; + +- minor->index = index; +- + r = drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor); + if (r) + return r; +@@ -176,16 +181,12 @@ static int drm_minor_register(struct drm_device *dev, enum drm_minor_type type) + goto err_debugfs; + + /* replace NULL with @minor so lookups will succeed from now on */ +- if (minor->type == DRM_MINOR_ACCEL) { +- accel_minor_replace(minor, minor->index); +- } else { +- entry = xa_store(&drm_minors_xa, minor->index, minor, GFP_KERNEL); +- if (xa_is_err(entry)) { +- ret = xa_err(entry); +- goto err_debugfs; +- } +- WARN_ON(entry); ++ entry = xa_store(drm_minor_get_xa(type), minor->index, minor, GFP_KERNEL); ++ if (xa_is_err(entry)) { ++ ret = xa_err(entry); ++ goto err_debugfs; + } ++ WARN_ON(entry); + + DRM_DEBUG("new minor registered %d\n", minor->index); + return 0; +@@ -204,10 +205,7 @@ static void drm_minor_unregister(struct drm_device *dev, enum drm_minor_type typ + return; + + /* replace @minor with NULL so lookups will fail from now on */ +- if (minor->type == DRM_MINOR_ACCEL) +- accel_minor_replace(NULL, minor->index); +- else +- xa_store(&drm_minors_xa, minor->index, NULL, GFP_KERNEL); ++ xa_store(drm_minor_get_xa(type), minor->index, NULL, GFP_KERNEL); + + device_del(minor->kdev); + dev_set_drvdata(minor->kdev, NULL); /* safety belt */ +@@ -223,15 +221,15 @@ static void drm_minor_unregister(struct drm_device *dev, enum drm_minor_type typ + * minor->dev pointer will stay valid! However, the device may get unplugged and + * unregistered while you hold the minor. + */ +-struct drm_minor *drm_minor_acquire(unsigned int minor_id) ++struct drm_minor *drm_minor_acquire(struct xarray *minor_xa, unsigned int minor_id) + { + struct drm_minor *minor; + +- xa_lock(&drm_minors_xa); +- minor = xa_load(&drm_minors_xa, minor_id); ++ xa_lock(minor_xa); ++ minor = xa_load(minor_xa, minor_id); + if (minor) + drm_dev_get(minor->dev); +- xa_unlock(&drm_minors_xa); ++ xa_unlock(minor_xa); + + if (!minor) { + return ERR_PTR(-ENODEV); +@@ -1024,7 +1022,7 @@ static int drm_stub_open(struct inode *inode, struct file *filp) + + DRM_DEBUG("\n"); + +- minor = drm_minor_acquire(iminor(inode)); ++ minor = drm_minor_acquire(&drm_minors_xa, iminor(inode)); + if (IS_ERR(minor)) + return PTR_ERR(minor); + +diff --git a/drivers/gpu/drm/drm_file.c b/drivers/gpu/drm/drm_file.c +index 714e42b051080..f917b259b3342 100644 +--- a/drivers/gpu/drm/drm_file.c ++++ b/drivers/gpu/drm/drm_file.c +@@ -364,7 +364,7 @@ int drm_open(struct inode *inode, struct file *filp) + struct drm_minor *minor; + int retcode; + +- minor = drm_minor_acquire(iminor(inode)); ++ minor = drm_minor_acquire(&drm_minors_xa, iminor(inode)); + if (IS_ERR(minor)) + return PTR_ERR(minor); + +diff --git a/drivers/gpu/drm/drm_internal.h b/drivers/gpu/drm/drm_internal.h +index 690505a1f7a5d..12acf44c4e240 100644 +--- a/drivers/gpu/drm/drm_internal.h ++++ b/drivers/gpu/drm/drm_internal.h +@@ -81,10 +81,6 @@ void drm_prime_destroy_file_private(struct drm_prime_file_private *prime_fpriv); + void drm_prime_remove_buf_handle(struct drm_prime_file_private *prime_fpriv, + uint32_t handle); + +-/* drm_drv.c */ +-struct drm_minor *drm_minor_acquire(unsigned int minor_id); +-void drm_minor_release(struct drm_minor *minor); +- + /* drm_managed.c */ + void drm_managed_release(struct drm_device *dev); + void drmm_add_final_kfree(struct drm_device *dev, void *container); +diff --git a/include/drm/drm_accel.h b/include/drm/drm_accel.h +index f4d3784b1dce0..8867ce0be94cd 100644 +--- a/include/drm/drm_accel.h ++++ b/include/drm/drm_accel.h +@@ -51,11 +51,10 @@ + + #if IS_ENABLED(CONFIG_DRM_ACCEL) + ++extern struct xarray accel_minors_xa; ++ + void accel_core_exit(void); + int accel_core_init(void); +-void accel_minor_remove(int index); +-int accel_minor_alloc(void); +-void accel_minor_replace(struct drm_minor *minor, int index); + void accel_set_device_instance_params(struct device *kdev, int index); + int accel_open(struct inode *inode, struct file *filp); + void accel_debugfs_init(struct drm_device *dev); +@@ -73,19 +72,6 @@ static inline int __init accel_core_init(void) + return 0; + } + +-static inline void accel_minor_remove(int index) +-{ +-} +- +-static inline int accel_minor_alloc(void) +-{ +- return -EOPNOTSUPP; +-} +- +-static inline void accel_minor_replace(struct drm_minor *minor, int index) +-{ +-} +- + static inline void accel_set_device_instance_params(struct device *kdev, int index) + { + } +diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h +index ab230d3af138d..8c0030c773081 100644 +--- a/include/drm/drm_file.h ++++ b/include/drm/drm_file.h +@@ -45,6 +45,8 @@ struct drm_printer; + struct device; + struct file; + ++extern struct xarray drm_minors_xa; ++ + /* + * FIXME: Not sure we want to have drm_minor here in the end, but to avoid + * header include loops we need it here for now. +@@ -434,6 +436,9 @@ static inline bool drm_is_accel_client(const struct drm_file *file_priv) + + void drm_file_update_pid(struct drm_file *); + ++struct drm_minor *drm_minor_acquire(struct xarray *minors_xa, unsigned int minor_id); ++void drm_minor_release(struct drm_minor *minor); ++ + int drm_open(struct inode *inode, struct file *filp); + int drm_open_helper(struct file *filp, struct drm_minor *minor); + ssize_t drm_read(struct file *filp, char __user *buffer, +-- +2.43.0 + diff --git a/queue-6.10/drm-expand-max-drm-device-number-to-full-minorbits.patch b/queue-6.10/drm-expand-max-drm-device-number-to-full-minorbits.patch new file mode 100644 index 00000000000..93d84f0f044 --- /dev/null +++ b/queue-6.10/drm-expand-max-drm-device-number-to-full-minorbits.patch @@ -0,0 +1,69 @@ +From 90d0a9a4ac90f737083cab5ecb9010be5a2b3330 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Aug 2024 18:30:48 +0200 +Subject: drm: Expand max DRM device number to full MINORBITS +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michał Winiarski + +[ Upstream commit 071d583e01c88272f6ff216d4f867f8f35e94d7d ] + +Having a limit of 64 DRM devices is not good enough for modern world +where we have multi-GPU servers, SR-IOV virtual functions and virtual +devices used for testing. +Let's utilize full minor range for DRM devices. +To avoid regressing the existing userspace, we're still maintaining the +numbering scheme where 0-63 is used for primary, 64-127 is reserved +(formerly for control) and 128-191 is used for render. +For minors >= 192, we're allocating minors dynamically on a first-come, +first-served basis. + +Signed-off-by: Michał Winiarski +Link: https://patchwork.freedesktop.org/patch/msgid/20240823163048.2676257-4-michal.winiarski@intel.com +Acked-by: James Zhu +Acked-by: Christian König +Signed-off-by: Christian König +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_drv.c | 12 ++++++++++++ + 1 file changed, 12 insertions(+) + +diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c +index a5f7b24324e30..928824b919456 100644 +--- a/drivers/gpu/drm/drm_drv.c ++++ b/drivers/gpu/drm/drm_drv.c +@@ -121,10 +121,19 @@ static void drm_minor_alloc_release(struct drm_device *dev, void *data) + xa_erase(drm_minor_get_xa(minor->type), minor->index); + } + ++/* ++ * DRM used to support 64 devices, for backwards compatibility we need to maintain the ++ * minor allocation scheme where minors 0-63 are primary nodes, 64-127 are control nodes, ++ * and 128-191 are render nodes. ++ * After reaching the limit, we're allocating minors dynamically - first-come, first-serve. ++ * Accel nodes are using a distinct major, so the minors are allocated in continuous 0-MAX ++ * range. ++ */ + #define DRM_MINOR_LIMIT(t) ({ \ + typeof(t) _t = (t); \ + _t == DRM_MINOR_ACCEL ? XA_LIMIT(0, ACCEL_MAX_MINORS) : XA_LIMIT(64 * _t, 64 * _t + 63); \ + }) ++#define DRM_EXTENDED_MINOR_LIMIT XA_LIMIT(192, (1 << MINORBITS) - 1) + + static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + { +@@ -140,6 +149,9 @@ static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + + r = xa_alloc(drm_minor_get_xa(type), &minor->index, + NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL); ++ if (r == -EBUSY && (type == DRM_MINOR_PRIMARY || type == DRM_MINOR_RENDER)) ++ r = xa_alloc(&drm_minors_xa, &minor->index, ++ NULL, DRM_EXTENDED_MINOR_LIMIT, GFP_KERNEL); + if (r < 0) + return r; + +-- +2.43.0 + diff --git a/queue-6.10/drm-use-xarray-instead-of-idr-for-minors.patch b/queue-6.10/drm-use-xarray-instead-of-idr-for-minors.patch new file mode 100644 index 00000000000..957e9482d28 --- /dev/null +++ b/queue-6.10/drm-use-xarray-instead-of-idr-for-minors.patch @@ -0,0 +1,197 @@ +From 9f42f2f2ae6902e9c2778de3865f01ffb693af1b Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 23 Aug 2024 18:30:46 +0200 +Subject: drm: Use XArray instead of IDR for minors +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Michał Winiarski + +[ Upstream commit 5fbca8b48b3050ae7fb611a8b09af60012ed6de1 ] + +IDR is deprecated, and since XArray manages its own state with internal +locking, it simplifies the locking on DRM side. +Additionally, don't use the IRQ-safe variant, since operating on drm +minor is not done in IRQ context. + +Suggested-by: Matthew Wilcox +Signed-off-by: Michał Winiarski +Acked-by: James Zhu +Acked-by: Christian König +Link: https://patchwork.freedesktop.org/patch/msgid/20240823163048.2676257-2-michal.winiarski@intel.com +Signed-off-by: Christian König +Signed-off-by: Sasha Levin +--- + drivers/gpu/drm/drm_drv.c | 63 ++++++++++++++++----------------------- + 1 file changed, 25 insertions(+), 38 deletions(-) + +diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c +index 535b624d4c9da..40cd4faca2b1e 100644 +--- a/drivers/gpu/drm/drm_drv.c ++++ b/drivers/gpu/drm/drm_drv.c +@@ -34,6 +34,7 @@ + #include + #include + #include ++#include + + #include + #include +@@ -54,8 +55,7 @@ MODULE_AUTHOR("Gareth Hughes, Leif Delgass, José Fonseca, Jon Smirl"); + MODULE_DESCRIPTION("DRM shared core routines"); + MODULE_LICENSE("GPL and additional rights"); + +-static DEFINE_SPINLOCK(drm_minor_lock); +-static struct idr drm_minors_idr; ++static DEFINE_XARRAY_ALLOC(drm_minors_xa); + + /* + * If the drm core fails to init for whatever reason, +@@ -101,26 +101,23 @@ static struct drm_minor **drm_minor_get_slot(struct drm_device *dev, + static void drm_minor_alloc_release(struct drm_device *dev, void *data) + { + struct drm_minor *minor = data; +- unsigned long flags; + + WARN_ON(dev != minor->dev); + + put_device(minor->kdev); + +- if (minor->type == DRM_MINOR_ACCEL) { ++ if (minor->type == DRM_MINOR_ACCEL) + accel_minor_remove(minor->index); +- } else { +- spin_lock_irqsave(&drm_minor_lock, flags); +- idr_remove(&drm_minors_idr, minor->index); +- spin_unlock_irqrestore(&drm_minor_lock, flags); +- } ++ else ++ xa_erase(&drm_minors_xa, minor->index); + } + ++#define DRM_MINOR_LIMIT(t) ({ typeof(t) _t = (t); XA_LIMIT(64 * _t, 64 * _t + 63); }) ++ + static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + { + struct drm_minor *minor; +- unsigned long flags; +- int r; ++ int index, r; + + minor = drmm_kzalloc(dev, sizeof(*minor), GFP_KERNEL); + if (!minor) +@@ -129,24 +126,17 @@ static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + minor->type = type; + minor->dev = dev; + +- idr_preload(GFP_KERNEL); + if (type == DRM_MINOR_ACCEL) { + r = accel_minor_alloc(); ++ index = r; + } else { +- spin_lock_irqsave(&drm_minor_lock, flags); +- r = idr_alloc(&drm_minors_idr, +- NULL, +- 64 * type, +- 64 * (type + 1), +- GFP_NOWAIT); +- spin_unlock_irqrestore(&drm_minor_lock, flags); ++ r = xa_alloc(&drm_minors_xa, &index, NULL, DRM_MINOR_LIMIT(type), GFP_KERNEL); + } +- idr_preload_end(); + + if (r < 0) + return r; + +- minor->index = r; ++ minor->index = index; + + r = drmm_add_action_or_reset(dev, drm_minor_alloc_release, minor); + if (r) +@@ -163,7 +153,7 @@ static int drm_minor_alloc(struct drm_device *dev, enum drm_minor_type type) + static int drm_minor_register(struct drm_device *dev, enum drm_minor_type type) + { + struct drm_minor *minor; +- unsigned long flags; ++ void *entry; + int ret; + + DRM_DEBUG("\n"); +@@ -189,9 +179,12 @@ static int drm_minor_register(struct drm_device *dev, enum drm_minor_type type) + if (minor->type == DRM_MINOR_ACCEL) { + accel_minor_replace(minor, minor->index); + } else { +- spin_lock_irqsave(&drm_minor_lock, flags); +- idr_replace(&drm_minors_idr, minor, minor->index); +- spin_unlock_irqrestore(&drm_minor_lock, flags); ++ entry = xa_store(&drm_minors_xa, minor->index, minor, GFP_KERNEL); ++ if (xa_is_err(entry)) { ++ ret = xa_err(entry); ++ goto err_debugfs; ++ } ++ WARN_ON(entry); + } + + DRM_DEBUG("new minor registered %d\n", minor->index); +@@ -205,20 +198,16 @@ static int drm_minor_register(struct drm_device *dev, enum drm_minor_type type) + static void drm_minor_unregister(struct drm_device *dev, enum drm_minor_type type) + { + struct drm_minor *minor; +- unsigned long flags; + + minor = *drm_minor_get_slot(dev, type); + if (!minor || !device_is_registered(minor->kdev)) + return; + + /* replace @minor with NULL so lookups will fail from now on */ +- if (minor->type == DRM_MINOR_ACCEL) { ++ if (minor->type == DRM_MINOR_ACCEL) + accel_minor_replace(NULL, minor->index); +- } else { +- spin_lock_irqsave(&drm_minor_lock, flags); +- idr_replace(&drm_minors_idr, NULL, minor->index); +- spin_unlock_irqrestore(&drm_minor_lock, flags); +- } ++ else ++ xa_store(&drm_minors_xa, minor->index, NULL, GFP_KERNEL); + + device_del(minor->kdev); + dev_set_drvdata(minor->kdev, NULL); /* safety belt */ +@@ -237,13 +226,12 @@ static void drm_minor_unregister(struct drm_device *dev, enum drm_minor_type typ + struct drm_minor *drm_minor_acquire(unsigned int minor_id) + { + struct drm_minor *minor; +- unsigned long flags; + +- spin_lock_irqsave(&drm_minor_lock, flags); +- minor = idr_find(&drm_minors_idr, minor_id); ++ xa_lock(&drm_minors_xa); ++ minor = xa_load(&drm_minors_xa, minor_id); + if (minor) + drm_dev_get(minor->dev); +- spin_unlock_irqrestore(&drm_minor_lock, flags); ++ xa_unlock(&drm_minors_xa); + + if (!minor) { + return ERR_PTR(-ENODEV); +@@ -1071,7 +1059,7 @@ static void drm_core_exit(void) + unregister_chrdev(DRM_MAJOR, "drm"); + debugfs_remove(drm_debugfs_root); + drm_sysfs_destroy(); +- idr_destroy(&drm_minors_idr); ++ WARN_ON(!xa_empty(&drm_minors_xa)); + drm_connector_ida_destroy(); + } + +@@ -1080,7 +1068,6 @@ static int __init drm_core_init(void) + int ret; + + drm_connector_ida_init(); +- idr_init(&drm_minors_idr); + drm_memcpy_init_early(); + + ret = drm_sysfs_init(); +-- +2.43.0 + diff --git a/queue-6.10/powercap-intel_rapl-add-support-for-amd-family-1ah.patch b/queue-6.10/powercap-intel_rapl-add-support-for-amd-family-1ah.patch new file mode 100644 index 00000000000..cd9c8ad7671 --- /dev/null +++ b/queue-6.10/powercap-intel_rapl-add-support-for-amd-family-1ah.patch @@ -0,0 +1,36 @@ +From cd866faf14a72835b640b8deb8abebe758cdf946 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Fri, 19 Jul 2024 10:12:35 +0000 +Subject: powercap/intel_rapl: Add support for AMD family 1Ah + +From: Dhananjay Ugwekar + +[ Upstream commit 166df51097a258a14fe9e946e2157f3b75eeb3c2 ] + +AMD Family 1Ah's RAPL MSRs are identical to Family 19h's, +extend Family 19h's support to Family 1Ah. + +Signed-off-by: Dhananjay Ugwekar +Reviewed-by: Gautham R. Shenoy +Link: https://patch.msgid.link/20240719101234.50827-1-Dhananjay.Ugwekar@amd.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/powercap/intel_rapl_common.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c +index aac0744011a3a..d51d4ec8d707c 100644 +--- a/drivers/powercap/intel_rapl_common.c ++++ b/drivers/powercap/intel_rapl_common.c +@@ -1285,6 +1285,7 @@ static const struct x86_cpu_id rapl_ids[] __initconst = { + + X86_MATCH_VENDOR_FAM(AMD, 0x17, &rapl_defaults_amd), + X86_MATCH_VENDOR_FAM(AMD, 0x19, &rapl_defaults_amd), ++ X86_MATCH_VENDOR_FAM(AMD, 0x1A, &rapl_defaults_amd), + X86_MATCH_VENDOR_FAM(HYGON, 0x18, &rapl_defaults_amd), + {} + }; +-- +2.43.0 + diff --git a/queue-6.10/powercap-intel_rapl-fix-the-energy-pkg-event-for-amd.patch b/queue-6.10/powercap-intel_rapl-fix-the-energy-pkg-event-for-amd.patch new file mode 100644 index 00000000000..14e8d6af450 --- /dev/null +++ b/queue-6.10/powercap-intel_rapl-fix-the-energy-pkg-event-for-amd.patch @@ -0,0 +1,126 @@ +From fa1a0bfaff0e93129d8151b8d8515bb6d7607a73 Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Tue, 30 Jul 2024 04:49:19 +0000 +Subject: powercap/intel_rapl: Fix the energy-pkg event for AMD CPUs + +From: Dhananjay Ugwekar + +[ Upstream commit 26096aed255fbac9501718174dbb24c935d8854e ] + +After commit ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf"), +on AMD processors that support extended CPUID leaf 0x80000026, the +topology_logical_die_id() macros, no longer returns package id, instead it +returns the CCD (Core Complex Die) id. This leads to the energy-pkg +event scope to be modified to CCD instead of package. + +For more historical context, please refer to commit 32fb480e0a2c +("powercap/intel_rapl: Support multi-die/package"), which initially changed +the RAPL scope from package to die for all systems, as Intel systems +with Die enumeration have RAPL scope as die, and those without die +enumeration are not affected. So, all systems(Intel, AMD, Hygon), worked +correctly with topology_logical_die_id() until recently, but this changed +after the "0x80000026 leaf" commit mentioned above. + +Future multi-die Intel systems will have package scope RAPL counters, +but they will be using TPMI RAPL interface, which is not affected by +this change. + +Replacing topology_logical_die_id() with topology_physical_package_id() +conditionally only for AMD and Hygon fixes the energy-pkg event. + +On an AMD 2 socket 8 CCD Zen4 server: + +Before: + +linux$ ls /sys/class/powercap/ +intel-rapl intel-rapl:4 intel-rapl:8:0 intel-rapl:d +intel-rapl:0 intel-rapl:4:0 intel-rapl:9 intel-rapl:d:0 +intel-rapl:0:0 intel-rapl:5 intel-rapl:9:0 intel-rapl:e +intel-rapl:1 intel-rapl:5:0 intel-rapl:a intel-rapl:e:0 +intel-rapl:1:0 intel-rapl:6 intel-rapl:a:0 intel-rapl:f +intel-rapl:2 intel-rapl:6:0 intel-rapl:b intel-rapl:f:0 +intel-rapl:2:0 intel-rapl:7 intel-rapl:b:0 +intel-rapl:3 intel-rapl:7:0 intel-rapl:c +intel-rapl:3:0 intel-rapl:8 intel-rapl:c:0 + +After: + +linux$ ls /sys/class/powercap/ +intel-rapl intel-rapl:0 intel-rapl:0:0 intel-rapl:1 intel-rapl:1:0 + +Only one sysfs entry per-event per-package is created after this change. + +Fixes: 63edbaa48a57 ("x86/cpu/topology: Add support for the AMD 0x80000026 leaf") +Reported-by: Michael Larabel +Signed-off-by: Dhananjay Ugwekar +Reviewed-by: Zhang Rui +Link: https://patch.msgid.link/20240730044917.4680-3-Dhananjay.Ugwekar@amd.com +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Sasha Levin +--- + drivers/powercap/intel_rapl_common.c | 34 ++++++++++++++++++++++++---- + 1 file changed, 30 insertions(+), 4 deletions(-) + +diff --git a/drivers/powercap/intel_rapl_common.c b/drivers/powercap/intel_rapl_common.c +index d51d4ec8d707c..28bc6f85b6c87 100644 +--- a/drivers/powercap/intel_rapl_common.c ++++ b/drivers/powercap/intel_rapl_common.c +@@ -2129,6 +2129,21 @@ void rapl_remove_package(struct rapl_package *rp) + } + EXPORT_SYMBOL_GPL(rapl_remove_package); + ++/* ++ * RAPL Package energy counter scope: ++ * 1. AMD/HYGON platforms use per-PKG package energy counter ++ * 2. For Intel platforms ++ * 2.1 CLX-AP platform has per-DIE package energy counter ++ * 2.2 Other platforms that uses MSR RAPL are single die systems so the ++ * package energy counter can be considered as per-PKG/per-DIE, ++ * here it is considered as per-DIE. ++ * 2.3 New platforms that use TPMI RAPL doesn't care about the ++ * scope because they are not MSR/CPU based. ++ */ ++#define rapl_msrs_are_pkg_scope() \ ++ (boot_cpu_data.x86_vendor == X86_VENDOR_AMD || \ ++ boot_cpu_data.x86_vendor == X86_VENDOR_HYGON) ++ + /* caller to ensure CPU hotplug lock is held */ + struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_priv *priv, + bool id_is_cpu) +@@ -2136,8 +2151,14 @@ struct rapl_package *rapl_find_package_domain_cpuslocked(int id, struct rapl_if_ + struct rapl_package *rp; + int uid; + +- if (id_is_cpu) +- uid = topology_logical_die_id(id); ++ if (id_is_cpu) { ++ uid = rapl_msrs_are_pkg_scope() ? ++ topology_physical_package_id(id) : topology_logical_die_id(id); ++ if (uid < 0) { ++ pr_err("topology_logical_(package/die)_id() returned a negative value"); ++ return ERR_PTR(-EINVAL); ++ } ++ } + else + uid = id; + +@@ -2169,9 +2190,14 @@ struct rapl_package *rapl_add_package_cpuslocked(int id, struct rapl_if_priv *pr + return ERR_PTR(-ENOMEM); + + if (id_is_cpu) { +- rp->id = topology_logical_die_id(id); ++ rp->id = rapl_msrs_are_pkg_scope() ? ++ topology_physical_package_id(id) : topology_logical_die_id(id); ++ if ((int)(rp->id) < 0) { ++ pr_err("topology_logical_(package/die)_id() returned a negative value"); ++ return ERR_PTR(-EINVAL); ++ } + rp->lead_cpu = id; +- if (topology_max_dies_per_package() > 1) ++ if (!rapl_msrs_are_pkg_scope() && topology_max_dies_per_package() > 1) + snprintf(rp->name, PACKAGE_DOMAIN_NAME_LENGTH, "package-%d-die-%d", + topology_physical_package_id(id), topology_die_id(id)); + else +-- +2.43.0 + diff --git a/queue-6.10/series b/queue-6.10/series index 58d3f6851f7..d593cb41334 100644 --- a/queue-6.10/series +++ b/queue-6.10/series @@ -88,3 +88,8 @@ drm-amd-pm-fix-the-pp_dpm_pcie-issue-on-smu-v14.0.2-.patch-15721 spi-spidev-add-missing-spi_device_id-for-jg10309-01.patch-10107 ocfs2-add-bounds-checking-to-ocfs2_xattr_find_entry.patch-10443 ocfs2-strict-bound-check-before-memcmp-in-ocfs2_xatt.patch-24730 +drm-use-xarray-instead-of-idr-for-minors.patch +accel-use-xarray-instead-of-idr-for-minors.patch +drm-expand-max-drm-device-number-to-full-minorbits.patch +powercap-intel_rapl-add-support-for-amd-family-1ah.patch +powercap-intel_rapl-fix-the-energy-pkg-event-for-amd.patch -- 2.47.3