From patchwork Fri Mar 1 10:14:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerd Hoffmann X-Patchwork-Id: 13578281 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.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 6B2A16BB22 for ; Fri, 1 Mar 2024 10:14:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709288060; cv=none; b=UVK1fyaGkpBGlNkhoYizRpQT+gNJ0mHs4QJciUqLwpuM0zf2V6QYqmfJxk18KfqDj69v2pyNhk6lKHiHNP80vHPAbAvZBhs5T/BinXiNddm+foyHY6++4PV0MOuQkTzUjoCvs60P6YqCUNKLwC9hlmAgN8Qsa80RDFy5TJL9O1k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709288060; c=relaxed/simple; bh=x+nTTwmEfaKEpgrbbMiWdsUHJXOKVRsj2CPeKkTwj3I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oX+0h6VaV5NrCqalCspY/cEO/PQa8zYYSi9+dVRR086VkGhuxUVgr9vF+3xoLN35ty3w34hoTKnTfACEnMLJWl15a3chruig/nGkP5WgC1T5AFUom4ydaOL+VLaGLNX+nkEe3ovnaBfh9DUl2dr1trme1SZDYVTsS57J78MudW4= 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=bY23dM0X; arc=none smtp.client-ip=170.10.133.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="bY23dM0X" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709288057; 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=R+QSb4VJ1jHAbQmwW/SLNpPZK+rj9N/eRYzdT8VP+cg=; b=bY23dM0XM/ODIqZLVt4gKlh1SYkVhCEPvFgGnowKo2Dk6TNobzOXzWp1nUypnNw1V3Gu0w gtioZ3UUSJ5IDfyLJFBPftiCArYZ7GgYf9RPDl9r0auC3Yz5Cp+vqy14VRRIU77Y9Ozb+D yq5/iPwsZhdCiVunCr0MlCslVCPtHjI= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-662-QWOY9T-_N0yzeq7pYgncJQ-1; Fri, 01 Mar 2024 05:14:16 -0500 X-MC-Unique: QWOY9T-_N0yzeq7pYgncJQ-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 58473108BD87; Fri, 1 Mar 2024 10:14:15 +0000 (UTC) Received: from sirius.home.kraxel.org (unknown [10.39.192.121]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 5C1F02166B33; Fri, 1 Mar 2024 10:14:14 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id DAB481801491; Fri, 1 Mar 2024 11:14:10 +0100 (CET) From: Gerd Hoffmann To: kvm@vger.kernel.org Cc: Gerd Hoffmann , Sean Christopherson , Paolo Bonzini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), "H. Peter Anvin" , linux-kernel@vger.kernel.org (open list:X86 ARCHITECTURE (32-BIT AND 64-BIT)) Subject: [PATCH 2/3] kvm/vmx: limit guest_phys_bits to 48 without 5-level ept Date: Fri, 1 Mar 2024 11:14:08 +0100 Message-ID: <20240301101410.356007-3-kraxel@redhat.com> In-Reply-To: <20240301101410.356007-1-kraxel@redhat.com> References: <20240301101410.356007-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 If EPT has no support for 5-level paging the guest physical address space is limited to 48 bits. Adjust kvm_caps.guest_phys_bits accordingly. Signed-off-by: Gerd Hoffmann --- arch/x86/kvm/vmx/vmx.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/x86/kvm/vmx/vmx.c b/arch/x86/kvm/vmx/vmx.c index 1111d9d08903..8bd644a5022d 100644 --- a/arch/x86/kvm/vmx/vmx.c +++ b/arch/x86/kvm/vmx/vmx.c @@ -7899,6 +7899,11 @@ static __init void vmx_set_cpu_caps(void) if (cpu_has_vmx_waitpkg()) kvm_cpu_cap_check_and_set(X86_FEATURE_WAITPKG); + + if (enable_ept && + !cpu_has_vmx_ept_5levels() && + kvm_caps.guest_phys_bits > 48) + kvm_caps.guest_phys_bits = 48; } static void vmx_request_immediate_exit(struct kvm_vcpu *vcpu)