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=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 8B689C282CE for ; Tue, 4 Jun 2019 17:27:07 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 711792070D for ; Tue, 4 Jun 2019 17:27:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726613AbfFDR1G (ORCPT ); Tue, 4 Jun 2019 13:27:06 -0400 Received: from mail-wr1-f68.google.com ([209.85.221.68]:43863 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726490AbfFDR1F (ORCPT ); Tue, 4 Jun 2019 13:27:05 -0400 Received: by mail-wr1-f68.google.com with SMTP id r18so7695032wrm.10 for ; Tue, 04 Jun 2019 10:27:04 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=cr8BrjNtYOFxwy5Oy3Ej0/Q0CeyJqGrrVrumTp5GPGk=; b=ivLR8qFxVnczPdvd+mUvRiZpip7eyN2BFAegQsybMFu9Z7GHkduhRwtQpLbCOoquCf zncTWa0rQV6/nFphdrCyQ5xobtRZo0b2JGr+PsuJ9MSzwP1NbdCSLU22F0FJT8xfFTNt 4xcV1V+owlrLyUUr+/uKPg2+npU/5sGBAPpLiU0JqtCKy9JBHctV2qfsmzENT5DjQHHm kqp91ZGzYZEDDh9ZMp8Ayj7LUPvZwiKPIfDgeAmDju/N2fQT+jsrg2WCMUWvH7S84noI xQLwF1wFbGRyU5bi+Oz5DyMu3D978FjW7rNYk+LrUwSK6yIGcfo+bopEwaEHWjMi4GpY TLew== X-Gm-Message-State: APjAAAWvEiUexV0OXeqoylEujlpLla3alQ2rd+UfWO/87JWA6eBm5ubs q9F4eT7wYRYD7JWk/V/rsMFaMQ== X-Google-Smtp-Source: APXvYqx4G9q7ov7opkOXQO89pAuJTMeIfDaTqoZ9C8zOKa6K/iDhYHQv9TF4FSA5nJLp//i1V//moQ== X-Received: by 2002:adf:e7c9:: with SMTP id e9mr7538350wrn.321.1559669224002; Tue, 04 Jun 2019 10:27:04 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:657f:501:149f:5617? ([2001:b07:6468:f312:657f:501:149f:5617]) by smtp.gmail.com with ESMTPSA id o21sm18023538wmc.46.2019.06.04.10.27.02 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Tue, 04 Jun 2019 10:27:03 -0700 (PDT) Subject: Re: [PATCH] KVM/nSVM: properly map nested VMCB To: Vitaly Kuznetsov , kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, =?UTF-8?B?UmFkaW0gS3LEjW3DocWZ?= , Joerg Roedel , KarimAllah Ahmed References: <20190604160939.17031-1-vkuznets@redhat.com> From: Paolo Bonzini Message-ID: Date: Tue, 4 Jun 2019 19:27:02 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <20190604160939.17031-1-vkuznets@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 04/06/19 18:09, Vitaly Kuznetsov wrote: > Commit 8c5fbf1a7231 ("KVM/nSVM: Use the new mapping API for mapping guest > memory") broke nested SVM completely: kvm_vcpu_map()'s second parameter is > GFN so vmcb_gpa needs to be converted with gpa_to_gfn(), not the other way > around. > > Fixes: 8c5fbf1a7231 ("KVM/nSVM: Use the new mapping API for mapping guest memory") > Signed-off-by: Vitaly Kuznetsov > --- > arch/x86/kvm/svm.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/x86/kvm/svm.c b/arch/x86/kvm/svm.c > index 735b8c01895e..5beca1030c9a 100644 > --- a/arch/x86/kvm/svm.c > +++ b/arch/x86/kvm/svm.c > @@ -3293,7 +3293,7 @@ static int nested_svm_vmexit(struct vcpu_svm *svm) > vmcb->control.exit_int_info_err, > KVM_ISA_SVM); > > - rc = kvm_vcpu_map(&svm->vcpu, gfn_to_gpa(svm->nested.vmcb), &map); > + rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(svm->nested.vmcb), &map); > if (rc) { > if (rc == -EINVAL) > kvm_inject_gp(&svm->vcpu, 0); > @@ -3583,7 +3583,7 @@ static bool nested_svm_vmrun(struct vcpu_svm *svm) > > vmcb_gpa = svm->vmcb->save.rax; > > - rc = kvm_vcpu_map(&svm->vcpu, gfn_to_gpa(vmcb_gpa), &map); > + rc = kvm_vcpu_map(&svm->vcpu, gpa_to_gfn(vmcb_gpa), &map); > if (rc) { > if (rc == -EINVAL) > kvm_inject_gp(&svm->vcpu, 0); > Oops. Queued, thanks. Paolo