1 files changed, 49 insertions, 27 deletions

diff --git a/include/linux/module.h b/include/linux/module.h
index 7760c6d344a..bbd77fa05b1 100644
--- a/include/linux/module.h
+++ b/include/linux/module.h
@@ -21,8 +21,7 @@
 #include <linux/percpu.h>
 #include <asm/module.h>
 
-/* In stripped ARM and x86-64 modules, ~ is surprisingly rare. */
-#define MODULE_SIG_STRING "~Module signature appended~\n"
+#include <trace/events/module.h>
 
 /* Not Yet Implemented */
 #define MODULE_SUPPORTED_DEVICE(name)
@@ -136,6 +135,11 @@ extern const struct gtype##_id __mod_##gtype##_table		\
 /* 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)
 
@@ -206,20 +210,6 @@ enum module_state
         MODULE_STATE_GOING,
 };
 
-/**
- * struct module_ref - per cpu module reference counts
- * @incs: number of module get on this cpu
- * @decs: number of module put on this cpu
- *
- * We force an alignment on 8 or 16 bytes, so that alloc_percpu()
- * put @incs/@decs in same cache line, with no extra memory cost,
- * since alloc_percpu() is fine grained.
- */
-struct module_ref {
-        unsigned long incs;
-        unsigned long decs;
-} __attribute((aligned(2 * sizeof(unsigned long))));
-
 struct module
 {
         enum module_state state;
@@ -263,11 +253,6 @@ struct module
         const unsigned long *unused_gpl_crcs;
 #endif
 
-#ifdef CONFIG_MODULE_SIG
-        /* Signature was verified. */
-        bool sig_ok;
-#endif
-
         /* symbols that will be GPL-only in the near future. */
         const struct kernel_symbol *gpl_future_syms;
         const unsigned long *gpl_future_crcs;
@@ -367,7 +352,10 @@ struct module
         /* Destruction function. */
         void (*exit)(void);
 
-        struct module_ref __percpu *refptr;
+        struct module_ref {
+                unsigned int incs;
+                unsigned int decs;
+        } __percpu *refptr;
 #endif
 
 #ifdef CONFIG_CONSTRUCTORS
@@ -451,18 +439,40 @@ extern void __module_put_and_exit(struct module *mod, long code)
 #define module_put_and_exit(code) __module_put_and_exit(THIS_MODULE, code);
 
 #ifdef CONFIG_MODULE_UNLOAD
-unsigned long module_refcount(struct module *mod);
+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);
 
 /* Sometimes we know we already have a refcount, and it's easier not
    to handle the error case (which only happens with rmmod --wait). */
-extern void __module_get(struct module *module);
+static inline void __module_get(struct module *module)
+{
+        if (module) {
+                preempt_disable();
+                __this_cpu_inc(module->refptr->incs);
+                trace_module_get(module, _THIS_IP_);
+                preempt_enable();
+        }
+}
+
+static inline int try_module_get(struct module *module)
+{
+        int ret = 1;
 
-/* This is the Right Way to get a module: if it fails, it's being removed,
- * so pretend it's not there. */
-extern bool try_module_get(struct module *module);
+        if (module) {
+                preempt_disable();
+
+                if (likely(module_is_live(module))) {
+                        __this_cpu_inc(module->refptr->incs);
+                        trace_module_get(module, _THIS_IP_);
+                } else
+                        ret = 0;
+
+                preempt_enable();
+        }
+        return ret;
+}
 
 extern void module_put(struct module *module);
 
@@ -509,6 +519,9 @@ int unregister_module_notifier(struct notifier_block * nb);
 
 extern void print_modules(void);
 
+extern void module_update_tracepoints(void);
+extern int module_get_iter_tracepoints(struct tracepoint_iter *iter);
+
 #else /* !CONFIG_MODULES... */
 
 /* Given an address, look for it in the exception tables. */
@@ -619,6 +632,15 @@ static inline int unregister_module_notifier(struct notifier_block * nb)
 static inline void print_modules(void)
 {
 }
+
+static inline void module_update_tracepoints(void)
+{
+}
+
+static inline int module_get_iter_tracepoints(struct tracepoint_iter *iter)
+{
+        return 0;
+}
 #endif /* CONFIG_MODULES */
 
 #ifdef CONFIG_SYSFS