Skip to contentSkip to conversation

s390: virtio: let arch validate VIRTIO features

PATCH Superseded Pierre Morel 2 participants 7 messages Aug 19, 2020 – Aug 21, 2020

Subsystems (4)

v9 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

v9 cover s390: virtio: let arch validate VIRTIO features

Hi all,

The goal of the series is to give a chance to the architecture to validate VIRTIO device features.

in this respin:

The tests are back to virtio_finalize_features.

No more argument for the architecture callback which only reports if the architecture needs guest memory access restrictions for VIRTIO.

I renamed the callback to arch_has_restricted_virtio_memory_access, and the config option to ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS.

Regards,
Pierre

Pierre Morel (2):
virtio: let arch advertise guest's memory access restrictions
s390: virtio: PV needs VIRTIO I/O device protection

 arch/s390/Kconfig             |  1 +
 arch/s390/mm/init.c           | 11 +++++++++++
 drivers/virtio/Kconfig        |  6 ++++++
 drivers/virtio/virtio.c       | 15 +++++++++++++++
 include/linux/virtio_config.h |  9 +++++++++
 5 files changed, 42 insertions(+)
Signature · 72 lines
2.25.1

Changelog

to v9:

- move virtio tests back to virtio_finalize_features
  (Connie)

- remove virtio device argument

to v8:

- refactoring by using an optional callback
  (Connie)

to v7:

- typo in warning message
  (Connie)
to v6:

- rewording warning messages
  (Connie, Halil)

to v5:

- return directly from S390 arch_validate_virtio_features()
  when the guest is not protected.
  (Connie)

- Somme rewording
  (Connie, Michael)

- moved back code from arch/s390/ ...kernel/uv.c to ...mm/init.c
  (Christian)

to v4:

- separate virtio and arch code
  (Pierre)

- moved code from arch/s390/mm/init.c to arch/s390/kernel/uv.c
  (as interpreted from Heiko's comment)

- moved validation inside the arch code
  (Connie)

- moved the call to arch validation before VIRTIO_F_1 test
  (Michael)

to v3:

- add warning
  (Connie, Christian)

- add comment
  (Connie)

- change hook name
  (Halil, Connie)

to v2:

- put the test in virtio_finalize_features()
  (Connie)

- put the test inside VIRTIO core
  (Jason)

- pass a virtio device as parameter
  (Halil)
#1 lore raw

PATCH v9 1/2 virtio: let arch advertise guest's memory access restrictions

An architecture may restrict host access to guest memory.

Provide a new Kconfig entry the architecture can select, CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS, when it provides the arch_has_restricted_virtio_memory_access callback to advertise VIRTIO common code when the architecture restricts memory access from the host.

---
 drivers/virtio/Kconfig        |  6 ++++++
 drivers/virtio/virtio.c       | 15 +++++++++++++++
 include/linux/virtio_config.h |  9 +++++++++
 3 files changed, 30 insertions(+)
drivers/virtio/Kconfig +6 -0
index 5809e5f5b157..509f3b4d8ba1 100644
@@ -6,6 +6,12 @@ config VIRTIO
 	  bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_RPMSG
 	  or CONFIG_S390_GUEST.
 
+config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
+	bool
+	help
+	  This option is selected by any architecture enforcing
+	  VIRTIO_F_IOMMU_PLATFORM
+
 menuconfig VIRTIO_MENU
 	bool "Virtio drivers"
 	default y
drivers/virtio/virtio.c +15 -0
index a977e32a88f2..57ca41d77b09 100644
@@ -176,6 +176,21 @@ int virtio_finalize_features(struct virtio_device *dev)
 	if (ret)
 		return ret;
 
+	ret = arch_has_restricted_virtio_memory_access();
+	if (ret) {
+		if (!virtio_has_feature(dev, VIRTIO_F_VERSION_1)) {
+			dev_warn(&dev->dev,
+				 "device must provide VIRTIO_F_VERSION_1\n");
+			return -ENODEV;
+		}
+
+		if (!virtio_has_feature(dev, VIRTIO_F_IOMMU_PLATFORM)) {
+			dev_warn(&dev->dev,
+				 "device must provide VIRTIO_F_IOMMU_PLATFORM\n");
+			return -ENODEV;
+		}
+	}
+
 	if (!virtio_has_feature(dev, VIRTIO_F_VERSION_1))
 		return 0;
 
include/linux/virtio_config.h +9 -0
index bb4cc4910750..e380664642b4 100644
@@ -459,4 +459,13 @@ static inline void virtio_cwrite64(struct virtio_device *vdev,
 		_r;							\
 	})
 
