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>
Subject: [PATCH 3/6] x86/p2m: set_{foreign,mmio}_p2m_entry() are HVM-only
Date: Tue, 15 Dec 2020 17:26:34 +0100 [thread overview]
Message-ID: <15f41816-4814-bae5-e0bc-89e99d04a142@suse.com> (raw)
In-Reply-To: <be9ce75e-9119-2b5a-9e7b-437beb7ee446@suse.com>
Extend a respective #ifdef from inside set_typed_p2m_entry() to around
all three functions. Add ASSERT_UNREACHABLE() to the latter one's safety
check path.
Signed-off-by: Jan Beulich <jbeulich@suse.com>
--- a/xen/arch/x86/mm/p2m.c
+++ b/xen/arch/x86/mm/p2m.c
@@ -1257,6 +1257,8 @@ int p2m_finish_type_change(struct domain
return rc;
}
+#ifdef CONFIG_HVM
+
/*
* Returns:
* 0 for success
@@ -1277,7 +1279,10 @@ static int set_typed_p2m_entry(struct do
struct p2m_domain *p2m = p2m_get_hostp2m(d);
if ( !paging_mode_translate(d) )
+ {
+ ASSERT_UNREACHABLE();
return -EIO;
+ }
gfn_lock(p2m, gfn, order);
omfn = p2m->get_entry(p2m, gfn, &ot, &a, 0, &cur_order, NULL);
@@ -1308,7 +1313,6 @@ static int set_typed_p2m_entry(struct do
if ( rc )
gdprintk(XENLOG_ERR, "p2m_set_entry: %#lx:%u -> %d (0x%"PRI_mfn")\n",
gfn_l, order, rc, mfn_x(mfn));
-#ifdef CONFIG_HVM
else if ( p2m_is_pod(ot) )
{
pod_lock(p2m);
@@ -1316,7 +1320,6 @@ static int set_typed_p2m_entry(struct do
BUG_ON(p2m->pod.entry_count < 0);
pod_unlock(p2m);
}
-#endif
gfn_unlock(p2m, gfn, order);
return rc;
@@ -1341,6 +1344,8 @@ int set_mmio_p2m_entry(struct domain *d,
p2m_get_hostp2m(d)->default_access);
}
+#endif /* CONFIG_HVM */
+
int set_identity_p2m_entry(struct domain *d, unsigned long gfn_l,
p2m_access_t p2ma, unsigned int flag)
{
next prev parent reply other threads:[~2020-12-15 16:26 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 16:24 [PATCH 0/6] x86/p2m: restrict more code to build just for HVM Jan Beulich
2020-12-15 16:25 ` [PATCH 1/6] x86/p2m: tidy p2m_add_foreign() a little Jan Beulich
2020-12-17 19:03 ` Andrew Cooper
2020-12-18 8:39 ` Jan Beulich
2020-12-15 16:26 ` [PATCH 2/6] x86/mm: p2m_add_foreign() is HVM-only Jan Beulich
2020-12-17 19:18 ` Andrew Cooper
2020-12-18 8:48 ` Jan Beulich
2020-12-21 8:10 ` Jan Beulich
2020-12-22 10:40 ` Andrew Cooper
2021-01-04 16:57 ` Oleksandr Tyshchenko
2021-01-05 8:48 ` Jan Beulich
2021-01-08 16:38 ` Oleksandr
2021-01-08 17:01 ` Jan Beulich
2021-01-08 17:37 ` Oleksandr
2021-01-11 7:41 ` Jan Beulich
2021-01-11 8:23 ` Oleksandr
2021-01-12 11:58 ` Jan Beulich
2021-01-13 15:06 ` Oleksandr
2021-01-23 13:22 ` Julien Grall
2021-01-25 9:10 ` Jan Beulich
2021-01-25 10:33 ` Jan Beulich
2020-12-15 16:26 ` Jan Beulich [this message]
2020-12-17 19:54 ` [PATCH 3/6] x86/p2m: set_{foreign,mmio}_p2m_entry() are HVM-only Andrew Cooper
2020-12-18 8:58 ` Jan Beulich
2020-12-15 16:26 ` [PATCH 4/6] x86/p2m: {,un}map_mmio_regions() " Jan Beulich
2020-12-15 16:27 ` [PATCH 5/6] x86/mm: the gva_to_gfn() hook is HVM-only Jan Beulich
2020-12-22 17:02 ` Jan Beulich
2020-12-15 16:28 ` [PATCH 6/6] x86/p2m: set_shared_p2m_entry() is MEM_SHARING-only Jan Beulich
2020-12-15 17:05 ` Tamas K Lengyel
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=15f41816-4814-bae5-e0bc-89e99d04a142@suse.com \
--to=jbeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=george.dunlap@citrix.com \
--cc=roger.pau@citrix.com \
--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.