Skip to contentSkip to conversation

xen/virtio: support grant based virtio on x86

PATCH Superseded Juergen Gross 3 participants 11 messages Oct 6, 2022 – Oct 7, 2022

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Juergen Gross

author maintainer
#0 lore raw

cover xen/virtio: support grant based virtio on x86

Add basic support for virtio with grants on x86 by defaulting the backend to be in dom0 in the case the guest kernel was built with CONFIG_XEN_VIRTIO_FORCE_GRANT.

Juergen Gross (3):
xen/virtio: restructure xen grant dma setup
xen/virtio: use dom0 as default backend for
CONFIG_XEN_VIRTIO_FORCE_GRANT
xen/virtio: enable grant based virtio on x86

 arch/x86/xen/enlighten_hvm.c |  2 +-
 arch/x86/xen/enlighten_pv.c  |  2 +-
 drivers/xen/grant-dma-ops.c  | 81 +++++++++++++++++++++++++-----------
 include/xen/xen-ops.h        |  1 +
 4 files changed, 59 insertions(+), 27 deletions(-)
Signature · 1 line
2.35.3
author maintainer
#1 lore raw

PATCH 1/3 xen/virtio: restructure xen grant dma setup

In order to prepare supporting other means than device tree for setting up virtio devices under Xen, restructure the functions xen_is_grant_dma_device() and xen_grant_setup_dma_ops() a little bit.

---
 drivers/xen/grant-dma-ops.c | 68 +++++++++++++++++++++++--------------
 1 file changed, 43 insertions(+), 25 deletions(-)
drivers/xen/grant-dma-ops.c +43 -25
index 8973fc1e9ccc..f29759d5301f 100644
@@ -273,22 +273,28 @@ static const struct dma_map_ops xen_grant_dma_ops = {
 	.dma_supported = xen_grant_dma_supported,
 };
 
-bool xen_is_grant_dma_device(struct device *dev)
+static bool xen_is_dt_grant_dma_device(struct device *dev)
 {
 	struct device_node *iommu_np;
 	bool has_iommu;
 
-	/* XXX Handle only DT devices for now */
-	if (!dev->of_node)
-		return false;
-
 	iommu_np = of_parse_phandle(dev->of_node, "iommus", 0);
-	has_iommu = iommu_np && of_device_is_compatible(iommu_np, "xen,grant-dma");
+	has_iommu = iommu_np &&
+		    of_device_is_compatible(iommu_np, "xen,grant-dma");
 	of_node_put(iommu_np);
 
 	return has_iommu;
 }
 
+bool xen_is_grant_dma_device(struct device *dev)
+{
+	/* XXX Handle only DT devices for now */
+	if (dev->of_node)
+		return xen_is_dt_grant_dma_device(dev);
+
+	return false;
+}
+
 bool xen_virtio_mem_acc(struct virtio_device *dev)
 {
 	if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT))
@@ -297,45 +303,56 @@ bool xen_virtio_mem_acc(struct virtio_device *dev)
 	return xen_is_grant_dma_device(dev->dev.parent);
 }
 
-void xen_grant_setup_dma_ops(struct device *dev)
+static int xen_dt_grant_setup_dma_ops(struct device *dev,
+				       struct xen_grant_dma_data *data)
 {
-	struct xen_grant_dma_data *data;
 	struct of_phandle_args iommu_spec;
 
-	data = find_xen_grant_dma_data(dev);
-	if (data) {
-		dev_err(dev, "Xen grant DMA data is already created\n");
-		return;
-	}
-
-	/* XXX ACPI device unsupported for now */
-	if (!dev->of_node)
-		goto err;
-
 	if (of_parse_phandle_with_args(dev->of_node, "iommus", "#iommu-cells",
 			0, &iommu_spec)) {
 		dev_err(dev, "Cannot parse iommus property\n");
-		goto err;
+		return -ESRCH;
 	}
 
 	if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") ||
 			iommu_spec.args_count != 1) {
 		dev_err(dev, "Incompatible IOMMU node\n");
 		of_node_put(iommu_spec.np);
-		goto err;
+		return -ESRCH;
 	}
 
 	of_node_put(iommu_spec.np);
 
