tip-queue 2015-11-30
Subsystems (3)
Borislav Petkov
maintainerPATCH 1/1 tip-queue 2015-11-30
From: Borislav Petkov <[email protected]>
Hi Ingo,
just this one fix for tip:x86/urgent this week:
Kirill A. Shutemov (1):
x86/mm: Fix regression with huge pages on PAE
arch/x86/boot/boot.h | 1 - arch/x86/boot/video-mode.c | 2 ++ arch/x86/boot/video.c | 2 ++ arch/x86/include/asm/page_types.h | 16 +++++++++------- arch/x86/include/asm/pgtable_types.h | 14 ++++---------- arch/x86/include/asm/x86_init.h | 1 - 6 files changed, 17 insertions(+), 19 deletions(-)
Signature · 1 line
2.3.5
Borislav Petkov
maintainerPATCH 1/1 x86/mm: Fix regression with huge pages on PAE
From: "Kirill A. Shutemov" <[email protected]>
Recent PAT patchset has caused issue on 32-bit PAE machines:
page:eea45000 count:0 mapcount:-128 mapping: (null) index:0x0
flags: 0x40000000()
page dumped because: VM_BUG_ON_PAGE(page_mapcount(page) < 0) ------------[ cut here ]------------ kernel BUG at /home/build/linux-boris/mm/huge_memory.c:1485! invalid opcode: 0000 [#1] SMP Modules linked in: ahci libahci ata_generic skge r8169 firewire_ohci mii libata qla2xxx(+) scsi_transport_fc scsi_mod radeon tpm_infineon ttm backlight wmi acpi_cpufreq tpm_tis CPU: 2 PID: 1758 Comm: modprobe Not tainted 4.3.0upstream-09269-gce5c2d2 #1 Hardware name: To Be Filled By O.E.M. To Be Filled By O.E.M./To be filled by O.E.M., BIOS 080014 07/18/2008 task: ed84e600 ti: f6458000 task.ti: f6458000 EIP: 0060:[<c11bde80>] EFLAGS: 00010246 CPU: 2 EIP is at zap_huge_pmd+0x240/0x260 EAX: 00000000 EBX: f6459eb0 ECX: 00000292 EDX: 00000292 ESI: f6634d98 EDI: eea45000 EBP: f6459dc8 ESP: f6459d98
ata1: SATA link down (SStatus 0 SControl 300)
ata2: SATA link down (SStatus 0 SControl 300)
DS: 007b ES: 007b FS: 00d8 GS: 0033 SS: 0068
CR0: 8005003b CR2: b75b21a0 CR3: 3655b880 CR4: 000006f0
Stack: ... Call Trace: unmap_single_vma ? __wake_up unmap_vmas unmap_region do_munmap vm_munmap SyS_munmap do_fast_syscall_32 ? __do_page_fault sysenter_past_esp Code: ... EIP: [<c11bde80>] zap_huge_pmd+0x240/0x260 SS:ESP 0068:f6459d98 ---[ end trace cba8fb1fc2e2e78a ]---
The problem is in pmd_pfn_mask() and pmd_flags_mask(). These helpers use PMD_PAGE_MASK to calculate resulting mask. PMD_PAGE_MASK is 'unsigned long', not 'unsigned long long' as phys_addr_t is on 32-bit PAE (ARCH_PHYS_ADDR_T_64BIT). As a result, the upper bits of resulting mask get truncated.
pud_pfn_mask() and pud_flags_mask() aren't problematic since we don't have PUD page table level on 32-bit systems, but it's reasonable to keep them consistent with PMD counterpart.
Introduce PHYSICAL_PMD_PAGE_MASK and PHYSICAL_PUD_PAGE_MASK in addition to existing PHYSICAL_PAGE_MASK and reworks helpers to use them.
--- arch/x86/boot/boot.h | 1 - arch/x86/boot/video-mode.c | 2 ++ arch/x86/boot/video.c | 2 ++ arch/x86/include/asm/page_types.h | 16 +++++++++------- arch/x86/include/asm/pgtable_types.h | 14 ++++---------- arch/x86/include/asm/x86_init.h | 1 - 6 files changed, 17 insertions(+), 19 deletions(-)
arch/x86/boot/boot.h +0 -1
@@ -23,7 +23,6 @@#include <stdarg.h> #include <linux/types.h> #include <linux/edd.h> -#include <asm/boot.h> #include <asm/setup.h> #include "bitops.h" #include "ctype.h"
arch/x86/boot/video-mode.c +2 -0
@@ -19,6 +19,8 @@#include "video.h" #include "vesa.h" +#include <uapi/asm/boot.h> +/* * Common variables */
arch/x86/boot/video.c +2 -0
@@ -13,6 +13,8 @@* Select video mode */ +#include <uapi/asm/boot.h> +#include "boot.h" #include "video.h" #include "vesa.h"
arch/x86/include/asm/page_types.h +9 -7
@@ -9,19 +9,21 @@#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)#define PAGE_MASK (~(PAGE_SIZE-1)) +#define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) +#define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) + +#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) +#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) +#define __PHYSICAL_MASK ((phys_addr_t)((1ULL << __PHYSICAL_MASK_SHIFT) - 1))#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) -/* Cast PAGE_MASK to a signed type so that it is sign-extended if +/* Cast *PAGE_MASK to a signed type so that it is sign-extended if virtual addresses are 32-bits but physical addresses are larger (ie, 32-bit PAE). */ #define PHYSICAL_PAGE_MASK (((signed long)PAGE_MASK) & __PHYSICAL_MASK) - -#define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) -#define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) - -#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) -#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) +#define PHYSICAL_PMD_PAGE_MASK (((signed long)PMD_PAGE_MASK) & __PHYSICAL_MASK) +#define PHYSICAL_PUD_PAGE_MASK (((signed long)PUD_PAGE_MASK) & __PHYSICAL_MASK)#define HPAGE_SHIFT PMD_SHIFT#define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT)
arch/x86/include/asm/pgtable_types.h +4 -10
@@ -279,17 +279,14 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)static inline pudval_t pud_pfn_mask (pud_t pud) {if (native_pud_val (pud) & _PAGE_PSE) -return PUD_PAGE_MASK &PHYSICAL_PAGE_MASK ; +return PHYSICAL_PUD_PAGE_MASK ;else return PTE_PFN_MASK ; }static inline pudval_t pud_flags_mask (pud_t pud) { -if (native_pud_val (pud) & _PAGE_PSE) -return ~(PUD_PAGE_MASK & (pudval_t )PHYSICAL_PAGE_MASK ); -else -return ~PTE_PFN_MASK ; +return ~pud_pfn_mask (pud); }static inline pudval_t pud_flags (pud_t pud)
@@ -300,17 +297,14 @@ static inline pudval_t pud_flags(pud_t pud)static inline pmdval_t pmd_pfn_mask (pmd_t pmd) {if (native_pmd_val (pmd) & _PAGE_PSE) -return PMD_PAGE_MASK &PHYSICAL_PAGE_MASK ; +return PHYSICAL_PMD_PAGE_MASK ;else return PTE_PFN_MASK ; }static inline pmdval_t pmd_flags_mask (pmd_t pmd) { -if (native_pmd_val (pmd) & _PAGE_PSE) -return ~(PMD_PAGE_MASK & (pmdval_t )PHYSICAL_PAGE_MASK ); -else -return ~PTE_PFN_MASK ; +return ~pmd_pfn_mask (pmd); }static inline pmdval_t pmd_flags (pmd_t pmd)
arch/x86/include/asm/x86_init.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_X86_PLATFORM_H#define _ASM_X86_PLATFORM_H -#include <asm/pgtable_types.h> #include <asm/bootparam.h> struct mpc_bus ;
Signature · 1 line
2.3.5
tip-bot for Kirill A. Shutemov
merge bot[tip:x86/urgent] x86/mm: Fix regression with huge pages on PAE
x86/mm: Fix regression with huge pages on PAE
Commit-ID: 70f1528747651b20c7769d3516ade369f9963237 Gitweb: http://git.kernel.org/tip/70f1528747651b20c7769d3516ade369f9963237 Author: Kirill A. Shutemov <[email protected]> AuthorDate: Mon, 30 Nov 2015 11:10:33 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Fri, 4 Dec 2015 09:14:27 +0100
x86/mm: Fix regression with huge pages on PAE
Recent PAT patchset has caused issue on 32-bit PAE machines:
page:eea45000 count:0 mapcount:-128 mapping: (null) index:0x0 flags: 0x40000000()
page dumped because: VM_BUG_ON_PAGE(page_mapcount(page) < 0) ------------[ cut here ]------------ kernel BUG at /home/build/linux-boris/mm/huge_memory.c:1485! invalid opcode: 0000 [#1] SMP [...] Call Trace: unmap_single_vma ? __wake_up unmap_vmas unmap_region do_munmap vm_munmap SyS_munmap do_fast_syscall_32 ? __do_page_fault sysenter_past_esp Code: ... EIP: [<c11bde80>] zap_huge_pmd+0x240/0x260 SS:ESP 0068:f6459d98
The problem is in pmd_pfn_mask() and pmd_flags_mask(). These helpers use PMD_PAGE_MASK to calculate resulting mask. PMD_PAGE_MASK is 'unsigned long', not 'unsigned long long' as phys_addr_t is on 32-bit PAE (ARCH_PHYS_ADDR_T_64BIT). As a result, the upper bits of resulting mask get truncated.
pud_pfn_mask() and pud_flags_mask() aren't problematic since we don't have PUD page table level on 32-bit systems, but it's reasonable to keep them consistent with PMD counterpart.
Introduce PHYSICAL_PMD_PAGE_MASK and PHYSICAL_PUD_PAGE_MASK in addition to existing PHYSICAL_PAGE_MASK and reworks helpers to use them.
--- arch/x86/boot/boot.h | 1 - arch/x86/boot/video-mode.c | 2 ++ arch/x86/boot/video.c | 2 ++ arch/x86/include/asm/page_types.h | 16 +++++++++------- arch/x86/include/asm/pgtable_types.h | 14 ++++---------- arch/x86/include/asm/x86_init.h | 1 - 6 files changed, 17 insertions(+), 19 deletions(-)
arch/x86/boot/boot.h +0 -1
@@ -23,7 +23,6 @@#include <stdarg.h> #include <linux/types.h> #include <linux/edd.h> -#include <asm/boot.h> #include <asm/setup.h> #include "bitops.h" #include "ctype.h"
arch/x86/boot/video-mode.c +2 -0
@@ -19,6 +19,8 @@#include "video.h" #include "vesa.h" +#include <uapi/asm/boot.h> +/* * Common variables */
arch/x86/boot/video.c +2 -0
@@ -13,6 +13,8 @@* Select video mode */ +#include <uapi/asm/boot.h> +#include "boot.h" #include "video.h" #include "vesa.h"
arch/x86/include/asm/page_types.h +9 -7
@@ -9,19 +9,21 @@#define PAGE_SIZE (_AC(1,UL) << PAGE_SHIFT)#define PAGE_MASK (~(PAGE_SIZE-1)) +#define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) +#define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) + +#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) +#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) +#define __PHYSICAL_MASK ((phys_addr_t)((1ULL << __PHYSICAL_MASK_SHIFT) - 1))#define __VIRTUAL_MASK ((1UL << __VIRTUAL_MASK_SHIFT) - 1) -/* Cast PAGE_MASK to a signed type so that it is sign-extended if +/* Cast *PAGE_MASK to a signed type so that it is sign-extended if virtual addresses are 32-bits but physical addresses are larger (ie, 32-bit PAE). */ #define PHYSICAL_PAGE_MASK (((signed long)PAGE_MASK) & __PHYSICAL_MASK) - -#define PMD_PAGE_SIZE (_AC(1, UL) << PMD_SHIFT) -#define PMD_PAGE_MASK (~(PMD_PAGE_SIZE-1)) - -#define PUD_PAGE_SIZE (_AC(1, UL) << PUD_SHIFT) -#define PUD_PAGE_MASK (~(PUD_PAGE_SIZE-1)) +#define PHYSICAL_PMD_PAGE_MASK (((signed long)PMD_PAGE_MASK) & __PHYSICAL_MASK) +#define PHYSICAL_PUD_PAGE_MASK (((signed long)PUD_PAGE_MASK) & __PHYSICAL_MASK)#define HPAGE_SHIFT PMD_SHIFT#define HPAGE_SIZE (_AC(1,UL) << HPAGE_SHIFT)
arch/x86/include/asm/pgtable_types.h +4 -10
@@ -279,17 +279,14 @@ static inline pmdval_t native_pmd_val(pmd_t pmd)static inline pudval_t pud_pfn_mask (pud_t pud) {if (native_pud_val (pud) & _PAGE_PSE) -return PUD_PAGE_MASK &PHYSICAL_PAGE_MASK ; +return PHYSICAL_PUD_PAGE_MASK ;else return PTE_PFN_MASK ; }static inline pudval_t pud_flags_mask (pud_t pud) { -if (native_pud_val (pud) & _PAGE_PSE) -return ~(PUD_PAGE_MASK & (pudval_t )PHYSICAL_PAGE_MASK ); -else -return ~PTE_PFN_MASK ; +return ~pud_pfn_mask (pud); }static inline pudval_t pud_flags (pud_t pud)
@@ -300,17 +297,14 @@ static inline pudval_t pud_flags(pud_t pud)static inline pmdval_t pmd_pfn_mask (pmd_t pmd) {if (native_pmd_val (pmd) & _PAGE_PSE) -return PMD_PAGE_MASK &PHYSICAL_PAGE_MASK ; +return PHYSICAL_PMD_PAGE_MASK ;else return PTE_PFN_MASK ; }static inline pmdval_t pmd_flags_mask (pmd_t pmd) { -if (native_pmd_val (pmd) & _PAGE_PSE) -return ~(PMD_PAGE_MASK & (pmdval_t )PHYSICAL_PAGE_MASK ); -else -return ~PTE_PFN_MASK ; +return ~pmd_pfn_mask (pmd); }static inline pmdval_t pmd_flags (pmd_t pmd)
arch/x86/include/asm/x86_init.h +0 -1
@@ -1,7 +1,6 @@#ifndef _ASM_X86_PLATFORM_H#define _ASM_X86_PLATFORM_H -#include <asm/pgtable_types.h> #include <asm/bootparam.h> struct mpc_bus ;
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>