TSM: Implement ->lock()/->accept() callbacks for ARM CCA TDISP setup

[PATCH v2 04/11] coco: guest: arm64: Add support for updating interface reports from device

Posted by Aneesh Kumar K.V (Arm) 2 weeks ago

Support collecting interface reports using RSI calls. The fetched
interface report will be cached in the host.

Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org>
---
 arch/arm64/include/asm/rhi.h              |  1 +
 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  |  2 ++
 6 files changed, 67 insertions(+)

diff --git a/arch/arm64/include/asm/rhi.h b/arch/arm64/include/asm/rhi.h
index 335930bbf059..5f140015afc3 100644
--- a/arch/arm64/include/asm/rhi.h
+++ b/arch/arm64/include/asm/rhi.h
@@ -40,6 +40,7 @@
 #define RHI_DA_FEATURES			SMC_RHI_CALL(0x004B)
 
 #define RHI_DA_VDEV_CONTINUE		SMC_RHI_CALL(0x0051)
+#define RHI_DA_VDEV_GET_INTERFACE_REPORT SMC_RHI_CALL(0x0052)
 
 #define RHI_DA_TDI_CONFIG_UNLOCKED		0x0
 #define RHI_DA_TDI_CONFIG_LOCKED		0x1
diff --git a/drivers/virt/coco/arm-cca-guest/arm-cca.c b/drivers/virt/coco/arm-cca-guest/arm-cca.c
index f4c9e529c43e..7988ff6d4b2e 100644
--- a/drivers/virt/coco/arm-cca-guest/arm-cca.c
+++ b/drivers/virt/coco/arm-cca-guest/arm-cca.c
@@ -212,6 +212,12 @@ static struct pci_tsm *cca_tsm_lock(struct tsm_dev *tsm_dev, struct pci_dev *pde
 	if (ret)
 		return ERR_PTR(-EIO);
 
+	ret = cca_update_device_object_cache(pdev, cca_dsc);
+	if (ret) {
+		cca_device_unlock(pdev);
+		return ERR_PTR(-EIO);
+	}
+
 	return &no_free_ptr(cca_dsc)->pci.base_tsm;
 }
 
diff --git a/drivers/virt/coco/arm-cca-guest/rhi-da.c b/drivers/virt/coco/arm-cca-guest/rhi-da.c
index 3430d8df4424..f4fb8577e1b5 100644
--- a/drivers/virt/coco/arm-cca-guest/rhi-da.c
+++ b/drivers/virt/coco/arm-cca-guest/rhi-da.c
@@ -156,3 +156,47 @@ int rhi_vdev_set_tdi_state(struct pci_dev *pdev, unsigned long target_state)
 
 	return ret;
 }
+
+static inline int rhi_vdev_get_interface_report(unsigned long vdev_id,
+						unsigned long *cookie)
+{
+	unsigned long ret;
+
+	struct rsi_host_call *rhi_call __free(kfree) =
+		kmalloc(sizeof(struct rsi_host_call), GFP_KERNEL);
+	if (!rhi_call)
+		return -ENOMEM;
+
+	rhi_call->imm = 0;
+	rhi_call->gprs[0] = RHI_DA_VDEV_GET_INTERFACE_REPORT;
+	rhi_call->gprs[1] = vdev_id;
+
+	ret = rsi_host_call(virt_to_phys(rhi_call));
+	if (ret != RSI_SUCCESS)
+		return -EIO;
+
+	*cookie = rhi_call->gprs[1];
+	return map_rhi_da_error(rhi_call->gprs[0]);
+}
+
+int rhi_update_vdev_interface_report_cache(struct pci_dev *pdev)
+{
+	int ret;
+	unsigned long cookie;
+	int vdev_id = rsi_vdev_id(pdev);
+
+	for (;;) {
+		ret = rhi_vdev_get_interface_report(vdev_id, &cookie);
+		if (ret != -EBUSY)
+			break;
+		cond_resched();
+	}
+
+	while (ret == E_INCOMPLETE) {
+		if (should_abort_rhi_call_loop(vdev_id))
+			return -EINTR;
+		ret = rhi_vdev_continue(vdev_id, cookie);
+	}
+
+	return ret;
+}
diff --git a/drivers/virt/coco/arm-cca-guest/rhi-da.h b/drivers/virt/coco/arm-cca-guest/rhi-da.h
index 8dd77c7ed645..d83e61359b35 100644
--- a/drivers/virt/coco/arm-cca-guest/rhi-da.h
+++ b/drivers/virt/coco/arm-cca-guest/rhi-da.h
@@ -11,4 +11,5 @@
 struct pci_dev;
 bool rhi_has_da_support(void);
 int rhi_vdev_set_tdi_state(struct pci_dev *pdev, unsigned long target_state);
