]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
sparc64: Fix page table walk for PUD hugepages
authorNitin Gupta <nitin.m.gupta@oracle.com>
Fri, 3 Nov 2017 19:26:06 +0000 (12:26 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 15 Nov 2017 05:37:43 +0000 (14:37 +0900)
For a PUD hugepage entry, we need to propagate bits [32:22]
from virtual address to resolve at 4M granularity. However,
the current code was incorrectly propagating bits [29:19].
This bug can cause incorrect data to be returned for pages
backed with 16G hugepages.

Signed-off-by: Nitin Gupta <nitin.m.gupta@oracle.com>
Reported-by: Al Viro <viro@ZenIV.linux.org.uk>
Cc: Al Viro <viro@ZenIV.linux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
arch/sparc/include/asm/tsb.h

index acf55063aa3dd9ae66bc1f7760782a84404d03f8..ca0de1646f1ede087bc60349f94acd39af7bf1dc 100644 (file)
@@ -216,7 +216,7 @@ extern struct tsb_phys_patch_entry __tsb_phys_patch, __tsb_phys_patch_end;
        sllx            REG2, 32, REG2;                 \
        andcc           REG1, REG2, %g0;                \
        be,pt           %xcc, 700f;                     \
-        sethi          %hi(0x1ffc0000), REG2;          \
+        sethi          %hi(0xffe00000), REG2;          \
        sllx            REG2, 1, REG2;                  \
        brgez,pn        REG1, FAIL_LABEL;               \
         andn           REG1, REG2, REG1;               \