From patchwork Thu Oct 10 18:44:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Martin X-Patchwork-Id: 175824 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp2683640ill; Thu, 10 Oct 2019 11:46:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqx+9CGuzPSKSW0XVtgjprQYmnnqt2tEzWKWhqxb0NZuSWzTsNchtweYPNL9z2PmZyHHXqaP X-Received: by 2002:aa7:dc47:: with SMTP id g7mr9584570edu.153.1570733166200; Thu, 10 Oct 2019 11:46:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570733166; cv=none; d=google.com; s=arc-20160816; b=oZfHSbwONZXRb6WGDod0Mjk61cT6iVs24gA1t5raqLTdocdhCCRu/r5aTuiumIHhvg l7x8QS67PTIOYm2meMmmgxjo4webYXzZVGwyMHuONcgI00NldzvifYqfKcb8/u4Lm4g7 EEEj84cWApSFuHwnJSffdAVPBuXL/B5FE1Yb86SqSP7xtvqDDUMIQwrBcB6PReL/TsxU nMRMggTJ7PXARKj6vGOod+gSF5ZMg79Wjay6+N/Wceh3hYodIxfbzjhvgbxom02rs7Ub xDP2KYwpRWa1b/OCgU0NXab52Us6gAHAEPYxtyEVf/7G8Aq9/tvQFRAMJ1/kjGuNwCOb +zjA== 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; bh=gyB1ngDXDV8HcKWFdfqcNoWon5lfakaOtf8iIIVbDj8=; b=lGmmZmySCItMcw4s50xq3EaOJWZo+GGljY7uO9x584FknUqxHLxrfNo6Yrc+/JnxEH P8DiQc8S2P1/fqMLtQau9NMWPlQPNlopF4MhSd8hel5bErDOhkui0mflkKj4FiHjA6FB 44bXyJJetfjsXvbZ4ppSU6Rdi6F+bo/hMM1sj8S25O5X+GmUigykU/1rxljR/x3O43zK vu2NqNp7r4JWoN0/lP9BufczhAxiFgruG3iTL8xg0Ifr7WSP44b/bttgfrzUsnKuSTC9 Ftk3hTIff4pjJIP+6cEdr7S48MYvbpWXcHgmbCwvt8umCaI7I4gzzlQ0QXdoh1DVV3qF dLCg== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x14si3770209edq.49.2019.10.10.11.46.05; Thu, 10 Oct 2019 11:46:06 -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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727308AbfJJSqF (ORCPT + 22 others); Thu, 10 Oct 2019 14:46:05 -0400 Received: from foss.arm.com ([217.140.110.172]:38566 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727294AbfJJSqC (ORCPT ); Thu, 10 Oct 2019 14:46:02 -0400 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 090F728; Thu, 10 Oct 2019 11:46:02 -0700 (PDT) Received: from e103592.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 352063F703; Thu, 10 Oct 2019 11:45:59 -0700 (PDT) From: Dave Martin To: linux-kernel@vger.kernel.org Cc: Andrew Jones , Arnd Bergmann , Catalin Marinas , Eugene Syromiatnikov , Florian Weimer , "H.J. Lu" , Jann Horn , Kees Cook , =?utf-8?q?Kristina_Mart=C5=A1enko?= , Mark Brown , Paul Elliott , Peter Zijlstra , Richard Henderson , Sudakshina Das , Szabolcs Nagy , Thomas Gleixner , Will Deacon , Yu-cheng Yu , Amit Kachhap , Vincenzo Frascino , linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v2 11/12] arm64: BTI: Reset BTYPE when skipping emulated instructions Date: Thu, 10 Oct 2019 19:44:39 +0100 Message-Id: <1570733080-21015-12-git-send-email-Dave.Martin@arm.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1570733080-21015-1-git-send-email-Dave.Martin@arm.com> References: <1570733080-21015-1-git-send-email-Dave.Martin@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since normal execution of any non-branch instruction resets the PSTATE BTYPE field to 0, so do the same thing when emulating a trapped instruction. Branches don't trap directly, so we should never need to assign a non-zero value to BTYPE here. Signed-off-by: Dave Martin --- arch/arm64/kernel/traps.c | 2 ++ 1 file changed, 2 insertions(+) -- 2.1.4 diff --git a/arch/arm64/kernel/traps.c b/arch/arm64/kernel/traps.c index 3af2768..4d8ce50 100644 --- a/arch/arm64/kernel/traps.c +++ b/arch/arm64/kernel/traps.c @@ -331,6 +331,8 @@ void arm64_skip_faulting_instruction(struct pt_regs *regs, unsigned long size) if (regs->pstate & PSR_MODE32_BIT) advance_itstate(regs); + else + regs->pstate &= ~(u64)PSR_BTYPE_MASK; } static LIST_HEAD(undef_hook);