stash domain create flags and then use them
cover stash domain create flags and then use them
This series starts with a patch to stash the domain create flags in struct domain then then follows up with various clean-up patches that this enables.
Paul Durrant (6):
domain: stash xen_domctl_createdomain flags in struct domain
domain: remove 'guest_type' field (and enum guest_type) x86/hvm/domain: remove the 'hap_enabled' flag x86/domain: remove the 'oos_off' flag
domain: remove the 'is_xenstore' flag
x86/domain: remove the 's3_integrity' flag
xen/arch/x86/domain.c | 9 +-------- xen/arch/x86/mm/paging.c | 4 ++-- xen/arch/x86/mm/shadow/common.c | 5 ++--- xen/arch/x86/tboot.c | 2 +- xen/common/domain.c | 11 +++-------- xen/common/domctl.c | 12 ++---------- xen/common/kernel.c | 9 ++------- xen/include/asm-x86/domain.h | 3 --- xen/include/asm-x86/hvm/domain.h | 9 +++------ xen/include/asm-x86/paging.h | 2 +- xen/include/asm-x86/shadow.h | 2 +- xen/include/xen/sched.h | 22 ++++++++++------------ xen/include/xsm/dummy.h | 2 +- 13 files changed, 29 insertions(+), 63 deletions(-)
---
Cc: Andrew Cooper <[email protected]>
Cc: Daniel De Graaf <[email protected]>
Cc: Gang Wei <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Shane Wang <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/6 domain: stash xen_domctl_createdomain flags in struct domain
These are canonical source of data used to set various other flags. If they are available directly in struct domain then the other flags are no longer needed.
This patch simply copies the flags into a new 'createflags' field in struct domain. Subsequent patches will do the related clean-up work.
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
--- xen/common/domain.c | 6 ++++-- xen/include/xen/sched.h | 1 + 2 files changed, 5 insertions(+), 2 deletions(-)
xen/common/domain.c +4 -2
@@ -333,6 +333,8 @@ struct domain *domain_create(domid_t domid,if ( (d =alloc_domain_struct ()) ==NULL )return ERR_PTR (-ENOMEM ); + d->createflags = config ? config->flags :0 ; +/* Sort out our idea of is_system_domain(). */ d->domain_id = domid;
@@ -354,7 +356,7 @@ struct domain *domain_create(domid_t domid, }/* Sort out our idea of is_{pv,hvm}_domain(). All system domains are PV. */ - d->guest_type = ((config && (config->flags & XEN_DOMCTL_CDF_hvm_guest)) + d->guest_type = ((d->createflags & XEN_DOMCTL_CDF_hvm_guest) ? guest_type_hvm : guest_type_pv);TRACE_1D (TRC_DOM0_DOM_ADD , d->domain_id);
@@ -431,7 +433,7 @@ struct domain *domain_create(domid_t domid,watchdog_domain_init (d); init_status |= INIT_watchdog; -if ( config->flags & XEN_DOMCTL_CDF_xs_domain ) +if ( d->createflags & XEN_DOMCTL_CDF_xs_domain ) { d->is_xenstore =1 ; d->disable_migrate =1 ;
xen/include/xen/sched.h +1 -0
@@ -308,6 +308,7 @@ enum guest_type {struct domain { +unsigned int createflags;domid_t domain_id;unsigned int max_vcpus;
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/6] domain: stash xen_domctl_createdomain flags in struct domain
Quoted 6 lines · Paul Durrant
These are canonical source of data used to set various other flags. If they are available directly in struct domain then the other flags are no longer needed.
This patch simply copies the flags into a new 'createflags' field in struct domain. Subsequent patches will do the related clean-up work.
Thanks!
Just one naming comment (which is subject to taste I guess).
xen/include/xen/sched.h enum guest_type { · line 311
Quoted 9 lines
xen/include/xen/sched.h +1
-0@@ -308,6 +308,7 @@ enum guest_type {struct domain { +unsigned int createflags;
Can you name this just flags or options or some such (without the create prefix). IMO adding the create prefix makes it look like a field only used during domain creation, while it's not the case.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/6] domain: stash xen_domctl_createdomain flags in struct domain
Quoted 28 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 25 July 2019 10:23
To: Paul Durrant <[email protected]>
Cc: [email protected]; Stefano Stabellini <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; George Dunlap <[email protected]>; Andrew Cooper <[email protected]>; Ian Jackson <[email protected]>; Tim (Xen.org) <[email protected]>; Julien Grall <[email protected]>; Jan Beulich <[email protected]>
Subject: Re: [Xen-devel] [PATCH 1/6] domain: stashxen_domctl_createdomainflags in struct domainQuoted 6 lines · Paul Durrant
These are canonical source of data used to set various other flags. If they are available directly in struct domain then the other flags are no longer needed.
This patch simply copies the flags into a new 'createflags' field in struct domain. Subsequent patches will do the related clean-up work.
Thanks!
Just one naming comment (which is subject to taste I guess).
Quoted 6 lines
xen/include/xen/sched.h +0
-0@@ -308,6 +308,7 @@ enum guest_type {
Quoted 7 lines
xen/include/xen/sched.h enum guest_type { · line 311
Quoted 3 lines
xen/include/xen/sched.h +1
-0struct domain { +unsigned int createflags;Can you name this just flags or options or some such (without the create prefix). IMO adding the create prefix makes it look like a field only used during domain creation, while it's not the case.
I guess naming it simply 'flags' would be ok coupled with a comment in the header stating that the field is merely a copy of the domain create flags. Anyone else got opinions on this?
Paul
Quoted 2 lines
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/6] domain: stash xen_domctl_createdomain flags in struct domain
Quoted 36 lines · Paul Durrant
Quoted 28 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 25 July 2019 10:23
To: Paul Durrant <[email protected]>
Cc: [email protected]; Stefano Stabellini <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; George Dunlap <[email protected]>; Andrew Cooper <[email protected]>; Ian Jackson <[email protected]>; Tim (Xen.org) <[email protected]>; Julien Grall <[email protected]>; Jan Beulich <[email protected]>
Subject: Re: [Xen-devel] [PATCH 1/6] domain: stashxen_domctl_createdomainflags in struct domainQuoted 6 lines · Paul Durrant
These are canonical source of data used to set various other flags. If they are available directly in struct domain then the other flags are no longer needed.
This patch simply copies the flags into a new 'createflags' field in struct domain. Subsequent patches will do the related clean-up work.
Thanks!
Just one naming comment (which is subject to taste I guess).
Quoted 6 lines
xen/include/xen/sched.h +0
-0@@ -308,6 +308,7 @@ enum guest_type {Quoted 7 lines
xen/include/xen/sched.h enum guest_type { · line 311
Quoted 3 lines
xen/include/xen/sched.h +1
-0struct domain { +unsigned int createflags;Can you name this just flags or options or some such (without the create prefix). IMO adding the create prefix makes it look like a field only used during domain creation, while it's not the case.
Quoted 3 lines
I guess naming it simply 'flags' would be ok coupled with a comment in the header stating that the field is merely a copy of the domain create flags. Anyone else got opinions on this?
We use "flags" too often imo. What about "options" as suggested by Roger, or "settings"?
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 1/6] domain: stash xen_domctl_createdomain flags in struct domain
Quoted 49 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 25 July 2019 11:25
To: Paul Durrant <[email protected]>
Cc: Roger Pau Monne <[email protected]>; Julien Grall <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Stefano Stabellini <[email protected]>; [email protected]; KonradRzeszutek Wilk <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [Xen-devel] [PATCH 1/6] domain: stashxen_domctl_createdomainflags in struct domainQuoted 5 lines · Paul Durrant
Quoted 5 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 25 July 2019 10:23
To: Paul Durrant <[email protected]>
Cc: [email protected]; Stefano Stabellini <[email protected]>; Wei LiuQuoted 2 lines
Quoted 2 lines
Konrad Rzeszutek Wilk <[email protected]>; George Dunlap <[email protected]>; Andrew Cooper <[email protected]>; Ian Jackson <[email protected]>; Tim (Xen.org)
Quoted 29 lines
Quoted 28 lines
Julien Grall <[email protected]>; Jan Beulich <[email protected]>
Subject: Re: [Xen-devel] [PATCH 1/6] domain: stashxen_domctl_createdomainflags in struct domainQuoted 6 lines · Paul Durrant
These are canonical source of data used to set various other flags. If they are available directly in struct domain then the other flags are no longer needed.
This patch simply copies the flags into a new 'createflags' field in struct domain. Subsequent patches will do the related clean-up work.
Thanks!
Just one naming comment (which is subject to taste I guess).
xen/include/xen/sched.h enum guest_type { · line 311
Quoted 9 lines
xen/include/xen/sched.h +1
-0@@ -308,6 +308,7 @@ enum guest_type {struct domain { +unsigned int createflags;Can you name this just flags or options or some such (without the create prefix). IMO adding the create prefix makes it look like a field only used during domain creation, while it's not the case.
Quoted 6 lines
Quoted 3 lines
I guess naming it simply 'flags' would be ok coupled with a comment in the header stating that the field is merely a copy of the domain create flags. Anyone else got opinions on this?
We use "flags" too often imo. What about "options" as suggested by Roger, or "settings"?
Alright, let's go with 'options' then.
Paul
Quoted 2 lines
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/6 domain: remove 'guest_type' field (and enum guest_type)
In reply to Paul DurrantThe enum guest_type was introduced in commit 6c6492780ea "pvh prep:
introduce pv guest type and has_hvm_container macros" to allow a new guest type, distinct from either PV or HVM guest types, to be added in commit 8271d6522c6 "pvh: introduce PVH guest type". Subsequently, commit 33e5c32559e "x86: remove PVHv1 code" removed this third guest type.
This patch removes the struct domain field and enumeration as the guest type can now be trivially determined from the 'createflags' field.
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
--- xen/common/domain.c | 4 ---- xen/common/domctl.c | 10 +--------- xen/common/kernel.c | 9 ++------- xen/include/xen/sched.h | 14 ++++---------- 4 files changed, 7 insertions(+), 30 deletions(-)
xen/common/domain.c +0 -4
@@ -355,10 +355,6 @@ struct domain *domain_create(domid_t domid, hardware_domain = d; } -/* Sort out our idea of is_{pv,hvm}_domain(). All system domains are PV. */ - d->guest_type = ((d->createflags & XEN_DOMCTL_CDF_hvm_guest) - ? guest_type_hvm : guest_type_pv); -TRACE_1D (TRC_DOM0_DOM_ADD , d->domain_id);/*
xen/common/domctl.c +1 -9
@@ -187,17 +187,9 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) (d->controller_pause_count >0 ? XEN_DOMINF_paused :0 ) | (d->debugger_attached ? XEN_DOMINF_debugged :0 ) | (d->is_xenstore ? XEN_DOMINF_xs_domain :0 ) | + (is_hvm_domain (d) ? XEN_DOMINF_hvm_guest :0 ) | d->shutdown_code << XEN_DOMINF_shutdownshift; -switch ( d->guest_type ) - { -case guest_type_hvm: - info->flags |= XEN_DOMINF_hvm_guest; -break ; -default : -break ; - } -xsm_security_domaininfo (d, info); info->tot_pages = d->tot_pages;
xen/common/kernel.c +2 -7
@@ -474,19 +474,14 @@ DO(xen_version)(int cmd, XEN_GUEST_HANDLE_PARAM(void) arg) fi.submap |= (1U << XENFEAT_ARM_SMCCC_supported);#endif #ifdef CONFIG_X86 -switch ( d->guest_type ) - { -case guest_type_pv: +if (is_pv_domain (d) ) fi.submap |= (1U << XENFEAT_mmu_pt_update_preserve_ad) | (1U << XENFEAT_highmem_assist) | (1U << XENFEAT_gnttab_map_avail_bits); -break ; -case guest_type_hvm: +else fi.submap |= (1U << XENFEAT_hvm_safe_pvclock) | (1U << XENFEAT_hvm_callback_vector) | (has_pirq (d) ? (1U << XENFEAT_hvm_pirqs) :0 ); -break ; - }#endif break ;default :
xen/include/xen/sched.h +4 -10
@@ -302,10 +302,6 @@ struct vm_event_domainstruct evtchn_port_ops ; -enum guest_type { - guest_type_pv, guest_type_hvm -}; -struct domain {unsigned int createflags;
@@ -357,8 +353,6 @@ struct domainstruct radix_tree_root pirq_tree;unsigned int nr_pirqs; -enum guest_type guest_type; -/* Is this guest dying (i.e., a zombie)? */ enum { DOMDYING_alive, DOMDYING_dying, DOMDYING_dead } is_dying;
@@ -918,8 +912,8 @@ void watchdog_domain_destroy(struct domain *d);static inline bool is_pv_domain (const struct domain *d) { -return IS_ENABLED (CONFIG_PV ) - ?evaluate_nospec (d->guest_type == guest_type_pv) : false; +return IS_ENABLED (CONFIG_PV ) && + !evaluate_nospec (d->createflags & XEN_DOMCTL_CDF_hvm_guest); }static inline bool is_pv_vcpu (const struct vcpu *v)
@@ -950,8 +944,8 @@ static inline bool is_pv_64bit_vcpu(const struct vcpu *v)#endif static inline bool is_hvm_domain (const struct domain *d) { -return IS_ENABLED (CONFIG_HVM ) - ?evaluate_nospec (d->guest_type == guest_type_hvm) : false; +return IS_ENABLED (CONFIG_HVM ) && +evaluate_nospec (d->createflags & XEN_DOMCTL_CDF_hvm_guest); }static inline bool is_hvm_vcpu (const struct vcpu *v)
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 2/6] domain: remove 'guest_type' field (and enum guest_type)
Quoted 10 lines · Paul Durrant
The enum
guest_typewas introduced in commit6c6492780ea"pvh prep:
introduce pv guest type andhas_hvm_containermacros" to allow a new guest type, distinct from either PV or HVM guest types, to be added in commit8271d6522c6"pvh: introduce PVH guest type". Subsequently, commit33e5c32559e"x86: remove PVHv1 code" removed this third guest type.This patch removes the struct domain field and enumeration as the guest type can now be trivially determined from the 'createflags' field.
Signed-off-by Paul Durrant <[email protected]>
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 3/6 x86/hvm/domain: remove the 'hap_enabled' flag
In reply to Paul DurrantThe hap_enabled() macro can determine whether the feature is available using the domain 'createflags'; there is no need for a separate flag.
---
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
--- xen/arch/x86/domain.c | 7 +------ xen/arch/x86/mm/paging.c | 4 ++-- xen/arch/x86/mm/shadow/common.c | 4 ++-- xen/include/asm-x86/hvm/domain.h | 9 +++------ xen/include/asm-x86/paging.h | 2 +- xen/include/asm-x86/shadow.h | 2 +- 6 files changed, 10 insertions(+), 18 deletions(-)
xen/arch/x86/domain.c +1 -6
@@ -564,12 +564,7 @@ int arch_domain_create(struct domain *d,HYPERVISOR_COMPAT_VIRT_START (d) =is_pv_domain (d) ? __HYPERVISOR_COMPAT_VIRT_START : ~0u ; -/* Need to determine if HAP is enabled before initialising paging */ -if (is_hvm_domain (d) ) - d->arch.hvm.hap_enabled = -hvm_hap_supported () && (config->flags & XEN_DOMCTL_CDF_hap); - -if ( (rc =paging_domain_init (d, config->flags)) !=0 ) +if ( (rc =paging_domain_init (d)) !=0 ) goto fail; paging_initialised = true;
xen/arch/x86/mm/paging.c +2 -2
@@ -632,7 +632,7 @@ void paging_log_dirty_init(struct domain *d, const struct log_dirty_ops *ops)/* CODE FOR PAGING SUPPORT */ /************************************************/ /* Domain paging struct initialization. */ -int paging_domain_init (struct domain *d,unsigned int domcr_flags) +int paging_domain_init (struct domain *d) {int rc;
@@ -653,7 +653,7 @@ int paging_domain_init(struct domain *d, unsigned int domcr_flags)if (hap_enabled (d) )hap_domain_init (d);else - rc =shadow_domain_init (d, domcr_flags); + rc =shadow_domain_init (d);return rc; }
xen/arch/x86/mm/shadow/common.c +2 -2
@@ -46,7 +46,7 @@ static void sh_clean_dirty_bitmap(struct domain *);/* Set up the shadow-specific parts of a domain struct at start of day. * Called for every domain from arch_domain_create() */ -int shadow_domain_init (struct domain *d,unsigned int domcr_flags) +int shadow_domain_init (struct domain *d) {static const struct log_dirty_ops sh_ops = { .enable = sh_enable_log_dirty,
@@ -62,7 +62,7 @@ int shadow_domain_init(struct domain *d, unsigned int domcr_flags)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC ) d->arch.paging.shadow.oos_active =0 ; - d->arch.paging.shadow.oos_off = domcr_flags & XEN_DOMCTL_CDF_oos_off; + d->arch.paging.shadow.oos_off = d->createflags & XEN_DOMCTL_CDF_oos_off;#endif d->arch.paging.shadow.pagetable_dying_op =0 ;
xen/include/asm-x86/hvm/domain.h +3 -6
@@ -156,7 +156,6 @@ struct hvm_domain {struct viridian_domain *viridian; -bool_t hap_enabled;bool_t mem_sharing_enabled;bool_t qemu_mapcache_invalidate;bool_t is_s3_suspended;
@@ -195,11 +194,9 @@ struct hvm_domain { }; }; -#ifdef CONFIG_HVM -#define hap_enabled (d) (is_hvm_domain(d) && (d)->arch.hvm.hap_enabled) -#else -#define hap_enabled (d) ({(void)(d); false;}) -#endif +#define hap_enabled (d) \ + (hvm_hap_supported() && is_hvm_domain(d) && \ + evaluate_nospec(d->createflags & XEN_DOMCTL_CDF_hap))#endif /* __ASM_X86_HVM_DOMAIN_H__ */
xen/include/asm-x86/paging.h +1 -1
@@ -207,7 +207,7 @@ void paging_vcpu_init(struct vcpu *v);/* Set up the paging-assistance-specific parts of a domain struct at * start of day. Called for every domain from arch_domain_create() */ -int paging_domain_init (struct domain *d,unsigned int domcr_flags); +int paging_domain_init (struct domain *d);/* Handler for paging-control ops: operations from user-space to enable * and disable ephemeral shadow modes (test mode and log-dirty mode) and
xen/include/asm-x86/shadow.h +1 -1
@@ -49,7 +49,7 @@/* Set up the shadow-specific parts of a domain struct at start of day. * Called from paging_domain_init(). */ -int shadow_domain_init (struct domain *d,unsigned int domcr_flags); +int shadow_domain_init (struct domain *d);/* Setup the shadow-specific parts of a vcpu struct. It is called by * paging_vcpu_init() in paging.c */
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 3/6] x86/hvm/domain: remove the 'hap_enabled' flag
xen/include/asm-x86/hvm/domain.h struct hvm_domain { · line 199
Quoted 8 lines · Paul Durrant
xen/include/asm-x86/hvm/domain.h +3
-5-#ifdef CONFIG_HVM -#define hap_enabled (d) (is_hvm_domain(d) && (d)->arch.hvm.hap_enabled) -#else -#define hap_enabled (d) ({(void)(d); false;}) -#endif +#define hap_enabled (d) \ + (hvm_hap_supported() && is_hvm_domain(d) && \ + evaluate_nospec(d->createflags & XEN_DOMCTL_CDF_hap))
You could make this an inline function while at it AFAICT.
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 3/6] x86/hvm/domain: remove the 'hap_enabled' flag
Quoted 9 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 25 July 2019 10:44
To: Paul Durrant <[email protected]>
Cc: [email protected]; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [PATCH 3/6] x86/hvm/domain: remove the 'hap_enabled' flagOn Tue, Jul 23, 2019 at 05:06:06PM +0100, Paul Durrant wrote:
Quoted 10 lines
xen/include/asm-x86/hvm/domain.h struct hvm_domain { · line 199
Quoted 8 lines
xen/include/asm-x86/hvm/domain.h +3
-5-#ifdef CONFIG_HVM -#define hap_enabled (d) (is_hvm_domain(d) && (d)->arch.hvm.hap_enabled) -#else -#define hap_enabled (d) ({(void)(d); false;}) -#endif +#define hap_enabled (d) \ + (hvm_hap_supported() && is_hvm_domain(d) && \ + evaluate_nospec(d->createflags & XEN_DOMCTL_CDF_hap))You could make this an inline function while at it AFAICT.
Yeah, that's not a bad idea.
Paul
Quoted 2 lines
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 3/6] x86/hvm/domain: remove the 'hap_enabled' flag
Quoted 28 lines
-----Original Message-----
From: Xen-devel <[email protected]> On Behalf Of Paul Durrant
Sent: 25 July 2019 11:08
To: Roger Pau Monne <[email protected]>
Cc: [email protected]; Wei Liu <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>
Subject: Re: [Xen-devel] [PATCH 3/6] x86/hvm/domain: remove the 'hap_enabled' flagQuoted 9 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 25 July 2019 10:44
To: Paul Durrant <[email protected]>
Cc: [email protected]; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [PATCH 3/6] x86/hvm/domain: remove the 'hap_enabled' flagOn Tue, Jul 23, 2019 at 05:06:06PM +0100, Paul Durrant wrote:
Quoted 10 lines
xen/include/asm-x86/hvm/domain.h struct hvm_domain { · line 199
Quoted 8 lines
xen/include/asm-x86/hvm/domain.h +3
-5-#ifdef CONFIG_HVM -#define hap_enabled (d) (is_hvm_domain(d) && (d)->arch.hvm.hap_enabled) -#else -#define hap_enabled (d) ({(void)(d); false;}) -#endif +#define hap_enabled (d) \ + (hvm_hap_supported() && is_hvm_domain(d) && \ + evaluate_nospec(d->createflags & XEN_DOMCTL_CDF_hap))You could make this an inline function while at it AFAICT.
Quoted 2 lines
Yeah, that's not a bad idea.
Alas this turns out to be a can of worms. As an inline function I cannot call is_hvm_domain() from here which, I guess, is why it’s a macro at the moment. Also I cannot dereference d->createflags (a.k.a. options) as the definition of struct domain is not available.
Paul
Quoted 9 lines
Paul
Quoted 2 lines
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 4/6 x86/domain: remove the 'oos_off' flag
In reply to Paul DurrantThe flag is not needed since the domain 'createflags' can now be tested directly.
---
Cc: Tim Deegan <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
--- xen/arch/x86/mm/shadow/common.c | 3 +-- xen/include/asm-x86/domain.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)
xen/arch/x86/mm/shadow/common.c +1 -2
@@ -62,7 +62,6 @@ int shadow_domain_init(struct domain *d)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC ) d->arch.paging.shadow.oos_active =0 ; - d->arch.paging.shadow.oos_off = d->createflags & XEN_DOMCTL_CDF_oos_off;#endif d->arch.paging.shadow.pagetable_dying_op =0 ;
@@ -2523,7 +2522,7 @@ static void sh_update_paging_modes(struct vcpu *v)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC )/* We need to check that all the vcpus have paging enabled to * unsync PTs. */ -if (is_hvm_domain (d) && !d->arch.paging.shadow.oos_off ) +if (is_hvm_domain (d) && !(d->createflags & XEN_DOMCTL_CDF_oos_off) ) {int pe =1 ;struct vcpu *vptr;
xen/include/asm-x86/domain.h +0 -1
@@ -115,7 +115,6 @@ struct shadow_domain {/* OOS */ bool_t oos_active; -bool_t oos_off;/* Has this domain ever used HVMOP_pagetable_dying? */ bool_t pagetable_dying_op;
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 4/6] x86/domain: remove the 'oos_off' flag
Quoted 4 lines · Paul Durrant
The flag is not needed since the domain 'createflags' can now be tested directly.
Signed-off-by Paul Durrant <[email protected]>
though some of this change seems to have got into patch 3, maybe they were reordered at some point?
Cheers,
Tim.
Quoted 47 lines
---
Cc: George Dunlap <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>--- xen/arch/x86/mm/shadow/common.c | 3 +-- xen/include/asm-x86/domain.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)xen/arch/x86/mm/shadow/common.c +1
-2@@ -62,7 +62,6 @@ int shadow_domain_init(struct domain *d)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC ) d->arch.paging.shadow.oos_active =0 ; - d->arch.paging.shadow.oos_off = d->createflags & XEN_DOMCTL_CDF_oos_off;#endif d->arch.paging.shadow.pagetable_dying_op =0 ;@@ -2523,7 +2522,7 @@ static void sh_update_paging_modes(struct vcpu *v)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC )/* We need to check that all the vcpus have paging enabled to * unsync PTs. */ -if (is_hvm_domain (d) && !d->arch.paging.shadow.oos_off ) +if (is_hvm_domain (d) && !(d->createflags & XEN_DOMCTL_CDF_oos_off) ) {int pe =1 ;struct vcpu *vptr;xen/include/asm-x86/domain.h +0
-1@@ -115,7 +115,6 @@ struct shadow_domain {/* OOS */ bool_t oos_active; -bool_t oos_off;/* Has this domain ever used HVMOP_pagetable_dying? */ bool_t pagetable_dying_op;Signature · 1 line
2.20.1.2.gb21ebb671
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 4/6] x86/domain: remove the 'oos_off' flag
Quoted 13 lines
-----Original Message-----
From: Tim Deegan <[email protected]>
Sent: 24 July 2019 18:45
To: Paul Durrant <[email protected]>
Cc: [email protected]; George Dunlap <[email protected]>; Jan Beulich <[email protected]>; Andrew Cooper <[email protected]>; Wei Liu <[email protected]>; Roger Pau Monne <[email protected]>
Subject: Re: [PATCH 4/6] x86/domain: remove the 'oos_off' flagQuoted 3 lines · Paul Durrant
The flag is not needed since the domain 'createflags' can now be tested directly.
Quoted 7 lines
Quoted 1 line
Signed-off-by Paul Durrant <[email protected]>Acked-by Tim Deegan <[email protected]>though some of this change seems to have got into patch 3, maybe they were reordered at some point?
Oh, yes, they were actually combined when I originally made the change. The removal of domcr_flags for shadow_domain_init() would indeed be more logically placed in this patch. It's a pretty trivial change so I'll move it in v2 and assume your A-b still stands.
Paul
Quoted 47 lines
Cheers,
Tim.
Quoted 42 lines
---
Cc: George Dunlap <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>--- xen/arch/x86/mm/shadow/common.c | 3 +-- xen/include/asm-x86/domain.h | 1 - 2 files changed, 1 insertion(+), 3 deletions(-)xen/arch/x86/mm/shadow/common.c +1
-2@@ -62,7 +62,6 @@ int shadow_domain_init(struct domain *d)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC ) d->arch.paging.shadow.oos_active =0 ; - d->arch.paging.shadow.oos_off = d->createflags & XEN_DOMCTL_CDF_oos_off;#endif d->arch.paging.shadow.pagetable_dying_op =0 ;@@ -2523,7 +2522,7 @@ static void sh_update_paging_modes(struct vcpu *v)#if (SHADOW_OPTIMIZATIONS &SHOPT_OUT_OF_SYNC )/* We need to check that all the vcpus have paging enabled to * unsync PTs. */ -if (is_hvm_domain (d) && !d->arch.paging.shadow.oos_off ) +if (is_hvm_domain (d) && !(d->createflags & XEN_DOMCTL_CDF_oos_off) ) {int pe =1 ;struct vcpu *vptr;xen/include/asm-x86/domain.h +0
-1@@ -115,7 +115,6 @@ struct shadow_domain {/* OOS */ bool_t oos_active; -bool_t oos_off;
Quoted 5 lines
Quoted 5 lines
xen/include/asm-x86/domain.h +0
-1/* Has this domain ever used HVMOP_pagetable_dying? */ bool_t pagetable_dying_op; --2.20.1.2.gb21ebb671
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 5/6 domain: remove the 'is_xenstore' flag
In reply to Paul DurrantThis patch introduces a convenience macro, is_xenstore_domain(), which tests the domain 'createflags' directly and then uses that in place of the 'is_xenstore' flag.
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Daniel De Graaf <[email protected]>
--- xen/common/domain.c | 5 +---- xen/common/domctl.c | 2 +- xen/include/xen/sched.h | 7 +++++-- xen/include/xsm/dummy.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
xen/common/domain.c +1 -4
@@ -429,11 +429,8 @@ struct domain *domain_create(domid_t domid,watchdog_domain_init (d); init_status |= INIT_watchdog; -if ( d->createflags & XEN_DOMCTL_CDF_xs_domain ) - { - d->is_xenstore =1 ; +if (is_xenstore_domain (d) ) d->disable_migrate =1 ; - } d->iomem_caps =rangeset_new (d,"I/O Memory" , RANGESETF_prettyprint_hex); d->irq_caps =rangeset_new (d,"Interrupts" ,0 );
xen/common/domctl.c +1 -1
@@ -186,7 +186,7 @@ void getdomaininfo(struct domain *d, struct xen_domctl_getdomaininfo *info) (d->is_shut_down ? XEN_DOMINF_shutdown :0 ) | (d->controller_pause_count >0 ? XEN_DOMINF_paused :0 ) | (d->debugger_attached ? XEN_DOMINF_debugged :0 ) | - (d->is_xenstore ? XEN_DOMINF_xs_domain :0 ) | + (is_xenstore_domain (d) ? XEN_DOMINF_xs_domain :0 ) | (is_hvm_domain (d) ? XEN_DOMINF_hvm_guest :0 ) | d->shutdown_code << XEN_DOMINF_shutdownshift;
xen/include/xen/sched.h +5 -2
@@ -374,8 +374,6 @@ struct domainbool is_privileged;/* Can this guest access the Xen console? */ bool is_console; -/* Is this a xenstore domain (not dom0)? */ -bool is_xenstore;/* Non-migratable and non-restoreable? */ bool disable_migrate;/* Is this guest being debugged by dom0? */
@@ -972,6 +970,11 @@ static inline bool is_vcpu_online(const struct vcpu *v)return !test_bit (_VPF_down, &v->pause_flags); } +static inline bool is_xenstore_domain (const struct domain *d) +{ +return d->createflags & XEN_DOMCTL_CDF_xs_domain; +} +extern bool sched_smt_power_savings; extern enum cpufreq_controller {
xen/include/xsm/dummy.h +1 -1
@@ -79,7 +79,7 @@ static always_inline int xsm_default_action( {return 0 ;case XSM_XS_PRIV : -if ( src->is_xenstore ) +if (is_xenstore_domain (src) )return 0 ; }/* fall through */
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 5/6] domain: remove the 'is_xenstore' flag
Quoted 5 lines · Paul Durrant
This patch introduces a convenience macro,
is_xenstore_domain(), which tests the domain 'createflags' directly and then uses that in place of the 'is_xenstore' flag.Signed-off-by Paul Durrant <[email protected]>
Just one request below (which is not related to your code actually).
Quoted 23 lines
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Daniel De Graaf <[email protected]>--- xen/common/domain.c | 5 +---- xen/common/domctl.c | 2 +- xen/include/xen/sched.h | 7 +++++-- xen/include/xsm/dummy.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)xen/common/domain.c +0
-0
xen/common/domain.c struct domain *domain_create(domid_t domid, · line 433
Quoted 8 lines
xen/common/domain.c +1
-3@@ -429,11 +429,8 @@ struct domain *domain_create(domid_t domid,watchdog_domain_init (d); init_status |= INIT_watchdog; -if ( d->createflags & XEN_DOMCTL_CDF_xs_domain ) - { - d->is_xenstore =1 ; +if (is_xenstore_domain (d) ) d->disable_migrate =1 ;
While here can you also fix this line to use true instead of 1?
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 5/6] domain: remove the 'is_xenstore' flag
Quoted 11 lines
-----Original Message-----
From: Roger Pau Monne <[email protected]>
Sent: 25 July 2019 10:48
To: Paul Durrant <[email protected]>
Cc: [email protected]; Stefano Stabellini <[email protected]>; Wei Liu <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; George Dunlap <[email protected]>; Andrew Cooper <[email protected]>; Ian Jackson <[email protected]>; Tim (Xen.org) <[email protected]>; Julien Grall <[email protected]>; Jan Beulich <[email protected]>; Daniel De Graaf <[email protected]>
Subject: Re: [Xen-devel] [PATCH 5/6] domain: remove the 'is_xenstore' flag
Quoted 9 lines
Quoted 5 lines · Paul Durrant
This patch introduces a convenience macro,
is_xenstore_domain(), which tests the domain 'createflags' directly and then uses that in place of the 'is_xenstore' flag.Signed-off-by Paul Durrant <[email protected]>Reviewed-by Roger Pau Monné <[email protected]>
Thanks.
Quoted 28 lines
Just one request below (which is not related to your code actually).
Quoted 26 lines
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: Daniel De Graaf <[email protected]>--- xen/common/domain.c | 5 +---- xen/common/domctl.c | 2 +- xen/include/xen/sched.h | 7 +++++-- xen/include/xsm/dummy.h | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)xen/common/domain.c +0
-0@@ -429,11 +429,8 @@ struct domain *domain_create(domid_t domid,watchdog_domain_init (d); init_status |= INIT_watchdog;
Quoted 8 lines
xen/common/domain.c struct domain *domain_create(domid_t domid, · line 433
Quoted 5 lines
xen/common/domain.c +1
-3-if ( d->createflags & XEN_DOMCTL_CDF_xs_domain ) - { - d->is_xenstore =1 ; +if (is_xenstore_domain (d) ) d->disable_migrate =1 ;While here can you also fix this line to use true instead of 1?
Sure.
Paul
Quoted 1 line
Thanks, Roger.
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 6/6 x86/domain: remove the 's3_integrity' flag
In reply to Paul DurrantThe flag is not needed since the domain 'createflags' can now be tested directly.
---
Cc: Jan Beulich <[email protected]>
Cc: Andrew Cooper <[email protected]>
Cc: Wei Liu <[email protected]>
Cc: "Roger Pau Monné" <[email protected]>
Cc: Gang Wei <[email protected]>
Cc: Shane Wang <[email protected]>
--- xen/arch/x86/domain.c | 2 -- xen/arch/x86/tboot.c | 2 +- xen/include/asm-x86/domain.h | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-)
xen/arch/x86/domain.c +0 -2
@@ -538,8 +538,6 @@ int arch_domain_create(struct domain *d, d->domain_id); } - d->arch.s3_integrity = config->flags & XEN_DOMCTL_CDF_s3_integrity; - emflags = config->arch.emulation_flags;if (is_hardware_domain (d) &&is_pv_domain (d) )
xen/arch/x86/tboot.c +1 -1
@@ -212,7 +212,7 @@ static void tboot_gen_domain_integrity(const uint8_t key[TB_KEY_SIZE],vmac_set_key ((uint8_t *)key, &ctx);for_each_domain ( d ) { -if ( !d->arch.s3_integrity ) +if ( !(d->createflags & XEN_DOMCTL_CDF_s3_integrity) )continue ;printk ("MACing Domain %u\n" , d->domain_id);
xen/include/asm-x86/domain.h +0 -2
@@ -295,8 +295,6 @@ struct arch_domainuint32_t pci_cf8;uint8_t cmos_idx; -bool_t s3_integrity; -union {struct pv_domain pv;struct hvm_domain hvm;
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH 6/6] x86/domain: remove the 's3_integrity' flag
Quoted 4 lines · Paul Durrant
The flag is not needed since the domain 'createflags' can now be tested directly.
Signed-off-by Paul Durrant <[email protected]>
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel