From patchwork Fri Sep 18 17:16:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11785539 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A3F04618 for ; Fri, 18 Sep 2020 17:17:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8859922211 for ; Fri, 18 Sep 2020 17:17:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600449445; bh=dT/SIIBfk6PdNJR5wifdnUhvj/zHp9ljO8pxvLb8ouI=; h=From:To:Cc:Subject:Date:List-ID:From; b=yxilRB3fXBzvKVTI4p/Kj6hGaZp0e0GrFtMC/J5jX5nqOquv+6go6Y/44FBZ7RiRl wBioYQiWsC1oUg+QsSqybAedFea0y26+SYu6EnMx4f9aTCRUyCRg44fXHi4KDYrB5T yUAcicmQUsEcRuDxKkDPwbQO212h1G5JEhzS+zFE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726252AbgIRRRY (ORCPT ); Fri, 18 Sep 2020 13:17:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:34796 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbgIRRRY (ORCPT ); Fri, 18 Sep 2020 13:17:24 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id A805421707; Fri, 18 Sep 2020 17:17:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600449443; bh=dT/SIIBfk6PdNJR5wifdnUhvj/zHp9ljO8pxvLb8ouI=; h=From:To:Cc:Subject:Date:From; b=sScf8brvcJJZ1OIxlPXSE1vyOhRAJ5bWUdN6HZa64ks2ni7AZwUMHOnkWSDlqXw4e xtXYTKivF9Gu6fe7f3g/dWxh721wKq0KoLRgqv36d8C5Tyt/J9fwZajTktVbkzsjGR POg34ttD0fKp8lZK5OLvELOcV3sNsBevkCMuyI44= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kJK0f-00D4ZN-PC; Fri, 18 Sep 2020 18:17:21 +0100 From: Marc Zyngier To: Paolo Bonzini Cc: Will Deacon , kernel-team@android.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, James Morse , Julien Thierry , Suzuki K Poulose Subject: [GIT PULL] KVM/arm64 fixes for 5.9, take #2 Date: Fri, 18 Sep 2020 18:16:49 +0100 Message-Id: <20200918171651.1340445-1-maz@kernel.org> X-Mailer: git-send-email 2.28.0 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: pbonzini@redhat.com, will@kernel.org, kernel-team@android.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Hi Paolo, Here's the latest set of fixes for 5.9. The first patch is pretty nasty, as a guest hitting this bug will have its vcpu stuck on a fault, without any hope of it being resolved. Embarrassing, and definitely a stable candidate. The second patch is only a cleanup after the first one. Please pull, M. The following changes since commit 7b75cd5128421c673153efb1236705696a1a9812: KVM: arm64: Update page shift if stage 2 block mapping not supported (2020-09-04 10:53:48 +0100) are available in the Git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git tags/kvmarm-fixes-5.9-2 for you to fetch changes up to 620cf45f7a516bf5fe9e5dce675a652e935c8bde: KVM: arm64: Remove S1PTW check from kvm_vcpu_dabt_iswrite() (2020-09-18 18:01:48 +0100) ---------------------------------------------------------------- KVM/arm64 fixes for 5.9, take #2 - Fix handling of S1 Page Table Walk permission fault at S2 on instruction fetch - Cleanup kvm_vcpu_dabt_iswrite() ---------------------------------------------------------------- Marc Zyngier (2): KVM: arm64: Assume write fault on S1PTW permission fault on instruction fetch KVM: arm64: Remove S1PTW check from kvm_vcpu_dabt_iswrite() arch/arm64/include/asm/kvm_emulate.h | 14 +++++++++++--- arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- arch/arm64/kvm/mmu.c | 4 ++-- 3 files changed, 14 insertions(+), 6 deletions(-) From patchwork Fri Sep 18 17:16:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marc Zyngier X-Patchwork-Id: 11785543 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0099A618 for ; Fri, 18 Sep 2020 17:17:28 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D316522211 for ; Fri, 18 Sep 2020 17:17:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600449447; bh=cAgxLXePeYCs/M26SYLkziKIDoRBbatCmklPQ+trqT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=mf6ZiOuoJwMUfbKrKjtuaEHt5dFtEj0YoTKy/xtVv+V23Yvt4yqXBJPuFNVNPNadM 7E3FUbWQY0wnLKUCARzCKDvhTsNDOTosgvEDrY5lB6RM/wvLEizNjCEvTZVjm9HTlh GI5R1v1LKAE9HsmtMGjcNzt00C1t53CiXL3MlWHI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726343AbgIRRR0 (ORCPT ); Fri, 18 Sep 2020 13:17:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:34840 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726139AbgIRRRY (ORCPT ); Fri, 18 Sep 2020 13:17:24 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 67A4021741; Fri, 18 Sep 2020 17:17:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1600449444; bh=cAgxLXePeYCs/M26SYLkziKIDoRBbatCmklPQ+trqT0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y/u2oVlXb5KeDrKPcI/EU4XxJ5GMbUd49XQXmguldfr5lslVpkcGCY9doHqnbu+lh fXVraqfum/Hl11QjQ8cVy+ac+4ygzB/I2lGmcdSSVblWompMvK2BDEOYh+/z8G/9rc RuZJkG0w6haHsyV9JnGJW/JL6xLgdtzGNcKF44v8= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=why.lan) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1kJK0g-00D4ZN-TG; Fri, 18 Sep 2020 18:17:23 +0100 From: Marc Zyngier To: Paolo Bonzini Cc: Will Deacon , kernel-team@android.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, James Morse , Julien Thierry , Suzuki K Poulose Subject: [PATCH 2/2] KVM: arm64: Remove S1PTW check from kvm_vcpu_dabt_iswrite() Date: Fri, 18 Sep 2020 18:16:51 +0100 Message-Id: <20200918171651.1340445-3-maz@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200918171651.1340445-1-maz@kernel.org> References: <20200918171651.1340445-1-maz@kernel.org> MIME-Version: 1.0 X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: pbonzini@redhat.com, will@kernel.org, kernel-team@android.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org Now that kvm_vcpu_trap_is_write_fault() checks for S1PTW, there is no need for kvm_vcpu_dabt_iswrite() to do the same thing, as we already check for this condition on all existing paths. Drop the check and add a comment instead. Signed-off-by: Marc Zyngier Reviewed-by: Will Deacon Link: https://lore.kernel.org/r/20200915104218.1284701-3-maz@kernel.org --- arch/arm64/include/asm/kvm_emulate.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/include/asm/kvm_emulate.h b/arch/arm64/include/asm/kvm_emulate.h index 4f618af660ba..1cc5f5f72d0b 100644 --- a/arch/arm64/include/asm/kvm_emulate.h +++ b/arch/arm64/include/asm/kvm_emulate.h @@ -303,10 +303,10 @@ static __always_inline bool kvm_vcpu_abt_iss1tw(const struct kvm_vcpu *vcpu) return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_S1PTW); } +/* Always check for S1PTW *before* using this. */ static __always_inline bool kvm_vcpu_dabt_iswrite(const struct kvm_vcpu *vcpu) { - return !!(kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR) || - kvm_vcpu_abt_iss1tw(vcpu); /* AF/DBM update */ + return kvm_vcpu_get_esr(vcpu) & ESR_ELx_WNR; } static inline bool kvm_vcpu_dabt_is_cm(const struct kvm_vcpu *vcpu)