patch-0002-x86-mm-shadow-do-not-open-code-PAGE_CACHE_ATTRS.patch

From 6362370d9c50633c16db8e1f50ed564000c4be80 Mon Sep 17 00:00:00 2001
Message-Id: <6362370d9c50633c16db8e1f50ed564000c4be80.1671771766.git.demi@invisiblethingslab.com>
In-Reply-To: <cover.1671771766.git.demi@invisiblethingslab.com>
References: <cover.1671771766.git.demi@invisiblethingslab.com>
From: Demi Marie Obenour <demi@invisiblethingslab.com>
Date: Tue, 6 Dec 2022 13:55:07 +0100
Subject: [PATCH 02/10] x86/mm/shadow: do not open-code PAGE_CACHE_ATTRS
Cc: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>

This makes the code easier to understand.

Signed-off-by: Demi Marie Obenour <demi@invisiblethingslab.com>
Acked-by: Jan Beulich <jbeulich@suse.com>
---
 xen/arch/x86/mm/shadow/multi.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c
index 95ff6df5d91e1bcfe6c88a565d61b5c69ff1538f..0792d3fbb4b4940587a68f645eb4177a8317fb41 100644
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -562,7 +562,7 @@ _sh_propagate(struct vcpu *v,
     if ( guest_nx_enabled(v) )
         pass_thru_flags |= _PAGE_NX_BIT;
     if ( level == 1 && !shadow_mode_refcounts(d) && mmio_mfn )
-        pass_thru_flags |= _PAGE_PAT | _PAGE_PCD | _PAGE_PWT;
+        pass_thru_flags |= PAGE_CACHE_ATTRS;
     sflags = gflags & pass_thru_flags;
 
     /*
@@ -575,7 +575,7 @@ _sh_propagate(struct vcpu *v,
     {
         int type;
 
-        ASSERT(!(sflags & (_PAGE_PAT | _PAGE_PCD | _PAGE_PWT)));
+        ASSERT(!(sflags & PAGE_CACHE_ATTRS));
 
         /* compute the PAT index for shadow page entry when VT-d is enabled
          * and device assigned.
-- 
Sincerely,
Demi Marie Obenour (she/her/hers)
Invisible Things Lab