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=-3.3 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=no 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 22BC8C433E0 for ; Thu, 14 May 2020 10:36:10 +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 CD3D82053B for ; Thu, 14 May 2020 10:36:08 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="iftLrCoz" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CD3D82053B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com 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 49N7HT2V4DzDqgk for ; Thu, 14 May 2020 20:36:05 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gmail.com (client-ip=2607:f8b0:4864:20::242; helo=mail-oi1-x242.google.com; envelope-from=jniethe5@gmail.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=iftLrCoz; dkim-atps=neutral Received: from mail-oi1-x242.google.com (mail-oi1-x242.google.com [IPv6:2607:f8b0:4864:20::242]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 49N7F93ykfzDqYY for ; Thu, 14 May 2020 20:34:03 +1000 (AEST) Received: by mail-oi1-x242.google.com with SMTP id i22so7521524oik.10 for ; Thu, 14 May 2020 03:34:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc:content-transfer-encoding; bh=VW1ZcPtkKoqPfUT7YLRWwNtYnplsIrvH38qw5CZtzVw=; b=iftLrCozb8GoD8dSGe8jO+jkjb/ZlM2eKJfCLNILLDh/f+T1SiGJKgVyMz5lWakzGQ CkWYtC4rQnYRtxeLta9xofYp/7PAT7OvXTpfZ6Wss+KkVyIdr9Cd4Z91WZa8BzB4Lvfg VXJok0VSqv7o4Bw2f1dX+PjswiIrYnMJmMHeTh7b3x3AgjK+vpXAPJ4ETE2PS0QSQu3F d9EUoKmtazJrTKqinIBczs7tf8rEkYmvVUvVhUG4vvf46AtfCCu6Q9ljc5tLnGwsmFht crdGch5k75i7ITkVml8tgWLV5YL33rqygBPBW/9a815udRcQ9GUExMFnM/6AmveucCgk yqHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=VW1ZcPtkKoqPfUT7YLRWwNtYnplsIrvH38qw5CZtzVw=; b=ezjj6zOq+NHfTW9dUUvObmvuXOSp92ektCV1zsF2ny5WSH1H7VXiyJxeIkLvMLce0y HFubTzKkAaVgnTU40Z1gRStXHT152YHzfE/ffcf65gQSqq0aEeeh0fIzAc4/6Jja9Kgt 2HX3Uj0A0f3BDg7pXsX70+HtWz4r6E6tNxR1uV0Dg4IplQGPuGAExydFQ0/5rNap4Q7C fmlp+RTGYeDdvD0JbOXvuMnTvk50Zvzwl9Jx78N8VR3XqGEct+Yp2uxZkcYj8FSmiGsd U/SXF+Lu43eDZq84rsAC9DQdr9g06GqG66ITZ//CwdntdnknJxU6RxRxYGiMGcUn/TQ8 yQlg== X-Gm-Message-State: AGi0Puar8XMOqr483H4Sj8Yn6S5PMS9j9lAdmTZ7RFuhtfzMG/6CMCqb rPSjD7zy8HsphR94CoE8vMftSwm49bKsQu+wX28= X-Google-Smtp-Source: APiQypLhNnLzLNhJqknOwT1X0LrD2rODZhXH+gpDHuJC+UTksErTQ1M1a131U8JT9XBX6S2dHHdBM+h9Zj+ssGPcdDw= X-Received: by 2002:a05:6808:3d5:: with SMTP id o21mr31515953oie.40.1589452439844; Thu, 14 May 2020 03:33:59 -0700 (PDT) MIME-Version: 1.0 References: <20200506034050.24806-1-jniethe5@gmail.com> In-Reply-To: From: Jordan Niethe Date: Thu, 14 May 2020 20:33:48 +1000 Message-ID: Subject: Re: [PATCH v8 00/30] Initial Prefixed Instruction support To: Christophe Leroy Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable 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: Alistair Popple , Nicholas Piggin , Balamuruhan S , naveen.n.rao@linux.vnet.ibm.com, linuxppc-dev@lists.ozlabs.org, Daniel Axtens Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" On Thu, May 14, 2020 at 3:31 PM Christophe Leroy wrote: > > > > Le 06/05/2020 =C3=A0 05:40, Jordan Niethe a =C3=A9crit : > > A future revision of the ISA will introduce prefixed instructions. A > > prefixed instruction is composed of a 4-byte prefix followed by a > > 4-byte suffix. > > > > All prefixes have the major opcode 1. A prefix will never be a valid > > word instruction. A suffix may be an existing word instruction or a > > new instruction. > > > > This series enables prefixed instructions and extends the instruction > > emulation to support them. Then the places where prefixed instructions > > might need to be emulated are updated. > > > > v8 incorporates feedback from Alistair Popple and Balamuruhan Suriyakum= ar. > > The major changes: > > - Fix some style issues > > - Fix __patch_instruction() on big endian > > - Reintroduce v3's forbidding breakpoints on second word of prefix > > instructions for kprobes and xmon. Missed this when changing to > > using a data type. > > - Use the data type in some places that were missed. > > Checkpatch seems to report the following warnings for pmac32_defconfig, > are they harmless ? > > +arch/powerpc/kernel/align.c:307:13: warning: cast removes address space > '' of expression > +arch/powerpc/kernel/align.c:307:13: warning: cast removes address space > '' of expression > +arch/powerpc/kernel/align.c:307:13: warning: cast removes address space > '' of expression > +arch/powerpc/kernel/align.c:307:13: warning: cast removes address space > '' of expression > +arch/powerpc/kernel/align.c:307:13: warning: cast removes address space > '' of expression > +arch/powerpc/kernel/align.c:307:13: warning: incorrect type in argument > 1 (different address spaces) expected void const volatile [noderef] > * got unsigned int [usertype] * > +arch/powerpc/kernel/align.c:307:13: warning: incorrect type in > initializer (different address spaces) expected unsigned int [noderef] > *__gu_addr got unsigned int [usertype] * > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: cast removes > address space '' of expression > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: cast removes > address space '' of expression > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: cast removes > address space '' of expression > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: cast removes > address space '' of expression > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: cast removes > address space '' of expression > -arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: incorrect type in > argument 1 (different address spaces) expected void const volatile > [noderef] * got unsigned int * > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: incorrect type in > argument 1 (different address spaces) expected void const volatile > [noderef] * got unsigned int [usertype] * > -arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: incorrect type in > initializer (different address spaces) expected unsigned int [noderef] > *__gu_addr got unsigned int * > +arch/powerpc/kernel/hw_breakpoint.c:XX:13: warning: incorrect type in > initializer (different address spaces) expected unsigned int [noderef] > *__gu_addr got unsigned int [usertype] * > +arch/powerpc/kernel/vecemu.c:269:13: warning: cast removes address > space '' of expression > +arch/powerpc/kernel/vecemu.c:269:13: warning: cast removes address > space '' of expression > +arch/powerpc/kernel/vecemu.c:269:13: warning: cast removes address > space '' of expression > +arch/powerpc/kernel/vecemu.c:269:13: warning: cast removes address > space '' of expression > +arch/powerpc/kernel/vecemu.c:269:13: warning: cast removes address > space '' of expression > +arch/powerpc/kernel/vecemu.c:269:13: warning: incorrect type in > argument 1 (different address spaces) expected void const volatile > [noderef] * got unsigned int [usertype] * > +arch/powerpc/kernel/vecemu.c:269:13: warning: incorrect type in > initializer (different address spaces) expected unsigned int [noderef] > *__gu_addr got unsigned int [usertype] * > +arch/powerpc/lib/inst.c:55:37: warning: incorrect type in argument 2 > (different address spaces) expected void const [noderef] *src > got struct ppc_inst *nip > +arch/powerpc/mm/fault.c:284:59: warning: incorrect type in argument 2 > (different address spaces) expected struct ppc_inst *nip got struct > ppc_inst [noderef] * Thanks, I was missing some __user. --- a/arch/powerpc/include/asm/uaccess.h +++ b/arch/powerpc/include/asm/uaccess.h @@ -106,10 +106,10 @@ static inline int __access_ok(unsigned long addr, unsigned long size, __put_user_nosleep((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) #define __get_user_instr(x, ptr) \ - __get_user_nocheck((x).val, (u32 *)(ptr), sizeof(u32), true) + __get_user_nocheck((x).val, (u32 __user *)(ptr), sizeof(u32), true) #define __get_user_instr_inatomic(x, ptr) \ - __get_user_nosleep((x).val, (u32 *)(ptr), sizeof(u32)) + __get_user_nosleep((x).val, (u32 __user *)(ptr), sizeof(u32)) extern long __put_user_bad(void); /* --- a/arch/powerpc/include/asm/inst.h +++ b/arch/powerpc/include/asm/inst.h @@ -38,6 +38,6 @@ static inline bool ppc_inst_equal(struct ppc_inst x, struct ppc_inst y) } int probe_user_read_inst(struct ppc_inst *inst, - struct ppc_inst *nip); + struct ppc_inst __user *nip); #endif /* _ASM_INST_H */ diff --git a/arch/powerpc/lib/inst.c b/arch/powerpc/lib/inst.c index eaf786afad2b..c15611086d26 100644 --- a/arch/powerpc/lib/inst.c +++ b/arch/powerpc/lib/inst.c @@ -7,7 +7,7 @@ #include int probe_user_read_inst(struct ppc_inst *inst, - struct ppc_inst *nip) + struct ppc_inst __user *nip) { unsigned int val; int err; > > Christophe > > > > > v7 fixes compilation issues for some configs reported by Alistair > > Popple. > > > > v6 is based on feedback from Balamuruhan Suriyakumar, Alistair Popple, > > Christophe Leroy and Segher Boessenkool. > > The major changes: > > - Use the instruction type in more places that had been missed bef= ore > > - Fix issues with ppc32 > > - Introduce new self tests for code patching and feature fixups > > > > v5 is based on feedback from Nick Piggins, Michael Ellerman, Balamuruha= n > > Suriyakumar and Alistair Popple. > > The major changes: > > - The ppc instruction type is now a struct > > - Series now just based on next > > - ppc_inst_masked() dropped > > - Space for xmon breakpoints allocated in an assembly file > > - "Add prefixed instructions to instruction data type" patch seper= ated in > > to smaller patches > > - Calling convention for create_branch() is changed > > - Some places which had not been updated to use the data type are = now updated > > > > v4 is based on feedback from Nick Piggins, Christophe Leroy and Daniel = Axtens. > > The major changes: > > - Move xmon breakpoints from data section to text section > > - Introduce a data type for instructions on powerpc > > > > v3 is based on feedback from Christophe Leroy. The major changes: > > - Completely replacing store_inst() with patch_instruction() in > > xmon > > - Improve implementation of mread_instr() to not use mread(). > > - Base the series on top of > > https://patchwork.ozlabs.org/patch/1232619/ as this will effect > > kprobes. > > - Some renaming and simplification of conditionals. > > > > v2 incorporates feedback from Daniel Axtens and and Balamuruhan > > S. The major changes are: > > - Squashing together all commits about SRR1 bits > > - Squashing all commits for supporting prefixed load stores > > - Changing abbreviated references to sufx/prfx -> suffix/prefix > > - Introducing macros for returning the length of an instruction > > - Removing sign extension flag from pstd/pld in sstep.c > > - Dropping patch "powerpc/fault: Use analyse_instr() to check for > > store with updates to sp" from the series, it did not really fit > > with prefixed enablement in the first place and as reported by G= reg > > Kurz did not work correctly. > > > > > > Alistair Popple (1): > > powerpc: Enable Prefixed Instructions > > > > Jordan Niethe (29): > > powerpc/xmon: Remove store_inst() for patch_instruction() > > powerpc/xmon: Move breakpoint instructions to own array > > powerpc/xmon: Move breakpoints to text section > > powerpc/xmon: Use bitwise calculations in_breakpoint_table() > > powerpc: Change calling convention for create_branch() et. al. > > powerpc: Use a macro for creating instructions from u32s > > powerpc: Use an accessor for instructions > > powerpc: Use a function for getting the instruction op code > > powerpc: Use a function for byte swapping instructions > > powerpc: Introduce functions for instruction equality > > powerpc: Use a datatype for instructions > > powerpc: Use a function for reading instructions > > powerpc: Add a probe_user_read_inst() function > > powerpc: Add a probe_kernel_read_inst() function > > powerpc/kprobes: Use patch_instruction() > > powerpc: Define and use __get_user_instr{,inatomic}() > > powerpc: Introduce a function for reporting instruction length > > powerpc/xmon: Use a function for reading instructions > > powerpc/xmon: Move insertion of breakpoint for xol'ing > > powerpc: Make test_translate_branch() independent of instruction > > length > > powerpc: Define new SRR1 bits for a future ISA version > > powerpc: Add prefixed instructions to instruction data type > > powerpc: Test prefixed code patching > > powerpc: Test prefixed instructions in feature fixups > > powerpc/xmon: Don't allow breakpoints on suffixes > > powerpc/kprobes: Don't allow breakpoints on suffixes > > powerpc: Support prefixed instructions in alignment handler > > powerpc sstep: Add support for prefixed load/stores > > powerpc sstep: Add support for prefixed fixed-point arithmetic > > > > arch/powerpc/include/asm/code-patching.h | 37 +- > > arch/powerpc/include/asm/inst.h | 107 +++++ > > arch/powerpc/include/asm/kprobes.h | 2 +- > > arch/powerpc/include/asm/ppc-opcode.h | 3 + > > arch/powerpc/include/asm/reg.h | 7 +- > > arch/powerpc/include/asm/sstep.h | 15 +- > > arch/powerpc/include/asm/uaccess.h | 43 ++ > > arch/powerpc/include/asm/uprobes.h | 7 +- > > arch/powerpc/kernel/align.c | 13 +- > > arch/powerpc/kernel/asm-offsets.c | 8 + > > arch/powerpc/kernel/crash_dump.c | 7 +- > > arch/powerpc/kernel/epapr_paravirt.c | 7 +- > > arch/powerpc/kernel/hw_breakpoint.c | 5 +- > > arch/powerpc/kernel/jump_label.c | 5 +- > > arch/powerpc/kernel/kgdb.c | 9 +- > > arch/powerpc/kernel/kprobes.c | 37 +- > > arch/powerpc/kernel/mce_power.c | 5 +- > > arch/powerpc/kernel/module_64.c | 3 +- > > arch/powerpc/kernel/optprobes.c | 102 +++-- > > arch/powerpc/kernel/optprobes_head.S | 3 + > > arch/powerpc/kernel/security.c | 12 +- > > arch/powerpc/kernel/setup_32.c | 8 +- > > arch/powerpc/kernel/trace/ftrace.c | 168 ++++---- > > arch/powerpc/kernel/traps.c | 20 +- > > arch/powerpc/kernel/uprobes.c | 5 +- > > arch/powerpc/kernel/vecemu.c | 20 +- > > arch/powerpc/kvm/book3s_hv_nested.c | 2 +- > > arch/powerpc/kvm/book3s_hv_rm_mmu.c | 2 +- > > arch/powerpc/kvm/emulate_loadstore.c | 2 +- > > arch/powerpc/lib/Makefile | 2 +- > > arch/powerpc/lib/code-patching.c | 319 +++++++++------ > > arch/powerpc/lib/feature-fixups-test.S | 69 ++++ > > arch/powerpc/lib/feature-fixups.c | 160 ++++++-- > > arch/powerpc/lib/inst.c | 70 ++++ > > arch/powerpc/lib/sstep.c | 459 +++++++++++++++------= - > > arch/powerpc/lib/test_code-patching.S | 20 + > > arch/powerpc/lib/test_emulate_step.c | 56 +-- > > arch/powerpc/mm/fault.c | 15 +- > > arch/powerpc/mm/nohash/8xx.c | 5 +- > > arch/powerpc/perf/8xx-pmu.c | 9 +- > > arch/powerpc/perf/core-book3s.c | 4 +- > > arch/powerpc/platforms/86xx/mpc86xx_smp.c | 5 +- > > arch/powerpc/platforms/powermac/smp.c | 5 +- > > arch/powerpc/xmon/Makefile | 2 +- > > arch/powerpc/xmon/xmon.c | 122 ++++-- > > arch/powerpc/xmon/xmon_bpts.S | 11 + > > arch/powerpc/xmon/xmon_bpts.h | 14 + > > 47 files changed, 1409 insertions(+), 602 deletions(-) > > create mode 100644 arch/powerpc/include/asm/inst.h > > create mode 100644 arch/powerpc/lib/inst.c > > create mode 100644 arch/powerpc/lib/test_code-patching.S > > create mode 100644 arch/powerpc/xmon/xmon_bpts.S > > create mode 100644 arch/powerpc/xmon/xmon_bpts.h > >