From: Roger Pau Monne <roger.pau@citrix.com>
To: xen-devel@lists.xenproject.org, boris.ostrovsky@oracle.com,
konrad.wilk@oracle.com
Cc: George Dunlap <george.dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Tim Deegan <tim@xen.org>, Jan Beulich <jbeulich@suse.com>,
Roger Pau Monne <roger.pau@citrix.com>
Subject: [PATCH v3.1 05/15] x86/paging: introduce paging_set_allocation
Date: Sat, 29 Oct 2016 10:59:51 +0200 [thread overview]
Message-ID: <1477731601-10926-6-git-send-email-roger.pau@citrix.com> (raw)
In-Reply-To: <1477731601-10926-1-git-send-email-roger.pau@citrix.com>
... and remove hap_set_alloc_for_pvh_dom0. While there also change the last
parameter of the {hap/sh}_set_allocation functions to be a boolean.
Signed-off-by: Roger Pau Monné <roger.pau@citrix.com>
Acked-by: Tim Deegan <tim@xen.org>
Acked-by: George Dunlap <george.dunlap@citrix.com>
---
Cc: Jan Beulich <jbeulich@suse.com>
Cc: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: George Dunlap <george.dunlap@eu.citrix.com>
Cc: Tim Deegan <tim@xen.org>
---
Changes since v2:
- Convert the preempt parameter into a bool.
- Fix Dom0 builder comment to reflect that paging.mode should be correct
before calling paging_set_allocation.
Changes since RFC:
- Make paging_set_allocation preemtable.
- Move comments.
---
xen/arch/x86/domain_build.c | 21 +++++++++++++++------
xen/arch/x86/mm/hap/hap.c | 22 +++++-----------------
xen/arch/x86/mm/paging.c | 19 ++++++++++++++++++-
xen/arch/x86/mm/shadow/common.c | 15 +++++----------
xen/include/asm-x86/hap.h | 4 ++--
xen/include/asm-x86/paging.h | 7 +++++++
xen/include/asm-x86/shadow.h | 10 +++++++++-
7 files changed, 61 insertions(+), 37 deletions(-)
diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
index 0a02d65..17f8e91 100644
--- a/xen/arch/x86/domain_build.c
+++ b/xen/arch/x86/domain_build.c
@@ -35,7 +35,6 @@
#include <asm/setup.h>
#include <asm/bzimage.h> /* for bzimage_parse */
#include <asm/io_apic.h>
-#include <asm/hap.h>
#include <asm/hpet.h>
#include <public/version.h>
@@ -1383,15 +1382,25 @@ int __init construct_dom0(
nr_pages);
}
- if ( is_pvh_domain(d) )
- hap_set_alloc_for_pvh_dom0(d, dom0_paging_pages(d, nr_pages));
-
/*
- * We enable paging mode again so guest_physmap_add_page will do the
- * right thing for us.
+ * We enable paging mode again so guest_physmap_add_page and
+ * paging_set_allocation will do the right thing for us.
*/
d->arch.paging.mode = save_pvh_pg_mode;
+ if ( is_pvh_domain(d) )
+ {
+ bool preempted;
+
+ do {
+ preempted = false;
+ paging_set_allocation(d, dom0_paging_pages(d, nr_pages),
+ &preempted);
+ process_pending_softirqs();
+ } while ( preempted );
+ }
+
+
/* Write the phys->machine and machine->phys table entries. */
for ( pfn = 0; pfn < count; pfn++ )
{
diff --git a/xen/arch/x86/mm/hap/hap.c b/xen/arch/x86/mm/hap/hap.c
index 0645521..b930619 100644
--- a/xen/arch/x86/mm/hap/hap.c
+++ b/xen/arch/x86/mm/hap/hap.c
@@ -334,8 +334,7 @@ hap_get_allocation(struct domain *d)
/* Set the pool of pages to the required number of pages.
* Returns 0 for success, non-zero for failure. */
-static int
-hap_set_allocation(struct domain *d, unsigned int pages, int *preempted)
+int hap_set_allocation(struct domain *d, unsigned int pages, bool *preempted)
{
struct page_info *pg;
@@ -383,7 +382,7 @@ hap_set_allocation(struct domain *d, unsigned int pages, int *preempted)
(is_idle_vcpu(current) ? softirq_pending(smp_processor_id()) :
hypercall_preempt_check()) )
{
- *preempted = 1;
+ *preempted = true;
return 0;
}
}
@@ -563,7 +562,7 @@ void hap_final_teardown(struct domain *d)
paging_unlock(d);
}
-void hap_teardown(struct domain *d, int *preempted)
+void hap_teardown(struct domain *d, bool *preempted)
{
struct vcpu *v;
mfn_t mfn;
@@ -611,7 +610,8 @@ out:
int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
XEN_GUEST_HANDLE_PARAM(void) u_domctl)
{
- int rc, preempted = 0;
+ int rc;
+ bool preempted = false;
switch ( sc->op )
{
@@ -638,18 +638,6 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
}
}
-void __init hap_set_alloc_for_pvh_dom0(struct domain *d,
- unsigned long hap_pages)
-{
- int rc;
-
- paging_lock(d);
- rc = hap_set_allocation(d, hap_pages, NULL);
- paging_unlock(d);
-
- BUG_ON(rc);
-}
-
static const struct paging_mode hap_paging_real_mode;
static const struct paging_mode hap_paging_protected_mode;
static const struct paging_mode hap_paging_pae_mode;
diff --git a/xen/arch/x86/mm/paging.c b/xen/arch/x86/mm/paging.c
index cc44682..5d80b03 100644
--- a/xen/arch/x86/mm/paging.c
+++ b/xen/arch/x86/mm/paging.c
@@ -809,7 +809,8 @@ long paging_domctl_continuation(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl)
/* Call when destroying a domain */
int paging_teardown(struct domain *d)
{
- int rc, preempted = 0;
+ int rc;
+ bool preempted = false;
if ( hap_enabled(d) )
hap_teardown(d, &preempted);
@@ -954,6 +955,22 @@ void paging_write_p2m_entry(struct p2m_domain *p2m, unsigned long gfn,
safe_write_pte(p, new);
}
+int paging_set_allocation(struct domain *d, unsigned int pages, bool *preempted)
+{
+ int rc;
+
+ ASSERT(paging_mode_enabled(d));
+
+ paging_lock(d);
+ if ( hap_enabled(d) )
+ rc = hap_set_allocation(d, pages, preempted);
+ else
+ rc = sh_set_allocation(d, pages, preempted);
+ paging_unlock(d);
+
+ return rc;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c
index b2e99c2..4933651 100644
--- a/xen/arch/x86/mm/shadow/common.c
+++ b/xen/arch/x86/mm/shadow/common.c
@@ -1609,13 +1609,7 @@ shadow_free_p2m_page(struct domain *d, struct page_info *pg)
paging_unlock(d);
}
-/* Set the pool of shadow pages to the required number of pages.
- * Input will be rounded up to at least shadow_min_acceptable_pages(),
- * plus space for the p2m table.
- * Returns 0 for success, non-zero for failure. */
-static int sh_set_allocation(struct domain *d,
- unsigned int pages,
- int *preempted)
+int sh_set_allocation(struct domain *d, unsigned int pages, bool *preempted)
{
struct page_info *sp;
unsigned int lower_bound;
@@ -1683,7 +1677,7 @@ static int sh_set_allocation(struct domain *d,
(is_idle_vcpu(current) ? softirq_pending(smp_processor_id()) :
hypercall_preempt_check()) )
{
- *preempted = 1;
+ *preempted = true;
return 0;
}
}
@@ -3239,7 +3233,7 @@ int shadow_enable(struct domain *d, u32 mode)
return rv;
}
-void shadow_teardown(struct domain *d, int *preempted)
+void shadow_teardown(struct domain *d, bool *preempted)
/* Destroy the shadow pagetables of this domain and free its shadow memory.
* Should only be called for dying domains. */
{
@@ -3876,7 +3870,8 @@ int shadow_domctl(struct domain *d,
xen_domctl_shadow_op_t *sc,
XEN_GUEST_HANDLE_PARAM(void) u_domctl)
{
- int rc, preempted = 0;
+ int rc;
+ bool preempted = false;
switch ( sc->op )
{
diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h
index c613836..dedb4b1 100644
--- a/xen/include/asm-x86/hap.h
+++ b/xen/include/asm-x86/hap.h
@@ -38,7 +38,7 @@ int hap_domctl(struct domain *d, xen_domctl_shadow_op_t *sc,
XEN_GUEST_HANDLE_PARAM(void) u_domctl);
int hap_enable(struct domain *d, u32 mode);
void hap_final_teardown(struct domain *d);
-void hap_teardown(struct domain *d, int *preempted);
+void hap_teardown(struct domain *d, bool *preempted);
void hap_vcpu_init(struct vcpu *v);
int hap_track_dirty_vram(struct domain *d,
unsigned long begin_pfn,
@@ -46,7 +46,7 @@ int hap_track_dirty_vram(struct domain *d,
XEN_GUEST_HANDLE_64(uint8) dirty_bitmap);
extern const struct paging_mode *hap_paging_get_mode(struct vcpu *);
-void hap_set_alloc_for_pvh_dom0(struct domain *d, unsigned long num_pages);
+int hap_set_allocation(struct domain *d, unsigned int pages, bool *preempted);
#endif /* XEN_HAP_H */
diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h
index 56eef6b..f83ed8b 100644
--- a/xen/include/asm-x86/paging.h
+++ b/xen/include/asm-x86/paging.h
@@ -347,6 +347,13 @@ void pagetable_dying(struct domain *d, paddr_t gpa);
void paging_dump_domain_info(struct domain *d);
void paging_dump_vcpu_info(struct vcpu *v);
+/* Set the pool of shadow pages to the required number of pages.
+ * Input might be rounded up to at minimum amount of pages, plus
+ * space for the p2m table.
+ * Returns 0 for success, non-zero for failure. */
+int paging_set_allocation(struct domain *d, unsigned int pages,
+ bool *preempted);
+
#endif /* XEN_PAGING_H */
/*
diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
index 6d0aefb..4822f89 100644
--- a/xen/include/asm-x86/shadow.h
+++ b/xen/include/asm-x86/shadow.h
@@ -73,7 +73,7 @@ int shadow_domctl(struct domain *d,
XEN_GUEST_HANDLE_PARAM(void) u_domctl);
/* Call when destroying a domain */
-void shadow_teardown(struct domain *d, int *preempted);
+void shadow_teardown(struct domain *d, bool *preempted);
/* Call once all of the references to the domain have gone away */
void shadow_final_teardown(struct domain *d);
@@ -83,6 +83,12 @@ void sh_remove_shadows(struct domain *d, mfn_t gmfn, int fast, int all);
/* Discard _all_ mappings from the domain's shadows. */
void shadow_blow_tables_per_domain(struct domain *d);
+/* Set the pool of shadow pages to the required number of pages.
+ * Input will be rounded up to at least shadow_min_acceptable_pages(),
+ * plus space for the p2m table.
+ * Returns 0 for success, non-zero for failure. */
+int sh_set_allocation(struct domain *d, unsigned int pages, bool *preempted);
+
#else /* !CONFIG_SHADOW_PAGING */
#define shadow_teardown(d, p) ASSERT(is_pv_domain(d))
@@ -91,6 +97,8 @@ void shadow_blow_tables_per_domain(struct domain *d);
({ ASSERT(is_pv_domain(d)); -EOPNOTSUPP; })
#define shadow_track_dirty_vram(d, begin_pfn, nr, bitmap) \
({ ASSERT_UNREACHABLE(); -EOPNOTSUPP; })
+#define sh_set_allocation(d, pages, preempted) \
+ ({ ASSERT_UNREACHABLE(); -EOPNOTSUPP; })
static inline void sh_remove_shadows(struct domain *d, mfn_t gmfn,
bool_t fast, bool_t all) {}
--
2.7.4 (Apple Git-66)
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-10-29 9:00 UTC|newest]
Thread overview: 89+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-29 8:59 [PATCH v3.1 00/15] Initial PVHv2 Dom0 support Roger Pau Monne
2016-10-29 8:59 ` [PATCH v3.1 01/15] xen/x86: remove XENFEAT_hvm_pirqs for PVHv2 guests Roger Pau Monne
2016-10-31 16:32 ` Jan Beulich
2016-11-03 12:35 ` Roger Pau Monne
2016-11-03 12:52 ` Jan Beulich
2016-11-03 14:25 ` Konrad Rzeszutek Wilk
2016-11-03 15:05 ` Roger Pau Monne
2016-11-03 14:22 ` Konrad Rzeszutek Wilk
2016-11-03 15:01 ` Roger Pau Monne
2016-11-03 15:43 ` Roger Pau Monne
2016-10-29 8:59 ` [PATCH v3.1 02/15] xen/x86: fix return value of *_set_allocation functions Roger Pau Monne
2016-10-29 22:11 ` Tim Deegan
2016-10-29 8:59 ` [PATCH v3.1 03/15] xen/x86: allow calling {sh/hap}_set_allocation with the idle domain Roger Pau Monne
2016-10-31 16:34 ` Jan Beulich
2016-11-01 10:45 ` Tim Deegan
2016-11-02 17:14 ` Roger Pau Monne
2016-11-03 10:20 ` Roger Pau Monne
2016-11-03 10:33 ` Tim Deegan
2016-11-03 11:31 ` Jan Beulich
2016-10-29 8:59 ` [PATCH v3.1 04/15] xen/x86: assert that local_events_need_delivery is not called by " Roger Pau Monne
2016-10-31 16:37 ` Jan Beulich
2016-10-29 8:59 ` Roger Pau Monne [this message]
2016-10-31 16:42 ` [PATCH v3.1 05/15] x86/paging: introduce paging_set_allocation Jan Beulich
2016-11-01 10:29 ` Tim Deegan
2016-10-29 8:59 ` [PATCH v3.1 06/15] xen/x86: split the setup of Dom0 permissions to a function Roger Pau Monne
2016-10-31 16:44 ` Jan Beulich
2016-10-29 8:59 ` [PATCH v3.1 07/15] xen/x86: do the PCI scan unconditionally Roger Pau Monne
2016-10-31 16:47 ` Jan Beulich
2016-11-03 10:58 ` Roger Pau Monne
2016-11-03 11:35 ` Jan Beulich
2016-11-03 11:54 ` Boris Ostrovsky
2016-11-29 12:33 ` Roger Pau Monne
2016-11-29 12:47 ` Jan Beulich
2016-11-29 12:57 ` Roger Pau Monne
2016-11-30 5:53 ` Tian, Kevin
2016-11-30 9:02 ` Jan Beulich
2016-10-29 8:59 ` [PATCH v3.1 08/15] x86/vtd: fix mapping of RMRR regions Roger Pau Monne
2016-11-04 9:16 ` Jan Beulich
2016-11-04 9:45 ` Roger Pau Monne
2016-11-04 10:34 ` Jan Beulich
2016-11-04 12:25 ` Roger Pau Monne
2016-11-04 12:53 ` Jan Beulich
2016-11-04 13:03 ` Roger Pau Monne
2016-11-04 13:16 ` Jan Beulich
2016-11-04 15:33 ` Roger Pau Monne
2016-11-04 16:13 ` Jan Beulich
2016-11-04 16:19 ` Roger Pau Monne
2016-11-04 17:08 ` Jan Beulich
2016-11-04 17:25 ` Roger Pau Monne
2016-11-07 8:36 ` Jan Beulich
2016-10-29 8:59 ` [PATCH v3.1 09/15] xen/x86: allow the emulated APICs to be enabled for the hardware domain Roger Pau Monne
2016-11-04 9:19 ` Jan Beulich
2016-11-04 9:47 ` Roger Pau Monne
2016-11-04 10:21 ` Jan Beulich
2016-11-04 12:09 ` Roger Pau Monne
2016-11-04 12:50 ` Jan Beulich
2016-11-04 13:06 ` Roger Pau Monne
2016-10-29 8:59 ` [PATCH v3.1 10/15] xen/x86: split Dom0 build into PV and PVHv2 Roger Pau Monne
2016-11-11 16:53 ` Jan Beulich
2016-11-16 18:02 ` Roger Pau Monne
2016-11-17 10:49 ` Jan Beulich
2016-11-28 17:49 ` Roger Pau Monne
2016-11-29 9:34 ` Jan Beulich
2016-10-29 8:59 ` [PATCH v3.1 11/15] xen/mm: introduce a function to map large chunks of MMIO Roger Pau Monne
2016-11-11 16:58 ` Jan Beulich
2016-11-29 12:41 ` Roger Pau Monne
2016-11-29 13:00 ` Jan Beulich
2016-11-29 15:32 ` Roger Pau Monne
2016-11-11 20:17 ` Konrad Rzeszutek Wilk
2016-10-29 8:59 ` [PATCH v3.1 12/15] xen/x86: populate PVHv2 Dom0 physical memory map Roger Pau Monne
2016-11-11 17:16 ` Jan Beulich
2016-11-28 11:26 ` Roger Pau Monne
2016-11-28 11:41 ` Jan Beulich
2016-11-28 13:30 ` Roger Pau Monne
2016-11-28 13:49 ` Jan Beulich
2016-11-28 16:02 ` Roger Pau Monne
2016-10-29 8:59 ` [PATCH v3.1 13/15] xen/x86: parse Dom0 kernel for PVHv2 Roger Pau Monne
2016-11-11 20:30 ` Konrad Rzeszutek Wilk
2016-11-28 12:14 ` Roger Pau Monne
2016-10-29 9:00 ` [PATCH v3.1 14/15] xen/x86: hack to setup PVHv2 Dom0 CPUs Roger Pau Monne
2016-10-29 9:00 ` [PATCH v3.1 15/15] xen/x86: setup PVHv2 Dom0 ACPI tables Roger Pau Monne
2016-11-14 16:15 ` Jan Beulich
2016-11-30 12:40 ` Roger Pau Monne
2016-11-30 14:09 ` Jan Beulich
2016-11-30 14:23 ` Roger Pau Monne
2016-11-30 16:38 ` Jan Beulich
2016-10-31 14:35 ` [PATCH v3.1 00/15] Initial PVHv2 Dom0 support Boris Ostrovsky
2016-10-31 14:43 ` Andrew Cooper
2016-10-31 16:35 ` Roger Pau Monne
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=1477731601-10926-6-git-send-email-roger.pau@citrix.com \
--to=roger.pau@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=george.dunlap@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=konrad.wilk@oracle.com \
--cc=tim@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).