History

x86/mm: Fix slow_virt_to_phys() for X86_PAE again

"d1cd12108346: x86, pageattr: Prevent overflow in slow_virt_to_phys() for X86_PAE" was unintentionally removed by the recent "34437e67a672: x86/mm: Fix slow_virt_to_phys() to handle large PAT bit". And, the variable 'phys_addr' was defined as "unsigned long" by mistake -- it should be "phys_addr_t". As a result, Hyper-V network driver in 32-PAE Linux guest can't work again.

Dexuan Cui committed 10 years ago

Commit bf70e551 parent 3d44d511 file · +10 −4Browse files

Unified · Split

arch/x86/mm/pageattr.c+10−4
@@ -419,24 +419,30 @@ pmd_t *lookup_pmd_address(unsigned long address) · 418 unmodified lines
419419 phys_addr_t slow_virt_to_phys(void *__virt_addr)
420420 {
421421 unsigned long virt_addr = (unsigned long)__virt_addr;
422− unsigned long phys_addr, offset;
422+ phys_addr_t phys_addr;
423+ unsigned long offset;
423424 enum pg_level level;
424425 pte_t *pte;
425426
426427 pte = lookup_address(virt_addr, &level);
427428 BUG_ON(!pte);
428429
430+ /*
431+ * pXX_pfn() returns unsigned long, which must be cast to phys_addr_t
432+ * before being left-shifted PAGE_SHIFT bits -- this trick is to
433+ * make 32-PAE kernel work correctly.
434+ */
429435 switch (level) {
430436 case PG_LEVEL_1G:
431− phys_addr = pud_pfn(*(pud_t *)pte) << PAGE_SHIFT;
437+ phys_addr = (phys_addr_t)pud_pfn(*(pud_t *)pte) << PAGE_SHIFT;
432438 offset = virt_addr & ~PUD_PAGE_MASK;
433439 break;
434440 case PG_LEVEL_2M:
435− phys_addr = pmd_pfn(*(pmd_t *)pte) << PAGE_SHIFT;
441+ phys_addr = (phys_addr_t)pmd_pfn(*(pmd_t *)pte) << PAGE_SHIFT;
436442 offset = virt_addr & ~PMD_PAGE_MASK;
437443 break;
438444 default:
439− phys_addr = pte_pfn(*pte) << PAGE_SHIFT;
445+ phys_addr = (phys_addr_t)pte_pfn(*pte) << PAGE_SHIFT;
440446 offset = virt_addr & ~PAGE_MASK;
441447 }
442448

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t