[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-arm] [PATCH v5 2/9] m25p80: do not put iovec on the stack
From: |
Cédric Le Goater |
Subject: |
[Qemu-arm] [PATCH v5 2/9] m25p80: do not put iovec on the stack |
Date: |
Tue, 28 Jun 2016 20:24:23 +0200 |
From: Paolo Bonzini <address@hidden>
When doing a read-modify-write cycle, QEMU uses the iovec after returning
from blk_aio_pwritev. m25p80 puts the iovec on the stack of blk_aio_pwritev's
caller, which causes trouble in this case. This has been a problem
since commit 243e6f6 ("m25p80: Switch to byte-based block access",
2016-05-12) started doing writes at a smaller granularity than 512 bytes.
In principle however it could have broken before when using -drive
if=mtd,cache=none on a disk with 4K native sectors.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Cédric Le Goater <address@hidden>
Reviewed-by: Eric Blake <address@hidden>
Signed-off-by: Cédric Le Goater <address@hidden>
---
hw/block/m25p80.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/hw/block/m25p80.c b/hw/block/m25p80.c
index 3cdcfce07ba9..8e4c11573521 100644
--- a/hw/block/m25p80.c
+++ b/hw/block/m25p80.c
@@ -447,6 +447,11 @@ static inline Manufacturer get_man(Flash *s)
static void blk_sync_complete(void *opaque, int ret)
{
+ QEMUIOVector *iov = opaque;
+
+ qemu_iovec_destroy(iov);
+ g_free(iov);
+
/* do nothing. Masters do not directly interact with the backing store,
* only the working copy so no mutexing required.
*/
@@ -454,31 +459,31 @@ static void blk_sync_complete(void *opaque, int ret)
static void flash_sync_page(Flash *s, int page)
{
- QEMUIOVector iov;
+ QEMUIOVector *iov = g_new(QEMUIOVector, 1);
if (!s->blk || blk_is_read_only(s->blk)) {
return;
}
- qemu_iovec_init(&iov, 1);
- qemu_iovec_add(&iov, s->storage + page * s->pi->page_size,
+ qemu_iovec_init(iov, 1);
+ qemu_iovec_add(iov, s->storage + page * s->pi->page_size,
s->pi->page_size);
- blk_aio_pwritev(s->blk, page * s->pi->page_size, &iov, 0,
- blk_sync_complete, NULL);
+ blk_aio_pwritev(s->blk, page * s->pi->page_size, iov, 0,
+ blk_sync_complete, iov);
}
static inline void flash_sync_area(Flash *s, int64_t off, int64_t len)
{
- QEMUIOVector iov;
+ QEMUIOVector *iov = g_new(QEMUIOVector, 1);
if (!s->blk || blk_is_read_only(s->blk)) {
return;
}
assert(!(len % BDRV_SECTOR_SIZE));
- qemu_iovec_init(&iov, 1);
- qemu_iovec_add(&iov, s->storage + off, len);
- blk_aio_pwritev(s->blk, off, &iov, 0, blk_sync_complete, NULL);
+ qemu_iovec_init(iov, 1);
+ qemu_iovec_add(iov, s->storage + off, len);
+ blk_aio_pwritev(s->blk, off, iov, 0, blk_sync_complete, iov);
}
static void flash_erase(Flash *s, int offset, FlashCMD cmd)
--
2.1.4
- [Qemu-arm] [PATCH v5 0/9] ast2400: SMC controllers, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 1/9] ssi: change ssi_slave_init to be a realize ops, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 2/9] m25p80: do not put iovec on the stack,
Cédric Le Goater <=
- [Qemu-arm] [PATCH v5 3/9] m25p80: avoid out of bounds accesses, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 4/9] m25p80: change cur_addr to 32 bit integer, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 5/9] m25p80: qdev-ify drive property, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 6/9] ast2400: add SMC controllers (FMC and SPI), Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 7/9] ast2400: add SPI flash slaves, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 8/9] ast2400: create SPI flash slaves, Cédric Le Goater, 2016/06/28
- [Qemu-arm] [PATCH v5 9/9] tests: add a m25p80 test, Cédric Le Goater, 2016/06/28