From nobody Tue May 14 14:15:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1686559443; cv=none; d=zohomail.com; s=zohoarc; b=csz7X5WSGrQTJeGsYf/98kKsSStcOQA/GRmEEi+W62EqxTMPJv09BOyEV4cBjt/NzRqJOnwYcYr5iRrnx0X9TZ5uGUcwmEATU0ke58St60O13GmLe0pywRDAj+xuJkWoksAyvE5u255clTbzJKZ4o3NwFscBr22Mg+jUmQ/WCJs= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686559443; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=GJ9XKKQfCBUj1wypA/gFlaBPTwyYRcYctE4LP9sVCSc=; b=TfKimgRchvHBIJ0adrPVM7UOFLfinLKrTD5yKFNQHegiEsdOScnXjbHdJNXPn1+f7d4o4ApWlOga67mKVLVxLu66In4xSWN5uItCHdVt6Jp/1P1OgMzWmQehJqsFH5JafaAxK5EbYEMr1PtzvRjr8Y98TWYnUqcUJM1dFP1IDv8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686559443687854.0840281330244; Mon, 12 Jun 2023 01:44:03 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8d8y-0003zf-NF; Mon, 12 Jun 2023 04:43:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8d8r-0003yv-Fm for qemu-devel@nongnu.org; Mon, 12 Jun 2023 04:43:15 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8d8p-0007XO-5A for qemu-devel@nongnu.org; Mon, 12 Jun 2023 04:43:12 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-556-Tpx3jYLmPFGxip2nyy047Q-1; Mon, 12 Jun 2023 04:42:04 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B94028028B2 for ; Mon, 12 Jun 2023 08:42:03 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id 077351121314; Mon, 12 Jun 2023 08:42:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686559389; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GJ9XKKQfCBUj1wypA/gFlaBPTwyYRcYctE4LP9sVCSc=; b=JGWXiPyowsTZ1J7GbH1XDNXfzPuuhivFRmmuyDMBwaUpIuz3l4X/ihTTDGv4/CI3bnDMvL nGiCuk2PF/MNJnyapt8YOXAigdj/0sG02H0CEWU8RFZjyjuGtisJUx5OzmwK0DS1U7k/Qu 5RI7GJf2t6uJPS0BgQjQ4tfry3yw1Sw= X-MC-Unique: Tpx3jYLmPFGxip2nyy047Q-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Marcelo Tosatti Subject: [PATCH 1/2] i386: Fix conditional CONFIG_SYNDBG enablement Date: Mon, 12 Jun 2023 10:42:00 +0200 Message-Id: <20230612084201.294248-2-vkuznets@redhat.com> In-Reply-To: <20230612084201.294248-1-vkuznets@redhat.com> References: <20230612084201.294248-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1686559444879100001 Content-Type: text/plain; charset="utf-8" Putting HYPERV_FEAT_SYNDBG entry under "#ifdef CONFIG_SYNDBG" in 'kvm_hyperv_properties' array is wrong: as HYPERV_FEAT_SYNDBG is not the highest feature number, the result is an empty (zeroed) entry in the array (and not a skipped entry!). hyperv_feature_supported() is designed to check that all CPUID bits are set but for a zeroed feature in 'kvm_hyperv_properties' it returns 'true' so QEMU considers HYPERV_FEAT_SYNDBG as always supported, regardless of whether KVM host actually supports it. To fix the issue, leave HYPERV_FEAT_SYNDBG's definition in 'kvm_hyperv_properties' array, there's nothing wrong in having it defined even when 'CONFIG_SYNDBG' is not set. Instead, put "hv-syndbg" CPU property under '#ifdef CONFIG_SYNDBG' to alter the existing behavior when the flag is silently skipped in !CONFIG_SYNDBG builds. Leave an 'assert' sentinel in hyperv_feature_supported() making sure there are no 'holes' or improperly defined features in 'kvm_hyperv_properties'. Fixes: d8701185f40c ("hw: hyperv: Initial commit for Synthetic Debugging de= vice") Signed-off-by: Vitaly Kuznetsov --- target/i386/cpu.c | 2 ++ target/i386/kvm/kvm.c | 11 +++++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1242bd541a53..caa207849e9a 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7564,8 +7564,10 @@ static Property x86_cpu_properties[] =3D { HYPERV_FEAT_TLBFLUSH_DIRECT, 0), DEFINE_PROP_ON_OFF_AUTO("hv-no-nonarch-coresharing", X86CPU, hyperv_no_nonarch_cs, ON_OFF_AUTO_OFF), +#ifdef CONFIG_SYNDBG DEFINE_PROP_BIT64("hv-syndbg", X86CPU, hyperv_features, HYPERV_FEAT_SYNDBG, 0), +#endif DEFINE_PROP_BOOL("hv-passthrough", X86CPU, hyperv_passthrough, false), DEFINE_PROP_BOOL("hv-enforce-cpuid", X86CPU, hyperv_enforce_cpuid, fal= se), =20 diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index de531842f6b1..88c75f58f0a6 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -989,7 +989,6 @@ static struct { .bits =3D HV_DEPRECATING_AEOI_RECOMMENDED} } }, -#ifdef CONFIG_SYNDBG [HYPERV_FEAT_SYNDBG] =3D { .desc =3D "Enable synthetic kernel debugger channel (hv-syndbg)", .flags =3D { @@ -998,7 +997,6 @@ static struct { }, .dependencies =3D BIT(HYPERV_FEAT_SYNIC) | BIT(HYPERV_FEAT_RELAXED) }, -#endif [HYPERV_FEAT_MSR_BITMAP] =3D { .desc =3D "enlightened MSR-Bitmap (hv-emsr-bitmap)", .flags =3D { @@ -1250,6 +1248,13 @@ static bool hyperv_feature_supported(CPUState *cs, i= nt feature) uint32_t func, bits; int i, reg; =20 + /* + * kvm_hyperv_properties needs to define at least one CPUID flag which + * must be used to detect the feature, it's hard to say whether it is + * supported or not otherwise. + */ + assert(kvm_hyperv_properties[feature].flags[0].func); + for (i =3D 0; i < ARRAY_SIZE(kvm_hyperv_properties[feature].flags); i+= +) { =20 func =3D kvm_hyperv_properties[feature].flags[i].func; @@ -3474,13 +3479,11 @@ static int kvm_put_msrs(X86CPU *cpu, int level) kvm_msr_entry_add(cpu, HV_X64_MSR_TSC_EMULATION_STATUS, env->msr_hv_tsc_emulation_status); } -#ifdef CONFIG_SYNDBG if (hyperv_feat_enabled(cpu, HYPERV_FEAT_SYNDBG) && has_msr_hv_syndbg_options) { kvm_msr_entry_add(cpu, HV_X64_MSR_SYNDBG_OPTIONS, hyperv_syndbg_query_options()); } -#endif } if (hyperv_feat_enabled(cpu, HYPERV_FEAT_VAPIC)) { kvm_msr_entry_add(cpu, HV_X64_MSR_APIC_ASSIST_PAGE, --=20 2.40.1 From nobody Tue May 14 14:15:38 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1686559420; cv=none; d=zohomail.com; s=zohoarc; b=ijrDaLWn43M87E/4pgazb+6QuYD6V/zEyQsK0O1cw4z0rzTGH5iSvuo43d3ZRjPOSAQ/y2BYwu1R3k/LD/ErO3x8QcLLSyhDgCVyDYftnD79WJm1w39LWHlh+CL6Qyskgg1U68AKm9PF/MIOjXyvnWApTTc/VJxCmHe9BzStPjw= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1686559420; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=VLeX5r1RVd/ZZXyvkTRggqADf6nnqM4ycmWtfKy5hwk=; b=HOvUkmG05l9eHPVNQ8fbbQNzIWyemFcBtiFxUL3nCkuvBzK6jpHINbeupZz7s/uSkpjUw+qf0y9J2MzoOvu/V5HTBuQYJJy03W36Jvf9q8K4Mq+gvQKexpOtRJkpZnsi876LoBQOFHjYMhQz9VPPrQiA9W1Tj/mhMNKikb304PE= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1686559420509267.60774171105083; Mon, 12 Jun 2023 01:43:40 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1q8d99-00040j-MG; Mon, 12 Jun 2023 04:43:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8d94-00040R-Ul for qemu-devel@nongnu.org; Mon, 12 Jun 2023 04:43:26 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1q8d93-0007bd-0i for qemu-devel@nongnu.org; Mon, 12 Jun 2023 04:43:26 -0400 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-558-em7XjRf6MECaiwkoIiMKzg-1; Mon, 12 Jun 2023 04:42:05 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id B70F9101AA6F for ; Mon, 12 Jun 2023 08:42:04 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.45.225.24]) by smtp.corp.redhat.com (Postfix) with ESMTP id F0F871121314; Mon, 12 Jun 2023 08:42:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1686559404; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VLeX5r1RVd/ZZXyvkTRggqADf6nnqM4ycmWtfKy5hwk=; b=YzybT7bjcaInkVZ794yqmv1tDLGQzKoqXqwVSNZC+4t0Ute2W3fjoRbsUtStd/n24tVPP5 6wBvDhmL6LAh7IvaRLYN+ZlChRcSPc/Jk6Kjq7gJKWsvUyZqjTjsmZaexpG750/HOL1bgR kLBt1PZekf9WwucPzRpTNuM/cCUDeJM= X-MC-Unique: em7XjRf6MECaiwkoIiMKzg-1 From: Vitaly Kuznetsov To: qemu-devel@nongnu.org, Paolo Bonzini Cc: Marcelo Tosatti Subject: [PATCH 2/2] i386: Exclude 'hv-syndbg' from 'hv-passthrough' Date: Mon, 12 Jun 2023 10:42:01 +0200 Message-Id: <20230612084201.294248-3-vkuznets@redhat.com> In-Reply-To: <20230612084201.294248-1-vkuznets@redhat.com> References: <20230612084201.294248-1-vkuznets@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.1 on 10.11.54.3 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=170.10.133.124; envelope-from=vkuznets@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H5=-1, RCVD_IN_MSPIKE_WL=-0.01, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1686559422592100001 Content-Type: text/plain; charset="utf-8" Windows with Hyper-V role enabled doesn't boot with 'hv-passthrough' when no debugger is configured, this significantly limits the usefulness of the feature as there's no support for subtracting Hyper-V features from CPU flags at this moment (e.g. "-cpu host,hv-passthrough,-hv-syndbg" does not work). While this is also theoretically fixable, 'hv-syndbg' is likely very special and unneeded in the default set. Genuine Hyper-V doesn't seem to enable it either. Introduce 'skip_passthrough' flag to 'kvm_hyperv_properties' and use it as one-off to skip 'hv-syndbg' when enabling features in 'hv-passthrough' mode. Note, "-cpu host,hv-passthrough,hv-syndbg" can still be used if needed. As both 'hv-passthrough' and 'hv-syndbg' are debug features, the change should not have any effect on production environments. Signed-off-by: Vitaly Kuznetsov --- docs/system/i386/hyperv.rst | 13 +++++++++---- target/i386/kvm/kvm.c | 7 +++++-- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/docs/system/i386/hyperv.rst b/docs/system/i386/hyperv.rst index 2505dc4c86e0..009947e39141 100644 --- a/docs/system/i386/hyperv.rst +++ b/docs/system/i386/hyperv.rst @@ -262,14 +262,19 @@ Supplementary features ``hv-passthrough`` In some cases (e.g. during development) it may make sense to use QEMU in 'pass-through' mode and give Windows guests all enlightenments currently - supported by KVM. This pass-through mode is enabled by "hv-passthrough" = CPU - flag. + supported by KVM. =20 Note: ``hv-passthrough`` flag only enables enlightenments which are know= n to QEMU (have corresponding 'hv-' flag) and copies ``hv-spinlocks`` and ``hv-ven= dor-id`` values from KVM to QEMU. ``hv-passthrough`` overrides all other 'hv-' se= ttings on - the command line. Also, enabling this flag effectively prevents migratio= n as the - list of enabled enlightenments may differ between target and destination= hosts. + the command line. + + Note: ``hv-passthrough`` does not enable ``hv-syndbg`` which can prevent= certain + Windows guests from booting when used without proper configuration. If n= eeded, + ``hv-syndbg`` can be enabled additionally. + + Note: ``hv-passthrough`` effectively prevents migration as the list of e= nabled + enlightenments may differ between target and destination hosts. =20 ``hv-enforce-cpuid`` By default, KVM allows the guest to use all currently supported Hyper-V diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index 88c75f58f0a6..fbaaacf9877c 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -867,6 +867,7 @@ static struct { uint32_t bits; } flags[2]; uint64_t dependencies; + bool skip_passthrough; } kvm_hyperv_properties[] =3D { [HYPERV_FEAT_RELAXED] =3D { .desc =3D "relaxed timing (hv-relaxed)", @@ -995,7 +996,8 @@ static struct { {.func =3D HV_CPUID_FEATURES, .reg =3D R_EDX, .bits =3D HV_FEATURE_DEBUG_MSRS_AVAILABLE} }, - .dependencies =3D BIT(HYPERV_FEAT_SYNIC) | BIT(HYPERV_FEAT_RELAXED) + .dependencies =3D BIT(HYPERV_FEAT_SYNIC) | BIT(HYPERV_FEAT_RELAXED= ), + .skip_passthrough =3D true, }, [HYPERV_FEAT_MSR_BITMAP] =3D { .desc =3D "enlightened MSR-Bitmap (hv-emsr-bitmap)", @@ -1404,7 +1406,8 @@ bool kvm_hyperv_expand_features(X86CPU *cpu, Error **= errp) * hv_build_cpuid_leaf() uses this info to build guest CPUIDs. */ for (feat =3D 0; feat < ARRAY_SIZE(kvm_hyperv_properties); feat++)= { - if (hyperv_feature_supported(cs, feat)) { + if (hyperv_feature_supported(cs, feat) && + !kvm_hyperv_properties[feat].skip_passthrough) { cpu->hyperv_features |=3D BIT(feat); } } --=20 2.40.1