+	/*
+	 * The endpoint ID here means the ID of the domain where the
+	 * corresponding backend is running
+	 */
+	data->backend_domid = iommu_spec.args[0];
+
+	return 0;
+}
+
+void xen_grant_setup_dma_ops(struct device *dev)
+{
+	struct xen_grant_dma_data *data;
+
+	data = find_xen_grant_dma_data(dev);
+	if (data) {
+		dev_err(dev, "Xen grant DMA data is already created\n");
+		return;
+	}
+
 	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
 	if (!data)
 		goto err;
 
-	/*
-	 * The endpoint ID here means the ID of the domain where the corresponding
-	 * backend is running
-	 */
-	data->backend_domid = iommu_spec.args[0];
+	if (dev->of_node) {
+		if (xen_dt_grant_setup_dma_ops(dev, data))
+			goto err;
+	} else {
+		/* XXX ACPI device unsupported for now */
+		goto err;
+	}
 
 	if (xa_err(xa_store(&xen_grant_dma_devices, (unsigned long)dev, data,
 			GFP_KERNEL))) {
@@ -348,6 +365,7 @@ void xen_grant_setup_dma_ops(struct device *dev)
 	return;
 
 err:
+	devm_kfree(dev, data);
 	dev_err(dev, "Cannot set up Xen grant DMA ops, retain platform DMA ops\n");
 }
 
Signature · 1 line
2.35.3
reviewer Reviewed-by Tested-by on v1 1/3
#2 lore raw

Re: [PATCH 1/3] xen/virtio: restructure xen grant dma setup

On 06.10.22 10:14, Juergen Gross wrote:

Hello Juergen

Quoted 5 lines

In order to prepare supporting other means than device tree for setting up virtio devices under Xen, restructure the functions xen_is_grant_dma_device() and xen_grant_setup_dma_ops() a little bit.

Patch looks good,

one NIT, xen_dt_grant_setup_dma_ops() down the code doesn't actually setup DMA OPS, it retrieves the backend domid via device-tree means and stores it,

so I would rename to it, maybe something like xen_dt_grant_setup_backend_domid() or xen_dt_grant_init_backend_domid(), but I am not sure it would be good alternative.

So, w/ or w/o renaming:

also

only

Quoted 127 lines
---
  drivers/xen/grant-dma-ops.c | 68 +++++++++++++++++++++++--------------
  1 file changed, 43 insertions(+), 25 deletions(-)
drivers/xen/grant-dma-ops.c +43 -25
index 8973fc1e9ccc..f29759d5301f 100644
@@ -273,22 +273,28 @@ static const struct dma_map_ops xen_grant_dma_ops = {
  	.dma_supported = xen_grant_dma_supported,
  };
 
-bool xen_is_grant_dma_device(struct device *dev)
+static bool xen_is_dt_grant_dma_device(struct device *dev)
  {
  	struct device_node *iommu_np;
  	bool has_iommu;
 
-	/* XXX Handle only DT devices for now */
-	if (!dev->of_node)
-		return false;
-
  	iommu_np = of_parse_phandle(dev->of_node, "iommus", 0);
-	has_iommu = iommu_np && of_device_is_compatible(iommu_np, "xen,grant-dma");
+	has_iommu = iommu_np &&
+		    of_device_is_compatible(iommu_np, "xen,grant-dma");
  	of_node_put(iommu_np);
 
  	return has_iommu;
  }
 
+bool xen_is_grant_dma_device(struct device *dev)
+{
+	/* XXX Handle only DT devices for now */
+	if (dev->of_node)
+		return xen_is_dt_grant_dma_device(dev);
+
+	return false;
+}
+
  bool xen_virtio_mem_acc(struct virtio_device *dev)
  {
  	if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT))
@@ -297,45 +303,56 @@ bool xen_virtio_mem_acc(struct virtio_device *dev)
  	return xen_is_grant_dma_device(dev->dev.parent);
  }
 
