Commit 9f57bd4d6dc69a4e3bf43044fa00fcd24dd363e3

Authored by Eugene Surovegin
Committed by Tejun Heo
1 parent 42ebfc61cf

percpu: fix per_cpu_ptr_to_phys() handling of non-page-aligned addresses

per_cpu_ptr_to_phys() incorrectly rounds up its result for non-kmalloc
case to the page boundary, which is bogus for any non-page-aligned
address.

This affects the only in-tree user of this function - sysfs handler
for per-cpu 'crash_notes' physical address.  The trouble is that the
crash_notes per-cpu variable is not page-aligned:

crash_notes = 0xc08e8ed4
PER-CPU OFFSET VALUES:
 CPU 0: 3711f000
 CPU 1: 37129000
 CPU 2: 37133000
 CPU 3: 3713d000

So, the per-cpu addresses are:
 crash_notes on CPU 0: f7a07ed4 => phys 36b57ed4
 crash_notes on CPU 1: f7a11ed4 => phys 36b4ded4
 crash_notes on CPU 2: f7a1bed4 => phys 36b43ed4
 crash_notes on CPU 3: f7a25ed4 => phys 36b39ed4

However, /sys/devices/system/cpu/cpu*/crash_notes says:
 /sys/devices/system/cpu/cpu0/crash_notes: 36b57000
 /sys/devices/system/cpu/cpu1/crash_notes: 36b4d000
 /sys/devices/system/cpu/cpu2/crash_notes: 36b43000
 /sys/devices/system/cpu/cpu3/crash_notes: 36b39000

As you can see, all values are rounded down to a page
boundary. Consequently, this is where kexec sets up the NOTE segments,
and thus where the secondary kernel is looking for them. However, when
the first kernel crashes, it saves the notes to the unaligned
addresses, where they are not found.

Fix it by adding offset_in_page() to the translated page address.

-tj: Combined Eugene's and Petr's commit messages.

Signed-off-by: Eugene Surovegin <ebs@ebshome.net>
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-by: Petr Tesarik <ptesarik@suse.cz>
Cc: stable@kernel.org

Showing 1 changed file with 4 additions and 2 deletions Side-by-side Diff

... ... @@ -1023,9 +1023,11 @@
1023 1023 if (!is_vmalloc_addr(addr))
1024 1024 return __pa(addr);
1025 1025 else
1026   - return page_to_phys(vmalloc_to_page(addr));
  1026 + return page_to_phys(vmalloc_to_page(addr)) +
  1027 + offset_in_page(addr);
1027 1028 } else
1028   - return page_to_phys(pcpu_addr_to_page(addr));
  1029 + return page_to_phys(pcpu_addr_to_page(addr)) +
  1030 + offset_in_page(addr);
1029 1031 }
1030 1032  
1031 1033 /**