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.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 815CFC31E40 for ; Tue, 6 Aug 2019 06:01:58 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5FFA02147A for ; Tue, 6 Aug 2019 06:01:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731765AbfHFGB5 (ORCPT ); Tue, 6 Aug 2019 02:01:57 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:41759 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731557AbfHFGB4 (ORCPT ); Tue, 6 Aug 2019 02:01:56 -0400 Received: by mail-wr1-f68.google.com with SMTP id c2so83342335wrm.8 for ; Mon, 05 Aug 2019 23:01:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=yAuOdcFvKcJE+TJQBnlj7YZrsenOZm0DkL2Ya79xDlk=; b=KJvvUWwTV2OIuEoiInL8w0UDT/jtCuaJrlh4RQNf/B1+AkJ37HIPf9xD57tn9jYYdQ 4d3ujphQE6yCfV7JiXnpMQ4LWHblCCu5lJLpN+wmkYnHV+rVGR/qgLhNSUtQL2qX5CTY 5vhSXTQVffKiKpomIeiVwOjV8DFlJJ8+G6K+XU1H+cBLH/T1kv/QVUNVrQLJcR+H0nzQ tGd+8byb0K0of8BjUScwdfIG5mFfnCIwNlM8CRRdzhuHPUOAxVXCegvlMfgM4O3tijBN EhHnLTz1pehwaa627ILPVoCidfxVA150rdyaQWRszTLFJ2LcJ+VULzUHQfg7llmDDQTH gF2w== X-Gm-Message-State: APjAAAWq0gfI4zSTMbMtxQg/vmTvEci2lMnLy6cNz6YpeZRtYBXwIGBS u+3ePBwL2tpEhInR3K69MgSIHg== X-Google-Smtp-Source: APXvYqwiXF1AxGJU6sydSioAj2Kx1NEbKgbGzojrBQjdzJNbV+M2zF0ErfZ5H9XpyXimTCxAOZa3Bg== X-Received: by 2002:adf:db09:: with SMTP id s9mr1692425wri.214.1565071314493; Mon, 05 Aug 2019 23:01:54 -0700 (PDT) Received: from vitty.brq.redhat.com (ip-89-176-127-93.net.upcbroadband.cz. [89.176.127.93]) by smtp.gmail.com with ESMTPSA id r5sm94216756wmh.35.2019.08.05.23.01.53 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 05 Aug 2019 23:01:54 -0700 (PDT) From: Vitaly Kuznetsov To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Joerg Roedel , Jim Mattson , Sean Christopherson Subject: [PATCH v2 1/5] x86: KVM: svm: don't pretend to advance RIP in case wrmsr_interception() results in #GP Date: Tue, 6 Aug 2019 08:01:46 +0200 Message-Id: <20190806060150.32360-2-vkuznets@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190806060150.32360-1-vkuznets@redhat.com> References: <20190806060150.32360-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org svm->next_rip is only used by skip_emulated_instruction() and in case kvm_set_msr() fails we rightfully don't do that. Move svm->next_rip advancement to 'else' branch to avoid creating false impression that it's always advanced (and make it look like rdmsr_interception()). This is a preparatory change to removing hardcoded RIP advancement from instruction intercepts, no functional change. Signed-off-by: Vitaly Kuznetsov --- arch/x86/kvm/svm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c index 7eafc6907861..7e843b340490 100644 --- a/arch/x86/kvm/svm.c +++ b/arch/x86/kvm/svm.c @@ -4447,13 +4447,13 @@ static int wrmsr_interception(struct vcpu_svm *svm) msr.index = ecx; msr.host_initiated = false; - svm->next_rip = kvm_rip_read(&svm->vcpu) + 2; if (kvm_set_msr(&svm->vcpu, &msr)) { trace_kvm_msr_write_ex(ecx, data); kvm_inject_gp(&svm->vcpu, 0); return 1; } else { trace_kvm_msr_write(ecx, data); + svm->next_rip = kvm_rip_read(&svm->vcpu) + 2; return kvm_skip_emulated_instruction(&svm->vcpu); } } -- 2.20.1