-void xen_grant_setup_dma_ops(struct device *dev)
+static int xen_dt_grant_setup_dma_ops(struct device *dev,
+				       struct xen_grant_dma_data *data)
  {
-	struct xen_grant_dma_data *data;
  	struct of_phandle_args iommu_spec;
 
-	data = find_xen_grant_dma_data(dev);
-	if (data) {
-		dev_err(dev, "Xen grant DMA data is already created\n");
-		return;
-	}
-
-	/* XXX ACPI device unsupported for now */
-	if (!dev->of_node)
-		goto err;
-
  	if (of_parse_phandle_with_args(dev->of_node, "iommus", "#iommu-cells",
  			0, &iommu_spec)) {
  		dev_err(dev, "Cannot parse iommus property\n");
-		goto err;
+		return -ESRCH;
  	}
 
  	if (!of_device_is_compatible(iommu_spec.np, "xen,grant-dma") ||
  			iommu_spec.args_count != 1) {
  		dev_err(dev, "Incompatible IOMMU node\n");
  		of_node_put(iommu_spec.np);
-		goto err;
+		return -ESRCH;
  	}
 
  	of_node_put(iommu_spec.np);
 
+	/*
+	 * The endpoint ID here means the ID of the domain where the
+	 * corresponding backend is running
+	 */
+	data->backend_domid = iommu_spec.args[0];
+
+	return 0;
+}
+
+void xen_grant_setup_dma_ops(struct device *dev)
+{
+	struct xen_grant_dma_data *data;
+
+	data = find_xen_grant_dma_data(dev);
+	if (data) {
+		dev_err(dev, "Xen grant DMA data is already created\n");
+		return;
+	}
+
  	data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
  	if (!data)
  		goto err;
 
-	/*
-	 * The endpoint ID here means the ID of the domain where the corresponding
-	 * backend is running
-	 */
-	data->backend_domid = iommu_spec.args[0];
+	if (dev->of_node) {
+		if (xen_dt_grant_setup_dma_ops(dev, data))
+			goto err;
+	} else {
+		/* XXX ACPI device unsupported for now */
+		goto err;
+	}
 
  	if (xa_err(xa_store(&xen_grant_dma_devices, (unsigned long)dev, data,
  			GFP_KERNEL))) {
@@ -348,6 +365,7 @@ void xen_grant_setup_dma_ops(struct device *dev)
  	return;
 
  err:
+	devm_kfree(dev, data);
  	dev_err(dev, "Cannot set up Xen grant DMA ops, retain platform DMA ops\n");
  }
 
Signature · 3 lines
Regards,

Oleksandr Tyshchenko
maintainer Acked-by
#3 lore raw

Re: [PATCH 1/3] xen/virtio: restructure xen grant dma setup

Quoted 22 lines · Oleksandr Tyshchenko

On 06.10.22 10:14, Juergen Gross wrote:

Hello Juergen

Quoted 5 lines

In order to prepare supporting other means than device tree for setting up virtio devices under Xen, restructure the functions xen_is_grant_dma_device() and xen_grant_setup_dma_ops() a little bit.

Patch looks good,

one NIT, xen_dt_grant_setup_dma_ops() down the code doesn't actually setup DMA OPS, it retrieves the backend domid via device-tree means and stores it,

so I would rename to it, maybe something like xen_dt_grant_setup_backend_domid() or xen_dt_grant_init_backend_domid(), but I am not sure it would be good alternative.

Quoted 8 lines

So, w/ or w/o renaming:

also

only

author maintainer
#4 lore raw

Re: [PATCH 1/3] xen/virtio: restructure xen grant dma setup

In reply to Oleksandr Tyshchenko
Quoted 14 lines · Oleksandr Tyshchenko

On 06.10.22 10:14, Juergen Gross wrote:

Hello Juergen

Quoted 5 lines

In order to prepare supporting other means than device tree for setting up virtio devices under Xen, restructure the functions xen_is_grant_dma_device() and xen_grant_setup_dma_ops() a little bit.

Patch looks good,

Quoted 7 lines

one NIT, xen_dt_grant_setup_dma_ops() down the code doesn't actually setup DMA OPS, it retrieves the backend domid via device-tree means and stores it,

so I would rename to it, maybe something like xen_dt_grant_setup_backend_domid() or xen_dt_grant_init_backend_domid(), but I am not sure it would be good alternative.

I'll go with xen_dt_grant_init_backend_domid().

Quoted 10 lines

So, w/ or w/o renaming:

also

only

Thanks,

Juergen

author maintainer
#5 lore raw

PATCH 2/3 xen/virtio: use dom0 as default backend for CONFIG_XEN_VIRTIO_FORCE_GRANT

In reply to Juergen Gross

With CONFIG_XEN_VIRTIO_FORCE_GRANT set the default backend domid to 0, enabling to use xen_grant_dma_ops for those devices.

---
 drivers/xen/grant-dma-ops.c | 3 +++
 1 file changed, 3 insertions(+)
drivers/xen/grant-dma-ops.c +3 -0
index f29759d5301f..a00112235877 100644
@@ -349,6 +349,9 @@ void xen_grant_setup_dma_ops(struct device *dev)
 	if (dev->of_node) {
 		if (xen_dt_grant_setup_dma_ops(dev, data))
 			goto err;
+	} else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT)) {
+		dev_info(dev, "Using dom0 as backend\n");
+		data->backend_domid = 0;
 	} else {
 		/* XXX ACPI device unsupported for now */
 		goto err;
Signature · 1 line
2.35.3
reviewer Reviewed-by on v1 2/3
#6 lore raw

Re: [PATCH 2/3] xen/virtio: use dom0 as default backend for CONFIG_XEN_VIRTIO_FORCE_GRANT

On 06.10.22 10:14, Juergen Gross wrote:

Hello Juergen

Quoted 7 lines

With CONFIG_XEN_VIRTIO_FORCE_GRANT set the default backend domid to 0, enabling to use xen_grant_dma_ops for those devices.

---
  drivers/xen/grant-dma-ops.c | 3 +++
  1 file changed, 3 insertions(+)
Quoted 15 lines
drivers/xen/grant-dma-ops.c +3 -0
index f29759d5301f..a00112235877 100644
@@ -349,6 +349,9 @@ void xen_grant_setup_dma_ops(struct device *dev)
  	if (dev->of_node) {
  		if (xen_dt_grant_setup_dma_ops(dev, data))
  			goto err;
+	} else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT)) {
+		dev_info(dev, "Using dom0 as backend\n");
+		data->backend_domid = 0;
  	} else {
  		/* XXX ACPI device unsupported for now */
  		goto err;
Signature · 3 lines
Regards,

Oleksandr Tyshchenko
maintainer Acked-by
#7 lore raw

Re: [PATCH 2/3] xen/virtio: use dom0 as default backend for CONFIG_XEN_VIRTIO_FORCE_GRANT

Quoted 7 lines · Oleksandr Tyshchenko

On 06.10.22 10:14, Juergen Gross wrote:

Hello Juergen

Quoted 3 lines

With CONFIG_XEN_VIRTIO_FORCE_GRANT set the default backend domid to 0, enabling to use xen_grant_dma_ops for those devices.

Quoted 7 lines
Quoted 4 lines
---
  drivers/xen/grant-dma-ops.c | 3 +++
  1 file changed, 3 insertions(+)
Quoted 20 lines
Quoted 14 lines
drivers/xen/grant-dma-ops.c +3 -0
index f29759d5301f..a00112235877 100644
@@ -349,6 +349,9 @@ void xen_grant_setup_dma_ops(struct device *dev)
  	if (dev->of_node) {
  		if (xen_dt_grant_setup_dma_ops(dev, data))
  			goto err;
+	} else if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT)) {
+		dev_info(dev, "Using dom0 as backend\n");
+		data->backend_domid = 0;
  	} else {
  		/* XXX ACPI device unsupported for now */
  		goto err;
Signature · 3 lines
Regards,

Oleksandr Tyshchenko
author maintainer
#8 lore raw

PATCH 3/3 xen/virtio: enable grant based virtio on x86

In reply to Juergen Gross

Use an x86-specific virtio_check_mem_acc_cb() for Xen in order to setup the correct DMA ops.

---
 arch/x86/xen/enlighten_hvm.c |  2 +-
 arch/x86/xen/enlighten_pv.c  |  2 +-
 drivers/xen/grant-dma-ops.c  | 10 ++++++++++
 include/xen/xen-ops.h        |  1 +
 4 files changed, 13 insertions(+), 2 deletions(-)
arch/x86/xen/enlighten_hvm.c +1 -1
index 1c1ac418484b..c1cd28e915a3 100644
@@ -212,7 +212,7 @@ static void __init xen_hvm_guest_init(void)
 		return;
 
 	if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT))
