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=-11.5 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_SANE_1 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 2DDC2C433E2 for ; Wed, 2 Sep 2020 15:40:45 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 F0660207EA for ; Wed, 2 Sep 2020 15:40:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="ewvChhIW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org F0660207EA Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=IixQXY+PDd6wxquTdtImUdyQrHE2onvBWh7j5boMEc8=; b=ewvChhIWGLUA0gXZM6nF0dsmb E7Cl39L+6WqVCfBDdIixegy5Mg84ep6/SLKRQH7bw3d1qy0vgyy4ZstS6aMHh1Idzz3OaJQTHqVgj 1m3RuE+hk5PZ4kxlIIKndtPSD9was9j7kVP5EWSq7i9NfxHvcU8LDeyZOUthgt60WnlrL6XNVsUBD yj4F1ThS7uf4SceQipoGKgbtkOK9X08tm5Yl2iF/Lh2Yu2kyvQDCtlUao4ivsB07DQcfZBnw3WLi3 9dPy360yif8wvuCkdXnqA5gYTtJfcsOIlgEgbekoi3gIeSV5F9x00tqipPXMmOQzLKbV6aBGAkKjf sreQG8lAA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDUr3-0005pi-Pb; Wed, 02 Sep 2020 15:39:21 +0000 Received: from foss.arm.com ([217.140.110.172]) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kDUqz-0005oE-Q8 for linux-arm-kernel@lists.infradead.org; Wed, 02 Sep 2020 15:39:18 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 80C8E101E; Wed, 2 Sep 2020 08:39:16 -0700 (PDT) Received: from arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 324E43F71F; Wed, 2 Sep 2020 08:39:15 -0700 (PDT) Date: Wed, 2 Sep 2020 16:39:13 +0100 From: Dave Martin To: Amit Daniel Kachhap Subject: Re: [PATCH v5 2/6] arm64: traps: Allow force_signal_inject to pass esr error code Message-ID: <20200902153912.GF6642@arm.com> References: <1597734671-23407-1-git-send-email-amit.kachhap@arm.com> <1597734671-23407-3-git-send-email-amit.kachhap@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <1597734671-23407-3-git-send-email-amit.kachhap@arm.com> User-Agent: Mutt/1.5.23 (2014-03-12) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200902_113917_944323_61B1EB70 X-CRM114-Status: GOOD ( 26.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Kees Cook , Suzuki K Poulose , Catalin Marinas , Mark Brown , James Morse , Vincenzo Frascino , Will Deacon , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, Aug 18, 2020 at 12:41:07PM +0530, Amit Daniel Kachhap wrote: > Some error signal need to pass proper ARM esr error code to userspace to > better identify the cause of the signal. So the function > force_signal_inject is extended to pass this as a parameter. The > existing code is not affected by this change. > > Signed-off-by: Amit Daniel Kachhap Seems reasonable to me, thanks. Reviewed-by: Dave Martin > --- > Changes since v4: > * New patch. > > arch/arm64/include/asm/traps.h | 2 +- > arch/arm64/kernel/fpsimd.c | 4 ++-- > arch/arm64/kernel/traps.c | 14 +++++++------- > 3 files changed, 10 insertions(+), 10 deletions(-) > > diff --git a/arch/arm64/include/asm/traps.h b/arch/arm64/include/asm/traps.h > index cee5928e1b7d..d96dc2c7c09d 100644 > --- a/arch/arm64/include/asm/traps.h > +++ b/arch/arm64/include/asm/traps.h > @@ -24,7 +24,7 @@ struct undef_hook { > > void register_undef_hook(struct undef_hook *hook); > void unregister_undef_hook(struct undef_hook *hook); > -void force_signal_inject(int signal, int code, unsigned long address); > +void force_signal_inject(int signal, int code, unsigned long address, unsigned int err); > void arm64_notify_segfault(unsigned long addr); > void arm64_force_sig_fault(int signo, int code, void __user *addr, const char *str); > void arm64_force_sig_mceerr(int code, void __user *addr, short lsb, const char *str); > diff --git a/arch/arm64/kernel/fpsimd.c b/arch/arm64/kernel/fpsimd.c > index 55c8f3ec6705..77484359d44a 100644 > --- a/arch/arm64/kernel/fpsimd.c > +++ b/arch/arm64/kernel/fpsimd.c > @@ -312,7 +312,7 @@ static void fpsimd_save(void) > * re-enter user with corrupt state. > * There's no way to recover, so kill it: > */ > - force_signal_inject(SIGKILL, SI_KERNEL, 0); > + force_signal_inject(SIGKILL, SI_KERNEL, 0, 0); > return; > } > > @@ -936,7 +936,7 @@ void do_sve_acc(unsigned int esr, struct pt_regs *regs) > { > /* Even if we chose not to use SVE, the hardware could still trap: */ > if (unlikely(!system_supports_sve()) || WARN_ON(is_compat_task())) { > - force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc); > + force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0); > return; > } > > diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c > index 47f651df781c..eb19f985f0bc 100644 > --- a/arch/arm64/kernel/traps.c > +++ b/arch/arm64/kernel/traps.c > @@ -412,7 +412,7 @@ static int call_undef_hook(struct pt_regs *regs) > return fn ? fn(regs, instr) : 1; > } > > -void force_signal_inject(int signal, int code, unsigned long address) > +void force_signal_inject(int signal, int code, unsigned long address, unsigned int err) > { > const char *desc; > struct pt_regs *regs = current_pt_regs(); > @@ -438,7 +438,7 @@ void force_signal_inject(int signal, int code, unsigned long address) > signal = SIGKILL; > } > > - arm64_notify_die(desc, regs, signal, code, (void __user *)address, 0); > + arm64_notify_die(desc, regs, signal, code, (void __user *)address, err); > } > > /* > @@ -455,7 +455,7 @@ void arm64_notify_segfault(unsigned long addr) > code = SEGV_ACCERR; > mmap_read_unlock(current->mm); > > - force_signal_inject(SIGSEGV, code, addr); > + force_signal_inject(SIGSEGV, code, addr, 0); > } > > void do_undefinstr(struct pt_regs *regs) > @@ -468,14 +468,14 @@ void do_undefinstr(struct pt_regs *regs) > return; > > BUG_ON(!user_mode(regs)); > - force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc); > + force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0); > } > NOKPROBE_SYMBOL(do_undefinstr); > > void do_bti(struct pt_regs *regs) > { > BUG_ON(!user_mode(regs)); > - force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc); > + force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0); > } > NOKPROBE_SYMBOL(do_bti); > > @@ -528,7 +528,7 @@ static void user_cache_maint_handler(unsigned int esr, struct pt_regs *regs) > __user_cache_maint("ic ivau", address, ret); > break; > default: > - force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc); > + force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0); > return; > } > > @@ -581,7 +581,7 @@ static void mrs_handler(unsigned int esr, struct pt_regs *regs) > sysreg = esr_sys64_to_sysreg(esr); > > if (do_emulate_mrs(regs, sysreg, rt) != 0) > - force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc); > + force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc, 0); > } > > static void wfi_handler(unsigned int esr, struct pt_regs *regs) > -- > 2.17.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel