Skip to content

Commit 95c7b0a

Browse files
committed
virtio_input: fix DMA alignment for evts
On non-cache-coherent platforms, when a structure contains a buffer used for DMA alongside fields that the CPU writes to, cacheline sharing can cause data corruption. The evts array is used for DMA_FROM_DEVICE operations via virtqueue_add_inbuf(). The adjacent lock and ready fields are written by the CPU during normal operation. If these share cachelines with evts, CPU writes can corrupt DMA data. Add __dma_from_device_group_begin()/end() annotations to ensure evts is isolated in its own cachelines. Message-ID: <cd328233198a76618809bb5cd9a6ddcaa603a8a1.1767601130.git.mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
1 parent db191ba commit 95c7b0a

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

drivers/virtio/virtio_input.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
#include <linux/virtio_config.h>
55
#include <linux/input.h>
66
#include <linux/slab.h>
7+
#include <linux/dma-mapping.h>
78

89
#include <uapi/linux/virtio_ids.h>
910
#include <uapi/linux/virtio_input.h>
@@ -16,7 +17,9 @@ struct virtio_input {
1617
char serial[64];
1718
char phys[64];
1819
struct virtqueue *evt, *sts;
20+
__dma_from_device_group_begin();
1921
struct virtio_input_event evts[64];
22+
__dma_from_device_group_end();
2023
spinlock_t lock;
2124
bool ready;
2225
};

0 commit comments

Comments
 (0)