x86/cpuid: make cpuid_class a static const structure
Subsystems (3)
PATCH 2/3 x86/MSR: make msr_class a static const structure
In reply to Greg Kroah-HartmanFrom: Ivan Orlov <[email protected]>
Now that the driver core allows for struct class to be in read-only memory, move the msr_class structure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at boot time.
--- arch/x86/kernel/msr.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
arch/x86/kernel/msr.c +16 -15
@@ -39,7 +39,6 @@#include <asm/cpufeature.h> #include <asm/msr.h> -static struct class *msr_class;static enum cpuhp_state cpuhp_msr_state;enum allow_write_msrs {
@@ -235,26 +234,31 @@ static const struct file_operations msr_fops = { .compat_ioctl = msr_ioctl, }; +static char *msr_devnode (const struct device *dev,umode_t *mode) +{ +return kasprintf (GFP_KERNEL ,"cpu/%u/msr" ,MINOR (dev->devt)); +} + +static const struct class msr_class = { + .name ="msr" , + .devnode = msr_devnode, +}; +static int msr_device_create (unsigned int cpu) {struct device *dev; - dev =device_create (msr_class,NULL ,MKDEV (MSR_MAJOR , cpu),NULL , + dev =device_create (&msr_class,NULL ,MKDEV (MSR_MAJOR , cpu),NULL ,"msr%d" , cpu);return PTR_ERR_OR_ZERO (dev); }static int msr_device_destroy (unsigned int cpu) { -device_destroy (msr_class,MKDEV (MSR_MAJOR , cpu)); +device_destroy (&msr_class,MKDEV (MSR_MAJOR , cpu));return 0 ; } -static char *msr_devnode (const struct device *dev,umode_t *mode) -{ -return kasprintf (GFP_KERNEL ,"cpu/%u/msr" ,MINOR (dev->devt)); -} -static int __init msr_init (void ) {int err;
@@ -263,12 +267,9 @@ static int __init msr_init(void)pr_err ("unable to get major %d for msr\n" ,MSR_MAJOR );return -EBUSY ; } - msr_class =class_create ("msr" ); -if (IS_ERR (msr_class)) { - err =PTR_ERR (msr_class); + err =class_register (&msr_class); +if (err) goto out_chrdev; - } - msr_class->devnode = msr_devnode; err =cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"x86/msr:online" , msr_device_create, msr_device_destroy);
@@ -278,7 +279,7 @@ static int __init msr_init(void)return 0 ; out_class: -class_destroy (msr_class); +class_unregister (&msr_class); out_chrdev:__unregister_chrdev (MSR_MAJOR ,0 ,NR_CPUS ,"cpu/msr" );return err;
@@ -288,7 +289,7 @@ module_init(msr_init); static void __exit msr_exit(void) {cpuhp_remove_state (cpuhp_msr_state); -class_destroy (msr_class); +class_unregister (&msr_class);__unregister_chrdev (MSR_MAJOR ,0 ,NR_CPUS ,"cpu/msr" ); }module_exit (msr_exit)
Signature · 1 line
2.41.0
PATCH 1/3 x86/cpuid: make cpuid_class a static const structure
From: Ivan Orlov <[email protected]>
Now that the driver core allows for struct class to be in read-only memory, move the cpuid_class structure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at boot time.
--- arch/x86/kernel/cpuid.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-)
arch/x86/kernel/cpuid.c +16 -15
@@ -40,7 +40,6 @@#include <asm/processor.h> #include <asm/msr.h> -static struct class *cpuid_class;static enum cpuhp_state cpuhp_cpuid_state;struct cpuid_regs_done {
@@ -124,26 +123,31 @@ static const struct file_operations cpuid_fops = { .open = cpuid_open, }; +static char *cpuid_devnode (const struct device *dev,umode_t *mode) +{ +return kasprintf (GFP_KERNEL ,"cpu/%u/cpuid" ,MINOR (dev->devt)); +} + +static const struct class cpuid_class = { + .name ="cpuid" , + .devnode = cpuid_devnode, +}; +static int cpuid_device_create (unsigned int cpu) {struct device *dev; - dev =device_create (cpuid_class,NULL ,MKDEV (CPUID_MAJOR , cpu),NULL , + dev =device_create (&cpuid_class,NULL ,MKDEV (CPUID_MAJOR , cpu),NULL ,"cpu%d" , cpu);return PTR_ERR_OR_ZERO (dev); }static int cpuid_device_destroy (unsigned int cpu) { -device_destroy (cpuid_class,MKDEV (CPUID_MAJOR , cpu)); +device_destroy (&cpuid_class,MKDEV (CPUID_MAJOR , cpu));return 0 ; } -static char *cpuid_devnode (const struct device *dev,umode_t *mode) -{ -return kasprintf (GFP_KERNEL ,"cpu/%u/cpuid" ,MINOR (dev->devt)); -} -static int __init cpuid_init (void ) {int err;
@@ -154,12 +158,9 @@ static int __init cpuid_init(void) CPUID_MAJOR);return -EBUSY ; } - cpuid_class =class_create ("cpuid" ); -if (IS_ERR (cpuid_class)) { - err =PTR_ERR (cpuid_class); + err =class_register (&cpuid_class); +if (err) goto out_chrdev; - } - cpuid_class->devnode = cpuid_devnode; err =cpuhp_setup_state (CPUHP_AP_ONLINE_DYN ,"x86/cpuid:online" , cpuid_device_create, cpuid_device_destroy);
@@ -170,7 +171,7 @@ static int __init cpuid_init(void)return 0 ; out_class: -class_destroy (cpuid_class); +class_unregister (&cpuid_class); out_chrdev:__unregister_chrdev (CPUID_MAJOR ,0 ,NR_CPUS ,"cpu/cpuid" );return err;
@@ -180,7 +181,7 @@ module_init(cpuid_init); static void __exit cpuid_exit(void) {cpuhp_remove_state (cpuhp_cpuid_state); -class_destroy (cpuid_class); +class_unregister (&cpuid_class);__unregister_chrdev (CPUID_MAJOR ,0 ,NR_CPUS ,"cpu/cpuid" ); }module_exit (cpuid_exit);
Signature · 1 line
2.41.0
PATCH 3/3 x86/resctrl: make pseudo_lock_class a static const structure
From: Ivan Orlov <[email protected]>
Now that the driver core allows for struct class to be in read-only memory, move the pseudo_lock_class structure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at boot time.
--- arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 41 ++++++++++++----------- 1 file changed, 21 insertions(+), 20 deletions(-)
arch/x86/kernel/cpu/resctrl/pseudo_lock.c +21 -20
@@ -45,7 +45,21 @@ static u64 prefetch_disable_bits;*/ static unsigned int pseudo_lock_major;static unsigned long pseudo_lock_minor_avail =GENMASK (MINORBITS ,0 ); -static struct class *pseudo_lock_class; + +static char *pseudo_lock_devnode (const struct device *dev,umode_t *mode) +{ +const struct rdtgroup *rdtgrp; + + rdtgrp =dev_get_drvdata (dev); +if (mode) + *mode =0600 ; +return kasprintf (GFP_KERNEL ,"pseudo_lock/%s" , rdtgrp->kn->name); +} + +static const struct class pseudo_lock_class = { + .name ="pseudo_lock" , + .devnode = pseudo_lock_devnode, +};/** * get_prefetch_disable_bits - prefetch disable bits of supported platforms
@@ -1353,7 +1367,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) &pseudo_measure_fops); } - dev =device_create (pseudo_lock_class,NULL , + dev =device_create (&pseudo_lock_class,NULL ,MKDEV (pseudo_lock_major, new_minor), rdtgrp,"%s" , rdtgrp->kn->name);
@@ -1383,7 +1397,7 @@ int rdtgroup_pseudo_lock_create(struct rdtgroup *rdtgrp) goto out; out_device: -device_destroy (pseudo_lock_class,MKDEV (pseudo_lock_major, new_minor)); +device_destroy (&pseudo_lock_class,MKDEV (pseudo_lock_major, new_minor)); out_debugfs:debugfs_remove_recursive (plr->debugfs_dir);pseudo_lock_minor_release (new_minor);
@@ -1424,7 +1438,7 @@ void rdtgroup_pseudo_lock_remove(struct rdtgroup *rdtgrp)pseudo_lock_cstates_relax (plr);debugfs_remove_recursive (rdtgrp->plr->debugfs_dir); -device_destroy (pseudo_lock_class,MKDEV (pseudo_lock_major, plr->minor)); +device_destroy (&pseudo_lock_class,MKDEV (pseudo_lock_major, plr->minor));pseudo_lock_minor_release (plr->minor); free:
@@ -1560,16 +1574,6 @@ static const struct file_operations pseudo_lock_dev_fops = { .mmap = pseudo_lock_dev_mmap, }; -static char *pseudo_lock_devnode (const struct device *dev,umode_t *mode) -{ -const struct rdtgroup *rdtgrp; - - rdtgrp =dev_get_drvdata (dev); -if (mode) - *mode =0600 ; -return kasprintf (GFP_KERNEL ,"pseudo_lock/%s" , rdtgrp->kn->name); -} -int rdt_pseudo_lock_init (void ) {int ret;
@@ -1580,21 +1584,18 @@ int rdt_pseudo_lock_init(void) pseudo_lock_major = ret; - pseudo_lock_class =class_create ("pseudo_lock" ); -if (IS_ERR (pseudo_lock_class)) { - ret =PTR_ERR (pseudo_lock_class); + ret =class_register (&pseudo_lock_class); +if (ret) {unregister_chrdev (pseudo_lock_major,"pseudo_lock" );return ret; } - pseudo_lock_class->devnode = pseudo_lock_devnode;return 0 ; }void rdt_pseudo_lock_release (void ) { -class_destroy (pseudo_lock_class); - pseudo_lock_class =NULL ; +class_unregister (&pseudo_lock_class);unregister_chrdev (pseudo_lock_major,"pseudo_lock" ); pseudo_lock_major =0 ; }
Signature · 1 line
2.41.0
Re: [PATCH 3/3] x86/resctrl: make pseudo_lock_class a static const structure
Quoted 7 lines · Greg Kroah-Hartman
From: Ivan Orlov <[email protected]>
Now that the driver core allows for struct class to be in read-only memory, move the
pseudo_lock_classstructure to be declared at build time placing it into read-only memory, instead of having to be dynamically allocated at boot time.
Quoted 11 lines
Cc Fenghua Yu <[email protected]>Cc Reinette Chatre <[email protected]>Cc Thomas Gleixner <[email protected]>Cc Ingo Molnar <[email protected]>Cc Borislav Petkov <[email protected]>Cc Dave Hansen <[email protected]>Cc "H. Peter Anvin" <[email protected]>Suggested-by Greg Kroah-Hartman <[email protected]>Signed-off-by Ivan Orlov <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>
Thank you very much.
Reinette