From: Jan Beulich <jbeulich@suse.com>
To: "xen-devel@lists.xenproject.org" <xen-devel@lists.xenproject.org>
Cc: "Andrew Cooper" <andrew.cooper3@citrix.com>,
"Wei Liu" <wl@xen.org>, "Roger Pau Monné" <roger.pau@citrix.com>,
"George Dunlap" <george.dunlap@citrix.com>,
"Tim Deegan" <tim@xen.org>
Subject: [PATCH 08/16] x86/shadow: use lighter weight mode checks
Date: Wed, 22 Mar 2023 10:34:25 +0100 [thread overview]
Message-ID: <a794e6dc-d73a-e6fa-2d32-ad46b22f8483@suse.com> (raw)
In-Reply-To: <dd9205b8-63f0-b1bc-f2b8-50d5da2bf2a7@suse.com>
shadow_mode_...(), with the exception of shadow_mode_enabled(), are
shorthands for shadow_mode_enabled() && paging_mode_...(). While
potentially useful outside of shadow-internal functions, when we already
know that we're dealing with a domain in shadow mode, the "paging"
checks are sufficient and cheaper. While the "shadow" ones commonly
translate to a MOV/AND/CMP/Jcc sequence, the "paging" ones typically
resolve to just TEST+Jcc.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -1858,7 +1858,7 @@ int sh_remove_write_access(struct domain
* In guest refcounting, we trust Xen to already be restricting
* all the writes to the guest page tables, so we do not need to
* do more. */
- if ( !shadow_mode_refcounts(d) )
+ if ( !paging_mode_refcounts(d) )
return 0;
/* Early exit if it's already a pagetable, or otherwise not writeable */
@@ -2090,7 +2090,7 @@ int sh_remove_all_mappings(struct domain
* guest pages with an extra reference taken by
* prepare_ring_for_helper().
*/
- if ( !(shadow_mode_external(d)
+ if ( !(paging_mode_external(d)
&& (page->count_info & PGC_count_mask) <= 3
&& ((page->u.inuse.type_info & PGT_count_mask)
== (is_special_page(page) ||
@@ -2387,8 +2387,8 @@ static void sh_update_paging_modes(struc
{
const struct paging_mode *old_mode = v->arch.paging.mode;
- ASSERT(shadow_mode_translate(d));
- ASSERT(shadow_mode_external(d));
+ ASSERT(paging_mode_translate(d));
+ ASSERT(paging_mode_external(d));
#if (SHADOW_OPTIMIZATIONS & SHOPT_OUT_OF_SYNC)
/* Need to resync all our pages now, because if a page goes out
@@ -2775,7 +2775,7 @@ void shadow_vcpu_teardown(struct vcpu *v
sh_detach_old_tables(v);
#ifdef CONFIG_HVM
- if ( shadow_mode_external(d) )
+ if ( paging_mode_external(d) )
{
mfn_t mfn = pagetable_get_mfn(v->arch.hvm.monitor_table);
--- a/xen/arch/x86/mm/shadow/multi.c
+++ b/xen/arch/x86/mm/shadow/multi.c
@@ -526,7 +526,7 @@ _sh_propagate(struct vcpu *v,
|| (level == 1
&& page_get_owner(mfn_to_page(target_mfn)) == dom_io);
if ( mmio_mfn
- && !(level == 1 && (!shadow_mode_refcounts(d)
+ && !(level == 1 && (!paging_mode_refcounts(d)
|| p2mt == p2m_mmio_direct)) )
{
ASSERT((ft == ft_prefetch));
@@ -543,7 +543,7 @@ _sh_propagate(struct vcpu *v,
_PAGE_RW | _PAGE_PRESENT);
if ( guest_nx_enabled(v) )
pass_thru_flags |= _PAGE_NX_BIT;
- if ( level == 1 && !shadow_mode_refcounts(d) && mmio_mfn )
+ if ( level == 1 && !paging_mode_refcounts(d) && mmio_mfn )
pass_thru_flags |= PAGE_CACHE_ATTRS;
sflags = gflags & pass_thru_flags;
@@ -663,7 +663,7 @@ _sh_propagate(struct vcpu *v,
* (We handle log-dirty entirely inside the shadow code, without using the
* p2m_ram_logdirty p2m type: only HAP uses that.)
*/
- if ( level == 1 && unlikely(shadow_mode_log_dirty(d)) && !mmio_mfn )
+ if ( level == 1 && unlikely(paging_mode_log_dirty(d)) && !mmio_mfn )
{
if ( ft & FETCH_TYPE_WRITE )
paging_mark_dirty(d, target_mfn);
@@ -819,7 +819,7 @@ do {
#define SHADOW_FOREACH_L2E(_sl2mfn, _sl2e, _gl2p, _done, _dom, _code) \
do { \
int _i, _j; \
- ASSERT(shadow_mode_external(_dom)); \
+ ASSERT(paging_mode_external(_dom)); \
ASSERT(mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2_32_shadow); \
for ( _j = 0; _j < 4; _j++ ) \
{ \
@@ -845,7 +845,7 @@ do {
do { \
int _i; \
shadow_l2e_t *_sp = map_domain_page((_sl2mfn)); \
- ASSERT(shadow_mode_external(_dom)); \
+ ASSERT(paging_mode_external(_dom)); \
ASSERT(mfn_to_page(_sl2mfn)->u.sh.type == SH_type_l2_pae_shadow); \
for ( _i = 0; _i < SHADOW_L2_PAGETABLE_ENTRIES; _i++ ) \
{ \
@@ -866,7 +866,7 @@ do {
unsigned int _i, _end = SHADOW_L2_PAGETABLE_ENTRIES; \
shadow_l2e_t *_sp = map_domain_page((_sl2mfn)); \
ASSERT_VALID_L2(mfn_to_page(_sl2mfn)->u.sh.type); \
- if ( is_pv_32bit_domain(_dom) /* implies !shadow_mode_external */ && \
+ if ( is_pv_32bit_domain(_dom) /* implies !paging_mode_external */ && \
mfn_to_page(_sl2mfn)->u.sh.type != SH_type_l2_64_shadow ) \
_end = COMPAT_L2_PAGETABLE_FIRST_XEN_SLOT(_dom); \
for ( _i = 0; _i < _end; ++_i ) \
@@ -908,7 +908,7 @@ do {
#define SHADOW_FOREACH_L4E(_sl4mfn, _sl4e, _gl4p, _done, _dom, _code) \
do { \
shadow_l4e_t *_sp = map_domain_page((_sl4mfn)); \
- int _xen = !shadow_mode_external(_dom); \
+ int _xen = !paging_mode_external(_dom); \
int _i; \
ASSERT(mfn_to_page(_sl4mfn)->u.sh.type == SH_type_l4_64_shadow);\
for ( _i = 0; _i < SHADOW_L4_PAGETABLE_ENTRIES; _i++ ) \
@@ -977,7 +977,7 @@ sh_make_shadow(struct vcpu *v, mfn_t gmf
#endif
// Create the Xen mappings...
- if ( !shadow_mode_external(d) )
+ if ( !paging_mode_external(d) )
{
switch (shadow_type)
{
@@ -1379,7 +1379,7 @@ void sh_destroy_l1_shadow(struct domain
shadow_demote(d, gmfn, t);
}
- if ( shadow_mode_refcounts(d) )
+ if ( paging_mode_refcounts(d) )
{
/* Decrement refcounts of all the old entries */
mfn_t sl1mfn = smfn;
@@ -1476,7 +1476,7 @@ static int cf_check validate_gl4e(
l4e_propagate_from_guest(v, new_gl4e, sl3mfn, &new_sl4e, ft_prefetch);
// check for updates to xen reserved slots
- if ( !shadow_mode_external(d) )
+ if ( !paging_mode_external(d) )
{
int shadow_index = (((unsigned long)sl4p & ~PAGE_MASK) /
sizeof(shadow_l4e_t));
@@ -2399,7 +2399,7 @@ static int cf_check sh_page_fault(
gfn = guest_walk_to_gfn(&gw);
gmfn = get_gfn(d, gfn, &p2mt);
- if ( shadow_mode_refcounts(d) &&
+ if ( paging_mode_refcounts(d) &&
((!p2m_is_valid(p2mt) && !p2m_is_grant(p2mt)) ||
(!p2m_is_mmio(p2mt) && !mfn_valid(gmfn))) )
{
@@ -2623,7 +2623,7 @@ static int cf_check sh_page_fault(
return EXCRET_fault_fixed;
emulate:
- if ( !shadow_mode_refcounts(d) )
+ if ( !paging_mode_refcounts(d) )
goto not_a_shadow_fault;
#ifdef CONFIG_HVM
@@ -3067,7 +3067,7 @@ sh_update_linear_entries(struct vcpu *v)
*/
/* Don't try to update the monitor table if it doesn't exist */
- if ( !shadow_mode_external(d) ||
+ if ( !paging_mode_external(d) ||
pagetable_get_pfn(v->arch.hvm.monitor_table) == 0 )
return;
@@ -3216,7 +3216,7 @@ static void cf_check sh_update_cr3(struc
/* Double-check that the HVM code has sent us a sane guest_table */
if ( is_hvm_domain(d) )
{
- ASSERT(shadow_mode_external(d));
+ ASSERT(paging_mode_external(d));
if ( hvm_paging_enabled(v) )
ASSERT(pagetable_get_pfn(v->arch.guest_table));
else
@@ -3241,7 +3241,7 @@ static void cf_check sh_update_cr3(struc
* table. We cache the current state of that table and shadow that,
* until the next CR3 write makes us refresh our cache.
*/
- ASSERT(shadow_mode_external(d));
+ ASSERT(paging_mode_external(d));
/*
* Find where in the page the l3 table is, but ignore the low 2 bits of
@@ -3272,7 +3272,7 @@ static void cf_check sh_update_cr3(struc
ASSERT(d->is_dying || d->is_shutting_down);
return;
}
- if ( !shadow_mode_external(d) && !is_pv_32bit_domain(d) )
+ if ( !paging_mode_external(d) && !is_pv_32bit_domain(d) )
{
mfn_t smfn = pagetable_get_mfn(v->arch.paging.shadow.shadow_table[0]);
@@ -3366,7 +3366,7 @@ static void cf_check sh_update_cr3(struc
///
/// v->arch.cr3
///
- if ( shadow_mode_external(d) )
+ if ( paging_mode_external(d) )
{
make_cr3(v, pagetable_get_mfn(v->arch.hvm.monitor_table));
}
@@ -3383,7 +3383,7 @@ static void cf_check sh_update_cr3(struc
///
/// v->arch.hvm.hw_cr[3]
///
- if ( shadow_mode_external(d) )
+ if ( paging_mode_external(d) )
{
ASSERT(is_hvm_domain(d));
#if SHADOW_PAGING_LEVELS == 3
--- a/xen/arch/x86/mm/shadow/private.h
+++ b/xen/arch/x86/mm/shadow/private.h
@@ -423,7 +423,7 @@ static inline int sh_remove_write_access
unsigned int level,
unsigned long fault_addr)
{
- ASSERT(!shadow_mode_refcounts(d));
+ ASSERT(!paging_mode_refcounts(d));
return 0;
}
#endif
@@ -536,8 +536,8 @@ sh_mfn_is_a_page_table(mfn_t gmfn)
return 0;
owner = page_get_owner(page);
- if ( owner && shadow_mode_refcounts(owner)
- && (page->count_info & PGC_shadowed_pt) )
+ if ( owner && paging_mode_refcounts(owner) &&
+ (page->count_info & PGC_shadowed_pt) )
return 1;
type_info = page->u.inuse.type_info & PGT_type_mask;
--- a/xen/arch/x86/mm/shadow/set.c
+++ b/xen/arch/x86/mm/shadow/set.c
@@ -93,7 +93,7 @@ shadow_get_page_from_l1e(shadow_l1e_t sl
struct domain *owner = NULL;
ASSERT(!sh_l1e_is_magic(sl1e));
- ASSERT(shadow_mode_refcounts(d));
+ ASSERT(paging_mode_refcounts(d));
if ( mfn_valid(mfn) )
{
@@ -354,7 +354,7 @@ int shadow_set_l1e(struct domain *d, sha
!sh_l1e_is_magic(new_sl1e) )
{
/* About to install a new reference */
- if ( shadow_mode_refcounts(d) )
+ if ( paging_mode_refcounts(d) )
{
#define PAGE_FLIPPABLE (_PAGE_RW | _PAGE_PWT | _PAGE_PCD | _PAGE_PAT)
int rc;
@@ -387,7 +387,7 @@ int shadow_set_l1e(struct domain *d, sha
old_sl1f = shadow_l1e_get_flags(old_sl1e);
if ( (old_sl1f & _PAGE_PRESENT) && !sh_l1e_is_magic(old_sl1e) &&
- shadow_mode_refcounts(d) )
+ paging_mode_refcounts(d) )
{
/*
* We lost a reference to an old mfn.
--- a/xen/arch/x86/mm/shadow/types.h
+++ b/xen/arch/x86/mm/shadow/types.h
@@ -274,7 +274,7 @@ int shadow_set_l4e(struct domain *d, sha
static void inline
shadow_put_page_from_l1e(shadow_l1e_t sl1e, struct domain *d)
{
- if ( !shadow_mode_refcounts(d) )
+ if ( !paging_mode_refcounts(d) )
return;
put_page_from_l1e(sl1e, d);
next prev parent reply other threads:[~2023-03-22 9:34 UTC|newest]
Thread overview: 39+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-22 9:28 [PATCH 00/16] x86: assorted (mostly) shadow mode adjustments Jan Beulich
2023-03-22 9:29 ` [PATCH 01/16] x86/shadow: fix and improve sh_page_has_multiple_shadows() Jan Beulich
2023-03-23 11:55 ` Andrew Cooper
2023-03-22 9:30 ` [PATCH 02/16] x86/shadow: fold/rename sh_unhook_*_mappings() Jan Beulich
2023-03-22 9:31 ` [PATCH 03/16] x86/shadow: drop redundant present bit checks from SHADOW_FOREACH_L<N>E() "bodys" Jan Beulich
2023-03-23 12:14 ` Andrew Cooper
2023-03-22 9:31 ` [PATCH 04/16] x86/shadow: replace memcmp() in sh_resync_l1() Jan Beulich
2023-03-23 12:55 ` Andrew Cooper
2023-03-22 9:31 ` [PATCH 05/16] x86/shadow: reduce explicit log-dirty recording for HVM Jan Beulich
2023-03-22 9:32 ` [PATCH 06/16] x86/shadow: purge {write,cmpxchg}_guest_entry() hooks Jan Beulich
2023-03-23 13:13 ` Andrew Cooper
2023-03-22 9:33 ` [PATCH 07/16] x86/shadow: call sh_update_cr3() directly from sh_page_fault() Jan Beulich
2023-03-23 13:34 ` Andrew Cooper
2023-03-27 15:39 ` Tim Deegan
2023-03-28 10:37 ` Jan Beulich
2023-03-29 6:49 ` Tim Deegan
2023-03-22 9:34 ` Jan Beulich [this message]
2023-03-22 9:34 ` [PATCH 09/16] x86/shadow: OOS mode is HVM-only Jan Beulich
2023-03-23 13:42 ` Andrew Cooper
2023-03-22 9:35 ` [PATCH 10/16] x86/shadow: move OOS functions to their own file Jan Beulich
2023-03-23 14:30 ` Andrew Cooper
2023-03-23 15:40 ` Jan Beulich
2023-03-23 17:44 ` Andrew Cooper
2023-03-22 9:35 ` [PATCH 11/16] x86/shadow: drop is_hvm_...() where easily possible Jan Beulich
2023-03-23 18:18 ` Andrew Cooper
2023-03-24 7:38 ` Jan Beulich
2023-03-28 13:57 ` Andrew Cooper
2023-03-28 14:41 ` Jan Beulich
2023-03-22 9:35 ` [PATCH 12/16] x86/shadow: make monitor table create/destroy more consistent Jan Beulich
2023-03-23 18:28 ` Andrew Cooper
2023-03-24 7:52 ` Jan Beulich
2023-03-22 9:36 ` [PATCH 13/16] x86/shadow: vCPU-s never have "no mode" Jan Beulich
2023-03-23 18:29 ` Andrew Cooper
2023-03-22 9:37 ` [PATCH 14/16] x86/shadow: "monitor table" is a HVM-only concept Jan Beulich
2023-03-23 18:30 ` Andrew Cooper
2023-03-22 9:37 ` [PATCH 15/16] x86/shadow: adjust monitor table prealloc amount Jan Beulich
2023-03-22 9:38 ` [PATCH 16/16] x86/PV: conditionalize arch_set_info_guest()'s call to update_cr3() Jan Beulich
2023-03-23 18:34 ` Andrew Cooper
2023-03-23 11:40 ` [PATCH 00/16] x86: assorted (mostly) shadow mode adjustments Andrew Cooper
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a794e6dc-d73a-e6fa-2d32-ad46b22f8483@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=roger.pau@citrix.com \
--cc=tim@xen.org \
--cc=wl@xen.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.