Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A couple of EFI fixes, plus misc fixes all around the map"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm64: Store Runtime Services revision
firmware: Do not use WARN_ON(!spin_is_locked())
x86_32, entry: Clean up sysenter_badsys declaration
x86/doc: Fix the 'tlb_single_page_flush_ceiling' sysconfig path
x86/mm: Fix sparse 'tlb_single_page_flush_ceiling' warning and make the variable read-mostly
x86/mm: Fix RCU splat from new TLB tracepoints
+16
-8
+1
-1
Documentation/x86/tlb.txt
+1
-1
Documentation/x86/tlb.txt
···
35
35
profiles. If you believe that individual invalidations being
36
36
called too often, you can lower the tunable:
37
37
38
-
/sys/debug/kernel/x86/tlb_single_page_flush_ceiling
38
+
/sys/kernel/debug/x86/tlb_single_page_flush_ceiling
39
39
40
40
This will cause us to do the global flush for more cases.
41
41
Lowering it to 0 will disable the use of the individual flushes.
+2
arch/arm64/kernel/efi.c
+2
arch/arm64/kernel/efi.c
+1
-1
arch/x86/kernel/entry_32.S
+1
-1
arch/x86/kernel/entry_32.S
+8
-2
arch/x86/mm/tlb.c
+8
-2
arch/x86/mm/tlb.c
···
49
49
if (cpumask_test_cpu(cpu, mm_cpumask(active_mm))) {
50
50
cpumask_clear_cpu(cpu, mm_cpumask(active_mm));
51
51
load_cr3(swapper_pg_dir);
52
-
trace_tlb_flush(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
52
+
/*
53
+
* This gets called in the idle path where RCU
54
+
* functions differently. Tracing normally
55
+
* uses RCU, so we have to call the tracepoint
56
+
* specially here.
57
+
*/
58
+
trace_tlb_flush_rcuidle(TLB_FLUSH_ON_TASK_SWITCH, TLB_FLUSH_ALL);
53
59
}
54
60
}
55
61
EXPORT_SYMBOL_GPL(leave_mm);
···
180
174
*
181
175
* This is in units of pages.
182
176
*/
183
-
unsigned long tlb_single_page_flush_ceiling = 33;
177
+
static unsigned long tlb_single_page_flush_ceiling __read_mostly = 33;
184
178
185
179
void flush_tlb_mm_range(struct mm_struct *mm, unsigned long start,
186
180
unsigned long end, unsigned long vmflag)
+4
-4
drivers/firmware/efi/vars.c
+4
-4
drivers/firmware/efi/vars.c
···
481
481
*/
482
482
static void efivar_entry_list_del_unlock(struct efivar_entry *entry)
483
483
{
484
-
WARN_ON(!spin_is_locked(&__efivars->lock));
484
+
lockdep_assert_held(&__efivars->lock);
485
485
486
486
list_del(&entry->list);
487
487
spin_unlock_irq(&__efivars->lock);
···
507
507
const struct efivar_operations *ops = __efivars->ops;
508
508
efi_status_t status;
509
509
510
-
WARN_ON(!spin_is_locked(&__efivars->lock));
510
+
lockdep_assert_held(&__efivars->lock);
511
511
512
512
status = ops->set_variable(entry->var.VariableName,
513
513
&entry->var.VendorGuid,
···
667
667
int strsize1, strsize2;
668
668
bool found = false;
669
669
670
-
WARN_ON(!spin_is_locked(&__efivars->lock));
670
+
lockdep_assert_held(&__efivars->lock);
671
671
672
672
list_for_each_entry_safe(entry, n, head, list) {
673
673
strsize1 = ucs2_strsize(name, 1024);
···
739
739
const struct efivar_operations *ops = __efivars->ops;
740
740
efi_status_t status;
741
741
742
-
WARN_ON(!spin_is_locked(&__efivars->lock));
742
+
lockdep_assert_held(&__efivars->lock);
743
743
744
744
status = ops->get_variable(entry->var.VariableName,
745
745
&entry->var.VendorGuid,