From nobody Thu Apr 2 20:10:51 2026 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 9797F3A1E6D for ; Thu, 26 Mar 2026 18:18:06 +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=1774549092; cv=none; b=I0bEAQqRFkD40L3Z/jscxT5YM3Ad7dnVLs6nzq/q7QbBwt/7FXw07uPYa9p4VF3hd4vwRClX+dHDSjR3G3uZDEFBTKwaYKGqD9tZYSnJ4AwQwbnpuIk2vkcWFqhEHVs6gNfEWCSHTVHF1Bk1zQjN+TzXbctb8G/14mKcxZHU/vI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549092; c=relaxed/simple; bh=vRU527ooK61F8J/EBmObXyVR1fL0SuQzz0JB5ca4i3s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q1wfiYiVvkjixN0+aX4R6vtgOCC4ZOo00msFmLCotvjEpnZXDNv5eDlsy9+i5iJ1fwQYpSeyc/4CfDHxLLXE2Pb0r+msilxGlEVVAp0A9ePmbuepUbS8d4wqE4ldJKx82taOAx56n6iRO6kNlJhQbXOVKJEN1j2qrd6xPvgXyxA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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=CeQheFJ4; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=rZEAr2Ff; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine 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="CeQheFJ4"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="rZEAr2Ff" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549085; 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=z3max8On1ZuAYoYMSIpCEX64J8cd14WUWIyCVRHJcuY=; b=CeQheFJ4699WVcTCr/mnFeopc0y3P9PEs28tRCqtOLpQVJsdDo4mhIz4Z8eTc8LdD39UkP HxhuwJ+uSyA+a9D0kayWCk1HcjVSP8vfKr62Jal0813HpFzmcV4yTSxK58gFu/WYV62yh5 G+amK1uESSIX/JGVG4D6dCuvrfT5QcY= Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com [209.85.221.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-161-ZMw08yFPPvmCpCfUPvYHaw-1; Thu, 26 Mar 2026 14:18:03 -0400 X-MC-Unique: ZMw08yFPPvmCpCfUPvYHaw-1 X-Mimecast-MFC-AGG-ID: ZMw08yFPPvmCpCfUPvYHaw_1774549083 Received: by mail-wr1-f70.google.com with SMTP id ffacd0b85a97d-43b99add7f3so318473f8f.1 for ; Thu, 26 Mar 2026 11:18:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549081; x=1775153881; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=z3max8On1ZuAYoYMSIpCEX64J8cd14WUWIyCVRHJcuY=; b=rZEAr2FfBQNJ1bfJ32ZMoYs5Qc3hrRqi+JoTUlgZPrvcghj8pw+yk37WEixZZL65LA oT+n6EH9YDl7YkY5gRtFaw1e3UEcMHOnmCHh3zhwY0BV0DHoAHGQFTmhk2PIH6wbZ2M8 ykg1s29Ysfp6FUarjBib/6oSY7AFoA+EsxVUC4S0fvNFh8vngVrtq/4ISvQgb9NhA4C0 deEB7eoZPTO+8C3WoH//Guu7+HhuCKmXtK936UmP4AqIRInvhHzNV+Fyyaph91iZwQet ZQa9zxrzKfwo6HgYaswMc7pGMwS5fS7BLVOtnl6ZeNlrKCD1S+tcUnVHpmnrYNW/p3qp pFVg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549081; x=1775153881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=z3max8On1ZuAYoYMSIpCEX64J8cd14WUWIyCVRHJcuY=; b=bS8dT4MYESYTWgRgmQTuu4LFs0HXMNFcneXt0NI6dBSnPtg/REfSyHYIR4j4KB67XI kayll+sO5HfYsMLtZS9dOWAfTgzJ+z+afpCzrwhIBc8mm7ODnvTIQsWNNvUagrH8Gn+g McLQ3fwkc5CIevFUvSc5yOrwrmzqTlMoVWLZFJBq+eU9NsNwRYQEGBKH31CyQAHF34PG jjNEdrXvCpFOMGMRdsKfDWuSCzhZ/1STuuNLNg5Q+USs6kIweOVpcNjOPil6u5M/k0gh i15XEPmXZrLpNTfWXgYrdPG8Sgdo4aBThvXaJiER/oRiVegs/HbzpJrFmKfykc+D4kV6 7OjQ== X-Gm-Message-State: AOJu0YyWbb7xEIqaBkGAZw1cT816dLXhZnevzdWYpCwVjLZ9AXL6GE4P nVK9d7dm0Vog9Vqdvcpa/8yXfUbLqUjqr2PDa+TtyCunZJgkEEvl68zIXnDYq3Sem4+3Tp57bMX EUx+MeYcw9cphAPpfzAeAb4QSw8h7haGjjgH5Qgmq6XrqtAQUCU421YUjH8ZzujEUNBwgL3W7Cd Y2hi0bTB2845aXQ7ImEbLGmQFJvH1oRQnNIdMZJKsp7yRI2zQf4w== X-Gm-Gg: ATEYQzynQMMz10DraGTZ1XC2DELglpfrfyNxCitthWUrhqYDiejs13Hxuujg8NTbr7O WF184RrJlZ9GMcnL7sJgMOd8DQTKR3//N6WnbmZRkNIun3to7GQrRPtoVjaHcQ4U/lM4w5kiOxj 3yn2md7V/lzaaerNGa0IBYugEIGNHtf3A3wm0L7W+KF2fvOk3VDYtJJXEZJOXL0rGjSNuD+nE+/ EOoSDnteOah50NZfPd78h+nYy2YdAdvF/xJw9DneFbqZxu/V0yrfeNyEvyfalL5/llOeT48PZkH fvAVOkN3zkLGlMUml0X2hileH7BIN4WeqLvB41v2gEUsNtmg65Lv2M1+kJtdLlD/SneSPy7g+wE BA4jN3sUHg/FpWUCjvUQ+IfumOd2YZJDrJiWai0jhU7OOeVqUPaNUxjBDuUDQoKMjKqJnBBmrmL vYhibK96/y0WTKZdjTViILhYpB X-Received: by 2002:a05:6000:2901:b0:43b:4967:2898 with SMTP id ffacd0b85a97d-43b97a2cdc1mr5218495f8f.22.1774549081444; Thu, 26 Mar 2026 11:18:01 -0700 (PDT) X-Received: by 2002:a05:6000:2901:b0:43b:4967:2898 with SMTP id ffacd0b85a97d-43b97a2cdc1mr5218274f8f.22.1774549079750; Thu, 26 Mar 2026 11:17:59 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-43b9192e3e8sm10797961f8f.5.2026.03.26.11.17.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:17:58 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: Jon Kohler , Nikunj A Dadhania , Amit Shah , Sean Christopherson , Marcelo Tosatti Subject: [PATCH 13/24] KVM: nVMX: pass advanced EPT violation vmexit info to guest Date: Thu, 26 Mar 2026 19:17:11 +0100 Message-ID: <20260326181723.218115-14-pbonzini@redhat.com> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260326181723.218115-1-pbonzini@redhat.com> References: <20260326181723.218115-1-pbonzini@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" KVM will use advanced vmexit information for EPT violations to virtualize MBEC. Pass it to the guest since it is easy and allows testing nested nested. Signed-off-by: Paolo Bonzini --- arch/x86/include/asm/vmx.h | 4 ++++ arch/x86/kvm/mmu/paging_tmpl.h | 2 +- arch/x86/kvm/vmx/nested.c | 13 +++++++++---- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/vmx.h b/arch/x86/include/asm/vmx.h index 2b449a3948d3..fcd623719334 100644 --- a/arch/x86/include/asm/vmx.h +++ b/arch/x86/include/asm/vmx.h @@ -524,6 +524,7 @@ enum vmcs_field { #define VMX_EPT_1GB_PAGE_BIT (1ull << 17) #define VMX_EPT_INVEPT_BIT (1ull << 20) #define VMX_EPT_AD_BIT (1ull << 21) +#define VMX_EPT_ADVANCED_VMEXIT_INFO_BIT (1ull << 22) #define VMX_EPT_EXTENT_CONTEXT_BIT (1ull << 25) #define VMX_EPT_EXTENT_GLOBAL_BIT (1ull << 26) =20 @@ -606,6 +607,9 @@ enum vm_entry_failure_code { EPT_VIOLATION_PROT_USER_EXEC) #define EPT_VIOLATION_GVA_IS_VALID BIT(7) #define EPT_VIOLATION_GVA_TRANSLATED BIT(8) +#define EPT_VIOLATION_GVA_USER BIT(9) +#define EPT_VIOLATION_GVA_WRITABLE BIT(10) +#define EPT_VIOLATION_GVA_NX BIT(11) =20 #define EPT_VIOLATION_RWX_TO_PROT(__epte) (((__epte) & VMX_EPT_RWX_MASK) <= < 3) #define EPT_VIOLATION_USER_EXEC_TO_PROT(__epte) (((__epte) & VMX_EPT_USER_= EXECUTABLE_MASK) >> 4) diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index fb1b5d8b23e5..09e2e630d4b6 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -491,7 +491,7 @@ static int FNAME(walk_addr_generic)(struct guest_walker= *walker, * [2:0] - Derive from the access bits. The exit_qualification might be * out of date if it is serving an EPT misconfiguration. * [5:3] - Calculated by the page walk of the guest EPT page tables - * [7:8] - Derived from [7:8] of real exit_qualification + * [7:11] - Derived from [7:11] of real exit_qualification * * The other bits are set to 0. */ diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index adeb5a29169f..4b742a19bfde 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -443,10 +443,14 @@ static void nested_ept_inject_page_fault(struct kvm_v= cpu *vcpu, vm_exit_reason =3D EXIT_REASON_EPT_MISCONFIG; exit_qualification =3D 0; } else { + u64 mask =3D EPT_VIOLATION_GVA_IS_VALID | + EPT_VIOLATION_GVA_TRANSLATED; + if (vmx->nested.msrs.ept_caps & VMX_EPT_ADVANCED_VMEXIT_INFO_BIT) + mask |=3D EPT_VIOLATION_GVA_USER | + EPT_VIOLATION_GVA_WRITABLE | + EPT_VIOLATION_GVA_NX; exit_qualification =3D fault->exit_qualification; - exit_qualification |=3D vmx_get_exit_qual(vcpu) & - (EPT_VIOLATION_GVA_IS_VALID | - EPT_VIOLATION_GVA_TRANSLATED); + exit_qualification |=3D vmx_get_exit_qual(vcpu) & mask; vm_exit_reason =3D EXIT_REASON_EPT_VIOLATION; } =20 @@ -7238,7 +7242,8 @@ static void nested_vmx_setup_secondary_ctls(u32 ept_c= aps, VMX_EPT_PAGE_WALK_5_BIT | VMX_EPTP_WB_BIT | VMX_EPT_INVEPT_BIT | - VMX_EPT_EXECUTE_ONLY_BIT; + VMX_EPT_EXECUTE_ONLY_BIT | + VMX_EPT_ADVANCED_VMEXIT_INFO_BIT; =20 msrs->ept_caps &=3D ept_caps; msrs->ept_caps |=3D VMX_EPT_EXTENT_GLOBAL_BIT | --=20 2.53.0