x86/altp2m: Hypercall to set altp2m view visibility
PATCH v2 1/1 x86/altp2m: Hypercall to set altp2m view visibility
At this moment a guest can call vmfunc to change the altp2m view. This should be limited in order to avoid any unwanted view switch.
The new xc_altp2m_set_visibility() solves this by making views invisible to vmfunc.
This is done by having a separate arch.altp2m_working_eptp that is populated and made invalid in the same places as altp2m_eptp. This is written to EPTP_LIST_ADDR.
The views are made in/visible by marking them with INVALID_MFN or copying them back from altp2m_eptp.
To have consistency the visibility also applies to p2m_switch_domain_altp2m_by_id().
---
CC: Ian Jackson <[email protected]>
CC: Wei Liu <[email protected]>
CC: Andrew Cooper <[email protected]>
CC: George Dunlap <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Julien Grall <[email protected]>
CC: Konrad Rzeszutek Wilk <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: "Roger Pau Monné" <[email protected]>
CC: Jun Nakajima <[email protected]>
CC: Kevin Tian <[email protected]>
CC: George Dunlap <[email protected]>
---
Changes since V1:
- Drop double view from title.
--- tools/libxc/include/xenctrl.h | 2 ++ tools/libxc/xc_altp2m.c | 24 ++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 25 +++++++++++++++++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/mm/hap/hap.c | 15 +++++++++++++++ xen/arch/x86/mm/p2m-ept.c | 1 + xen/arch/x86/mm/p2m.c | 5 ++++- xen/include/asm-x86/domain.h | 1 + xen/include/public/hvm/hvm_op.h | 10 ++++++++++ 9 files changed, 83 insertions(+), 2 deletions(-)
tools/libxc/include/xenctrl.h +2 -0
@@ -1943,6 +1943,8 @@ int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid, xen_pfn_t new_gfn);int xc_altp2m_get_vcpu_p2m_idx (xc_interface *handle,uint32_t domid,uint32_t vcpuid,uint16_t *p2midx); +int xc_altp2m_set_visibility (xc_interface *handle,uint32_t domid, +uint16_t view_id,bool visible);/** * Mem paging operations.
tools/libxc/xc_altp2m.c +24 -0
@@ -410,3 +410,27 @@ int xc_altp2m_get_vcpu_p2m_idx(xc_interface *handle, uint32_t domid,xc_hypercall_buffer_free (handle, arg);return rc; } + +int xc_altp2m_set_visibility (xc_interface *handle,uint32_t domid, +uint16_t view_id,bool visible) +{ +int rc; + +DECLARE_HYPERCALL_BUFFER (xen_hvm_altp2m_op_t, arg); + + arg =xc_hypercall_buffer_alloc (handle, arg,sizeof (*arg)); +if ( arg ==NULL ) +return -1 ; + + arg->version =HVMOP_ALTP2M_INTERFACE_VERSION ; + arg->cmd = HVMOP_altp2m_set_visibility; + arg->domain = domid; + arg->u.set_visibility.altp2m_idx = view_id; + arg->u.set_visibility.visible = visible; + + rc =xencall2 (handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m, +HYPERCALL_BUFFER_AS_ARG (arg)); + +xc_hypercall_buffer_free (handle, arg); +return rc; +}
xen/arch/x86/hvm/hvm.c +25 -0
@@ -4537,6 +4537,7 @@ static int do_altp2m_op(case HVMOP_altp2m_get_mem_access:case HVMOP_altp2m_change_gfn:case HVMOP_altp2m_get_p2m_idx: +case HVMOP_altp2m_set_visibility:break ;default :
@@ -4814,6 +4815,30 @@ static int do_altp2m_op(break ; } +case HVMOP_altp2m_set_visibility: + { +uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx; + +if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 ) + rc = -EINVAL ; +else + { +if ( !altp2m_active (d) || !hap_enabled (d) ) + { + rc = -EOPNOTSUPP ; +break ; + } + +if ( a.u.set_visibility.visible ) + d->arch.altp2m_working_eptp[altp2m_idx] = + d->arch.altp2m_eptp[altp2m_idx]; +else + d->arch.altp2m_working_eptp[altp2m_idx] = +mfn_x (INVALID_MFN ); + } +break ; + } +default :ASSERT_UNREACHABLE (); }
xen/arch/x86/hvm/vmx/vmx.c +1 -1
@@ -2139,7 +2139,7 @@ static void vmx_vcpu_update_vmfunc_ve(struct vcpu *v) { v->arch.hvm.vmx.secondary_exec_control |= mask;__vmwrite (VM_FUNCTION_CONTROL ,VMX_VMFUNC_EPTP_SWITCHING ); -__vmwrite (EPTP_LIST_ADDR ,virt_to_maddr (d->arch.altp2m_eptp)); +__vmwrite (EPTP_LIST_ADDR ,virt_to_maddr (d->arch.altp2m_working_eptp));if ( cpu_has_vmx_virt_exceptions ) {
xen/arch/x86/mm/hap/hap.c +15 -0
@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + } +for ( i =0 ; i <MAX_EPTP ; i++ ) + { d->arch.altp2m_eptp[i] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[i] =mfn_x (INVALID_MFN ); + }for ( i =0 ; i <MAX_ALTP2M ; i++ ) {
@@ -523,6 +532,12 @@ void hap_final_teardown(struct domain *d) d->arch.altp2m_eptp =NULL ; } +if ( d->arch.altp2m_working_eptp ) + { +free_xenheap_page (d->arch.altp2m_working_eptp); + d->arch.altp2m_working_eptp =NULL ; + } +for ( i =0 ; i <MAX_ALTP2M ; i++ )p2m_teardown (d->arch.altp2m_p2m[i]); }
xen/arch/x86/mm/p2m-ept.c +1 -0
@@ -1361,6 +1361,7 @@ void p2m_init_altp2m_ept(struct domain *d, unsigned int i) 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_working_eptp[array_index_nospec (i,MAX_EPTP )] = ept->eptp; }unsigned int p2m_find_altp2m_by_eptp (struct domain *d,uint64_t eptp)
xen/arch/x86/mm/p2m.c +4 -1
@@ -2531,6 +2531,7 @@ void p2m_flush_altp2m(struct domain *d) {p2m_reset_altp2m (d, i,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[i] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[i] =mfn_x (INVALID_MFN ); }altp2m_list_unlock (d);
@@ -2651,6 +2652,8 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx)p2m_reset_altp2m (d, idx,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[array_index_nospec (idx,MAX_EPTP )] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[array_index_nospec (idx,MAX_EPTP )] = +mfn_x (INVALID_MFN ); rc =0 ; } }
@@ -2677,7 +2680,7 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) rc = -EINVAL ;altp2m_list_lock (d); -if ( d->arch.altp2m_eptp[idx] !=mfn_x (INVALID_MFN ) ) +if ( d->arch.altp2m_working_eptp[idx] !=mfn_x (INVALID_MFN ) ) {for_each_vcpu ( d, v )if ( idx !=vcpu_altp2m (v).p2midx )
xen/include/asm-x86/domain.h +1 -0
@@ -326,6 +326,7 @@ struct arch_domainstruct p2m_domain *altp2m_p2m[MAX_ALTP2M ];mm_lock_t altp2m_list_lock;uint64_t *altp2m_eptp; +uint64_t *altp2m_working_eptp;#endif /* NB. protected by d->event_lock and by irq_desc[irq].lock */
xen/include/public/hvm/hvm_op.h +10 -0
@@ -317,6 +317,13 @@ struct xen_hvm_altp2m_get_vcpu_p2m_idx {uint16_t altp2m_idx; }; +struct xen_hvm_altp2m_set_visibility { +uint16_t altp2m_idx; +uint8_t visible; +uint8_t pad; +uint32_t pad2; +}; +struct xen_hvm_altp2m_op {uint32_t version;/* HVMOP_ALTP2M_INTERFACE_VERSION */ uint32_t cmd;
@@ -349,6 +356,8 @@ struct xen_hvm_altp2m_op {#define HVMOP_altp2m_get_p2m_idx 14/* Set the "Supress #VE" bit for a range of pages */ #define HVMOP_altp2m_set_suppress_ve_multi 15 +/* Set visibility for a given altp2m view */ +#define HVMOP_altp2m_set_visibility 16domid_t domain;uint16_t pad1;uint32_t pad2;
@@ -366,6 +375,7 @@ struct xen_hvm_altp2m_op {struct xen_hvm_altp2m_suppress_ve_multi suppress_ve_multi;struct xen_hvm_altp2m_vcpu_disable_notify disable_notify;struct xen_hvm_altp2m_get_vcpu_p2m_idx get_vcpu_p2m_idx; +struct xen_hvm_altp2m_set_visibility set_visibility;uint8_t pad[64 ]; } u; };
Signature · 6 lines
2.17.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Any thoughts on this are appreciated.
Thanks,
Alex
Quoted 261 lines · Alexandru Stefan ISAILA
At this moment a guest can call vmfunc to change the altp2m view. This should be limited in order to avoid any unwanted view switch.
The new
xc_altp2m_set_visibility()solves this by making views invisible to vmfunc.
This is done by having a separate arch.altp2m_working_eptp that is populated and made invalid in the same places asaltp2m_eptp. This is written toEPTP_LIST_ADDR.
The views are made in/visible by marking them withINVALID_MFNor copying them back fromaltp2m_eptp.
To have consistency the visibility also applies top2m_switch_domain_altp2m_by_id().Signed-off-by Alexandru Isaila <[email protected]>---
CC: Ian Jackson <[email protected]>
CC: Wei Liu <[email protected]>
CC: Andrew Cooper <[email protected]>
CC: George Dunlap <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Julien Grall <[email protected]>
CC: Konrad Rzeszutek Wilk <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: "Roger Pau Monné" <[email protected]>
CC: Jun Nakajima <[email protected]>
CC: Kevin Tian <[email protected]>
CC: George Dunlap <[email protected]>
---
Changes since V1:
- Drop double view from title.--- tools/libxc/include/xenctrl.h | 2 ++ tools/libxc/xc_altp2m.c | 24 ++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 25 +++++++++++++++++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/mm/hap/hap.c | 15 +++++++++++++++ xen/arch/x86/mm/p2m-ept.c | 1 + xen/arch/x86/mm/p2m.c | 5 ++++- xen/include/asm-x86/domain.h | 1 + xen/include/public/hvm/hvm_op.h | 10 ++++++++++ 9 files changed, 83 insertions(+), 2 deletions(-)tools/libxc/include/xenctrl.h +2
-0@@ -1943,6 +1943,8 @@ int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid, xen_pfn_t new_gfn);int xc_altp2m_get_vcpu_p2m_idx (xc_interface *handle,uint32_t domid,uint32_t vcpuid,uint16_t *p2midx); +int xc_altp2m_set_visibility (xc_interface *handle,uint32_t domid, +uint16_t view_id,bool visible);/** * Mem paging operations. tools/libxc/xc_altp2m.c +24
-0@@ -410,3 +410,27 @@ int xc_altp2m_get_vcpu_p2m_idx(xc_interface *handle, uint32_t domid,xc_hypercall_buffer_free (handle, arg);return rc; } + +int xc_altp2m_set_visibility (xc_interface *handle,uint32_t domid, +uint16_t view_id,bool visible) +{ +int rc; + +DECLARE_HYPERCALL_BUFFER (xen_hvm_altp2m_op_t, arg); + + arg =xc_hypercall_buffer_alloc (handle, arg,sizeof (*arg)); +if ( arg ==NULL ) +return -1 ; + + arg->version =HVMOP_ALTP2M_INTERFACE_VERSION ; + arg->cmd = HVMOP_altp2m_set_visibility; + arg->domain = domid; + arg->u.set_visibility.altp2m_idx = view_id; + arg->u.set_visibility.visible = visible; + + rc =xencall2 (handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m, +HYPERCALL_BUFFER_AS_ARG (arg)); + +xc_hypercall_buffer_free (handle, arg); +return rc; +}xen/arch/x86/hvm/hvm.c +25
-0@@ -4537,6 +4537,7 @@ static int do_altp2m_op(case HVMOP_altp2m_get_mem_access:case HVMOP_altp2m_change_gfn:case HVMOP_altp2m_get_p2m_idx: +case HVMOP_altp2m_set_visibility:break ;default :@@ -4814,6 +4815,30 @@ static int do_altp2m_op(break ; } +case HVMOP_altp2m_set_visibility: + { +uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx; + +if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 ) + rc = -EINVAL ; +else + { +if ( !altp2m_active (d) || !hap_enabled (d) ) + { + rc = -EOPNOTSUPP ; +break ; + } + +if ( a.u.set_visibility.visible ) + d->arch.altp2m_working_eptp[altp2m_idx] = + d->arch.altp2m_eptp[altp2m_idx]; +else + d->arch.altp2m_working_eptp[altp2m_idx] = +mfn_x (INVALID_MFN ); + } +break ; + } +default :ASSERT_UNREACHABLE (); }xen/arch/x86/hvm/vmx/vmx.c +1
-1@@ -2139,7 +2139,7 @@ static void vmx_vcpu_update_vmfunc_ve(struct vcpu *v) { v->arch.hvm.vmx.secondary_exec_control |= mask;__vmwrite (VM_FUNCTION_CONTROL ,VMX_VMFUNC_EPTP_SWITCHING ); -__vmwrite (EPTP_LIST_ADDR ,virt_to_maddr (d->arch.altp2m_eptp)); +__vmwrite (EPTP_LIST_ADDR ,virt_to_maddr (d->arch.altp2m_working_eptp));if ( cpu_has_vmx_virt_exceptions ) {xen/arch/x86/mm/hap/hap.c +15
-0@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + } +for ( i =0 ; i <MAX_EPTP ; i++ ) + { d->arch.altp2m_eptp[i] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[i] =mfn_x (INVALID_MFN ); + }for ( i =0 ; i <MAX_ALTP2M ; i++ ) {@@ -523,6 +532,12 @@ void hap_final_teardown(struct domain *d) d->arch.altp2m_eptp =NULL ; } +if ( d->arch.altp2m_working_eptp ) + { +free_xenheap_page (d->arch.altp2m_working_eptp); + d->arch.altp2m_working_eptp =NULL ; + } +for ( i =0 ; i <MAX_ALTP2M ; i++ )p2m_teardown (d->arch.altp2m_p2m[i]); }xen/arch/x86/mm/p2m-ept.c +1
-0@@ -1361,6 +1361,7 @@ void p2m_init_altp2m_ept(struct domain *d, unsigned int i) 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_working_eptp[array_index_nospec (i,MAX_EPTP )] = ept->eptp; }unsigned int p2m_find_altp2m_by_eptp (struct domain *d,uint64_t eptp)xen/arch/x86/mm/p2m.c +4
-1@@ -2531,6 +2531,7 @@ void p2m_flush_altp2m(struct domain *d) {p2m_reset_altp2m (d, i,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[i] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[i] =mfn_x (INVALID_MFN ); }altp2m_list_unlock (d);@@ -2651,6 +2652,8 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx)p2m_reset_altp2m (d, idx,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[array_index_nospec (idx,MAX_EPTP )] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[array_index_nospec (idx,MAX_EPTP )] = +mfn_x (INVALID_MFN ); rc =0 ; } }@@ -2677,7 +2680,7 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) rc = -EINVAL ;altp2m_list_lock (d); -if ( d->arch.altp2m_eptp[idx] !=mfn_x (INVALID_MFN ) ) +if ( d->arch.altp2m_working_eptp[idx] !=mfn_x (INVALID_MFN ) ) {for_each_vcpu ( d, v )if ( idx !=vcpu_altp2m (v).p2midx )xen/include/asm-x86/domain.h +1
-0@@ -326,6 +326,7 @@ struct arch_domainstruct p2m_domain *altp2m_p2m[MAX_ALTP2M ];mm_lock_t altp2m_list_lock;uint64_t *altp2m_eptp; +uint64_t *altp2m_working_eptp;#endif /* NB. protected by d->event_lock and by irq_desc[irq].lock */ xen/include/public/hvm/hvm_op.h +9
-0@@ -317,6 +317,13 @@ struct xen_hvm_altp2m_get_vcpu_p2m_idx {uint16_t altp2m_idx; }; +struct xen_hvm_altp2m_set_visibility { +uint16_t altp2m_idx; +uint8_t visible; +uint8_t pad; +uint32_t pad2; +}; +struct xen_hvm_altp2m_op {uint32_t version;/* HVMOP_ALTP2M_INTERFACE_VERSION */ uint32_t cmd;@@ -349,6 +356,8 @@ struct xen_hvm_altp2m_op {#define HVMOP_altp2m_get_p2m_idx 14/* Set the "Supress #VE" bit for a range of pages */ #define HVMOP_altp2m_set_suppress_ve_multi 15 +/* Set visibility for a given altp2m view */ +#define HVMOP_altp2m_set_visibility 16domid_t domain;uint16_t pad1;uint32_t pad2;
xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_op { · line 381
Quoted 7 lines
xen/include/public/hvm/hvm_op.h +1
-0@@ -366,6 +375,7 @@ struct xen_hvm_altp2m_op {struct xen_hvm_altp2m_suppress_ve_multi suppress_ve_multi;struct xen_hvm_altp2m_vcpu_disable_notify disable_notify;struct xen_hvm_altp2m_get_vcpu_p2m_idx get_vcpu_p2m_idx; +struct xen_hvm_altp2m_set_visibility set_visibility;uint8_t pad[64 ]; } u; };
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
[Xen-devel] Ping: [PATCH V2] x86/altp2m: Hypercall to set altp2m view visibility
In reply to Alexandru Stefan ISAILAHi all,
Any ideas on this patch appreciated.
Regards,
Alex
Quoted 261 lines · Alexandru Stefan ISAILA
At this moment a guest can call vmfunc to change the altp2m view. This should be limited in order to avoid any unwanted view switch.
The new
xc_altp2m_set_visibility()solves this by making views invisible to vmfunc.
This is done by having a separate arch.altp2m_working_eptp that is populated and made invalid in the same places asaltp2m_eptp. This is written toEPTP_LIST_ADDR.
The views are made in/visible by marking them withINVALID_MFNor copying them back fromaltp2m_eptp.
To have consistency the visibility also applies top2m_switch_domain_altp2m_by_id().Signed-off-by Alexandru Isaila <[email protected]>---
CC: Ian Jackson <[email protected]>
CC: Wei Liu <[email protected]>
CC: Andrew Cooper <[email protected]>
CC: George Dunlap <[email protected]>
CC: Jan Beulich <[email protected]>
CC: Julien Grall <[email protected]>
CC: Konrad Rzeszutek Wilk <[email protected]>
CC: Stefano Stabellini <[email protected]>
CC: "Roger Pau Monné" <[email protected]>
CC: Jun Nakajima <[email protected]>
CC: Kevin Tian <[email protected]>
CC: George Dunlap <[email protected]>
---
Changes since V1:
- Drop double view from title.--- tools/libxc/include/xenctrl.h | 2 ++ tools/libxc/xc_altp2m.c | 24 ++++++++++++++++++++++++ xen/arch/x86/hvm/hvm.c | 25 +++++++++++++++++++++++++ xen/arch/x86/hvm/vmx/vmx.c | 2 +- xen/arch/x86/mm/hap/hap.c | 15 +++++++++++++++ xen/arch/x86/mm/p2m-ept.c | 1 + xen/arch/x86/mm/p2m.c | 5 ++++- xen/include/asm-x86/domain.h | 1 + xen/include/public/hvm/hvm_op.h | 10 ++++++++++ 9 files changed, 83 insertions(+), 2 deletions(-)tools/libxc/include/xenctrl.h +2
-0@@ -1943,6 +1943,8 @@ int xc_altp2m_change_gfn(xc_interface *handle, uint32_t domid, xen_pfn_t new_gfn);int xc_altp2m_get_vcpu_p2m_idx (xc_interface *handle,uint32_t domid,uint32_t vcpuid,uint16_t *p2midx); +int xc_altp2m_set_visibility (xc_interface *handle,uint32_t domid, +uint16_t view_id,bool visible);/** * Mem paging operations. tools/libxc/xc_altp2m.c +24
-0@@ -410,3 +410,27 @@ int xc_altp2m_get_vcpu_p2m_idx(xc_interface *handle, uint32_t domid,xc_hypercall_buffer_free (handle, arg);return rc; } + +int xc_altp2m_set_visibility (xc_interface *handle,uint32_t domid, +uint16_t view_id,bool visible) +{ +int rc; + +DECLARE_HYPERCALL_BUFFER (xen_hvm_altp2m_op_t, arg); + + arg =xc_hypercall_buffer_alloc (handle, arg,sizeof (*arg)); +if ( arg ==NULL ) +return -1 ; + + arg->version =HVMOP_ALTP2M_INTERFACE_VERSION ; + arg->cmd = HVMOP_altp2m_set_visibility; + arg->domain = domid; + arg->u.set_visibility.altp2m_idx = view_id; + arg->u.set_visibility.visible = visible; + + rc =xencall2 (handle->xcall, __HYPERVISOR_hvm_op, HVMOP_altp2m, +HYPERCALL_BUFFER_AS_ARG (arg)); + +xc_hypercall_buffer_free (handle, arg); +return rc; +}xen/arch/x86/hvm/hvm.c +25
-0@@ -4537,6 +4537,7 @@ static int do_altp2m_op(case HVMOP_altp2m_get_mem_access:case HVMOP_altp2m_change_gfn:case HVMOP_altp2m_get_p2m_idx: +case HVMOP_altp2m_set_visibility:break ;default :@@ -4814,6 +4815,30 @@ static int do_altp2m_op(break ; } +case HVMOP_altp2m_set_visibility: + { +uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx; + +if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 ) + rc = -EINVAL ; +else + { +if ( !altp2m_active (d) || !hap_enabled (d) ) + { + rc = -EOPNOTSUPP ; +break ; + } + +if ( a.u.set_visibility.visible ) + d->arch.altp2m_working_eptp[altp2m_idx] = + d->arch.altp2m_eptp[altp2m_idx]; +else + d->arch.altp2m_working_eptp[altp2m_idx] = +mfn_x (INVALID_MFN ); + } +break ; + } +default :ASSERT_UNREACHABLE (); }xen/arch/x86/hvm/vmx/vmx.c +1
-1@@ -2139,7 +2139,7 @@ static void vmx_vcpu_update_vmfunc_ve(struct vcpu *v) { v->arch.hvm.vmx.secondary_exec_control |= mask;__vmwrite (VM_FUNCTION_CONTROL ,VMX_VMFUNC_EPTP_SWITCHING ); -__vmwrite (EPTP_LIST_ADDR ,virt_to_maddr (d->arch.altp2m_eptp)); +__vmwrite (EPTP_LIST_ADDR ,virt_to_maddr (d->arch.altp2m_working_eptp));if ( cpu_has_vmx_virt_exceptions ) {xen/arch/x86/mm/hap/hap.c +15
-0@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + } +for ( i =0 ; i <MAX_EPTP ; i++ ) + { d->arch.altp2m_eptp[i] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[i] =mfn_x (INVALID_MFN ); + }for ( i =0 ; i <MAX_ALTP2M ; i++ ) {@@ -523,6 +532,12 @@ void hap_final_teardown(struct domain *d) d->arch.altp2m_eptp =NULL ; } +if ( d->arch.altp2m_working_eptp ) + { +free_xenheap_page (d->arch.altp2m_working_eptp); + d->arch.altp2m_working_eptp =NULL ; + } +for ( i =0 ; i <MAX_ALTP2M ; i++ )p2m_teardown (d->arch.altp2m_p2m[i]); }xen/arch/x86/mm/p2m-ept.c +1
-0@@ -1361,6 +1361,7 @@ void p2m_init_altp2m_ept(struct domain *d, unsigned int i) 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_working_eptp[array_index_nospec (i,MAX_EPTP )] = ept->eptp; }unsigned int p2m_find_altp2m_by_eptp (struct domain *d,uint64_t eptp)xen/arch/x86/mm/p2m.c +4
-1@@ -2531,6 +2531,7 @@ void p2m_flush_altp2m(struct domain *d) {p2m_reset_altp2m (d, i,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[i] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[i] =mfn_x (INVALID_MFN ); }altp2m_list_unlock (d);@@ -2651,6 +2652,8 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx)p2m_reset_altp2m (d, idx,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[array_index_nospec (idx,MAX_EPTP )] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[array_index_nospec (idx,MAX_EPTP )] = +mfn_x (INVALID_MFN ); rc =0 ; } }@@ -2677,7 +2680,7 @@ int p2m_switch_domain_altp2m_by_id(struct domain *d, unsigned int idx) rc = -EINVAL ;altp2m_list_lock (d); -if ( d->arch.altp2m_eptp[idx] !=mfn_x (INVALID_MFN ) ) +if ( d->arch.altp2m_working_eptp[idx] !=mfn_x (INVALID_MFN ) ) {for_each_vcpu ( d, v )if ( idx !=vcpu_altp2m (v).p2midx )xen/include/asm-x86/domain.h +1
-0@@ -326,6 +326,7 @@ struct arch_domainstruct p2m_domain *altp2m_p2m[MAX_ALTP2M ];mm_lock_t altp2m_list_lock;uint64_t *altp2m_eptp; +uint64_t *altp2m_working_eptp;#endif /* NB. protected by d->event_lock and by irq_desc[irq].lock */ xen/include/public/hvm/hvm_op.h +9
-0@@ -317,6 +317,13 @@ struct xen_hvm_altp2m_get_vcpu_p2m_idx {uint16_t altp2m_idx; }; +struct xen_hvm_altp2m_set_visibility { +uint16_t altp2m_idx; +uint8_t visible; +uint8_t pad; +uint32_t pad2; +}; +struct xen_hvm_altp2m_op {uint32_t version;/* HVMOP_ALTP2M_INTERFACE_VERSION */ uint32_t cmd;@@ -349,6 +356,8 @@ struct xen_hvm_altp2m_op {#define HVMOP_altp2m_get_p2m_idx 14/* Set the "Supress #VE" bit for a range of pages */ #define HVMOP_altp2m_set_suppress_ve_multi 15 +/* Set visibility for a given altp2m view */ +#define HVMOP_altp2m_set_visibility 16domid_t domain;uint16_t pad1;uint32_t pad2;
xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_op { · line 381
Quoted 7 lines
xen/include/public/hvm/hvm_op.h +1
-0@@ -366,6 +375,7 @@ struct xen_hvm_altp2m_op {struct xen_hvm_altp2m_suppress_ve_multi suppress_ve_multi;struct xen_hvm_altp2m_vcpu_disable_notify disable_notify;struct xen_hvm_altp2m_get_vcpu_p2m_idx get_vcpu_p2m_idx; +struct xen_hvm_altp2m_set_visibility set_visibility;uint8_t pad[64 ]; } u; };
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
xen/arch/x86/hvm/hvm.c static int do_altp2m_op( · line 4826
Quoted 13 lines · Alexandru Stefan ISAILA
xen/arch/x86/hvm/hvm.c +9
-0@@ -4814,6 +4815,30 @@ static int do_altp2m_op(break ; } +case HVMOP_altp2m_set_visibility: + { +uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx; + +if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 ) + rc = -EINVAL ; +else + { +if ( !altp2m_active (d) || !hap_enabled (d) )
Doesn't altp2m_active() imply hap_enabled()? At the very least there's no other use of hap_enabled() in do_altp2m_op().
xen/arch/x86/hvm/hvm.c static int do_altp2m_op( · line 4839
Quoted 13 lines
xen/arch/x86/hvm/hvm.c +13
-0+ { + rc = -EOPNOTSUPP ; +break ; + } + +if ( a.u.set_visibility.visible ) + d->arch.altp2m_working_eptp[altp2m_idx] = + d->arch.altp2m_eptp[altp2m_idx]; +else + d->arch.altp2m_working_eptp[altp2m_idx] = +mfn_x (INVALID_MFN ); + } +break ;
Also the code here lends itself to reduction of indentation depth:
case HVMOP_altp2m_set_visibility:
{
uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx;
if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 )
rc = -EINVAL;
else if ( !altp2m_active(d) || !hap_enabled(d) )
rc = -EOPNOTSUPP;
else if ( a.u.set_visibility.visible )
d->arch.altp2m_working_eptp[altp2m_idx] =
d->arch.altp2m_eptp[altp2m_idx];
else
d->arch.altp2m_working_eptp[altp2m_idx] =
mfn_x(INVALID_MFN);
break;
}Also note the altered indentation of the assignments.
xen/arch/x86/mm/hap/hap.c int hap_enable(struct domain *d, u32 mode) · line 495
Quoted 11 lines
xen/arch/x86/mm/hap/hap.c +5
-0@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + }
Isn't there a pre-existing error handling issue here which you widen, in that later encountered errors don't cause clean up of what had already succeeded before?
xen/arch/x86/mm/hap/hap.c int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) · line 2656
Quoted 6 lines
xen/arch/x86/mm/hap/hap.c +2
-0@@ -2651,6 +2652,8 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx)p2m_reset_altp2m (d, idx,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[array_index_nospec (idx,MAX_EPTP )] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[array_index_nospec (idx,MAX_EPTP )] = +mfn_x (INVALID_MFN );
Like above, and irrespective of you cloning existing code - indentation of the 2nd line is wrong here.
xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_get_vcpu_p2m_idx { · line 325
Quoted 12 lines
xen/include/public/hvm/hvm_op.h +6
-0@@ -317,6 +317,13 @@ struct xen_hvm_altp2m_get_vcpu_p2m_idx {uint16_t altp2m_idx; }; +struct xen_hvm_altp2m_set_visibility { +uint16_t altp2m_idx; +uint8_t visible; +uint8_t pad; +uint32_t pad2; +};
What is pad2 good/intended for? 32-bit padding fields in some other structures are needed because one or more uint64_t fields follow, but this isn't the case here.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 5 lines · Jan Beulich
Quoted 4 lines · Alexandru Stefan ISAILA
(quoted diff) +0
-0@@ -4814,6 +4815,30 @@ static int do_altp2m_op( break; }
Quoted 12 lines
xen/arch/x86/hvm/hvm.c static int do_altp2m_op( · line 4826
Quoted 9 lines
xen/arch/x86/hvm/hvm.c +9
-0+case HVMOP_altp2m_set_visibility: + { +uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx; + +if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 ) + rc = -EINVAL ; +else + { +if ( !altp2m_active (d) || !hap_enabled (d) )Doesn't
altp2m_active()implyhap_enabled()? At the very least there's no other use ofhap_enabled()indo_altp2m_op().
Yes, the hap_enabled can be dropped.
Quoted 37 lines
Quoted 4 lines
xen/arch/x86/hvm/hvm.c +3
-0+ { + rc = -EOPNOTSUPP ; +break ;xen/arch/x86/hvm/hvm.c static int do_altp2m_op( · line 4839
Quoted 10 lines
xen/arch/x86/hvm/hvm.c +10
-0+ } + +if ( a.u.set_visibility.visible ) + d->arch.altp2m_working_eptp[altp2m_idx] = + d->arch.altp2m_eptp[altp2m_idx]; +else + d->arch.altp2m_working_eptp[altp2m_idx] = +mfn_x (INVALID_MFN ); + } +break ;Also the code here lends itself to reduction of indentation depth:
case HVMOP_altp2m_set_visibility: { uint16_t altp2m_idx = a.u.set_visibility.altp2m_idx; if ( a.u.set_visibility.pad || a.u.set_visibility.pad2 ) rc = -EINVAL; else if ( !altp2m_active(d) || !hap_enabled(d) ) rc = -EOPNOTSUPP; else if ( a.u.set_visibility.visible ) d->arch.altp2m_working_eptp[altp2m_idx] = d->arch.altp2m_eptp[altp2m_idx]; else d->arch.altp2m_working_eptp[altp2m_idx] = mfn_x(INVALID_MFN); break; }
Quoted 1 line
Also note the altered indentation of the assignments.
I will fix the else if alignment as well as the indentation for the assignments.
Quoted 7 lines
Quoted 7 lines
xen/arch/x86/mm/hap/hap.c +0
-0@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; }
Quoted 9 lines
xen/arch/x86/mm/hap/hap.c int hap_enable(struct domain *d, u32 mode) · line 495
Quoted 5 lines
xen/arch/x86/mm/hap/hap.c +5
-0+if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + }Isn't there a pre-existing error handling issue here which you widen, in that later encountered errors don't cause clean up of what had already succeeded before?
It seems non of the errors perform a cleanup. It might be better to have a general cleanup done at "out:" if ( !rv ) and then check what should be "p2m_teardown()" or "free_xenheap_page()".
Quoted 17 lines
xen/arch/x86/mm/hap/hap.c int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx) · line 2656
Quoted 7 lines
xen/arch/x86/mm/hap/hap.c +2
-0@@ -2651,6 +2652,8 @@ int p2m_destroy_altp2m_by_id(struct domain *d, unsigned int idx)p2m_reset_altp2m (d, idx,ALTP2M_DEACTIVATE ); d->arch.altp2m_eptp[array_index_nospec (idx,MAX_EPTP )] =mfn_x (INVALID_MFN ); + d->arch.altp2m_working_eptp[array_index_nospec (idx,MAX_EPTP )] = +mfn_x (INVALID_MFN );Like above, and irrespective of you cloning existing code - indentation of the 2nd line is wrong here.
Quoted 6 lines
xen/include/public/hvm/hvm_op.h +0
-0@@ -317,6 +317,13 @@ struct xen_hvm_altp2m_get_vcpu_p2m_idx {uint16_t altp2m_idx; };
Quoted 10 lines
xen/include/public/hvm/hvm_op.h struct xen_hvm_altp2m_get_vcpu_p2m_idx { · line 325
Quoted 6 lines
xen/include/public/hvm/hvm_op.h +6
-0+struct xen_hvm_altp2m_set_visibility { +uint16_t altp2m_idx; +uint8_t visible; +uint8_t pad; +uint32_t pad2; +};What is pad2 good/intended for? 32-bit padding fields in some other structures are needed because one or more
uint64_tfields follow, but this isn't the case here.
Right, pad2 can be dropped.
Alex
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 17 lines
Quoted 7 lines
Quoted 7 lines
xen/arch/x86/mm/hap/hap.c +0
-0@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; }Quoted 9 lines
xen/arch/x86/mm/hap/hap.c int hap_enable(struct domain *d, u32 mode) · line 495
Quoted 5 lines
xen/arch/x86/mm/hap/hap.c +5
-0+if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + }Isn't there a pre-existing error handling issue here which you widen, in that later encountered errors don't cause clean up of what had already succeeded before?
Quoted 4 lines
It seems non of the errors perform a cleanup. It might be better to have a general cleanup done at "out:" if ( !rv ) and then check what should be "
p2m_teardown()" or "free_xenheap_page()".
I've looked around for this and it is handled in arch_domain_create(). If hvm_domain_initialise() fails then paging_final_teardown() is called and in the end hap_final_teardown() takes care of cleaning up.
Alex
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Quoted 17 lines · Alexandru Stefan ISAILA
Quoted 17 lines
Quoted 16 lines
xen/arch/x86/mm/hap/hap.c int hap_enable(struct domain *d, u32 mode) · line 495
Quoted 12 lines
xen/arch/x86/mm/hap/hap.c +5
-0@@ -488,8 +488,17 @@ int hap_enable(struct domain *d, u32 mode) goto out; } +if ( (d->arch.altp2m_working_eptp =alloc_xenheap_page ()) ==NULL ) + { + rv = -ENOMEM ; + goto out; + }Isn't there a pre-existing error handling issue here which you widen, in that later encountered errors don't cause clean up of what had already succeeded before?
Quoted 8 lines
Quoted 4 lines
It seems non of the errors perform a cleanup. It might be better to have a general cleanup done at "out:" if ( !rv ) and then check what should be "
p2m_teardown()" or "free_xenheap_page()".I've looked around for this and it is handled in
arch_domain_create(). Ifhvm_domain_initialise()fails thenpaging_final_teardown()is called and in the endhap_final_teardown()takes care of cleaning up.
Ah, good - thanks for checking. This code could be more obviously correct, though.
Jan
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel