[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH v12 9/9] tools: CMDs and APIs for Platform QoS Monitoring
Introduced some new xl commands to handle the platform QoS monitoring related services. The following two commands is to attach/detach the QoS monitoring service to/from a certain domain. $ xl pqos-monitor-attach domid $ xl pqos-monitor-detach domid This command is to display the QoS monitoring information, such as CQM, to show the L3 cache occupancy. $ xl pqos-monitor-show cache_occupancy <domid> Signed-off-by: Dongxiao Xu <dongxiao.xu@xxxxxxxxx> --- docs/man/xl.pod.1 | 24 +++++ tools/libxc/Makefile | 1 + tools/libxc/xc_msr_x86.h | 36 +++++++ tools/libxc/xc_pqos.c | 219 +++++++++++++++++++++++++++++++++++++++++++ tools/libxc/xenctrl.h | 18 ++++ tools/libxl/Makefile | 2 +- tools/libxl/libxl.h | 17 ++++ tools/libxl/libxl_pqos.c | 171 +++++++++++++++++++++++++++++++++ tools/libxl/libxl_types.idl | 4 + tools/libxl/xl.h | 3 + tools/libxl/xl_cmdimpl.c | 131 ++++++++++++++++++++++++++ tools/libxl/xl_cmdtable.c | 17 ++++ 12 files changed, 642 insertions(+), 1 deletion(-) create mode 100644 tools/libxc/xc_msr_x86.h create mode 100644 tools/libxc/xc_pqos.c create mode 100644 tools/libxl/libxl_pqos.c diff --git a/docs/man/xl.pod.1 b/docs/man/xl.pod.1 index 30bd4bf..9480a86 100644 --- a/docs/man/xl.pod.1 +++ b/docs/man/xl.pod.1 @@ -1366,6 +1366,30 @@ Load FLASK policy from the given policy file. The initial policy is provided to the hypervisor as a multiboot module; this command allows runtime updates to the policy. Loading new security policy will reset runtime changes to device labels. +=head1 PLATFORM QOS MONITORING + +Some new hardware may offer monitoring capability in each logical processor to +measure specific quality-of-service metric. In Xen implementation, the +monitoring granularity is domain level. To monitor a specific domain, just +attach the domain id with the monitoring service. When the domain doesn't need +to be monitored any more, detach the domain id from the monitoring service. + +=over 4 + +=item B<pqos-monitor-attach> [I<domain-id>] + +attach: Attach the platform QoS monitoring service to a domain. + +=item B<pqos-monitor-detach> [I<domain-id>] + +detach: Detach the platform QoS monitoring service from a domain. + +=item B<pqos-monitor-show> [I<qos-monitor-type>] [I<domain-id>] + +Show monitoring data for a certain domain or all domains. Current supported +QoS monitor types are: + - "cache-occupancy": showing the L3 cache occupancy. + =back =head1 TO BE DOCUMENTED diff --git a/tools/libxc/Makefile b/tools/libxc/Makefile index b8b28c1..91e65c4 100644 --- a/tools/libxc/Makefile +++ b/tools/libxc/Makefile @@ -35,6 +35,7 @@ CTRL_SRCS-y += xc_kexec.c CTRL_SRCS-y += xtl_core.c CTRL_SRCS-y += xtl_logger_stdio.c CTRL_SRCS-y += xc_resource.c +CTRL_SRCS-y += xc_pqos.c CTRL_SRCS-$(CONFIG_X86) += xc_pagetab.c CTRL_SRCS-$(CONFIG_Linux) += xc_linux.c xc_linux_osdep.c CTRL_SRCS-$(CONFIG_FreeBSD) += xc_freebsd.c xc_freebsd_osdep.c diff --git a/tools/libxc/xc_msr_x86.h b/tools/libxc/xc_msr_x86.h new file mode 100644 index 0000000..1e0ee99 --- /dev/null +++ b/tools/libxc/xc_msr_x86.h @@ -0,0 +1,36 @@ +/* + * xc_msr_x86.h + * + * MSR definition macros + * + * Copyright (C) 2014 Intel Corporation + * Author Dongxiao Xu <dongxiao.xu@xxxxxxxxx> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#ifndef XC_MSR_X86_H +#define XC_MSR_X86_H + +#define MSR_IA32_QOSEVTSEL 0x00000c8d +#define MSR_IA32_QMC 0x00000c8e + +#endif + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/xc_pqos.c b/tools/libxc/xc_pqos.c new file mode 100644 index 0000000..4adf7ef --- /dev/null +++ b/tools/libxc/xc_pqos.c @@ -0,0 +1,219 @@ +/* + * xc_pqos.c + * + * platform QoS related API functions. + * + * Copyright (C) 2014 Intel Corporation + * Author Dongxiao Xu <dongxiao.xu@xxxxxxxxx> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "xc_private.h" +#include "xc_msr_x86.h" + +#define IA32_QM_CTR_ERROR_MASK (0x3ull << 62) + +#define EVTID_L3_OCCUPANCY 0x1 + +int xc_pqos_monitor_attach(xc_interface *xch, uint32_t domid) +{ + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_pqos_monitor_op; + domctl.domain = (domid_t)domid; + domctl.u.pqos_monitor_op.cmd = XEN_DOMCTL_PQOS_MONITOR_OP_ATTACH; + + return do_domctl(xch, &domctl); +} + +int xc_pqos_monitor_detach(xc_interface *xch, uint32_t domid) +{ + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_pqos_monitor_op; + domctl.domain = (domid_t)domid; + domctl.u.pqos_monitor_op.cmd = XEN_DOMCTL_PQOS_MONITOR_OP_DETACH; + + return do_domctl(xch, &domctl); +} + +int xc_pqos_monitor_get_domain_rmid(xc_interface *xch, uint32_t domid, + uint32_t *rmid) +{ + int rc; + DECLARE_DOMCTL; + + domctl.cmd = XEN_DOMCTL_pqos_monitor_op; + domctl.domain = (domid_t)domid; + domctl.u.pqos_monitor_op.cmd = XEN_DOMCTL_PQOS_MONITOR_OP_QUERY_RMID; + + rc = do_domctl(xch, &domctl); + + *rmid = domctl.u.pqos_monitor_op.data; + + return rc; +} + +int xc_pqos_monitor_get_total_rmid(xc_interface *xch, uint32_t *total_rmid) +{ + static int val = 0; + int rc; + DECLARE_SYSCTL; + + if ( val ) + { + *total_rmid = val; + return 0; + } + + sysctl.cmd = XEN_SYSCTL_pqos_monitor_op; + sysctl.u.pqos_monitor_op.cmd = XEN_SYSCTL_PQOS_MONITOR_get_total_rmid; + + rc = xc_sysctl(xch, &sysctl); + if ( !rc ) + val = *total_rmid = sysctl.u.pqos_monitor_op.data; + + return rc; +} + +int xc_pqos_monitor_get_l3_upscaling_factor(xc_interface *xch, + uint32_t *upscaling_factor) +{ + static int val = 0; + int rc; + DECLARE_SYSCTL; + + if ( val ) + { + *upscaling_factor = val; + return 0; + } + + sysctl.cmd = XEN_SYSCTL_pqos_monitor_op; + sysctl.u.pqos_monitor_op.cmd = + XEN_SYSCTL_PQOS_MONITOR_get_l3_upscaling_factor; + + rc = xc_sysctl(xch, &sysctl); + if ( !rc ) + val = *upscaling_factor = sysctl.u.pqos_monitor_op.data; + + return rc; +} + +int xc_pqos_monitor_get_l3_cache_size(xc_interface *xch, + uint32_t *l3_cache_size) +{ + static int val = 0; + int rc; + DECLARE_SYSCTL; + + if ( val ) + { + *l3_cache_size = val; + return 0; + } + + sysctl.cmd = XEN_SYSCTL_pqos_monitor_op; + sysctl.u.pqos_monitor_op.cmd = + XEN_SYSCTL_PQOS_MONITOR_get_l3_cache_size; + + rc = xc_sysctl(xch, &sysctl); + if ( !rc ) + val = *l3_cache_size= sysctl.u.pqos_monitor_op.data; + + return rc; +} + +int xc_pqos_monitor_select_socket_cpu(xc_interface *xch, uint32_t socket) +{ + int rc; + DECLARE_SYSCTL; + + sysctl.cmd = XEN_SYSCTL_pqos_monitor_op; + sysctl.u.pqos_monitor_op.cmd = XEN_SYSCTL_PQOS_MONITOR_get_socket_cpu; + sysctl.u.pqos_monitor_op.data = socket; + + rc = do_sysctl(xch, &sysctl); + if ( !rc ) + return sysctl.u.pqos_monitor_op.data; + + return -1; +} + +int xc_pqos_monitor_get_data(xc_interface *xch, uint32_t rmid, + uint32_t cpu, xc_pqos_monitor_type type, uint64_t *monitor_data) +{ + xc_resource_data_t rsc_data[2]; + uint32_t evtid; + int rc; + + switch ( type ) + { + case XC_PQOS_MONITOR_L3_OCCUPANCY: + evtid = EVTID_L3_OCCUPANCY; + break; + default: + return -1; + } + + rsc_data[0].cmd = XEN_RESOURCE_OP_WRITE; + rsc_data[0].cpu = cpu; + rsc_data[0].idx = MSR_IA32_QOSEVTSEL; + rsc_data[0].val = (uint64_t)rmid << 32 | evtid; + rsc_data[1].cmd = XEN_RESOURCE_OP_READ; + rsc_data[1].cpu = cpu; + rsc_data[1].idx = MSR_IA32_QMC; + rsc_data[1].val = 0; + + rc = xc_resource_op(xch, 2, XEN_RESOURCE_TYPE_MSR, rsc_data); + if ( rc ) + return rc; + + if ( rsc_data[1].val & IA32_QM_CTR_ERROR_MASK ) + return -1; + + *monitor_data = rsc_data[1].val; + + return 0; +} + +int xc_pqos_monitor_cqm_enabled(xc_interface *xch) +{ + static int val = -1; + int rc; + DECLARE_SYSCTL; + + if ( val >= 0 ) + return val; + + sysctl.cmd = XEN_SYSCTL_pqos_monitor_op; + sysctl.u.pqos_monitor_op.cmd = XEN_SYSCTL_PQOS_MONITOR_cqm_enabled; + + rc = do_sysctl(xch, &sysctl); + if ( !rc ) + { + val = sysctl.u.pqos_monitor_op.data; + return val; + } + + return 0; +} + +/* + * Local variables: + * mode: C + * c-file-style: "BSD" + * c-basic-offset: 4 + * tab-width: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxc/xenctrl.h b/tools/libxc/xenctrl.h index ca0b207..08ee12f 100644 --- a/tools/libxc/xenctrl.h +++ b/tools/libxc/xenctrl.h @@ -2608,6 +2608,24 @@ typedef xenpf_resource_data_t xc_resource_data_t; int xc_resource_op(xc_interface *xch, uint32_t nr, uint32_t type, xc_resource_data_t *data); +enum xc_pqos_monitor_type { + XC_PQOS_MONITOR_L3_OCCUPANCY, +}; +typedef enum xc_pqos_monitor_type xc_pqos_monitor_type; +int xc_pqos_monitor_attach(xc_interface *xch, uint32_t domid); +int xc_pqos_monitor_detach(xc_interface *xch, uint32_t domid); +int xc_pqos_monitor_get_domain_rmid(xc_interface *xch, uint32_t domid, + uint32_t *rmid); +int xc_pqos_monitor_get_total_rmid(xc_interface *xch, uint32_t *total_rmid); +int xc_pqos_monitor_get_l3_upscaling_factor(xc_interface *xch, + uint32_t *upscaling_factor); +int xc_pqos_monitor_get_l3_cache_size(xc_interface *xch, + uint32_t *l3_cache_size); +int xc_pqos_monitor_select_socket_cpu(xc_interface *xch, uint32_t socket); +int xc_pqos_monitor_get_data(xc_interface *xch, uint32_t rmid, + uint32_t cpu, uint32_t pqos_monitor_type, uint64_t *monitor_data); +int xc_pqos_monitor_cqm_enabled(xc_interface *xch); + #endif /* XENCTRL_H */ /* diff --git a/tools/libxl/Makefile b/tools/libxl/Makefile index 7fc42c8..14cdd54 100644 --- a/tools/libxl/Makefile +++ b/tools/libxl/Makefile @@ -43,7 +43,7 @@ LIBXL_OBJS-y += libxl_blktap2.o else LIBXL_OBJS-y += libxl_noblktap2.o endif -LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o +LIBXL_OBJS-$(CONFIG_X86) += libxl_cpuid.o libxl_x86.o libxl_pqos.o LIBXL_OBJS-$(CONFIG_ARM) += libxl_nocpuid.o libxl_arm.o ifeq ($(CONFIG_NetBSD),y) diff --git a/tools/libxl/libxl.h b/tools/libxl/libxl.h index 69ceac8..f510ade 100644 --- a/tools/libxl/libxl.h +++ b/tools/libxl/libxl.h @@ -533,6 +533,13 @@ typedef uint8_t libxl_mac[6]; #define LIBXL_MAC_FMTLEN ((2*6)+5) /* 6 hex bytes plus 5 colons */ #define LIBXL_MAC_BYTES(mac) mac[0], mac[1], mac[2], mac[3], mac[4], mac[5] +/* + * LIBXL_HAVE_PQOS_MONITOR_CQM + * + * If this is defined, the cache QoS monitoring feature is suported. + */ +#define LIBXL_HAVE_PQOS_MONITOR_CQM 1 + typedef char **libxl_string_list; void libxl_string_list_dispose(libxl_string_list *sl); int libxl_string_list_length(const libxl_string_list *sl); @@ -1217,6 +1224,16 @@ int libxl_flask_getenforce(libxl_ctx *ctx); int libxl_flask_setenforce(libxl_ctx *ctx, int mode); int libxl_flask_loadpolicy(libxl_ctx *ctx, void *policy, uint32_t size); +int libxl_pqos_monitor_attach(libxl_ctx *ctx, uint32_t domid); +int libxl_pqos_monitor_detach(libxl_ctx *ctx, uint32_t domid); +int libxl_pqos_monitor_domain_attached(libxl_ctx *ctx, uint32_t domid); +int libxl_pqos_monitor_cqm_enabled(libxl_ctx *ctx); +int libxl_pqos_monitor_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid); +int libxl_pqos_monitor_get_l3_cache_size(libxl_ctx *ctx, + uint32_t *l3_cache_size); +int libxl_pqos_monitor_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, + uint32_t socketid, uint64_t *l3_cache_occupancy); + /* misc */ /* Each of these sets or clears the flag according to whether the diff --git a/tools/libxl/libxl_pqos.c b/tools/libxl/libxl_pqos.c new file mode 100644 index 0000000..8c56e67 --- /dev/null +++ b/tools/libxl/libxl_pqos.c @@ -0,0 +1,171 @@ +/* + * Copyright (C) 2014 Intel Corporation + * Author Dongxiao Xu <dongxiao.xu@xxxxxxxxx> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as published + * by the Free Software Foundation; version 2.1 only. with the special + * exception on linking described in file LICENSE. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License for more details. + */ + +#include "libxl_osdeps.h" /* must come before any other headers */ +#include "libxl_internal.h" + + +#define IA32_QM_CTR_ERROR_MASK (0x3ul << 62) + +static const char * const msg[] = { + [ENOSYS] = "unsupported operation", + [ENODEV] = "Platform QoS Monitoring is not supported in this system", + [EEXIST] = "Platform QoS Monitoring is already attached to this domain", + [ENOENT] = "Platform QoS Monitoring is not attached to this domain", + [EUSERS] = "there is no free RMID available", + [ESRCH] = "is this Domain ID valid?", + [EFAULT] = "cannot find a valid CPU belonging to this socket", +}; + +static void libxl_pqos_monitor_err_msg(libxl_ctx *ctx, int err) +{ + GC_INIT(ctx); + + switch (err) { + case EINVAL: + case ENODEV: + case EEXIST: + case EUSERS: + case ESRCH: + case ENOENT: + LOGE(ERROR, "%s", msg[err]); + break; + default: + LOGE(ERROR, "errno: %d", err); + } + + GC_FREE; +} + +int libxl_pqos_monitor_attach(libxl_ctx *ctx, uint32_t domid) +{ + int rc; + + rc = xc_pqos_monitor_attach(ctx->xch, domid); + if (rc < 0) { + libxl_pqos_monitor_err_msg(ctx, errno); + return ERROR_FAIL; + } + + return 0; +} + +int libxl_pqos_monitor_detach(libxl_ctx *ctx, uint32_t domid) +{ + int rc; + + rc = xc_pqos_monitor_detach(ctx->xch, domid); + if (rc < 0) { + libxl_pqos_monitor_err_msg(ctx, errno); + return ERROR_FAIL; + } + + return 0; +} + +int libxl_pqos_monitor_domain_attached(libxl_ctx *ctx, uint32_t domid) +{ + int rc; + uint32_t rmid; + + rc = xc_pqos_monitor_get_domain_rmid(ctx->xch, domid, &rmid); + if (rc < 0) + return 0; + + return !!rmid; +} + +int libxl_pqos_monitor_cqm_enabled(libxl_ctx *ctx) +{ + return xc_pqos_monitor_cqm_enabled(ctx->xch); +} + +int libxl_pqos_monitor_get_total_rmid(libxl_ctx *ctx, uint32_t *total_rmid) +{ + int rc; + + rc = xc_pqos_monitor_get_total_rmid(ctx->xch, total_rmid); + if (rc < 0) { + libxl_pqos_monitor_err_msg(ctx, errno); + return ERROR_FAIL; + } + + return 0; +} + +int libxl_pqos_monitor_get_l3_cache_size(libxl_ctx *ctx, + uint32_t *l3_cache_size) +{ + int rc; + + rc = xc_pqos_monitor_get_l3_cache_size(ctx->xch, l3_cache_size); + if (rc < 0) { + libxl_pqos_monitor_err_msg(ctx, errno); + return ERROR_FAIL; + } + + return 0; +} + +int libxl_pqos_monitor_get_cache_occupancy(libxl_ctx *ctx, uint32_t domid, + uint32_t socketid, uint64_t *l3_cache_occupancy) +{ + GC_INIT(ctx); + + unsigned int rmid; + uint32_t upscaling_factor; + uint64_t monitor_data; + int cpu, rc; + xc_pqos_monitor_type type; + + rc = xc_pqos_monitor_get_domain_rmid(ctx->xch, domid, &rmid); + if (rc < 0 || rmid == 0) { + LOGE(ERROR, "fail to get the domain rmid, " + "or domain is not attached with platform QoS monitoring service"); + return ERROR_FAIL; + } + + cpu = xc_pqos_monitor_select_socket_cpu(ctx->xch, socketid); + if (cpu < 0) { + LOGE(ERROR, "fail to select a cpu from socket %d", socketid); + return ERROR_FAIL; + } + + type = XC_PQOS_MONITOR_L3_OCCUPANCY; + rc = xc_pqos_monitor_get_data(ctx->xch, rmid, cpu, type, &monitor_data); + if (rc < 0) { + LOGE(ERROR, "failed to get monitoring data"); + return ERROR_FAIL; + } + + rc = xc_pqos_monitor_get_l3_upscaling_factor(ctx->xch, &upscaling_factor); + if (rc < 0) { + LOGE(ERROR, "failed to get L3 upscaling factor"); + return ERROR_FAIL; + } + + *l3_cache_occupancy = upscaling_factor * monitor_data; + + GC_FREE; + return 0; +} + +/* + * Local variables: + * mode: C + * c-basic-offset: 4 + * indent-tabs-mode: nil + * End: + */ diff --git a/tools/libxl/libxl_types.idl b/tools/libxl/libxl_types.idl index 1018142..2e7668b 100644 --- a/tools/libxl/libxl_types.idl +++ b/tools/libxl/libxl_types.idl @@ -604,3 +604,7 @@ libxl_event = Struct("event",[ ])), ("domain_create_console_available", None), ]))]) + +libxl_pqos_monitor_type = Enumeration("pqos_monitor_type", [ + (1, "CACHE_OCCUPANCY"), + ]) diff --git a/tools/libxl/xl.h b/tools/libxl/xl.h index 10a2e66..4e9635a 100644 --- a/tools/libxl/xl.h +++ b/tools/libxl/xl.h @@ -110,6 +110,9 @@ int main_loadpolicy(int argc, char **argv); int main_remus(int argc, char **argv); #endif int main_devd(int argc, char **argv); +int main_pqos_monitor_attach(int argc, char **argv); +int main_pqos_monitor_detach(int argc, char **argv); +int main_pqos_monitor_show(int argc, char **argv); void help(const char *command); diff --git a/tools/libxl/xl_cmdimpl.c b/tools/libxl/xl_cmdimpl.c index be041f2..ef049b5 100644 --- a/tools/libxl/xl_cmdimpl.c +++ b/tools/libxl/xl_cmdimpl.c @@ -7303,6 +7303,137 @@ out: return ret; } +static int pqos_monitor_show_cache_occupancy(uint32_t first_domain, + uint32_t nr_domains, + int ignore_domain_err) +{ + uint32_t domid, socketid, nr_sockets, total_rmid, l3_cache_size; + uint64_t l3_cache_occupancy; + libxl_physinfo info; + char *domain_name; + int rc, print_header; + + if (!libxl_pqos_monitor_cqm_enabled(ctx)) { + printf("CQM is not supported in the system\n"); + return -1; + } + + rc = libxl_get_physinfo(ctx, &info); + if (rc < 0) { + printf("failed to get system socket number\n"); + return -1; + } + nr_sockets = info.nr_cpus / info.threads_per_core / info.cores_per_socket; + + rc = libxl_pqos_monitor_get_total_rmid(ctx, &total_rmid); + if (rc < 0) { + printf("failed to get system total rmid number\n"); + return -1; + } + + rc = libxl_pqos_monitor_get_l3_cache_size(ctx, &l3_cache_size); + if (rc < 0) { + printf("failed to get system l3 cache size\n"); + return -1; + } + + printf("Total RMID: %d\n", total_rmid); + printf("Per-Socket L3 Cache Size: %d KB\n", l3_cache_size); + + print_header = 1; + for (domid = first_domain; domid < first_domain + nr_domains; domid++) { + if (!libxl_pqos_monitor_domain_attached(ctx, domid)) { + if (!ignore_domain_err) + printf("No CQM info for Domain %d.\n", domid); + continue; + } + if (print_header) { + printf("Name ID"); + for (socketid = 0; socketid < nr_sockets; socketid++) + printf("\tSocketID\tL3C_Usage"); + printf("\n"); + print_header = 0; + } + domain_name = libxl_domid_to_name(ctx, domid); + printf("%-40s %5d", domain_name, domid); + free(domain_name); + for (socketid = 0; socketid < nr_sockets; socketid++) { + rc = libxl_pqos_monitor_get_cache_occupancy(ctx, domid, socketid, + &l3_cache_occupancy); + printf("%10u %13lu KB ", socketid, l3_cache_occupancy/1024); + } + printf("\n"); + } + + return 0; +} + +int main_pqos_monitor_attach(int argc, char **argv) +{ + uint32_t domid; + int opt, ret = 0; + + SWITCH_FOREACH_OPT(opt, "", NULL, "pqos-monitor-attach", 1) { + /* No options */ + } + + domid = find_domain(argv[optind]); + ret = libxl_pqos_monitor_attach(ctx, domid); + + return ret; +} + +int main_pqos_monitor_detach(int argc, char **argv) +{ + uint32_t domid; + int opt, ret = 0; + + SWITCH_FOREACH_OPT(opt, "", NULL, "pqos-monitor-detach", 1) { + /* No options */ + } + + domid = find_domain(argv[optind]); + ret = libxl_pqos_monitor_detach(ctx, domid); + + return ret; +} + +int main_pqos_monitor_show(int argc, char **argv) +{ + int opt, ret = 0; + uint32_t first_domain, nr_domains; + libxl_pqos_monitor_type type; + + SWITCH_FOREACH_OPT(opt, "", NULL, "pqos-monitor-show", 1) { + /* No options */ + } + + libxl_pqos_monitor_type_from_string(argv[optind], &type); + + if (optind + 1 >= argc) { + first_domain = 0; + nr_domains = 1024; + } else if (optind + 1 == argc - 1){ + first_domain = find_domain(argv[optind + 1]); + nr_domains = 1; + } else { + help("pqos-monitor-show"); + return 2; + } + + switch (type) { + case LIBXL_PQOS_MONITOR_TYPE_CACHE_OCCUPANCY: + ret = pqos_monitor_show_cache_occupancy(first_domain, nr_domains, + nr_domains == 1024); + break; + default: + help("pqos-monitor-show"); + return 2; + } + + return ret; +} + /* * Local variables: * mode: C diff --git a/tools/libxl/xl_cmdtable.c b/tools/libxl/xl_cmdtable.c index 4279b9f..a2f8e9a 100644 --- a/tools/libxl/xl_cmdtable.c +++ b/tools/libxl/xl_cmdtable.c @@ -500,6 +500,23 @@ struct cmd_spec cmd_table[] = { "[options]", "-F Run in the foreground", }, + { "pqos-monitor-attach", + &main_pqos_monitor_attach, 0, 1, + "Attach platform QoS monitoring to a domain", + "<Domain>", + }, + { "pqos-monitor-detach", + &main_pqos_monitor_detach, 0, 1, + "Detach platform QoS monitoring from a domain", + "<Domain>", + }, + { "pqos-monitor-show", + &main_pqos_monitor_show, 0, 1, + "Show platform QoS monitoring information, current supported QoS monitor " + "types are:\n" + "\"cache_occupancy\": cache QoS monitoring, showing the L3 cache occupancy", + "<QoS-Monitor-Type> <Domain>", + }, }; int cmdtable_len = sizeof(cmd_table)/sizeof(struct cmd_spec); -- 1.7.9.5 _______________________________________________ Xen-devel mailing list Xen-devel@xxxxxxxxxxxxx http://lists.xen.org/xen-devel
|
Lists.xenproject.org is hosted with RackSpace, monitoring our |