From mboxrd@z Thu Jan 1 00:00:00 1970 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=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED 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 70379C3A5A9 for ; Tue, 5 May 2020 02:20:44 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id C962B206B9 for ; Tue, 5 May 2020 02:20:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C962B206B9 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=popple.id.au Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from bilbo.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 49GNk05WL3zDqXX for ; Tue, 5 May 2020 12:20:40 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [203.11.71.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49GNhB0Lz1zDqWh for ; Tue, 5 May 2020 12:19:06 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=popple.id.au Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 49GNh91dPKz9sSx; Tue, 5 May 2020 12:19:05 +1000 (AEST) From: Alistair Popple To: Jordan Niethe Subject: Re: [PATCH v7 19/28] powerpc/xmon: Move insertion of breakpoint for xol'ing Date: Tue, 05 May 2020 12:19:04 +1000 Message-ID: <2015143.6yaIr3PIRM@townsend> In-Reply-To: <20200501034220.8982-20-jniethe5@gmail.com> References: <20200501034220.8982-1-jniethe5@gmail.com> <20200501034220.8982-20-jniethe5@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: npiggin@gmail.com, bala24@linux.ibm.com, naveen.n.rao@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, dja@axtens.net Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" I can't see any side-effects from patching both instructions at the same time. Reviewed-by: Alistair Popple On Friday, 1 May 2020 1:42:11 PM AEST Jordan Niethe wrote: > When a new breakpoint is created, the second instruction of that > breakpoint is patched with a trap instruction. This assumes the length > of the instruction is always the same. In preparation for prefixed > instructions, remove this assumption. Insert the trap instruction at the > same time the first instruction is inserted. > > Signed-off-by: Jordan Niethe > --- > arch/powerpc/xmon/xmon.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c > index 1947821e425d..fb2563079046 100644 > --- a/arch/powerpc/xmon/xmon.c > +++ b/arch/powerpc/xmon/xmon.c > @@ -878,7 +878,6 @@ static struct bpt *new_breakpoint(unsigned long a) > if (!bp->enabled && atomic_read(&bp->ref_count) == 0) { > bp->address = a; > bp->instr = (void *)(bpt_table + ((bp - bpts) * BPT_WORDS)); > - patch_instruction(bp->instr + 1, ppc_inst(bpinstr)); > return bp; > } > } > @@ -910,6 +909,7 @@ static void insert_bpts(void) > continue; > } > patch_instruction(bp->instr, instr); > + patch_instruction((void *)bp->instr + ppc_inst_len(instr), > ppc_inst(bpinstr)); if (bp->enabled & BP_CIABR) > continue; > if (patch_instruction((struct ppc_inst *)bp->address,