From nobody Thu Apr 2 20:10:52 2026 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 9F89B428831 for ; Thu, 26 Mar 2026 18:18: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=1774549100; cv=none; b=mqrCIbOD14Tavea9Lfn7sbr8ZdbnxDjoixfJCMoMWp/IFN2KhQal6i6EDliOxkaoRlkVBW3SSbia3tN6IYJrDwwOOvLoGLThAOzGUBntXFXQ1fGuxrRd9AfQP6X/MBFdbGlB9ls1Y4JuS8ZoMvJRizXAH06k0qgS4Qo373VyJvE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774549100; c=relaxed/simple; bh=6k32YUNUSwEOl5Wx728jUQLxcFj6v2Ju0u6Kg3rAbFw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OfE7cdgIXEQzo4rpPxBrvGnVmD4t9EA1LqfT7Oq9uCloyTNOdrOcASYOQvIpSmOfS/pxob12srBAyCY5/xTqsxzwd8Ci5xaaIn9IigyFVEgv86AGN0dJq/6lrq7/8CWuFZlaxAkWUfQSSDAUls1iLLT44Zn52uEaIKxB23u7TmA= 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=PaoMqwCJ; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b=gWFB3qOQ; arc=none smtp.client-ip=170.10.133.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="PaoMqwCJ"; dkim=pass (2048-bit key) header.d=redhat.com header.i=@redhat.com header.b="gWFB3qOQ" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1774549097; 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=TuJVFKLmxdWFj1feiyagFVXOI8YBNvyO4c8mQRfVXAg=; b=PaoMqwCJmnMWp18dITSr5WPwB8FLcOJfFJniHsVmCQ1No34Yi/nJQXWA+qJ458nhRPj2Wr i5UKUjA2DN+PpMfjVQ+LVvnW+lVojyEGWySVXFeo8NWHKJY3mi+tOGw78tKCIp9hWOIVET GIAeTr9DNB+6Y/6QN7KGI41EELCYv1A= Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-70-AH1Ou0PhNhy9GUFv_gS0ZA-1; Thu, 26 Mar 2026 14:18:16 -0400 X-MC-Unique: AH1Ou0PhNhy9GUFv_gS0ZA-1 X-Mimecast-MFC-AGG-ID: AH1Ou0PhNhy9GUFv_gS0ZA_1774549095 Received: by mail-wm1-f72.google.com with SMTP id 5b1f17b1804b1-485345e2fdfso7370185e9.2 for ; Thu, 26 Mar 2026 11:18:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=google; t=1774549094; x=1775153894; 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=TuJVFKLmxdWFj1feiyagFVXOI8YBNvyO4c8mQRfVXAg=; b=gWFB3qOQdlD3XPErqU0Hzg4XlEe+WfmG9bcD5GgYZgdPVwYEFJN2Q2I+OsD1KUBbuk JXui+Ez535OCd4/oge69N0bkcq//SDszPf2xtoFXqPtkFC1QYvKjZjWE2IUyYJrqtag2 f8/Q13pXBZrc5gbZiPuBdFabBSVNR620l6GP3iRViGQBOoppY6D3F7EallxaSI3y5BMz jUTD3i3QWSUn8qQPvFJwDVwWQa2kihwGApCr8hz4OBpO/+6y/PIPJljC7IphJ2RhzsTZ xktdIG4faw6fnxjPsBafuVm+fPEoTZz5Y+y5aQiuUZopV1JL2q3W+TMwT6nfH80ukHnj YadA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774549094; x=1775153894; 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=TuJVFKLmxdWFj1feiyagFVXOI8YBNvyO4c8mQRfVXAg=; b=nK0UekPU9JD0Zr9ZfWrbvCrq6bCXGvQFuSxi+0ioMBeRm8PdtBQA8Y3y/IzauQgN90 xV7bul+lC0TYGTMol0LbOnHmwJqwdorcslmw8y90v1bGubPeA6kUCTfqnzEMU/o5ybQr HxZ1qGLbXGecQ2cfwprQZV6CKsVgddyNJCAG5Y+b8WMmZUPGH4107sDBwUjxac9LDNZ7 9P0er1CrYNouaTmmRFowwycRsdQKCGzbj3+2fr1erhFxfOsHjnrW4ul+AyS67mLOsHrC BCq139EB8lKEI/MKpSOuejPP+4JHvsLEQK4ysP449Zwje2U9Z2vTON+Fof13W/7YQ/oM zD6g== X-Gm-Message-State: AOJu0Yz6fhuJ+9mOULrcY+UdLOH6bWXzIwcTRLNPuaDpNLdzIX/xHpCh MG+EEL/O5eRz2jmKQlNIblaT7Sh4woOb4wp+APqZ0ZH8WLKt6MexXCXdPOsRYyFEqQ6+AxGEhv2 lK/V87zE1Nk3M0n2BK4/gLlLwaxVulHfagAAvEw/uTE+Y7mxLRajlODyVFt9Gj6CszYIQj+Dy+R PStZsIhxoRGiC1xLzEmKmGUVvIjGrDnYZr4Q1QGUXzdxiw54RUMA== X-Gm-Gg: ATEYQzzL5TV05iNkC62zTeJcPZeeMd8duMDe/Vgrc2Ot1dIuU8nKNTtZcUzJj4dVYnM KP7OxwMSZ9Hk/XvoDnDtOE+YSY8T1b5YrvGT7QxLq8mMijQWP+sm+EdzWXkFntkRF1UeGVLkSEy rmM4zQlbpSuqytiryDQTi/1RQTCff3YXjJ+MV1m6Wat8dLS0ZyzGOCZMPsvJxFpfSJbFu0ZMRWe eVXopWt7DK3q7cj9rFKevTjcF+SdeOiY49VjVmx/Jmm+3JJa4qR9um6fy8LGx4o13EvbxoZM/Fv 5ESn2wDX0qpdBpzkmY2EBcs4zGiH3PDFCPFBoLB/iOBm7ZWmA1Xbk3n+HCfhQYwMDJmXDEU/+Y1 DrHlGmxSiHOk8pNo9h4X2j981MUzMao67jFsDXwAM657/R13M6I9pklkRZ2DJesnRnuEXE4Kojs Jq2sb7PPaPIiyCBHxdz/p9G/Z/ X-Received: by 2002:a05:600c:4705:b0:486:fc4a:2951 with SMTP id 5b1f17b1804b1-48716083231mr135600865e9.28.1774549094346; Thu, 26 Mar 2026 11:18:14 -0700 (PDT) X-Received: by 2002:a05:600c:4705:b0:486:fc4a:2951 with SMTP id 5b1f17b1804b1-48716083231mr135600185e9.28.1774549093815; Thu, 26 Mar 2026 11:18:13 -0700 (PDT) Received: from [192.168.10.48] ([151.49.85.67]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-48722c6b495sm102046575e9.2.2026.03.26.11.18.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 26 Mar 2026 11:18:12 -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 18/24] KVM: x86/mmu: propagate access mask from root pages down Date: Thu, 26 Mar 2026 19:17:16 +0100 Message-ID: <20260326181723.218115-19-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" Until now, all SPTEs have had all kinds of access allowed; however, for GMET to be enabled all the pages have to have ACC_USER_MASK disabled. By marking them as supervisor pages, the processor allows execution from either user or supervisor mode (unlike for normal paging, NPT ignores the U bit for reads and writes). That will mean that the root page's role has ACC_USER_MASK cleared and that has to be propagated down through the kvm_mmu_page tree. Do that, and pass the required access to the kvm_mmu_spte_requested tracepoint since it's not ACC_ALL anymore. Signed-off-by: Paolo Bonzini --- arch/x86/kvm/mmu/mmu.c | 9 +++++---- arch/x86/kvm/mmu/mmutrace.h | 10 ++++++---- arch/x86/kvm/mmu/paging_tmpl.h | 2 +- arch/x86/kvm/mmu/tdp_mmu.c | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/arch/x86/kvm/mmu/mmu.c b/arch/x86/kvm/mmu/mmu.c index 442cbaeaf547..834ba9c0c809 100644 --- a/arch/x86/kvm/mmu/mmu.c +++ b/arch/x86/kvm/mmu/mmu.c @@ -3434,12 +3434,13 @@ static int direct_map(struct kvm_vcpu *vcpu, struct= kvm_page_fault *fault) { struct kvm_shadow_walk_iterator it; struct kvm_mmu_page *sp; - int ret; + int ret, access; gfn_t base_gfn =3D fault->gfn; =20 kvm_mmu_hugepage_adjust(vcpu, fault); =20 - trace_kvm_mmu_spte_requested(fault); + access =3D vcpu->arch.mmu->root_role.access; + trace_kvm_mmu_spte_requested(fault, access); for_each_shadow_entry(vcpu, fault->addr, it) { /* * We cannot overwrite existing page tables with an NX @@ -3452,7 +3453,7 @@ static int direct_map(struct kvm_vcpu *vcpu, struct k= vm_page_fault *fault) if (it.level =3D=3D fault->goal_level) break; =20 - sp =3D kvm_mmu_get_child_sp(vcpu, it.sptep, base_gfn, true, ACC_ALL); + sp =3D kvm_mmu_get_child_sp(vcpu, it.sptep, base_gfn, true, access); if (sp =3D=3D ERR_PTR(-EEXIST)) continue; =20 @@ -3465,7 +3466,7 @@ static int direct_map(struct kvm_vcpu *vcpu, struct k= vm_page_fault *fault) if (WARN_ON_ONCE(it.level !=3D fault->goal_level)) return -EFAULT; =20 - ret =3D mmu_set_spte(vcpu, fault->slot, it.sptep, ACC_ALL, + ret =3D mmu_set_spte(vcpu, fault->slot, it.sptep, access, base_gfn, fault->pfn, fault); if (ret =3D=3D RET_PF_SPURIOUS) return ret; diff --git a/arch/x86/kvm/mmu/mmutrace.h b/arch/x86/kvm/mmu/mmutrace.h index 3429c1413f42..fa01719baf8d 100644 --- a/arch/x86/kvm/mmu/mmutrace.h +++ b/arch/x86/kvm/mmu/mmutrace.h @@ -373,23 +373,25 @@ TRACE_EVENT( =20 TRACE_EVENT( kvm_mmu_spte_requested, - TP_PROTO(struct kvm_page_fault *fault), - TP_ARGS(fault), + TP_PROTO(struct kvm_page_fault *fault, u8 access), + TP_ARGS(fault, access), =20 TP_STRUCT__entry( __field(u64, gfn) __field(u64, pfn) __field(u8, level) + __field(u8, access) ), =20 TP_fast_assign( __entry->gfn =3D fault->gfn; __entry->pfn =3D fault->pfn | (fault->gfn & (KVM_PAGES_PER_HPAGE(fault->= goal_level) - 1)); __entry->level =3D fault->goal_level; + __entry->access =3D access; ), =20 - TP_printk("gfn %llx pfn %llx level %d", - __entry->gfn, __entry->pfn, __entry->level + TP_printk("gfn %llx pfn %llx level %d access %x", + __entry->gfn, __entry->pfn, __entry->level, __entry->access ) ); =20 diff --git a/arch/x86/kvm/mmu/paging_tmpl.h b/arch/x86/kvm/mmu/paging_tmpl.h index 95aa1b4fc327..31331fe10723 100644 --- a/arch/x86/kvm/mmu/paging_tmpl.h +++ b/arch/x86/kvm/mmu/paging_tmpl.h @@ -731,7 +731,7 @@ static int FNAME(fetch)(struct kvm_vcpu *vcpu, struct k= vm_page_fault *fault, */ kvm_mmu_hugepage_adjust(vcpu, fault); =20 - trace_kvm_mmu_spte_requested(fault); + trace_kvm_mmu_spte_requested(fault, gw->pte_access); =20 for (; shadow_walk_okay(&it); shadow_walk_next(&it)) { /* diff --git a/arch/x86/kvm/mmu/tdp_mmu.c b/arch/x86/kvm/mmu/tdp_mmu.c index 9c26038f6b77..25e557de99d6 100644 --- a/arch/x86/kvm/mmu/tdp_mmu.c +++ b/arch/x86/kvm/mmu/tdp_mmu.c @@ -1185,9 +1185,9 @@ static int tdp_mmu_map_handle_target_level(struct kvm= _vcpu *vcpu, } =20 if (unlikely(!fault->slot)) - new_spte =3D make_mmio_spte(vcpu, iter->gfn, ACC_ALL); + new_spte =3D make_mmio_spte(vcpu, iter->gfn, sp->role.access); else - wrprot =3D make_spte(vcpu, sp, fault->slot, ACC_ALL, iter->gfn, + wrprot =3D make_spte(vcpu, sp, fault->slot, sp->role.access, iter->gfn, fault->pfn, iter->old_spte, fault->prefetch, false, fault->map_writable, &new_spte); =20 @@ -1272,7 +1272,7 @@ int kvm_tdp_mmu_map(struct kvm_vcpu *vcpu, struct kvm= _page_fault *fault) =20 kvm_mmu_hugepage_adjust(vcpu, fault); =20 - trace_kvm_mmu_spte_requested(fault); + trace_kvm_mmu_spte_requested(fault, root->role.access); =20 rcu_read_lock(); =20 --=20 2.53.0