qemu-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Qemu-devel] [PATCH] Avoid CPU endian memory accesses in devices


From: Blue Swirl
Subject: [Qemu-devel] [PATCH] Avoid CPU endian memory accesses in devices
Date: Thu, 14 Jul 2011 22:34:14 +0300

Don't compile virtio.c in hwlib, it depends on memory accesses
performed in CPU endianness.

Make loads and stores in CPU endianness unavailable to devices
and poison them to avoid further bugs.

Signed-off-by: Blue Swirl <address@hidden>
---
 Makefile.objs   |    2 +-
 Makefile.target |    2 +-
 cpu-common.h    |   19 +++++++++++--------
 poison.h        |    9 +++++++++
 4 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/Makefile.objs b/Makefile.objs
index cea15e4..86ebcec 100644
--- a/Makefile.objs
+++ b/Makefile.objs
@@ -171,7 +171,7 @@ user-obj-y += cutils.o cache-utils.o

 hw-obj-y =
 hw-obj-y += vl.o loader.o
-hw-obj-$(CONFIG_VIRTIO) += virtio.o virtio-console.o
+hw-obj-$(CONFIG_VIRTIO) += virtio-console.o
 hw-obj-$(CONFIG_VIRTIO_PCI) += virtio-pci.o
 hw-obj-y += fw_cfg.o
 hw-obj-$(CONFIG_PCI) += pci.o pci_bridge.o
diff --git a/Makefile.target b/Makefile.target
index a53a2ff..f3070b3 100644
--- a/Makefile.target
+++ b/Makefile.target
@@ -190,7 +190,7 @@ obj-y = arch_init.o cpus.o monitor.o machine.o
gdbstub.o balloon.o
 # virtio has to be here due to weird dependency between PCI and virtio-net.
 # need to fix this properly
 obj-$(CONFIG_NO_PCI) += pci-stub.o
-obj-$(CONFIG_VIRTIO) += virtio-blk.o virtio-balloon.o virtio-net.o
virtio-serial-bus.o
+obj-$(CONFIG_VIRTIO) += virtio.o virtio-blk.o virtio-balloon.o
virtio-net.o virtio-serial-bus.o
 obj-y += vhost_net.o
 obj-$(CONFIG_VHOST_NET) += vhost.o
 obj-$(CONFIG_REALLY_VIRTFS) += 9pfs/virtio-9p-device.o
diff --git a/cpu-common.h b/cpu-common.h
index c6a2b5f..3203c67 100644
--- a/cpu-common.h
+++ b/cpu-common.h
@@ -134,28 +134,31 @@ void
qemu_unregister_coalesced_mmio(target_phys_addr_t addr, ram_addr_t
size);
 void qemu_flush_coalesced_mmio_buffer(void);

 uint32_t ldub_phys(target_phys_addr_t addr);
-uint32_t lduw_phys(target_phys_addr_t addr);
 uint32_t lduw_le_phys(target_phys_addr_t addr);
 uint32_t lduw_be_phys(target_phys_addr_t addr);
-uint32_t ldl_phys(target_phys_addr_t addr);
 uint32_t ldl_le_phys(target_phys_addr_t addr);
 uint32_t ldl_be_phys(target_phys_addr_t addr);
-uint64_t ldq_phys(target_phys_addr_t addr);
 uint64_t ldq_le_phys(target_phys_addr_t addr);
 uint64_t ldq_be_phys(target_phys_addr_t addr);
-void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val);
-void stq_phys_notdirty(target_phys_addr_t addr, uint64_t val);
 void stb_phys(target_phys_addr_t addr, uint32_t val);
-void stw_phys(target_phys_addr_t addr, uint32_t val);
 void stw_le_phys(target_phys_addr_t addr, uint32_t val);
 void stw_be_phys(target_phys_addr_t addr, uint32_t val);
-void stl_phys(target_phys_addr_t addr, uint32_t val);
 void stl_le_phys(target_phys_addr_t addr, uint32_t val);
 void stl_be_phys(target_phys_addr_t addr, uint32_t val);
-void stq_phys(target_phys_addr_t addr, uint64_t val);
 void stq_le_phys(target_phys_addr_t addr, uint64_t val);
 void stq_be_phys(target_phys_addr_t addr, uint64_t val);

+#ifdef NEED_CPU_H
+uint32_t lduw_phys(target_phys_addr_t addr);
+uint32_t ldl_phys(target_phys_addr_t addr);
+uint64_t ldq_phys(target_phys_addr_t addr);
+void stl_phys_notdirty(target_phys_addr_t addr, uint32_t val);
+void stq_phys_notdirty(target_phys_addr_t addr, uint64_t val);
+void stw_phys(target_phys_addr_t addr, uint32_t val);
+void stl_phys(target_phys_addr_t addr, uint32_t val);
+void stq_phys(target_phys_addr_t addr, uint64_t val);
+#endif
+
 void cpu_physical_memory_write_rom(target_phys_addr_t addr,
                                    const uint8_t *buf, int len);

diff --git a/poison.h b/poison.h
index 2b18232..5354e77 100644
--- a/poison.h
+++ b/poison.h
@@ -37,6 +37,15 @@
 #pragma GCC poison CPUState
 #pragma GCC poison env

+#pragma GCC poison lduw_phys
+#pragma GCC poison ldl_phys
+#pragma GCC poison ldq_phys
+#pragma GCC poison stl_phys_notdirty
+#pragma GCC poison stq_phys_notdirty
+#pragma GCC poison stw_phys
+#pragma GCC poison stl_phys
+#pragma GCC poison stq_phys
+
 #pragma GCC poison CPU_INTERRUPT_HARD
 #pragma GCC poison CPU_INTERRUPT_EXITTB
 #pragma GCC poison CPU_INTERRUPT_HALT
-- 
1.6.2.4

Attachment: 0001-Avoid-CPU-endian-memory-accesses-in-devices.patch
Description: Text Data


reply via email to

[Prev in Thread] Current Thread [Next in Thread]