From nobody Tue Feb 10 02:55:45 2026 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=1662637069; cv=none; d=zohomail.com; s=zohoarc; b=XNUiSwcAeW/IJZ3Xqg2lF5z722R3N2uyL8fwAuyX8IEoFqH/8HcR4H6ATL2SQ6lb46fr6Zwx+2Ml+VVxxVwNjBfRfzy+GAvP8gItRCIrCKBIU8s9Z7iqDGsJ5rEhPOuau2OxdHYyUVIuwQIw3MMxqAqbyS11qgNDhXZtpMxzU7k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1662637069; h=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=BXcShm0xkab//SpG2GV/N8lmXLzqOSC/0tZzxx8ejts=; b=jOcCVhMsJ8g/q6LqifoXXT89WBzwYz+NarJhiMLxMOLsVJLGHErxqUBQ39lzErUIAVyBmMg/GAUWg3OowwDOYT+4IsZafzJasyeEhBS0Xi5q1RO735rw2r1j8ffTtTA81jTLCcc569KC0276vUea1fEnkn8Y4xrWE2u8NLSuKZ0= 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 1662637069458129.0459833775593; Thu, 8 Sep 2022 04:37:49 -0700 (PDT) Received: from localhost ([::1]:38438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1oWFqt-00075f-EU for importer@patchew.org; Thu, 08 Sep 2022 07:37:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:38328) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWFkc-0002FY-E1 for qemu-devel@nongnu.org; Thu, 08 Sep 2022 07:31:18 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]:42557) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1oWFkZ-0005NI-Gh for qemu-devel@nongnu.org; Thu, 08 Sep 2022 07:31:16 -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-287-rPXqXCNgP_yS99PcbP1u6w-1; Thu, 08 Sep 2022 07:31:13 -0400 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 1D2EE1018AA1; Thu, 8 Sep 2022 11:31:13 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.194.14]) by smtp.corp.redhat.com (Postfix) with ESMTPS id C4B122026D4C; Thu, 8 Sep 2022 11:31:12 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C9ADC18017EC; Thu, 8 Sep 2022 13:31:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1662636674; 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=BXcShm0xkab//SpG2GV/N8lmXLzqOSC/0tZzxx8ejts=; b=JmmqBADUpdVMXkVN+vgQTmNZaVSc726JJEnax3TAs59CPAoZ4tWwbnKmsDBriKvyaZW56o 2BQyUps5t1DS56vqU8eGvLHw7PRvJwWYAty2h7b520g0ks7CbPNK5x6eBQZ5ai/9F6xFjy xS+AFmcHQw2JXbp7Rf4S+CSzmlLLwzU= X-MC-Unique: rPXqXCNgP_yS99PcbP1u6w-1 From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: kvm@vger.kernel.org, Paolo Bonzini , Marcel Apfelbaum , Marcelo Tosatti , Richard Henderson , "Michael S. Tsirkin" , Sergio Lopez , Eduardo Habkost , Gerd Hoffmann Subject: [PATCH v2 2/2] [RfC] expose host-phys-bits to guest Date: Thu, 8 Sep 2022 13:31:09 +0200 Message-Id: <20220908113109.470792-3-kraxel@redhat.com> In-Reply-To: <20220908113109.470792-1-kraxel@redhat.com> References: <20220908113109.470792-1-kraxel@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 2.78 on 10.11.54.4 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.129.124; envelope-from=kraxel@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -27 X-Spam_score: -2.8 X-Spam_bar: -- X-Spam_report: (-2.8 / 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_LOW=-0.7, 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" X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1662637071384100001 Content-Type: text/plain; charset="utf-8" Move "host-phys-bits" property from cpu->host_phys_bits to cpu->env.features[FEAT_KVM_HINTS] (KVM_HINTS_PHYS_ADDRESS_SIZE_DATA_VALID b= it). This has the effect that the guest can see whenever host-phys-bits is turned on or not and act accordingly. Signed-off-by: Gerd Hoffmann --- target/i386/cpu.h | 3 --- hw/i386/microvm.c | 7 ++++++- target/i386/cpu.c | 3 +-- target/i386/host-cpu.c | 5 ++++- target/i386/kvm/kvm.c | 1 + 5 files changed, 12 insertions(+), 7 deletions(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 82004b65b944..b9c6d3d9cac6 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -1898,9 +1898,6 @@ struct ArchCPU { /* if true fill the top bits of the MTRR_PHYSMASKn variable range */ bool fill_mtrr_mask; =20 - /* if true override the phys_bits value with a value read from the hos= t */ - bool host_phys_bits; - /* if set, limit maximum value for phys_bits when host_phys_bits is tr= ue */ uint8_t host_phys_bits_limit; =20 diff --git a/hw/i386/microvm.c b/hw/i386/microvm.c index 52cafa003d8a..316bbc8ef946 100644 --- a/hw/i386/microvm.c +++ b/hw/i386/microvm.c @@ -54,6 +54,8 @@ #include "kvm/kvm_i386.h" #include "hw/xen/start_info.h" =20 +#include "standard-headers/asm-x86/kvm_para.h" + #define MICROVM_QBOOT_FILENAME "qboot.rom" #define MICROVM_BIOS_FILENAME "bios-microvm.bin" =20 @@ -424,7 +426,10 @@ static void microvm_device_pre_plug_cb(HotplugHandler = *hotplug_dev, { X86CPU *cpu =3D X86_CPU(dev); =20 - cpu->host_phys_bits =3D true; /* need reliable phys-bits */ + /* need reliable phys-bits */ + cpu->env.features[FEAT_KVM_HINTS] |=3D + (1 << KVM_HINTS_PHYS_ADDRESS_SIZE_DATA_VALID); + x86_cpu_pre_plug(hotplug_dev, dev, errp); } =20 diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 1db1278a599b..d60f4498a3c3 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -778,7 +778,7 @@ FeatureWordInfo feature_word_info[FEATURE_WORDS] =3D { [FEAT_KVM_HINTS] =3D { .type =3D CPUID_FEATURE_WORD, .feat_names =3D { - "kvm-hint-dedicated", NULL, NULL, NULL, + "kvm-hint-dedicated", "host-phys-bits", NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, @@ -7016,7 +7016,6 @@ static Property x86_cpu_properties[] =3D { DEFINE_PROP_BOOL("x-force-features", X86CPU, force_features, false), DEFINE_PROP_BOOL("kvm", X86CPU, expose_kvm, true), DEFINE_PROP_UINT32("phys-bits", X86CPU, phys_bits, 0), - DEFINE_PROP_BOOL("host-phys-bits", X86CPU, host_phys_bits, false), DEFINE_PROP_UINT8("host-phys-bits-limit", X86CPU, host_phys_bits_limit= , 0), DEFINE_PROP_BOOL("fill-mtrr-mask", X86CPU, fill_mtrr_mask, true), DEFINE_PROP_UINT32("level-func7", X86CPU, env.cpuid_level_func7, diff --git a/target/i386/host-cpu.c b/target/i386/host-cpu.c index 10f8aba86e53..a1d6b3ac962e 100644 --- a/target/i386/host-cpu.c +++ b/target/i386/host-cpu.c @@ -13,6 +13,8 @@ #include "qapi/error.h" #include "sysemu/sysemu.h" =20 +#include "standard-headers/asm-x86/kvm_para.h" + /* Note: Only safe for use on x86(-64) hosts */ static uint32_t host_cpu_phys_bits(void) { @@ -68,7 +70,8 @@ static uint32_t host_cpu_adjust_phys_bits(X86CPU *cpu) warned =3D true; } =20 - if (cpu->host_phys_bits) { + if (cpu->env.features[FEAT_KVM_HINTS] & + (1 << KVM_HINTS_PHYS_ADDRESS_SIZE_DATA_VALID)) { /* The user asked for us to use the host physical bits */ phys_bits =3D host_phys_bits; if (cpu->host_phys_bits_limit && diff --git a/target/i386/kvm/kvm.c b/target/i386/kvm/kvm.c index a1fd1f53791d..3335c57b21b2 100644 --- a/target/i386/kvm/kvm.c +++ b/target/i386/kvm/kvm.c @@ -459,6 +459,7 @@ uint32_t kvm_arch_get_supported_cpuid(KVMState *s, uint= 32_t function, } } else if (function =3D=3D KVM_CPUID_FEATURES && reg =3D=3D R_EDX) { ret |=3D 1U << KVM_HINTS_REALTIME; + ret |=3D 1U << KVM_HINTS_PHYS_ADDRESS_SIZE_DATA_VALID; } =20 return ret; --=20 2.37.3