Updated asmlinkage patch v2
Subsystems (12)
Revert the asmlinkage contains __visible change.
I removed the header declarations Linus didn't like. This removed the crypto patch and made everything a lot smaller and simpler.
I thought it was needed based on earlier experiments, but on rechecking Linus was right and the header declarations are never needed.
Did some basic sanity checks with LTO and everything works (still need the three other LTO patches to build)
Please consider applying.
-Andi
PATCH 1/3 Revert "lto: Make asmlinkage __visible"
From: Andi Kleen <[email protected]>
As requested by Linus, revert adding __visible to asmlinkage. Instead we add __visible explicitely to all the symbols that need it.
This reverts commit 128ea04a9885af9629059e631ddf0cab4815b589.
--- include/linux/linkage.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/linux/linkage.h +2 -2
@@ -12,9 +12,9 @@#endif #ifdef __cplusplus -#define CPP_ASMLINKAGE extern "C" __visible +#define CPP_ASMLINKAGE extern "C"#else -#define CPP_ASMLINKAGE __visible +#define CPP_ASMLINKAGE #endif #ifndef asmlinkage
Signature · 1 line
1.8.5.2
PATCH 2/3 asmlinkage, x86: Add explicit __visible to arch/x86/*
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
As requested by Linus add explicit __visible to the asmlinkage users. This marks all functions visible to assembler.
Tree sweep for arch/x86/*
--- arch/x86/boot/compressed/misc.c | 2 +- arch/x86/kernel/acpi/sleep.c | 2 +- arch/x86/kernel/apic/io_apic.c | 2 +- arch/x86/kernel/cpu/mcheck/therm_throt.c | 4 ++-- arch/x86/kernel/cpu/mcheck/threshold.c | 4 ++-- arch/x86/kernel/head32.c | 2 +- arch/x86/kernel/head64.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/smp.c | 2 +- arch/x86/kernel/traps.c | 6 +++--- arch/x86/kernel/vsmp_64.c | 6 +++--- arch/x86/kvm/x86.c | 2 +- arch/x86/lguest/boot.c | 4 ++-- arch/x86/math-emu/errors.c | 16 ++++++++-------- arch/x86/platform/olpc/olpc-xo1-pm.c | 2 +- arch/x86/power/hibernate_64.c | 2 +- arch/x86/xen/enlighten.c | 2 +- arch/x86/xen/irq.c | 6 +++--- 18 files changed, 34 insertions(+), 34 deletions(-)
arch/x86/boot/compressed/misc.c +1 -1
@@ -389,7 +389,7 @@ static void parse_elf(void *output)free (phdrs); } -asmlinkage void *decompress_kernel(void *rmode, memptr heap, +asmlinkage __visible void *decompress_kernel(void *rmode, memptr heap, unsigned char *input_data, unsigned long input_len, unsigned char *output,
arch/x86/kernel/acpi/sleep.c +1 -1
@@ -31,7 +31,7 @@ static char temp_stack[4096];* * Wrapper around acpi_enter_sleep_state() to be called by assmebly. */ -acpi_status asmlinkage x86_acpi_enter_sleep_state(u8 state) +acpi_status asmlinkage __visible x86_acpi_enter_sleep_state(u8 state) {return acpi_enter_sleep_state (state); }
arch/x86/kernel/apic/io_apic.c +1 -1
@@ -2189,7 +2189,7 @@ void send_cleanup_vector(struct irq_cfg *cfg) cfg->move_in_progress =0 ; } -asmlinkage void smp_irq_move_cleanup_interrupt(void) +asmlinkage __visible void smp_irq_move_cleanup_interrupt(void) {unsigned vector, me;
arch/x86/kernel/cpu/mcheck/therm_throt.c +2 -2
@@ -439,14 +439,14 @@ static inline void __smp_thermal_interrupt(void)smp_thermal_vector (); } -asmlinkage void smp_thermal_interrupt(struct pt_regs *regs) +asmlinkage __visible void smp_thermal_interrupt(struct pt_regs *regs) {entering_irq ();__smp_thermal_interrupt ();exiting_ack_irq (); } -asmlinkage void smp_trace_thermal_interrupt(struct pt_regs *regs) +asmlinkage __visible void smp_trace_thermal_interrupt(struct pt_regs *regs) {entering_irq ();trace_thermal_apic_entry (THERMAL_APIC_VECTOR );
arch/x86/kernel/cpu/mcheck/threshold.c +2 -2
@@ -24,14 +24,14 @@ static inline void __smp_threshold_interrupt(void)mce_threshold_vector (); } -asmlinkage void smp_threshold_interrupt(void) +asmlinkage __visible void smp_threshold_interrupt(void) {entering_irq ();__smp_threshold_interrupt ();exiting_ack_irq (); } -asmlinkage void smp_trace_threshold_interrupt(void) +asmlinkage __visible void smp_trace_threshold_interrupt(void) {entering_irq ();trace_threshold_apic_entry (THRESHOLD_APIC_VECTOR );
arch/x86/kernel/head32.c +1 -1
@@ -29,7 +29,7 @@ static void __init i386_default_early_setup(void)reserve_ebda_region (); } -asmlinkage void __init i386_start_kernel(void) +asmlinkage __visible void __init i386_start_kernel(void) {sanitize_boot_params (&boot_params);
arch/x86/kernel/head64.c +1 -1
@@ -137,7 +137,7 @@ static void __init copy_bootdata(char *real_mode_data) } } -asmlinkage void __init x86_64_start_kernel(char * real_mode_data) +asmlinkage __visible void __init x86_64_start_kernel(char * real_mode_data) {int i;
arch/x86/kernel/process_64.c +1 -1
@@ -52,7 +52,7 @@ asmlinkage extern void ret_from_fork(void); -asmlinkage DEFINE_PER_CPU (unsigned long ,old_rsp ); +__visible DEFINE_PER_CPU (unsigned long ,old_rsp );/* Prints also some state that isn't saved in the pt_regs */ void __show_regs (struct pt_regs *regs,int all)
arch/x86/kernel/smp.c +1 -1
@@ -168,7 +168,7 @@ static int smp_stop_nmi_callback(unsigned int val, struct pt_regs *regs)* this function calls the 'stop' function on all other CPUs in the system. */ -asmlinkage void smp_reboot_interrupt(void) +asmlinkage __visible void smp_reboot_interrupt(void) {ack_APIC_irq ();irq_enter ();
arch/x86/kernel/traps.c +3 -3
@@ -357,7 +357,7 @@ exit:* for scheduling or signal handling. The actual stack switch is done in * entry.S */ -asmlinkage __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs) +asmlinkage __visible __kprobes struct pt_regs *sync_regs(struct pt_regs *eregs) {struct pt_regs *regs = eregs;/* Did already sync */
@@ -601,11 +601,11 @@ do_spurious_interrupt_bug(struct pt_regs *regs, long error_code)#endif } -asmlinkage void __attribute__((weak)) smp_thermal_interrupt(void) +asmlinkage __visible void __attribute__((weak)) smp_thermal_interrupt(void) { } -asmlinkage void __attribute__((weak)) smp_threshold_interrupt(void) +asmlinkage __visible void __attribute__((weak)) smp_threshold_interrupt(void) { }
arch/x86/kernel/vsmp_64.c +3 -3
@@ -33,7 +33,7 @@* and vice versa. */ -asmlinkage unsigned long vsmp_save_fl (void ) +asmlinkage __visible unsigned long vsmp_save_fl(void) {unsigned long flags =native_save_fl ();
@@ -53,7 +53,7 @@ __visible void vsmp_restore_fl(unsigned long flags) }PV_CALLEE_SAVE_REGS_THUNK (vsmp_restore_fl); -asmlinkage void vsmp_irq_disable(void) +asmlinkage __visible void vsmp_irq_disable(void) {unsigned long flags =native_save_fl ();
@@ -61,7 +61,7 @@ asmlinkage void vsmp_irq_disable(void) }PV_CALLEE_SAVE_REGS_THUNK (vsmp_irq_disable); -asmlinkage void vsmp_irq_enable(void) +asmlinkage __visible void vsmp_irq_enable(void) {unsigned long flags =native_save_fl ();
arch/x86/kvm/x86.c +1 -1
@@ -280,7 +280,7 @@ int kvm_set_apic_base(struct kvm_vcpu *vcpu, struct msr_data *msr_info) }EXPORT_SYMBOL_GPL (kvm_set_apic_base); -asmlinkage void kvm_spurious_fault(void) +asmlinkage __visible void kvm_spurious_fault(void) {/* Fault while not rebooting. We want the trace. */ BUG ();
arch/x86/lguest/boot.c +2 -2
@@ -233,13 +233,13 @@ static void lguest_end_context_switch(struct task_struct *next)* flags word contains all kind of stuff, but in practice Linux only cares * about the interrupt flag. Our "save_flags()" just returns that. */ -asmlinkage unsigned long lguest_save_fl (void ) +asmlinkage __visible unsigned long lguest_save_fl(void) {return lguest_data.irq_enabled; }/* Interrupts go off... */ -asmlinkage void lguest_irq_disable(void) +asmlinkage __visible void lguest_irq_disable(void) { lguest_data.irq_enabled =0 ; }
arch/x86/math-emu/errors.c +8 -8
@@ -302,7 +302,7 @@ static struct {0x242 in div_Xsig.S */ -asmlinkage void FPU_exception(int n) +asmlinkage __visible void FPU_exception(int n) {int i, int_type;
@@ -492,7 +492,7 @@ int real_2op_NaN(FPU_REG const *b, u_char tagb,/* Invalid arith operation on Valid registers */ /* Returns < 0 if the exception is unmasked */ -asmlinkage int arith_invalid(int deststnr) +asmlinkage __visible int arith_invalid(int deststnr) {EXCEPTION (EX_Invalid);
@@ -507,7 +507,7 @@ asmlinkage int arith_invalid(int deststnr) }/* Divide a finite number by zero */ -asmlinkage int FPU_divide_by_zero(int deststnr, u_char sign) +asmlinkage __visible int FPU_divide_by_zero(int deststnr, u_char sign) {FPU_REG *dest = &st (deststnr);int tag = TAG_Valid;
@@ -539,7 +539,7 @@ int set_precision_flag(int flags) }/* This may be called often, so keep it lean */ -asmlinkage void set_precision_flag_up(void) +asmlinkage __visible void set_precision_flag_up(void) {if (control_word & CW_Precision) partial_status |= (SW_Precision |SW_C1 );/* The masked response */
@@ -548,7 +548,7 @@ asmlinkage void set_precision_flag_up(void) }/* This may be called often, so keep it lean */ -asmlinkage void set_precision_flag_down(void) +asmlinkage __visible void set_precision_flag_down(void) {if (control_word & CW_Precision) {/* The masked response */ partial_status &= ~SW_C1 ;
@@ -557,7 +557,7 @@ asmlinkage void set_precision_flag_down(void)EXCEPTION (EX_Precision); } -asmlinkage int denormal_operand(void) +asmlinkage __visible int denormal_operand(void) {if (control_word & CW_Denormal) {/* The masked response */ partial_status |= SW_Denorm_Op;
@@ -568,7 +568,7 @@ asmlinkage int denormal_operand(void) } } -asmlinkage int arith_overflow(FPU_REG *dest) +asmlinkage __visible int arith_overflow(FPU_REG *dest) {int tag = TAG_Valid;
@@ -596,7 +596,7 @@ asmlinkage int arith_overflow(FPU_REG *dest) } -asmlinkage int arith_underflow(FPU_REG *dest) +asmlinkage __visible int arith_underflow(FPU_REG *dest) {int tag = TAG_Valid;
arch/x86/platform/olpc/olpc-xo1-pm.c +1 -1
@@ -75,7 +75,7 @@ static int xo1_power_state_enter(suspend_state_t pm_state)return 0 ; } -asmlinkage int xo1_do_sleep(u8 sleep_state) +asmlinkage __visible int xo1_do_sleep(u8 sleep_state) {void *pgd_addr =__va (read_cr3 ());
arch/x86/power/hibernate_64.c +1 -1
@@ -23,7 +23,7 @@ extern __visible const void __nosave_begin, __nosave_end;/* Defined in hibernate_asm_64.S */ -extern asmlinkage int restore_image(void); +extern asmlinkage __visible int restore_image(void);/* * Address to jump to in the last phase of restore in order to get to the image
arch/x86/xen/enlighten.c +1 -1
@@ -1515,7 +1515,7 @@ static void __init xen_pvh_early_guest_init(void) }/* First C function to be called on Xen boot */ -asmlinkage void __init xen_start_kernel(void) +asmlinkage __visible void __init xen_start_kernel(void) {struct physdev_set_iopl set_iopl;int rc;
arch/x86/xen/irq.c +3 -3
@@ -23,7 +23,7 @@ void xen_force_evtchn_callback(void) (void )HYPERVISOR_xen_version (0 ,NULL ); } -asmlinkage unsigned long xen_save_fl (void ) +asmlinkage __visible unsigned long xen_save_fl(void) {struct vcpu_info *vcpu;unsigned long flags;
@@ -63,7 +63,7 @@ __visible void xen_restore_fl(unsigned long flags) }PV_CALLEE_SAVE_REGS_THUNK (xen_restore_fl); -asmlinkage void xen_irq_disable(void) +asmlinkage __visible void xen_irq_disable(void) {/* There's a one instruction preempt window here. We need to make sure we're don't switch CPUs between getting the vcpu
@@ -74,7 +74,7 @@ asmlinkage void xen_irq_disable(void) }PV_CALLEE_SAVE_REGS_THUNK (xen_irq_disable); -asmlinkage void xen_irq_enable(void) +asmlinkage __visible void xen_irq_enable(void) {struct vcpu_info *vcpu;
Signature · 1 line
1.8.5.2
PATCH 3/3 asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
In reply to Andi KleenFrom: Andi Kleen <[email protected]>
As requested by Linus add explicit __visible to the asmlinkage users. This marks functions visible to assembler.
Tree sweep for rest of tree.
--- drivers/pnp/pnpbios/bioscalls.c | 2 +- init/main.c | 2 +- kernel/context_tracking.c | 2 +- kernel/locking/lockdep.c | 2 +- kernel/power/snapshot.c | 2 +- kernel/printk/printk.c | 4 ++-- kernel/sched/core.c | 10 +++++----- kernel/softirq.c | 4 ++-- lib/dump_stack.c | 4 ++-- 9 files changed, 16 insertions(+), 16 deletions(-)
drivers/pnp/pnpbios/bioscalls.c +1 -1
@@ -37,7 +37,7 @@ __visible struct {* kernel begins at offset 3GB... */ -asmlinkage void pnp_bios_callfunc(void); +asmlinkage __visible void pnp_bios_callfunc(void); __asm__(".text \n" __ALIGN_STR "\n"
init/main.c +1 -1
@@ -476,7 +476,7 @@ static void __init mm_init(void)vmalloc_init (); } -asmlinkage void __init start_kernel(void) +asmlinkage __visible void __init start_kernel(void) {char * command_line;extern const struct kernel_param __start___param[], __stop___param[];
kernel/context_tracking.c +1 -1
@@ -120,7 +120,7 @@ void context_tracking_user_enter(void)* instead of preempt_schedule() to exit user context if needed before * calling the scheduler. */ -asmlinkage void __sched notrace preempt_schedule_context(void) +asmlinkage __visible void __sched notrace preempt_schedule_context(void) {enum ctx_state prev_ctx;
kernel/locking/lockdep.c +1 -1
@@ -4188,7 +4188,7 @@ void debug_show_held_locks(struct task_struct *task) }EXPORT_SYMBOL_GPL (debug_show_held_locks); -asmlinkage void lockdep_sys_exit(void) +asmlinkage __visible void lockdep_sys_exit(void) {struct task_struct *curr = current;
kernel/power/snapshot.c +1 -1
@@ -1585,7 +1585,7 @@ swsusp_alloc(struct memory_bitmap *orig_bm, struct memory_bitmap *copy_bm,return -ENOMEM ; } -asmlinkage int swsusp_save(void) +asmlinkage __visible int swsusp_save(void) {unsigned int nr_pages, nr_highmem;
kernel/printk/printk.c +2 -2
@@ -1671,7 +1671,7 @@ EXPORT_SYMBOL(printk_emit);* * See the vsnprintf() documentation for format string extensions over C99. */ -asmlinkage int printk(const char *fmt, ...) +asmlinkage __visible int printk(const char *fmt, ...) {va_list args;int r;
@@ -1734,7 +1734,7 @@ void early_vprintk(const char *fmt, va_list ap) } } -asmlinkage void early_printk(const char *fmt, ...) +asmlinkage __visible void early_printk(const char *fmt, ...) {va_list ap;
kernel/sched/core.c +5 -5
@@ -2194,7 +2194,7 @@ static inline void post_schedule(struct rq *rq)* schedule_tail - first thing a freshly forked thread must call. * @prev: the thread we just switched away from. */ -asmlinkage void schedule_tail(struct task_struct *prev) +asmlinkage __visible void schedule_tail(struct task_struct *prev) __releases(rq->lock) {struct rq *rq =this_rq ();
@@ -2743,7 +2743,7 @@ static inline void sched_submit_work(struct task_struct *tsk)blk_schedule_flush_plug (tsk); } -asmlinkage void __sched schedule(void) +asmlinkage __visible void __sched schedule(void) {struct task_struct *tsk = current;
@@ -2753,7 +2753,7 @@ asmlinkage void __sched schedule(void)EXPORT_SYMBOL (schedule);#ifdef CONFIG_CONTEXT_TRACKING -asmlinkage void __sched schedule_user(void) +asmlinkage __visible void __sched schedule_user(void) {/* * If we come here after a random call to set_need_resched(),
@@ -2785,7 +2785,7 @@ void __sched schedule_preempt_disabled(void)* off of preempt_enable. Kernel preemptions off return from interrupt * occur there and call schedule directly. */ -asmlinkage void __sched notrace preempt_schedule(void) +asmlinkage __visible void __sched notrace preempt_schedule(void) {/* * If there is a non-zero preempt_count or interrupts are disabled,
@@ -2815,7 +2815,7 @@ EXPORT_SYMBOL(preempt_schedule);* Note, that this is called and return with irqs disabled. This will * protect us against recursive calling from irq. */ -asmlinkage void __sched preempt_schedule_irq(void) +asmlinkage __visible void __sched preempt_schedule_irq(void) {enum ctx_state prev_state;
kernel/softirq.c +2 -2
@@ -222,7 +222,7 @@ static inline bool lockdep_softirq_start(void) { return false; }static inline void lockdep_softirq_end (bool in_hardirq) { }#endif -asmlinkage void __do_softirq(void) +asmlinkage __visible void __do_softirq(void) {unsigned long end = jiffies +MAX_SOFTIRQ_TIME ;unsigned long old_flags = current->flags;
@@ -298,7 +298,7 @@ restart:tsk_restore_flags (current, old_flags,PF_MEMALLOC ); } -asmlinkage void do_softirq(void) +asmlinkage __visible void do_softirq(void) {__u32 pending;unsigned long flags;
lib/dump_stack.c +2 -2
@@ -23,7 +23,7 @@ static void __dump_stack(void)#ifdef CONFIG_SMP static atomic_t dump_lock =ATOMIC_INIT (-1 ); -asmlinkage void dump_stack(void) +asmlinkage __visible void dump_stack(void) {int was_locked;int old;
@@ -55,7 +55,7 @@ retry:preempt_enable (); }#else -asmlinkage void dump_stack(void) +asmlinkage __visible void dump_stack(void) {__dump_stack (); }
Signature · 1 line
1.8.5.2
Quoted 3 lines · Andi Kleen
Did some basic sanity checks with LTO and everything works (still need the three other LTO patches to build)
Ok, this series looks much better. Thanks,
Linus
Quoted 6 lines · Andi Kleen
Quoted 3 lines
Did some basic sanity checks with LTO and everything works (still need the three other LTO patches to build)
Ok, this series looks much better. Thanks,
It seems this series hasn't made it to the torvalds tree yet so the compiler still issues complaints about __visible static functions. Should I bring a patch removing the "static" from asmlinkage-annotated functions, or is this patch the better way? Or have I missed something?
BTW some of the functions have already lost their asmlinkage, see commit 8783dd3a37a5853689e1a8fa728827a50905b912 ("irqchip: Remove asmlinkage from static functions") in torvalds tree and also recent thread https://lkml.org/lkml/2014/4/16/453 ("[PATCH] crypto:
sha{256,512}_ssse3 - remove asmlinkage from static functions"), both of them because "it issues warnings".
MQ
Quoted 6 lines
BTW some of the functions have already lost their asmlinkage, see commit
8783dd3a37a5853689e1a8fa728827a50905b912("irqchip: Remove asmlinkage from static functions") in torvalds tree and also recent thread https://lkml.org/lkml/2014/4/16/453 ("[PATCH] crypto:
sha{256,512}_ssse3 - remove asmlinkage from static functions"), both of them because "it issues warnings".
I'll resend the changes.
Not sure which tree it should go through. Peter?
-Andi