x86 fixes
Subsystems (5)
Linus,
Please pull the latest x86-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-urgent-for-linus
# HEAD: 80b304fd00e8b667775ff791121b61ecd7cd0c03 Merge tag 'efi-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/mfleming/efi into x86/urgent
A couple of EFI fixes, plus misc fixes all around the map.
out-of-topic modifications in x86-urgent-for-linus:
-----------------------------------------------------
arch/arm64/kernel/efi.c # 6a7519e81321: efi/arm64: Store Runtime Ser
drivers/firmware/efi/vars.c # aee530cfecf4: firmware: Do not use WARN_ON
Thanks,
Ingo
------------------>
Dave Hansen (1):
x86/mm: Fix RCU splat from new TLB tracepoints
Guenter Roeck (1):
firmware: Do not use WARN_ON(!spin_is_locked())
Jeremiah Mahler (2):
x86/mm: Fix sparse 'tlb_single_page_flush_ceiling' warning and make the variable read-mostly x86/doc: Fix the 'tlb_single_page_flush_ceiling' sysconfig path
Semen Protsenko (1):
efi/arm64: Store Runtime Services revision
Stefan Bader (1):
x86_32, entry: Clean up sysenter_badsys declaration
Documentation/x86/tlb.txt | 2 +- arch/arm64/kernel/efi.c | 2 ++ arch/x86/kernel/entry_32.S | 2 +- arch/x86/mm/tlb.c | 10 ++++++++-- drivers/firmware/efi/vars.c | 8 ++++---- 5 files changed, 16 insertions(+), 8 deletions(-)
Documentation/x86/tlb.txt +1 -1
@@ -35,7 +35,7 @@ invlpg instruction (or instructions _near_ it) show up high in profiles. If you believe that individual invalidations being called too often, you can lower the tunable: - /sys/debug/kernel/x86/tlb_single_page_flush_ceiling + /sys/kernel/debug/x86/tlb_single_page_flush_ceiling This will cause us to do the global flush for more cases. Lowering it to 0 will disable the use of the individual flushes.
arch/arm64/kernel/efi.c +2 -0
@@ -463,6 +463,8 @@ static int __init arm64_enter_virtual_mode(void)efi_native_runtime_setup ();set_bit (EFI_RUNTIME_SERVICES , &efi.flags); + efi.runtime_version = efi.systab->hdr.revision; +return 0 ; err_unmap:
arch/x86/kernel/entry_32.S +1 -1
@@ -683,7 +683,7 @@ END(syscall_badsys) sysenter_badsys: movl $-ENOSYS,%eax jmp sysenter_after_call -END(syscall_badsys) +END(sysenter_badsys) CFI_ENDPROC .macro FIXUP_ESPFIX_STACK
arch/x86/mm/tlb.c +8 -2
@@ -49,7 +49,13 @@ void leave_mm(int cpu)if (cpumask_test_cpu (cpu,mm_cpumask (active_mm))) {cpumask_clear_cpu (cpu,mm_cpumask (active_mm));load_cr3 (swapper_pg_dir); -trace_tlb_flush (TLB_FLUSH_ON_TASK_SWITCH ,TLB_FLUSH_ALL ); +/* +* This gets called in the idle path where RCU +* functions differently. Tracing normally +* uses RCU, so we have to call the tracepoint +* specially here. +*/ +trace_tlb_flush_rcuidle (TLB_FLUSH_ON_TASK_SWITCH ,TLB_FLUSH_ALL ); } }EXPORT_SYMBOL_GPL (leave_mm);
@@ -174,7 +180,7 @@ void flush_tlb_current_task(void)* * This is in units of pages. */ -unsigned long tlb_single_page_flush_ceiling =33 ; +static unsigned long tlb_single_page_flush_ceiling__read_mostly =33 ;void flush_tlb_mm_range (struct mm_struct *mm,unsigned long start,unsigned long end,unsigned long vmflag)
drivers/firmware/efi/vars.c +4 -4
@@ -481,7 +481,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_remove);*/ static void efivar_entry_list_del_unlock (struct efivar_entry *entry) { -WARN_ON (!spin_is_locked (&__efivars->lock)); +lockdep_assert_held (&__efivars->lock);list_del (&entry->list);spin_unlock_irq (&__efivars->lock);
@@ -507,7 +507,7 @@ int __efivar_entry_delete(struct efivar_entry *entry)const struct efivar_operations *ops = __efivars->ops;efi_status_t status; -WARN_ON (!spin_is_locked (&__efivars->lock)); +lockdep_assert_held (&__efivars->lock); status = ops->set_variable(entry->var.VariableName, &entry->var.VendorGuid,
@@ -667,7 +667,7 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid,int strsize1, strsize2;bool found = false; -WARN_ON (!spin_is_locked (&__efivars->lock)); +lockdep_assert_held (&__efivars->lock);list_for_each_entry_safe (entry, n, head, list) { strsize1 =ucs2_strsize (name,1024 );
@@ -739,7 +739,7 @@ int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes,const struct efivar_operations *ops = __efivars->ops;efi_status_t status; -WARN_ON (!spin_is_locked (&__efivars->lock)); +lockdep_assert_held (&__efivars->lock); status = ops->get_variable(entry->var.VariableName, &entry->var.VendorGuid,