From patchwork Wed Jul 29 10:28:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Will Deacon X-Patchwork-Id: 11690753 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 20E8F14B7 for ; Wed, 29 Jul 2020 10:30:05 +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 EF5CB2076E for ; Wed, 29 Jul 2020 10:30:04 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="cHJOQEOd"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="1Gr13uaE" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org EF5CB2076E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=sS7NdCo26kNC5FfNygVwHR+szMLtoaY698DVlKo6t3A=; b=cHJOQEOd9pTqoP82WoPfYwXHW 4Ivaaut4vGdRkbmrgfgdqmXXz74KtTem99no1zKteIqIPUSp7ip5dGuAFzvbhCOAlYopqD7LiYrxZ k8l4CB9VbSD6w1VPiOIuqlHemcJiL0FJaLJx/v2+ylL5MYWAvTD0w9QMBvs3qDfY7ksSTklVjNrdB //BnDUeT3rYY/QsLWfBJ34xcEwmd4/NWDy+M6pkCrZah20z5sVKSekf1J0lGpVO42JxL79uyQmnXL qqVf14S7/i7jM6t2tDmlG8vBJDw5vTR6vLFj/6nMR+7GGSDq5jRCvQNmq2TlVonYnTaLB+4XpWpjR PZq7OYzbw==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0jKA-0000xx-Kw; Wed, 29 Jul 2020 10:28:39 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1k0jK2-0000vk-D7 for linux-arm-kernel@lists.infradead.org; Wed, 29 Jul 2020 10:28:31 +0000 Received: from localhost.localdomain (236.31.169.217.in-addr.arpa [217.169.31.236]) (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 6C52B2076E; Wed, 29 Jul 2020 10:28:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596018509; bh=Gl31CbiZlQexA6v7eOWxC19BV1NxI/smdNsGshpHyCA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Gr13uaEy/wvPdDrrGwFJXJ3KJHKtlQyMk2T/b+AuEx3OFr8EoeafxCyv0NnOBNEq sOoqTUJk1hd/B4WSyYd5NNOaOtp3QasSXU21wi5UVEkM9Fty7nWsi4e3Ty2VOtsB87 +GU1ETo/vBcZTohDHFIiyBKQeC4wPPv3vDHMl8TY= From: Will Deacon To: kvmarm@lists.cs.columbia.edu Subject: [PATCH v2 2/4] KVM: arm64: Handle data and instruction external aborts the same way Date: Wed, 29 Jul 2020 11:28:19 +0100 Message-Id: <20200729102821.23392-3-will@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200729102821.23392-1-will@kernel.org> References: <20200729102821.23392-1-will@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200729_062830_546403_6C1C2D80 X-CRM114-Status: GOOD ( 15.47 ) X-Spam-Score: -5.2 (-----) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-5.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at https://www.dnswl.org/, high trust [198.145.29.99 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.0 DKIMWL_WL_HIGH DKIMwl.org - Whitelisted High sender 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: Will Deacon , Suzuki Poulose , Marc Zyngier , Quentin Perret , James Morse , kernel-team@android.com, linux-arm-kernel@lists.infradead.org Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If the guest generates a synchronous external abort which is not handled by the host, we inject it back into the guest as a virtual SError, but only if the original fault was reported on the data side. Instruction faults are reported as "Unsupported FSC", causing the vCPU run loop to bail with -EFAULT. Although synchronous external aborts from a guest are pretty unusual, treat them the same regardless of whether they are taken as data or instruction aborts by EL2. Cc: Marc Zyngier Cc: Quentin Perret Signed-off-by: Will Deacon --- arch/arm64/kvm/mmu.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/mmu.c b/arch/arm64/kvm/mmu.c index 97394d56a5a9..96d995a1ef68 100644 --- a/arch/arm64/kvm/mmu.c +++ b/arch/arm64/kvm/mmu.c @@ -2079,13 +2079,10 @@ int kvm_handle_guest_abort(struct kvm_vcpu *vcpu, struct kvm_run *run) * For RAS the host kernel may handle this abort. * There is no need to pass the error into the guest. */ - if (!kvm_handle_guest_sea(fault_ipa, kvm_vcpu_get_hsr(vcpu))) - return 1; - - if (unlikely(!is_iabt)) { + if (kvm_handle_guest_sea(fault_ipa, kvm_vcpu_get_hsr(vcpu))) kvm_inject_vabt(vcpu); - return 1; - } + + return 1; } trace_kvm_guest_fault(*vcpu_pc(vcpu), kvm_vcpu_get_hsr(vcpu),