diff options
| author | Mark Rutland <mark.rutland@arm.com> | 2019-10-16 13:03:04 +0200 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-10-16 18:58:03 +0200 |
| commit | 3813733595c0c7c0674d106309b04e871d54dc1c (patch) | |
| tree | b564e9f16039b244535dbc9d2c24e930dafb4fc7 /arch/arm64/mm/fault.c | |
| parent | arm64: sysreg: fix incorrect definition of SYS_PAR_EL1_F (diff) | |
| download | linux-3813733595c0c7c0674d106309b04e871d54dc1c.tar.xz linux-3813733595c0c7c0674d106309b04e871d54dc1c.zip | |
arm64: mm: fix inverted PAR_EL1.F check
When detecting a spurious EL1 translation fault, we have the CPU retry
the translation using an AT S1E1R instruction, and inspect PAR_EL1 to
determine if the fault was spurious.
When PAR_EL1.F == 0, the AT instruction successfully translated the
address without a fault, which implies the original fault was spurious.
However, in this case we return false and treat the original fault as if
it was not spurious.
Invert the return value so that we treat such a case as spurious.
Cc: Catalin Marinas <catalin.marinas@arm.com>
Fixes: 42f91093b043 ("arm64: mm: Ignore spurious translation faults taken from the kernel")
Tested-by: James Morse <james.morse@arm.com>
Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Will Deacon <will@kernel.org>
Diffstat (limited to 'arch/arm64/mm/fault.c')
| -rw-r--r-- | arch/arm64/mm/fault.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 855f2a7954e6..9fc6db0bcbad 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -268,8 +268,12 @@ static bool __kprobes is_spurious_el1_translation_fault(unsigned long addr, par = read_sysreg(par_el1); local_irq_restore(flags); + /* + * If we now have a valid translation, treat the translation fault as + * spurious. + */ if (!(par & SYS_PAR_EL1_F)) - return false; + return true; /* * If we got a different type of fault from the AT instruction, |