From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 4.14 110/170] arm64: KVM: Skip MMIO insn after emulation Date: Mon, 28 Jan 2019 11:11:00 -0500 Message-ID: <20190128161200.55107-110-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 14CA74A32D for ; Mon, 28 Jan 2019 11:16:49 -0500 (EST) Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id KpyuaUsQdPQ0 for ; Mon, 28 Jan 2019 11:16:48 -0500 (EST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id DF3F34A321 for ; Mon, 28 Jan 2019 11:16:48 -0500 (EST) In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: kvmarm@lists.cs.columbia.edu, Sasha Levin , Marc Zyngier List-Id: kvmarm@lists.cs.columbia.edu RnJvbTogTWFyayBSdXRsYW5kIDxtYXJrLnJ1dGxhbmRAYXJtLmNvbT4KClsgVXBzdHJlYW0gY29t bWl0IDBkNjQwNzMyZGJlYmVkMGYxMGYxODUyNmRlMjE2NTI5MzFmMGIyZjIgXQoKV2hlbiB3ZSBl bXVsYXRlIGFuIE1NSU8gaW5zdHJ1Y3Rpb24sIHdlIGFkdmFuY2UgdGhlIENQVSBzdGF0ZSB3aXRo aW4KZGVjb2RlX2hzcigpLCBiZWZvcmUgZW11bGF0aW5nIHRoZSBpbnN0cnVjdGlvbiBlZmZlY3Rz LgoKSGF2aW5nIHRoaXMgbG9naWMgaW4gZGVjb2RlX2hzcigpIGlzIG9wYXF1ZSwgYW5kIGFkdmFu Y2luZyB0aGUgc3RhdGUKYmVmb3JlIGVtdWxhdGlvbiBpcyBwcm9ibGVtYXRpYy4gSXQgZ2V0cyBp biB0aGUgd2F5IG9mIGFwcGx5aW5nCmNvbnNpc3RlbnQgc2luZ2xlLXN0ZXAgbG9naWMsIGFuZCBp dCBwcmV2ZW50cyB1cyBmcm9tIGJlaW5nIGFibGUgdG8gZmFpbAphbiBNTUlPIGluc3RydWN0aW9u IHdpdGggYSBzeW5jaHJvbm91cyBleGNlcHRpb24uCgpDbGVhbiB0aGlzIHVwIGJ5IG9ubHkgYWR2 YW5jaW5nIHRoZSBDUFUgc3RhdGUgKmFmdGVyKiB0aGUgZWZmZWN0cyBvZiB0aGUKaW5zdHJ1Y3Rp b24gYXJlIGVtdWxhdGVkLgoKQ2M6IFBldGVyIE1heWRlbGwgPHBldGVyLm1heWRlbGxAbGluYXJv Lm9yZz4KUmV2aWV3ZWQtYnk6IEFsZXggQmVubsOpZSA8YWxleC5iZW5uZWVAbGluYXJvLm9yZz4K UmV2aWV3ZWQtYnk6IENocmlzdG9mZmVyIERhbGwgPGNocmlzdG9mZmVyLmRhbGxAYXJtLmNvbT4K U2lnbmVkLW9mZi1ieTogTWFyayBSdXRsYW5kIDxtYXJrLnJ1dGxhbmRAYXJtLmNvbT4KU2lnbmVk LW9mZi1ieTogTWFyYyBaeW5naWVyIDxtYXJjLnp5bmdpZXJAYXJtLmNvbT4KU2lnbmVkLW9mZi1i eTogU2FzaGEgTGV2aW4gPHNhc2hhbEBrZXJuZWwub3JnPgotLS0KIHZpcnQva3ZtL2FybS9tbWlv LmMgfCAxMSArKysrKystLS0tLQogMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9ucygrKSwgNSBk ZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS92aXJ0L2t2bS9hcm0vbW1pby5jIGIvdmlydC9rdm0v YXJtL21taW8uYwppbmRleCBkYWM3Y2ViMWE2NzcuLjA4NDQzYTE1ZTZiZSAxMDA2NDQKLS0tIGEv dmlydC9rdm0vYXJtL21taW8uYworKysgYi92aXJ0L2t2bS9hcm0vbW1pby5jCkBAIC0xMTcsNiAr MTE3LDEyIEBAIGludCBrdm1faGFuZGxlX21taW9fcmV0dXJuKHN0cnVjdCBrdm1fdmNwdSAqdmNw dSwgc3RydWN0IGt2bV9ydW4gKnJ1bikKIAkJdmNwdV9zZXRfcmVnKHZjcHUsIHZjcHUtPmFyY2gu bW1pb19kZWNvZGUucnQsIGRhdGEpOwogCX0KIAorCS8qCisJICogVGhlIE1NSU8gaW5zdHJ1Y3Rp b24gaXMgZW11bGF0ZWQgYW5kIHNob3VsZCBub3QgYmUgcmUtZXhlY3V0ZWQKKwkgKiBpbiB0aGUg Z3Vlc3QuCisJICovCisJa3ZtX3NraXBfaW5zdHIodmNwdSwga3ZtX3ZjcHVfdHJhcF9pbF9pczMy Yml0KHZjcHUpKTsKKwogCXJldHVybiAwOwogfQogCkBAIC0xNDQsMTEgKzE1MCw2IEBAIHN0YXRp YyBpbnQgZGVjb2RlX2hzcihzdHJ1Y3Qga3ZtX3ZjcHUgKnZjcHUsIGJvb2wgKmlzX3dyaXRlLCBp bnQgKmxlbikKIAl2Y3B1LT5hcmNoLm1taW9fZGVjb2RlLnNpZ25fZXh0ZW5kID0gc2lnbl9leHRl bmQ7CiAJdmNwdS0+YXJjaC5tbWlvX2RlY29kZS5ydCA9IHJ0OwogCi0JLyoKLQkgKiBUaGUgTU1J TyBpbnN0cnVjdGlvbiBpcyBlbXVsYXRlZCBhbmQgc2hvdWxkIG5vdCBiZSByZS1leGVjdXRlZAot CSAqIGluIHRoZSBndWVzdC4KLQkgKi8KLQlrdm1fc2tpcF9pbnN0cih2Y3B1LCBrdm1fdmNwdV90 cmFwX2lsX2lzMzJiaXQodmNwdSkpOwogCXJldHVybiAwOwogfQogCi0tIAoyLjE5LjEKCl9fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCmt2bWFybSBtYWlsaW5n IGxpc3QKa3ZtYXJtQGxpc3RzLmNzLmNvbHVtYmlhLmVkdQpodHRwczovL2xpc3RzLmNzLmNvbHVt YmlhLmVkdS9tYWlsbWFuL2xpc3RpbmZvL2t2bWFybQo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BFE20C282CF for ; Mon, 28 Jan 2019 16:58:38 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 87EEC20844 for ; Mon, 28 Jan 2019 16:58:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548694718; bh=plehLW++cCBs67mqYGqkjRQlhcZgJMYE72FXx4W1ogQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=I8md10AG674FcBbAXwTB3HjvY1XRL/16PjeOfuMl2ovwU/s0XSLfLldYepeLeGbF+ Xkh3BRoy8NgJjgKMdg7fTl3eWNcgTvArjoPQG8rATHmiQgSAVHUKsCCc0Fs1AQnqZX 4qm9uuYg+DLPniqM2rV5bt7DhjDw/XniSwGZWFAw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387634AbfA1QQv (ORCPT ); Mon, 28 Jan 2019 11:16:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:50046 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388041AbfA1QQs (ORCPT ); Mon, 28 Jan 2019 11:16:48 -0500 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 2F03E20879; Mon, 28 Jan 2019 16:16:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1548692207; bh=plehLW++cCBs67mqYGqkjRQlhcZgJMYE72FXx4W1ogQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=L6MUQ1tbioSW3GSoYIYn/xeLVsrx9dpTorhy7cwmJAWfQ6ER4bSiFOuWyODvNLfls 7v680UXIPsjToLsU57/BOOZP8lBO0vvcVFkQRWXNnUnZe8QvSa/IRLKIvtNeN7hgza W/hh1EdH5B9E9qykHZAbLio3gn8E9Y6PClxI9uGc= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mark Rutland , Peter Maydell , Marc Zyngier , Sasha Levin , kvmarm@lists.cs.columbia.edu Subject: [PATCH AUTOSEL 4.14 110/170] arm64: KVM: Skip MMIO insn after emulation Date: Mon, 28 Jan 2019 11:11:00 -0500 Message-Id: <20190128161200.55107-110-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190128161200.55107-1-sashal@kernel.org> References: <20190128161200.55107-1-sashal@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland [ Upstream commit 0d640732dbebed0f10f18526de21652931f0b2f2 ] When we emulate an MMIO instruction, we advance the CPU state within decode_hsr(), before emulating the instruction effects. Having this logic in decode_hsr() is opaque, and advancing the state before emulation is problematic. It gets in the way of applying consistent single-step logic, and it prevents us from being able to fail an MMIO instruction with a synchronous exception. Clean this up by only advancing the CPU state *after* the effects of the instruction are emulated. Cc: Peter Maydell Reviewed-by: Alex Bennée Reviewed-by: Christoffer Dall Signed-off-by: Mark Rutland Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- virt/kvm/arm/mmio.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/virt/kvm/arm/mmio.c b/virt/kvm/arm/mmio.c index dac7ceb1a677..08443a15e6be 100644 --- a/virt/kvm/arm/mmio.c +++ b/virt/kvm/arm/mmio.c @@ -117,6 +117,12 @@ int kvm_handle_mmio_return(struct kvm_vcpu *vcpu, struct kvm_run *run) vcpu_set_reg(vcpu, vcpu->arch.mmio_decode.rt, data); } + /* + * The MMIO instruction is emulated and should not be re-executed + * in the guest. + */ + kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); + return 0; } @@ -144,11 +150,6 @@ static int decode_hsr(struct kvm_vcpu *vcpu, bool *is_write, int *len) vcpu->arch.mmio_decode.sign_extend = sign_extend; vcpu->arch.mmio_decode.rt = rt; - /* - * The MMIO instruction is emulated and should not be re-executed - * in the guest. - */ - kvm_skip_instr(vcpu, kvm_vcpu_trap_il_is32bit(vcpu)); return 0; } -- 2.19.1