Received: by 2002:a05:6a10:17d3:0:0:0:0 with SMTP id hz19csp2817876pxb; Tue, 13 Apr 2021 10:51:47 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwcgzbuxhJMx4KhNEGkeZdao51NxOL756tX3FvNRbbq49rQi8yAITaKByNCosM61oeaBd7v X-Received: by 2002:aa7:c451:: with SMTP id n17mr36264839edr.197.1618336307542; Tue, 13 Apr 2021 10:51:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618336307; cv=none; d=google.com; s=arc-20160816; b=pHGNU9ITeomC8IUn9v1AJte5d15v7hZK8Lg/SGovEtxX5l59/yYk0e79cNWQufa2wm 8Ed1Ui3h7bYsxEqmhUsLQOxUlNQOHz0AcPa7EnUh+rlqX3DJPjeJbRdlF0LxjbBSdcPD gOU9YXOeGM+5QEIjOcKbDBo6+X86iJK+5R3YVAOub7NMchOaCPeV5UtU4Pz7jgKHLsnJ BBBmfxN+oCWnHnZxOZue0AjjocfFDM1iY8JmYPbgzMWeAM0HF4+rijNnCfqQ+UN0T8I/ zcmToA8r2tOGElnPCVEtFujjnvAirKqAF+Daf7pkoxWJAD//v+tdJflxcTb0x8lATqzp vCfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=4xtkR+la884G0GZlwBjdyXQVnue3TEt0UwAvDqmJdh4=; b=NRkKpE/mCgU6HA8rG2eugUwrzyYfTzmG7uLCfOsCugbnl+pR6ycPOPv1LBX4Bl9KPi dzJOlUBinWmRjWhoH9i5qHR4qPZLYq9KPpqNQGNAO7N1kjaLCDxHVaYE0PQCfEpCmvcD TEU8gWS+DRPjIY9Abn0SBOM5/6KEMpwKH0RJEnCdehsZHcsXKKfrBanw8R0VcD34zfbG eHfJ93o9c72PlLBv7ux/QCaT92ibGFvK3mzb4Mui3csh/qZ3AggouP1uzv1ypUD2TdZn ZUaesDdAkWMFjk/cA4cvYTUDrSB+sG5KC8t4rgrYoculO6AMPVLLAG/WHMbQeOla6Yxz Kjwg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ntk1xPDV; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a23si10164759edy.94.2021.04.13.10.51.21; Tue, 13 Apr 2021 10:51:47 -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=@redhat.com header.s=mimecast20190719 header.b=Ntk1xPDV; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345856AbhDMM2u (ORCPT + 99 others); Tue, 13 Apr 2021 08:28:50 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:20598 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345674AbhDMM1r (ORCPT ); Tue, 13 Apr 2021 08:27:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1618316848; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=4xtkR+la884G0GZlwBjdyXQVnue3TEt0UwAvDqmJdh4=; b=Ntk1xPDVNzVBKUfA7VyiIfxB3RXgEWj6ROD3b/BKFNOiELrTdmgm0XZ1KmPP7BSxZznXKp cOBL3avUIcdv9uACjc24TWdMwKGS1Fhig6ztChoZRwmFJyo6Wr57XX/D7fA3GUKwvgK655 /2b0qlfWv8HvOWnZP4G6GQ+c9ePVf7A= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-538-wr1BQZ7aNIGpA_Ns600GXg-1; Tue, 13 Apr 2021 08:27:26 -0400 X-MC-Unique: wr1BQZ7aNIGpA_Ns600GXg-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 8E2A5107ACCA; Tue, 13 Apr 2021 12:27:24 +0000 (UTC) Received: from vitty.brq.redhat.com (unknown [10.40.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A25E60C04; Tue, 13 Apr 2021 12:27:22 +0000 (UTC) From: Vitaly Kuznetsov To: kvm@vger.kernel.org, Paolo Bonzini Cc: Sean Christopherson , Wanpeng Li , Jim Mattson , Siddharth Chandrasekaran , linux-kernel@vger.kernel.org, linux-hyperv@vger.kernel.org Subject: [PATCH RFC 15/22] KVM: x86: hyper-v: Honor HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE privilege bit Date: Tue, 13 Apr 2021 14:26:23 +0200 Message-Id: <20210413122630.975617-16-vkuznets@redhat.com> In-Reply-To: <20210413122630.975617-1-vkuznets@redhat.com> References: <20210413122630.975617-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Synthetic debugging MSRs (HV_X64_MSR_SYNDBG_CONTROL, HV_X64_MSR_SYNDBG_STATUS, HV_X64_MSR_SYNDBG_SEND_BUFFER, HV_X64_MSR_SYNDBG_RECV_BUFFER, HV_X64_MSR_SYNDBG_PENDING_BUFFER, HV_X64_MSR_SYNDBG_OPTIONS) are only available to guest when HV_FEATURE_GUEST_CRASH_MSR_AVAILABLE bit is exposed. Signed-off-by: Vitaly Kuznetsov --- arch/x86/kvm/hyperv.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/x86/kvm/hyperv.c b/arch/x86/kvm/hyperv.c index 0678f1012ed7..1299847c89ba 100644 --- a/arch/x86/kvm/hyperv.c +++ b/arch/x86/kvm/hyperv.c @@ -312,7 +312,9 @@ static int syndbg_set_msr(struct kvm_vcpu *vcpu, u32 msr, u64 data, bool host) { struct kvm_hv_syndbg *syndbg = to_hv_syndbg(vcpu); - if (!kvm_hv_is_syndbg_enabled(vcpu) && !host) + if (unlikely(!host && (!kvm_hv_is_syndbg_enabled(vcpu) || + !(to_hv_vcpu(vcpu)->cpuid_cache.features_edx & + HV_FEATURE_DEBUG_MSRS_AVAILABLE)))) return 1; trace_kvm_hv_syndbg_set_msr(vcpu->vcpu_id, @@ -351,7 +353,9 @@ static int syndbg_get_msr(struct kvm_vcpu *vcpu, u32 msr, u64 *pdata, bool host) { struct kvm_hv_syndbg *syndbg = to_hv_syndbg(vcpu); - if (!kvm_hv_is_syndbg_enabled(vcpu) && !host) + if (unlikely(!host && (!kvm_hv_is_syndbg_enabled(vcpu) || + !(to_hv_vcpu(vcpu)->cpuid_cache.features_edx & + HV_FEATURE_DEBUG_MSRS_AVAILABLE)))) return 1; switch (msr) { -- 2.30.2