From: George Dunlap <george.dunlap@citrix.com>
To: Roger Pau Monne <roger.pau@citrix.com>, xen-devel@lists.xenproject.org
Cc: George Dunlap <george.dunlap@eu.citrix.com>,
Andrew Cooper <andrew.cooper3@citrix.com>,
Tim Deegan <tim@xen.org>, Jan Beulich <jbeulich@suse.com>,
boris.ostrovsky@oracle.com
Subject: Re: [PATCH v2 06/30] x86/paging: introduce paging_set_allocation
Date: Fri, 30 Sep 2016 18:00:52 +0100 [thread overview]
Message-ID: <2a8ae57e-c815-1dda-5aa5-f0c89f58567e@citrix.com> (raw)
In-Reply-To: <1474991845-27962-7-git-send-email-roger.pau@citrix.com>
On 27/09/16 16:57, Roger Pau Monne wrote:
> ... and remove hap_set_alloc_for_pvh_dom0.
>
> 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 RFC:
> - Make paging_set_allocation preemtable.
> - Move comments.
> ---
> xen/arch/x86/domain_build.c | 17 +++++++++++++----
> xen/arch/x86/mm/hap/hap.c | 14 +-------------
> xen/arch/x86/mm/paging.c | 16 ++++++++++++++++
> xen/arch/x86/mm/shadow/common.c | 7 +------
> xen/include/asm-x86/hap.h | 2 +-
> xen/include/asm-x86/paging.h | 7 +++++++
> xen/include/asm-x86/shadow.h | 8 ++++++++
> 7 files changed, 47 insertions(+), 24 deletions(-)
>
> diff --git a/xen/arch/x86/domain_build.c b/xen/arch/x86/domain_build.c
> index 0a02d65..04d6cb0 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.
> */
> d->arch.paging.mode = save_pvh_pg_mode;
>
> + if ( is_pvh_domain(d) )
> + {
> + int preempted;
> +
> + do {
> + preempted = 0;
> + 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 2dc82f5..4420e4e 100644
> --- a/xen/arch/x86/mm/hap/hap.c
> +++ b/xen/arch/x86/mm/hap/hap.c
> @@ -334,7 +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
> +int
> hap_set_allocation(struct domain *d, unsigned long pages, int *preempted)
> {
> struct page_info *pg;
> @@ -640,18 +640,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..2717bd3 100644
> --- a/xen/arch/x86/mm/paging.c
> +++ b/xen/arch/x86/mm/paging.c
> @@ -954,6 +954,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 long pages, int *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 d3cc2cc..53ffe1a 100644
> --- a/xen/arch/x86/mm/shadow/common.c
> +++ b/xen/arch/x86/mm/shadow/common.c
> @@ -1609,12 +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 long pages,
> - int *preempted)
> +int sh_set_allocation(struct domain *d, unsigned long pages, int *preempted)
> {
> struct page_info *sp;
> unsigned int lower_bound;
> diff --git a/xen/include/asm-x86/hap.h b/xen/include/asm-x86/hap.h
> index c613836..9d59430 100644
> --- a/xen/include/asm-x86/hap.h
> +++ b/xen/include/asm-x86/hap.h
> @@ -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 long pages, int *preempted);
>
> #endif /* XEN_HAP_H */
>
> diff --git a/xen/include/asm-x86/paging.h b/xen/include/asm-x86/paging.h
> index 56eef6b..c2d60d3 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 long pages,
> + int *preempted);
> +
> #endif /* XEN_PAGING_H */
>
> /*
> diff --git a/xen/include/asm-x86/shadow.h b/xen/include/asm-x86/shadow.h
> index 6d0aefb..f0e2227 100644
> --- a/xen/include/asm-x86/shadow.h
> +++ b/xen/include/asm-x86/shadow.h
> @@ -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 long pages, int *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) {}
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-09-30 17:01 UTC|newest]
Thread overview: 146+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-27 15:56 [PATCH v2 00/30] PVHv2 Dom0 Roger Pau Monne
2016-09-27 15:56 ` [PATCH v2 01/30] xen/x86: move setup of the VM86 TSS to the domain builder Roger Pau Monne
2016-09-28 15:35 ` Jan Beulich
2016-09-29 12:57 ` Roger Pau Monne
2016-09-27 15:56 ` [PATCH v2 02/30] xen/x86: remove XENFEAT_hvm_pirqs for PVHv2 guests Roger Pau Monne
2016-09-28 16:03 ` Jan Beulich
2016-09-29 14:17 ` Roger Pau Monne
2016-09-29 16:07 ` Jan Beulich
2016-09-27 15:56 ` [PATCH v2 03/30] xen/x86: fix parameters and return value of *_set_allocation functions Roger Pau Monne
2016-09-28 9:34 ` Tim Deegan
2016-09-29 10:39 ` Jan Beulich
2016-09-29 14:33 ` Roger Pau Monne
2016-09-29 16:09 ` Jan Beulich
2016-09-30 16:48 ` George Dunlap
2016-10-03 8:05 ` Paul Durrant
2016-10-06 11:33 ` Roger Pau Monne
2016-09-27 15:56 ` [PATCH v2 04/30] xen/x86: allow calling {sh/hap}_set_allocation with the idle domain Roger Pau Monne
2016-09-29 10:43 ` Jan Beulich
2016-09-29 14:37 ` Roger Pau Monne
2016-09-29 16:10 ` Jan Beulich
2016-09-30 16:56 ` George Dunlap
2016-09-30 16:56 ` George Dunlap
2016-09-27 15:57 ` [PATCH v2 05/30] xen/x86: assert that local_events_need_delivery is not called by " Roger Pau Monne
2016-09-29 10:45 ` Jan Beulich
2016-09-30 8:32 ` Roger Pau Monne
2016-09-30 8:59 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 06/30] x86/paging: introduce paging_set_allocation Roger Pau Monne
2016-09-29 10:51 ` Jan Beulich
2016-09-29 14:51 ` Roger Pau Monne
2016-09-29 16:12 ` Jan Beulich
2016-09-29 16:57 ` Roger Pau Monne
2016-09-30 17:00 ` George Dunlap [this message]
2016-09-27 15:57 ` [PATCH v2 07/30] xen/x86: split the setup of Dom0 permissions to a function Roger Pau Monne
2016-09-29 13:47 ` Jan Beulich
2016-09-29 15:53 ` Roger Pau Monne
2016-09-27 15:57 ` [PATCH v2 08/30] xen/x86: do the PCI scan unconditionally Roger Pau Monne
2016-09-29 13:55 ` Jan Beulich
2016-09-29 15:11 ` Roger Pau Monne
2016-09-29 16:14 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 09/30] x86/vtd: fix and simplify mapping RMRR regions Roger Pau Monne
2016-09-29 14:18 ` Jan Beulich
2016-09-30 11:27 ` Roger Pau Monne
2016-09-30 13:21 ` Jan Beulich
2016-09-30 15:02 ` Roger Pau Monne
2016-09-30 15:09 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 10/30] xen/x86: allow the emulated APICs to be enbled for the hardware domain Roger Pau Monne
2016-09-29 14:26 ` Jan Beulich
2016-09-30 15:44 ` Roger Pau Monne
2016-09-27 15:57 ` [PATCH v2 11/30] xen/x86: split Dom0 build into PV and PVHv2 Roger Pau Monne
2016-09-30 15:03 ` Jan Beulich
2016-10-03 10:09 ` Roger Pau Monne
2016-10-04 6:54 ` Jan Beulich
2016-10-04 7:09 ` Andrew Cooper
2016-09-27 15:57 ` [PATCH v2 12/30] xen/x86: make print_e820_memory_map global Roger Pau Monne
2016-09-30 15:04 ` Jan Beulich
2016-10-03 16:23 ` Roger Pau Monne
2016-10-04 6:47 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 13/30] xen: introduce a new format specifier to print sizes in human-readable form Roger Pau Monne
2016-09-28 8:24 ` Juergen Gross
2016-09-28 11:56 ` Roger Pau Monne
2016-09-28 12:01 ` Andrew Cooper
2016-10-03 8:36 ` Paul Durrant
2016-10-11 10:27 ` Roger Pau Monne
2016-09-27 15:57 ` [PATCH v2 14/30] xen/mm: add a ceil sufix to current page calculation routine Roger Pau Monne
2016-09-30 15:20 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 15/30] xen/x86: populate PVHv2 Dom0 physical memory map Roger Pau Monne
2016-09-30 15:52 ` Jan Beulich
2016-10-04 9:12 ` Roger Pau Monne
2016-10-04 11:16 ` Jan Beulich
2016-10-11 14:01 ` Roger Pau Monne
2016-10-12 11:51 ` Jan Beulich
2016-10-11 14:06 ` Roger Pau Monne
2016-10-12 11:58 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 16/30] xen/x86: parse Dom0 kernel for PVHv2 Roger Pau Monne
2016-10-06 15:14 ` Jan Beulich
2016-10-11 15:02 ` Roger Pau Monne
2016-09-27 15:57 ` [PATCH v2 17/30] xen/x86: setup PVHv2 Dom0 CPUs Roger Pau Monne
2016-10-06 15:20 ` Jan Beulich
2016-10-12 11:06 ` Roger Pau Monne
2016-10-12 11:32 ` Andrew Cooper
2016-10-12 12:02 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 18/30] xen/x86: setup PVHv2 Dom0 ACPI tables Roger Pau Monne
2016-10-06 15:40 ` Jan Beulich
2016-10-06 15:48 ` Andrew Cooper
2016-10-12 15:35 ` Roger Pau Monne
2016-10-12 15:55 ` Jan Beulich
2016-10-26 11:35 ` Roger Pau Monne
2016-10-26 14:10 ` Jan Beulich
2016-10-26 15:08 ` Roger Pau Monne
2016-10-26 15:16 ` Jan Beulich
2016-10-26 16:03 ` Roger Pau Monne
2016-10-27 7:25 ` Jan Beulich
2016-10-27 11:08 ` Roger Pau Monne
2016-10-26 17:14 ` Boris Ostrovsky
2016-10-27 7:27 ` Jan Beulich
2016-10-27 11:13 ` Roger Pau Monne
2016-10-27 11:25 ` Jan Beulich
2016-10-27 13:51 ` Boris Ostrovsky
2016-10-27 14:02 ` Jan Beulich
2016-10-27 14:15 ` Boris Ostrovsky
2016-10-27 14:30 ` Jan Beulich
2016-10-27 14:40 ` Boris Ostrovsky
2016-10-27 15:04 ` Roger Pau Monne
2016-10-27 15:20 ` Jan Beulich
2016-10-27 15:37 ` Roger Pau Monne
2016-10-28 13:51 ` Boris Ostrovsky
2016-09-27 15:57 ` [PATCH v2 19/30] xen/dcpi: add a dpci passthrough handler for hardware domain Roger Pau Monne
2016-10-03 9:02 ` Paul Durrant
2016-10-06 14:31 ` Roger Pau Monne
2016-10-06 15:44 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 20/30] xen/x86: add the basic infrastructure to import QEMU passthrough code Roger Pau Monne
2016-10-03 9:54 ` Paul Durrant
2016-10-06 15:08 ` Roger Pau Monne
2016-10-06 15:52 ` Lars Kurth
2016-10-07 9:13 ` Jan Beulich
2016-10-06 15:47 ` Jan Beulich
2016-10-10 12:41 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 21/30] xen/pci: split code to size BARs from pci_add_device Roger Pau Monne
2016-10-06 16:00 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 22/30] xen/x86: support PVHv2 Dom0 BAR remapping Roger Pau Monne
2016-10-03 10:10 ` Paul Durrant
2016-10-06 15:25 ` Roger Pau Monne
2016-09-27 15:57 ` [PATCH v2 23/30] xen/x86: route legacy PCI interrupts to Dom0 Roger Pau Monne
2016-10-10 13:37 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 24/30] x86/vmsi: add MSI emulation for hardware domain Roger Pau Monne
2016-09-27 15:57 ` [PATCH v2 25/30] xen/x86: add all PCI devices to PVHv2 Dom0 Roger Pau Monne
2016-10-10 13:44 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 26/30] xen/x86: add PCIe emulation Roger Pau Monne
2016-10-03 10:46 ` Paul Durrant
2016-10-06 15:53 ` Roger Pau Monne
2016-10-10 13:57 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 27/30] x86/msixtbl: disable MSI-X intercepts for domains without an ioreq server Roger Pau Monne
2016-10-10 14:18 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 28/30] xen/x86: add MSI-X emulation to PVHv2 Dom0 Roger Pau Monne
2016-10-03 10:57 ` Paul Durrant
2016-10-06 15:58 ` Roger Pau Monne
2016-10-10 16:15 ` Jan Beulich
2016-09-27 15:57 ` [PATCH v2 29/30] xen/x86: allow PVHv2 to perform foreign memory mappings Roger Pau Monne
2016-09-30 17:36 ` George Dunlap
2016-10-10 14:21 ` Jan Beulich
2016-10-10 14:27 ` George Dunlap
2016-10-10 14:50 ` Jan Beulich
2016-10-10 14:58 ` George Dunlap
2016-09-27 15:57 ` [PATCH v2 30/30] xen: allow setting the store pfn HVM parameter Roger Pau Monne
2016-10-03 11:01 ` Paul Durrant
2016-09-28 12:22 ` [PATCH v2 00/30] PVHv2 Dom0 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=2a8ae57e-c815-1dda-5aa5-f0c89f58567e@citrix.com \
--to=george.dunlap@citrix.com \
--cc=andrew.cooper3@citrix.com \
--cc=boris.ostrovsky@oracle.com \
--cc=george.dunlap@eu.citrix.com \
--cc=jbeulich@suse.com \
--cc=roger.pau@citrix.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).