From patchwork Wed Oct 31 23:06:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 149898 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp99592ljp; Wed, 31 Oct 2018 16:08:44 -0700 (PDT) X-Google-Smtp-Source: AJdET5dxrI4dBhfmJFUuUa0rCIQb6hG74SIWtCpXJf+efwpApY51R0Dt/DGFV+BA8tCqOvaiBQAF X-Received: by 2002:a65:5b81:: with SMTP id i1-v6mr5045826pgr.252.1541027324369; Wed, 31 Oct 2018 16:08:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1541027324; cv=none; d=google.com; s=arc-20160816; b=hD2thud7briOMCZ7WvOiTa/hsW9xr5UovloAwdzziYyQsGp/f73fEgaCJHvYMZzgRa k1XOSkVzYUIbV3lxjt4kQxiIVM0RH8pzSPVaEQ3WFbNmkiDBngZD1Vao+yv8VBkHLqX1 imNMmv/5zzUONouYx79qbKAqyy4hIINwGIiHPOcVPdHBl5fvd1nu7l5KFi9tuw1Qqn92 wFnhJeW4wabAo2C6bwWY+3LRKe2saaW3nZvhtJZg6q4esY1jMJKQzZTcFfLm1wzEfXM2 +JunOmIf+ehM8Kf9ktG5RNx70tbsj25uFZ4CkJ4O1XEXh8GIQVIGHVwKLWsgpTrLlDLG C88g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=eOJBvFj1ZaqIOu8FhC5sO6dJWFTNbp62mBUfsu7ffPk=; b=rdD/YX9p2Eh1GH+TGCr6C+FD6X+buYmey8EwGyg4ASND0gFEakfBooI9MB+J60OzMi SoaeNLdsjaUgaPZGl+hsZqBmtw/mhhQ2kWboZf1ihfJE2HH9dPGOfoX7s7dKCsNl4dhs u8hrSes7xa1ATbsDYqxYOcOq+lFyyZ7PU2pRq9IZf6V/XACysJnEPNVDZLwSNdMdWOf0 1LPIaAEdBX/7FGcOGpIW6+2QeH97lqpYIh1GDVCpimlhuDO9Pp556DYmsqs1aF7Sideo 6hAKr2FlHQ5nNgNA8iU3eB69mh9i4y9dE81kgAe6xAVSR4JwlKmjspW1jco5kblFp2ZB NH/A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dz26IKTn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s3-v6si29104001pgi.366.2018.10.31.16.08.44; Wed, 31 Oct 2018 16:08:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=Dz26IKTn; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730065AbeKAIIx (ORCPT + 32 others); Thu, 1 Nov 2018 04:08:53 -0400 Received: from mail.kernel.org ([198.145.29.99]:58232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730030AbeKAIIw (ORCPT ); Thu, 1 Nov 2018 04:08:52 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7AB0B2084A; Wed, 31 Oct 2018 23:08:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1541027321; bh=x6HF4QIL5OlTuHXmztarRGF4czZrSYY4uhoUeERyU+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Dz26IKTnKEg/pFuqSn2qmiCdEKg1O191U9Q1u7nkm/Q6V+EBioM/Lk0WHrdz5aAel Sz58vsUNN0+XlphDYYUEpvczdV6cwHsqNMQ879sPo6NqAhMRCaRdvLRGXmIpE1xm8T pr9UQSOPnrKAosZ9DNTu+YlyLoQHzbqWQCkD6BAo= From: Sasha Levin To: stable@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Will Deacon , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.18 051/126] arm64: entry: Allow handling of undefined instructions from EL1 Date: Wed, 31 Oct 2018 19:06:39 -0400 Message-Id: <20181031230754.29029-51-sashal@kernel.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181031230754.29029-1-sashal@kernel.org> References: <20181031230754.29029-1-sashal@kernel.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Will Deacon [ Upstream commit 0bf0f444b2c49241b2b39aa3cf210d7c95ef6c34 ] Rather than panic() when taking an undefined instruction exception from EL1, allow a hook to be registered in case we want to emulate the instruction, like we will for the SSBS PSTATE manipulation instructions. Signed-off-by: Will Deacon Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- arch/arm64/kernel/entry.S | 2 +- arch/arm64/kernel/traps.c | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) -- 2.17.1 diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 28ad8799406f..b0db91eefbde 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -599,7 +599,7 @@ el1_undef: inherit_daif pstate=x23, tmp=x2 mov x0, sp bl do_undefinstr - ASM_BUG() + kernel_exit 1 el1_dbg: /* * Debug exception handling diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index d399d459397b..9fa3d69cceaa 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -310,10 +310,12 @@ static int call_undef_hook(struct pt_regs *regs) int (*fn)(struct pt_regs *regs, u32 instr) = NULL; void __user *pc = (void __user *)instruction_pointer(regs); - if (!user_mode(regs)) - return 1; - - if (compat_thumb_mode(regs)) { + if (!user_mode(regs)) { + __le32 instr_le; + if (probe_kernel_address((__force __le32 *)pc, instr_le)) + goto exit; + instr = le32_to_cpu(instr_le); + } else if (compat_thumb_mode(regs)) { /* 16-bit Thumb instruction */ __le16 instr_le; if (get_user(instr_le, (__le16 __user *)pc)) @@ -407,6 +409,7 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs) return; force_signal_inject(SIGILL, ILL_ILLOPC, regs->pc); + BUG_ON(!user_mode(regs)); } void cpu_enable_cache_maint_trap(const struct arm64_cpu_capabilities *__unused)