coco/TSM: Arm CCA guest TDISP lock/accept flow with verification and DMA enable
Subsystems (3)
v4 cover coco/TSM: Arm CCA guest TDISP lock/accept flow with verification and DMA enable
This patch series implements the TSM ->lock(), ->unlock(), and ->accept() callbacks required for the TDISP setup with Arm CCA as per as per the RMM 2.0bet1 specification [1].
The series adds the guest-side DA plumbing needed to transition a device through TDI LOCK and RUN states, verify host-provided evidence against RMM-provided digests, validate interface-report MMIO mappings, and enable DMA only after attestation succeeds.
At a high level, the series includes:
- guest TSM callback registration and lock/unlock/accept hooks
- RHI DA helper support for TDI state transitions and object refresh
- host-cached DA object fetch APIs in guest
- RSI_VDEV_GET_INFO digest verification of certificate/VCA/report/measurement
- mapping validation for interface-report ranges and teardown on unlock
- DMA behavior updates for accepted devices (including swiotlb restrictions)
- vdev DMA enable after successful attestation
The series builds upon the TSM framework patches posted at [2]. A git repository containing all the related changes is available at [3].
Testing / Usage
echo ${DEVICE} > /sys/bus/pci/devices/${DEVICE}/driver/unbind
To transition the device to TDISP LOCK state:
echo tsm0 > /sys/bus/pci/devices/${DEVICE}/tsm/lock
To transition the device to TDISP RUN state:
echo 1 > /sys/bus/pci/devices/${DEVICE}/tsm/accept
echo ${DEVICE} > /sys/bus/pci/drivers_probe
Changes from v3:
https://lore.kernel.org/all/[email protected]
* updated the patches to follow the RMM 2.0bet1 specification
* updated the guest-side DA code to use the renamed identity/protocol digest fields and id_index
Changes from v2:
rfc-v2: https://lore.kernel.org/all/[email protected]
* rebase to latest kernel and core TSM changes
* Address review feedback.
* Interface report is now collected using core TSM framework
* swiotlb is now considered shared-memory pool and is not allowed to be used by accepted devices.
v1:
rfc-v1: https://lore.kernel.org/all/[email protected]
[1] https://developer.arm.com/documentation/den0137/2-0bet1/
[2] https://lore.kernel.org/all/[email protected]
[3] https://gitlab.arm.com/linux-arm/linux-cca.git cca/topics/cca-tdisp-upstream-rfc-v4
Aneesh Kumar K.V (Arm) (11):
coco: guest: arm64: Guest TSM callback and realm device lock support
coco: guest: arm64: Fix a typo in the ARM_CCA_GUEST Kconfig help
string ("and" -> "an"). coco: guest: arm64: Add Realm Host Interface and guest DA helper
coco: guest: arm64: Support guest-initiated TDI lock/unlock
transitions
coco: guest: arm64: Refresh interface-report cache during device lock
coco: guest: arm64: Add measurement refresh via
RHI_DA_VDEV_GET_MEASUREMENTS
coco: guest: arm64: Add guest APIs to read host-cached DA objects
coco: guest: arm64: Verify DA evidence with RSI_VDEV_GET_INFO digests
coco: guest: arm64: Hook TSM accept to Realm TDISP RUN transition
coco: arm64: dma: Update force_dma_unencrypted for accepted devices
coco: guest: arm64: Enable vdev DMA after attestation
arch/arm64/include/asm/mem_encrypt.h | 6 +- arch/arm64/include/asm/rhi.h | 59 ++++ arch/arm64/include/asm/rsi.h | 1 + arch/arm64/include/asm/rsi_cmds.h | 73 +++++ arch/arm64/include/asm/rsi_smc.h | 63 ++++ arch/arm64/kernel/rsi.c | 10 + arch/arm64/mm/mem_encrypt.c | 10 + drivers/virt/coco/Makefile | 2 +- drivers/virt/coco/arm-cca-guest/Kconfig | 9 +- drivers/virt/coco/arm-cca-guest/Makefile | 1 + drivers/virt/coco/arm-cca-guest/arm-cca.c | 358 +++++++++++++++++++++- drivers/virt/coco/arm-cca-guest/rhi-da.c | 356 +++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rhi-da.h | 17 + drivers/virt/coco/arm-cca-guest/rsi-da.c | 289 +++++++++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 66 ++++ include/linux/swiotlb.h | 3 + kernel/dma/direct.c | 8 + kernel/dma/swiotlb.c | 3 + 18 files changed, 1326 insertions(+), 8 deletions(-) create mode 100644 drivers/virt/coco/arm-cca-guest/rhi-da.c create mode 100644 drivers/virt/coco/arm-cca-guest/rhi-da.h create mode 100644 drivers/virt/coco/arm-cca-guest/rsi-da.c create mode 100644 drivers/virt/coco/arm-cca-guest/rsi-da.h
Signature · 1 line
2.43.0
RFC PATCH v4 1/11 coco: guest: arm64: Guest TSM callback and realm device lock support
Register the TSM callback when the DA feature is supported by RSI. The build order is also adjusted so that the TSM class is created before the arm-cca-guest driver is initialized.
In addition, add support for the TDISP lock sequence. Writing a TSM (TEE Security Manager) device name from /sys/class/tsm into tsm/lock triggers the realm device lock operation.
--- arch/arm64/include/asm/rsi.h | 1 + arch/arm64/include/asm/rsi_cmds.h | 17 +++++++ arch/arm64/include/asm/rsi_smc.h | 1 + arch/arm64/kernel/rsi.c | 10 ++++ drivers/virt/coco/Makefile | 2 +- drivers/virt/coco/arm-cca-guest/Kconfig | 5 ++ drivers/virt/coco/arm-cca-guest/arm-cca.c | 60 ++++++++++++++++++++++- drivers/virt/coco/arm-cca-guest/rsi-da.h | 35 +++++++++++++ 8 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 drivers/virt/coco/arm-cca-guest/rsi-da.h
arch/arm64/include/asm/rsi.h +1 -0
@@ -68,5 +68,6 @@ static inline int rsi_set_memory_range_shared(phys_addr_t start, RSI_CHANGE_DESTROYED); } +bool rsi_has_da_feature (void );unsigned long realm_get_hyp_pagesize (void );#endif /* __ASM_RSI_H_ */
arch/arm64/include/asm/rsi_cmds.h +17 -0
@@ -169,4 +169,21 @@ static inline unsigned long rsi_host_call(struct rsi_host_call *rhi_call) return res.a0; } +/** +* rsi_features() - Read feature register +* @index: Feature register index +* @out: Feature register value is written to this pointer +* +* Return: RSI return code +*/ +static inline unsigned long rsi_features (unsigned long index,u64 *out) +{ +struct arm_smccc_res res; + +arm_smccc_1_1_invoke (SMC_RSI_FEATURES , index, &res); + + *out = res.a1; +return res.a0; +} +#endif /* __ASM_RSI_CMDS_H */
arch/arm64/include/asm/rsi_smc.h +1 -0
@@ -53,6 +53,7 @@*/ #define SMC_RSI_ABI_VERSION SMC_RSI_FID(0x190) +#define RSI_FEATURE_REGISTER_0_DA BIT(0)/* * Read feature register. *
arch/arm64/kernel/rsi.c +10 -0
@@ -17,6 +17,7 @@#include <asm/rhi.h> static struct realm_config config; +static u64 rsi_feat_reg0;static unsigned long ipa_change_alignment =PAGE_SIZE ;unsigned long prot_ns_shared;
@@ -25,6 +26,12 @@ EXPORT_SYMBOL(prot_ns_shared);DEFINE_STATIC_KEY_FALSE_RO (rsi_present);EXPORT_SYMBOL (rsi_present); +bool rsi_has_da_feature (void ) +{ +return u64_get_bits (rsi_feat_reg0,RSI_FEATURE_REGISTER_0_DA ); +} +EXPORT_SYMBOL_GPL (rsi_has_da_feature); +bool cc_platform_has (enum cc_attr attr) {switch (attr) {
@@ -160,6 +167,9 @@ void __init arm64_rsi_init(void)if (!ipa_change_alignment)return ; +if (WARN_ON (rsi_features (0 , &rsi_feat_reg0))) +return ; + prot_ns_shared =__phys_to_pte_val (BIT (config.ipa_bits -1 ));if (arm64_ioremap_prot_hook_register (realm_ioremap_hook))
drivers/virt/coco/Makefile +1 -1
@@ -7,6 +7,6 @@ obj-$(CONFIG_ARM_PKVM_GUEST) += pkvm-guest/ obj-$(CONFIG_SEV_GUEST) += sev-guest/ obj-$(CONFIG_INTEL_TDX_GUEST) += tdx-guest/ obj-$(CONFIG_INTEL_TDX_HOST) += tdx-host/ -obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest/ obj-$(CONFIG_TSM) += tsm-core.o obj-$(CONFIG_TSM_GUEST) += guest/ +obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest/
drivers/virt/coco/arm-cca-guest/Kconfig +5 -0
@@ -1,11 +1,16 @@ +# SPDX-License-Identifier: GPL-2.0-only +# + config ARM_CCA_GUEST tristate "Arm CCA Guest driver" depends on ARM64 + select PCI_TSM if PCI select TSM_REPORTS select AUXILIARY_BUS help The driver provides userspace interface to request and attestation report from the Realm Management Monitor(RMM). + If the DA feature is supported, it also register with TSM framework. If you choose 'M' here, this module will be called arm-cca-guest.
drivers/virt/coco/arm-cca-guest/arm-cca.c +59 -1
88 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rsi-da.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2026 ARM Ltd. +*/ + +#ifndef _VIRT_COCO_RSI_DA_H_ +#define _VIRT_COCO_RSI_DA_H_ + +#include <linux/pci.h> +#include <linux/pci-tsm.h> +#include <asm/rsi_smc.h> + +struct cca_guest_dsc { +struct pci_tsm_devsec pci; +}; + +static inline struct cca_guest_dsc *to_cca_guest_dsc (struct pci_dev *pdev) +{ +struct pci_tsm *tsm = pdev->tsm; + +if (!tsm) +return NULL ; + return container_of(tsm, struct cca_guest_dsc, pci.base_tsm); +} + +/* +* Linux use device requester id as the vdev id. +*/ +static inline int rsi_vdev_id (struct pci_dev *pdev) +{ +return (pci_domain_nr (pdev->bus) <<16 ) | +PCI_DEVID (pdev->bus->number, pdev->devfn); +} + +#endif
Signature · 1 line
2.43.0
RFC PATCH v4 2/11 coco: guest: arm64: Fix a typo in the ARM_CCA_GUEST Kconfig help string ("and" -> "an").
In reply to Aneesh Kumar K.V (Arm)Fix a typo in Kconfig file.
--- drivers/virt/coco/arm-cca-guest/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/virt/coco/arm-cca-guest/Kconfig +1 -1
@@ -8,7 +8,7 @@ config ARM_CCA_GUEST select TSM_REPORTS select AUXILIARY_BUS help - The driver provides userspace interface to request and + The driver provides userspace interface to request an attestation report from the Realm Management Monitor(RMM). If the DA feature is supported, it also register with TSM framework.
Signature · 1 line
2.43.0
RFC PATCH v4 3/11 coco: guest: arm64: Add Realm Host Interface and guest DA helper
In reply to Aneesh Kumar K.V (Arm)- Add guest-side rhi-da helper that drives the vdev TDI state machine via RHI host calls and translates the firmware status codes
This provides the basic RHI plumbing that later DA features rely on.
--- arch/arm64/include/asm/rhi.h | 38 +++++ drivers/virt/coco/arm-cca-guest/Makefile | 1 + drivers/virt/coco/arm-cca-guest/arm-cca.c | 3 +- drivers/virt/coco/arm-cca-guest/rhi-da.c | 163 ++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rhi-da.h | 14 ++ 5 files changed, 218 insertions(+), 1 deletion(-) create mode 100644 drivers/virt/coco/arm-cca-guest/rhi-da.c create mode 100644 drivers/virt/coco/arm-cca-guest/rhi-da.h
arch/arm64/include/asm/rhi.h +38 -0
@@ -21,4 +21,42 @@ unsigned long rhi_get_ipa_change_alignment(void);#define __RHI_HOSTCONF_GET_IPA_CHANGE_ALIGNMENT BIT(0)#define RHI_HOSTCONF_FEATURES SMC_RHI_CALL(0x004F)#define RHI_HOSTCONF_GET_IPA_CHANGE_ALIGNMENT SMC_RHI_CALL(0x0050) + +#define RHI_DA_SUCCESS 0x0 +#define RHI_DA_INCOMPLETE 0x1 +#define RHI_DA_ERROR_DATA_NOT_AVAILABLE 0x2 +#define RHI_DA_ERROR_INVALID_VDEV_ID 0x3 +#define RHI_DA_ERROR_INVALID_OBJECT 0x4 +#define RHI_DA_ERROR_INPUT 0x5 +#define RHI_DA_ERROR_DEVICE 0x6 +#define RHI_DA_ERROR_INVALID_OFFSET 0x7 +#define RHI_DA_ERROR_ACCESS_FAILED 0x8 +#define RHI_DA_ERROR_BUSY 0x9 +#define RHI_DA_ABORTED_OPERATION_HAD_COMPLETED 0xA + +#define RHI_DA_FEATURE_OBJECT_SIZE BIT(0) +#define RHI_DA_FEATURE_OBJECT_READ BIT(1) +#define RHI_DA_FEATURE_VDEV_CONTINUE BIT(2) +#define RHI_DA_FEATURE_VDEV_GET_MEASUREMENT BIT(3) +#define RHI_DA_FEATURE_VDEV_GET_INTF_REPORT BIT(4) +#define RHI_DA_FEATURE_VDEV_SET_TDI_STATE BIT(5) + +#define RHI_DA_BASE_FEATURE (RHI_DA_FEATURE_OBJECT_SIZE | \ + RHI_DA_FEATURE_OBJECT_READ | \ + RHI_DA_FEATURE_VDEV_GET_INTF_REPORT | \ + RHI_DA_FEATURE_VDEV_GET_MEASUREMENT | \ + RHI_DA_FEATURE_VDEV_SET_TDI_STATE) +#define RHI_DA_FEATURES SMC_RHI_CALL(0x004B) + +#define RHI_DA_VDEV_CONTINUE SMC_RHI_CALL(0x0051) + +enum rhi_tdi_state { +RHI_DA_TDI_CONFIG_UNLOCKED , +RHI_DA_TDI_CONFIG_LOCKED , +RHI_DA_TDI_CONFIG_RUN , +}; +#define RHI_DA_VDEV_SET_TDI_STATE SMC_RHI_CALL(0x0054) + +#define RHI_DA_VDEV_ABORT SMC_RHI_CALL(0x0056) +#endif
drivers/virt/coco/arm-cca-guest/Makefile +1 -0
@@ -2,3 +2,4 @@ obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest.o arm-cca-guest-y += arm-cca.o +arm-cca-guest-$(CONFIG_PCI_TSM) += rhi-da.o
drivers/virt/coco/arm-cca-guest/arm-cca.c +2 -1
@@ -17,6 +17,7 @@#ifdef CONFIG_PCI_TSM #include "rsi-da.h" +#include "rhi-da.h" #endif /**
@@ -265,7 +266,7 @@ static int cca_devsec_tsm_probe(struct auxiliary_device *adev,#ifdef CONFIG_PCI_TSM /* Allow tsm report even if tsm_register fails */ -if (rsi_has_da_feature ()) +if (rsi_has_da_feature () &&rhi_has_da_support ())cca_devsec_tsm_register (adev);#endif
drivers/virt/coco/arm-cca-guest/rhi-da.c new file +163 -0
163 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rhi-da.h new file +14 -0
@@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* +* Copyright (C) 2026 ARM Ltd. +*/ + +#ifndef _VIRT_COCO_RHI_DA_H_ +#define _VIRT_COCO_RHI_DA_H_ + +#include <asm/rhi.h> + +struct pci_dev ; +bool rhi_has_da_support (void ); +int rhi_vdev_set_tdi_state (struct pci_dev *pdev,enum rhi_tdi_state target_state); +#endif
Signature · 1 line
2.43.0
Re: [RFC PATCH v4 03/11] coco: guest: arm64: Add Realm Host Interface and guest DA helper
Quoted 2 lines · Aneesh Kumar K.V (Arm)
- Add guest-side rhi-da helper that drives the vdev TDI state machine via RHI host calls and translates the firmware status codes
...
drivers/virt/coco/arm-cca-guest/rhi-da.c line 45
Quoted 7 lines
drivers/virt/coco/arm-cca-guest/rhi-da.c new file +7
-0+ +bool rhi_has_da_support (void ) +{ +int ret; + + struct rsi_host_call *rhi_call __free(kfree) = +kmalloc (sizeof (*rhi_call),GFP_KERNEL );
Same comment as before that kzalloc is best practice for struct rsi_host_call.
Review
Quoted 2 lines
(quoted diff) +2
-0+ if (!rhi_call) + return -ENOMEM;
Returning an error value in a bool function will evaluate to true. This is probably not your intended behavior.
Regards,
Kameron
Quoted 14 lines
drivers/virt/coco/arm-cca-guest/rhi-da.c new file +14
-0+ + rhi_call->imm =0 ; + rhi_call->gprs[0 ] =RHI_DA_FEATURES ; + + ret =rsi_host_call (rhi_call); +if (ret !=RSI_SUCCESS || rhi_call->gprs[0 ] ==SMCCC_RET_NOT_SUPPORTED ) +return false; + +/* For base DA to work we need these to be supported */ +if ((rhi_call->gprs[0 ] &RHI_DA_BASE_FEATURE ) ==RHI_DA_BASE_FEATURE ) +return true; + +return false; +}...
RFC PATCH v4 4/11 coco: guest: arm64: Support guest-initiated TDI lock/unlock transitions
In reply to Aneesh Kumar K.V (Arm)Add guest helpers to drive TDI state transitions through RHI:
- cca_device_lock() -> RHI_DA_TDI_CONFIG_LOCKED
- cca_device_unlock() -> RHI_DA_TDI_CONFIG_UNLOCKED
Use these helpers in the PCI TSM lock/unlock callbacks so a successful lock path returns a live pci_tsm handle and unlock transitions the device back to unlocked state.
--- drivers/virt/coco/arm-cca-guest/Makefile | 2 +- drivers/virt/coco/arm-cca-guest/arm-cca.c | 9 ++++-- drivers/virt/coco/arm-cca-guest/rsi-da.c | 34 +++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 3 ++ 4 files changed, 45 insertions(+), 3 deletions(-) create mode 100644 drivers/virt/coco/arm-cca-guest/rsi-da.c
drivers/virt/coco/arm-cca-guest/Makefile +1 -1
@@ -2,4 +2,4 @@ obj-$(CONFIG_ARM_CCA_GUEST) += arm-cca-guest.o arm-cca-guest-y += arm-cca.o -arm-cca-guest-$(CONFIG_PCI_TSM) += rhi-da.o +arm-cca-guest-$(CONFIG_PCI_TSM) += rhi-da.o rsi-da.o
drivers/virt/coco/arm-cca-guest/arm-cca.c +7 -2
@@ -211,14 +211,19 @@ static struct pci_tsm *cca_tsm_lock(struct tsm_dev *tsm_dev, struct pci_dev *pdeif (ret)return ERR_PTR (ret); -/* For now always return an error */ -return ERR_PTR (-EIO ); + ret =cca_device_lock (pdev); +if (ret) +return ERR_PTR (ret); + +return &no_free_ptr (cca_dsc)->pci.base_tsm; }static void cca_tsm_unlock (struct pci_tsm *tsm) {struct cca_guest_dsc *cca_dsc =to_cca_guest_dsc (tsm->pdev); +cca_device_unlock (tsm->pdev); +kfree (cca_dsc); }
drivers/virt/coco/arm-cca-guest/rsi-da.c new file +34 -0
@@ -0,0 +1,34 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* +* Copyright (C) 2025 ARM Ltd. +*/ + +#include <linux/pci.h> +#include <asm/rsi_cmds.h> + +#include "rsi-da.h" +#include "rhi-da.h" + +int cca_device_lock (struct pci_dev *pdev) +{ +int ret; + + ret =rhi_vdev_set_tdi_state (pdev,RHI_DA_TDI_CONFIG_LOCKED ); +if (ret) { +pci_err (pdev,"failed to lock the device (%d)\n" , ret); +return ret; + } +return 0 ; +} + +int cca_device_unlock (struct pci_dev *pdev) +{ +int ret; + + ret =rhi_vdev_set_tdi_state (pdev,RHI_DA_TDI_CONFIG_UNLOCKED ); +if (ret) { +pci_err (pdev,"failed to unlock the device (%d)\n" , ret); +return ret; + } +return 0 ; +}
drivers/virt/coco/arm-cca-guest/rsi-da.h +3 -0
@@ -32,4 +32,7 @@ static inline int rsi_vdev_id(struct pci_dev *pdev) PCI_DEVID(pdev->bus->number, pdev->devfn); } +int cca_device_lock (struct pci_dev *pdev); +int cca_device_unlock (struct pci_dev *pdev); +#endif
Signature · 1 line
2.43.0
RFC PATCH v4 5/11 coco: guest: arm64: Refresh interface-report cache during device lock
In reply to Aneesh Kumar K.V (Arm)Add support for RHI_DA_VDEV_GET_INTERFACE_REPORT and use it to refresh the host-side cached interface report when a device is locked.
Implement rhi_update_vdev_interface_report_cache() with busy retry and cookie-based CONTINUE handling for incomplete operations. Surface the flow through cca_update_device_object_cache(), and call it from the lock path so the interface report is fetched before lock succeeds.
On refresh failure, unwind by unlocking the device and returning the error.
--- arch/arm64/include/asm/rhi.h | 2 ++ drivers/virt/coco/arm-cca-guest/arm-cca.c | 6 ++++ drivers/virt/coco/arm-cca-guest/rhi-da.c | 44 +++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rhi-da.h | 1 + drivers/virt/coco/arm-cca-guest/rsi-da.c | 13 +++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 1 + 6 files changed, 67 insertions(+)
arch/arm64/include/asm/rhi.h +2 -0
@@ -50,6 +50,8 @@ unsigned long rhi_get_ipa_change_alignment(void);#define RHI_DA_VDEV_CONTINUE SMC_RHI_CALL(0x0051) +#define RHI_DA_VDEV_GET_INTERFACE_REPORT SMC_RHI_CALL(0x0053) +enum rhi_tdi_state {RHI_DA_TDI_CONFIG_UNLOCKED ,RHI_DA_TDI_CONFIG_LOCKED ,
drivers/virt/coco/arm-cca-guest/arm-cca.c +6 -0
@@ -215,6 +215,12 @@ static struct pci_tsm *cca_tsm_lock(struct tsm_dev *tsm_dev, struct pci_dev *pdeif (ret)return ERR_PTR (ret); + ret =cca_update_device_object_cache (pdev,NULL ); +if (ret) { +cca_device_unlock (pdev); +return ERR_PTR (ret); + } +return &no_free_ptr (cca_dsc)->pci.base_tsm; }
drivers/virt/coco/arm-cca-guest/rhi-da.c +44 -0
47 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rhi-da.h +1 -0
@@ -11,4 +11,5 @@struct pci_dev ;bool rhi_has_da_support (void );int rhi_vdev_set_tdi_state (struct pci_dev *pdev,enum rhi_tdi_state target_state); +int rhi_update_vdev_interface_report_cache (struct pci_dev *pdev);#endif
drivers/virt/coco/arm-cca-guest/rsi-da.c +13 -0
@@ -32,3 +32,16 @@ int cca_device_unlock(struct pci_dev *pdev) }return 0 ; } + +int cca_update_device_object_cache (struct pci_dev *pdev,const u8 *nonce) +{ +int ret; + + ret =rhi_update_vdev_interface_report_cache (pdev); +if (ret) { +pci_err (pdev,"failed to get interface report (%d)\n" , ret); +return ret; + } + +return 0 ; +}
drivers/virt/coco/arm-cca-guest/rsi-da.h +1 -0
@@ -34,5 +34,6 @@ static inline int rsi_vdev_id(struct pci_dev *pdev)int cca_device_lock (struct pci_dev *pdev);int cca_device_unlock (struct pci_dev *pdev); +int cca_update_device_object_cache (struct pci_dev *pdev,const u8 *nonce);#endif
Signature · 1 line
2.43.0
RFC PATCH v4 6/11 coco: guest: arm64: Add measurement refresh via RHI_DA_VDEV_GET_MEASUREMENTS
In reply to Aneesh Kumar K.V (Arm)Add guest support to request fresh device measurements using RHI_DA_VDEV_GET_MEASUREMENTS.
Define measurement request parameters (flags + nonce), request RAW measurements, and implement cookie-based continuation for incomplete DA operations. Extend cca_update_device_object_cache() to refresh both interface report and measurements.
Because RHI buffers are shared with the host, add shared-page allocation helpers that convert pages to decrypted/shared memory before use and restore them to encrypted/private state on free.
--- arch/arm64/include/asm/rhi.h | 11 ++++ drivers/virt/coco/arm-cca-guest/arm-cca.c | 1 + drivers/virt/coco/arm-cca-guest/rhi-da.c | 78 +++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rhi-da.h | 1 + drivers/virt/coco/arm-cca-guest/rsi-da.c | 42 +++++++++++- drivers/virt/coco/arm-cca-guest/rsi-da.h | 2 + 6 files changed, 134 insertions(+), 1 deletion(-)
arch/arm64/include/asm/rhi.h +11 -0
@@ -50,6 +50,17 @@ unsigned long rhi_get_ipa_change_alignment(void);#define RHI_DA_VDEV_CONTINUE SMC_RHI_CALL(0x0051) +#define RHI_VDEV_MEASURE_HASH 0x0 +#define RHI_VDEV_MEASURE_RAW 0x1 +struct rhi_vdev_measurement_params { +union { +u64 flags; +u8 padding0[0x100 ]; + }; +u8 nonce[32 ]; +}; +#define RHI_DA_VDEV_GET_MEASUREMENTS SMC_RHI_CALL(0x0052) +#define RHI_DA_VDEV_GET_INTERFACE_REPORT SMC_RHI_CALL(0x0053)enum rhi_tdi_state {
drivers/virt/coco/arm-cca-guest/arm-cca.c +1 -0
@@ -215,6 +215,7 @@ static struct pci_tsm *cca_tsm_lock(struct tsm_dev *tsm_dev, struct pci_dev *pdeif (ret)return ERR_PTR (ret); +/* collect evidence without nonce */ ret =cca_update_device_object_cache (pdev,NULL );if (ret) {cca_device_unlock (pdev);
drivers/virt/coco/arm-cca-guest/rhi-da.c +78 -0
81 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rhi-da.h +1 -0
@@ -12,4 +12,5 @@ struct pci_dev;bool rhi_has_da_support (void );int rhi_vdev_set_tdi_state (struct pci_dev *pdev,enum rhi_tdi_state target_state);int rhi_update_vdev_interface_report_cache (struct pci_dev *pdev); +int rhi_update_vdev_measurements_cache (struct pci_dev *pdev,const u8 *nonce);#endif
drivers/virt/coco/arm-cca-guest/rsi-da.c +41 -1
58 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rsi-da.h +2 -0
@@ -35,5 +35,7 @@ static inline int rsi_vdev_id(struct pci_dev *pdev)int cca_device_lock (struct pci_dev *pdev);int cca_device_unlock (struct pci_dev *pdev);int cca_update_device_object_cache (struct pci_dev *pdev,const u8 *nonce); +struct page *alloc_shared_pages (int nid,gfp_t gfp_mask,unsigned long min_size); +int free_shared_pages (struct page *page,unsigned long min_size);#endif
Signature · 1 line
2.43.0
RFC PATCH v4 7/11 coco: guest: arm64: Add guest APIs to read host-cached DA objects
In reply to Aneesh Kumar K.V (Arm)Introduce guest-side helpers to read host-cached DA objects (certificate, VCA, interface report, and measurements).
Add RHI_DA_OBJECT_SIZE and RHI_DA_OBJECT_READ definitions, then implement rhi_read_cached_object() that:
- queries object size from host
- validates size against MAX_CACHE_OBJ_SIZE
- allocates a shared buffer
- issues OBJECT_READ into shared memory
- copies data into private memory and frees shared pages
Export the helper for later evidence-collection and verification code.
--- arch/arm64/include/asm/rhi.h | 8 +++ drivers/virt/coco/arm-cca-guest/rhi-da.c | 71 ++++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rhi-da.h | 1 + drivers/virt/coco/arm-cca-guest/rsi-da.h | 2 + 4 files changed, 82 insertions(+)
arch/arm64/include/asm/rhi.h +8 -0
@@ -48,6 +48,14 @@ unsigned long rhi_get_ipa_change_alignment(void); RHI_DA_FEATURE_VDEV_SET_TDI_STATE)#define RHI_DA_FEATURES SMC_RHI_CALL(0x004B) +#define RHI_DA_OBJECT_VCA 0x0 +#define RHI_DA_OBJECT_CERTIFICATE 0x1 +#define RHI_DA_OBJECT_MEASUREMENT 0x2 +#define RHI_DA_OBJECT_INTERFACE_REPORT 0x3 +#define RHI_DA_OBJECT_EXTENSION_EVIDENCE 0x4 +#define RHI_DA_OBJECT_SIZE SMC_RHI_CALL(0x004C) +#define RHI_DA_OBJECT_READ SMC_RHI_CALL(0x004D) +#define RHI_DA_VDEV_CONTINUE SMC_RHI_CALL(0x0051)#define RHI_VDEV_MEASURE_HASH 0x0
drivers/virt/coco/arm-cca-guest/rhi-da.c +71 -0
80 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rhi-da.h +1 -0
@@ -13,4 +13,5 @@ bool rhi_has_da_support(void);int rhi_vdev_set_tdi_state (struct pci_dev *pdev,enum rhi_tdi_state target_state);int rhi_update_vdev_interface_report_cache (struct pci_dev *pdev);int rhi_update_vdev_measurements_cache (struct pci_dev *pdev,const u8 *nonce); +int rhi_read_cached_object (int vdev_id,int da_object_type,void **object,int *object_size);#endif
drivers/virt/coco/arm-cca-guest/rsi-da.h +2 -0
@@ -10,6 +10,8 @@#include <linux/pci-tsm.h> #include <asm/rsi_smc.h> +#define MAX_CACHE_OBJ_SIZE SZ_16M +struct cca_guest_dsc {struct pci_tsm_devsec pci; };
Signature · 1 line
2.43.0
Re: [RFC PATCH v4 07/11] coco: guest: arm64: Add guest APIs to read host-cached DA objects
Quoted 60 lines · Aneesh Kumar K.V (Arm)
Introduce guest-side helpers to read host-cached DA objects (certificate, VCA, interface report, and measurements).
Add
RHI_DA_OBJECT_SIZEandRHI_DA_OBJECT_READdefinitions, then implementrhi_read_cached_object()that:
- queries object size from host
- validates size againstMAX_CACHE_OBJ_SIZE
- allocates a shared buffer
- issuesOBJECT_READinto shared memory
- copies data into private memory and frees shared pagesExport the helper for later evidence-collection and verification code.
Signed-off-by Aneesh Kumar K.V (Arm) <[email protected]>--- arch/arm64/include/asm/rhi.h | 8 +++ drivers/virt/coco/arm-cca-guest/rhi-da.c | 71 ++++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rhi-da.h | 1 + drivers/virt/coco/arm-cca-guest/rsi-da.h | 2 + 4 files changed, 82 insertions(+)arch/arm64/include/asm/rhi.h +8
-0@@ -48,6 +48,14 @@ unsigned long rhi_get_ipa_change_alignment(void); RHI_DA_FEATURE_VDEV_SET_TDI_STATE)#define RHI_DA_FEATURES SMC_RHI_CALL(0x004B) +#define RHI_DA_OBJECT_VCA 0x0 +#define RHI_DA_OBJECT_CERTIFICATE 0x1 +#define RHI_DA_OBJECT_MEASUREMENT 0x2 +#define RHI_DA_OBJECT_INTERFACE_REPORT 0x3 +#define RHI_DA_OBJECT_EXTENSION_EVIDENCE 0x4 +#define RHI_DA_OBJECT_SIZE SMC_RHI_CALL(0x004C) +#define RHI_DA_OBJECT_READ SMC_RHI_CALL(0x004D) +#define RHI_DA_VDEV_CONTINUE SMC_RHI_CALL(0x0051)#define RHI_VDEV_MEASURE_HASH 0x0drivers/virt/coco/arm-cca-guest/rhi-da.c +5
-0@@ -3,6 +3,8 @@* Copyright (C) 2026 ARM Ltd. */ +#include <linux/string.h> +#include "rsi-da.h" #include "rhi-da.h" @@ -283,3 +285,72 @@ int rhi_update_vdev_measurements_cache(struct pci_dev *pdev, const u8 *nonce)pci_err (pdev,"failed to get device measurement (%d)\n" , ret);return ret; } + +int rhi_read_cached_object (int vdev_id,int da_object_type,void **object,int *object_size) +{
drivers/virt/coco/arm-cca-guest/rhi-da.c int rhi_update_vdev_measurements_cache(struct pci_dev *pdev, const u8 *nonce) · line 300
Quoted 10 lines
drivers/virt/coco/arm-cca-guest/rhi-da.c +10
-0+int ret; +int data_size; +void *data_buf_shared; +struct page *shared_pages; + + *object_size =0 ; + *object =NULL ; + + struct rsi_host_call *rhicall __free(kfree) = +kmalloc (sizeof (struct rsi_host_call ),GFP_KERNEL );
"Unused bits of the RsiHostCall structure SBZ"
It's best practice to use kzalloc for struct rsi_host_call.
Quoted 9 lines
drivers/virt/coco/arm-cca-guest/rhi-da.c +9
-0+if (!rhicall) +return -ENOMEM ; + + rhicall->imm =0 ; + rhicall->gprs[0 ] =RHI_DA_OBJECT_SIZE ; + rhicall->gprs[1 ] = vdev_id; + rhicall->gprs[2 ] = da_object_type; + + ret =rsi_host_call (rhicall);
drivers/virt/coco/arm-cca-guest/rhi-da.c int rhi_update_vdev_measurements_cache(struct pci_dev *pdev, const u8 *nonce) · line 319
Quoted 10 lines
drivers/virt/coco/arm-cca-guest/rhi-da.c +10
-0+if (ret !=RSI_SUCCESS ) +return -EIO ; + +if (rhicall->gprs[0 ] !=RHI_DA_SUCCESS ) +return -EIO ; + +/* validate against the max cache object size used on host. */ + data_size = rhicall->gprs[1 ]; +if (data_size >MAX_CACHE_OBJ_SIZE || data_size ==0 ) +return -EIO ;
Consider making data_size and object_size size_t (unsigned long) to avoid truncation and signed comparison.
For consistency with cca_verify_digests() and pci_tsm_evidence_object.len, I would also change all the sizes in cca_collect_dev_evidence() to be size_t.
Quoted 51 lines
drivers/virt/coco/arm-cca-guest/rhi-da.c +36
-0+ shared_pages =alloc_shared_pages (NUMA_NO_NODE ,GFP_KERNEL , data_size); +if (!shared_pages) +return -ENOMEM ; + + data_buf_shared =page_address (shared_pages); + + rhicall->imm =0 ; + rhicall->gprs[0 ] =RHI_DA_OBJECT_READ ; + rhicall->gprs[1 ] = vdev_id; + rhicall->gprs[2 ] = da_object_type; + rhicall->gprs[3 ] =virt_to_phys (data_buf_shared); + rhicall->gprs[4 ] = data_size; + rhicall->gprs[5 ] =0 ;/* offset to read from */ + ret =rsi_host_call (rhicall); +if (ret !=RSI_SUCCESS || rhicall->gprs[0 ] !=RHI_DA_SUCCESS ) { +free_shared_pages (shared_pages, data_size); +return -EIO ; + } + +if (data_size != rhicall->gprs[1 ]) { +/* Short read */ +free_shared_pages (shared_pages, data_size); +return -EIO ; + } + +void *data_buf_private =kvmemdup (data_buf_shared, + data_size,GFP_KERNEL ); +/* free the shared pages irrespective of error condition */ +free_shared_pages (shared_pages, data_size); +if (!data_buf_private) +return -ENOMEM ; + + *object = data_buf_private; + *object_size = data_size; +return 0 ; +}drivers/virt/coco/arm-cca-guest/rhi-da.h +1
-0@@ -13,4 +13,5 @@ bool rhi_has_da_support(void);int rhi_vdev_set_tdi_state (struct pci_dev *pdev,enum rhi_tdi_state target_state);int rhi_update_vdev_interface_report_cache (struct pci_dev *pdev);int rhi_update_vdev_measurements_cache (struct pci_dev *pdev,const u8 *nonce); +int rhi_read_cached_object (int vdev_id,int da_object_type,void **object,int *object_size);#endif drivers/virt/coco/arm-cca-guest/rsi-da.h +0
-0
drivers/virt/coco/arm-cca-guest/rsi-da.h line 13
Quoted 4 lines
drivers/virt/coco/arm-cca-guest/rsi-da.h +1
-0@@ -10,6 +10,8 @@#include <linux/pci-tsm.h> #include <asm/rsi_smc.h> +#define MAX_CACHE_OBJ_SIZE SZ_16M
Why is the limit 16 MiB? I don't see that limitation in the RHI spec. Does the limit come from PCI TSM?
Regards,
Kameron
Quoted 4 lines
drivers/virt/coco/arm-cca-guest/rsi-da.h +1
-0+struct cca_guest_dsc {struct pci_tsm_devsec pci; };
Re: [RFC PATCH v4 07/11] coco: guest: arm64: Add guest APIs to read host-cached DA objects
Quoted 8 lines · Kameron Carr
Quoted 8 lines
drivers/virt/coco/arm-cca-guest/rsi-da.h +0
-0@@ -10,6 +10,8 @@#include <linux/pci-tsm.h> #include <asm/rsi_smc.h>
Quoted 5 lines
drivers/virt/coco/arm-cca-guest/rsi-da.h line 13
Quoted 1 line
drivers/virt/coco/arm-cca-guest/rsi-da.h +1
-0+#define MAX_CACHE_OBJ_SIZE SZ_16MWhy is the limit 16 MiB? I don't see that limitation in the RHI spec. Does the limit come from PCI TSM?
I based that on the SPDM MeasurementRecordLength, which is 16 MB.
-aneesh
RFC PATCH v4 8/11 coco: guest: arm64: Verify DA evidence with RSI_VDEV_GET_INFO digests
In reply to Aneesh Kumar K.V (Arm)Add guest-side evidence verification based on RSI_VDEV_GET_INFO and use the verified TDISP interface report to validate Realm MMIO mappings.
During lock:
- refresh host caches from device
- read certificate/VCA/interface-report/measurement objects from host cache
- fetch trusted digest metadata from RSI_VDEV_GET_INFO
- verify host-provided objects against RSI digests
- initialize and populate PCI TSM evidence objects
- preserve lock/meas/report nonces and digests in guest state
Add mapping helpers to walk MMIO entries from the TDISP report and perform RSI_VDEV_VALIDATE_MAPPING on map, or RIPAS destroy on unmap. Reject malformed range progress while validating.
During unlock:
- invalidate mappings derived from the evidence report
- unlock the device and tear down MMIO bookkeeping
This ensures host-cached DA objects are cryptographically verified before being trusted for mapping and attestation state transitions.
--- arch/arm64/include/asm/rsi_cmds.h | 40 +++ arch/arm64/include/asm/rsi_smc.h | 60 +++++ drivers/virt/coco/arm-cca-guest/Kconfig | 2 + drivers/virt/coco/arm-cca-guest/arm-cca.c | 287 +++++++++++++++++++++- drivers/virt/coco/arm-cca-guest/rsi-da.c | 145 +++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 22 ++ 6 files changed, 545 insertions(+), 11 deletions(-)
arch/arm64/include/asm/rsi_cmds.h +40 -0
@@ -186,4 +186,44 @@ static inline unsigned long rsi_features(unsigned long index, u64 *out)return res.a0; } +static inline long +rsi_vdev_validate_mapping (unsigned long vdev_id, +phys_addr_t ipa_base,phys_addr_t ipa_top, +phys_addr_t pa_base,phys_addr_t *next_ipa, +unsigned long flags,unsigned long lock_nonce, +unsigned long meas_nonce,unsigned long report_nonce) +{ +struct arm_smccc_1_2_regs res; +struct arm_smccc_1_2_regs regs = { + .a0 =SMC_RSI_VDEV_VALIDATE_MAPPING , + .a1 = vdev_id, + .a2 = ipa_base, + .a3 = ipa_top, + .a4 = pa_base, + .a5 = flags, + .a6 = lock_nonce, + .a7 = meas_nonce, + .a8 = report_nonce, + }; + +arm_smccc_1_2_invoke (®s, &res); + *next_ipa = res.a1; + +if (res.a2 !=RSI_ACCEPT ) +return -EPERM ; + +return res.a0; +} + +static inline unsigned long rsi_vdev_get_info (unsigned long vdev_id, +unsigned long digest_phys) +{ +struct arm_smccc_res res; + +arm_smccc_1_1_invoke (SMC_RSI_VDEV_GET_INFO , + vdev_id, digest_phys, &res); + +return res.a0; +} +#endif /* __ASM_RSI_CMDS_H */
arch/arm64/include/asm/rsi_smc.h +60 -0
72 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/Kconfig +2 -0
@@ -5,6 +5,8 @@ config ARM_CCA_GUEST tristate "Arm CCA Guest driver" depends on ARM64 select PCI_TSM if PCI + select CRYPTO_LIB_SHA256 + select CRYPTO_LIB_SHA512 select TSM_REPORTS select AUXILIARY_BUS help
drivers/virt/coco/arm-cca-guest/arm-cca.c +276 -11
315 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rsi-da.c +145 -0
154 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rsi-da.h +22 -0
@@ -9,11 +9,23 @@#include <linux/pci.h> #include <linux/pci-tsm.h> #include <asm/rsi_smc.h> +#include <crypto/sha2.h> #define MAX_CACHE_OBJ_SIZE SZ_16M +struct dsm_device_info { +u64 lock_nonce; +u64 meas_nonce; +u64 report_nonce; +u8 cert_digest[SHA512_DIGEST_SIZE ]; +u8 vca_digest[SHA512_DIGEST_SIZE ]; +u8 meas_digest[SHA512_DIGEST_SIZE ]; +u8 report_digest[SHA512_DIGEST_SIZE ]; +}; +struct cca_guest_dsc {struct pci_tsm_devsec pci; +struct dsm_device_info dev_info; };static inline struct cca_guest_dsc *to_cca_guest_dsc (struct pci_dev *pdev)
@@ -39,5 +51,15 @@ int cca_device_unlock(struct pci_dev *pdev);int cca_update_device_object_cache (struct pci_dev *pdev,const u8 *nonce);struct page *alloc_shared_pages (int nid,gfp_t gfp_mask,unsigned long min_size);int free_shared_pages (struct page *page,unsigned long min_size); +int cca_map_evidence_report_range (struct pci_dev *pdev,struct pci_tsm_mmio *mmio); +int cca_unmap_evidence_report_range (struct pci_dev *pdev); +int cca_verify_digest (u64 hash_algo,uint8_t *report, +size_t report_size,uint8_t *report_digest); +int cca_verify_digests (u64 hash_algo, +uint8_t *certificate,size_t certificate_size, +uint8_t *vca,size_t vca_size, +uint8_t *interface_report,size_t interface_report_size, +uint8_t *measurements,size_t measurements_size, +struct rsi_vdevice_info *dev_info);#endif
Signature · 1 line
2.43.0
Re: [RFC PATCH v4 08/11] coco: guest: arm64: Verify DA evidence with RSI_VDEV_GET_INFO digests
Quoted 96 lines · Aneesh Kumar K.V (Arm)
Add guest-side evidence verification based on
RSI_VDEV_GET_INFOand use the verified TDISP interface report to validate Realm MMIO mappings.During lock:
- refresh host caches from device
- read certificate/VCA/interface-report/measurement objects from host cache
- fetch trusted digest metadata fromRSI_VDEV_GET_INFO
- verify host-provided objects against RSI digests
- initialize and populate PCI TSM evidence objects
- preserve lock/meas/report nonces and digests in guest stateAdd mapping helpers to walk MMIO entries from the TDISP report and perform
RSI_VDEV_VALIDATE_MAPPINGon map, or RIPAS destroy on unmap. Reject malformed range progress while validating.During unlock:
- invalidate mappings derived from the evidence report
- unlock the device and tear down MMIO bookkeepingThis ensures host-cached DA objects are cryptographically verified before being trusted for mapping and attestation state transitions.
Signed-off-by Aneesh Kumar K.V (Arm) <[email protected]>--- arch/arm64/include/asm/rsi_cmds.h | 40 +++ arch/arm64/include/asm/rsi_smc.h | 60 +++++ drivers/virt/coco/arm-cca-guest/Kconfig | 2 + drivers/virt/coco/arm-cca-guest/arm-cca.c | 287 +++++++++++++++++++++- drivers/virt/coco/arm-cca-guest/rsi-da.c | 145 +++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 22 ++ 6 files changed, 545 insertions(+), 11 deletions(-)arch/arm64/include/asm/rsi_cmds.h +40
-0@@ -186,4 +186,44 @@ static inline unsigned long rsi_features(unsigned long index, u64 *out)return res.a0; } +static inline long +rsi_vdev_validate_mapping (unsigned long vdev_id, +phys_addr_t ipa_base,phys_addr_t ipa_top, +phys_addr_t pa_base,phys_addr_t *next_ipa, +unsigned long flags,unsigned long lock_nonce, +unsigned long meas_nonce,unsigned long report_nonce) +{ +struct arm_smccc_1_2_regs res; +struct arm_smccc_1_2_regs regs = { + .a0 =SMC_RSI_VDEV_VALIDATE_MAPPING , + .a1 = vdev_id, + .a2 = ipa_base, + .a3 = ipa_top, + .a4 = pa_base, + .a5 = flags, + .a6 = lock_nonce, + .a7 = meas_nonce, + .a8 = report_nonce, + }; + +arm_smccc_1_2_invoke (®s, &res); + *next_ipa = res.a1; + +if (res.a2 !=RSI_ACCEPT ) +return -EPERM ; + +return res.a0; +} + +static inline unsigned long rsi_vdev_get_info (unsigned long vdev_id, +unsigned long digest_phys) +{ +struct arm_smccc_res res; + +arm_smccc_1_1_invoke (SMC_RSI_VDEV_GET_INFO , + vdev_id, digest_phys, &res); + +return res.a0; +} +#endif /* __ASM_RSI_CMDS_H */ arch/arm64/include/asm/rsi_smc.h +3
-0@@ -125,6 +125,9 @@ #ifndef __ASSEMBLER__ +#define RSI_HASH_SHA_256 0 +#define RSI_HASH_SHA_512 1 + struct realm_config { union { struct {
arch/arm64/include/asm/rsi_smc.h struct realm_config { · line 189
Quoted 4 lines
arch/arm64/include/asm/rsi_smc.h +1
-0@@ -183,6 +186,63 @@ struct realm_config {*/ #define SMC_RSI_IPA_STATE_GET SMC_RSI_FID(0x198) +#define RSI_VDEV_REPORT_FORMAT_TDISP 0x1
You define this but never verify the format_type.
arch/arm64/include/asm/rsi_smc.h struct realm_config { · line 201
Quoted 12 lines
arch/arm64/include/asm/rsi_smc.h +12
-0+struct rsi_vdevice_info { + union { + struct { + u64 flags; + u64 id_index; + union { + u8 hash_algo; + u64 padding0; + }; + u64 lock_nonce; + u64 meas_nonce; + u64 report_nonce;
Nit:
I found the name lock_nonce confusing. I originally assumed this was the nonce passed in when calling RHI_DA_VDEV_GET_MEASUREMENTS. The new RSI spec (2.0 beta 3) names these lock_seq, meas_seq, report_seq. Consider matching these names since the values represent sequence counters and to differentiate them from the nonce used in RHI_DA_VDEV_GET_MEASUREMENTS.
Quoted 425 lines
arch/arm64/include/asm/rsi_smc.h +44
-0+union { +u8 format_type; +u64 padding1; + }; +u64 format_version; +union { +u8 state; +u64 padding2; + }; + + }; +u8 padding3[0x80 ]; + }; +union {/* 0x80 */ +struct { +u8 protocol_data_digest[0x40 ]; +u8 identity_digest[0x40 ]; +u8 pubkey_digest[0x40 ]; +u8 meas_digest[0x40 ]; +u8 report_digest[0x40 ]; + }; +u8 padding4[0x1c0 -0x80 ]; + }; +union {/* 0x1c0 */ +struct { +u64 vsmmu_addr; +u64 vsmu_vsid; + }; +u8 padding5[0x200 -0x1c0 ]; + }; +}; + +/* +* Get information for a device. +* arg1 == Realm device identifier (vdev id) +* arg2 == IPA to which configuration data will be written +* ret0 == Status / error +*/ +#define SMC_RSI_VDEV_GET_INFO SMC_RSI_FID(0x19D) + +#define RSI_DEV_MEM_COHERENT BIT(0) +#define RSI_DEV_MEM_LIMITED_ORDER BIT(1) +#define SMC_RSI_VDEV_VALIDATE_MAPPING SMC_RSI_FID(0x19F) + struct rsi_host_call { union { u16 imm;drivers/virt/coco/arm-cca-guest/Kconfig +2
-0@@ -5,6 +5,8 @@ config ARM_CCA_GUEST tristate "Arm CCA Guest driver" depends on ARM64 select PCI_TSM if PCI + select CRYPTO_LIB_SHA256 + select CRYPTO_LIB_SHA512 select TSM_REPORTS select AUXILIARY_BUS helpdrivers/virt/coco/arm-cca-guest/arm-cca.c +276
-11@@ -198,39 +198,304 @@ static void unregister_cca_tsm_report(void *data) }#ifdef CONFIG_PCI_TSM + +static int __maybe_unused +cca_update_dev_measurements (struct pci_dev *pdev,const u8 *nonce) +{ +int ret; +void *measurements; +int measurements_size; +int vdev_id =rsi_vdev_id (pdev); +struct pci_tsm_evidence *evidence; +struct rsi_vdevice_info *dev_info; +struct pci_tsm_evidence_object *obj; +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); + +/* Regenerate the measurement from the device */ + ret =rhi_update_vdev_measurements_cache (pdev, nonce); +if (ret) { +pci_err (pdev,"failed to update device measurements from device (%d)\n" , ret); +return ret; + } + + ret =rhi_read_cached_object (vdev_id,RHI_DA_OBJECT_MEASUREMENT , + &measurements, &measurements_size); +if (ret) { +pci_err (pdev,"failed to get device measurements from the host (%d)\n" , ret); +return ret; + } + + dev_info =kmalloc (sizeof (*dev_info),GFP_KERNEL ); +if (!dev_info) { + ret = -ENOMEM ; + goto free_measurements; + } + +if (rsi_vdev_get_info (vdev_id,virt_to_phys (dev_info))) { +pci_err (pdev,"failed to get device digests (%d)\n" , ret); + ret = -EIO ; + goto free_dev_info; + } + +/* Make sure no unexpected lock/unlock operation happened from guest */ +if (dsc->dev_info.lock_nonce != dev_info->lock_nonce) { +pci_err (pdev,"Unexpected lock/unlock operation from host (%d)\n" , ret); + ret = -EIO ; + goto free_dev_info; + } + +/* +* Verify that the digests of the provided reports match with the +* digests from RMM +*/ + ret =cca_verify_digest (dev_info->hash_algo, measurements, + measurements_size, dev_info->meas_digest); +if (ret) { +pci_err (pdev,"RMM provided digest mismatch (%d)\n" , ret); + goto free_dev_info; + } + +/* fill evidence details */ + evidence = &dsc->pci.base_tsm.evidence; + +/* Now update the evidence under lock. */ +down_write (&evidence->lock); + evidence->generation = dev_info->meas_nonce; + + obj = &evidence->obj[PCI_TSM_EVIDENCE_TYPE_MEASUREMENTS ]; +if (obj->data) +kvfree (obj->data); + obj->data = measurements; + obj->len = measurements_size; + + dsc->dev_info.meas_nonce = dev_info->meas_nonce; +memcpy (dsc->dev_info.meas_digest, dev_info->meas_digest,SHA512_DIGEST_SIZE ); +up_write (&evidence->lock); + +kfree (dev_info); +return 0 ; + +free_dev_info: +kfree (dev_info); +free_measurements: +kvfree (measurements); +return ret; +} + +static int cca_collect_dev_evidence (struct pci_dev *pdev,struct cca_guest_dsc *dsc) +{ +int ret; +int vdev_id =rsi_vdev_id (pdev); +struct pci_tsm_evidence *evidence; +struct rsi_vdevice_info *dev_info; +struct pci_tsm_evidence_object *obj; +void *certificate, *vca, *interface_report, *measurements; +int certificate_size, vca_size, interface_report_size, measurements_size; + +/* Regenerate interface report and measurement from the device */ + ret =cca_update_device_object_cache (pdev,NULL ); +if (ret) { +pci_err (pdev,"failed to update device objects from device (%d)\n" , ret); +return ret; + } + + ret =rhi_read_cached_object (vdev_id,RHI_DA_OBJECT_CERTIFICATE , + &certificate, &certificate_size); +if (ret) { +pci_err (pdev,"failed to get device certificate from the host (%d)\n" , ret); +return ret; + } + + ret =rhi_read_cached_object (vdev_id,RHI_DA_OBJECT_VCA , &vca, &vca_size); +if (ret) { +pci_err (pdev,"failed to get device VCA from the host (%d)\n" , ret); + goto free_certificate; + } + + ret =rhi_read_cached_object (vdev_id,RHI_DA_OBJECT_INTERFACE_REPORT , + &interface_report, &interface_report_size); +if (ret) { +pci_err (pdev,"failed to get interface report from the host (%d)\n" , ret); + goto free_vca; + } + + ret =rhi_read_cached_object (vdev_id,RHI_DA_OBJECT_MEASUREMENT , + &measurements, &measurements_size); +if (ret) { +pci_err (pdev,"failed to get device certificate from the host (%d)\n" , ret); + goto free_interface_report; + } + + dev_info =kmalloc (sizeof (*dev_info),GFP_KERNEL ); +if (!dev_info) { + ret = -ENOMEM ; + goto free_measurements; + } + +if (rsi_vdev_get_info (vdev_id,virt_to_phys (dev_info))) { +pci_err (pdev,"failed to get device digests (%d)\n" , ret); + ret = -EIO ; + goto free_dev_info; + } + +/* Make sure no unexpected lock/unlock operation happened from guest */ +if (dsc->dev_info.lock_nonce != dev_info->lock_nonce) { +pci_err (pdev,"Unexpected lock/unlock operation from host (%d)\n" , ret); + ret = -EIO ; + goto free_dev_info; + } + +/* +* Verify that the digests of the provided reports match with the +* digests from RMM +*/ + ret =cca_verify_digests (dev_info->hash_algo, certificate, + certificate_size, vca, vca_size, + interface_report, interface_report_size, + measurements, measurements_size, dev_info); +if (ret) { +pci_err (pdev,"RMM provided digest mismatch (%d)\n" , ret); + goto free_dev_info; + } + +/* fill evidence details */ + evidence = &dsc->pci.base_tsm.evidence; + +/* Now update the evidence under lock. */ +down_write (&evidence->lock); + evidence->generation = dev_info->meas_nonce; + +/* we default to slot 0 in pdev_create */ + obj = &evidence->obj[PCI_TSM_EVIDENCE_TYPE_CERT0 ]; +WARN_ON (obj->data); + obj->data = certificate; + obj->len = certificate_size; + + obj = &evidence->obj[PCI_TSM_EVIDENCE_TYPE_VCA ]; +WARN_ON (obj->data); + obj->data = vca; + obj->len = vca_size; + + obj = &evidence->obj[PCI_TSM_EVIDENCE_TYPE_REPORT ]; +WARN_ON (obj->data); + obj->data = interface_report; + obj->len = interface_report_size; + + obj = &evidence->obj[PCI_TSM_EVIDENCE_TYPE_MEASUREMENTS ]; +WARN_ON (obj->data); + obj->data = measurements; + obj->len = measurements_size; + + dsc->dev_info.meas_nonce = dev_info->meas_nonce; + dsc->dev_info.report_nonce = dev_info->report_nonce; +memcpy (dsc->dev_info.cert_digest, dev_info->identity_digest,SHA512_DIGEST_SIZE ); +memcpy (dsc->dev_info.vca_digest, dev_info->protocol_data_digest,SHA512_DIGEST_SIZE ); +memcpy (dsc->dev_info.meas_digest, dev_info->meas_digest,SHA512_DIGEST_SIZE ); +memcpy (dsc->dev_info.report_digest, dev_info->report_digest,SHA512_DIGEST_SIZE ); +up_write (&evidence->lock); + +kfree (dev_info); +return 0 ; + +free_dev_info: +kfree (dev_info); +free_measurements: +kvfree (measurements); +free_interface_report: +kvfree (interface_report); +free_vca: +kvfree (vca); +free_certificate: +kvfree (certificate); +return ret; +} +static struct pci_tsm *cca_tsm_lock (struct tsm_dev *tsm_dev,struct pci_dev *pdev) {int ret; +enum hash_algo digest_algo; +struct cca_guest_dsc *cca_dsc; +int vdev_id =rsi_vdev_id (pdev); +struct rsi_vdevice_info *dev_info; - struct cca_guest_dsc *cca_dsc __free(kfree) = - kzalloc_obj(struct cca_guest_dsc); + cca_dsc = kzalloc_obj(struct cca_guest_dsc);if (!cca_dsc)return ERR_PTR (-ENOMEM ); ret =pci_tsm_devsec_constructor (pdev, &cca_dsc->pci, tsm_dev);if (ret) -return ERR_PTR (ret); + goto free_cca_dsc; ret =cca_device_lock (pdev);if (ret) -return ERR_PTR (ret); + goto free_cca_dsc; -/* collect evidence without nonce */ - ret =cca_update_device_object_cache (pdev,NULL ); -if (ret) { -cca_device_unlock (pdev); -return ERR_PTR (ret); + dev_info = kmalloc_obj(struct rsi_vdevice_info); +if (!dev_info) { + ret = -ENOMEM ; + goto dev_unlock; + } + +if (rsi_vdev_get_info (vdev_id,virt_to_phys (dev_info))) { + ret = -EIO ; + goto free_dev_info; + } + +/* collect the lock nonce */ + cca_dsc->dev_info.lock_nonce = dev_info->lock_nonce; + +switch (dev_info->hash_algo) { +case RSI_HASH_SHA_256 : + digest_algo =HASH_ALGO_SHA256 ; +break ; +case RSI_HASH_SHA_512 : + digest_algo =HASH_ALGO_SHA512 ; +break ; +default : + ret = -EIO ; + goto free_dev_info; } +pci_tsm_init_evidence (&cca_dsc->pci.base_tsm.evidence, + dev_info->id_index, digest_algo); -return &no_free_ptr (cca_dsc)->pci.base_tsm; +/* collect evidence without nonce */ + ret =cca_collect_dev_evidence (pdev, cca_dsc); +if (ret) + goto free_dev_info; + +kfree (dev_info); +return &cca_dsc->pci.base_tsm; + +free_dev_info: +kfree (dev_info); +dev_unlock: +cca_device_unlock (pdev); +free_cca_dsc: +kfree (cca_dsc); +return ERR_PTR (ret); }static void cca_tsm_unlock (struct pci_tsm *tsm) { -struct cca_guest_dsc *cca_dsc =to_cca_guest_dsc (tsm->pdev); +long ret; +struct pci_dev *pdev = tsm->pdev; +struct cca_guest_dsc *cca_dsc =to_cca_guest_dsc (pdev); + +/* invalidate dev mapping based on interface report */ + ret =cca_unmap_evidence_report_range (tsm->pdev); +if (ret) { +pci_err (tsm->pdev,"failed to invalidate the interface report\n" ); + goto err_out; + }cca_device_unlock (tsm->pdev); +pci_tsm_mmio_teardown (cca_dsc->pci.mmio); +err_out: +/* +* No error handling from this function. Leave the device locked +*/ +pci_tsm_mmio_free (tsm->pdev, cca_dsc->pci.mmio);kfree (cca_dsc); }drivers/virt/coco/arm-cca-guest/rsi-da.c +30
-0@@ -6,6 +6,7 @@#include <linux/pci.h> #include <linux/mem_encrypt.h> #include <asm/rsi_cmds.h> +#include <crypto/hash.h> #include "rsi-da.h" #include "rhi-da.h" @@ -85,3 +86,147 @@ int cca_update_device_object_cache(struct pci_dev *pdev, const u8 *nonce)return rhi_update_vdev_measurements_cache (pdev, nonce); } + +static inline int +rsi_validate_dev_mapping (unsigned long vdev_id,phys_addr_t start_ipa, +phys_addr_t end_ipa,phys_addr_t io_pa, +unsigned long flags,unsigned long lock_nonce, +unsigned long meas_nonce,unsigned long report_nonce) +{ +unsigned long ret; +phys_addr_t next_ipa; + +while (start_ipa < end_ipa) { + ret =rsi_vdev_validate_mapping (vdev_id, start_ipa, end_ipa, + io_pa, &next_ipa, flags, + lock_nonce, meas_nonce, report_nonce); +if (ret || next_ipa <= start_ipa || next_ipa > end_ipa) +return -EINVAL ; + io_pa += next_ipa - start_ipa; + start_ipa = next_ipa; + } +return 0 ; +} + +static inline int rsi_invalidate_dev_mapping (phys_addr_t start_ipa,phys_addr_t end_ipa) +{ +return rsi_set_memory_range (start_ipa, end_ipa,RSI_RIPAS_EMPTY , +RSI_CHANGE_DESTROYED ); +} + +static int cca_apply_evidence_report_range(struct pci_dev *pdev,
drivers/virt/coco/arm-cca-guest/rsi-da.c int cca_update_device_object_cache(struct pci_dev *pdev, const u8 *nonce) · line 127
Quoted 10 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +10
-0+ struct pci_tsm_mmio *mmio, bool map) +{ + int i, ret; +struct resource *res; +unsigned long mmio_flags =0 ;/* non coherent, not limited order */ +int vdev_id =rsi_vdev_id (pdev); +struct pci_tsm_mmio_entry *entry; +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); + +for (i =0 ; i < mmio->nr; i++) {
In the tsm unlock code path cca_tsm_unlock() -> cca_unmap_evidence_report_range() -> cca_apply_evidence_report_range() there is no null pointer check on mmio / dsc->pci.mmio.
dsc->pci.mmio is only initialized in the tsm accept path, so if the device is locked then unlocked without an accept, this will lead to a null pointer dereference.
Regards,
Kameron
Quoted 149 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +105
-0+ entry =pci_tsm_mmio_entry (mmio, i); + res = &entry->res; + +if (res->desc !=IORES_DESC_ENCRYPTED ) +continue ; + +if (map) + ret =rsi_validate_dev_mapping (vdev_id, res->start, + res->end +1 , entry->tsm_offset, + mmio_flags, + dsc->dev_info.lock_nonce, + dsc->dev_info.meas_nonce, + dsc->dev_info.report_nonce); +else + ret =rsi_invalidate_dev_mapping (res->start, res->end +1 ); +if (ret) +return ret; + } +return 0 ; +} + +int cca_map_evidence_report_range (struct pci_dev *pdev,struct pci_tsm_mmio *mmio) +{ +return cca_apply_evidence_report_range (pdev, mmio, true); +} + +int cca_unmap_evidence_report_range (struct pci_dev *pdev) +{ +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); +struct pci_tsm_mmio *tsm_mmio = dsc->pci.mmio; + +return cca_apply_evidence_report_range (pdev, tsm_mmio, false); +} + +int cca_verify_digest (u64 hash_algo,uint8_t *report, +size_t report_size,uint8_t *report_digest) +{ +u8 digest[SHA512_DIGEST_SIZE ]; +size_t digest_size; +void (*digest_func)(const u8 *data,size_t len,u8 *out); + +switch (hash_algo) { +case RSI_HASH_SHA_256 : + digest_func = sha256; + digest_size =SHA256_DIGEST_SIZE ; +break ; +case RSI_HASH_SHA_512 : + digest_func = sha512; + digest_size =SHA512_DIGEST_SIZE ; +break ; +default : +return -EINVAL ; + } + +digest_func (report, report_size, digest); +if (memcmp (report_digest, digest, digest_size)) +return -EINVAL ; + +return 0 ; +} + +int cca_verify_digests (u64 hash_algo, +uint8_t *certificate,size_t certificate_size, +uint8_t *vca,size_t vca_size, +uint8_t *interface_report,size_t interface_report_size, +uint8_t *measurements,size_t measurements_size, +struct rsi_vdevice_info *dev_info) +{ +int ret; +struct { +uint8_t *report; +size_t size; +uint8_t *digest; + } reports[] = { + { + certificate, + certificate_size, + dev_info->identity_digest + }, + { + vca, + vca_size, + dev_info->protocol_data_digest + }, + { + interface_report, + interface_report_size, + dev_info->report_digest + }, + { + measurements, + measurements_size, + dev_info->meas_digest + } + + }; + +for (int i =0 ; i <ARRAY_SIZE (reports); i++) { + ret =cca_verify_digest (hash_algo, reports[i].report, + reports[i].size, reports[i].digest); +if (ret) +return ret; + } +return 0 ; +}drivers/virt/coco/arm-cca-guest/rsi-da.h +22
-0@@ -9,11 +9,23 @@#include <linux/pci.h> #include <linux/pci-tsm.h> #include <asm/rsi_smc.h> +#include <crypto/sha2.h> #define MAX_CACHE_OBJ_SIZE SZ_16M +struct dsm_device_info { +u64 lock_nonce; +u64 meas_nonce; +u64 report_nonce; +u8 cert_digest[SHA512_DIGEST_SIZE ]; +u8 vca_digest[SHA512_DIGEST_SIZE ]; +u8 meas_digest[SHA512_DIGEST_SIZE ]; +u8 report_digest[SHA512_DIGEST_SIZE ]; +}; +struct cca_guest_dsc {struct pci_tsm_devsec pci; +struct dsm_device_info dev_info; };static inline struct cca_guest_dsc *to_cca_guest_dsc (struct pci_dev *pdev)@@ -39,5 +51,15 @@ int cca_device_unlock(struct pci_dev *pdev);int cca_update_device_object_cache (struct pci_dev *pdev,const u8 *nonce);struct page *alloc_shared_pages (int nid,gfp_t gfp_mask,unsigned long min_size);int free_shared_pages (struct page *page,unsigned long min_size); +int cca_map_evidence_report_range (struct pci_dev *pdev,struct pci_tsm_mmio *mmio); +int cca_unmap_evidence_report_range (struct pci_dev *pdev); +int cca_verify_digest (u64 hash_algo,uint8_t *report, +size_t report_size,uint8_t *report_digest); +int cca_verify_digests (u64 hash_algo, +uint8_t *certificate,size_t certificate_size, +uint8_t *vca,size_t vca_size, +uint8_t *interface_report,size_t interface_report_size, +uint8_t *measurements,size_t measurements_size, +struct rsi_vdevice_info *dev_info);#endif
Re: [RFC PATCH v4 08/11] coco: guest: arm64: Verify DA evidence with RSI_VDEV_GET_INFO digests
Quoted 13 lines · Kameron Carr
Quoted 11 lines · Aneesh Kumar K.V (Arm)
arch/arm64/include/asm/rsi_smc.h +11
-0+struct rsi_vdevice_info { + union { + struct { + u64 flags; + u64 id_index; + union { + u8 hash_algo; + u64 padding0; + }; + u64 lock_nonce; + u64 meas_nonce;
Quoted 9 lines
Review
Quoted 1 line
(quoted diff) +1
-0+ u64 report_nonce;Nit:
I found the namelock_nonceconfusing. I originally assumed this was the nonce passed in when callingRHI_DA_VDEV_GET_MEASUREMENTS. The new RSI spec (2.0 beta 3) names theselock_seq,meas_seq,report_seq. Consider matching these names since the values represent sequence counters and to differentiate them from the nonce used inRHI_DA_VDEV_GET_MEASUREMENTS.
Will switch to that name.
Quoted 14 lines
Quoted 14 lines
arch/arm64/include/asm/rsi_smc.h +13
-0+union { +u8 format_type; +u64 padding1; + }; +u64 format_version; +union { +u8 state; +u64 padding2; + }; + + }; +u8 padding3[0x80 ]; + };
...
Quoted 16 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c int cca_update_device_object_cache(struct pci_dev *pdev, const u8 *nonce) · line 127
Quoted 11 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +11
-0+static int cca_apply_evidence_report_range (struct pci_dev *pdev, +struct pci_tsm_mmio *mmio,bool map) +{ +int i, ret; +struct resource *res; +unsigned long mmio_flags =0 ;/* non coherent, not limited order */ +int vdev_id =rsi_vdev_id (pdev); +struct pci_tsm_mmio_entry *entry; +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); + +for (i =0 ; i < mmio->nr; i++) {In the tsm unlock code path
cca_tsm_unlock()->cca_unmap_evidence_report_range()->cca_apply_evidence_report_range()there is no null pointer check on mmio /dsc->pci.mmio.
Quoted 4 lines
dsc->pci.mmiois only initialized in the tsm accept path, so if the device is locked then unlocked without an accept, this will lead to a null pointer dereference.
I already have a fix for it in my development branch.
modified drivers/virt/coco/arm-cca-guest/arm-cca.c
@@ -489,13 +489,15 @@ static void cca_tsm_unlock(struct pci_tsm *tsm)
}
cca_device_unlock(tsm->pdev);
- pci_tsm_mmio_teardown(cca_dsc->pci.mmio);
+ if (cca_dsc->pci.mmio)
+ pci_tsm_mmio_teardown(cca_dsc->pci.mmio);
err_out:
/*
* No error handling from this function. Leave the device locked */
- pci_tsm_mmio_free(tsm->pdev, cca_dsc->pci.mmio);
+ if (cca_dsc->pci.mmio)
+ pci_tsm_mmio_free(tsm->pdev, cca_dsc->pci.mmio);
kfree(cca_dsc);
}
modified drivers/virt/coco/arm-cca-guest/rsi-da.c
@@ -155,7 +155,9 @@ int cca_unmap_evidence_report_range(struct pci_dev *pdev)
struct cca_guest_dsc *dsc = to_cca_guest_dsc(pdev); struct pci_tsm_mmio *tsm_mmio = dsc->pci.mmio;
- return cca_apply_evidence_report_range(pdev, tsm_mmio, false);
+ if (tsm_mmio)
+ return cca_apply_evidence_report_range(pdev, tsm_mmio, false);
+ return 0;
}
int cca_verify_digest(u64 hash_algo, uint8_t *report,
-aneesh
RFC PATCH v4 9/11 coco: guest: arm64: Hook TSM accept to Realm TDISP RUN transition
In reply to Aneesh Kumar K.V (Arm)Add an accept callback in pci_tsm_ops and implement cca_device_accept() to:
- verify evidence generation (lock_nonce)
- allocate and register protected MMIO ranges
- transition TDI state to RUN
--- drivers/virt/coco/arm-cca-guest/arm-cca.c | 20 +++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.c | 43 +++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 1 + 3 files changed, 64 insertions(+)
drivers/virt/coco/arm-cca-guest/arm-cca.c +20 -0
@@ -499,9 +499,29 @@ static void cca_tsm_unlock(struct pci_tsm *tsm)kfree (cca_dsc); } +static int __cca_tsm_accept (struct pci_dev *pdev,unsigned long lock_nonce) +{ +int ret; + + ret =cca_device_accept (pdev, lock_nonce); +if (ret) { +pci_err (pdev,"failed to transition the device to run state (%d)\n" , ret); +return ret; + } +return 0 ; +} + +static int cca_tsm_accept (struct pci_dev *pdev) +{ +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); + +return __cca_tsm_accept (pdev, dsc->dev_info.lock_nonce); +} +static struct pci_tsm_ops cca_devsec_pci_ops = { .lock = cca_tsm_lock, .unlock = cca_tsm_unlock, + .accept = cca_tsm_accept, };static void cca_devsec_tsm_remove (void *tsm_dev)
drivers/virt/coco/arm-cca-guest/rsi-da.c +43 -0
46 lines not on this page · raw message
drivers/virt/coco/arm-cca-guest/rsi-da.h +1 -0
@@ -61,5 +61,6 @@ int cca_verify_digests(u64 hash_algo, uint8_t *interface_report, size_t interface_report_size, uint8_t *measurements, size_t measurements_size, struct rsi_vdevice_info *dev_info); +int cca_device_accept (struct pci_dev *pdev,unsigned long lock_nonce);#endif
Signature · 1 line
2.43.0
Re: [RFC PATCH v4 09/11] coco: guest: arm64: Hook TSM accept to Realm TDISP RUN transition
Quoted 84 lines · Aneesh Kumar K.V (Arm)
Add an accept callback in
pci_tsm_opsand implementcca_device_accept()to:
- verify evidence generation (lock_nonce)
- allocate and register protected MMIO ranges
- transition TDI state to RUNReviewed-by Jonathan Cameron <[email protected]>Signed-off-by Aneesh Kumar K.V (Arm) <[email protected]>--- drivers/virt/coco/arm-cca-guest/arm-cca.c | 20 +++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.c | 43 +++++++++++++++++++++++ drivers/virt/coco/arm-cca-guest/rsi-da.h | 1 + 3 files changed, 64 insertions(+)drivers/virt/coco/arm-cca-guest/arm-cca.c +20
-0@@ -499,9 +499,29 @@ static void cca_tsm_unlock(struct pci_tsm *tsm)kfree (cca_dsc); } +static int __cca_tsm_accept (struct pci_dev *pdev,unsigned long lock_nonce) +{ +int ret; + + ret =cca_device_accept (pdev, lock_nonce); +if (ret) { +pci_err (pdev,"failed to transition the device to run state (%d)\n" , ret); +return ret; + } +return 0 ; +} + +static int cca_tsm_accept (struct pci_dev *pdev) +{ +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); + +return __cca_tsm_accept (pdev, dsc->dev_info.lock_nonce); +} +static struct pci_tsm_ops cca_devsec_pci_ops = { .lock = cca_tsm_lock, .unlock = cca_tsm_unlock, + .accept = cca_tsm_accept, };static void cca_devsec_tsm_remove (void *tsm_dev)drivers/virt/coco/arm-cca-guest/rsi-da.c +29
-0@@ -230,3 +230,46 @@ int cca_verify_digests(u64 hash_algo, }return 0 ; } + +int cca_device_accept (struct pci_dev *pdev,unsigned long lock_nonce) +{ +int ret; +struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev); + +if (lock_nonce != dsc->dev_info.lock_nonce) { +pci_err (pdev,"Device evidence generation mismatch\n" ); +return -EIO ; + } + +/* Allocation private mmio range based on interface report. */ + struct pci_tsm_mmio *tsm_mmio __free(kfree) = pci_tsm_mmio_alloc(pdev); +if (!tsm_mmio) { +pci_err (pdev,"Protected mmio range allocation failure\n" ); +return -ENOMEM ; + } + +/* +* Present the private mmio range in the resource hierarchy. +* We don't use this for ioremap, ioremap check the RIPAS value. +*/ + ret =pci_tsm_mmio_setup (pdev, tsm_mmio); +if (ret) { +pci_err (pdev,"Protected mmio setup failure\n" ); +return ret; + } + + ret =cca_map_evidence_report_range (pdev, tsm_mmio);
drivers/virt/coco/arm-cca-guest/rsi-da.c int cca_verify_digests(u64 hash_algo, · line 271
Quoted 10 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +10
-0+if (ret) { +pci_err (pdev,"failed to validate the interface report\n" ); +return ret; + } + + ret =rhi_vdev_set_tdi_state (pdev,RHI_DA_TDI_CONFIG_RUN ); +if (ret) { +pci_err (pdev,"failed to switch the device (%u) to RUN state\n" , ret); +return ret; + }
After calling pci_tsm_mmio_setup() we have mappings from insert_resource() then failures from later return codes never call mmio_teardown() so remove_resource() is never called, only kfree on the tsm_mmio.
Likewise after cca_map_evidence_report_range() the mmio entry memory ranges have state RIPAS_DEV. Later failures never restore RIPAS_EMPTY.
Could clean up be handled better? Is there a reason these failures don't have a rollback path?
Regards,
Kameron
Quoted 15 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +4
-0+ + dsc->pci.mmio =no_free_ptr (tsm_mmio); +return 0 ; +}drivers/virt/coco/arm-cca-guest/rsi-da.h +1
-0@@ -61,5 +61,6 @@ int cca_verify_digests(u64 hash_algo, uint8_t *interface_report, size_t interface_report_size, uint8_t *measurements, size_t measurements_size, struct rsi_vdevice_info *dev_info); +int cca_device_accept (struct pci_dev *pdev,unsigned long lock_nonce);#endif
Re: [RFC PATCH v4 09/11] coco: guest: arm64: Hook TSM accept to Realm TDISP RUN transition
Quoted 1 line · Kameron Carr
On 4/27/2026 1:28 AM, Aneesh Kumar K.V (Arm) wrote:
...
Quoted 27 lines
Quoted 12 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +11
-0+/* +* Present the private mmio range in the resource hierarchy. +* We don't use this for ioremap, ioremap check the RIPAS value. +*/ + ret =pci_tsm_mmio_setup (pdev, tsm_mmio); +if (ret) { +pci_err (pdev,"Protected mmio setup failure\n" ); +return ret; + } + + ret =cca_map_evidence_report_range (pdev, tsm_mmio);drivers/virt/coco/arm-cca-guest/rsi-da.c int cca_verify_digests(u64 hash_algo, · line 271
Quoted 10 lines
drivers/virt/coco/arm-cca-guest/rsi-da.c +10
-0+if (ret) { +pci_err (pdev,"failed to validate the interface report\n" ); +return ret; + } + + ret =rhi_vdev_set_tdi_state (pdev,RHI_DA_TDI_CONFIG_RUN ); +if (ret) { +pci_err (pdev,"failed to switch the device (%u) to RUN state\n" , ret); +return ret; + }After calling
pci_tsm_mmio_setup()we have mappings frominsert_resource()then failures from later return codes never callmmio_teardown()soremove_resource()is never called, only kfree on thetsm_mmio.
Quoted 6 lines
Likewise after
cca_map_evidence_report_range()the mmio entry memory ranges have stateRIPAS_DEV. Later failures never restoreRIPAS_EMPTY.Could clean up be handled better? Is there a reason these failures don't have a rollback path?
Thanks for the review. I’ll incorporate these changes in the next version.
-aneesh
RFC PATCH v4 10/11 coco: arm64: dma: Update force_dma_unencrypted for accepted devices
In reply to Aneesh Kumar K.V (Arm)This change updates the DMA behavior for accepted devices by assuming they access only private memory. Currently, the DMA API does not provide a mechanism for allocating shared memory that can be accessed by both the secure realm and the non-secure host. Accepted devices are therefore expected to operate entirely within the private memory space.
If future use cases require accepted devices to interact with shared memory— for example, for host-device communication, we will need to extend the DMA interface to support such allocation semantics. This commit lays the groundwork for that by clearly defining the current assumption and isolating the enforcement to force_dma_unencrypted.
Treat swiotlb and decrypted DMA pools as shared-memory paths and avoid them for accepted devices by:
- returning false from is_swiotlb_for_alloc() for accepted devices
- returning false from is_swiotlb_active() for accepted devices
- bypassing dma-direct atomic pool usage for accepted devices
This is based on the current assumption that accepted devices operate on private Realm memory only, and prevents accidental fallback to shared/decrypted DMA backends.
--- arch/arm64/include/asm/mem_encrypt.h | 6 +----- arch/arm64/mm/mem_encrypt.c | 10 ++++++++++ include/linux/swiotlb.h | 3 +++ kernel/dma/direct.c | 8 ++++++++ kernel/dma/swiotlb.c | 3 +++ 5 files changed, 25 insertions(+), 5 deletions(-)
arch/arm64/include/asm/mem_encrypt.h +1 -5
@@ -15,17 +15,13 @@ int arm64_mem_crypt_ops_register(const struct arm64_mem_crypt_ops *ops);int set_memory_encrypted (unsigned long addr,int numpages);int set_memory_decrypted (unsigned long addr,int numpages); +bool force_dma_unencrypted (struct device *dev);#define mem_decrypt_granule_size mem_decrypt_granule_sizesize_t mem_decrypt_granule_size (void );int realm_register_memory_enc_ops (void ); -static inline bool force_dma_unencrypted (struct device *dev) -{ -return is_realm_world (); -} -/* * For Arm CCA guests, canonical addresses are "encrypted", so no changes * required for dma_addr_encrypted().
arch/arm64/mm/mem_encrypt.c +10 -0
@@ -18,6 +18,7 @@#include <linux/err.h> #include <linux/mm.h> #include <linux/mem_encrypt.h> +#include <linux/device.h> static const struct arm64_mem_crypt_ops *crypt_ops;
@@ -67,3 +68,12 @@ size_t mem_decrypt_granule_size(void)return PAGE_SIZE ; }EXPORT_SYMBOL_GPL (mem_decrypt_granule_size); + +bool force_dma_unencrypted (struct device *dev) +{ +if (device_cc_accepted (dev)) +return false; + +return is_realm_world (); +} +EXPORT_SYMBOL_GPL (force_dma_unencrypted);
include/linux/swiotlb.h +3 -0
@@ -296,6 +296,9 @@ bool swiotlb_free(struct device *dev, struct page *page, size_t size);static inline bool is_swiotlb_for_alloc (struct device *dev) { +if (device_cc_accepted (dev)) +return false; +return dev->dma_io_tlb_mem->for_alloc; }#else
kernel/dma/direct.c +8 -0
@@ -158,6 +158,14 @@ static struct page *__dma_direct_alloc_pages(struct device *dev, size_t size,*/ static bool dma_direct_use_pool (struct device *dev,gfp_t gfp) { +/* +* Atomic pools are marked decrypted and are used if we require +* updation of pfn mem encryption attributes or for DMA non-coherent +* device allocation. Both is not true for trusted device. +*/ +if (device_cc_accepted (dev)) +return false; +return !gfpflags_allow_blocking (gfp) && !is_swiotlb_for_alloc (dev); }
kernel/dma/swiotlb.c +3 -0
@@ -1651,6 +1651,9 @@ bool is_swiotlb_active(struct device *dev) {struct io_tlb_mem *mem = dev->dma_io_tlb_mem; +if (device_cc_accepted (dev)) +return false; +return mem && mem->nslabs; }
Signature · 1 line
2.43.0
RFC PATCH v4 11/11 coco: guest: arm64: Enable vdev DMA after attestation
In reply to Aneesh Kumar K.V (Arm)- define SMC_RSI_VDEV_DMA_ENABLE and add wrapper in rsi_cmds.h
- invoke the new helper from the guest accept path once the device passes attestation, rolling back to TDI_LOCKED on failure
--- arch/arm64/include/asm/rsi_cmds.h | 16 ++++++++++++++++ arch/arm64/include/asm/rsi_smc.h | 2 ++ drivers/virt/coco/arm-cca-guest/rsi-da.c | 14 ++++++++++++++ 3 files changed, 32 insertions(+)
arch/arm64/include/asm/rsi_cmds.h +16 -0
@@ -226,4 +226,20 @@ static inline unsigned long rsi_vdev_get_info(unsigned long vdev_id, return res.a0; } +static inline unsigned long __rsi_vdev_dma_enable (unsigned long vdev_id, +unsigned long flags, +unsigned long non_ats_plane, +unsigned long lock_nonce, +unsigned long meas_nonce, +unsigned long report_nonce) +{ +struct arm_smccc_res res; + +arm_smccc_1_1_invoke (SMC_RSI_VDEV_DMA_ENABLE , vdev_id, flags, + non_ats_plane, lock_nonce, + meas_nonce, report_nonce, &res); + +return res.a0; +} +#endif /* __ASM_RSI_CMDS_H */
arch/arm64/include/asm/rsi_smc.h +2 -0
@@ -186,6 +186,8 @@ struct realm_config {*/ #define SMC_RSI_IPA_STATE_GET SMC_RSI_FID(0x198) +#define SMC_RSI_VDEV_DMA_ENABLE SMC_RSI_FID(0x19C) +#define RSI_VDEV_REPORT_FORMAT_TDISP 0x1 struct rsi_vdevice_info { union {
drivers/virt/coco/arm-cca-guest/rsi-da.c +14 -0
@@ -231,9 +231,17 @@ int cca_verify_digests(u64 hash_algo,return 0 ; } +static inline int rsi_vdev_enable_dma (int vdev_id,struct dsm_device_info *dev_info) +{ +/* No ATS support */ +return __rsi_vdev_dma_enable (vdev_id,0 ,0 , dev_info->lock_nonce, + dev_info->meas_nonce, dev_info->report_nonce); +} +int cca_device_accept (struct pci_dev *pdev,unsigned long lock_nonce) {int ret; +int vdev_id =rsi_vdev_id (pdev);struct cca_guest_dsc *dsc =to_cca_guest_dsc (pdev);if (lock_nonce != dsc->dev_info.lock_nonce) {
@@ -270,6 +278,12 @@ int cca_device_accept(struct pci_dev *pdev, unsigned long lock_nonce)return ret; } +if (rsi_vdev_enable_dma (vdev_id, &dsc->dev_info)) { +rhi_vdev_set_tdi_state (pdev,RHI_DA_TDI_CONFIG_LOCKED ); +pci_err (pdev,"failed to enable DMA from the device\n" ); +return -EIO ; + } + dsc->pci.mmio =no_free_ptr (tsm_mmio);return 0 ; }
Signature · 1 line
2.43.0