1. Patchew
  2. linux
  3. [PATCH v4 0/9] GenieZone hypervisor drivers
  4. View patch

[PATCH v4 8/9] virt: geniezone: Add dtb config support

Yi-De Wu posted 9 patches 1 year, 5 months ago
There is a newer version of this series
[PATCH v4 8/9] virt: geniezone: Add dtb config support
Posted by Yi-De Wu 1 year, 5 months ago 
From: "Jerry Wang" <ze-yu.wang@mediatek.com>

Hypervisor might need to know the accurate address and size of dtb
passed from userspace. And then hypervisor would parse the dtb and get
vm information.

Signed-off-by: Jerry Wang <ze-yu.wang@mediatek.com>
Signed-off-by: Liju-clr Chen <liju-clr.chen@mediatek.com>
Signed-off-by: Yi-De Wu <yi-de.wu@mediatek.com>
---
 arch/arm64/geniezone/gzvm_arch_common.h |  2 ++
 arch/arm64/geniezone/vm.c               |  8 ++++++++
 drivers/virt/geniezone/gzvm_vm.c        |  8 ++++++++
 include/linux/gzvm_drv.h                |  1 +
 include/uapi/linux/gzvm.h               | 10 ++++++++++
 5 files changed, 29 insertions(+)

diff --git a/arch/arm64/geniezone/gzvm_arch_common.h b/arch/arm64/geniezone/gzvm_arch_common.h
index 5cfeb4df84c5..ccd2a7516eeb 100644
--- a/arch/arm64/geniezone/gzvm_arch_common.h
+++ b/arch/arm64/geniezone/gzvm_arch_common.h
@@ -24,6 +24,7 @@ enum {
 	GZVM_FUNC_PROBE,
 	GZVM_FUNC_ENABLE_CAP,
 	GZVM_FUNC_MEMREGION_PURPOSE,
+	GZVM_FUNC_SET_DTB_CONFIG,
 	NR_GZVM_FUNC
 };
 
@@ -48,6 +49,7 @@ enum {
 #define MT_HVC_GZVM_PROBE		GZVM_HCALL_ID(GZVM_FUNC_PROBE)
 #define MT_HVC_GZVM_ENABLE_CAP		GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)
 #define MT_HVC_GZVM_MEMREGION_PURPOSE	GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE)
+#define MT_HVC_GZVM_SET_DTB_CONFIG	GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG)
 #define GIC_V3_NR_LRS			16
 
 /**
diff --git a/arch/arm64/geniezone/vm.c b/arch/arm64/geniezone/vm.c
index e19a66d6a75d..6062fe85c70e 100644
--- a/arch/arm64/geniezone/vm.c
+++ b/arch/arm64/geniezone/vm.c
@@ -106,6 +106,14 @@ int gzvm_arch_memregion_purpose(struct gzvm *gzvm, struct gzvm_userspace_memory_
 				    mem->flags, 0, 0, 0, &res);
 }
 
+int gzvm_arch_set_dtb_config(struct gzvm *gzvm, struct gzvm_dtb_config *cfg)
+{
+	struct arm_smccc_res res;
+
+	return gzvm_hypcall_wrapper(MT_HVC_GZVM_SET_DTB_CONFIG, gzvm->vm_id, cfg->dtb_addr,
+				    cfg->dtb_size, 0, 0, 0, 0, &res);
+}
+
 static int gzvm_vm_arch_enable_cap(struct gzvm *gzvm, struct gzvm_enable_cap *cap,
 				   struct arm_smccc_res *res)
 {
diff --git a/drivers/virt/geniezone/gzvm_vm.c b/drivers/virt/geniezone/gzvm_vm.c
index 3b1cb715ef34..d379793deace 100644
--- a/drivers/virt/geniezone/gzvm_vm.c
+++ b/drivers/virt/geniezone/gzvm_vm.c
@@ -390,6 +390,14 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl,
 		ret = gzvm_vm_ioctl_enable_cap(gzvm, &cap, argp);
 		break;
 	}
+	case GZVM_SET_DTB_CONFIG: {
+		struct gzvm_dtb_config cfg;
+
+		if (copy_from_user(&cfg, argp, sizeof(cfg)))
+			goto out;
+		ret = gzvm_arch_set_dtb_config(gzvm, &cfg);
+		break;
+	}
 	default:
 		ret = -ENOTTY;
 	}
diff --git a/include/linux/gzvm_drv.h b/include/linux/gzvm_drv.h
index 288a339bf382..e920397e83d3 100644
--- a/include/linux/gzvm_drv.h
+++ b/include/linux/gzvm_drv.h
@@ -146,6 +146,7 @@ void gzvm_sync_hwstate(struct gzvm_vcpu *vcpu);
 extern struct miscdevice *gzvm_debug_dev;
 
 int gzvm_arch_memregion_purpose(struct gzvm *gzvm, struct gzvm_userspace_memory_region *mem);
+int gzvm_arch_set_dtb_config(struct gzvm *gzvm, struct gzvm_dtb_config *args);
 
 int gzvm_init_ioeventfd(struct gzvm *gzvm);
 int gzvm_ioeventfd(struct gzvm *gzvm, struct gzvm_ioeventfd *args);
diff --git a/include/uapi/linux/gzvm.h b/include/uapi/linux/gzvm.h
index 2af1b068947c..28354c17ed9c 100644
--- a/include/uapi/linux/gzvm.h
+++ b/include/uapi/linux/gzvm.h
@@ -265,4 +265,14 @@ struct gzvm_ioeventfd {
 
 #define GZVM_IOEVENTFD	_IOW(GZVM_IOC_MAGIC, 0x79, struct gzvm_ioeventfd)
 
+struct gzvm_dtb_config {
+	/* dtb address set by VMM (guset memory) */
+	__u64 dtb_addr;
+	/* dtb size */
+	__u64 dtb_size;
+};
+
+#define GZVM_SET_DTB_CONFIG       _IOW(GZVM_IOC_MAGIC, 0xff, \
+				       struct gzvm_dtb_config)
+
 #endif /* __GZVM_H__ */