-		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
+		virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc);
 
 	init_hvm_pv_info();
 
arch/x86/xen/enlighten_pv.c +1 -1
index 9b1a58dda935..45b24c1b646a 100644
@@ -112,7 +112,7 @@ static void __init xen_pv_init_platform(void)
 {
 	/* PV guests can't operate virtio devices without grants. */
 	if (IS_ENABLED(CONFIG_XEN_VIRTIO))
-		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
+		virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc);
 
 	populate_extra_pte(fix_to_virt(FIX_PARAVIRT_BOOTMAP));
 
drivers/xen/grant-dma-ops.c +10 -0
index a00112235877..60a7acc334ed 100644
@@ -372,6 +372,16 @@ void xen_grant_setup_dma_ops(struct device *dev)
 	dev_err(dev, "Cannot set up Xen grant DMA ops, retain platform DMA ops\n");
 }
 
+bool xen_virtio_restricted_mem_acc(struct virtio_device *dev)
+{
+	bool ret = xen_virtio_mem_acc(dev);
+
+	if (ret)
+		xen_grant_setup_dma_ops(dev->dev.parent);
+
+	return ret;
+}
+
 MODULE_DESCRIPTION("Xen grant DMA-mapping layer");
 MODULE_AUTHOR("Juergen Gross <[email protected]>");
 MODULE_LICENSE("GPL");
