From patchwork Mon Mar 25 14:47:23 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 13602355 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 62BE6149C71 for ; Mon, 25 Mar 2024 14:47:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711378058; cv=none; b=SCiKIfHbax0PZRZHD9oKBEZ3bOViuyGCfwowfPDzcP1ER+C1N82jzc1obAGcxseJvHXgR+8fbRVLCGg5v7xi9XUuf9pwEkMUE2pxozpYojTwBHWhHKF5F+AJfZg8FRr9Vqlh1xf26XFO78HAgQq1fKeRepRcZXhiLB+Iv18hqhI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711378058; c=relaxed/simple; bh=5mR6JrlRkPWNHwwvfTrPgPZxflRV/rXqRreiaqG43i8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=gio7CRiv9REn29cpQ+8tF/ZdOwTh4rnGDFPD2vVYzCBPv1Yq9T6aeTADtuGDoNaOqZqoSrVlomomwirS5TGiy8sMT9nLLcNTlJkN7O51Vgq2aJRPLwhKLNECgDIhKGcU7v5iU0vhnyIc1nM4eitNn/8kstMeetTUUwPrccqqp6g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=VTDaU+zl; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="VTDaU+zl" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711378056; 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=VazSRcTbku3LywnN/7Q7TrP0Ppb/9wCf++7ePYqCWwE=; b=VTDaU+zl17//s7wQap/uwcgv+phe3k4Y1CFEnETBcP2DbTggTwJr10TbsPD9q9RChwDLM1 qg+TIwqfjI+u/ddGCOp5bRjl2BmkHoJ2deMgZLlhOmqg7koxeoazIIIm9KM0ELCnVEDVnE yVZdj+P+AeyUM7UMq5NoRmT981ach/8= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-297-U76x7RzGPXSkPRtX21nQRg-1; Mon, 25 Mar 2024 10:47:31 -0400 X-MC-Unique: U76x7RzGPXSkPRtX21nQRg-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C5ACD2800E84; Mon, 25 Mar 2024 14:47:30 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.158]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 672CA2166B31; Mon, 25 Mar 2024 14:47:30 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 653DA1801CDB; Mon, 25 Mar 2024 15:47:25 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Tom Lendacky , Marcelo Tosatti , kvm@vger.kernel.org, Paolo Bonzini , Gerd Hoffmann Subject: [PATCH v5 1/2] kvm: add support for guest physical bits Date: Mon, 25 Mar 2024 15:47:23 +0100 Message-ID: <20240325144725.1089192-2-kraxel@redhat.com> In-Reply-To: <20240325144725.1089192-1-kraxel@redhat.com> References: <20240325144725.1089192-1-kraxel@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 Query kvm for supported guest physical address bits, in cpuid function 80000008, eax[23:16]. Usually this is identical to host physical address bits. With NPT or EPT being used this might be restricted to 48 (max 4-level paging address space size) even if the host cpu supports more physical address bits. When set pass this to the guest, using cpuid too. Guest firmware can use this to figure how big the usable guest physical address space is, so PCI bar mapping are actually reachable. Signed-off-by: Gerd Hoffmann --- target/i386/cpu.h | 1 + target/i386/cpu.c | 1 + target/i386/kvm/kvm-cpu.c | 31 ++++++++++++++++++++++++++++++- 3 files changed, 32 insertions(+), 1 deletion(-) diff --git a/target/i386/cpu.h b/target/i386/cpu.h index 6b0573807918..83e473584517 100644 --- a/target/i386/cpu.h +++ b/target/i386/cpu.h @@ -2026,6 +2026,7 @@ struct ArchCPU { /* Number of physical address bits supported */ uint32_t phys_bits; + uint32_t guest_phys_bits; /* in order to simplify APIC support, we leave this pointer to the user */ diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 33760a2ee163..3b7bd506baf1 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -6570,6 +6570,7 @@ void cpu_x86_cpuid(CPUX86State *env, uint32_t index, uint32_t count, if (env->features[FEAT_8000_0001_EDX] & CPUID_EXT2_LM) { /* 64 bit processor */ *eax |= (cpu_x86_virtual_addr_width(env) << 8); + *eax |= (cpu->guest_phys_bits << 16); } *ebx = env->features[FEAT_8000_0008_EBX]; if (cs->nr_cores * cs->nr_threads > 1) { diff --git a/target/i386/kvm/kvm-cpu.c b/target/i386/kvm/kvm-cpu.c index 9c791b7b0520..c5c24f6a8282 100644 --- a/target/i386/kvm/kvm-cpu.c +++ b/target/i386/kvm/kvm-cpu.c @@ -18,10 +18,33 @@ #include "kvm_i386.h" #include "hw/core/accel-cpu.h" +static void kvm_set_guest_phys_bits(CPUState *cs) +{ + X86CPU *cpu = X86_CPU(cs); + uint32_t eax, guest_phys_bits; + + eax = kvm_arch_get_supported_cpuid(cs->kvm_state, 0x80000008, 0, R_EAX); + guest_phys_bits = (eax >> 16) & 0xff; + if (!guest_phys_bits) { + return; + } + + if (cpu->guest_phys_bits == 0 || + cpu->guest_phys_bits > guest_phys_bits) { + cpu->guest_phys_bits = guest_phys_bits; + } + + if (cpu->host_phys_bits && cpu->host_phys_bits_limit && + cpu->guest_phys_bits > cpu->host_phys_bits_limit) { + cpu->guest_phys_bits = cpu->host_phys_bits_limit; + } +} + static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) { X86CPU *cpu = X86_CPU(cs); CPUX86State *env = &cpu->env; + bool ret; /* * The realize order is important, since x86_cpu_realize() checks if @@ -50,7 +73,13 @@ static bool kvm_cpu_realizefn(CPUState *cs, Error **errp) MSR_IA32_UCODE_REV); } } - return host_cpu_realizefn(cs, errp); + ret = host_cpu_realizefn(cs, errp); + if (!ret) { + return ret; + } + + kvm_set_guest_phys_bits(cs); + return true; } static bool lmce_supported(void) From patchwork Mon Mar 25 14:47:24 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 13602356 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3EDD314D2A7 for ; Mon, 25 Mar 2024 14:47:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711378061; cv=none; b=BC2tgEGH1MXcGrLfXwtZoF9dKQyoXsS93szUF1XNHhht98HNjKf6Y18qOU7nbAY6Ie5h9rcKsntUmabkOI+IKk8jZA8BO2qslfgrEBtAMrFbr+ptxlCeuxOXU+35omg4r1uhhXsZMNLQA06+Hzjn91gbSMa3ANfMDbZFzMl9s4g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711378061; c=relaxed/simple; bh=GTmM8vLVnfDJNCDlIZTuXHQn6avz5v/tLGQoeLNr+EE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=pdnrUu8gocima0AH33JP9McY396phcWmvgjpnTzJGumlqklWBuk4ky12PLJtFVwHODLsgYUzmf34sIW46zyA8w9IIy64Ju84pJWKlR1cpYSy1wDWiXmWmYE2lNHBr3nUmwB4xkqMnSjSaUl2o2pIfJHqHkNsoVCr5msYYc2Gao4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=HXJEK8IE; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="HXJEK8IE" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711378059; 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=DsJzNPnYlAzllKzELoC8ajG8VB6UCIrLwt5d6+Usjys=; b=HXJEK8IEvDflafCBM+Kth2QcSdulio0SwAqWjd9UTBTPDQ2bJSq7gaT3kfGYT1UFAei0ER KKQCQtPuXSqiVqAXG/bPU9S57j4oBKIvl7o3CyrEt32Mec6H5AdqPcXUjQWBN48cR+MBxn aWYil7kl4e35xH/LFl5mrFYmQla7qHk= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-403-XMZUEqHON_e8BDus4gvrKg-1; Mon, 25 Mar 2024 10:47:36 -0400 X-MC-Unique: XMZUEqHON_e8BDus4gvrKg-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 60FDB2800E8F; Mon, 25 Mar 2024 14:47:36 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.158]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 05EA51121306; Mon, 25 Mar 2024 14:47:36 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id 9AB551801CDC; Mon, 25 Mar 2024 15:47:25 +0100 (CET) From: Gerd Hoffmann To: qemu-devel@nongnu.org Cc: Tom Lendacky , Marcelo Tosatti , kvm@vger.kernel.org, Paolo Bonzini , Gerd Hoffmann Subject: [PATCH v5 2/2] target/i386: add guest-phys-bits cpu property Date: Mon, 25 Mar 2024 15:47:24 +0100 Message-ID: <20240325144725.1089192-3-kraxel@redhat.com> In-Reply-To: <20240325144725.1089192-1-kraxel@redhat.com> References: <20240325144725.1089192-1-kraxel@redhat.com> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.3 Allows to set guest-phys-bits (cpuid leaf 80000008, eax[23:16]) via -cpu $model,guest-phys-bits=$nr. Signed-off-by: Gerd Hoffmann --- target/i386/cpu.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/target/i386/cpu.c b/target/i386/cpu.c index 3b7bd506baf1..79bea83b7b1c 100644 --- a/target/i386/cpu.c +++ b/target/i386/cpu.c @@ -7380,6 +7380,14 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) if (cpu->phys_bits == 0) { cpu->phys_bits = TCG_PHYS_ADDR_BITS; } + if (cpu->guest_phys_bits && + (cpu->guest_phys_bits > cpu->phys_bits || + cpu->guest_phys_bits < 32)) { + error_setg(errp, "guest-phys-bits should be between 32 and %u " + " (but is %u)", + cpu->phys_bits, cpu->guest_phys_bits); + return; + } } else { /* For 32 bit systems don't use the user set value, but keep * phys_bits consistent with what we tell the guest. @@ -7388,6 +7396,10 @@ static void x86_cpu_realizefn(DeviceState *dev, Error **errp) error_setg(errp, "phys-bits is not user-configurable in 32 bit"); return; } + if (cpu->guest_phys_bits != 0) { + error_setg(errp, "guest-phys-bits is not user-configurable in 32 bit"); + return; + } if (env->features[FEAT_1_EDX] & (CPUID_PSE36 | CPUID_PAE)) { cpu->phys_bits = 36; @@ -7888,6 +7900,7 @@ static Property x86_cpu_properties[] = { 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_UINT32("guest-phys-bits", X86CPU, guest_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),