x86_64: CPA, fix cache attribute inconsistency bug
cover x86_64: CPA, fix cache attribute inconsistency bug
the following 3 patches are the backports to 2.6.22, 2.6.23 and 2.6.24 of a CPA bug we found while writing 2.6.25's new CPA code.
the bug affects the 64-bit kernel on two popular Linux distros, Fedora and Ubuntu:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8
CONFIG_RELOCATABLE=y $ grep RELOC /boot/config-2.6.22-14-generic
CONFIG_RELOCATABLE=yhavent checked more.
(There are no upstream commits for this because this code is not present in the new code.)
Ingo
PATCH 1/3 x86_64: CPA, fix cache attribute inconsistency bug, v2.6.22 backport
fix CPA cache attribute bug in v2.6.23. When phys_base is nonzero (when CONFIG_RELOCATABLE=y) then change_page_attr_addr() miscalculates the secondary alias address by -14 MB (depending on the configured offset).
The default 64-bit kernels of Fedora and Ubuntu are affected:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8
CONFIG_RELOCATABLE=y $ grep RELOC /boot/config-2.6.22-14-generic
CONFIG_RELOCATABLE=yand probably on many other distros as well.
the bug affects all pages in the first 40 MB of physical RAM that are allocated by some subsystem that does ioremap_nocache() on them:
if (__pa(address) < KERNEL_TEXT_SIZE) {Hence we might leave page table entries with inconsistent cache attributes around (pages mapped at both UnCacheable and Write-Back), and we can also set the wrong kernel text pages to UnCacheable.
the effects of this bug can be random slowdowns and other misbehavior. If for example AGP allocates its aperture pages into the first 40 MB of physical RAM, then the -14 MB bug might mark random kernel texto pages as uncacheable, slowing down a random portion of the 64-bit kernel until the AGP driver is unloaded.
--- arch/x86_64/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86_64/mm/pageattr.c +1 -1
@@ -204,7 +204,7 @@ int change_page_attr_addr(unsigned longif (__pa (address) <KERNEL_TEXT_SIZE ) {unsigned long addr2;pgprot_t prot2; - addr2 = __START_KERNEL_map +__pa (address); + addr2 = __START_KERNEL_map +__pa (address) - phys_base;/* Make sure the kernel mappings stay executable */ prot2 =pte_pgprot (pte_mkexec (pfn_pte (0 , prot))); err = __change_page_attr(addr2, pfn, prot2,
Re: [patch 1/3] x86_64: CPA, fix cache attribute inconsistency bug, v2.6.22 backport
correction:
Quoted 1 line
fix CPA cache attribute bug in v2.6.23. When
phys_baseis nonzero
v2.6.22
(the text says .23 but the fix is correctly against .22)
Ingo
Re: [patch 1/3] x86_64: CPA, fix cache attribute inconsistency bug, v2.6.22 backport
In reply to Ingo Molnarhi Ingo,
thx add to http://repo.or.cz/w/linux-2.6.22.y-op.git testing ;)
Quoted 51 lines · Ingo Molnar
fix CPA cache attribute bug in v2.6.23. When
phys_baseis nonzero (whenCONFIG_RELOCATABLE=y) thenchange_page_attr_addr()miscalculates the secondary alias address by -14 MB (depending on the configured offset).The default 64-bit kernels of Fedora and Ubuntu are affected:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8 CONFIG_RELOCATABLE=y$ grep RELOC /boot/config-2.6.22-14-generic CONFIG_RELOCATABLE=yand probably on many other distros as well.
the bug affects all pages in the first 40 MB of physical RAM that are allocated by some subsystem that does
ioremap_nocache()on them:if (
__pa(address)<KERNEL_TEXT_SIZE) {Hence we might leave page table entries with inconsistent cache attributes around (pages mapped at both UnCacheable and Write-Back), and we can also set the wrong kernel text pages to UnCacheable.
the effects of this bug can be random slowdowns and other misbehavior. If for example AGP allocates its aperture pages into the first 40 MB of physical RAM, then the -14 MB bug might mark random kernel texto pages as uncacheable, slowing down a random portion of the 64-bit kernel until the AGP driver is unloaded.
Signed-off-by Ingo Molnar <[email protected]>Acked-by Thomas Gleixner <[email protected]>---
arch/x86_64/mm/pageattr.c| 2 +-1 file changed, 1 insertion(+), 1 deletion(-)Index:
linux-tmp/arch/x86_64/mm/pageattr.c
===================================================================arch/x86_64/mm/pageattr.c +1
-2@@ -204,7 +204,7 @@ int change_page_attr_addr(unsigned longif (__pa (address) <KERNEL_TEXT_SIZE ) {unsigned long addr2;pgprot_t prot2; - addr2 = __START_KERNEL_map +__pa (address); + addr2 = __START_KERNEL_map +__pa (address) - phys_base;/* Make sure the kernel mappings stay executable */ prot2 =pte_pgprot (pte_mkexec (pfn_pte (0 , prot))); err = __change_page_attr(addr2, pfn, prot2, --
Quoted 5 lines
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
--
Thanks,
Oliver
Re: [patch 1/3] x86_64: CPA, fix cache attribute inconsistency bug, v2.6.22 backport
In reply to Ingo MolnarQuoted 42 lines · Ingo Molnar
fix CPA cache attribute bug in v2.6.23. When
phys_baseis nonzero (whenCONFIG_RELOCATABLE=y) thenchange_page_attr_addr()miscalculates the secondary alias address by -14 MB (depending on the configured offset).The default 64-bit kernels of Fedora and Ubuntu are affected:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8 CONFIG_RELOCATABLE=y$ grep RELOC /boot/config-2.6.22-14-generic CONFIG_RELOCATABLE=yand probably on many other distros as well.
the bug affects all pages in the first 40 MB of physical RAM that are allocated by some subsystem that does
ioremap_nocache()on them:if (__pa(address) < KERNEL_TEXT_SIZE) {Hence we might leave page table entries with inconsistent cache attributes around (pages mapped at both UnCacheable and Write-Back), and we can also set the wrong kernel text pages to UnCacheable.
the effects of this bug can be random slowdowns and other misbehavior. If for example AGP allocates its aperture pages into the first 40 MB of physical RAM, then the -14 MB bug might mark random kernel texto pages as uncacheable, slowing down a random portion of the 64-bit kernel until the AGP driver is unloaded.
Signed-off-by Ingo Molnar <[email protected]>Acked-by Thomas Gleixner <[email protected]>--- arch/x86_64/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Index:
linux-tmp/arch/x86_64/mm/pageattr.c
===================================================================
arch/x86_64/mm/pageattr.c int change_page_attr_addr(unsigned long · line 204
Quoted 1 line
arch/x86_64/mm/pageattr.c +0
-0@@ -204,7 +204,7 @@ int change_page_attr_addr(unsigned longif (__pa (address) <KERNEL_TEXT_SIZE ) {
Hi Ingo,
Should we change above condition also to something like following.
kernel_phys_start = __pa(__START_KERNEL_map) + phys_base kernel_phys_end = kernel_phys_start + KERNEL_TEXT_SIZE
if (__pa(address) >= kernel_phys_start
&& __pa(address) <= kernel_phys_end)
Looks like we are trying to see if a physical page has been mapped by kernel text/data region also then change the caching attributes there too.
In case of relocatable kernel, not necessarily first 40MB will be mapped by the kernel text/data region, If boot loader decides to load kernel at a higher address and phys_base is non-zero.
Thanks
Vivek
Re: [patch 1/3] x86_64: CPA, fix cache attribute inconsistency bug, v2.6.22 backport
Quoted 47 lines · Vivek Goyal
Quoted 42 lines · Ingo Molnar
fix CPA cache attribute bug in v2.6.23. When
phys_baseis nonzero (whenCONFIG_RELOCATABLE=y) thenchange_page_attr_addr()miscalculates the secondary alias address by -14 MB (depending on the configured offset).The default 64-bit kernels of Fedora and Ubuntu are affected:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8 CONFIG_RELOCATABLE=y$ grep RELOC /boot/config-2.6.22-14-generic CONFIG_RELOCATABLE=yand probably on many other distros as well.
the bug affects all pages in the first 40 MB of physical RAM that are allocated by some subsystem that does
ioremap_nocache()on them:if (__pa(address) < KERNEL_TEXT_SIZE) {Hence we might leave page table entries with inconsistent cache attributes around (pages mapped at both UnCacheable and Write-Back), and we can also set the wrong kernel text pages to UnCacheable.
the effects of this bug can be random slowdowns and other misbehavior. If for example AGP allocates its aperture pages into the first 40 MB of physical RAM, then the -14 MB bug might mark random kernel texto pages as uncacheable, slowing down a random portion of the 64-bit kernel until the AGP driver is unloaded.
Signed-off-by Ingo Molnar <[email protected]>Acked-by Thomas Gleixner <[email protected]>--- arch/x86_64/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)Index:
linux-tmp/arch/x86_64/mm/pageattr.c
===================================================================arch/x86_64/mm/pageattr.c int change_page_attr_addr(unsigned long · line 204
Quoted 1 line
arch/x86_64/mm/pageattr.c +0
-0@@ -204,7 +204,7 @@ int change_page_attr_addr(unsigned longif (__pa (address) <KERNEL_TEXT_SIZE ) {Hi Ingo,
Quoted 3 lines
Should we change above condition also to something like following.
kernel_phys_start=__pa(__START_KERNEL_map)+phys_base
Oops. Just noticed that __pa() is already taking care of adding phys_base. So it should probably be.
kernel_phys_start = __pa(__START_KERNEL_map); kernel_phys_end = kernel_phys_start + KERNEL_TEXT_SIZE;
if (__pa(address) >= kernel_phys_start
&& __pa(address) <= kernel_phys_end)
Thanks
Vivek
PATCH 2/3 x86_64: CPA, fix cache attribute inconsistency bug, v2.6.23 backport
In reply to Ingo Molnarfix CPA cache attribute bug in v2.6.23. When phys_base is nonzero (when CONFIG_RELOCATABLE=y) then change_page_attr_addr() miscalculates the secondary alias address by -14 MB (depending on the configured offset).
The default 64-bit kernels of Fedora and Ubuntu are affected:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8
CONFIG_RELOCATABLE=y $ grep RELOC /boot/config-2.6.22-14-generic
CONFIG_RELOCATABLE=yand probably on many other distros as well.
the bug affects all pages in the first 40 MB of physical RAM that are allocated by some subsystem that does ioremap_nocache() on them:
if (__pa(address) < KERNEL_TEXT_SIZE) {Hence we might leave page table entries with inconsistent cache attributes around (pages mapped at both UnCacheable and Write-Back), and we can also set the wrong kernel text pages to UnCacheable.
the effects of this bug can be random slowdowns and other misbehavior. If for example AGP allocates its aperture pages into the first 40 MB of physical RAM, then the -14 MB bug might mark random kernel texto pages as uncacheable, slowing down a random portion of the 64-bit kernel until the AGP driver is unloaded.
--- arch/x86_64/mm/pageattr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86_64/mm/pageattr.c +1 -1
@@ -206,7 +206,7 @@ int change_page_attr_addr(unsigned longif (__pa (address) <KERNEL_TEXT_SIZE ) {unsigned long addr2;pgprot_t prot2; - addr2 = __START_KERNEL_map +__pa (address); + addr2 = __START_KERNEL_map +__pa (address) - phys_base;/* Make sure the kernel mappings stay executable */ prot2 =pte_pgprot (pte_mkexec (pfn_pte (0 , prot))); err = __change_page_attr(addr2, pfn, prot2,
PATCH 3/3 x86_64: CPA, fix cache attribute inconsistency bug, v2.6.24 backport
In reply to Ingo Molnarfix CPA cache attribute bug in v2.6.24. When phys_base is nonzero (when CONFIG_RELOCATABLE=y) then change_page_attr_addr() miscalculates the secondary alias address by -14 MB (depending on the configured offset).
The default 64-bit kernels of Fedora and Ubuntu are affected:
$ grep RELOCA /boot/config-2.6.23.9-85.fc8
CONFIG_RELOCATABLE=y $ grep RELOC /boot/config-2.6.22-14-generic
CONFIG_RELOCATABLE=yand probably on many other distros as well.
the bug affects all pages in the first 40 MB of physical RAM that are allocated by some subsystem that does ioremap_nocache() on them:
if (__pa(address) < KERNEL_TEXT_SIZE) {Hence we might leave page table entries with inconsistent cache attributes around (pages mapped at both UnCacheable and Write-Back), and we can also set the wrong kernel text pages to UnCacheable.
the effects of this bug can be random slowdowns and other misbehavior. If for example AGP allocates its aperture pages into the first 40 MB of physical RAM, then the -14 MB bug might mark random kernel texto pages as uncacheable, slowing down a random portion of the 64-bit kernel until the AGP driver is unloaded.
--- arch/x86/mm/pageattr_64.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/mm/pageattr_64.c +1 -1
@@ -207,7 +207,7 @@ int change_page_attr_addr(unsigned longif (__pa (address) <KERNEL_TEXT_SIZE ) {unsigned long addr2;pgprot_t prot2; - addr2 = __START_KERNEL_map +__pa (address); + addr2 = __START_KERNEL_map +__pa (address) - phys_base;/* Make sure the kernel mappings stay executable */ prot2 =pte_pgprot (pte_mkexec (pfn_pte (0 , prot))); err = __change_page_attr(addr2, pfn, prot2,