x86: Make MAX_ALTP2M configurable
v3 cover x86: Make MAX_ALTP2M configurable
From: Petr Beneš <[email protected]>
This series introduces the ability to configure the maximum number of altp2m tables during domain creation. Previously, the limits were hardcoded to a maximum of 10. This change allows for greater flexibility in environments that require more or fewer altp2m views.
Adjustments include:
- "Prepare" commits with style changes.
- Adding a new altp2m_count parameter to xl.
- Adding a new altp2m_count parameter to the OCaml bindings.
- Adding a new altp2m_count parameter to the xl.cfg manual.
- Adding a new nr_altp2m field into the xen_domctl_createdomain, which, after sanity checks, is stored in newly introduced nr_altp2m field of struct domain - leaving room for other architectures to implement the altp2m feature.
- Replacing MAX_ALTP2M macro occurrences with domain->nr_altp2m.
This enhancement is particularly relevant for users leveraging Xen's features for virtual machine introspection.
Changes since v2:
- Changed max_altp2m to nr_altp2m.
- Moved arch-dependent check from xen/common/domain.c to xen/arch/x86/domain.c.
- Replaced min(d->nr_altp2m, MAX_EPTP) occurences for just d->nr_altp2m.
- Replaced array_index_nospec(altp2m_idx, ...) for just altp2m_idx.
- Shortened long lines.
- Removed unnecessary comments in altp2m_vcpu_initialise/destroy.
- Moved nr_altp2m field after max_ fields in xen_domctl_createdomain.
- Removed the commit that adjusted the initial allocation of pages from 256 to 1024. This means that after these patches, technically, the nr_altp2m will be capped to (256 - 1 + vcpus + MAX_NESTEDP2M) instead of MAX_EPTP (512). Future work will be needed to fix this.
Petr Beneš (6):
x86/p2m: Add braces for better code clarity tools/xl: Add altp2m_count parameter
docs/man: Add altp2m_count parameter to the xl.cfg manual
x86: Make the maximum number of altp2m views configurable tools/libxl: Activate the altp2m_count feature tools/ocaml: Add altp2m_count parameter
docs/man/xl.cfg.5.pod.in | 14 +++++ tools/golang/xenlight/helpers.gen.go | 2 + tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 8 +++ tools/libs/light/libxl_create.c | 10 ++++ tools/libs/light/libxl_types.idl | 1 + tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/ocaml/libs/xc/xenctrl_stubs.c | 11 ++-- tools/xl/xl_parse.c | 4 ++ xen/arch/x86/domain.c | 12 +++++ xen/arch/x86/hvm/hvm.c | 8 ++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/domain.h | 7 ++- xen/arch/x86/include/asm/p2m.h | 4 +- xen/arch/x86/mm/altp2m.c | 23 +++++++- xen/arch/x86/mm/hap/hap.c | 6 +-- xen/arch/x86/mm/mem_access.c | 23 ++++---- xen/arch/x86/mm/mem_sharing.c | 2 +- xen/arch/x86/mm/p2m-ept.c | 10 ++-- xen/arch/x86/mm/p2m.c | 80 ++++++++++++++-------------- xen/common/domain.c | 1 + xen/include/public/domctl.h | 5 +- xen/include/xen/sched.h | 2 + 24 files changed, 161 insertions(+), 77 deletions(-)
--
2.34.1
PATCH v3 1/6 x86/p2m: Add braces for better code clarity
From: Petr Beneš <[email protected]>
No functional change.
--- xen/arch/x86/mm/p2m.c | 4 ++++ 1 file changed, 4 insertions(+)
xen/arch/x86/mm/p2m.c +4 -0
@@ -106,6 +106,7 @@ void p2m_change_entry_type_global(struct domain *d,unsigned int i;for ( i =0 ; i <MAX_ALTP2M ; i++ ) + {if ( d->arch.altp2m_eptp[i] !=mfn_x (INVALID_MFN ) ) {struct p2m_domain *altp2m = d->arch.altp2m_p2m[i];
@@ -114,6 +115,7 @@ void p2m_change_entry_type_global(struct domain *d,change_entry_type_global (altp2m, ot, nt);p2m_unlock (altp2m); } + } }p2m_unlock (hostp2m);
@@ -139,6 +141,7 @@ void p2m_memory_type_changed(struct domain *d)unsigned int i;for ( i =0 ; i <MAX_ALTP2M ; i++ ) + {if ( d->arch.altp2m_eptp[i] !=mfn_x (INVALID_MFN ) ) {struct p2m_domain *altp2m = d->arch.altp2m_p2m[i];
@@ -147,6 +150,7 @@ void p2m_memory_type_changed(struct domain *d)_memory_type_changed (altp2m);p2m_unlock (altp2m); } + } }p2m_unlock (hostp2m);
--
2.34.1
PATCH v3 2/6 tools/xl: Add altp2m_count parameter
In reply to Petr BenešFrom: Petr Beneš <[email protected]>
Introduce a new altp2m_count parameter to control the maximum number of altp2m views a domain can use. By default, if altp2m_count is unspecified and altp2m is enabled, the value is set to 10, reflecting the legacy behavior.
This change is preparatory; it establishes the groundwork for the feature but does not activate it.
--- tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 8 ++++++++ tools/libs/light/libxl_create.c | 9 +++++++++ tools/libs/light/libxl_types.idl | 1 + tools/xl/xl_parse.c | 4 ++++ 6 files changed, 25 insertions(+)
tools/golang/xenlight/helpers.gen.go +2 -0
@@ -1158,6 +1158,7 @@ if err := x.ArchX86.MsrRelaxed.fromC(&xc.arch_x86.msr_relaxed);err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } x.Altp2M = Altp2MMode(xc.altp2m) +x.Altp2MCount = uint32(xc.altp2m_count) x.VmtraceBufKb = int(xc.vmtrace_buf_kb) if err := x.Vpmu.fromC(&xc.vpmu);err != nil { return fmt.Errorf("converting field Vpmu: %v", err)
@@ -1674,6 +1675,7 @@ if err := x.ArchX86.MsrRelaxed.toC(&xc.arch_x86.msr_relaxed); err != nil { return fmt.Errorf("converting field ArchX86.MsrRelaxed: %v", err) } xc.altp2m = C.libxl_altp2m_mode(x.Altp2M) +xc.altp2m_count = C.uint32_t(x.Altp2MCount) xc.vmtrace_buf_kb = C.int(x.VmtraceBufKb) if err := x.Vpmu.toC(&xc.vpmu); err != nil { return fmt.Errorf("converting field Vpmu: %v", err)
tools/golang/xenlight/types.gen.go +1 -0
@@ -602,6 +602,7 @@ ArchX86 struct { MsrRelaxed Defbool } Altp2M Altp2MMode +Altp2MCount uint32 VmtraceBufKb int Vpmu Defbool }
tools/include/libxl.h +8 -0
@@ -1239,6 +1239,14 @@ typedef struct libxl__ctx libxl_ctx;*/ #define LIBXL_HAVE_ALTP2M 1 +/* +* LIBXL_HAVE_ALTP2M_COUNT +* If this is defined, then libxl supports setting the maximum number of +* alternate p2m tables. +*/ +#define LIBXL_HAVE_ALTP2M_COUNT 1 +#define LIBXL_ALTP2M_COUNT_DEFAULT (~(uint32_t)0) +/* * LIBXL_HAVE_REMUS * If this is defined, then libxl supports remus.
tools/libs/light/libxl_create.c +9 -0
@@ -483,6 +483,15 @@ int libxl__domain_build_info_setdefault(libxl__gc *gc,return -ERROR_INVAL ; } +if (b_info->altp2m_count ==LIBXL_ALTP2M_COUNT_DEFAULT ) { +if ((libxl_defbool_val (b_info->u.hvm.altp2m) || + b_info->altp2m !=LIBXL_ALTP2M_MODE_DISABLED )) +/* Reflect the default legacy count */ + b_info->altp2m_count =10 ; +else + b_info->altp2m_count =0 ; + } +/* Assume that providing a bootloader user implies enabling restrict. */ libxl_defbool_setdefault (&b_info->bootloader_restrict, !!b_info->bootloader_user);
tools/libs/light/libxl_types.idl +1 -0
@@ -728,6 +728,7 @@ libxl_domain_build_info = Struct("domain_build_info",[ # Alternate p2m is not bound to any architecture or guest type, as it is # supported by x86 HVM and ARM support is planned. ("altp2m", libxl_altp2m_mode), + ("altp2m_count", uint32, {'init_val': 'LIBXL_ALTP2M_COUNT_DEFAULT'}), # Size of preallocated vmtrace trace buffers (in KBYTES). # Use zero value to disable this feature.
tools/xl/xl_parse.c +4 -0
@@ -2063,6 +2063,10 @@ void parse_config_data(const char *config_source, } } +if (!xlu_cfg_get_long (config,"altp2m_count" , &l,1 )) { + b_info->altp2m_count = l; + } +if (!xlu_cfg_get_long (config,"vmtrace_buf_kb" , &l,1 ) && l) { b_info->vmtrace_buf_kb = l; }
--
2.34.1
PATCH v3 3/6 docs/man: Add altp2m_count parameter to the xl.cfg manual
In reply to Petr BenešFrom: Petr Beneš <[email protected]>
Update manual pages to include detailed information about the altp2m_count configuration parameter.
--- docs/man/xl.cfg.5.pod.in | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
docs/man/xl.cfg.5.pod.in +14 -0
@@ -2039,6 +2039,20 @@ a single guest HVM domain. B<This option is deprecated, use the option B<Note>: While the option "altp2mhvm" is deprecated, legacy applications for x86 systems will continue to work using it. +=item B<altp2m_count=NUMBER> + +Specifies the maximum number of alternate-p2m views available to the guest. +This setting is crucial in domain introspection scenarios that require +multiple physical-to-machine (p2m) memory mappings to be established +simultaneously. + +Enabling multiple p2m views may increase memory usage. It is advisable to +review and adjust the B<shadow_memory> setting as necessary to accommodate +the additional memory requirements. + +B<Note>: This option is ignored if B<altp2m> is disabled. The default value +is 10. + =item B<nestedhvm=BOOLEAN> Enable or disables guest access to hardware virtualisation features,
--
2.34.1
PATCH v3 4/6 x86: Make the maximum number of altp2m views configurable
In reply to Petr BenešFrom: Petr Beneš <[email protected]>
This commit introduces the ability to configure the maximum number of altp2m views for the domain during its creation. Previously, the limits were hardcoded to a maximum of 10. This change allows for greater flexibility in environments that require more or fewer altp2m views.
The maximum configurable limit for max_altp2m on x86 is now set to MAX_EPTP (512). This cap is linked to the architectural limit of the EPTP-switching VMFUNC, which supports up to 512 entries. Despite there being no inherent need for limiting max_altp2m in scenarios not utilizing VMFUNC, decoupling these components would necessitate substantial code changes.
--- xen/arch/x86/domain.c | 12 +++++ xen/arch/x86/hvm/hvm.c | 8 +++- xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/include/asm/domain.h | 7 ++- xen/arch/x86/include/asm/p2m.h | 4 +- xen/arch/x86/mm/altp2m.c | 23 +++++++++- xen/arch/x86/mm/hap/hap.c | 6 +-- xen/arch/x86/mm/mem_access.c | 23 ++++------ xen/arch/x86/mm/mem_sharing.c | 2 +- xen/arch/x86/mm/p2m-ept.c | 10 ++-- xen/arch/x86/mm/p2m.c | 76 +++++++++++++++---------------- xen/common/domain.c | 1 + xen/include/public/domctl.h | 5 +- xen/include/xen/sched.h | 2 + 14 files changed, 108 insertions(+), 73 deletions(-)
xen/arch/x86/domain.c +12 -0
@@ -685,6 +685,18 @@ int arch_sanitise_domain_config(struct xen_domctl_createdomain *config)return -EINVAL ; } +if ( config->nr_altp2m && !hvm_altp2m_supported () ) + { +dprintk (XENLOG_INFO ,"altp2m requested but not available\n" ); +return -EINVAL ; + } + +if ( config->nr_altp2m >MAX_EPTP ) + { +dprintk (XENLOG_INFO ,"nr_altp2m must be <= %lu\n" ,MAX_EPTP ); +return -EINVAL ; + } +if ( config->vmtrace_size ) {unsigned int size = config->vmtrace_size;
xen/arch/x86/hvm/hvm.c +7 -1
@@ -4639,6 +4639,12 @@ static int do_altp2m_op( goto out; } +if ( d->nr_altp2m ==0 ) + { + rc = -EINVAL ; + goto out; + } +if ( (rc =xsm_hvm_altp2mhvm_op (XSM_OTHER , d, mode, a.cmd)) ) goto out;
@@ -5228,7 +5234,7 @@ void hvm_fast_singlestep(struct vcpu *v, uint16_t p2midx)if ( !hvm_is_singlestep_supported () )return ; -if ( p2midx >=MAX_ALTP2M ) +if ( p2midx >= v->domain->nr_altp2m )return ; v->arch.hvm.single_step = true;
xen/arch/x86/hvm/vmx/vmx.c +1 -1
@@ -4888,7 +4888,7 @@ bool asmlinkage vmx_vmenter_helper(const struct cpu_user_regs *regs) {unsigned int i; -for ( i =0 ; i <MAX_ALTP2M ; ++i ) +for ( i =0 ; i < currd->nr_altp2m; ++i ) {if ( currd->arch.altp2m_eptp[i] ==mfn_x (INVALID_MFN ) )continue ;
xen/arch/x86/include/asm/domain.h +3 -4
@@ -258,11 +258,10 @@ struct paging_vcpu {struct shadow_vcpu shadow; }; -#define MAX_NESTEDP2M 10 - -#define MAX_ALTP2M 10/* arbitrary */ #define INVALID_ALTP2M 0xffff#define MAX_EPTP (PAGE_SIZE / sizeof(uint64_t)) +#define MAX_NESTEDP2M 10 +struct p2m_domain ;struct time_scale {int shift;
@@ -353,7 +352,7 @@ struct arch_domain/* altp2m: allow multiple copies of host p2m */ bool altp2m_active; -struct p2m_domain *altp2m_p2m[MAX_ALTP2M ]; +struct p2m_domain **altp2m_p2m;mm_lock_t altp2m_list_lock;uint64_t *altp2m_eptp;uint64_t *altp2m_visible_eptp;
xen/arch/x86/include/asm/p2m.h +2 -2
@@ -881,7 +881,7 @@ static inline struct p2m_domain *p2m_get_altp2m(struct vcpu *v)if ( index ==INVALID_ALTP2M )return NULL ; -BUG_ON (index >=MAX_ALTP2M ); +BUG_ON (index >= v->domain->nr_altp2m);return v->domain->arch.altp2m_p2m[index]; }
@@ -891,7 +891,7 @@ static inline bool p2m_set_altp2m(struct vcpu *v, unsigned int idx) {struct p2m_domain *orig; -BUG_ON (idx >=MAX_ALTP2M ); +BUG_ON (idx >= v->domain->nr_altp2m);if ( idx ==vcpu_altp2m (v).p2midx )return false;
xen/arch/x86/mm/altp2m.c +21 -2
@@ -13,6 +13,11 @@void altp2m_vcpu_initialise (struct vcpu *v) { +struct domain *d = v->domain; + +if ( d->nr_altp2m ==0 ) +return ; +if ( v != current )vcpu_pause (v);
@@ -28,8 +33,12 @@ altp2m_vcpu_initialise(struct vcpu *v)void altp2m_vcpu_destroy (struct vcpu *v) { +struct domain *d = v->domain;struct p2m_domain *p2m; +if ( d->nr_altp2m ==0 ) +return ; +if ( v != current )vcpu_pause (v);
@@ -120,7 +129,12 @@ int p2m_init_altp2m(struct domain *d)struct p2m_domain *hostp2m =p2m_get_hostp2m (d);mm_lock_init (&d->arch.altp2m_list_lock); -for ( i =0 ; i <MAX_ALTP2M ; i++ ) + d->arch.altp2m_p2m = xzalloc_array(struct p2m_domain *, d->nr_altp2m); + +if ( !d->arch.altp2m_p2m ) +return -ENOMEM ; + +for ( i =0 ; i < d->nr_altp2m; i++ ) { d->arch.altp2m_p2m[i] = p2m =p2m_init_one (d);if ( p2m ==NULL )
@@ -141,7 +155,10 @@ void p2m_teardown_altp2m(struct domain *d)unsigned int i;struct p2m_domain *p2m; -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +if ( !d->arch.altp2m_p2m ) +return ; + +for ( i =0 ; i < d->nr_altp2m; i++ ) {if ( !d->arch.altp2m_p2m[i] )continue ;
@@ -149,6 +166,8 @@ void p2m_teardown_altp2m(struct domain *d) d->arch.altp2m_p2m[i] =NULL ;p2m_free_one (p2m); } + +XFREE (d->arch.altp2m_p2m); }/*
xen/arch/x86/mm/hap/hap.c +3 -3
@@ -515,7 +515,7 @@ int hap_enable(struct domain *d, u32 mode) d->arch.altp2m_visible_eptp[i] =mfn_x (INVALID_MFN ); } -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ ) { rv =p2m_alloc_table (d->arch.altp2m_p2m[i]);if ( rv !=0 )
@@ -538,7 +538,7 @@ void hap_final_teardown(struct domain *d)unsigned int i;if (hvm_altp2m_supported () ) -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ )p2m_teardown (d->arch.altp2m_p2m[i], true,NULL );/* Destroy nestedp2m's first */
@@ -590,7 +590,7 @@ void hap_teardown(struct domain *d, bool *preempted)FREE_XENHEAP_PAGE (d->arch.altp2m_eptp);FREE_XENHEAP_PAGE (d->arch.altp2m_visible_eptp); -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ ) {p2m_teardown (d->arch.altp2m_p2m[i], false, preempted);if ( preempted && *preempted )
xen/arch/x86/mm/mem_access.c +10 -13
@@ -347,12 +347,11 @@ long p2m_set_mem_access(struct domain *d, gfn_t gfn, uint32_t nr,/* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { -if ( altp2m_idx >=min (ARRAY_SIZE (d->arch.altp2m_p2m),MAX_EPTP ) || - d->arch.altp2m_eptp[array_index_nospec (altp2m_idx,MAX_EPTP )] == -mfn_x (INVALID_MFN ) ) +if ( altp2m_idx >= d->nr_altp2m || + d->arch.altp2m_eptp[altp2m_idx] ==mfn_x (INVALID_MFN ) )return -EINVAL ; - ap2m =array_access_nospec (d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[altp2m_idx]; }if ( !xenmem_access_to_p2m_access (p2m, access, &a) )
@@ -403,12 +402,11 @@ long p2m_set_mem_access_multi(struct domain *d,/* altp2m view 0 is treated as the hostp2m */ if ( altp2m_idx ) { -if ( altp2m_idx >=min (ARRAY_SIZE (d->arch.altp2m_p2m),MAX_EPTP ) || - d->arch.altp2m_eptp[array_index_nospec (altp2m_idx,MAX_EPTP )] == -mfn_x (INVALID_MFN ) ) +if ( altp2m_idx >= d->nr_altp2m || + d->arch.altp2m_eptp[altp2m_idx] ==mfn_x (INVALID_MFN ) )return -EINVAL ; - ap2m =array_access_nospec (d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[altp2m_idx]; }p2m_lock (p2m);
@@ -466,12 +464,11 @@ int p2m_get_mem_access(struct domain *d, gfn_t gfn, xenmem_access_t *access, }else if ( altp2m_idx )/* altp2m view 0 is treated as the hostp2m */ { -if ( altp2m_idx >=min (ARRAY_SIZE (d->arch.altp2m_p2m),MAX_EPTP ) || - d->arch.altp2m_eptp[array_index_nospec (altp2m_idx,MAX_EPTP )] == -mfn_x (INVALID_MFN ) ) +if ( altp2m_idx >= d->nr_altp2m || + d->arch.altp2m_eptp[altp2m_idx] ==mfn_x (INVALID_MFN ) )return -EINVAL ; - p2m =array_access_nospec (d->arch.altp2m_p2m, altp2m_idx); + p2m = d->arch.altp2m_p2m[altp2m_idx]; }return _p2m_get_mem_access (p2m, gfn, access);
@@ -486,7 +483,7 @@ void arch_p2m_set_access_required(struct domain *d, bool access_required)if (altp2m_active (d) ) {unsigned int i; -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ ) {struct p2m_domain *p2m = d->arch.altp2m_p2m[i];
xen/arch/x86/mm/mem_sharing.c +1 -1
@@ -912,7 +912,7 @@ static int nominate_page(struct domain *d, gfn_t gfn,altp2m_list_lock (d); -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ ) { ap2m = d->arch.altp2m_p2m[i];if ( !ap2m )
xen/arch/x86/mm/p2m-ept.c +5 -5
@@ -1293,7 +1293,7 @@ static void ept_set_ad_sync(struct domain *d, bool value) {unsigned int i; -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ ) {struct p2m_domain *p2m;
@@ -1500,15 +1500,15 @@ void setup_ept_dump(void)void p2m_init_altp2m_ept (struct domain *d,unsigned int i) { -struct p2m_domain *p2m =array_access_nospec (d->arch.altp2m_p2m, i); +struct p2m_domain *p2m = d->arch.altp2m_p2m[i];struct p2m_domain *hostp2m =p2m_get_hostp2m (d);struct ept_data *ept; p2m->ept.ad = hostp2m->ept.ad; ept = &p2m->ept; ept->mfn =pagetable_get_pfn (p2m_get_pagetable (p2m)); - d->arch.altp2m_eptp[array_index_nospec (i,MAX_EPTP )] = ept->eptp; - d->arch.altp2m_visible_eptp[array_index_nospec (i,MAX_EPTP )] = ept->eptp; + d->arch.altp2m_eptp[i] = ept->eptp; + d->arch.altp2m_visible_eptp[i] = ept->eptp; }unsigned int p2m_find_altp2m_by_eptp (struct domain *d,uint64_t eptp)
@@ -1519,7 +1519,7 @@ unsigned int p2m_find_altp2m_by_eptp(struct domain *d, uint64_t eptp)altp2m_list_lock (d); -for ( i =0 ; i <MAX_ALTP2M ; i++ ) +for ( i =0 ; i < d->nr_altp2m; i++ ) {if ( d->arch.altp2m_eptp[i] ==mfn_x (INVALID_MFN ) )continue ;
xen/arch/x86/mm/p2m.c +36 -40
213 lines not on this page · raw message
xen/common/domain.c +1 -0
@@ -610,6 +610,7 @@ struct domain *domain_create(domid_t domid,if ( config ) { d->options = config->flags; + d->nr_altp2m = config->nr_altp2m; d->vmtrace_size = config->vmtrace_size; }
xen/include/public/domctl.h +4 -1
@@ -21,7 +21,7 @@#include "hvm/save.h" #include "memory.h" -#define XEN_DOMCTL_INTERFACE_VERSION 0x00000016 +#define XEN_DOMCTL_INTERFACE_VERSION 0x00000017/* * NB. xen_domctl.domain is an IN/OUT parameter for this operation.
@@ -86,6 +86,9 @@ struct xen_domctl_createdomain {uint32_t grant_opts; +/* Number of altp2ms to allocate. */ +uint32_t nr_altp2m; +/* Per-vCPU buffer size in bytes. 0 to disable. */ uint32_t vmtrace_size;
xen/include/xen/sched.h +2 -0
@@ -602,6 +602,8 @@ struct domain unsigned int guest_request_sync : 1; } monitor; +unsigned int nr_altp2m;/* Number of altp2m tables */ +unsigned int vmtrace_size;/* Buffer size in bytes, or 0 to disable. */ #ifdef CONFIG_ARGO
--
2.34.1
Re: [PATCH for-4.19? v3 4/6] x86: Make the maximum number of altp2m views configurable
Review
Quoted 2 lines
(quoted diff) +1
-1- ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[altp2m_idx];
Why is it no longer necessary to use array_access_nospec?
Tamas
Re: [PATCH for-4.19? v3 4/6] x86: Make the maximum number of altp2m views configurable
Quoted 7 lines · Tamas K Lengyel
Review
Quoted 3 lines
(quoted diff) +1
-1- ap2m = array_access_nospec(d->arch.altp2m_p2m, altp2m_idx); + ap2m = d->arch.altp2m_p2m[altp2m_idx];Why is it no longer necessary to use
array_access_nospec?Tamas
I was under the impression that when the domain_create guarantees the length of the array, and before each access to the altp2m_p2m there is an explicit check if idx is within bounds of nr_altp2m, that the array_access_nospec is not needed anymore. But apparently I misunderstood how speculative execution works, when I now read about it.
I'll put it back.
P.
PATCH v3 5/6 tools/libxl: Activate the altp2m_count feature
In reply to Petr BenešFrom: Petr Beneš <[email protected]>
This commit activates the previously introduced altp2m_count parameter, establishing the connection between libxl and Xen.
--- tools/libs/light/libxl_create.c | 1 + 1 file changed, 1 insertion(+)
tools/libs/light/libxl_create.c +1 -0
@@ -657,6 +657,7 @@ int libxl__domain_make(libxl__gc *gc, libxl_domain_config *d_config, .max_grant_frames = b_info->max_grant_frames, .max_maptrack_frames = b_info->max_maptrack_frames, .grant_opts = XEN_DOMCTL_GRANT_version(b_info->max_grant_version), + .nr_altp2m = b_info->altp2m_count, .vmtrace_size = ROUNDUP(b_info->vmtrace_buf_kb << 10, XC_PAGE_SHIFT), .cpupool_id = info->poolid, };
--
2.34.1
PATCH v3 6/6 tools/ocaml: Add altp2m_count parameter
In reply to Petr BenešFrom: Petr Beneš <[email protected]>
Allow developers using the OCaml bindings to set the altp2m_count parameter.
--- tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/ocaml/libs/xc/xenctrl_stubs.c | 11 +++++++---- 3 files changed, 9 insertions(+), 4 deletions(-)
tools/ocaml/libs/xc/xenctrl.ml +1 -0
@@ -85,6 +85,7 @@ type domctl_create_config = max_grant_frames: int; max_maptrack_frames: int; max_grant_version: int; + altp2m_count: int; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig;
tools/ocaml/libs/xc/xenctrl.mli +1 -0
@@ -77,6 +77,7 @@ type domctl_create_config = { max_grant_frames: int; max_maptrack_frames: int; max_grant_version: int; + altp2m_count: int; vmtrace_buf_kb: int32; cpupool_id: int32; arch: arch_domainconfig;
tools/ocaml/libs/xc/xenctrl_stubs.c +7 -4
@@ -210,9 +210,10 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co#define VAL_MAX_GRANT_FRAMES Field(config, 6)#define VAL_MAX_MAPTRACK_FRAMES Field(config, 7)#define VAL_MAX_GRANT_VERSION Field(config, 8) -#define VAL_VMTRACE_BUF_KB Field(config, 9) -#define VAL_CPUPOOL_ID Field(config, 10) -#define VAL_ARCH Field(config, 11) +#define VAL_ALTP2M_COUNT Field(config, 9) +#define VAL_VMTRACE_BUF_KB Field(config, 10) +#define VAL_CPUPOOL_ID Field(config, 11) +#define VAL_ARCH Field(config, 12)uint32_t domid =Int_val (wanted_domid);uint64_t vmtrace_size =Int32_val (VAL_VMTRACE_BUF_KB );
@@ -230,6 +231,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co .max_maptrack_frames = Int_val(VAL_MAX_MAPTRACK_FRAMES), .grant_opts = XEN_DOMCTL_GRANT_version(Int_val(VAL_MAX_GRANT_VERSION)), + .nr_altp2m = Int_val(VAL_ALTP2M_COUNT), .vmtrace_size = vmtrace_size, .cpupool_id = Int32_val(VAL_CPUPOOL_ID), };
@@ -257,7 +259,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co#if defined(__i386__) || defined(__x86_64__)/* Quick & dirty check for ABI changes. */ -BUILD_BUG_ON (sizeof (cfg) !=64 ); +BUILD_BUG_ON (sizeof (cfg) !=68 );/* Mnemonics for the named fields inside xen_x86_arch_domainconfig */ #define VAL_EMUL_FLAGS Field(arch_domconfig, 0)
@@ -288,6 +290,7 @@ CAMLprim value stub_xc_domain_create(value xch_val, value wanted_domid, value co#undef VAL_ARCH#undef VAL_CPUPOOL_ID#undef VAL_VMTRACE_BUF_KB +#undef VAL_ALTP2M_COUNT#undef VAL_MAX_GRANT_VERSION#undef VAL_MAX_MAPTRACK_FRAMES#undef VAL_MAX_GRANT_FRAMES
--
2.34.1