qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-devel@nongnu.org
Cc: kwolf@redhat.com, lersek@redhat.com, stefanha@redhat.com
Subject: [Qemu-devel] [PATCH 2/3] block: bdrv_aligned_pwritev: Assert overlap range
Date: Fri,  7 Feb 2014 17:12:57 +0100	[thread overview]
Message-ID: <1391789578-19601-3-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1391789578-19601-1-git-send-email-kwolf@redhat.com>

This adds assertions that the request that we actually end up passing to
the block driver (which includes RMW data and has therefore potentially
been rounded to alignment boundaries) is fully covered by the
overlap_{offset,size} fields of the associated BdrvTrackedRequest.

Suggested-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 block.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block.c b/block.c
index c1d1f74..a027823 100644
--- a/block.c
+++ b/block.c
@@ -3134,6 +3134,8 @@ static int coroutine_fn bdrv_aligned_pwritev(BlockDriverState *bs,
 
     waited = wait_serialising_requests(req);
     assert(!waited || !req->serialising);
+    assert(req->overlap_offset <= offset);
+    assert(offset + bytes <= req->overlap_offset + req->overlap_bytes);
 
     ret = notifier_with_return_list_notify(&bs->before_write_notifiers, req);
 
-- 
1.8.1.4

  parent reply	other threads:[~2014-02-07 16:13 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-07 16:12 [Qemu-devel] [PATCH 0/3] 512-on-4k follow-up patches Kevin Wolf
2014-02-07 16:12 ` [Qemu-devel] [PATCH 1/3] block: Fix memory leaks in bdrv_co_do_pwritev() Kevin Wolf
2014-02-07 16:12 ` Kevin Wolf [this message]
2014-02-07 16:12 ` [Qemu-devel] [PATCH 3/3] block: Don't call ROUND_UP with negative values Kevin Wolf
2014-02-07 16:27   ` Eric Blake
2014-02-07 21:45     ` Kevin Wolf
2014-02-07 23:24       ` Laszlo Ersek
2014-02-08  8:17         ` Kevin Wolf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1391789578-19601-3-git-send-email-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=lersek@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).