+#ifdef CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
+int arch_has_restricted_virtio_memory_access(void);
+#else
+static inline int arch_has_restricted_virtio_memory_access(void)
+{
+	return 0;
+}
+#endif /* CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS */
+
 #endif /* _LINUX_VIRTIO_CONFIG_H */
Signature · 1 line
2.25.1
Reviewed-by on v9 1/2
#2 lore raw

Re: [PATCH v9 1/2] virtio: let arch advertise guest's memory access restrictions

Quoted 1 line · On Wed, 19 Aug 2020 18:23:17 +0200 Pierre Morel <[email protected]> wrote:

An architecture may restrict host access to guest memory.

"e.g. IBM s390 Secure Execution or AMD SEV"

Just to make clearer what you are referring to?

Quoted 4 lines

Provide a new Kconfig entry the architecture can select, CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS, when it provides the arch_has_restricted_virtio_memory_access callback to advertise

s/advertise/advertise to/

Quoted 2 lines

VIRTIO common code when the architecture restricts memory access from the host.

"The common code can then fail the probe for any device where VIRTIO_F_IOMMU_PLATFORM is required, but not set."

?

Quoted 13 lines
---
 drivers/virtio/Kconfig        |  6 ++++++
 drivers/virtio/virtio.c       | 15 +++++++++++++++
 include/linux/virtio_config.h |  9 +++++++++
 3 files changed, 30 insertions(+)
drivers/virtio/Kconfig +0 -0
index 5809e5f5b157..509f3b4d8ba1 100644

drivers/virtio/Kconfig config VIRTIO · line 13

Quoted 8 lines
drivers/virtio/Kconfig +5 -0
@@ -6,6 +6,12 @@ config VIRTIO
 	  bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_RPMSG
 	  or CONFIG_S390_GUEST.
 
+config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
+	bool
+	help
+	  This option is selected by any architecture enforcing
+	  VIRTIO_F_IOMMU_PLATFORM

"This option is selected if the architecture may need to enforce VIRTIO_F_IOMMU_PLATFORM."

?

Quoted 4 lines
drivers/virtio/Kconfig +1 -0
+
 menuconfig VIRTIO_MENU
 	bool "Virtio drivers"
 	default y

(...)

#3 lore raw

Re: [PATCH v9 1/2] virtio: let arch advertise guest's memory access restrictions

Quoted 8 lines · Cornelia Huck
Quoted 1 line · On Wed, 19 Aug 2020 18:23:17 +0200 Pierre Morel <[email protected]> wrote:

An architecture may restrict host access to guest memory.

"e.g. IBM s390 Secure Execution or AMD SEV"

Just to make clearer what you are referring to?

yes, thanks

Quoted 7 lines
Quoted 5 lines

Provide a new Kconfig entry the architecture can select, CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS, when it provides the arch_has_restricted_virtio_memory_access callback to advertise

s/advertise/advertise to/

OK

Quoted 8 lines
Quoted 3 lines

VIRTIO common code when the architecture restricts memory access from the host.

"The common code can then fail the probe for any device where VIRTIO_F_IOMMU_PLATFORM is required, but not set."

?

Yes, better thanks

Quoted 26 lines
Quoted 14 lines
---
  drivers/virtio/Kconfig        |  6 ++++++
  drivers/virtio/virtio.c       | 15 +++++++++++++++
  include/linux/virtio_config.h |  9 +++++++++
  3 files changed, 30 insertions(+)
drivers/virtio/Kconfig +0 -0
index 5809e5f5b157..509f3b4d8ba1 100644

drivers/virtio/Kconfig config VIRTIO · line 13

Quoted 8 lines
drivers/virtio/Kconfig +5 -0
@@ -6,6 +6,12 @@ config VIRTIO
  	  bus, such as CONFIG_VIRTIO_PCI, CONFIG_VIRTIO_MMIO, CONFIG_RPMSG
  	  or CONFIG_S390_GUEST.
 
+config ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
+	bool
+	help
+	  This option is selected by any architecture enforcing
+	  VIRTIO_F_IOMMU_PLATFORM

"This option is selected if the architecture may need to enforce VIRTIO_F_IOMMU_PLATFORM."

Quoted 1 line

?

yes, better thanks

Quoted 10 lines
Quoted 5 lines
drivers/virtio/Kconfig +1 -0
+
  menuconfig VIRTIO_MENU
  	bool "Virtio drivers"
  	default y

(...)

I will make the rewordings.

Thanks,
Pierre

Signature · 2 lines
Pierre Morel
IBM Lab Boeblingen
#4 lore raw

PATCH v9 2/2 s390: virtio: PV needs VIRTIO I/O device protection

