From: Dongxiao Xu Date: Mon, 6 Oct 2014 10:39:11 +0000 (+0200) Subject: x86: dynamically attach/detach CMT service for a guest X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4261 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=c80c2b4bf07212485a9dcb27134f659c741155f5;p=xen.git x86: dynamically attach/detach CMT service for a guest Add hypervisor side support for dynamically attach and detach Cache Monitoring Technology(CMT) services for a certain guest. When attach CMT service for a guest, system will allocate an RMID for it. When detach or guest is shutdown, the RMID will be recycled for future use. Signed-off-by: Dongxiao Xu Signed-off-by: Chao Peng Acked-by: Jan Beulich Reviewed-by: Andrew Cooper Release-Acked-by: Konrad Rzeszutek Wilk --- diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c index ad0a9f585f..d5133ac7c4 100644 --- a/xen/arch/x86/domain.c +++ b/xen/arch/x86/domain.c @@ -60,6 +60,7 @@ #include #include #include +#include DEFINE_PER_CPU(struct vcpu *, curr_vcpu); DEFINE_PER_CPU(unsigned long, cr4); @@ -661,6 +662,8 @@ void arch_domain_destroy(struct domain *d) free_xenheap_page(d->shared_info); cleanup_domain_irq_mapping(d); + + psr_free_rmid(d); } unsigned long pv_guest_cr4_fixup(const struct vcpu *v, unsigned long guest_cr4) diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c index ce95bea337..82365a40b2 100644 --- a/xen/arch/x86/domctl.c +++ b/xen/arch/x86/domctl.c @@ -35,6 +35,7 @@ #include #include #include +#include static int gdbsx_guest_mem_io( domid_t domid, struct xen_domctl_gdbsx_memio *iop) @@ -1299,6 +1300,34 @@ long arch_do_domctl( } break; + case XEN_DOMCTL_psr_cmt_op: + if ( !psr_cmt_enabled() ) + { + ret = -ENODEV; + break; + } + + switch ( domctl->u.psr_cmt_op.cmd ) + { + case XEN_DOMCTL_PSR_CMT_OP_ATTACH: + ret = psr_alloc_rmid(d); + break; + case XEN_DOMCTL_PSR_CMT_OP_DETACH: + if ( d->arch.psr_rmid > 0 ) + psr_free_rmid(d); + else + ret = -ENOENT; + break; + case XEN_DOMCTL_PSR_CMT_OP_QUERY_RMID: + domctl->u.psr_cmt_op.data = d->arch.psr_rmid; + copyback = 1; + break; + default: + ret = -ENOSYS; + break; + } + break; + default: ret = iommu_do_domctl(domctl, d, u_domctl); break; diff --git a/xen/arch/x86/psr.c b/xen/arch/x86/psr.c index 6c4842b17a..b6e9f2e062 100644 --- a/xen/arch/x86/psr.c +++ b/xen/arch/x86/psr.c @@ -15,6 +15,7 @@ */ #include #include +#include #include #define PSR_CMT (1<<0) @@ -116,6 +117,51 @@ static int __init init_psr(void) } __initcall(init_psr); +/* Called with domain lock held, no psr specific lock needed */ +int psr_alloc_rmid(struct domain *d) +{ + unsigned int rmid; + + ASSERT(psr_cmt_enabled()); + + if ( d->arch.psr_rmid > 0 ) + return -EEXIST; + + for ( rmid = 1; rmid <= psr_cmt->rmid_max; rmid++ ) + { + if ( psr_cmt->rmid_to_dom[rmid] != DOMID_INVALID ) + continue; + + psr_cmt->rmid_to_dom[rmid] = d->domain_id; + break; + } + + /* No RMID available, assign RMID=0 by default. */ + if ( rmid > psr_cmt->rmid_max ) + { + d->arch.psr_rmid = 0; + return -EUSERS; + } + + d->arch.psr_rmid = rmid; + + return 0; +} + +/* Called with domain lock held, no psr specific lock needed */ +void psr_free_rmid(struct domain *d) +{ + unsigned int rmid; + + rmid = d->arch.psr_rmid; + /* We do not free system reserved "RMID=0". */ + if ( rmid == 0 ) + return; + + psr_cmt->rmid_to_dom[rmid] = DOMID_INVALID; + d->arch.psr_rmid = 0; +} + /* * Local variables: * mode: C diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h index f5cb6fe9a0..6a77a930ad 100644 --- a/xen/include/asm-x86/domain.h +++ b/xen/include/asm-x86/domain.h @@ -328,6 +328,8 @@ struct arch_domain /* Shared page for notifying that explicit PIRQ EOI is required. */ unsigned long *pirq_eoi_map; unsigned long pirq_eoi_map_mfn; + + unsigned int psr_rmid; /* RMID assigned to the domain for CMT */ } __cacheline_aligned; #define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list)) diff --git a/xen/include/asm-x86/psr.h b/xen/include/asm-x86/psr.h index 60420f2586..33f81f673c 100644 --- a/xen/include/asm-x86/psr.h +++ b/xen/include/asm-x86/psr.h @@ -16,6 +16,8 @@ #ifndef __ASM_PSR_H__ #define __ASM_PSR_H__ +#include + /* Resource Type Enumeration */ #define PSR_RESOURCE_TYPE_L3 0x2 @@ -37,6 +39,14 @@ struct psr_cmt { extern struct psr_cmt *psr_cmt; +static inline bool_t psr_cmt_enabled(void) +{ + return !!psr_cmt; +} + +int psr_alloc_rmid(struct domain *d); +void psr_free_rmid(struct domain *d); + #endif /* __ASM_PSR_H__ */ /* diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 61f7555211..f519524fe8 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -971,6 +971,16 @@ struct xen_domctl_vnuma { typedef struct xen_domctl_vnuma xen_domctl_vnuma_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_vnuma_t); +struct xen_domctl_psr_cmt_op { +#define XEN_DOMCTL_PSR_CMT_OP_DETACH 0 +#define XEN_DOMCTL_PSR_CMT_OP_ATTACH 1 +#define XEN_DOMCTL_PSR_CMT_OP_QUERY_RMID 2 + uint32_t cmd; + uint32_t data; +}; +typedef struct xen_domctl_psr_cmt_op xen_domctl_psr_cmt_op_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cmt_op_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -1044,6 +1054,7 @@ struct xen_domctl { #define XEN_DOMCTL_get_vcpu_msrs 72 #define XEN_DOMCTL_set_vcpu_msrs 73 #define XEN_DOMCTL_setvnumainfo 74 +#define XEN_DOMCTL_psr_cmt_op 75 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1105,6 +1116,7 @@ struct xen_domctl { struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu; struct xen_domctl_gdbsx_domstatus gdbsx_domstatus; struct xen_domctl_vnuma vnuma; + struct xen_domctl_psr_cmt_op psr_cmt_op; uint8_t pad[128]; } u; };