mm: pageattr: convert noop to functional fix
PATCH 1/1 mm: pageattr: convert noop to functional fix
Commit a8aed3e0752b4beb2e37cbed6df69faae88268da introduced some valid fix but one location that didn't trigger the bug that lead to finding those (small) problems, wasn't updated using the right variable.
The wrong variable was also initialized for no good reason, that may have been the source of the confusion. Remove the noop initialization accordingly.
Commit a8aed3e0752b4beb2e37cbed6df69faae88268da also erroneously removed one canon_pgprot pass meant to clear pmd bitflags not supported in hardware by older CPUs, that automatically gets corrected by this patch too by applying it to the right variable in the new location.
--- arch/x86/mm/pageattr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/mm/pageattr.c +5 -5
@@ -467,7 +467,7 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,* We are safe now. Check whether the new pgprot is the same: */ old_pte = *kpte; - old_prot = new_prot = req_prot =pte_pgprot (old_pte); + old_prot = req_prot =pte_pgprot (old_pte);pgprot_val (req_prot) &= ~pgprot_val (cpa->mask_clr);pgprot_val (req_prot) |=pgprot_val (cpa->mask_set);
@@ -478,12 +478,12 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,* a non present pmd. The canon_pgprot will clear _PAGE_GLOBAL * for the ancient hardware that doesn't support it. */ -if (pgprot_val (new_prot) & _PAGE_PRESENT) -pgprot_val (new_prot) |= _PAGE_PSE | _PAGE_GLOBAL; +if (pgprot_val (req_prot) & _PAGE_PRESENT) +pgprot_val (req_prot) |= _PAGE_PSE | _PAGE_GLOBAL;else -pgprot_val (new_prot) &= ~(_PAGE_PSE | _PAGE_GLOBAL); +pgprot_val (req_prot) &= ~(_PAGE_PSE | _PAGE_GLOBAL); - new_prot =canon_pgprot (new_prot); + req_prot =canon_pgprot (req_prot);/* * old_pte points to the large page base address. So we need
Quoted 8 lines · Andrea Arcangeli
Commit
a8aed3e0752b4beb2e37cbed6df69faae88268daintroduced some valid fix but one location that didn't trigger the bug that lead to finding those (small) problems, wasn't updated using the right variable.The wrong variable was also initialized for no good reason, that may have been the source of the confusion. Remove the noop initialization accordingly.
Quoted 8 lines
Commit
a8aed3e0752b4beb2e37cbed6df69faae88268daalso erroneously removed onecanon_pgprotpass meant to clear pmd bitflags not supported in hardware by older CPUs, that automatically gets corrected by this patch too by applying it to the right variable in the new location.Reported-by Stefan Bader <[email protected]>Signed-off-by Andrea Arcangeli <[email protected]>
Signature · 5 lines
Regards/Gruss,
Boris.
Sent from a fat crate under my desk. Formatting is fine.
--tip-bot for Andrea Arcangeli
merge bot[tip:x86/urgent] x86/mm/cpa: Convert noop to functional fix
In reply to Andrea Arcangelix86/mm/cpa: Convert noop to functional fix
Commit-ID: f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Gitweb: http://git.kernel.org/tip/f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Author: Andrea Arcangeli <[email protected]> AuthorDate: Wed, 10 Apr 2013 15:28:25 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 11 Apr 2013 10:34:42 +0200
x86/mm/cpa: Convert noop to functional fix
Commit:
a8aed3e0752b ("x86/mm/pageattr: Prevent PSE and GLOABL leftovers to confuse pmd/pte_present and pmd_huge")
introduced a valid fix but one location that didn't trigger the bug that lead to finding those (small) problems, wasn't updated using the right variable.
The wrong variable was also initialized for no good reason, that may have been the source of the confusion. Remove the noop initialization accordingly.
Commit a8aed3e0752b also erroneously removed one canon_pgprot pass meant to clear pmd bitflags not supported in hardware by older CPUs, that automatically gets corrected by this patch too by applying it to the right variable in the new location.
--- arch/x86/mm/pageattr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
arch/x86/mm/pageattr.c +5 -5
@@ -467,7 +467,7 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,* We are safe now. Check whether the new pgprot is the same: */ old_pte = *kpte; - old_prot = new_prot = req_prot =pte_pgprot (old_pte); + old_prot = req_prot =pte_pgprot (old_pte);pgprot_val (req_prot) &= ~pgprot_val (cpa->mask_clr);pgprot_val (req_prot) |=pgprot_val (cpa->mask_set);
@@ -478,12 +478,12 @@ try_preserve_large_page(pte_t *kpte, unsigned long address,* a non present pmd. The canon_pgprot will clear _PAGE_GLOBAL * for the ancient hardware that doesn't support it. */ -if (pgprot_val (new_prot) & _PAGE_PRESENT) -pgprot_val (new_prot) |= _PAGE_PSE | _PAGE_GLOBAL; +if (pgprot_val (req_prot) & _PAGE_PRESENT) +pgprot_val (req_prot) |= _PAGE_PSE | _PAGE_GLOBAL;else -pgprot_val (new_prot) &= ~(_PAGE_PSE | _PAGE_GLOBAL); +pgprot_val (req_prot) &= ~(_PAGE_PSE | _PAGE_GLOBAL); - new_prot =canon_pgprot (new_prot); + req_prot =canon_pgprot (req_prot);/* * old_pte points to the large page base address. So we need
Re: [tip:x86/urgent] x86/mm/cpa: Convert noop to functional fix
Quoted 8 lines · tip-bot for Andrea Arcangeli
Commit-ID: f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Gitweb: http://git.kernel.org/tip/f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Author: Andrea Arcangeli <[email protected]> AuthorDate: Wed, 10 Apr 2013 15:28:25 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 11 Apr 2013 10:34:42 +0200x86/mm/cpa: Convert noop to functional fix
I think it's this commit that causes the following cpa-selftest failure:
CPA self-test:ffff880038000000 level 2 but not PSE 8000000038000062 ffff880038200000 level 2 but not PSE 8000000038200062 ffff880038400000 level 2 but not PSE 8000000038400062 ffff880038600000 level 2 but not PSE 8000000038600062 ffff880038800000 level 2 but not PSE 8000000038800062 ffff880038a00000 level 2 but not PSE 8000000038a00062 ffff880038c00000 level 2 but not PSE 8000000038c00062 ffff880038e00000 level 2 but not PSE 8000000038e00062
...
4k 134128 large 250 gb 0 x 1[ffff88000009a000-ffff88000009a000] miss 0
------------[ cut here ]------------ WARNING: at arch/x86/mm/pageattr-test.c:226 pageattr_test+0x3e1/0x410() NOT PASSED. Please report. Pid: 32, comm: pageattr-test Not tainted 3.9.0-rc6+ #222036 Call Trace: [<ffffffff8104fdd3>] warn_slowpath_common+0x62/0x7b [<ffffffff8104fe5a>] warn_slowpath_fmt+0x46/0x48 [<ffffffff8102b3d9>] ? lookup_address+0xad/0x127 [<ffffffff8102c766>] pageattr_test+0x3e1/0x410 [<ffffffff8102c795>] ? pageattr_test+0x410/0x410 [<ffffffff8102c7af>] do_pageattr_test+0x1a/0x3d [<ffffffff81070a8d>] kthread+0xa2/0xaa [<ffffffff810709eb>] ? __kthread_parkme+0x65/0x65 [<ffffffff81aad73c>] ret_from_fork+0x7c/0xb0 [<ffffffff810709eb>] ? __kthread_parkme+0x65/0x65 ---[ end trace 582fec3a45bb42b7 ]---
device: 'vcs2': device_add
Thanks,
Ingo
Re: [tip:x86/urgent] x86/mm/cpa: Convert noop to functional fix
Hi,
Quoted 44 lines · Ingo Molnar
Quoted 8 lines · tip-bot for Andrea Arcangeli
Commit-ID: f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Gitweb: http://git.kernel.org/tip/f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Author: Andrea Arcangeli <[email protected]> AuthorDate: Wed, 10 Apr 2013 15:28:25 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 11 Apr 2013 10:34:42 +0200x86/mm/cpa: Convert noop to functional fix
I think it's this commit that causes the following cpa-selftest failure:
CPA self-test:
ffff880038000000level 2 but not PSE 8000000038000062ffff880038200000level 2 but not PSE 8000000038200062ffff880038400000level 2 but not PSE 8000000038400062ffff880038600000level 2 but not PSE 8000000038600062ffff880038800000level 2 but not PSE 8000000038800062ffff880038a00000level 2 but not PSE8000000038a00062ffff880038c00000level 2 but not PSE8000000038c00062ffff880038e00000level 2 but not PSE8000000038e00062...
4k 134128 large 250 gb 0 x 1[ffff88000009a000-ffff88000009a000] miss 0
------------[ cut here ]------------ WARNING: at arch/x86/mm/pageattr-test.c:226 pageattr_test+0x3e1/0x410() NOT PASSED. Please report. Pid: 32, comm: pageattr-test Not tainted 3.9.0-rc6+ #222036 Call Trace: [<ffffffff8104fdd3>] warn_slowpath_common+0x62/0x7b [<ffffffff8104fe5a>] warn_slowpath_fmt+0x46/0x48 [<ffffffff8102b3d9>] ? lookup_address+0xad/0x127 [<ffffffff8102c766>] pageattr_test+0x3e1/0x410 [<ffffffff8102c795>] ? pageattr_test+0x410/0x410 [<ffffffff8102c7af>] do_pageattr_test+0x1a/0x3d [<ffffffff81070a8d>] kthread+0xa2/0xaa [<ffffffff810709eb>] ? __kthread_parkme+0x65/0x65 [<ffffffff81aad73c>] ret_from_fork+0x7c/0xb0 [<ffffffff810709eb>] ? __kthread_parkme+0x65/0x65 ---[ end trace 582fec3a45bb42b7 ]---
Quoted 1 line
device: 'vcs2':
device_add
This looks a warning resulting from a false positive in the CPA self test, not a bug in f76cfa3c2496c462b5bc01bd0c9340c2715b73ca. I'll send a patch to correct it. I can't reproduce it here so it would be great if you could test the fix on your system above to verify.
Thanks,
Andrea
Re: [tip:x86/urgent] x86/mm/cpa: Convert noop to functional fix
Quoted 49 lines · Andrea Arcangeli
Hi,
Quoted 44 lines · Ingo Molnar
Quoted 8 lines · tip-bot for Andrea Arcangeli
Commit-ID: f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Gitweb: http://git.kernel.org/tip/f76cfa3c2496c462b5bc01bd0c9340c2715b73ca Author: Andrea Arcangeli <[email protected]> AuthorDate: Wed, 10 Apr 2013 15:28:25 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Thu, 11 Apr 2013 10:34:42 +0200x86/mm/cpa: Convert noop to functional fix
I think it's this commit that causes the following cpa-selftest failure:
CPA self-test:
ffff880038000000level 2 but not PSE 8000000038000062ffff880038200000level 2 but not PSE 8000000038200062ffff880038400000level 2 but not PSE 8000000038400062ffff880038600000level 2 but not PSE 8000000038600062ffff880038800000level 2 but not PSE 8000000038800062ffff880038a00000level 2 but not PSE8000000038a00062ffff880038c00000level 2 but not PSE8000000038c00062ffff880038e00000level 2 but not PSE8000000038e00062...
4k 134128 large 250 gb 0 x 1[ffff88000009a000-ffff88000009a000] miss 0
------------[ cut here ]------------ WARNING: at arch/x86/mm/pageattr-test.c:226 pageattr_test+0x3e1/0x410() NOT PASSED. Please report. Pid: 32, comm: pageattr-test Not tainted 3.9.0-rc6+ #222036 Call Trace: [<ffffffff8104fdd3>] warn_slowpath_common+0x62/0x7b [<ffffffff8104fe5a>] warn_slowpath_fmt+0x46/0x48 [<ffffffff8102b3d9>] ? lookup_address+0xad/0x127 [<ffffffff8102c766>] pageattr_test+0x3e1/0x410 [<ffffffff8102c795>] ? pageattr_test+0x410/0x410 [<ffffffff8102c7af>] do_pageattr_test+0x1a/0x3d [<ffffffff81070a8d>] kthread+0xa2/0xaa [<ffffffff810709eb>] ? __kthread_parkme+0x65/0x65 [<ffffffff81aad73c>] ret_from_fork+0x7c/0xb0 [<ffffffff810709eb>] ? __kthread_parkme+0x65/0x65 ---[ end trace 582fec3a45bb42b7 ]---Quoted 1 line
device: 'vcs2':
device_add
Quoted 4 lines
This looks a warning resulting from a false positive in the CPA self test, not a bug in
f76cfa3c2496c462b5bc01bd0c9340c2715b73ca. I'll send a patch to correct it. I can't reproduce it here so it would be great if you could test the fix on your system above to verify.
Will do, thanks Andrea!
Ingo