+int rhi_update_vdev_interface_report_cache(struct pci_dev *pdev);
 #endif
diff --git a/drivers/virt/coco/arm-cca-guest/rsi-da.c b/drivers/virt/coco/arm-cca-guest/rsi-da.c
index 6770861629f2..c8ba72e4be3e 100644
--- a/drivers/virt/coco/arm-cca-guest/rsi-da.c
+++ b/drivers/virt/coco/arm-cca-guest/rsi-da.c
@@ -34,3 +34,16 @@ int cca_device_unlock(struct pci_dev *pdev)
 	}
 	return 0;
 }
+
+int cca_update_device_object_cache(struct pci_dev *pdev, struct cca_guest_dsc *dsc)
+{
+	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;
+}
diff --git a/drivers/virt/coco/arm-cca-guest/rsi-da.h b/drivers/virt/coco/arm-cca-guest/rsi-da.h
index d1f4641a0fa1..fd4792a50daf 100644
--- a/drivers/virt/coco/arm-cca-guest/rsi-da.h
+++ b/drivers/virt/coco/arm-cca-guest/rsi-da.h
@@ -31,4 +31,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, struct cca_guest_dsc *dsc);
+
 #endif
-- 
2.43.0

Re: [PATCH v2 04/11] coco: guest: arm64: Add support for updating interface reports from device

Posted by Jonathan Cameron 1 week, 5 days ago

On Mon, 17 Nov 2025 19:30:00 +0530
"Aneesh Kumar K.V (Arm)" <aneesh.kumar@kernel.org> wrote:

> Support collecting interface reports using RSI calls. The fetched
> interface report will be cached in the host.
> 
> Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org>

> diff --git a/drivers/virt/coco/arm-cca-guest/arm-cca.c b/drivers/virt/coco/arm-cca-guest/arm-cca.c
> index f4c9e529c43e..7988ff6d4b2e 100644
> --- a/drivers/virt/coco/arm-cca-guest/arm-cca.c
> +++ b/drivers/virt/coco/arm-cca-guest/arm-cca.c
> @@ -212,6 +212,12 @@ static struct pci_tsm *cca_tsm_lock(struct tsm_dev *tsm_dev, struct pci_dev *pde
>  	if (ret)
>  		return ERR_PTR(-EIO);
>  
> +	ret = cca_update_device_object_cache(pdev, cca_dsc);
> +	if (ret) {
> +		cca_device_unlock(pdev);
> +		return ERR_PTR(-EIO);

Why not return ERR_PTR(ret);

> +	}
> +
>  	return &no_free_ptr(cca_dsc)->pci.base_tsm;
>  }
>  
> diff --git a/drivers/virt/coco/arm-cca-guest/rhi-da.c b/drivers/virt/coco/arm-cca-guest/rhi-da.c
> index 3430d8df4424..f4fb8577e1b5 100644
> --- a/drivers/virt/coco/arm-cca-guest/rhi-da.c
> +++ b/drivers/virt/coco/arm-cca-guest/rhi-da.c
> @@ -156,3 +156,47 @@ int rhi_vdev_set_tdi_state(struct pci_dev *pdev, unsigned long target_state)
>  
>  	return ret;
>  }
> +
> +static inline int rhi_vdev_get_interface_report(unsigned long vdev_id,
> +						unsigned long *cookie)
> +{
> +	unsigned long ret;
> +
> +	struct rsi_host_call *rhi_call __free(kfree) =
> +		kmalloc(sizeof(struct rsi_host_call), GFP_KERNEL);
> +	if (!rhi_call)
> +		return -ENOMEM;
> +
> +	rhi_call->imm = 0;
> +	rhi_call->gprs[0] = RHI_DA_VDEV_GET_INTERFACE_REPORT;
> +	rhi_call->gprs[1] = vdev_id;
> +
> +	ret = rsi_host_call(virt_to_phys(rhi_call));

Given every rsi_host_call I've seen in here is passed
output of virt_to_phys() maybe a wrapper that does that is worthwhile?

rsi_host_call_va() or something like that.

> +	if (ret != RSI_SUCCESS)
> +		return -EIO;
> +
> +	*cookie = rhi_call->gprs[1];
> +	return map_rhi_da_error(rhi_call->gprs[0]);
> +}


