| Message ID | 20180223185729.8780-1-julien.grall@arm.com |
|---|---|
| Headers | show |
| Series | xen/arm: PSCI 1.1 and SMCCC-1.1 support and XSA-254 variant 2 update | expand |
On Fri, 23 Feb 2018, Julien Grall wrote: > Hi all, > > Arm has recently published a SMC Calling Convention (SMCCC) > specification update [1] that provides an optimised calling convention > and optional, discoverable support for mitigating CVE-2017-5715 (XSA-254 > variant 2). ARM Trusted Firmware (ATF) has already gained such an > implementation[2]. > > This series addresses a few things: > > - It provides a Xen implementation of PSCI v1.0, which is a > prerequisite for being able to discover SMCCC v1.1. > - It allows Xen to advertise SMCCC v1.1 > - It implements guest support for the > ARM_WORKAROUND_1 function that is used > to mitigate CVE-2017-5715 (if such mitigation is available on the > hypervisor). > - It adds Xen support for branch predictor hardening via > ARM_WORKAROUND_1 if the firmware supports it. > > This method is intended to fully replace the initial PSCI_GET_VERSION > approach. Although PSCI_GET_VERSION still works, it has an obvious > overhead and is called on some of the hottest paths. We expect > ARCH_WORKAROUND_1 to be much faster. I tested the series and it is ready to go. I am waiting for Andre to confirm before committing, since he had comments last time. > Cheers, > > [1] https://developer.arm.com/support/security-update/downloads > > [2] https://github.com/ARM-software/arm-trusted-firmware/pull/1240 > > [3] https://lists.xen.org/archives/html/xen-devel/2018-02/msg00447.html > > Julien Grall (18): > xen/arm: psci: Rework the PSCI definitions > xen/arm: vpsci: Add support for PSCI 1.1 > xen/arm: vsmc: Implement SMCCC 1.1 > xen/arm: vsmc: Implement SMCCC_ARCH_WORKAROUND_1 BP hardening support > xen/arm: Adapt smccc.h to be able to use it in assembly code > xen/arm64: Implement a fast path for handling SMCCC_ARCH_WORKAROUND_1 > xen/arm64: Print a per-CPU message with the BP hardening method used > xen/arm: smccc: Add macros SMCCC_VERSION, SMCCC_VERSION_{MINOR, MAJOR} > xen/arm: psci: Detect SMCCC version > xen/arm: smccc: Implement SMCCC v1.1 inline primitive > xen/arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support > xen/arm64: Kill PSCI_GET_VERSION as a variant-2 workaround > xen/arm: vpsci: Remove parameter 'ver' from do_common_cpu > xen/arm: psci: Consolidate PSCI version print > xen/arm: psci: Prefix with static any functions not exported > xen/arm: vpsci: Update the return type for MIGRATE_INFO_TYPE > xen/arm: vpsci: Introduce and use PSCI_INVALID_ADDRESS > xen/arm: vpsci: Rework the logic to start AArch32 vCPU in Thumb mode > > tools/libxl/libxl_arm.c | 3 +- > xen/arch/arm/arm64/bpi.S | 34 +++----- > xen/arch/arm/arm64/entry.S | 59 ++++++++++++- > xen/arch/arm/cpuerrata.c | 55 +++++++++---- > xen/arch/arm/domain_build.c | 1 + > xen/arch/arm/platforms/seattle.c | 4 +- > xen/arch/arm/psci.c | 58 +++++++++---- > xen/arch/arm/vpsci.c | 111 ++++++++++++++++++------- > xen/arch/arm/vsmc.c | 41 +++++++++ > xen/include/asm-arm/perfc_defn.h | 1 + > xen/include/asm-arm/processor.h | 2 + > xen/include/asm-arm/psci.h | 39 +++++---- > xen/include/asm-arm/smccc.h | 174 +++++++++++++++++++++++++++++++++++++-- > xen/include/asm-arm/vpsci.h | 2 +- > 14 files changed, 471 insertions(+), 113 deletions(-) > > -- > 2.11.0 >
Hi, On 24/02/18 01:49, Stefano Stabellini wrote: > On Fri, 23 Feb 2018, Julien Grall wrote: >> Hi all, >> >> Arm has recently published a SMC Calling Convention (SMCCC) >> specification update [1] that provides an optimised calling convention >> and optional, discoverable support for mitigating CVE-2017-5715 (XSA-254 >> variant 2). ARM Trusted Firmware (ATF) has already gained such an >> implementation[2]. >> >> This series addresses a few things: >> >> - It provides a Xen implementation of PSCI v1.0, which is a >> prerequisite for being able to discover SMCCC v1.1. >> - It allows Xen to advertise SMCCC v1.1 >> - It implements guest support for the >> ARM_WORKAROUND_1 function that is used >> to mitigate CVE-2017-5715 (if such mitigation is available on the >> hypervisor). >> - It adds Xen support for branch predictor hardening via >> ARM_WORKAROUND_1 if the firmware supports it. >> >> This method is intended to fully replace the initial PSCI_GET_VERSION >> approach. Although PSCI_GET_VERSION still works, it has an obvious >> overhead and is called on some of the hottest paths. We expect >> ARCH_WORKAROUND_1 to be much faster. > > I tested the series and it is ready to go. I am waiting for Andre to > confirm before committing, since he had comments last time. I am happy with the changes, so please go ahead. Thanks! Andre. > > >> Cheers, >> >> [1] https://developer.arm.com/support/security-update/downloads >> >> [2] https://github.com/ARM-software/arm-trusted-firmware/pull/1240 >> >> [3] https://lists.xen.org/archives/html/xen-devel/2018-02/msg00447.html >> >> Julien Grall (18): >> xen/arm: psci: Rework the PSCI definitions >> xen/arm: vpsci: Add support for PSCI 1.1 >> xen/arm: vsmc: Implement SMCCC 1.1 >> xen/arm: vsmc: Implement SMCCC_ARCH_WORKAROUND_1 BP hardening support >> xen/arm: Adapt smccc.h to be able to use it in assembly code >> xen/arm64: Implement a fast path for handling SMCCC_ARCH_WORKAROUND_1 >> xen/arm64: Print a per-CPU message with the BP hardening method used >> xen/arm: smccc: Add macros SMCCC_VERSION, SMCCC_VERSION_{MINOR, MAJOR} >> xen/arm: psci: Detect SMCCC version >> xen/arm: smccc: Implement SMCCC v1.1 inline primitive >> xen/arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support >> xen/arm64: Kill PSCI_GET_VERSION as a variant-2 workaround >> xen/arm: vpsci: Remove parameter 'ver' from do_common_cpu >> xen/arm: psci: Consolidate PSCI version print >> xen/arm: psci: Prefix with static any functions not exported >> xen/arm: vpsci: Update the return type for MIGRATE_INFO_TYPE >> xen/arm: vpsci: Introduce and use PSCI_INVALID_ADDRESS >> xen/arm: vpsci: Rework the logic to start AArch32 vCPU in Thumb mode >> >> tools/libxl/libxl_arm.c | 3 +- >> xen/arch/arm/arm64/bpi.S | 34 +++----- >> xen/arch/arm/arm64/entry.S | 59 ++++++++++++- >> xen/arch/arm/cpuerrata.c | 55 +++++++++---- >> xen/arch/arm/domain_build.c | 1 + >> xen/arch/arm/platforms/seattle.c | 4 +- >> xen/arch/arm/psci.c | 58 +++++++++---- >> xen/arch/arm/vpsci.c | 111 ++++++++++++++++++------- >> xen/arch/arm/vsmc.c | 41 +++++++++ >> xen/include/asm-arm/perfc_defn.h | 1 + >> xen/include/asm-arm/processor.h | 2 + >> xen/include/asm-arm/psci.h | 39 +++++---- >> xen/include/asm-arm/smccc.h | 174 +++++++++++++++++++++++++++++++++++++-- >> xen/include/asm-arm/vpsci.h | 2 +- >> 14 files changed, 471 insertions(+), 113 deletions(-) >> >> -- >> 2.11.0 >>
Hi all, Arm has recently published a SMC Calling Convention (SMCCC) specification update [1] that provides an optimised calling convention and optional, discoverable support for mitigating CVE-2017-5715 (XSA-254 variant 2). ARM Trusted Firmware (ATF) has already gained such an implementation[2]. This series addresses a few things: - It provides a Xen implementation of PSCI v1.0, which is a prerequisite for being able to discover SMCCC v1.1. - It allows Xen to advertise SMCCC v1.1 - It implements guest support for the ARM_WORKAROUND_1 function that is used to mitigate CVE-2017-5715 (if such mitigation is available on the hypervisor). - It adds Xen support for branch predictor hardening via ARM_WORKAROUND_1 if the firmware supports it. This method is intended to fully replace the initial PSCI_GET_VERSION approach. Although PSCI_GET_VERSION still works, it has an obvious overhead and is called on some of the hottest paths. We expect ARCH_WORKAROUND_1 to be much faster. Cheers, [1] https://developer.arm.com/support/security-update/downloads [2] https://github.com/ARM-software/arm-trusted-firmware/pull/1240 [3] https://lists.xen.org/archives/html/xen-devel/2018-02/msg00447.html Julien Grall (18): xen/arm: psci: Rework the PSCI definitions xen/arm: vpsci: Add support for PSCI 1.1 xen/arm: vsmc: Implement SMCCC 1.1 xen/arm: vsmc: Implement SMCCC_ARCH_WORKAROUND_1 BP hardening support xen/arm: Adapt smccc.h to be able to use it in assembly code xen/arm64: Implement a fast path for handling SMCCC_ARCH_WORKAROUND_1 xen/arm64: Print a per-CPU message with the BP hardening method used xen/arm: smccc: Add macros SMCCC_VERSION, SMCCC_VERSION_{MINOR, MAJOR} xen/arm: psci: Detect SMCCC version xen/arm: smccc: Implement SMCCC v1.1 inline primitive xen/arm64: Add ARM_SMCCC_ARCH_WORKAROUND_1 BP hardening support xen/arm64: Kill PSCI_GET_VERSION as a variant-2 workaround xen/arm: vpsci: Remove parameter 'ver' from do_common_cpu xen/arm: psci: Consolidate PSCI version print xen/arm: psci: Prefix with static any functions not exported xen/arm: vpsci: Update the return type for MIGRATE_INFO_TYPE xen/arm: vpsci: Introduce and use PSCI_INVALID_ADDRESS xen/arm: vpsci: Rework the logic to start AArch32 vCPU in Thumb mode tools/libxl/libxl_arm.c | 3 +- xen/arch/arm/arm64/bpi.S | 34 +++----- xen/arch/arm/arm64/entry.S | 59 ++++++++++++- xen/arch/arm/cpuerrata.c | 55 +++++++++---- xen/arch/arm/domain_build.c | 1 + xen/arch/arm/platforms/seattle.c | 4 +- xen/arch/arm/psci.c | 58 +++++++++---- xen/arch/arm/vpsci.c | 111 ++++++++++++++++++------- xen/arch/arm/vsmc.c | 41 +++++++++ xen/include/asm-arm/perfc_defn.h | 1 + xen/include/asm-arm/processor.h | 2 + xen/include/asm-arm/psci.h | 39 +++++---- xen/include/asm-arm/smccc.h | 174 +++++++++++++++++++++++++++++++++++++-- xen/include/asm-arm/vpsci.h | 2 +- 14 files changed, 471 insertions(+), 113 deletions(-)