@@ -3360,6 +3360,7 @@ x.CapHap = bool(xc.cap_hap)
x.CapShadow = bool(xc.cap_shadow)
x.CapIommuHapPtShare = bool(xc.cap_iommu_hap_pt_share)
x.CapVmtrace = bool(xc.cap_vmtrace)
+x.CapVpmu = bool(xc.cap_vpmu)
return nil}
@@ -3391,6 +3392,7 @@ xc.cap_hap = C.bool(x.CapHap)
xc.cap_shadow = C.bool(x.CapShadow)
xc.cap_iommu_hap_pt_share = C.bool(x.CapIommuHapPtShare)
xc.cap_vmtrace = C.bool(x.CapVmtrace)
+xc.cap_vpmu = C.bool(x.CapVpmu)
return nil
}
@@ -1008,6 +1008,7 @@ CapHap bool
CapShadow bool
CapIommuHapPtShare bool
CapVmtrace bool
+CapVpmu bool
}
type Connectorinfo struct {
@@ -502,6 +502,12 @@
*/
#define LIBXL_HAVE_X86_MSR_RELAXED 1
+/*
+ * LIBXL_HAVE_PHYSINFO_CAP_VPMU indicates that libxl_physinfo has a cap_vpmu
+ * field, which indicates the availability of vPMU functionality.
+ */
+#define LIBXL_HAVE_PHYSINFO_CAP_VPMU 1
+
/*
* libxl ABI compatibility
*
@@ -404,6 +404,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo)
!!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share);
physinfo->cap_vmtrace =
!!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_vmtrace);
+ physinfo->cap_vpmu = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_vpmu);
GC_FREE;
return 0;
@@ -1061,6 +1061,7 @@ libxl_physinfo = Struct("physinfo", [
("cap_shadow", bool),
("cap_iommu_hap_pt_share", bool),
("cap_vmtrace", bool),
+ ("cap_vpmu", bool),
], dir=DIR_OUT)
libxl_connectorinfo = Struct("connectorinfo", [
@@ -122,6 +122,7 @@ type physinfo_cap_flag =
| CAP_Shadow
| CAP_IOMMU_HAP_PT_SHARE
| CAP_Vmtrace
+ | CAP_Vpmu
type physinfo =
{
@@ -107,6 +107,7 @@ type physinfo_cap_flag =
| CAP_Shadow
| CAP_IOMMU_HAP_PT_SHARE
| CAP_Vmtrace
+ | CAP_Vpmu
type physinfo = {
threads_per_core : int;
@@ -210,7 +210,7 @@ static void output_physinfo(void)
info.hw_cap[4], info.hw_cap[5], info.hw_cap[6], info.hw_cap[7]
);
- maybe_printf("virt_caps :%s%s%s%s%s%s%s%s\n",
+ maybe_printf("virt_caps :%s%s%s%s%s%s%s%s%s\n",
info.cap_pv ? " pv" : "",
info.cap_hvm ? " hvm" : "",
info.cap_hvm && info.cap_hvm_directio ? " hvm_directio" : "",
@@ -218,7 +218,8 @@ static void output_physinfo(void)
info.cap_hap ? " hap" : "",
info.cap_shadow ? " shadow" : "",
info.cap_iommu_hap_pt_share ? " iommu_hap_pt_share" : "",
- info.cap_vmtrace ? " vmtrace" : ""
+ info.cap_vmtrace ? " vmtrace" : "",
+ info.cap_vpmu ? " vpmu" : ""
);
vinfo = libxl_get_version_info(ctx);
@@ -84,6 +84,8 @@ vcpu_info_t dummy_vcpu_info;
bool __read_mostly vmtrace_available;
+bool __read_mostly vpmu_is_available;
+
static void __domain_finalise_shutdown(struct domain *d)
{
struct vcpu *v;
@@ -280,6 +280,9 @@ long do_sysctl(XEN_GUEST_HANDLE_PARAM(xen_sysctl_t) u_sysctl)
if ( vmtrace_available )
pi->capabilities |= XEN_SYSCTL_PHYSCAP_vmtrace;
+ if ( vpmu_is_available )
+ pi->capabilities |= XEN_SYSCTL_PHYSCAP_vpmu;
+
if ( copy_to_guest(u_sysctl, op, 1) )
ret = -EFAULT;
}
@@ -100,10 +100,12 @@ struct xen_sysctl_tbuf_op {
#define _XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share 5
#define XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share \
(1u << _XEN_SYSCTL_PHYSCAP_iommu_hap_pt_share)
-#define XEN_SYSCTL_PHYSCAP_vmtrace (1 << 6)
+#define XEN_SYSCTL_PHYSCAP_vmtrace (1u << 6)
+/* The platform supports vPMU. */
+#define XEN_SYSCTL_PHYSCAP_vpmu (1u << 7)
/* Max XEN_SYSCTL_PHYSCAP_* constant. Used for ABI checking. */
-#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_vmtrace
+#define XEN_SYSCTL_PHYSCAP_MAX XEN_SYSCTL_PHYSCAP_vpmu
struct xen_sysctl_physinfo {
uint32_t threads_per_core;
@@ -133,4 +133,6 @@ static inline void vnuma_destroy(struct vnuma_info *vnuma) { ASSERT(!vnuma); }
extern bool vmtrace_available;
+extern bool vpmu_is_available;
+
#endif /* __XEN_DOMAIN_H__ */