[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 11/18] block: use Stat64 for wr_highest_offset
From: |
Paolo Bonzini |
Subject: |
[Qemu-block] [PATCH 11/18] block: use Stat64 for wr_highest_offset |
Date: |
Thu, 11 May 2017 16:42:01 +0200 |
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
block/io.c | 4 +---
block/qapi.c | 2 +-
include/block/block_int.h | 7 ++++---
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/block/io.c b/block/io.c
index 8d2854aeaa..25a00d82ed 100644
--- a/block/io.c
+++ b/block/io.c
@@ -1413,9 +1413,7 @@ static int coroutine_fn bdrv_aligned_pwritev(BdrvChild
*child,
++bs->write_gen;
bdrv_set_dirty(bs, start_sector, end_sector - start_sector);
- if (bs->wr_highest_offset < offset + bytes) {
- bs->wr_highest_offset = offset + bytes;
- }
+ stat64_max(&bs->wr_highest_offset, offset + bytes);
if (ret >= 0) {
bs->total_sectors = MAX(bs->total_sectors, end_sector);
diff --git a/block/qapi.c b/block/qapi.c
index a40922ea26..14b60ae66c 100644
--- a/block/qapi.c
+++ b/block/qapi.c
@@ -441,7 +441,7 @@ static BlockStats *bdrv_query_bds_stats(const
BlockDriverState *bs,
s->node_name = g_strdup(bdrv_get_node_name(bs));
}
- s->stats->wr_highest_offset = bs->wr_highest_offset;
+ s->stats->wr_highest_offset = stat64_get(&bs->wr_highest_offset);
if (bs->file) {
s->has_parent = true;
diff --git a/include/block/block_int.h b/include/block/block_int.h
index a11e405fa4..a9a1b45302 100644
--- a/include/block/block_int.h
+++ b/include/block/block_int.h
@@ -29,6 +29,7 @@
#include "qemu/option.h"
#include "qemu/queue.h"
#include "qemu/coroutine.h"
+#include "qemu/stats64.h"
#include "qemu/timer.h"
#include "qapi-types.h"
#include "qemu/hbitmap.h"
@@ -590,9 +591,6 @@ struct BlockDriverState {
/* Callback before write request is processed */
NotifierWithReturnList before_write_notifiers;
- /* Offset after the highest byte written to */
- uint64_t wr_highest_offset;
-
/* threshold limit for writes, in bytes. "High water mark". */
uint64_t write_threshold_offset;
NotifierWithReturn write_threshold_notifier;
@@ -605,6 +603,9 @@ struct BlockDriverState {
QLIST_HEAD(, BdrvDirtyBitmap) dirty_bitmaps;
+ /* Offset after the highest byte written to */
+ Stat64 wr_highest_offset;
+
/* If true, copy read backing sectors into image. Can be >1 if more
* than one client has requested copy-on-read. Accessed with atomic
* ops.
--
2.12.2
- [Qemu-block] [PATCH 08/18] throttle-groups: do not use qemu_co_enter_next, (continued)
- [Qemu-block] [PATCH 10/18] util: add stats64 module, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 11/18] block: use Stat64 for wr_highest_offset,
Paolo Bonzini <=
- [Qemu-block] [PATCH 13/18] block: protect tracked_requests and flush_queue with reqs_lock, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 12/18] block: access write_gen with atomics, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 14/18] block: introduce dirty_bitmap_mutex, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 15/18] migration/block: reset dirty bitmap before reading, Paolo Bonzini, 2017/05/11
- [Qemu-block] [PATCH 17/18] block: introduce block_account_one_io, Paolo Bonzini, 2017/05/11