]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
powerpc/watchpoint: Fix handling of vector instructions
authorRavi Bangoria <ravi.bangoria@linux.ibm.com>
Wed, 2 Sep 2020 04:29:39 +0000 (09:59 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 29 Oct 2020 09:07:56 +0000 (10:07 +0100)
[ Upstream commit 4441eb02333a9b46a0d919aa7a6d3b137b5f2562 ]

Vector load/store instructions are special because they are always
aligned. Thus unaligned EA needs to be aligned down before comparing
it with watch ranges. Otherwise we might consider valid event as
invalid.

Fixes: 74c6881019b7 ("powerpc/watchpoint: Prepare handler to handle more than one watchpoint")
Signed-off-by: Ravi Bangoria <ravi.bangoria@linux.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/20200902042945.129369-3-ravi.bangoria@linux.ibm.com
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/powerpc/kernel/hw_breakpoint.c

index f39e86d7511446885e37b007608bbf79320f76fa..2190be70c7fd995fa0f90de21e838c374688ab8c 100644 (file)
@@ -643,6 +643,8 @@ static void get_instr_detail(struct pt_regs *regs, struct ppc_inst *instr,
        if (*type == CACHEOP) {
                *size = cache_op_size();
                *ea &= ~(*size - 1);
+       } else if (*type == LOAD_VMX || *type == STORE_VMX) {
+               *ea &= ~(*size - 1);
        }
 }