lkml.org 
[lkml]   [2022]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v5 2/3] module: Move module_assert_mutex_or_preempt() to internal.h
    Date
    No functional change.

    This patch migrates module_assert_mutex_or_preempt() to internal.h.
    So, the aforementiond function can be used outside of main/or core
    module code yet will remain restricted for internal use only.

    Signed-off-by: Aaron Tomlin <atomlin@redhat.com>
    ---
    kernel/module/internal.h | 12 ++++++++++++
    kernel/module/main.c | 11 -----------
    2 files changed, 12 insertions(+), 11 deletions(-)

    diff --git a/kernel/module/internal.h b/kernel/module/internal.h
    index abbd1c5ef264..0bdf64c9dfb5 100644
    --- a/kernel/module/internal.h
    +++ b/kernel/module/internal.h
    @@ -10,6 +10,7 @@
    #include <linux/module.h>
    #include <linux/mutex.h>
    #include <linux/rculist.h>
    +#include <linux/rcupdate.h>

    #ifndef ARCH_SHF_SMALL
    #define ARCH_SHF_SMALL 0
    @@ -102,6 +103,17 @@ long module_get_offset(struct module *mod, unsigned int *size, Elf_Shdr *sechdr,
    char *module_flags(struct module *mod, char *buf);
    size_t module_flags_taint(unsigned long taints, char *buf);

    +static inline void module_assert_mutex_or_preempt(void)
    +{
    +#ifdef CONFIG_LOCKDEP
    + if (unlikely(!debug_locks))
    + return;
    +
    + WARN_ON_ONCE(!rcu_read_lock_sched_held() &&
    + !lockdep_is_held(&module_mutex));
    +#endif
    +}
    +
    static inline unsigned long kernel_symbol_value(const struct kernel_symbol *sym)
    {
    #ifdef CONFIG_HAVE_ARCH_PREL32_RELOCATIONS
    diff --git a/kernel/module/main.c b/kernel/module/main.c
    index 7dbdd098b995..7a0484900320 100644
    --- a/kernel/module/main.c
    +++ b/kernel/module/main.c
    @@ -118,17 +118,6 @@ static void mod_update_bounds(struct module *mod)
    #endif
    }

    -static void module_assert_mutex_or_preempt(void)
    -{
    -#ifdef CONFIG_LOCKDEP
    - if (unlikely(!debug_locks))
    - return;
    -
    - WARN_ON_ONCE(!rcu_read_lock_sched_held() &&
    - !lockdep_is_held(&module_mutex));
    -#endif
    -}
    -
    /* Block module loading/unloading? */
    int modules_disabled = 0;
    core_param(nomodule, modules_disabled, bint, 0);
    --
    2.34.1
    \
     
     \ /
      Last update: 2022-05-02 22:52    [W:5.652 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site