Adrian Bunk points out that "unsafe" was used to mark modules touched by the deprecated MOD_INC_USE_COUNT interface, which has long gone. It's time to remove the member from the module structure, as well. If you want a module which can't unload, don't register an exit function. (Vlad Yasevich says SCTP is now safe to unload, so just remove the __unsafe there).
Unified · Split
| @@ -1446,21 +1446,20 @@ static struct platform_driver iop_adma_driver = { · 1445 unmodified lines | ||
| 1446 | 1446 | |
| 1447 | 1447 | static int __init iop_adma_init (void) |
| 1448 | 1448 | { |
| 1449 | − /* it's currently unsafe to unload this module */ | |
| 1450 | − /* if forced, worst case is that rmmod hangs */ | |
| 1451 | − __unsafe(THIS_MODULE); | |
| 1452 | − | |
| 1453 | 1449 | return platform_driver_register(&iop_adma_driver); |
| 1454 | 1450 | } |
| 1455 | 1451 | |
| 1452 | +/* it's currently unsafe to unload this module */ | |
| 1453 | +#if 0 | |
| 1456 | 1454 | static void __exit iop_adma_exit (void) |
| 1457 | 1455 | { |
| 1458 | 1456 | platform_driver_unregister(&iop_adma_driver); |
| 1459 | 1457 | return; |
| 1460 | 1458 | } |
| 1459 | +module_exit(iop_adma_exit); | |
| 1460 | +#endif | |
| 1461 | 1461 | |
| 1462 | 1462 | module_init(iop_adma_init); |
| 1463 | −module_exit(iop_adma_exit); | |
| 1464 | 1463 | |
| 1465 | 1464 | MODULE_AUTHOR("Intel Corporation"); |
| 1466 | 1465 | MODULE_DESCRIPTION("IOP ADMA Engine Driver"); |
| @@ -312,9 +312,6 @@ struct module · 311 unmodified lines | ||
| 312 | 312 | /* Arch-specific module values */ |
| 313 | 313 | struct mod_arch_specific arch; |
| 314 | 314 | |
| 315 | − /* Am I unsafe to unload? */ | |
| 316 | − int unsafe; | |
| 317 | − | |
| 318 | 315 | unsigned int taints; /* same bits as kernel:tainted */ |
| 319 | 316 | |
| 320 | 317 | #ifdef CONFIG_GENERIC_BUG |
| @@ -441,16 +438,6 @@ static inline void __module_get(struct module *module) · 120 unmodified lines | ||
| 441 | 438 | __mod ? __mod->name : "kernel"; \ |
| 442 | 439 | }) |
| 443 | 440 | |
| 444 | −#define __unsafe(mod) \ | |
| 445 | −do { \ | |
| 446 | − if (mod && !(mod)->unsafe) { \ | |
| 447 | − printk(KERN_WARNING \ | |
| 448 | − "Module %s cannot be unloaded due to unsafe usage in" \ | |
| 449 | − " %s:%u\n", (mod)->name, __FILE__, __LINE__); \ | |
| 450 | − (mod)->unsafe = 1; \ | |
| 451 | − } \ | |
| 452 | −} while(0) | |
| 453 | − | |
| 454 | 441 | /* For kallsyms to ask for address resolution. NULL means not found. */ |
| 455 | 442 | const char *module_address_lookup(unsigned long addr, |
| 456 | 443 | unsigned long *symbolsize, |
| @@ -518,8 +505,6 @@ static inline void module_put(struct module *module) · 61 unmodified lines | ||
| 518 | 505 | |
| 519 | 506 | #define module_name(mod) "kernel" |
| 520 | 507 | |
| 521 | −#define __unsafe(mod) | |
| 522 | − | |
| 523 | 508 | /* For kallsyms to ask for address resolution. NULL means not found. */ |
| 524 | 509 | static inline const char *module_address_lookup(unsigned long addr, |
| 525 | 510 | unsigned long *symbolsize, |
| @@ -692,8 +692,7 @@ sys_delete_module(const char __user *name_user, unsigned int flags) · 691 unmodified lines | ||
| 692 | 692 | } |
| 693 | 693 | |
| 694 | 694 | /* If it has an init func, it must have an exit func to unload */ |
| 695 | − if ((mod->init != NULL && mod->exit == NULL) | |
| 696 | − || mod->unsafe) { | |
| 695 | + if (mod->init && !mod->exit) { | |
| 697 | 696 | forced = try_force_unload(flags); |
| 698 | 697 | if (!forced) { |
| 699 | 698 | /* This module can't be removed */ |
| @@ -741,11 +740,6 @@ static void print_unload_info(struct seq_file *m, struct module *mod) · 41 unmodified lines | ||
| 741 | 740 | seq_printf(m, "%s,", use->module_which_uses->name); |
| 742 | 741 | } |
| 743 | 742 | |
| 744 | − if (mod->unsafe) { | |
| 745 | − printed_something = 1; | |
| 746 | − seq_printf(m, "[unsafe],"); | |
| 747 | − } | |
| 748 | − | |
| 749 | 743 | if (mod->init != NULL && mod->exit == NULL) { |
| 750 | 744 | printed_something = 1; |
| 751 | 745 | seq_printf(m, "[permanent],"); |
| @@ -2011,15 +2005,10 @@ sys_init_module(void __user *umod, · 1259 unmodified lines | ||
| 2011 | 2005 | buggy refcounters. */ |
| 2012 | 2006 | mod->state = MODULE_STATE_GOING; |
| 2013 | 2007 | synchronize_sched(); |
| 2014 | − if (mod->unsafe) | |
| 2015 | − printk(KERN_ERR "%s: module is now stuck!\n", | |
| 2016 | − mod->name); | |
| 2017 | − else { | |
| 2018 | − module_put(mod); | |
| 2019 | − mutex_lock(&module_mutex); | |
| 2020 | − free_module(mod); | |
| 2021 | − mutex_unlock(&module_mutex); | |
| 2022 | − } | |
| 2008 | + module_put(mod); | |
| 2009 | + mutex_lock(&module_mutex); | |
| 2010 | + free_module(mod); | |
| 2011 | + mutex_unlock(&module_mutex); | |
| 2023 | 2012 | return ret; |
| 2024 | 2013 | } |
| 2025 | 2014 | |
| @@ -1228,7 +1228,6 @@ SCTP_STATIC __init int sctp_init(void) · 1227 unmodified lines | ||
| 1228 | 1228 | if (status) |
| 1229 | 1229 | goto err_v6_add_protocol; |
| 1230 | 1230 | |
| 1231 | − __unsafe(THIS_MODULE); | |
| 1232 | 1231 | status = 0; |
| 1233 | 1232 | out: |
| 1234 | 1233 | return status; |