> diff --git a/drivers/virt/coco/arm-cca-guest/rsi-da.h b/drivers/virt/coco/arm-cca-guest/rsi-da.h
> index d1f4641a0fa1..fd4792a50daf 100644
> --- a/drivers/virt/coco/arm-cca-guest/rsi-da.h
> +++ b/drivers/virt/coco/arm-cca-guest/rsi-da.h
> @@ -31,4 +31,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, struct cca_guest_dsc *dsc);
> +

If the blank line makes sense, should have been in previous patch.

>  #endif

Re: [PATCH v2 04/11] coco: guest: arm64: Add support for updating interface reports from device

Posted by Aneesh Kumar K.V 1 week ago

Jonathan Cameron <jonathan.cameron@huawei.com> writes:

> On Mon, 17 Nov 2025 19:30:00 +0530
> "Aneesh Kumar K.V (Arm)" <aneesh.kumar@kernel.org> wrote:
>
>> Support collecting interface reports using RSI calls. The fetched
>> interface report will be cached in the host.
>> 
>> Signed-off-by: Aneesh Kumar K.V (Arm) <aneesh.kumar@kernel.org>
>
>> diff --git a/drivers/virt/coco/arm-cca-guest/arm-cca.c b/drivers/virt/coco/arm-cca-guest/arm-cca.c
>> index f4c9e529c43e..7988ff6d4b2e 100644
>> --- a/drivers/virt/coco/arm-cca-guest/arm-cca.c
>> +++ b/drivers/virt/coco/arm-cca-guest/arm-cca.c
>> @@ -212,6 +212,12 @@ static struct pci_tsm *cca_tsm_lock(struct tsm_dev *tsm_dev, struct pci_dev *pde
>>  	if (ret)
>>  		return ERR_PTR(-EIO);
>>  
>> +	ret = cca_update_device_object_cache(pdev, cca_dsc);
>> +	if (ret) {
>> +		cca_device_unlock(pdev);
>> +		return ERR_PTR(-EIO);
>
> Why not return ERR_PTR(ret);
>
>> +	}
>> +
>>  	return &no_free_ptr(cca_dsc)->pci.base_tsm;
>>  }
>>  
>> diff --git a/drivers/virt/coco/arm-cca-guest/rhi-da.c b/drivers/virt/coco/arm-cca-guest/rhi-da.c
>> index 3430d8df4424..f4fb8577e1b5 100644
>> --- a/drivers/virt/coco/arm-cca-guest/rhi-da.c
>> +++ b/drivers/virt/coco/arm-cca-guest/rhi-da.c
>> @@ -156,3 +156,47 @@ int rhi_vdev_set_tdi_state(struct pci_dev *pdev, unsigned long target_state)
>>  
>>  	return ret;
>>  }
>> +
>> +static inline int rhi_vdev_get_interface_report(unsigned long vdev_id,
>> +						unsigned long *cookie)
>> +{
>> +	unsigned long ret;
>> +
>> +	struct rsi_host_call *rhi_call __free(kfree) =
>> +		kmalloc(sizeof(struct rsi_host_call), GFP_KERNEL);
>> +	if (!rhi_call)
>> +		return -ENOMEM;
>> +
>> +	rhi_call->imm = 0;
>> +	rhi_call->gprs[0] = RHI_DA_VDEV_GET_INTERFACE_REPORT;
>> +	rhi_call->gprs[1] = vdev_id;
>> +
>> +	ret = rsi_host_call(virt_to_phys(rhi_call));
>
> Given every rsi_host_call I've seen in here is passed
> output of virt_to_phys() maybe a wrapper that does that is worthwhile?
>
> rsi_host_call_va() or something like that.
>

how about static inline unsigned long rsi_host_call(struct rsi_host_call *rhi_call)


>
>> +	if (ret != RSI_SUCCESS)
>> +		return -EIO;
>> +
>> +	*cookie = rhi_call->gprs[1];
>> +	return map_rhi_da_error(rhi_call->gprs[0]);
>> +}
>
>
>> diff --git a/drivers/virt/coco/arm-cca-guest/rsi-da.h b/drivers/virt/coco/arm-cca-guest/rsi-da.h
>> index d1f4641a0fa1..fd4792a50daf 100644
>> --- a/drivers/virt/coco/arm-cca-guest/rsi-da.h
>> +++ b/drivers/virt/coco/arm-cca-guest/rsi-da.h
>> @@ -31,4 +31,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, struct cca_guest_dsc *dsc);
>> +
>
> If the blank line makes sense, should have been in previous patch.
>
>>  #endif