Skip to contentSkip to conversation

util/vfio-helper: Fix endianess in PCI config read/write functions

PATCH Applied Farhan Ali 3 participants 5 messages Jan 5 – Jan 9

lore
Share & tools
lore

Farhan Ali

author
#0 lore raw

PATCH 1/1 util/vfio-helper: Fix endianess in PCI config read/write functions

The VFIO pread/pwrite functions use little-endian data format. Currently, the qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config() don't correctly convert from CPU native endian format to little-endian (and vice versa) when using the pread/pwrite functions. Fix this by limiting read/write to 32 bits and handling endian conversion in qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config().

---
 util/vfio-helpers.c | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

v1 -> v2
v1 https://lore.kernel.org/all/[email protected]/
- Drop Philipe's r-b as code has changed.
- Do endian conversion in qemu_vfio_pci_read_config() and
qemu_vfio_pci_write_config().

util/vfio-helpers.c +10 -5
index 44b457c442..5a4169d1b1 100644
@@ -233,31 +233,36 @@ int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
     return 0;
 }
 
-static int qemu_vfio_pci_read_config(QEMUVFIOState *s, void *buf,
+static int qemu_vfio_pci_read_config(QEMUVFIOState *s, uint32_t *buf,
                                      int size, int ofs)
 {
     int ret;
+    uint32_t val_le;
 
     trace_qemu_vfio_pci_read_config(buf, ofs, size,
                                     s->config_region_info.offset,
                                     s->config_region_info.size);
     assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size));
     ret = RETRY_ON_EINTR(
-        pread(s->device, buf, size, s->config_region_info.offset + ofs)
+        pread(s->device, &val_le, size, s->config_region_info.offset + ofs)
     );
+
+    *buf = le32_to_cpu(val_le);
     return ret == size ? 0 : -errno;
 }
 
-static int qemu_vfio_pci_write_config(QEMUVFIOState *s, void *buf, int size, int ofs)
+static int qemu_vfio_pci_write_config(QEMUVFIOState *s, uint32_t *buf, int size, int ofs)
 {
     int ret;
+    uint32_t val_le;
 
+    val_le = cpu_to_le32(*buf);
     trace_qemu_vfio_pci_write_config(buf, ofs, size,
                                      s->config_region_info.offset,
                                      s->config_region_info.size);
     assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size));
     ret = RETRY_ON_EINTR(
-        pwrite(s->device, buf, size, s->config_region_info.offset + ofs)
+        pwrite(s->device, &val_le, size, s->config_region_info.offset + ofs)
     );
     return ret == size ? 0 : -errno;
 }
@@ -296,7 +301,7 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const char *device,
 {
     int ret;
     int i;
-    uint16_t pci_cmd;
+    uint32_t pci_cmd;
     struct vfio_group_status group_status = { .argsz = sizeof(group_status) };
     struct vfio_iommu_type1_info *iommu_info = NULL;
     size_t iommu_info_size = sizeof(*iommu_info);
Signature · 1 line
2.43.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Farhan Ali

The VFIO pread/pwrite functions use little-endian data format. Currently, the qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config() don't correctly convert from CPU native endian format to little-endian (and vice versa) when using the pread/pwrite functions. Fix this by limiting read/write to 32 bits and handling endian conversion in qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config().

Thanks,

C.

Quoted 65 lines
---
  util/vfio-helpers.c | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)

v1 -> v2
v1 https://lore.kernel.org/all/[email protected]/
- Drop Philipe's r-b as code has changed.
- Do endian conversion in qemu_vfio_pci_read_config() and
qemu_vfio_pci_write_config().

util/vfio-helpers.c +10 -5
index 44b457c442..5a4169d1b1 100644
@@ -233,31 +233,36 @@ int qemu_vfio_pci_init_irq(QEMUVFIOState *s, EventNotifier *e,
      return 0;
  }
 
