From patchwork Tue Oct 27 13:51:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 312458 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 093FDC838BF for ; Tue, 27 Oct 2020 15:47:54 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id C0E3A22283 for ; Tue, 27 Oct 2020 15:47:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813673; bh=Fd7ViidNz2XnheOKTRTAEYjBKTX1LdS1OOPdkcDTOLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=sAZeKK6Ek/2YJ892iIHLQLGcU/H98jONME1nhCZg+Iu6mfsPdSbE95eI90XBXsT5r tmX3PBTEtPqjNQGl3SfMyelK+NevXPnKQC/sryXgsG6bzHt3A4Gql6nI+cjIXLdFya OmwOOqs8rbzzXdg9vz+Alc6NZKMrRgVa4NAyOoSw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764874AbgJ0PrZ (ORCPT ); Tue, 27 Oct 2020 11:47:25 -0400 Received: from mail.kernel.org ([198.145.29.99]:58826 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1801272AbgJ0PjY (ORCPT ); Tue, 27 Oct 2020 11:39:24 -0400 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8742C2225E; Tue, 27 Oct 2020 15:39:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603813164; bh=Fd7ViidNz2XnheOKTRTAEYjBKTX1LdS1OOPdkcDTOLo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kgv7Qhxgn+6JrhP2HhY683EfLZu9GeiKtDyxqiWrp9lIxBHYDE1wqqkMXJ9gXT2Ls igMQma2tOyBJZWJshRTcHpkOAGH7Ndfro7ThP4kTK7u6xlLA2d84gG91Odnm38kTl1 8tfO8RJr6vhZarHlkuvEVBvJiGIWLVACMjTSgaQM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Ravi Bangoria , Michael Ellerman , Sasha Levin Subject: [PATCH 5.9 441/757] powerpc/watchpoint: Fix handling of vector instructions Date: Tue, 27 Oct 2020 14:51:31 +0100 Message-Id: <20201027135511.224104960@linuxfoundation.org> X-Mailer: git-send-email 2.29.1 In-Reply-To: <20201027135450.497324313@linuxfoundation.org> References: <20201027135450.497324313@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Ravi Bangoria [ 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 Signed-off-by: Michael Ellerman Link: https://lore.kernel.org/r/20200902042945.129369-3-ravi.bangoria@linux.ibm.com Signed-off-by: Sasha Levin --- arch/powerpc/kernel/hw_breakpoint.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/powerpc/kernel/hw_breakpoint.c b/arch/powerpc/kernel/hw_breakpoint.c index 9f7df1c372330..f6b24838ca3c0 100644 --- a/arch/powerpc/kernel/hw_breakpoint.c +++ b/arch/powerpc/kernel/hw_breakpoint.c @@ -644,6 +644,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); } }