-- 
2.18.0
Re: [PATCH v4 8/9] virt: geniezone: Add dtb config support
Posted by AngeloGioacchino Del Regno 1 year, 5 months ago 
Il 09/06/23 10:52, Yi-De Wu ha scritto:
> From: "Jerry Wang" <ze-yu.wang@mediatek.com>
> 
> Hypervisor might need to know the accurate address and size of dtb
> passed from userspace. And then hypervisor would parse the dtb and get
> vm information.
> 
> Signed-off-by: Jerry Wang <ze-yu.wang@mediatek.com>
> Signed-off-by: Liju-clr Chen <liju-clr.chen@mediatek.com>
> Signed-off-by: Yi-De Wu <yi-de.wu@mediatek.com>
> ---
>   arch/arm64/geniezone/gzvm_arch_common.h |  2 ++
>   arch/arm64/geniezone/vm.c               |  8 ++++++++
>   drivers/virt/geniezone/gzvm_vm.c        |  8 ++++++++
>   include/linux/gzvm_drv.h                |  1 +
>   include/uapi/linux/gzvm.h               | 10 ++++++++++
>   5 files changed, 29 insertions(+)
> 
> diff --git a/arch/arm64/geniezone/gzvm_arch_common.h b/arch/arm64/geniezone/gzvm_arch_common.h
> index 5cfeb4df84c5..ccd2a7516eeb 100644
> --- a/arch/arm64/geniezone/gzvm_arch_common.h
> +++ b/arch/arm64/geniezone/gzvm_arch_common.h
> @@ -24,6 +24,7 @@ enum {
>   	GZVM_FUNC_PROBE,
>   	GZVM_FUNC_ENABLE_CAP,
>   	GZVM_FUNC_MEMREGION_PURPOSE,
> +	GZVM_FUNC_SET_DTB_CONFIG,
>   	NR_GZVM_FUNC
>   };
>   
> @@ -48,6 +49,7 @@ enum {
>   #define MT_HVC_GZVM_PROBE		GZVM_HCALL_ID(GZVM_FUNC_PROBE)
>   #define MT_HVC_GZVM_ENABLE_CAP		GZVM_HCALL_ID(GZVM_FUNC_ENABLE_CAP)
>   #define MT_HVC_GZVM_MEMREGION_PURPOSE	GZVM_HCALL_ID(GZVM_FUNC_MEMREGION_PURPOSE)
> +#define MT_HVC_GZVM_SET_DTB_CONFIG	GZVM_HCALL_ID(GZVM_FUNC_SET_DTB_CONFIG)
>   #define GIC_V3_NR_LRS			16
>   
>   /**
> diff --git a/arch/arm64/geniezone/vm.c b/arch/arm64/geniezone/vm.c
> index e19a66d6a75d..6062fe85c70e 100644
> --- a/arch/arm64/geniezone/vm.c
> +++ b/arch/arm64/geniezone/vm.c
> @@ -106,6 +106,14 @@ int gzvm_arch_memregion_purpose(struct gzvm *gzvm, struct gzvm_userspace_memory_
>   				    mem->flags, 0, 0, 0, &res);
>   }
>   
> +int gzvm_arch_set_dtb_config(struct gzvm *gzvm, struct gzvm_dtb_config *cfg)
> +{
> +	struct arm_smccc_res res;
> +
> +	return gzvm_hypcall_wrapper(MT_HVC_GZVM_SET_DTB_CONFIG, gzvm->vm_id, cfg->dtb_addr,
> +				    cfg->dtb_size, 0, 0, 0, 0, &res);
> +}
> +
>   static int gzvm_vm_arch_enable_cap(struct gzvm *gzvm, struct gzvm_enable_cap *cap,
>   				   struct arm_smccc_res *res)
>   {
> diff --git a/drivers/virt/geniezone/gzvm_vm.c b/drivers/virt/geniezone/gzvm_vm.c
> index 3b1cb715ef34..d379793deace 100644
> --- a/drivers/virt/geniezone/gzvm_vm.c
> +++ b/drivers/virt/geniezone/gzvm_vm.c
> @@ -390,6 +390,14 @@ static long gzvm_vm_ioctl(struct file *filp, unsigned int ioctl,
>   		ret = gzvm_vm_ioctl_enable_cap(gzvm, &cap, argp);
>   		break;
>   	}
> +	case GZVM_SET_DTB_CONFIG: {
> +		struct gzvm_dtb_config cfg;
> +
> +		if (copy_from_user(&cfg, argp, sizeof(cfg)))
> +			goto out;
> +		ret = gzvm_arch_set_dtb_config(gzvm, &cfg);
> +		break;
> +	}
>   	default:
>   		ret = -ENOTTY;
>   	}
> diff --git a/include/linux/gzvm_drv.h b/include/linux/gzvm_drv.h
> index 288a339bf382..e920397e83d3 100644
> --- a/include/linux/gzvm_drv.h
> +++ b/include/linux/gzvm_drv.h
> @@ -146,6 +146,7 @@ void gzvm_sync_hwstate(struct gzvm_vcpu *vcpu);
>   extern struct miscdevice *gzvm_debug_dev;
>   
>   int gzvm_arch_memregion_purpose(struct gzvm *gzvm, struct gzvm_userspace_memory_region *mem);
> +int gzvm_arch_set_dtb_config(struct gzvm *gzvm, struct gzvm_dtb_config *args);
>   
>   int gzvm_init_ioeventfd(struct gzvm *gzvm);
>   int gzvm_ioeventfd(struct gzvm *gzvm, struct gzvm_ioeventfd *args);
> diff --git a/include/uapi/linux/gzvm.h b/include/uapi/linux/gzvm.h
> index 2af1b068947c..28354c17ed9c 100644
> --- a/include/uapi/linux/gzvm.h
> +++ b/include/uapi/linux/gzvm.h
> @@ -265,4 +265,14 @@ struct gzvm_ioeventfd {
>   
>   #define GZVM_IOEVENTFD	_IOW(GZVM_IOC_MAGIC, 0x79, struct gzvm_ioeventfd)
>   
> +struct gzvm_dtb_config {

kerneldoc please.

> +	/* dtb address set by VMM (guset memory) */
> +	__u64 dtb_addr;
> +	/* dtb size */
> +	__u64 dtb_size;
> +};
> +
> +#define GZVM_SET_DTB_CONFIG       _IOW(GZVM_IOC_MAGIC, 0xff, \
> +				       struct gzvm_dtb_config)
> +
>   #endif /* __GZVM_H__ */

Patchew 2.1-devel-b67e4c2

© 2016 - 2024 Red Hat, Inc.