From patchwork Tue Aug 27 16:04:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vitaly Kuznetsov X-Patchwork-Id: 11117237 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 E83DA1395 for ; Tue, 27 Aug 2019 16:04:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D13882173E for ; Tue, 27 Aug 2019 16:04:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730243AbfH0QER (ORCPT ); Tue, 27 Aug 2019 12:04:17 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49910 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730182AbfH0QEN (ORCPT ); Tue, 27 Aug 2019 12:04:13 -0400 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0D80069061 for ; Tue, 27 Aug 2019 16:04:13 +0000 (UTC) Received: by mail-wm1-f72.google.com with SMTP id c14so1248722wml.5 for ; Tue, 27 Aug 2019 09:04:12 -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=ATtFby2HHOKxvIMlAxWSWxfBwEvUPTz5bp6RBKSRe98=; b=g7bAdPJBhcMS8/WMkPMfx+uWVHVEG3GyuiG+bbtYHNaoz8LXDBtjW0oKz8cCYnmhts LZJVbP5svUCljLGfYP8urSn0vhopJhRM9TgKZBbY9LbzpoIu2Z3Io33FBac9UeDR50i+ l48ho8BPKkGxCyC2reIxYZFkp4jLOK+vQWgAEC/BzCewFFEpwIdO0lggfRkMr4/TdvPU /BjFgFUUtvMm53LWGNHiWdjH2xTh1Ai8EwzXki6kuonjXLItH8LGkfvmRZoluaVFmu35 SsEsPYY45f2elOxFl2Kg0xCCeLhzPtDZb7iP30RpY4BET/gGGWZGY286AhXn9FGiDbPK rv3Q== X-Gm-Message-State: APjAAAVecTC9jX0zOEFrIb7rmyfhZMfFdjcVpymOYQaFXUT+UrWwRDDm yv3rZVCb6qgfl7NN1ZAiPNWQQ7kPiTf7h+Ej0RTWV0Wike/h24cQrvMQ1Xi3qwXXExsC8kE0/ZS 533zkAofB9lHY X-Received: by 2002:a1c:b342:: with SMTP id c63mr29455687wmf.84.1566921851187; Tue, 27 Aug 2019 09:04:11 -0700 (PDT) X-Google-Smtp-Source: APXvYqw5+ZjwKbX+HfEYgJbnHxYapRoHIk9gLuCdB4RLCgMobGff6yZoB0Y/LUoJdbxRNnPysx3N+A== X-Received: by 2002:a1c:b342:: with SMTP id c63mr29455658wmf.84.1566921850970; Tue, 27 Aug 2019 09:04:10 -0700 (PDT) Received: from vitty.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id n8sm13461246wro.89.2019.08.27.09.04.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Aug 2019 09:04:09 -0700 (PDT) From: Vitaly Kuznetsov To: kvm@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Paolo Bonzini , =?utf-8?b?UmFkaW0gS3LEjW3DocWZ?= , Joerg Roedel , Jim Mattson , Sean Christopherson , Roman Kagan Subject: [PATCH 3/3] KVM: x86: announce KVM_CAP_HYPERV_ENLIGHTENED_VMCS support only when it is available Date: Tue, 27 Aug 2019 18:04:04 +0200 Message-Id: <20190827160404.14098-4-vkuznets@redhat.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190827160404.14098-1-vkuznets@redhat.com> References: <20190827160404.14098-1-vkuznets@redhat.com> MIME-Version: 1.0 Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org It was discovered that after commit 65efa61dc0d5 ("selftests: kvm: provide common function to enable eVMCS") hyperv_cpuid selftest is failing on AMD. The reason is that the commit changed _vcpu_ioctl() to vcpu_ioctl() in the test and this one can't fail. Instead of fixing the test is seems to make more sense to not announce KVM_CAP_HYPERV_ENLIGHTENED_VMCS support if it is definitely missing (on svm and in case kvm_intel.nested=0). Signed-off-by: Vitaly Kuznetsov --- arch/x86/kvm/x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index d1cd0fcff9e7..ef2e8b138300 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3106,7 +3106,6 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) case KVM_CAP_HYPERV_EVENTFD: case KVM_CAP_HYPERV_TLBFLUSH: case KVM_CAP_HYPERV_SEND_IPI: - case KVM_CAP_HYPERV_ENLIGHTENED_VMCS: case KVM_CAP_HYPERV_CPUID: case KVM_CAP_PCI_SEGMENT: case KVM_CAP_DEBUGREGS: @@ -3183,6 +3182,8 @@ int kvm_vm_ioctl_check_extension(struct kvm *kvm, long ext) r = kvm_x86_ops->get_nested_state ? kvm_x86_ops->get_nested_state(NULL, NULL, 0) : 0; break; + case KVM_CAP_HYPERV_ENLIGHTENED_VMCS: + r = kvm_x86_ops->nested_enable_evmcs != NULL; default: break; }