-static int qemu_vfio_pci_read_config(QEMUVFIOState *s, void *buf,
+static int qemu_vfio_pci_read_config(QEMUVFIOState *s, uint32_t *buf,
                                       int size, int ofs)
  {
      int ret;
+    uint32_t val_le;
 
      trace_qemu_vfio_pci_read_config(buf, ofs, size,
                                      s->config_region_info.offset,
                                      s->config_region_info.size);
      assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size));
      ret = RETRY_ON_EINTR(
-        pread(s->device, buf, size, s->config_region_info.offset + ofs)
+        pread(s->device, &val_le, size, s->config_region_info.offset + ofs)
      );
+
+    *buf = le32_to_cpu(val_le);
      return ret == size ? 0 : -errno;
  }
 
-static int qemu_vfio_pci_write_config(QEMUVFIOState *s, void *buf, int size, int ofs)
+static int qemu_vfio_pci_write_config(QEMUVFIOState *s, uint32_t *buf, int size, int ofs)
  {
      int ret;
+    uint32_t val_le;
 
+    val_le = cpu_to_le32(*buf);
      trace_qemu_vfio_pci_write_config(buf, ofs, size,
                                       s->config_region_info.offset,
                                       s->config_region_info.size);
      assert(QEMU_IS_ALIGNED(s->config_region_info.offset + ofs, size));
      ret = RETRY_ON_EINTR(
-        pwrite(s->device, buf, size, s->config_region_info.offset + ofs)
+        pwrite(s->device, &val_le, size, s->config_region_info.offset + ofs)
      );
      return ret == size ? 0 : -errno;
  }
@@ -296,7 +301,7 @@ static int qemu_vfio_init_pci(QEMUVFIOState *s, const char *device,
  {
      int ret;
      int i;
-    uint16_t pci_cmd;
+    uint32_t pci_cmd;
      struct vfio_group_status group_status = { .argsz = sizeof(group_status) };
      struct vfio_iommu_type1_info *iommu_info = NULL;
      size_t iommu_info_size = sizeof(*iommu_info);
#2 lore raw
In reply to Farhan Ali
Quoted 11 lines · Farhan Ali

The VFIO pread/pwrite functions use little-endian data format. Currently, the qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config() don't correctly convert from CPU native endian format to little-endian (and vice versa) when using the pread/pwrite functions. Fix this by limiting read/write to 32 bits and handling endian conversion in qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config().

---
  util/vfio-helpers.c | 15 ++++++++++-----
  1 file changed, 10 insertions(+), 5 deletions(-)

Applied v2 to vfio-next.

Thanks,

C.

#3 lore raw
Quoted 8 lines · Cédric Le Goater
Quoted 7 lines · Farhan Ali

The VFIO pread/pwrite functions use little-endian data format. Currently, the qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config() don't correctly convert from CPU native endian format to little-endian (and vice versa) when using the pread/pwrite functions. Fix this by limiting read/write to 32 bits and handling endian conversion in qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config().

Quoted 7 lines
Quoted 4 lines

---
  util/vfio-helpers.c | 15 ++++++++++-----

  1 file changed, 10 insertions(+), 5 deletions(-)

Applied v2 to vfio-next.

Typo "endianness" in subject.

#4 lore raw
Quoted 15 lines · Philippe Mathieu-Daudé
Quoted 14 lines · Cédric Le Goater
Quoted 11 lines · Farhan Ali

The VFIO pread/pwrite functions use little-endian data format. Currently, the qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config() don't correctly convert from CPU native endian format to little-endian (and vice versa) when using the pread/pwrite functions. Fix this by limiting read/write to 32 bits and handling endian conversion in qemu_vfio_pci_read_config() and qemu_vfio_pci_write_config().

---
  util/vfio-helpers.c | 15 ++++++++++-----

  1 file changed, 10 insertions(+), 5 deletions(-)
Quoted 4 lines
Quoted 1 line

Applied v2 to vfio-next.

Typo "endianness" in subject.

Fixed.

C.