xen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long
Subsystems (2)
PATCH 1/1 xen_alloc_ptpage: cast PFN_PHYS() argument to unsigned long
[Oops, I forgot to CC lkml when sending this patch previously. Sorry]
Currently paravirt_ops alloc_p*() uses u32 for the pfn args. We should change that later, but while the pfn parameter is still u32, we need to cast the PFN_PHYS() argument at xen_alloc_ptpage() to unsigned long, otherwise it will lose bits on the shift.
I think PFN_PHYS() should behave better when fed with smaller integers, but a cast to unsigned long won't be enough for all cases on 32-bit PAE, and a cast to u64 would be overkill for most users of PFN_PHYS().
We could have two different flavors of PFN_PHYS: one for low pages only (unsigned long) and another that works for any page (u64)), but while we don't have it, we will need the cast to unsigned long on xen_alloc_ptpage().
--- arch/x86/xen/enlighten.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/x86/xen/enlighten.c +1 -1
@@ -942,7 +942,7 @@ static void xen_alloc_ptpage(struct mm_struct *mm, u32 pfn, unsigned level)SetPagePinned (page);if (!PageHighMem (page)) { -make_lowmem_page_readonly (__va (PFN_PHYS (pfn))); +make_lowmem_page_readonly (__va (PFN_PHYS ((unsigned long )pfn)));if (level ==PT_PTE )pin_pagetable_pfn (MMUEXT_PIN_L1_TABLE , pfn); }else
Signature · 1 line
1.5.5.GIT
Ingo Molnar
AppliedQuoted 10 lines · Eduardo Habkost
Currently
paravirt_opsalloc_p*() uses u32 for the pfn args. We should change that later, but while the pfn parameter is still u32, we need to cast thePFN_PHYS()argument atxen_alloc_ptpage()to unsigned long, otherwise it will lose bits on the shift.I think
PFN_PHYS()should behave better when fed with smaller integers, but a cast to unsigned long won't be enough for all cases on 32-bit PAE, and a cast to u64 would be overkill for most users ofPFN_PHYS().
Quoted 7 lines
We could have two different flavors of
PFN_PHYS: one for low pages only (unsigned long) and another that works for any page (u64)), but while we don't have it, we will need the cast to unsigned long onxen_alloc_ptpage().Signed-off-by Eduardo Habkost <[email protected]>
applied to tip/x86/xen - thanks Eduardo.
Ingo