Received: by 2002:a05:6a10:1287:0:0:0:0 with SMTP id d7csp636309pxv; Thu, 22 Jul 2021 08:41:38 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz5KreqQyVV5jFhX4Xb0kQfXXYUwLucXb9vvnvoYtKmPT5HTBIPHH1jOoT8ucd29euxhxmA X-Received: by 2002:a92:d8d1:: with SMTP id l17mr289933ilo.187.1626968498375; Thu, 22 Jul 2021 08:41:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626968498; cv=none; d=google.com; s=arc-20160816; b=HbJNn3YYG41O+oRnnNFU4zrdzl9iIszWq8dVYsSo6Zmqn+ms06eIDf5yyo1+sVpePV SW53nkXGlGdBgC3feX+GP7z8HuijgzCGTjtLIcDMa7WOj8Nr9WBSDuBG7Ds8YxcW10qH 2EClaMEC6NaaqllIci/2JahbzIR6jQu2cTPQFeMY5ZXjR+03x7BLH2rATRux0Um1XZnD /a+Ghd2F1QXD7B/6x15neroFU2hNDyvGhC473D8mFxJhGgElUCG9GwPs4FlhRpt53EH9 NkIJtv7YYkm8y2G75/8gnZoQLhGcgvdfAG1kso3YXnXkvKt8Erqn3s71EcFmDmr/s+zL o5Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=SEhg4S6nFbf1uARdrzetepOUBYKfp4wLBDEW5V4gz1U=; b=olBAsVr+SPTPQiWr8XN4XuXtl6TgouDsUDouia9lgU3iGPczwhytCTh8KE224dLgBx /+VPcI0qaP8iqLgtim/Wpw9+gt2Znbyqtv1VAk/m2j99wYi1xn2p7cOCXxTabKhM8fkx h8lO6YQ6R0OkJWNc3X4cV24GbNEi7opNw5hJT3S+twuXHD6IMWU0q5vW2T8L3iYbLrar gm+P64WRGkgX6B7ReDlv4Yh3UBQ7AI6vLCSjpwlCOKWFN88+siviSS8J79Bo26p8DLyn wnGjcbOt2o+bn8X4HJiUScEWmivWt7htK5LVWtohwpSx/Xgj/0iGfimHyjhhLYFHp5Pb vfhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="I6Qz/AO+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id h41si9105826jaa.50.2021.07.22.08.41.24; Thu, 22 Jul 2021 08:41:38 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b="I6Qz/AO+"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232632AbhGVPAD (ORCPT + 99 others); Thu, 22 Jul 2021 11:00:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232568AbhGVPAC (ORCPT ); Thu, 22 Jul 2021 11:00:02 -0400 Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 43979C061575 for ; Thu, 22 Jul 2021 08:40:36 -0700 (PDT) Received: by mail-lf1-x134.google.com with SMTP id f30so9151447lfv.10 for ; Thu, 22 Jul 2021 08:40:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=SEhg4S6nFbf1uARdrzetepOUBYKfp4wLBDEW5V4gz1U=; b=I6Qz/AO+KjpQSoLm6Jn7rg3CaUXlghY++G0hbFLOSjk+0Cc9XJWyJAQ7v+PY9JJpFB 85R/hZTSRR9i32C7x+bcX8ISFZwUPP4W9wS4ujrwAEvdhwjaoq1P+quNjVx+w8zp5ySs be9kHeZO5LgHLEA0OQyFJ2Z5rsKEDkvkpottTo6p04ZmOOFFS8OJ7Efw7AhBoTKkFNx8 TUcDFQSYETMc+JYGhxpwO22RJzIts8/P9Rzdf77do5y6S0FmekzCzLrLQbs6wMHAkBK/ 0oHgyGW3ulWIkm4uEI+3hZO6EjW0JjQYSaAz3rFmSvZbz0Zz+8M3FmhSHQ7nD/72QM6d hwhA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=SEhg4S6nFbf1uARdrzetepOUBYKfp4wLBDEW5V4gz1U=; b=dTVhXEjinTrU0TnohQOkh+04sor6Wfi/b6Ozl/XRC2HAqjIA0t3kP1h6KUDhRO8FiS IOHnefnac4d2ht1/WdRHQiz/yVVBgVzdvshmP6fBQytWDoEY3g5tsY7LhiUewcoJNm5F M4vONULa3FfMIWHaXSwLLBIJ6wGoe8viFRzV2yoRGY/DZ6pjlx3x6ZxAdUppVWWeZuRu zGC5536Wukt0ILtSdFiyO6TJMTdvU7Cf74CR9omBeKRdHdb9C6+S5nScArWlx9bqMYue xZzcbfVpcZWDAn5uE1IFAOSj+cx5B9sVE/XySZOaoD6VMFCtY5R+mxV7popHByDQlCRo 64Qw== X-Gm-Message-State: AOAM530Nk+eN+sBcumNGqufWie9GRBoGNc0PIh0JBFUYFiidZs6a2yBy /xXcSp9wL9dtCwhyWI7YOPcnfq46zjmcg1EzJAD9iQ== X-Received: by 2002:a19:ae0f:: with SMTP id f15mr82349lfc.117.1626968434179; Thu, 22 Jul 2021 08:40:34 -0700 (PDT) MIME-Version: 1.0 References: <20210722123018.260035-1-vkuznets@redhat.com> In-Reply-To: From: Oliver Upton Date: Thu, 22 Jul 2021 08:40:23 -0700 Message-ID: Subject: Re: [PATCH] KVM: x86: Check the right feature bit for MSR_KVM_ASYNC_PF_ACK access To: Maxim Levitsky Cc: Vitaly Kuznetsov , kvm@vger.kernel.org, Paolo Bonzini , Sean Christopherson , Wanpeng Li , Jim Mattson , linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, Jul 22, 2021 at 5:39 AM Maxim Levitsky wrote: > > On Thu, 2021-07-22 at 14:30 +0200, Vitaly Kuznetsov wrote: > > MSR_KVM_ASYNC_PF_ACK MSR is part of interrupt based asynchronous page fault > > interface and not the original (deprecated) KVM_FEATURE_ASYNC_PF. This is > > stated in Documentation/virt/kvm/msr.rst. > > > > Fixes: 66570e966dd9 ("kvm: x86: only provide PV features if enabled in guest's CPUID") > > Signed-off-by: Vitaly Kuznetsov > > --- > > arch/x86/kvm/x86.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c > > index d715ae9f9108..88ff7a1af198 100644 > > --- a/arch/x86/kvm/x86.c > > +++ b/arch/x86/kvm/x86.c > > @@ -3406,7 +3406,7 @@ int kvm_set_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > > return 1; > > break; > > case MSR_KVM_ASYNC_PF_ACK: > > - if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF)) > > + if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF_INT)) > > return 1; > > if (data & 0x1) { > > vcpu->arch.apf.pageready_pending = false; > > @@ -3745,7 +3745,7 @@ int kvm_get_msr_common(struct kvm_vcpu *vcpu, struct msr_data *msr_info) > > msr_info->data = vcpu->arch.apf.msr_int_val; > > break; > > case MSR_KVM_ASYNC_PF_ACK: > > - if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF)) > > + if (!guest_pv_has(vcpu, KVM_FEATURE_ASYNC_PF_INT)) > > return 1; > > > > msr_info->data = 0; > > Reviewed-by: Maxim Levitsky > > Best regards, > Maxim Levitsky > Reviewed-by: Oliver Upton -- Thanks, Oliver