From patchwork Sat May 28 11:38:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 12864021 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 8B269C433F5 for ; Sat, 28 May 2022 11:51:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lAXtpqSftptBDEUsxx2PUcJ8g/nLh8VDEsZ88ZA2YtY=; b=c5zH38dPLnTfjo 15FcAcffzgilUSsPHnT8A4sir7ktSyTMn7O81Blvl2iQWx3nZf/DfmUFlmstJak0imwmR8ejQkqSj hbfh6Amjsqr8uY9m+yd5+nYl65ptXtSiY6OBRYhqD/Z1lzqkGcb/b/8HZ6T2/pe7bR4gLqp4SR8FE Nj9xn2TRSbFfmJvkh9Qy9ddMRp9S2Xr/kIFnDMAJDPRoQVam8/GTFGZTz/sm87S9TdkGm/RqbXcka ZOosepWdmobL2Yn49gW6R+YpDQNIBtxdOVFF/H6haD1nt8to3O7vKd5/I2ARpqRHD30nkYIkeu7H8 2HV5Mk546INZuCdWUH6w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nuuxM-0023tt-TV; Sat, 28 May 2022 11:50:09 +0000 Received: from ams.source.kernel.org ([2604:1380:4601:e00::1]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nuuxA-0023pE-RH for linux-arm-kernel@lists.infradead.org; Sat, 28 May 2022 11:49:58 +0000 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 89001B816FE; Sat, 28 May 2022 11:49:55 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2515BC34100; Sat, 28 May 2022 11:49:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1653738594; bh=C9c28cedZULwe3x4XI5ibuDlgiUGa4VC7XtN6wvnzwA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VIC+dN8rg1nItQp2y4Mj7faOO7iw4JkaFZNWTRJb9S4B1Twp2lSF0xCgfwYPTEdrA pmtUwu/W3Nw/aXg0ZGz9vcrNa0ZGvb9G4J64BNa4ZJSPrM2rQii3TaLLBYHiMsDM41 jjTT+aqkKNFPQdME4CGBVENhqb7RkEF4IuYUaP3tcHqJJhtgJy5vldy5QdRdHoxtJX zd0hWzF6CS2yMFDh2svFN+3+F/eiMSCgRT3Lod8jcAp0uowQiMrMbCAevFR8Tk8wRG WmQjjFN6zx8tIpuFWlmcOw5Ju7yusQtGtjzyy2Qwy0yq11VKOhZmAwyQuVyx8T7umJ Yyxksk+FZv5WA== Received: from sofa.misterjones.org ([185.219.108.64] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1nuumD-00EEGh-3t; Sat, 28 May 2022 12:38:37 +0100 From: Marc Zyngier To: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: James Morse , Suzuki K Poulose , Alexandru Elisei , Oliver Upton , Will Deacon , Fuad Tabba , Quentin Perret , Mark Brown , kernel-team@android.com Subject: [PATCH 15/18] KVM: arm64: Warn when PENDING_EXCEPTION and INCREMENT_PC are set together Date: Sat, 28 May 2022 12:38:25 +0100 Message-Id: <20220528113829.1043361-16-maz@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220528113829.1043361-1-maz@kernel.org> References: <20220528113829.1043361-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 185.219.108.64 X-SA-Exim-Rcpt-To: kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-arm-kernel@lists.infradead.org, james.morse@arm.com, suzuki.poulose@arm.com, alexandru.elisei@arm.com, oupton@google.com, will@kernel.org, tabba@google.com, qperret@google.com, broonie@kernel.org, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220528_044957_195534_73849DE8 X-CRM114-Status: GOOD ( 13.30 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org We really don't want PENDING_EXCEPTION and INCREMENT_PC to ever be set at the same time, as they are mutually exclusive. Add checks that will generate a warning should this ever happen. Signed-off-by: Marc Zyngier --- arch/arm64/include/asm/kvm_emulate.h | 1 + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 2 ++ arch/arm64/kvm/inject_fault.c | 8 ++++++++ 3 files changed, 11 insertions(+) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 46e631cd8d9e..861fa0b24a7f 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -473,6 +473,7 @@ static inline unsigned long vcpu_data_host_to_guest(struct kvm_vcpu *vcpu, static __always_inline void kvm_incr_pc(struct kvm_vcpu *vcpu) { + WARN_ON(vcpu_get_flag(vcpu, PENDING_EXCEPTION)); vcpu_set_flag(vcpu, INCREMENT_PC); } diff --git a/arch/arm64/kvm/hyp/nvhe/sys_regs.c b/arch/arm64/kvm/hyp/nvhe/sys_regs.c index 2841a2d447a1..04973984b6db 100644 --- a/arch/arm64/kvm/hyp/nvhe/sys_regs.c +++ b/arch/arm64/kvm/hyp/nvhe/sys_regs.c @@ -38,6 +38,8 @@ static void inject_undef64(struct kvm_vcpu *vcpu) *vcpu_pc(vcpu) = read_sysreg_el2(SYS_ELR); *vcpu_cpsr(vcpu) = read_sysreg_el2(SYS_SPSR); + WARN_ON(vcpu_get_flag(vcpu, INCREMENT_PC)); + vcpu_set_flag(vcpu, PENDING_EXCEPTION); vcpu_set_flag(vcpu, EXCEPT_AA64_EL1_SYNC); diff --git a/arch/arm64/kvm/inject_fault.c b/arch/arm64/kvm/inject_fault.c index a9a7b513f3b0..2f4b9afc16ec 100644 --- a/arch/arm64/kvm/inject_fault.c +++ b/arch/arm64/kvm/inject_fault.c @@ -20,6 +20,8 @@ static void inject_abt64(struct kvm_vcpu *vcpu, bool is_iabt, unsigned long addr bool is_aarch32 = vcpu_mode_is_32bit(vcpu); u32 esr = 0; + WARN_ON(vcpu_get_flag(vcpu, INCREMENT_PC)); + vcpu_set_flag(vcpu, PENDING_EXCEPTION); vcpu_set_flag(vcpu, EXCEPT_AA64_EL1_SYNC); @@ -51,6 +53,8 @@ static void inject_undef64(struct kvm_vcpu *vcpu) { u32 esr = (ESR_ELx_EC_UNKNOWN << ESR_ELx_EC_SHIFT); + WARN_ON(vcpu_get_flag(vcpu, INCREMENT_PC)); + vcpu_set_flag(vcpu, PENDING_EXCEPTION); vcpu_set_flag(vcpu, EXCEPT_AA64_EL1_SYNC); @@ -71,6 +75,8 @@ static void inject_undef64(struct kvm_vcpu *vcpu) static void inject_undef32(struct kvm_vcpu *vcpu) { + WARN_ON(vcpu_get_flag(vcpu, INCREMENT_PC)); + vcpu_set_flag(vcpu, PENDING_EXCEPTION); vcpu_set_flag(vcpu, EXCEPT_AA32_UND); } @@ -94,6 +100,8 @@ static void inject_abt32(struct kvm_vcpu *vcpu, bool is_pabt, u32 addr) far = vcpu_read_sys_reg(vcpu, FAR_EL1); + WARN_ON(vcpu_get_flag(vcpu, INCREMENT_PC)); + if (is_pabt) { vcpu_set_flag(vcpu, PENDING_EXCEPTION); vcpu_set_flag(vcpu, EXCEPT_AA32_IABT);