|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] Re: [Xen-devel] [PATCH v5 4/4] x86/mem_sharing: compile mem_sharing subsystem only when kconfig is enabled
>>> On 16.05.19 at 23:37, <tamas@xxxxxxxxxxxxx> wrote:
> Disable it by default as it is only an experimental subsystem.
>
> Signed-off-by: Tamas K Lengyel <tamas@xxxxxxxxxxxxx>
> Cc: Jan Beulich <jbeulich@xxxxxxxx>
> Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
> Cc: Wei Liu <wei.liu2@xxxxxxxxxx>
> Cc: Roger Pau Monne <roger.pau@xxxxxxxxxx>
> Cc: George Dunlap <George.Dunlap@xxxxxxxxxxxxx>
> Cc: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
> Cc: Julien Grall <julien.grall@xxxxxxx>
> Cc: Konrad Rzeszutek Wilk <konrad.wilk@xxxxxxxxxx>
> Cc: Stefano Stabellini <sstabellini@xxxxxxxxxx>
> Cc: Tim Deegan <tim@xxxxxxx>
> Cc: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
> ----
> v4: add ASSERT_UNREACHABLE to inlined functions where applicable & other
> fixups
> ---
> xen/arch/x86/Kconfig | 6 +++++-
> xen/arch/x86/domain.c | 2 ++
> xen/arch/x86/domctl.c | 2 ++
> xen/arch/x86/mm/Makefile | 2 +-
> xen/arch/x86/x86_64/compat/mm.c | 2 ++
> xen/arch/x86/x86_64/mm.c | 2 ++
> xen/common/Kconfig | 3 ---
> xen/common/domain.c | 2 +-
> xen/common/grant_table.c | 2 +-
> xen/common/memory.c | 2 +-
> xen/common/vm_event.c | 6 +++---
> xen/include/asm-x86/mem_sharing.h | 28 ++++++++++++++++++++++++++++
> xen/include/asm-x86/mm.h | 3 +++
> xen/include/xen/sched.h | 2 +-
> xen/include/xsm/dummy.h | 2 +-
> xen/include/xsm/xsm.h | 4 ++--
> xen/xsm/dummy.c | 2 +-
> xen/xsm/flask/hooks.c | 4 ++--
> 18 files changed, 58 insertions(+), 18 deletions(-)
Daniel, it looks like you weren't Cc-ed here, but your ack is needed.
Jan
> diff --git a/xen/arch/x86/Kconfig b/xen/arch/x86/Kconfig
> index 4b8b07b549..600ca5c12e 100644
> --- a/xen/arch/x86/Kconfig
> +++ b/xen/arch/x86/Kconfig
> @@ -17,7 +17,6 @@ config X86
> select HAS_KEXEC
> select MEM_ACCESS_ALWAYS_ON
> select HAS_MEM_PAGING
> - select HAS_MEM_SHARING
> select HAS_NS16550
> select HAS_PASSTHROUGH
> select HAS_PCI
> @@ -198,6 +197,11 @@ config PV_SHIM_EXCLUSIVE
> firmware, and will not function correctly in other scenarios.
>
> If unsure, say N.
> +
> +config MEM_SHARING
> + bool "Xen memory sharing support" if EXPERT = "y"
> + depends on HVM
> +
> endmenu
>
> source "common/Kconfig"
> diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
> index d2d9f2fc3c..474df8433b 100644
> --- a/xen/arch/x86/domain.c
> +++ b/xen/arch/x86/domain.c
> @@ -2046,6 +2046,7 @@ int domain_relinquish_resources(struct domain *d)
> d->arch.auto_unmask = 0;
> }
>
> +#ifdef CONFIG_MEM_SHARING
> PROGRESS(shared):
>
> if ( is_hvm_domain(d) )
> @@ -2056,6 +2057,7 @@ int domain_relinquish_resources(struct domain *d)
> if ( ret )
> return ret;
> }
> +#endif
>
> spin_lock(&d->page_alloc_lock);
> page_list_splice(&d->arch.relmem_list, &d->page_list);
> diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
> index 9bf2d0820f..bc9e024ccc 100644
> --- a/xen/arch/x86/domctl.c
> +++ b/xen/arch/x86/domctl.c
> @@ -1231,9 +1231,11 @@ long arch_do_domctl(
> break;
> }
>
> +#ifdef CONFIG_MEM_SHARING
> case XEN_DOMCTL_mem_sharing_op:
> ret = mem_sharing_domctl(d, &domctl->u.mem_sharing_op);
> break;
> +#endif
>
> #if P2M_AUDIT && defined(CONFIG_HVM)
> case XEN_DOMCTL_audit_p2m:
> diff --git a/xen/arch/x86/mm/Makefile b/xen/arch/x86/mm/Makefile
> index 5a17646f98..5010a29d6c 100644
> --- a/xen/arch/x86/mm/Makefile
> +++ b/xen/arch/x86/mm/Makefile
> @@ -6,7 +6,7 @@ obj-$(CONFIG_HVM) += guest_walk_2.o guest_walk_3.o
> guest_walk_4.o
> obj-$(CONFIG_SHADOW_PAGING) += guest_walk_2.o guest_walk_3.o guest_walk_4.o
> obj-$(CONFIG_MEM_ACCESS) += mem_access.o
> obj-y += mem_paging.o
> -obj-y += mem_sharing.o
> +obj-$(CONFIG_MEM_SHARING) += mem_sharing.o
> obj-y += p2m.o p2m-pt.o
> obj-$(CONFIG_HVM) += p2m-ept.o p2m-pod.o
> obj-y += paging.o
> diff --git a/xen/arch/x86/x86_64/compat/mm.c b/xen/arch/x86/x86_64/compat/mm.c
> index 32410ed273..d4c6be3032 100644
> --- a/xen/arch/x86/x86_64/compat/mm.c
> +++ b/xen/arch/x86/x86_64/compat/mm.c
> @@ -152,8 +152,10 @@ int compat_arch_memory_op(unsigned long cmd,
> XEN_GUEST_HANDLE_PARAM(void) arg)
> case XENMEM_paging_op:
> return mem_paging_memop(guest_handle_cast(arg,
> xen_mem_paging_op_t));
>
> +#ifdef CONFIG_MEM_SHARING
> case XENMEM_sharing_op:
> return mem_sharing_memop(guest_handle_cast(arg,
> xen_mem_sharing_op_t));
> +#endif
>
> default:
> rc = -ENOSYS;
> diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c
> index d8f558bc3a..51d1d511f2 100644
> --- a/xen/arch/x86/x86_64/mm.c
> +++ b/xen/arch/x86/x86_64/mm.c
> @@ -993,8 +993,10 @@ long subarch_memory_op(unsigned long cmd,
> XEN_GUEST_HANDLE_PARAM(void) arg)
> case XENMEM_paging_op:
> return mem_paging_memop(guest_handle_cast(arg,
> xen_mem_paging_op_t));
>
> +#ifdef CONFIG_MEM_SHARING
> case XENMEM_sharing_op:
> return mem_sharing_memop(guest_handle_cast(arg,
> xen_mem_sharing_op_t));
> +#endif
>
> default:
> rc = -ENOSYS;
> diff --git a/xen/common/Kconfig b/xen/common/Kconfig
> index 7a12346f19..6e28fc48af 100644
> --- a/xen/common/Kconfig
> +++ b/xen/common/Kconfig
> @@ -45,9 +45,6 @@ config MEM_ACCESS
> config HAS_MEM_PAGING
> bool
>
> -config HAS_MEM_SHARING
> - bool
> -
> config HAS_PDX
> bool
>
> diff --git a/xen/common/domain.c b/xen/common/domain.c
> index 90c66079f9..0815cf8f07 100644
> --- a/xen/common/domain.c
> +++ b/xen/common/domain.c
> @@ -923,7 +923,7 @@ static void complete_domain_destroy(struct rcu_head
> *head)
> xfree(d->vm_event_paging);
> #endif
> xfree(d->vm_event_monitor);
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> xfree(d->vm_event_share);
> #endif
>
> diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
> index 80728ea57d..6c40dccae9 100644
> --- a/xen/common/grant_table.c
> +++ b/xen/common/grant_table.c
> @@ -3760,7 +3760,7 @@ void grant_table_init_vcpu(struct vcpu *v)
> v->maptrack_tail = MAPTRACK_TAIL;
> }
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref,
> gfn_t *gfn, uint16_t *status)
> {
> diff --git a/xen/common/memory.c b/xen/common/memory.c
> index 520d6f4803..69851f4344 100644
> --- a/xen/common/memory.c
> +++ b/xen/common/memory.c
> @@ -1671,7 +1671,7 @@ int check_get_page_from_gfn(struct domain *d, gfn_t
> gfn, bool readonly,
> return -EAGAIN;
> }
> #endif
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> if ( (q & P2M_UNSHARE) && p2m_is_shared(p2mt) )
> {
> if ( page )
> diff --git a/xen/common/vm_event.c b/xen/common/vm_event.c
> index 6e68be47bc..163a671cea 100644
> --- a/xen/common/vm_event.c
> +++ b/xen/common/vm_event.c
> @@ -544,7 +544,7 @@ static void monitor_notification(struct vcpu *v, unsigned
> int port)
> vm_event_resume(v->domain, v->domain->vm_event_monitor);
> }
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> /* Registered with Xen-bound event channel for incoming notifications. */
> static void mem_sharing_notification(struct vcpu *v, unsigned int port)
> {
> @@ -574,7 +574,7 @@ void vm_event_cleanup(struct domain *d)
> destroy_waitqueue_head(&d->vm_event_monitor->wq);
> (void)vm_event_disable(d, &d->vm_event_monitor);
> }
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> if ( vm_event_check_ring(d->vm_event_share) )
> {
> destroy_waitqueue_head(&d->vm_event_share->wq);
> @@ -720,7 +720,7 @@ int vm_event_domctl(struct domain *d, struct
> xen_domctl_vm_event_op *vec,
> }
> break;
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> case XEN_DOMCTL_VM_EVENT_OP_SHARING:
> {
> rc = -EINVAL;
> diff --git a/xen/include/asm-x86/mem_sharing.h
> b/xen/include/asm-x86/mem_sharing.h
> index afd0c17292..db22468744 100644
> --- a/xen/include/asm-x86/mem_sharing.h
> +++ b/xen/include/asm-x86/mem_sharing.h
> @@ -24,6 +24,8 @@
> #include <public/domctl.h>
> #include <public/memory.h>
>
> +#ifdef CONFIG_MEM_SHARING
> +
> /* Auditing of memory sharing code? */
> #ifndef NDEBUG
> #define MEM_SHARING_AUDIT 1
> @@ -99,4 +101,30 @@ int mem_sharing_domctl(struct domain *d,
> */
> int relinquish_shared_pages(struct domain *d);
>
> +#else
> +
> +static inline unsigned int mem_sharing_get_nr_saved_mfns(void)
> +{
> + return 0;
> +}
> +static inline unsigned int mem_sharing_get_nr_shared_mfns(void)
> +{
> + return 0;
> +}
> +static inline int mem_sharing_unshare_page(struct domain *d,
> + unsigned long gfn,
> + uint16_t flags)
> +{
> + ASSERT_UNREACHABLE();
> + return -EOPNOTSUPP;
> +}
> +static inline int mem_sharing_notify_enomem(struct domain *d, unsigned long
> gfn,
> + bool allow_sleep)
> +{
> + ASSERT_UNREACHABLE();
> + return -EOPNOTSUPP;
> +}
> +
> +#endif
> +
> #endif /* __MEM_SHARING_H__ */
> diff --git a/xen/include/asm-x86/mm.h b/xen/include/asm-x86/mm.h
> index 24c4205ba7..d8ab53d688 100644
> --- a/xen/include/asm-x86/mm.h
> +++ b/xen/include/asm-x86/mm.h
> @@ -127,6 +127,8 @@ struct page_info
> /* For non-pinnable single-page shadows, a higher entry that points
> * at us. */
> paddr_t up;
> +
> +#ifdef CONFIG_MEM_SHARING
> /* For shared/sharable pages, we use a doubly-linked list
> * of all the {pfn,domain} pairs that map this page. We also
> include
> * an opaque handle, which is effectively a version, so that
> clients
> @@ -134,6 +136,7 @@ struct page_info
> * This list is allocated and freed when a page is shared/unshared.
> */
> struct page_sharing_info *sharing;
> +#endif
> };
>
> /* Reference count and various PGC_xxx flags and fields. */
> diff --git a/xen/include/xen/sched.h b/xen/include/xen/sched.h
> index 2201faca6b..410c74489f 100644
> --- a/xen/include/xen/sched.h
> +++ b/xen/include/xen/sched.h
> @@ -459,7 +459,7 @@ struct domain
> /* Various vm_events */
>
> /* Memory sharing support */
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> struct vm_event_domain *vm_event_share;
> #endif
> /* Memory paging support */
> diff --git a/xen/include/xsm/dummy.h b/xen/include/xsm/dummy.h
> index 01d2814fed..ef52bb1764 100644
> --- a/xen/include/xsm/dummy.h
> +++ b/xen/include/xsm/dummy.h
> @@ -597,7 +597,7 @@ static XSM_INLINE int xsm_mem_paging(XSM_DEFAULT_ARG
> struct domain *d)
> }
> #endif
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> static XSM_INLINE int xsm_mem_sharing(XSM_DEFAULT_ARG struct domain *d)
> {
> XSM_ASSERT_ACTION(XSM_DM_PRIV);
> diff --git a/xen/include/xsm/xsm.h b/xen/include/xsm/xsm.h
> index 9a90355056..d61ba77374 100644
> --- a/xen/include/xsm/xsm.h
> +++ b/xen/include/xsm/xsm.h
> @@ -150,7 +150,7 @@ struct xsm_operations {
> int (*mem_paging) (struct domain *d);
> #endif
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> int (*mem_sharing) (struct domain *d);
> #endif
>
> @@ -597,7 +597,7 @@ static inline int xsm_mem_paging (xsm_default_t def,
> struct domain *d)
> }
> #endif
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> static inline int xsm_mem_sharing (xsm_default_t def, struct domain *d)
> {
> return xsm_ops->mem_sharing(d);
> diff --git a/xen/xsm/dummy.c b/xen/xsm/dummy.c
> index c9a566f2b5..5705e52791 100644
> --- a/xen/xsm/dummy.c
> +++ b/xen/xsm/dummy.c
> @@ -128,7 +128,7 @@ void __init xsm_fixup_ops (struct xsm_operations *ops)
> set_to_dummy_if_null(ops, mem_paging);
> #endif
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> set_to_dummy_if_null(ops, mem_sharing);
> #endif
>
> diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c
> index a7d690ac3c..791c1f66af 100644
> --- a/xen/xsm/flask/hooks.c
> +++ b/xen/xsm/flask/hooks.c
> @@ -1262,7 +1262,7 @@ static int flask_mem_paging(struct domain *d)
> }
> #endif
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> static int flask_mem_sharing(struct domain *d)
> {
> return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__MEM_SHARING);
> @@ -1829,7 +1829,7 @@ static struct xsm_operations flask_ops = {
> .mem_paging = flask_mem_paging,
> #endif
>
> -#ifdef CONFIG_HAS_MEM_SHARING
> +#ifdef CONFIG_MEM_SHARING
> .mem_sharing = flask_mem_sharing,
> #endif
>
> --
> 2.20.1
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxxx
https://lists.xenproject.org/mailman/listinfo/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |