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 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 0DFA2C3A5A9 for ; Mon, 4 May 2020 08:32:33 +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 BBF44206D7 for ; Mon, 4 May 2020 08:32:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org BBF44206D7 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 49Fx1T5hXjzDqkX for ; Mon, 4 May 2020 18:32:29 +1000 (AEST) Received: from ozlabs.org (bilbo.ozlabs.org [IPv6:2401:3900:2:1::2]) (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 49Fwzj1lRYzDqRk for ; Mon, 4 May 2020 18:30:57 +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 49Fwzh5zvQz9sRf; Mon, 4 May 2020 18:30:56 +1000 (AEST) From: Alistair Popple To: Jordan Niethe Subject: Re: [PATCH v7 13/28] powerpc: Add a probe_user_read_inst() function Date: Mon, 04 May 2020 18:30:56 +1000 Message-ID: <1788028.fjJG1VDcy6@townsend> In-Reply-To: <20200501034220.8982-14-jniethe5@gmail.com> References: <20200501034220.8982-1-jniethe5@gmail.com> <20200501034220.8982-14-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" Looks good. Reviewed-by: Alistair Popple On Friday, 1 May 2020 1:42:05 PM AEST Jordan Niethe wrote: > Introduce a probe_user_read_inst() function to use in cases where > probe_user_read() is used for getting an instruction. This will be more > useful for prefixed instructions. > > Signed-off-by: Jordan Niethe > --- > v6: - New to series > --- > arch/powerpc/include/asm/inst.h | 3 +++ > arch/powerpc/lib/Makefile | 2 +- > arch/powerpc/lib/inst.c | 18 ++++++++++++++++++ > arch/powerpc/mm/fault.c | 2 +- > 4 files changed, 23 insertions(+), 2 deletions(-) > create mode 100644 arch/powerpc/lib/inst.c > > diff --git a/arch/powerpc/include/asm/inst.h > b/arch/powerpc/include/asm/inst.h index 552e953bf04f..3e9a58420151 100644 > --- a/arch/powerpc/include/asm/inst.h > +++ b/arch/powerpc/include/asm/inst.h > @@ -37,4 +37,7 @@ static inline bool ppc_inst_equal(struct ppc_inst x, > struct ppc_inst y) return ppc_inst_val(x) == ppc_inst_val(y); > } > > +int probe_user_read_inst(struct ppc_inst *inst, > + struct ppc_inst *nip); > + > #endif /* _ASM_INST_H */ > diff --git a/arch/powerpc/lib/Makefile b/arch/powerpc/lib/Makefile > index b8de3be10eb4..546591848219 100644 > --- a/arch/powerpc/lib/Makefile > +++ b/arch/powerpc/lib/Makefile > @@ -16,7 +16,7 @@ CFLAGS_code-patching.o += -DDISABLE_BRANCH_PROFILING > CFLAGS_feature-fixups.o += -DDISABLE_BRANCH_PROFILING > endif > > -obj-y += alloc.o code-patching.o feature-fixups.o pmem.o > +obj-y += alloc.o code-patching.o feature-fixups.o pmem.o inst.o > > ifndef CONFIG_KASAN > obj-y += string.o memcmp_$(BITS).o > diff --git a/arch/powerpc/lib/inst.c b/arch/powerpc/lib/inst.c > new file mode 100644 > index 000000000000..eaf786afad2b > --- /dev/null > +++ b/arch/powerpc/lib/inst.c > @@ -0,0 +1,18 @@ > +// SPDX-License-Identifier: GPL-2.0-or-later > +/* > + * Copyright 2020, IBM Corporation. > + */ > + > +#include > +#include > + > +int probe_user_read_inst(struct ppc_inst *inst, > + struct ppc_inst *nip) > +{ > + unsigned int val; > + int err; > + > + err = probe_user_read(&val, nip, sizeof(val)); > + *inst = ppc_inst(val); > + return err; > +} > diff --git a/arch/powerpc/mm/fault.c b/arch/powerpc/mm/fault.c > index 4a50f125ec18..f3a943eae305 100644 > --- a/arch/powerpc/mm/fault.c > +++ b/arch/powerpc/mm/fault.c > @@ -281,7 +281,7 @@ static bool bad_stack_expansion(struct pt_regs *regs, > unsigned long address, access_ok(nip, sizeof(*nip))) { > struct ppc_inst inst; > > - if (!probe_user_read(&inst, nip, sizeof(inst))) > + if (!probe_user_read_inst(&inst, (struct ppc_inst __user *)nip)) > return !store_updates_sp(inst); > *must_retry = true; > }