From: Dongxiao Xu <dongxiao.xu@intel.com>
To: xen-devel@lists.xen.org
Cc: keir@xen.org, Ian.Campbell@citrix.com,
stefano.stabellini@eu.citrix.com, George.Dunlap@eu.citrix.com,
andrew.cooper3@citrix.com, Ian.Jackson@eu.citrix.com,
JBeulich@suse.com, dgdegra@tycho.nsa.gov
Subject: [PATCH v13 05/10] x86: dynamically attach/detach QoS monitoring service for a guest
Date: Mon, 4 Aug 2014 10:17:01 +0800 [thread overview]
Message-ID: <1407118626-76843-6-git-send-email-dongxiao.xu@intel.com> (raw)
In-Reply-To: <1407118626-76843-1-git-send-email-dongxiao.xu@intel.com>
Add hypervisor side support for dynamically attach and detach QoS
monitoring services for a certain guest.
When attach Qos monitoring 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 <dongxiao.xu@intel.com>
---
xen/arch/x86/domain.c | 3 +++
xen/arch/x86/domctl.c | 29 ++++++++++++++++++++++++++
xen/arch/x86/pqos.c | 49 ++++++++++++++++++++++++++++++++++++++++++++
xen/include/asm-x86/domain.h | 2 ++
xen/include/asm-x86/pqos.h | 9 ++++++++
xen/include/public/domctl.h | 12 +++++++++++
6 files changed, 104 insertions(+)
diff --git a/xen/arch/x86/domain.c b/xen/arch/x86/domain.c
index e896210..f8e0e33 100644
--- a/xen/arch/x86/domain.c
+++ b/xen/arch/x86/domain.c
@@ -60,6 +60,7 @@
#include <xen/numa.h>
#include <xen/iommu.h>
#include <compat/vcpu.h>
+#include <asm/pqos.h>
DEFINE_PER_CPU(struct vcpu *, curr_vcpu);
DEFINE_PER_CPU(unsigned long, cr4);
@@ -636,6 +637,8 @@ void arch_domain_destroy(struct domain *d)
free_xenheap_page(d->shared_info);
cleanup_domain_irq_mapping(d);
+
+ pqos_monitor_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 d1517c4..cc719b1 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -35,6 +35,7 @@
#include <asm/mem_sharing.h>
#include <asm/xstate.h>
#include <asm/debugger.h>
+#include <asm/pqos.h>
static int gdbsx_guest_mem_io(
domid_t domid, struct xen_domctl_gdbsx_memio *iop)
@@ -1395,6 +1396,34 @@ long arch_do_domctl(
}
break;
+ case XEN_DOMCTL_pqos_monitor_op:
+ if ( !pqos_monitor_enabled() )
+ {
+ ret = -ENODEV;
+ break;
+ }
+
+ switch ( domctl->u.pqos_monitor_op.cmd )
+ {
+ case XEN_DOMCTL_PQOS_MONITOR_OP_ATTACH:
+ ret = pqos_monitor_alloc_rmid(d);
+ break;
+ case XEN_DOMCTL_PQOS_MONITOR_OP_DETACH:
+ if ( d->arch.pqos_rmid > 0 )
+ pqos_monitor_free_rmid(d);
+ else
+ ret = -ENOENT;
+ break;
+ case XEN_DOMCTL_PQOS_MONITOR_OP_QUERY_RMID:
+ domctl->u.pqos_monitor_op.data = d->arch.pqos_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/pqos.c b/xen/arch/x86/pqos.c
index 148d97f..97b527f 100644
--- a/xen/arch/x86/pqos.c
+++ b/xen/arch/x86/pqos.c
@@ -15,6 +15,7 @@
*/
#include <xen/init.h>
#include <xen/cpu.h>
+#include <xen/sched.h>
#include <asm/pqos.h>
struct pqos_monitor *__read_mostly pqosm = NULL;
@@ -108,6 +109,54 @@ void __init init_platform_qos(void)
init_pqos_monitor(opt_rmid_max);
}
+/* Called with domain lock held, no pqos specific lock needed */
+int pqos_monitor_alloc_rmid(struct domain *d)
+{
+ unsigned int rmid;
+
+ ASSERT(pqos_monitor_enabled());
+
+ if ( d->arch.pqos_rmid > 0 )
+ return -EEXIST;
+
+ for ( rmid = pqosm->rmid_min; rmid <= pqosm->rmid_max; rmid++ )
+ {
+ if ( pqosm->rmid_to_dom[rmid] != DOMID_INVALID)
+ continue;
+
+ pqosm->rmid_to_dom[rmid] = d->domain_id;
+ break;
+ }
+
+ /* No RMID available, assign RMID=0 by default */
+ if ( rmid > pqosm->rmid_max )
+ {
+ d->arch.pqos_rmid = 0;
+ return -EUSERS;
+ }
+ else
+ pqosm->rmid_inuse++;
+
+ d->arch.pqos_rmid = rmid;
+
+ return 0;
+}
+
+/* Called with domain lock held, no pqos specific lock needed */
+void pqos_monitor_free_rmid(struct domain *d)
+{
+ unsigned int rmid;
+
+ rmid = d->arch.pqos_rmid;
+ /* We do not free system reserved "RMID=0" */
+ if ( rmid == 0 )
+ return;
+
+ pqosm->rmid_to_dom[rmid] = DOMID_INVALID;
+ d->arch.pqos_rmid = 0;
+ pqosm->rmid_inuse--;
+}
+
/*
* Local variables:
* mode: C
diff --git a/xen/include/asm-x86/domain.h b/xen/include/asm-x86/domain.h
index abf55fb..cd53108 100644
--- a/xen/include/asm-x86/domain.h
+++ b/xen/include/asm-x86/domain.h
@@ -313,6 +313,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 pqos_rmid; /* QoS monitoring RMID assigned to the domain */
} __cacheline_aligned;
#define has_arch_pdevs(d) (!list_empty(&(d)->arch.pdev_list))
diff --git a/xen/include/asm-x86/pqos.h b/xen/include/asm-x86/pqos.h
index ae35762..b45c991 100644
--- a/xen/include/asm-x86/pqos.h
+++ b/xen/include/asm-x86/pqos.h
@@ -16,6 +16,8 @@
#ifndef __ASM_PQOS_H__
#define __ASM_PQOS_H__
+#include <xen/types.h>
+
/* QoS Resource Type Enumeration */
#define QOS_MONITOR_TYPE_L3 0x2
@@ -40,7 +42,14 @@ struct pqos_monitor {
extern struct pqos_monitor *pqosm;
+static inline bool_t pqos_monitor_enabled(void)
+{
+ return !!pqosm;
+}
+
void init_platform_qos(void);
+int pqos_monitor_alloc_rmid(struct domain *d);
+void pqos_monitor_free_rmid(struct domain *d);
#endif /* __ASM_PQOS_H__ */
diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h
index 5b11bbf..af9e775 100644
--- a/xen/include/public/domctl.h
+++ b/xen/include/public/domctl.h
@@ -936,6 +936,16 @@ typedef struct xen_domctl_vcpu_msrs xen_domctl_vcpu_msrs_t;
DEFINE_XEN_GUEST_HANDLE(xen_domctl_vcpu_msrs_t);
#endif
+struct xen_domctl_pqos_monitor_op {
+#define XEN_DOMCTL_PQOS_MONITOR_OP_DETACH 0
+#define XEN_DOMCTL_PQOS_MONITOR_OP_ATTACH 1
+#define XEN_DOMCTL_PQOS_MONITOR_OP_QUERY_RMID 2
+ uint32_t cmd;
+ uint32_t data;
+};
+typedef struct xen_domctl_pqos_op xen_domctl_pqos_op_t;
+DEFINE_XEN_GUEST_HANDLE(xen_domctl_pqos_op_t);
+
struct xen_domctl {
uint32_t cmd;
#define XEN_DOMCTL_createdomain 1
@@ -1008,6 +1018,7 @@ struct xen_domctl {
#define XEN_DOMCTL_cacheflush 71
#define XEN_DOMCTL_get_vcpu_msrs 72
#define XEN_DOMCTL_set_vcpu_msrs 73
+#define XEN_DOMCTL_pqos_monitor_op 74
#define XEN_DOMCTL_gdbsx_guestmemio 1000
#define XEN_DOMCTL_gdbsx_pausevcpu 1001
#define XEN_DOMCTL_gdbsx_unpausevcpu 1002
@@ -1068,6 +1079,7 @@ struct xen_domctl {
struct xen_domctl_cacheflush cacheflush;
struct xen_domctl_gdbsx_pauseunp_vcpu gdbsx_pauseunp_vcpu;
struct xen_domctl_gdbsx_domstatus gdbsx_domstatus;
+ struct xen_domctl_pqos_monitor_op pqos_monitor_op;
uint8_t pad[128];
} u;
};
--
1.8.1.5
next prev parent reply other threads:[~2014-08-04 2:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 2:16 [PATCH v13 00/10] enable Cache QoS Monitoring (CQM) feature Dongxiao Xu
2014-08-04 2:16 ` [PATCH v13 01/10] x86: add generic resource (e.g. MSR) access hypercall Dongxiao Xu
2014-08-04 11:07 ` Jan Beulich
2014-08-04 2:16 ` [PATCH v13 02/10] xsm: add resource operation related xsm policy Dongxiao Xu
2014-08-04 2:16 ` [PATCH v13 03/10] tools: provide interface for generic resource access Dongxiao Xu
2014-08-04 2:17 ` [PATCH v13 04/10] x86: detect and initialize Platform QoS Monitoring feature Dongxiao Xu
2014-08-04 11:19 ` Jan Beulich
2014-08-04 2:17 ` Dongxiao Xu [this message]
2014-08-04 9:38 ` [PATCH v13 05/10] x86: dynamically attach/detach QoS monitoring service for a guest Andrew Cooper
2014-08-04 11:23 ` Jan Beulich
2014-08-04 2:17 ` [PATCH v13 06/10] x86: collect global QoS monitoring information Dongxiao Xu
2014-08-04 11:31 ` Jan Beulich
2014-08-04 11:34 ` Jan Beulich
2014-08-04 2:17 ` [PATCH v13 07/10] x86: enable QoS monitoring for each domain RMID Dongxiao Xu
2014-08-04 9:44 ` Andrew Cooper
2014-08-04 11:33 ` Jan Beulich
2014-08-04 2:17 ` [PATCH v13 08/10] x86: add QoS monitoring related MSRs in allowed list Dongxiao Xu
2014-08-04 2:17 ` [PATCH v13 09/10] xsm: add platform QoS related xsm policies Dongxiao Xu
2014-08-04 2:17 ` [PATCH v13 10/10] tools: CMDs and APIs for Platform QoS Monitoring Dongxiao Xu
2014-08-04 10:29 ` [PATCH v13 00/10] enable Cache QoS Monitoring (CQM) feature Jan Beulich
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1407118626-76843-6-git-send-email-dongxiao.xu@intel.com \
--to=dongxiao.xu@intel.com \
--cc=George.Dunlap@eu.citrix.com \
--cc=Ian.Campbell@citrix.com \
--cc=Ian.Jackson@eu.citrix.com \
--cc=JBeulich@suse.com \
--cc=andrew.cooper3@citrix.com \
--cc=dgdegra@tycho.nsa.gov \
--cc=keir@xen.org \
--cc=stefano.stabellini@eu.citrix.com \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).