include/xen/xen-ops.h +1 -0
index dae0f350c678..3dd5aa936f1d 100644
@@ -219,6 +219,7 @@ static inline void xen_preemptible_hcall_end(void) { }
 void xen_grant_setup_dma_ops(struct device *dev);
 bool xen_is_grant_dma_device(struct device *dev);
 bool xen_virtio_mem_acc(struct virtio_device *dev);
+bool xen_virtio_restricted_mem_acc(struct virtio_device *dev);
 #else
 static inline void xen_grant_setup_dma_ops(struct device *dev)
 {
Signature · 1 line
2.35.3
#9 lore raw

Re: [PATCH 3/3] xen/virtio: enable grant based virtio on x86

On 06.10.22 10:15, Juergen Gross wrote:

Hello Juergen

Quoted 42 lines

Use an x86-specific virtio_check_mem_acc_cb() for Xen in order to setup the correct DMA ops.

---
  arch/x86/xen/enlighten_hvm.c |  2 +-
  arch/x86/xen/enlighten_pv.c  |  2 +-
  drivers/xen/grant-dma-ops.c  | 10 ++++++++++
  include/xen/xen-ops.h        |  1 +
  4 files changed, 13 insertions(+), 2 deletions(-)
arch/x86/xen/enlighten_hvm.c +1 -1
index 1c1ac418484b..c1cd28e915a3 100644
@@ -212,7 +212,7 @@ static void __init xen_hvm_guest_init(void)
  		return;
 
  	if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT))
-		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
+		virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc);
 
  	init_hvm_pv_info();
 
arch/x86/xen/enlighten_pv.c +1 -1
index 9b1a58dda935..45b24c1b646a 100644
@@ -112,7 +112,7 @@ static void __init xen_pv_init_platform(void)
  {
  	/* PV guests can't operate virtio devices without grants. */
  	if (IS_ENABLED(CONFIG_XEN_VIRTIO))
-		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
+		virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc);
 
  	populate_extra_pte(fix_to_virt(FIX_PARAVIRT_BOOTMAP));
 
drivers/xen/grant-dma-ops.c +0 -0
index a00112235877..60a7acc334ed 100644

drivers/xen/grant-dma-ops.c void xen_grant_setup_dma_ops(struct device *dev) · line 377

Quoted 6 lines
drivers/xen/grant-dma-ops.c +3 -0
@@ -372,6 +372,16 @@ void xen_grant_setup_dma_ops(struct device *dev)
  	dev_err(dev, "Cannot set up Xen grant DMA ops, retain platform DMA ops\n");
  }
 
+bool xen_virtio_restricted_mem_acc(struct virtio_device *dev)
+{
+	bool ret = xen_virtio_mem_acc(dev);

The grant usage is mandatory for PV guests, right?

Then xen_virtio_mem_acc() should always return true for PV guests (I mean even if CONFIG_XEN_VIRTIO_FORCE_GRANT is not set).

Quoted 15 lines
drivers/xen/grant-dma-ops.c +7 -0
+
+	if (ret)
+		xen_grant_setup_dma_ops(dev->dev.parent);
+
+	return ret;
+}
+
  MODULE_DESCRIPTION("Xen grant DMA-mapping layer");
  MODULE_AUTHOR("Juergen Gross <[email protected]>");
  MODULE_LICENSE("GPL");
include/xen/xen-ops.h +0 -0
index dae0f350c678..3dd5aa936f1d 100644

include/xen/xen-ops.h static inline void xen_preemptible_hcall_end(void) { } · line 225

Quoted 7 lines
include/xen/xen-ops.h +1 -0
@@ -219,6 +219,7 @@ static inline void xen_preemptible_hcall_end(void) { }
  void xen_grant_setup_dma_ops(struct device *dev);
  bool xen_is_grant_dma_device(struct device *dev);
  bool xen_virtio_mem_acc(struct virtio_device *dev);
