From 67ac5b866bda838d9838faedad0435e3e84fb2bd Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 29 Apr 2003 17:17:33 -0700 Subject: [PATCH] complete modinfo section Restores .modinfo section, and uses it to store license and vermagic. --- include/linux/module.h | 48 +++++++++++++++++++++++++++++------------------- 1 file changed, 29 insertions(+), 19 deletions(-) (limited to 'include/linux') diff --git a/include/linux/module.h b/include/linux/module.h index 657802c8af75..9511614b024a 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -20,10 +20,7 @@ #include /* Not Yet Implemented */ -#define MODULE_AUTHOR(name) -#define MODULE_DESCRIPTION(desc) #define MODULE_SUPPORTED_DEVICE(name) -#define MODULE_PARM_DESC(var,desc) #define print_modules() /* v850 toolchain uses a `_' prefix for all user symbols */ @@ -58,12 +55,11 @@ search_extable(const struct exception_table_entry *first, unsigned long value); #ifdef MODULE -#define ___module_cat(a,b) a ## b +#define ___module_cat(a,b) __mod_ ## a ## b #define __module_cat(a,b) ___module_cat(a,b) -/* For userspace: you can also call me... */ -#define MODULE_ALIAS(alias) \ - static const char __module_cat(__alias_,__LINE__)[] \ - __attribute__((section(".modinfo"),unused)) = "alias=" alias +#define __MODULE_INFO(tag, name, info) \ +static const char __module_cat(name,__LINE__)[] \ + __attribute__((section(".modinfo"),unused)) = __stringify(tag) "=" info #define MODULE_GENERIC_TABLE(gtype,name) \ extern const struct gtype##_id __mod_##gtype##_table \ @@ -71,6 +67,19 @@ extern const struct gtype##_id __mod_##gtype##_table \ #define THIS_MODULE (&__this_module) +#else /* !MODULE */ + +#define MODULE_GENERIC_TABLE(gtype,name) +#define __MODULE_INFO(tag, name, info) +#define THIS_MODULE ((struct module *)0) +#endif + +/* Generic info of form tag = "info" */ +#define MODULE_INFO(tag, info) __MODULE_INFO(tag, tag, info) + +/* For userspace: you can also call me... */ +#define MODULE_ALIAS(_alias) MODULE_INFO(alias, _alias) + /* * The following license idents are currently accepted as indicating free * software modules @@ -97,17 +106,18 @@ extern const struct gtype##_id __mod_##gtype##_table \ * 2. So the community can ignore bug reports including proprietary modules * 3. So vendors can do likewise based on their own policies */ -#define MODULE_LICENSE(license) \ - static const char __module_license[] \ - __attribute__((section(".init.license"), unused)) = license - -#else /* !MODULE */ - -#define MODULE_ALIAS(alias) -#define MODULE_GENERIC_TABLE(gtype,name) -#define THIS_MODULE ((struct module *)0) -#define MODULE_LICENSE(license) -#endif +#define MODULE_LICENSE(_license) MODULE_INFO(license, _license) + +/* Author, ideally of form NAME [, NAME ]*[ and NAME ] */ +#define MODULE_AUTHOR(_author) MODULE_INFO(author, _author) + +/* What your module does. */ +#define MODULE_DESCRIPTION(_description) MODULE_INFO(description, _description) + +/* One for each parameter, describing how to use it. Some files do + multiple of these per line, so can't just use MODULE_INFO. */ +#define MODULE_PARM_DESC(_parm, desc) \ + __MODULE_INFO(parm, _parm, #_parm ":" desc) #define MODULE_DEVICE_TABLE(type,name) \ MODULE_GENERIC_TABLE(type##_device,name) -- cgit v1.2.3 From fbf7eda6f4f1e3d5b9a26d82a6884755d34923b7 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Tue, 29 Apr 2003 17:17:42 -0700 Subject: [PATCH] __module_get Introduces __module_get for places where we know we already hold a reference and ignoring the fact that the module is being "rmmod --wait"ed is simpler. --- fs/filesystems.c | 12 +----------- include/linux/module.h | 19 +++++++++++++++++++ kernel/module.c | 3 ++- 3 files changed, 22 insertions(+), 12 deletions(-) (limited to 'include/linux') diff --git a/fs/filesystems.c b/fs/filesystems.c index a87d637e168a..c4b467fb67dd 100644 --- a/fs/filesystems.c +++ b/fs/filesystems.c @@ -32,17 +32,7 @@ static rwlock_t file_systems_lock = RW_LOCK_UNLOCKED; /* WARNING: This can be used only if we _already_ own a reference */ void get_filesystem(struct file_system_type *fs) { - if (!try_module_get(fs->owner)) { -#ifdef CONFIG_MODULE_UNLOAD - unsigned int cpu = get_cpu(); - local_inc(&fs->owner->ref[cpu].count); - put_cpu(); -#else - /* Getting filesystem while it's starting up? We're - already supposed to have a reference. */ - BUG(); -#endif - } + __module_get(fs->owner); } void put_filesystem(struct file_system_type *fs) diff --git a/include/linux/module.h b/include/linux/module.h index 9511614b024a..4ddc5edcd22f 100644 --- a/include/linux/module.h +++ b/include/linux/module.h @@ -265,6 +265,7 @@ struct module *module_text_address(unsigned long addr); #ifdef CONFIG_MODULE_UNLOAD +unsigned int module_refcount(struct module *mod); void __symbol_put(const char *symbol); #define symbol_put(x) __symbol_put(MODULE_SYMBOL_PREFIX #x) void symbol_put_addr(void *addr); @@ -275,6 +276,17 @@ void symbol_put_addr(void *addr); #define local_dec(x) atomic_dec(x) #endif +/* Sometimes we know we already have a refcount, and it's easier not + to handle the error case (which only happens with rmmod --wait). */ +static inline void __module_get(struct module *module) +{ + if (module) { + BUG_ON(module_refcount(module) == 0); + local_inc(&module->ref[get_cpu()].count); + put_cpu(); + } +} + static inline int try_module_get(struct module *module) { int ret = 1; @@ -310,6 +322,9 @@ static inline int try_module_get(struct module *module) static inline void module_put(struct module *module) { } +static inline void __module_get(struct module *module) +{ +} #define symbol_put(x) do { } while(0) #define symbol_put_addr(p) do { } while(0) @@ -367,6 +382,10 @@ static inline struct module *module_text_address(unsigned long addr) #define symbol_put(x) do { } while(0) #define symbol_put_addr(x) do { } while(0) +static inline void __module_get(struct module *module) +{ +} + static inline int try_module_get(struct module *module) { return 1; diff --git a/kernel/module.c b/kernel/module.c index 17e2884ce495..06ff9328b30b 100644 --- a/kernel/module.c +++ b/kernel/module.c @@ -431,7 +431,7 @@ static inline void restart_refcounts(void) } #endif -static unsigned int module_refcount(struct module *mod) +unsigned int module_refcount(struct module *mod) { unsigned int i, total = 0; @@ -439,6 +439,7 @@ static unsigned int module_refcount(struct module *mod) total += atomic_read(&mod->ref[i].count); return total; } +EXPORT_SYMBOL(module_refcount); /* This exists whether we can unload or not */ static void free_module(struct module *mod); -- cgit v1.2.3 From e5ded0b1d26fceb4a59547fa4d1fcf3fb3983b5b Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 29 Apr 2003 17:31:22 -0700 Subject: [PATCH] Fix slab-vs-gfp bitflag clash Fixes a bug spotted by Alexey Mahotkin : the slab-internal SLAB_NO_GROW bit clashes with __GFP_NORETRY. Fix that up so it won't happen again by moving the bit layout into gfp.h. --- include/linux/gfp.h | 1 + include/linux/slab.h | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'include/linux') diff --git a/include/linux/gfp.h b/include/linux/gfp.h index ade6d9e97475..be82baa340fa 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -31,6 +31,7 @@ #define __GFP_REPEAT 0x400 /* Retry the allocation. Might fail */ #define __GFP_NOFAIL 0x800 /* Retry for ever. Cannot fail */ #define __GFP_NORETRY 0x1000 /* Do not retry. Might fail */ +#define __GFP_NO_GROW 0x2000 /* Slab internal usage */ #define GFP_ATOMIC (__GFP_HIGH) #define GFP_NOIO (__GFP_WAIT) diff --git a/include/linux/slab.h b/include/linux/slab.h index 603748b9b349..49374df2d450 100644 --- a/include/linux/slab.h +++ b/include/linux/slab.h @@ -22,8 +22,11 @@ typedef struct kmem_cache_s kmem_cache_t; #define SLAB_KERNEL GFP_KERNEL #define SLAB_DMA GFP_DMA -#define SLAB_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|__GFP_COLD|__GFP_NOWARN|__GFP_REPEAT|__GFP_NOFAIL|__GFP_NORETRY) -#define SLAB_NO_GROW 0x00001000UL /* don't grow a cache */ +#define SLAB_LEVEL_MASK (__GFP_WAIT|__GFP_HIGH|__GFP_IO|__GFP_FS|\ + __GFP_COLD|__GFP_NOWARN|__GFP_REPEAT|\ + __GFP_NOFAIL|__GFP_NORETRY) + +#define SLAB_NO_GROW __GFP_NO_GROW /* don't grow a cache */ /* flags to pass to kmem_cache_create(). * The first 3 are only valid when the allocator as been build -- cgit v1.2.3 From 0948aa6d1967d2b3a6e07eb9176a579187bae1e2 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Tue, 29 Apr 2003 17:32:40 -0700 Subject: [PATCH] improved bdevname --- fs/partitions/check.c | 21 ++++++++++++++------- fs/partitions/check.h | 2 +- include/linux/fs.h | 5 +---- kernel/ksyms.c | 1 + 4 files changed, 17 insertions(+), 12 deletions(-) (limited to 'include/linux') diff --git a/fs/partitions/check.c b/fs/partitions/check.c index a8530c42211f..591123911467 100644 --- a/fs/partitions/check.c +++ b/fs/partitions/check.c @@ -99,25 +99,32 @@ char *disk_name(struct gendisk *hd, int part, char *buf) #ifdef CONFIG_DEVFS_FS if (hd->devfs_name[0] != '\0') { if (part) - sprintf(buf, "%s/part%d", hd->devfs_name, part); + snprintf(buf, BDEVNAME_SIZE, "%s/part%d", + hd->devfs_name, part); else if (hd->minors != 1) - sprintf(buf, "%s/disc", hd->devfs_name); + snprintf(buf, BDEVNAME_SIZE, "%s/disc", hd->devfs_name); else - sprintf(buf, "%s", hd->devfs_name); + snprintf(buf, BDEVNAME_SIZE, "%s", hd->devfs_name); return buf; } #endif if (!part) - sprintf(buf, "%s", hd->disk_name); + snprintf(buf, BDEVNAME_SIZE, "%s", hd->disk_name); else if (isdigit(hd->disk_name[strlen(hd->disk_name)-1])) - sprintf(buf, "%sp%d", hd->disk_name, part); + snprintf(buf, BDEVNAME_SIZE, "%sp%d", hd->disk_name, part); else - sprintf(buf, "%s%d", hd->disk_name, part); + snprintf(buf, BDEVNAME_SIZE, "%s%d", hd->disk_name, part); return buf; } +const char *bdevname(struct block_device *bdev, char *buf) +{ + int part = MINOR(bdev->bd_dev) - bdev->bd_disk->first_minor; + return disk_name(bdev->bd_disk, part, buf); +} + static struct parsed_partitions * check_partition(struct gendisk *hd, struct block_device *bdev) { @@ -417,7 +424,7 @@ void del_gendisk(struct gendisk *disk) struct dev_name { struct list_head list; dev_t dev; - char namebuf[64]; + char namebuf[BDEVNAME_SIZE]; char *name; }; diff --git a/fs/partitions/check.h b/fs/partitions/check.h index 882980c55720..43adcc68e471 100644 --- a/fs/partitions/check.h +++ b/fs/partitions/check.h @@ -8,7 +8,7 @@ enum { MAX_PART = 256 }; struct parsed_partitions { - char name[40]; + char name[BDEVNAME_SIZE]; struct { sector_t from; sector_t size; diff --git a/include/linux/fs.h b/include/linux/fs.h index 572b92e6f443..b9b2cf5b69e8 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -1068,10 +1068,7 @@ extern int chrdev_open(struct inode *, struct file *); /* fs/block_dev.c */ #define BDEVNAME_SIZE 32 /* Largest string for a blockdev identifier */ extern const char *__bdevname(dev_t, char *buffer); -extern inline const char *bdevname(struct block_device *bdev, char *buffer) -{ - return __bdevname(bdev->bd_dev, buffer); -} +extern const char *bdevname(struct block_device *bdev, char *buffer); extern struct block_device *lookup_bdev(const char *); extern struct block_device *open_bdev_excl(const char *, int, int, void *); extern void close_bdev_excl(struct block_device *, int); diff --git a/kernel/ksyms.c b/kernel/ksyms.c index 8c8cff48895d..c8ca8a9fa5e1 100644 --- a/kernel/ksyms.c +++ b/kernel/ksyms.c @@ -515,6 +515,7 @@ EXPORT_SYMBOL(vsprintf); EXPORT_SYMBOL(vsnprintf); EXPORT_SYMBOL(vsscanf); EXPORT_SYMBOL(__bdevname); +EXPORT_SYMBOL(bdevname); EXPORT_SYMBOL(cdevname); EXPORT_SYMBOL(simple_strtoull); EXPORT_SYMBOL(simple_strtoul); -- cgit v1.2.3 From efa428ef2cafff1c31730f04147244d1e2def76f Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Tue, 29 Apr 2003 17:33:47 -0700 Subject: [PATCH] percpu counters cause UML compilation errors in with SMP The percpu counters break UML SMP compilation (in current 2.5.58 bk snapshot) (first NR_CPUS undeclared in header, then dereference of incomplete structure in .c file) --- include/linux/percpu_counter.h | 2 +- lib/percpu_counter.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'include/linux') diff --git a/include/linux/percpu_counter.h b/include/linux/percpu_counter.h index 69d0a66b662e..53c52176c391 100644 --- a/include/linux/percpu_counter.h +++ b/include/linux/percpu_counter.h @@ -7,7 +7,7 @@ #include #include #include -#include +#include #ifdef CONFIG_SMP diff --git a/lib/percpu_counter.c b/lib/percpu_counter.c index 73f99d99f9ac..a9afaec00bdd 100644 --- a/lib/percpu_counter.c +++ b/lib/percpu_counter.c @@ -1,5 +1,6 @@ #include +#include void percpu_counter_mod(struct percpu_counter *fbc, long amount) { -- cgit v1.2.3