From patchwork Tue Oct 12 08:13:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michal Orzel X-Patchwork-Id: 12551669 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 34430C4332F for ; Tue, 12 Oct 2021 08:14:09 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 02BFA60F23 for ; Tue, 12 Oct 2021 08:14:08 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 02BFA60F23 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.206862.362533 (Exim 4.92) (envelope-from ) id 1maCuy-0000Hn-F4; Tue, 12 Oct 2021 08:13:48 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 206862.362533; Tue, 12 Oct 2021 08:13:48 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maCuy-0000Hb-BN; Tue, 12 Oct 2021 08:13:48 +0000 Received: by outflank-mailman (input) for mailman id 206862; Tue, 12 Oct 2021 08:13:47 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1maCuw-0008RX-V8 for xen-devel@lists.xenproject.org; Tue, 12 Oct 2021 08:13:46 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 62797bfd-b31b-4777-b009-26179e934a09; Tue, 12 Oct 2021 08:13:44 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 506A6ED1; Tue, 12 Oct 2021 01:13:44 -0700 (PDT) Received: from e123311-lin.arm.com (unknown [10.57.27.99]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id E43823F694; Tue, 12 Oct 2021 01:13:40 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 62797bfd-b31b-4777-b009-26179e934a09 From: Michal Orzel To: xen-devel@lists.xenproject.org Cc: George Dunlap , Nick Rosbrook , Ian Jackson , Wei Liu , Andrew Cooper , Jan Beulich , Julien Grall , Stefano Stabellini , Anthony PERARD , Juergen Gross , Christian Lindig , David Scott , bertrand.marquis@arm.com Subject: [PATCH v5 1/3] xen+tools: Introduce XEN_SYSCTL_PHYSCAP_vpmu Date: Tue, 12 Oct 2021 10:13:21 +0200 Message-Id: <20211012081323.14141-2-michal.orzel@arm.com> X-Mailer: git-send-email 2.29.0 In-Reply-To: <20211012081323.14141-1-michal.orzel@arm.com> References: <20211012081323.14141-1-michal.orzel@arm.com> MIME-Version: 1.0 Introduce flag XEN_SYSCTL_PHYSCAP_vpmu which indicates whether the platform supports vPMU functionality. Modify Xen and tools accordingly. Take the opportunity and fix XEN_SYSCTL_PHYSCAP_vmtrace definition in sysctl.h which wrongly use (1 << 6) instead of (1u << 6). Signed-off-by: Michal Orzel Reviewed-by: Bertrand Marquis Acked-by: Nick Rosbrook Reviewed-by: Stefano Stabellini Acked-by: Ian Jackson --- Changes since v4: -none Changes since v3: -add spaces between brackets and keyword Changes since v2: -do not define bit position and mask separately Changes since v1: -new in v2 --- tools/golang/xenlight/helpers.gen.go | 2 ++ tools/golang/xenlight/types.gen.go | 1 + tools/include/libxl.h | 6 ++++++ tools/libs/light/libxl.c | 1 + tools/libs/light/libxl_types.idl | 1 + tools/ocaml/libs/xc/xenctrl.ml | 1 + tools/ocaml/libs/xc/xenctrl.mli | 1 + tools/xl/xl_info.c | 5 +++-- xen/common/domain.c | 2 ++ xen/common/sysctl.c | 3 +++ xen/include/public/sysctl.h | 6 ++++-- xen/include/xen/domain.h | 2 ++ 12 files changed, 27 insertions(+), 4 deletions(-) diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index bfc1e7f312..c8669837d8 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -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 } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index 09a3bb67e2..45f2cba3d2 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -1008,6 +1008,7 @@ CapHap bool CapShadow bool CapIommuHapPtShare bool CapVmtrace bool +CapVpmu bool } type Connectorinfo struct { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index b9ba16d698..ec5e3badae 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -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 * diff --git a/tools/libs/light/libxl.c b/tools/libs/light/libxl.c index 204eb0be2d..a032723fde 100644 --- a/tools/libs/light/libxl.c +++ b/tools/libs/light/libxl.c @@ -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; diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index 3f9fff653a..993e83acca 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -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", [ diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index 7ed1c00e47..7a4030a192 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -122,6 +122,7 @@ type physinfo_cap_flag = | CAP_Shadow | CAP_IOMMU_HAP_PT_SHARE | CAP_Vmtrace + | CAP_Vpmu type physinfo = { diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index 391d4abdf8..6900513e7f 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -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; diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index 8383e4a6df..2c86b317b7 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -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); diff --git a/xen/common/domain.c b/xen/common/domain.c index 40d67ec342..262b6c0c3c 100644 --- a/xen/common/domain.c +++ b/xen/common/domain.c @@ -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; diff --git a/xen/common/sysctl.c b/xen/common/sysctl.c index 3558641cd9..6e7189bb3c 100644 --- a/xen/common/sysctl.c +++ b/xen/common/sysctl.c @@ -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; } diff --git a/xen/include/public/sysctl.h b/xen/include/public/sysctl.h index 039ccf885c..fead0e5b53 100644 --- a/xen/include/public/sysctl.h +++ b/xen/include/public/sysctl.h @@ -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; diff --git a/xen/include/xen/domain.h b/xen/include/xen/domain.h index 1708c36964..160c8dbdab 100644 --- a/xen/include/xen/domain.h +++ b/xen/include/xen/domain.h @@ -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__ */