+bool xen_virtio_restricted_mem_acc(struct virtio_device *dev);
  #else
  static inline void xen_grant_setup_dma_ops(struct device *dev)
  {

And probably static inline stub always returning false if CONFIG_XEN_GRANT_DMA_OPS is not set.

Signature · 3 lines
Regards,

Oleksandr Tyshchenko
author maintainer
#10 lore raw

Re: [PATCH 3/3] xen/virtio: enable grant based virtio on x86

Quoted 58 lines · Oleksandr Tyshchenko

On 06.10.22 10:15, Juergen Gross wrote:

Hello Juergen

Quoted 42 lines

Use an x86-specific virtio_check_mem_acc_cb() for Xen in order to setup the correct DMA ops.

---
   arch/x86/xen/enlighten_hvm.c |  2 +-
   arch/x86/xen/enlighten_pv.c  |  2 +-
   drivers/xen/grant-dma-ops.c  | 10 ++++++++++
   include/xen/xen-ops.h        |  1 +
   4 files changed, 13 insertions(+), 2 deletions(-)
arch/x86/xen/enlighten_hvm.c +1 -1
index 1c1ac418484b..c1cd28e915a3 100644
@@ -212,7 +212,7 @@ static void __init xen_hvm_guest_init(void)
   		return;
 
   	if (IS_ENABLED(CONFIG_XEN_VIRTIO_FORCE_GRANT))
-		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
+		virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc);
 
   	init_hvm_pv_info();
 
arch/x86/xen/enlighten_pv.c +1 -1
index 9b1a58dda935..45b24c1b646a 100644
@@ -112,7 +112,7 @@ static void __init xen_pv_init_platform(void)
   {
   	/* PV guests can't operate virtio devices without grants. */
   	if (IS_ENABLED(CONFIG_XEN_VIRTIO))
-		virtio_set_mem_acc_cb(virtio_require_restricted_mem_acc);
+		virtio_set_mem_acc_cb(xen_virtio_restricted_mem_acc);
 
   	populate_extra_pte(fix_to_virt(FIX_PARAVIRT_BOOTMAP));
 
drivers/xen/grant-dma-ops.c +0 -0
index a00112235877..60a7acc334ed 100644

drivers/xen/grant-dma-ops.c void xen_grant_setup_dma_ops(struct device *dev) · line 377

Quoted 6 lines
drivers/xen/grant-dma-ops.c +3 -0
@@ -372,6 +372,16 @@ void xen_grant_setup_dma_ops(struct device *dev)
   	dev_err(dev, "Cannot set up Xen grant DMA ops, retain platform DMA ops\n");
   }
 
+bool xen_virtio_restricted_mem_acc(struct virtio_device *dev)
+{
+	bool ret = xen_virtio_mem_acc(dev);

The grant usage is mandatory for PV guests, right?

Quoted 2 lines

Then xen_virtio_mem_acc() should always return true for PV guests (I mean even if CONFIG_XEN_VIRTIO_FORCE_GRANT is not set).

Yes.

Quoted 21 lines
Quoted 21 lines
drivers/xen/grant-dma-ops.c +7 -0
+
+	if (ret)
+		xen_grant_setup_dma_ops(dev->dev.parent);
+
+	return ret;
+}
+
   MODULE_DESCRIPTION("Xen grant DMA-mapping layer");
   MODULE_AUTHOR("Juergen Gross <[email protected]>");
   MODULE_LICENSE("GPL");
include/xen/xen-ops.h +0 -0
index dae0f350c678..3dd5aa936f1d 100644
@@ -219,6 +219,7 @@ static inline void xen_preemptible_hcall_end(void) { }
   void xen_grant_setup_dma_ops(struct device *dev);
   bool xen_is_grant_dma_device(struct device *dev);
   bool xen_virtio_mem_acc(struct virtio_device *dev);
Quoted 8 lines

include/xen/xen-ops.h static inline void xen_preemptible_hcall_end(void) { } · line 225

Quoted 4 lines
include/xen/xen-ops.h +1 -0
+bool xen_virtio_restricted_mem_acc(struct virtio_device *dev);
   #else
   static inline void xen_grant_setup_dma_ops(struct device *dev)
   {

And probably static inline stub always returning false if CONFIG_XEN_GRANT_DMA_OPS is not set.

Indeed.

Juergen