| Message ID | 20230523074326.3035745-10-luca.fancellu@arm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | SVE feature for arm guests | expand |
On Tue, May 23, 2023 at 08:43:23AM +0100, Luca Fancellu wrote: > On Arm, the SVE vector length is encoded in arch_capabilities field > of struct xen_sysctl_physinfo, make use of this field in the tools > when building for arm. > > Create header arm-arch-capabilities.h to handle the arch_capabilities > field of physinfo for Arm. > > Removed include for xen-tools/common-macros.h in > python/xen/lowlevel/xc/xc.c because it is already included by the > arm-arch-capabilities.h header. > > Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> > Acked-by: George Dunlap <george.dunlap@citrix.com> > Acked-by: Christian Lindig <christian.lindig@cloud.com> > Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> > --- > Changes from v6: > - Fix licence header in arm-atch-capabilities.h, add R-by (Anthony) > Changes from v5: > - no changes > Changes from v4: > - Move arm-arch-capabilities.h into xen-tools/, add LIBXL_HAVE_, > fixed python return type to I instead of i. (Anthony) > Changes from v3: > - add Ack-by for the Golang bits (George) > - add Ack-by for the OCaml tools (Christian) > - now xen-tools/libs.h is named xen-tools/common-macros.h > - changed commit message to explain why the header modification > in python/xen/lowlevel/xc/xc.c > Changes from v2: > - rename arm_arch_capabilities.h in arm-arch-capabilities.h, use > MASK_EXTR. > - Now arm-arch-capabilities.h needs MASK_EXTR macro, but it is > defined in libxl_internal.h, it doesn't feel right to include > that header so move MASK_EXTR into xen-tools/libs.h that is also > included in libxl_internal.h > Changes from v1: > - now SVE VL is encoded in arch_capabilities on Arm > Changes from RFC: > - new patch > --- > tools/golang/xenlight/helpers.gen.go | 2 ++ > tools/golang/xenlight/types.gen.go | 1 + > tools/include/libxl.h | 6 ++++ > .../include/xen-tools/arm-arch-capabilities.h | 28 +++++++++++++++++++ > tools/include/xen-tools/common-macros.h | 2 ++ > tools/libs/light/libxl.c | 1 + > tools/libs/light/libxl_internal.h | 1 - > tools/libs/light/libxl_types.idl | 1 + > tools/ocaml/libs/xc/xenctrl.ml | 4 +-- > tools/ocaml/libs/xc/xenctrl.mli | 4 +-- > tools/ocaml/libs/xc/xenctrl_stubs.c | 8 ++++-- > tools/python/xen/lowlevel/xc/xc.c | 8 ++++-- > tools/xl/xl_info.c | 8 ++++++ > 13 files changed, 62 insertions(+), 12 deletions(-) > create mode 100644 tools/include/xen-tools/arm-arch-capabilities.h > (...) > diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c > index 9728b34185ac..b3699fdac58e 100644 > --- a/tools/python/xen/lowlevel/xc/xc.c > +++ b/tools/python/xen/lowlevel/xc/xc.c > @@ -22,6 +22,7 @@ > #include <xen/hvm/hvm_info_table.h> > #include <xen/hvm/params.h> > > +#include <xen-tools/arm-arch-capabilities.h> > #include <xen-tools/common-macros.h> > > /* Needed for Python versions earlier than 2.3. */ > @@ -897,7 +898,7 @@ static PyObject *pyxc_physinfo(XcObject *self) > if ( p != virt_caps ) > *(p-1) = '\0'; > > - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", > + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", > "nr_nodes", pinfo.nr_nodes, > "threads_per_core", pinfo.threads_per_core, > "cores_per_socket", pinfo.cores_per_socket, > @@ -907,7 +908,10 @@ static PyObject *pyxc_physinfo(XcObject *self) > "scrub_memory", pages_to_kib(pinfo.scrub_pages), > "cpu_khz", pinfo.cpu_khz, > "hw_caps", cpu_cap, > - "virt_caps", virt_caps); > + "virt_caps", virt_caps, > + "arm_sve_vl", > + arch_capabilities_arm_sve(pinfo.arch_capabilities) > + ); This should be added only when building for ARM, similar as for other bindings. > } > > static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds)
> On 25 May 2023, at 09:39, Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com> wrote: > > On Tue, May 23, 2023 at 08:43:23AM +0100, Luca Fancellu wrote: >> On Arm, the SVE vector length is encoded in arch_capabilities field >> of struct xen_sysctl_physinfo, make use of this field in the tools >> when building for arm. >> >> Create header arm-arch-capabilities.h to handle the arch_capabilities >> field of physinfo for Arm. >> >> Removed include for xen-tools/common-macros.h in >> python/xen/lowlevel/xc/xc.c because it is already included by the >> arm-arch-capabilities.h header. >> >> Signed-off-by: Luca Fancellu <luca.fancellu@arm.com> >> Acked-by: George Dunlap <george.dunlap@citrix.com> >> Acked-by: Christian Lindig <christian.lindig@cloud.com> >> Reviewed-by: Anthony PERARD <anthony.perard@citrix.com> >> --- >> Changes from v6: >> - Fix licence header in arm-atch-capabilities.h, add R-by (Anthony) >> Changes from v5: >> - no changes >> Changes from v4: >> - Move arm-arch-capabilities.h into xen-tools/, add LIBXL_HAVE_, >> fixed python return type to I instead of i. (Anthony) >> Changes from v3: >> - add Ack-by for the Golang bits (George) >> - add Ack-by for the OCaml tools (Christian) >> - now xen-tools/libs.h is named xen-tools/common-macros.h >> - changed commit message to explain why the header modification >> in python/xen/lowlevel/xc/xc.c >> Changes from v2: >> - rename arm_arch_capabilities.h in arm-arch-capabilities.h, use >> MASK_EXTR. >> - Now arm-arch-capabilities.h needs MASK_EXTR macro, but it is >> defined in libxl_internal.h, it doesn't feel right to include >> that header so move MASK_EXTR into xen-tools/libs.h that is also >> included in libxl_internal.h >> Changes from v1: >> - now SVE VL is encoded in arch_capabilities on Arm >> Changes from RFC: >> - new patch >> --- >> tools/golang/xenlight/helpers.gen.go | 2 ++ >> tools/golang/xenlight/types.gen.go | 1 + >> tools/include/libxl.h | 6 ++++ >> .../include/xen-tools/arm-arch-capabilities.h | 28 +++++++++++++++++++ >> tools/include/xen-tools/common-macros.h | 2 ++ >> tools/libs/light/libxl.c | 1 + >> tools/libs/light/libxl_internal.h | 1 - >> tools/libs/light/libxl_types.idl | 1 + >> tools/ocaml/libs/xc/xenctrl.ml | 4 +-- >> tools/ocaml/libs/xc/xenctrl.mli | 4 +-- >> tools/ocaml/libs/xc/xenctrl_stubs.c | 8 ++++-- >> tools/python/xen/lowlevel/xc/xc.c | 8 ++++-- >> tools/xl/xl_info.c | 8 ++++++ >> 13 files changed, 62 insertions(+), 12 deletions(-) >> create mode 100644 tools/include/xen-tools/arm-arch-capabilities.h >> > > (...) > >> diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c >> index 9728b34185ac..b3699fdac58e 100644 >> --- a/tools/python/xen/lowlevel/xc/xc.c >> +++ b/tools/python/xen/lowlevel/xc/xc.c >> @@ -22,6 +22,7 @@ >> #include <xen/hvm/hvm_info_table.h> >> #include <xen/hvm/params.h> >> >> +#include <xen-tools/arm-arch-capabilities.h> >> #include <xen-tools/common-macros.h> >> >> /* Needed for Python versions earlier than 2.3. */ >> @@ -897,7 +898,7 @@ static PyObject *pyxc_physinfo(XcObject *self) >> if ( p != virt_caps ) >> *(p-1) = '\0'; >> >> - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", >> + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", >> "nr_nodes", pinfo.nr_nodes, >> "threads_per_core", pinfo.threads_per_core, >> "cores_per_socket", pinfo.cores_per_socket, >> @@ -907,7 +908,10 @@ static PyObject *pyxc_physinfo(XcObject *self) >> "scrub_memory", pages_to_kib(pinfo.scrub_pages), >> "cpu_khz", pinfo.cpu_khz, >> "hw_caps", cpu_cap, >> - "virt_caps", virt_caps); >> + "virt_caps", virt_caps, >> + "arm_sve_vl", >> + arch_capabilities_arm_sve(pinfo.arch_capabilities) >> + ); > > This should be added only when building for ARM, similar as for other > bindings. Hi Marek, Thank you for taking the time to review this, are you ok if I make these changes to the code? diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index b3699fdac58e..c7f690189770 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -872,6 +872,8 @@ static PyObject *pyxc_physinfo(XcObject *self) const char *virtcap_names[] = { "hvm", "pv" }; const unsigned virtcaps_bits[] = { XEN_SYSCTL_PHYSCAP_hvm, XEN_SYSCTL_PHYSCAP_pv }; + PyObject *objret; + int retcode; if ( xc_physinfo(self->xc_handle, &pinfo) != 0 ) return pyxc_error_to_exception(self->xc_handle); @@ -898,20 +900,31 @@ static PyObject *pyxc_physinfo(XcObject *self) if ( p != virt_caps ) *(p-1) = '\0'; - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", - "nr_nodes", pinfo.nr_nodes, - "threads_per_core", pinfo.threads_per_core, - "cores_per_socket", pinfo.cores_per_socket, - "nr_cpus", pinfo.nr_cpus, - "total_memory", pages_to_kib(pinfo.total_pages), - "free_memory", pages_to_kib(pinfo.free_pages), - "scrub_memory", pages_to_kib(pinfo.scrub_pages), - "cpu_khz", pinfo.cpu_khz, - "hw_caps", cpu_cap, - "virt_caps", virt_caps, - "arm_sve_vl", - arch_capabilities_arm_sve(pinfo.arch_capabilities) + objret = Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", + "nr_nodes", pinfo.nr_nodes, + "threads_per_core", pinfo.threads_per_core, + "cores_per_socket", pinfo.cores_per_socket, + "nr_cpus", pinfo.nr_cpus, + "total_memory", pages_to_kib(pinfo.total_pages), + "free_memory", pages_to_kib(pinfo.free_pages), + "scrub_memory", pages_to_kib(pinfo.scrub_pages), + "cpu_khz", pinfo.cpu_khz, + "hw_caps", cpu_cap, + "virt_caps", virt_caps ); + + #if defined(__aarch64__) + if (objret) { + retcode = PyDict_SetItemString( + objret, "arm_sve_vl", + arch_capabilities_arm_sve(pinfo.arch_capabilities) + ); + if ( retcode < 0 ) + return NULL; + } + #endif + + return objret; } static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) Please notice that now we can have a path that could return NULL, are you ok for It or should I just ignore the return code for PyDict_SetItemString? Also, do you want me to protect the include to <xen-tools/arm-arch-capabilities.h> with ifdef? > >> } >> >> static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) > > -- > Best Regards, > Marek Marczykowski-Górecki > Invisible Things Lab
>> >> (...) >> >>> diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c >>> index 9728b34185ac..b3699fdac58e 100644 >>> --- a/tools/python/xen/lowlevel/xc/xc.c >>> +++ b/tools/python/xen/lowlevel/xc/xc.c >>> @@ -22,6 +22,7 @@ >>> #include <xen/hvm/hvm_info_table.h> >>> #include <xen/hvm/params.h> >>> >>> +#include <xen-tools/arm-arch-capabilities.h> >>> #include <xen-tools/common-macros.h> >>> >>> /* Needed for Python versions earlier than 2.3. */ >>> @@ -897,7 +898,7 @@ static PyObject *pyxc_physinfo(XcObject *self) >>> if ( p != virt_caps ) >>> *(p-1) = '\0'; >>> >>> - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", >>> + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", >>> "nr_nodes", pinfo.nr_nodes, >>> "threads_per_core", pinfo.threads_per_core, >>> "cores_per_socket", pinfo.cores_per_socket, >>> @@ -907,7 +908,10 @@ static PyObject *pyxc_physinfo(XcObject *self) >>> "scrub_memory", pages_to_kib(pinfo.scrub_pages), >>> "cpu_khz", pinfo.cpu_khz, >>> "hw_caps", cpu_cap, >>> - "virt_caps", virt_caps); >>> + "virt_caps", virt_caps, >>> + "arm_sve_vl", >>> + arch_capabilities_arm_sve(pinfo.arch_capabilities) >>> + ); >> >> This should be added only when building for ARM, similar as for other >> bindings. > > Hi Marek, > > Thank you for taking the time to review this, are you ok if I make these changes to the code? > > diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c > index b3699fdac58e..c7f690189770 100644 > --- a/tools/python/xen/lowlevel/xc/xc.c > +++ b/tools/python/xen/lowlevel/xc/xc.c > @@ -872,6 +872,8 @@ static PyObject *pyxc_physinfo(XcObject *self) > const char *virtcap_names[] = { "hvm", "pv" }; > const unsigned virtcaps_bits[] = { XEN_SYSCTL_PHYSCAP_hvm, > XEN_SYSCTL_PHYSCAP_pv }; > + PyObject *objret; > + int retcode; > > if ( xc_physinfo(self->xc_handle, &pinfo) != 0 ) > return pyxc_error_to_exception(self->xc_handle); > @@ -898,20 +900,31 @@ static PyObject *pyxc_physinfo(XcObject *self) > if ( p != virt_caps ) > *(p-1) = '\0'; > > - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", > - "nr_nodes", pinfo.nr_nodes, > - "threads_per_core", pinfo.threads_per_core, > - "cores_per_socket", pinfo.cores_per_socket, > - "nr_cpus", pinfo.nr_cpus, > - "total_memory", pages_to_kib(pinfo.total_pages), > - "free_memory", pages_to_kib(pinfo.free_pages), > - "scrub_memory", pages_to_kib(pinfo.scrub_pages), > - "cpu_khz", pinfo.cpu_khz, > - "hw_caps", cpu_cap, > - "virt_caps", virt_caps, > - "arm_sve_vl", > - arch_capabilities_arm_sve(pinfo.arch_capabilities) > + objret = Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", > + "nr_nodes", pinfo.nr_nodes, > + "threads_per_core", pinfo.threads_per_core, > + "cores_per_socket", pinfo.cores_per_socket, > + "nr_cpus", pinfo.nr_cpus, > + "total_memory", pages_to_kib(pinfo.total_pages), > + "free_memory", pages_to_kib(pinfo.free_pages), > + "scrub_memory", pages_to_kib(pinfo.scrub_pages), > + "cpu_khz", pinfo.cpu_khz, > + "hw_caps", cpu_cap, > + "virt_caps", virt_caps > ); > + > + #if defined(__aarch64__) > + if (objret) { > + retcode = PyDict_SetItemString( > + objret, "arm_sve_vl", > + arch_capabilities_arm_sve(pinfo.arch_capabilities) > + ); > + if ( retcode < 0 ) > + return NULL; > + } > + #endif > + > + return objret; > } > > static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) > > > Please notice that now we can have a path that could return NULL, are you ok for > It or should I just ignore the return code for PyDict_SetItemString? > > Also, do you want me to protect the include to <xen-tools/arm-arch-capabilities.h> > with ifdef? > EDIT: I saw this doesn’t even compile, I will ask later when I will have something working, I saw PyDict_SetItemString is used somewhere else so I will use that approach before Proposing you a solution >> >>> } >>> >>> static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) >> >> -- >> Best Regards, >> Marek Marczykowski-Górecki >> Invisible Things Lab
> On 25 May 2023, at 10:21, Luca Fancellu <Luca.Fancellu@arm.com> wrote: > >>> >>> (...) >>> >>>> diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c >>>> index 9728b34185ac..b3699fdac58e 100644 >>>> --- a/tools/python/xen/lowlevel/xc/xc.c >>>> +++ b/tools/python/xen/lowlevel/xc/xc.c >>>> @@ -22,6 +22,7 @@ >>>> #include <xen/hvm/hvm_info_table.h> >>>> #include <xen/hvm/params.h> >>>> >>>> +#include <xen-tools/arm-arch-capabilities.h> >>>> #include <xen-tools/common-macros.h> >>>> >>>> /* Needed for Python versions earlier than 2.3. */ >>>> @@ -897,7 +898,7 @@ static PyObject *pyxc_physinfo(XcObject *self) >>>> if ( p != virt_caps ) >>>> *(p-1) = '\0'; >>>> >>>> - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", >>>> + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", >>>> "nr_nodes", pinfo.nr_nodes, >>>> "threads_per_core", pinfo.threads_per_core, >>>> "cores_per_socket", pinfo.cores_per_socket, >>>> @@ -907,7 +908,10 @@ static PyObject *pyxc_physinfo(XcObject *self) >>>> "scrub_memory", pages_to_kib(pinfo.scrub_pages), >>>> "cpu_khz", pinfo.cpu_khz, >>>> "hw_caps", cpu_cap, >>>> - "virt_caps", virt_caps); >>>> + "virt_caps", virt_caps, >>>> + "arm_sve_vl", >>>> + arch_capabilities_arm_sve(pinfo.arch_capabilities) >>>> + ); >>> >>> This should be added only when building for ARM, similar as for other >>> bindings. >> >> Hi Marek, >> >> Thank you for taking the time to review this, are you ok if I make these changes to the code? >> >> diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c >> index b3699fdac58e..c7f690189770 100644 >> --- a/tools/python/xen/lowlevel/xc/xc.c >> +++ b/tools/python/xen/lowlevel/xc/xc.c >> @@ -872,6 +872,8 @@ static PyObject *pyxc_physinfo(XcObject *self) >> const char *virtcap_names[] = { "hvm", "pv" }; >> const unsigned virtcaps_bits[] = { XEN_SYSCTL_PHYSCAP_hvm, >> XEN_SYSCTL_PHYSCAP_pv }; >> + PyObject *objret; >> + int retcode; >> >> if ( xc_physinfo(self->xc_handle, &pinfo) != 0 ) >> return pyxc_error_to_exception(self->xc_handle); >> @@ -898,20 +900,31 @@ static PyObject *pyxc_physinfo(XcObject *self) >> if ( p != virt_caps ) >> *(p-1) = '\0'; >> >> - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", >> - "nr_nodes", pinfo.nr_nodes, >> - "threads_per_core", pinfo.threads_per_core, >> - "cores_per_socket", pinfo.cores_per_socket, >> - "nr_cpus", pinfo.nr_cpus, >> - "total_memory", pages_to_kib(pinfo.total_pages), >> - "free_memory", pages_to_kib(pinfo.free_pages), >> - "scrub_memory", pages_to_kib(pinfo.scrub_pages), >> - "cpu_khz", pinfo.cpu_khz, >> - "hw_caps", cpu_cap, >> - "virt_caps", virt_caps, >> - "arm_sve_vl", >> - arch_capabilities_arm_sve(pinfo.arch_capabilities) >> + objret = Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", >> + "nr_nodes", pinfo.nr_nodes, >> + "threads_per_core", pinfo.threads_per_core, >> + "cores_per_socket", pinfo.cores_per_socket, >> + "nr_cpus", pinfo.nr_cpus, >> + "total_memory", pages_to_kib(pinfo.total_pages), >> + "free_memory", pages_to_kib(pinfo.free_pages), >> + "scrub_memory", pages_to_kib(pinfo.scrub_pages), >> + "cpu_khz", pinfo.cpu_khz, >> + "hw_caps", cpu_cap, >> + "virt_caps", virt_caps >> ); >> + >> + #if defined(__aarch64__) >> + if (objret) { >> + retcode = PyDict_SetItemString( >> + objret, "arm_sve_vl", >> + arch_capabilities_arm_sve(pinfo.arch_capabilities) >> + ); >> + if ( retcode < 0 ) >> + return NULL; >> + } >> + #endif >> + >> + return objret; >> } >> >> static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) >> >> >> Please notice that now we can have a path that could return NULL, are you ok for >> It or should I just ignore the return code for PyDict_SetItemString? >> >> Also, do you want me to protect the include to <xen-tools/arm-arch-capabilities.h> >> with ifdef? >> > > EDIT: I saw this doesn’t even compile, I will ask later when I will have something working, > I saw PyDict_SetItemString is used somewhere else so I will use that approach before > Proposing you a solution > > Ok, so this is my proposed solution: diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index b3699fdac58e..e52aa88f3c5f 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -872,6 +872,7 @@ static PyObject *pyxc_physinfo(XcObject *self) const char *virtcap_names[] = { "hvm", "pv" }; const unsigned virtcaps_bits[] = { XEN_SYSCTL_PHYSCAP_hvm, XEN_SYSCTL_PHYSCAP_pv }; + PyObject *objret; if ( xc_physinfo(self->xc_handle, &pinfo) != 0 ) return pyxc_error_to_exception(self->xc_handle); @@ -898,20 +899,36 @@ static PyObject *pyxc_physinfo(XcObject *self) if ( p != virt_caps ) *(p-1) = '\0'; - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", - "nr_nodes", pinfo.nr_nodes, - "threads_per_core", pinfo.threads_per_core, - "cores_per_socket", pinfo.cores_per_socket, - "nr_cpus", pinfo.nr_cpus, - "total_memory", pages_to_kib(pinfo.total_pages), - "free_memory", pages_to_kib(pinfo.free_pages), - "scrub_memory", pages_to_kib(pinfo.scrub_pages), - "cpu_khz", pinfo.cpu_khz, - "hw_caps", cpu_cap, - "virt_caps", virt_caps, - "arm_sve_vl", - arch_capabilities_arm_sve(pinfo.arch_capabilities) + objret = Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", + "nr_nodes", pinfo.nr_nodes, + "threads_per_core", pinfo.threads_per_core, + "cores_per_socket", pinfo.cores_per_socket, + "nr_cpus", pinfo.nr_cpus, + "total_memory", pages_to_kib(pinfo.total_pages), + "free_memory", pages_to_kib(pinfo.free_pages), + "scrub_memory", pages_to_kib(pinfo.scrub_pages), + "cpu_khz", pinfo.cpu_khz, + "hw_caps", cpu_cap, + "virt_caps", virt_caps ); + + #if defined(__aarch64__) + if ( objret ) { + unsigned int sve_vl_bits; + PyObject *py_arm_sve_vl; + + sve_vl_bits = arch_capabilities_arm_sve(pinfo.arch_capabilities); + py_arm_sve_vl = PyLong_FromUnsignedLong(sve_vl_bits); + + if ( !py_arm_sve_vl ) + return NULL; + + if( PyDict_SetItemString(objret, "arm_sve_vl", py_arm_sve_vl) ) + return NULL; + } + #endif + + return objret; } static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) Would it work for you? > >>> >>>> } >>>> >>>> static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) >>> >>> -- >>> Best Regards, >>> Marek Marczykowski-Górecki >>> Invisible Things Lab
diff --git a/tools/golang/xenlight/helpers.gen.go b/tools/golang/xenlight/helpers.gen.go index 0a203d22321f..35397be2f9e2 100644 --- a/tools/golang/xenlight/helpers.gen.go +++ b/tools/golang/xenlight/helpers.gen.go @@ -3506,6 +3506,7 @@ x.CapVmtrace = bool(xc.cap_vmtrace) x.CapVpmu = bool(xc.cap_vpmu) x.CapGnttabV1 = bool(xc.cap_gnttab_v1) x.CapGnttabV2 = bool(xc.cap_gnttab_v2) +x.ArchCapabilities = uint32(xc.arch_capabilities) return nil} @@ -3540,6 +3541,7 @@ xc.cap_vmtrace = C.bool(x.CapVmtrace) xc.cap_vpmu = C.bool(x.CapVpmu) xc.cap_gnttab_v1 = C.bool(x.CapGnttabV1) xc.cap_gnttab_v2 = C.bool(x.CapGnttabV2) +xc.arch_capabilities = C.uint32_t(x.ArchCapabilities) return nil } diff --git a/tools/golang/xenlight/types.gen.go b/tools/golang/xenlight/types.gen.go index a7c17699f80e..3d968a496744 100644 --- a/tools/golang/xenlight/types.gen.go +++ b/tools/golang/xenlight/types.gen.go @@ -1079,6 +1079,7 @@ CapVmtrace bool CapVpmu bool CapGnttabV1 bool CapGnttabV2 bool +ArchCapabilities uint32 } type Connectorinfo struct { diff --git a/tools/include/libxl.h b/tools/include/libxl.h index cfa1a191318c..4fa09ff7635a 100644 --- a/tools/include/libxl.h +++ b/tools/include/libxl.h @@ -525,6 +525,12 @@ */ #define LIBXL_HAVE_PHYSINFO_CAP_GNTTAB 1 +/* + * LIBXL_HAVE_PHYSINFO_ARCH_CAPABILITIES indicates that libxl_physinfo has a + * arch_capabilities field. + */ +#define LIBXL_HAVE_PHYSINFO_ARCH_CAPABILITIES 1 + /* * LIBXL_HAVE_MAX_GRANT_VERSION indicates libxl_domain_build_info has a * max_grant_version field for setting the max grant table version per diff --git a/tools/include/xen-tools/arm-arch-capabilities.h b/tools/include/xen-tools/arm-arch-capabilities.h new file mode 100644 index 000000000000..3849e897925d --- /dev/null +++ b/tools/include/xen-tools/arm-arch-capabilities.h @@ -0,0 +1,28 @@ +/* SPDX-License-Identifier: LGPL-2.1-only */ +/* + * Copyright (C) 2023 ARM Ltd. + */ + +#ifndef ARM_ARCH_CAPABILITIES_H +#define ARM_ARCH_CAPABILITIES_H + +#include <stdint.h> +#include <xen/sysctl.h> + +#include <xen-tools/common-macros.h> + +static inline +unsigned int arch_capabilities_arm_sve(unsigned int arch_capabilities) +{ +#if defined(__aarch64__) + unsigned int sve_vl = MASK_EXTR(arch_capabilities, + XEN_SYSCTL_PHYSCAP_ARM_SVE_MASK); + + /* Vector length is divided by 128 before storing it in arch_capabilities */ + return sve_vl * 128U; +#else + return 0; +#endif +} + +#endif /* ARM_ARCH_CAPABILITIES_H */ diff --git a/tools/include/xen-tools/common-macros.h b/tools/include/xen-tools/common-macros.h index 76b55bf62085..d53b88182560 100644 --- a/tools/include/xen-tools/common-macros.h +++ b/tools/include/xen-tools/common-macros.h @@ -72,6 +72,8 @@ #define ROUNDUP(_x,_w) (((unsigned long)(_x)+(1UL<<(_w))-1) & ~((1UL<<(_w))-1)) #endif +#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) + #ifndef __must_check #define __must_check __attribute__((__warn_unused_result__)) #endif diff --git a/tools/libs/light/libxl.c b/tools/libs/light/libxl.c index a0bf7d186f69..175d6dde0b80 100644 --- a/tools/libs/light/libxl.c +++ b/tools/libs/light/libxl.c @@ -409,6 +409,7 @@ int libxl_get_physinfo(libxl_ctx *ctx, libxl_physinfo *physinfo) !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_gnttab_v1); physinfo->cap_gnttab_v2 = !!(xcphysinfo.capabilities & XEN_SYSCTL_PHYSCAP_gnttab_v2); + physinfo->arch_capabilities = xcphysinfo.arch_capabilities; GC_FREE; return 0; diff --git a/tools/libs/light/libxl_internal.h b/tools/libs/light/libxl_internal.h index 5244fde6239a..8aba3e138909 100644 --- a/tools/libs/light/libxl_internal.h +++ b/tools/libs/light/libxl_internal.h @@ -132,7 +132,6 @@ #define DIV_ROUNDUP(n, d) (((n) + (d) - 1) / (d)) -#define MASK_EXTR(v, m) (((v) & (m)) / ((m) & -(m))) #define MASK_INSR(v, m) (((v) * ((m) & -(m))) & (m)) #define LIBXL__LOGGING_ENABLED diff --git a/tools/libs/light/libxl_types.idl b/tools/libs/light/libxl_types.idl index c10292e0d7e3..fd31dacf7d5a 100644 --- a/tools/libs/light/libxl_types.idl +++ b/tools/libs/light/libxl_types.idl @@ -1133,6 +1133,7 @@ libxl_physinfo = Struct("physinfo", [ ("cap_vpmu", bool), ("cap_gnttab_v1", bool), ("cap_gnttab_v2", bool), + ("arch_capabilities", uint32), ], dir=DIR_OUT) libxl_connectorinfo = Struct("connectorinfo", [ diff --git a/tools/ocaml/libs/xc/xenctrl.ml b/tools/ocaml/libs/xc/xenctrl.ml index e4096bf92c1d..bf23ca50bb15 100644 --- a/tools/ocaml/libs/xc/xenctrl.ml +++ b/tools/ocaml/libs/xc/xenctrl.ml @@ -128,12 +128,10 @@ type physinfo_cap_flag = | CAP_Gnttab_v1 | CAP_Gnttab_v2 -type arm_physinfo_cap_flag - type x86_physinfo_cap_flag type arch_physinfo_cap_flags = - | ARM of arm_physinfo_cap_flag list + | ARM of int | X86 of x86_physinfo_cap_flag list type physinfo = diff --git a/tools/ocaml/libs/xc/xenctrl.mli b/tools/ocaml/libs/xc/xenctrl.mli index ef2254537430..ed1e28ea30a0 100644 --- a/tools/ocaml/libs/xc/xenctrl.mli +++ b/tools/ocaml/libs/xc/xenctrl.mli @@ -113,12 +113,10 @@ type physinfo_cap_flag = | CAP_Gnttab_v1 | CAP_Gnttab_v2 -type arm_physinfo_cap_flag - type x86_physinfo_cap_flag type arch_physinfo_cap_flags = - | ARM of arm_physinfo_cap_flag list + | ARM of int | X86 of x86_physinfo_cap_flag list type physinfo = { diff --git a/tools/ocaml/libs/xc/xenctrl_stubs.c b/tools/ocaml/libs/xc/xenctrl_stubs.c index f686db3124ee..a03da31f6f2c 100644 --- a/tools/ocaml/libs/xc/xenctrl_stubs.c +++ b/tools/ocaml/libs/xc/xenctrl_stubs.c @@ -851,13 +851,15 @@ CAMLprim value stub_xc_physinfo(value xch_val) arch_cap_list = Tag_cons; arch_cap_flags_tag = 1; /* tag x86 */ -#else - caml_failwith("Unhandled architecture"); -#endif arch_cap_flags = caml_alloc_small(1, arch_cap_flags_tag); Store_field(arch_cap_flags, 0, arch_cap_list); Store_field(physinfo, 10, arch_cap_flags); +#elif defined(__aarch64__) + Store_field(physinfo, 10, Val_int(c_physinfo.arch_capabilities)); +#else + caml_failwith("Unhandled architecture"); +#endif CAMLreturn(physinfo); } diff --git a/tools/python/xen/lowlevel/xc/xc.c b/tools/python/xen/lowlevel/xc/xc.c index 9728b34185ac..b3699fdac58e 100644 --- a/tools/python/xen/lowlevel/xc/xc.c +++ b/tools/python/xen/lowlevel/xc/xc.c @@ -22,6 +22,7 @@ #include <xen/hvm/hvm_info_table.h> #include <xen/hvm/params.h> +#include <xen-tools/arm-arch-capabilities.h> #include <xen-tools/common-macros.h> /* Needed for Python versions earlier than 2.3. */ @@ -897,7 +898,7 @@ static PyObject *pyxc_physinfo(XcObject *self) if ( p != virt_caps ) *(p-1) = '\0'; - return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s}", + return Py_BuildValue("{s:i,s:i,s:i,s:i,s:l,s:l,s:l,s:i,s:s,s:s,s:I}", "nr_nodes", pinfo.nr_nodes, "threads_per_core", pinfo.threads_per_core, "cores_per_socket", pinfo.cores_per_socket, @@ -907,7 +908,10 @@ static PyObject *pyxc_physinfo(XcObject *self) "scrub_memory", pages_to_kib(pinfo.scrub_pages), "cpu_khz", pinfo.cpu_khz, "hw_caps", cpu_cap, - "virt_caps", virt_caps); + "virt_caps", virt_caps, + "arm_sve_vl", + arch_capabilities_arm_sve(pinfo.arch_capabilities) + ); } static PyObject *pyxc_getcpuinfo(XcObject *self, PyObject *args, PyObject *kwds) diff --git a/tools/xl/xl_info.c b/tools/xl/xl_info.c index 712b7638b013..ddc42f96b979 100644 --- a/tools/xl/xl_info.c +++ b/tools/xl/xl_info.c @@ -27,6 +27,7 @@ #include <libxl_json.h> #include <libxl_utils.h> #include <libxlutil.h> +#include <xen-tools/arm-arch-capabilities.h> #include "xl.h" #include "xl_utils.h" @@ -224,6 +225,13 @@ static void output_physinfo(void) info.cap_gnttab_v2 ? " gnttab-v2" : "" ); + /* Print arm SVE vector length only on ARM platforms */ +#if defined(__aarch64__) + maybe_printf("arm_sve_vector_length : %u\n", + arch_capabilities_arm_sve(info.arch_capabilities) + ); +#endif + vinfo = libxl_get_version_info(ctx); if (vinfo) { i = (1 << 20) / vinfo->pagesize;