In reply to Pierre Morel

If protected virtualization is active on s390, VIRTIO has retricted access to the guest memory.
Define CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS and export arch_has_restricted_virtio_memory_access to advertize VIRTIO if that's the case, preventing a host error on access attempt.

---
 arch/s390/Kconfig   |  1 +
 arch/s390/mm/init.c | 11 +++++++++++
 2 files changed, 12 insertions(+)
arch/s390/Kconfig +1 -0
index 9cfd8de907cb..c12422c26389 100644
@@ -820,6 +820,7 @@ menu "Virtualization"
 config PROTECTED_VIRTUALIZATION_GUEST
 	def_bool n
 	prompt "Protected virtualization guest support"
+	select ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
 	help
 	  Select this option, if you want to be able to run this
 	  kernel as a protected virtualization KVM guest.
arch/s390/mm/init.c +11 -0
index 6dc7c3b60ef6..8febd73ed6ca 100644
@@ -45,6 +45,7 @@
 #include <asm/kasan.h>
 #include <asm/dma-mapping.h>
 #include <asm/uv.h>
+#include <linux/virtio_config.h>
 
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
 
@@ -161,6 +162,16 @@ bool force_dma_unencrypted(struct device *dev)
 	return is_prot_virt_guest();
 }
 
+#ifdef CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS
+
+int arch_has_restricted_virtio_memory_access(void)
+{
+	return is_prot_virt_guest();
+}
+EXPORT_SYMBOL(arch_has_restricted_virtio_memory_access);
+
+#endif
+
 /* protected virtualization */
 static void pv_init(void)
 {
Signature · 1 line
2.25.1
Reviewed-by on v9 2/2
#5 lore raw

Re: [PATCH v9 2/2] s390: virtio: PV needs VIRTIO I/O device protection

Quoted 1 line · On Wed, 19 Aug 2020 18:23:18 +0200 Pierre Morel <[email protected]> wrote:

If protected virtualization is active on s390, VIRTIO has retricted

s/retricted/only restricted/

Quoted 10 lines

access to the guest memory.
Define CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS and export arch_has_restricted_virtio_memory_access to advertize VIRTIO if that's the case, preventing a host error on access attempt.

---
 arch/s390/Kconfig   |  1 +
 arch/s390/mm/init.c | 11 +++++++++++
 2 files changed, 12 insertions(+)

(...)

arch/s390/mm/init.c line 48

Quoted 9 lines
arch/s390/mm/init.c +1 -0
index 6dc7c3b60ef6..8febd73ed6ca 100644
@@ -45,6 +45,7 @@
 #include <asm/kasan.h>
 #include <asm/dma-mapping.h>
 #include <asm/uv.h>
+#include <linux/virtio_config.h>

I don't think you need this include anymore.

arch/s390/mm/init.c line 51

Quoted 3 lines
arch/s390/mm/init.c +0 -0
 pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
 

(...)

With the nit fixed,

#6 lore raw

Re: [PATCH v9 2/2] s390: virtio: PV needs VIRTIO I/O device protection

Quoted 20 lines · Cornelia Huck
Quoted 1 line · On Wed, 19 Aug 2020 18:23:18 +0200 Pierre Morel <[email protected]> wrote:

If protected virtualization is active on s390, VIRTIO has retricted

s/retricted/only restricted/

Quoted 10 lines

access to the guest memory.
Define CONFIG_ARCH_HAS_RESTRICTED_VIRTIO_MEMORY_ACCESS and export arch_has_restricted_virtio_memory_access to advertize VIRTIO if that's the case, preventing a host error on access attempt.

---
  arch/s390/Kconfig   |  1 +
  arch/s390/mm/init.c | 11 +++++++++++
  2 files changed, 12 insertions(+)

(...)

Quoted 11 lines

arch/s390/mm/init.c line 48

Quoted 9 lines
arch/s390/mm/init.c +1 -0
index 6dc7c3b60ef6..8febd73ed6ca 100644
@@ -45,6 +45,7 @@
  #include <asm/kasan.h>
  #include <asm/dma-mapping.h>
  #include <asm/uv.h>
+#include <linux/virtio_config.h>

I don't think you need this include anymore.

right,

Quoted 11 lines

arch/s390/mm/init.c line 51

Quoted 4 lines
arch/s390/mm/init.c +0 -0
  pgd_t swapper_pg_dir[PTRS_PER_PGD] __section(.bss..swapper_pg_dir);
 

(...)

With the nit fixed,

Thanks,

Pierre

Signature · 2 lines
Pierre Morel
IBM Lab Boeblingen