qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Kevin Wolf <kwolf@redhat.com>
To: qemu-block@nongnu.org
Cc: kwolf@redhat.com, peter.maydell@linaro.org, qemu-devel@nongnu.org
Subject: [PULL 02/43] icount: make dma reads deterministic
Date: Wed, 17 Jun 2020 16:48:28 +0200	[thread overview]
Message-ID: <20200617144909.192176-3-kwolf@redhat.com> (raw)
In-Reply-To: <20200617144909.192176-1-kwolf@redhat.com>

From: Pavel Dovgalyuk <pavel.dovgaluk@gmail.com>

Windows guest sometimes makes DMA requests with overlapping
target addresses. This leads to the following structure of iov for
the block driver:

addr size1
addr size2
addr size3

It means that three adjacent disk blocks should be read into the same
memory buffer. Windows does not expects anything from these bytes
(should it be data from the first block, or the last one, or some mix),
but uses them somehow. It leads to non-determinism of the guest execution,
because block driver does not preserve any order of reading.

This situation was discusses in the mailing list at least twice:
https://lists.gnu.org/archive/html/qemu-devel/2010-09/msg01996.html
https://lists.gnu.org/archive/html/qemu-devel/2020-02/msg05185.html

This patch makes such disk reads deterministic in icount mode.
It splits the whole request into several parts. Parts may overlap,
but SGs inside one part do not overlap.
Parts that are processed later overwrite the prior ones in case
of overlapping.

Examples for different SG part sequences:

1)
A1 1000
A2 1000
A1 1000
A3 1000
->
One request is split into two.
A1 1000
A2 1000
--
A1 1000
A3 1000

2)
A1 800
A2 1000
A1 1000
->
A1 800
A2 1000
--
A1 1000

Signed-off-by: Pavel Dovgalyuk <Pavel.Dovgaluk@ispras.ru>
Message-Id: <159117972206.12193.12939621311413561779.stgit@pasha-ThinkPad-X280>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
 dma-helpers.c | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/dma-helpers.c b/dma-helpers.c
index e8a26e81e1..2a77b5a9cb 100644
--- a/dma-helpers.c
+++ b/dma-helpers.c
@@ -13,6 +13,8 @@
 #include "trace-root.h"
 #include "qemu/thread.h"
 #include "qemu/main-loop.h"
+#include "sysemu/cpus.h"
+#include "qemu/range.h"
 
 /* #define DEBUG_IOMMU */
 
@@ -142,6 +144,26 @@ static void dma_blk_cb(void *opaque, int ret)
         cur_addr = dbs->sg->sg[dbs->sg_cur_index].base + dbs->sg_cur_byte;
         cur_len = dbs->sg->sg[dbs->sg_cur_index].len - dbs->sg_cur_byte;
         mem = dma_memory_map(dbs->sg->as, cur_addr, &cur_len, dbs->dir);
+        /*
+         * Make reads deterministic in icount mode. Windows sometimes issues
+         * disk read requests with overlapping SGs. It leads
+         * to non-determinism, because resulting buffer contents may be mixed
+         * from several sectors. This code splits all SGs into several
+         * groups. SGs in every group do not overlap.
+         */
+        if (mem && use_icount && dbs->dir == DMA_DIRECTION_FROM_DEVICE) {
+            int i;
+            for (i = 0 ; i < dbs->iov.niov ; ++i) {
+                if (ranges_overlap((intptr_t)dbs->iov.iov[i].iov_base,
+                                   dbs->iov.iov[i].iov_len, (intptr_t)mem,
+                                   cur_len)) {
+                    dma_memory_unmap(dbs->sg->as, mem, cur_len,
+                                     dbs->dir, cur_len);
+                    mem = NULL;
+                    break;
+                }
+            }
+        }
         if (!mem)
             break;
         qemu_iovec_add(&dbs->iov, mem, cur_len);
-- 
2.25.4



  parent reply	other threads:[~2020-06-17 14:52 UTC|newest]

Thread overview: 48+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-06-17 14:48 [PULL 00/43] Block layer patches Kevin Wolf
2020-06-17 14:48 ` [PULL 01/43] hw/ide: Make IDEDMAOps handlers take a const IDEDMA pointer Kevin Wolf
2020-06-17 14:48 ` Kevin Wolf [this message]
2020-06-17 14:48 ` [PULL 03/43] virtio-blk: Refactor the code that processes queued requests Kevin Wolf
2020-06-17 14:48 ` [PULL 04/43] virtio-blk: On restart, process queued requests in the proper context Kevin Wolf
2020-06-17 14:48 ` [PULL 05/43] block: Refactor subdirectory recursion during make Kevin Wolf
2020-06-17 14:48 ` [PULL 06/43] qcow2: Tweak comments on qcow2_get_persistent_dirty_bitmap_size Kevin Wolf
2020-06-17 14:48 ` [PULL 07/43] hw/block/nvme: fix pci doorbell size calculation Kevin Wolf
2020-06-17 14:48 ` [PULL 08/43] hw/block/nvme: rename trace events to pci_nvme Kevin Wolf
2020-06-17 14:48 ` [PULL 09/43] hw/block/nvme: remove superfluous breaks Kevin Wolf
2020-06-17 14:48 ` [PULL 10/43] hw/block/nvme: move device parameters to separate struct Kevin Wolf
2020-06-17 14:48 ` [PULL 11/43] hw/block/nvme: use constants in identify Kevin Wolf
2020-06-17 14:48 ` [PULL 12/43] hw/block/nvme: refactor nvme_addr_read Kevin Wolf
2020-06-17 14:48 ` [PULL 13/43] hw/block/nvme: fix pin-based interrupt behavior Kevin Wolf
2020-06-17 14:48 ` [PULL 14/43] hw/block/nvme: add max_ioqpairs device parameter Kevin Wolf
2020-06-17 14:48 ` [PULL 15/43] hw/block/nvme: remove redundant cmbloc/cmbsz members Kevin Wolf
2020-06-17 14:48 ` [PULL 16/43] hw/block/nvme: factor out property/constraint checks Kevin Wolf
2020-06-17 14:48 ` [PULL 17/43] hw/block/nvme: factor out device state setup Kevin Wolf
2020-06-17 14:48 ` [PULL 18/43] hw/block/nvme: factor out block backend setup Kevin Wolf
2020-06-17 14:48 ` [PULL 19/43] hw/block/nvme: add namespace helpers Kevin Wolf
2020-06-17 14:48 ` [PULL 20/43] hw/block/nvme: factor out namespace setup Kevin Wolf
2020-06-17 14:48 ` [PULL 21/43] hw/block/nvme: factor out pci setup Kevin Wolf
2020-06-17 14:48 ` [PULL 22/43] hw/block/nvme: factor out cmb setup Kevin Wolf
2020-06-17 14:48 ` [PULL 23/43] hw/block/nvme: factor out pmr setup Kevin Wolf
2020-06-17 14:48 ` [PULL 24/43] hw/block/nvme: do cmb/pmr init as part of pci init Kevin Wolf
2020-06-17 14:48 ` [PULL 25/43] hw/block/nvme: factor out controller identify setup Kevin Wolf
2020-06-17 14:48 ` [PULL 26/43] hw/block/nvme: Verify msix_vector_use() returned value Kevin Wolf
2020-06-17 14:48 ` [PULL 27/43] hw/block/nvme: add msix_qsize parameter Kevin Wolf
2020-06-17 14:48 ` [PULL 28/43] hw/block/nvme: verify msix_init_exclusive_bar() return value Kevin Wolf
2020-06-17 14:48 ` [PULL 29/43] .gitignore: Ignore storage-daemon files Kevin Wolf
2020-06-17 14:48 ` [PULL 30/43] virtio-blk: store opt_io_size with correct size Kevin Wolf
2020-06-17 14:48 ` [PULL 31/43] block: consolidate blocksize properties consistency checks Kevin Wolf
2020-06-17 14:48 ` [PULL 32/43] qdev-properties: blocksize: use same limits in code and description Kevin Wolf
2020-06-17 14:48 ` [PULL 33/43] qdev-properties: add size32 property type Kevin Wolf
2020-06-17 14:49 ` [PULL 34/43] qdev-properties: make blocksize accept size suffixes Kevin Wolf
2020-06-17 14:49 ` [PULL 35/43] block: make BlockConf size props 32bit and " Kevin Wolf
2020-06-17 14:49 ` [PULL 36/43] qdev-properties: add getter for size32 and blocksize Kevin Wolf
2020-06-17 14:49 ` [PULL 37/43] block: lift blocksize property limit to 2 MiB Kevin Wolf
2020-06-17 14:49 ` [PULL 38/43] iotests.py: Add skip_for_formats() decorator Kevin Wolf
2020-06-17 14:49 ` [PULL 39/43] iotests/041: Skip test_small_target for qed Kevin Wolf
2020-06-17 14:49 ` [PULL 40/43] iotests/292: data_file is unsupported Kevin Wolf
2020-06-17 14:49 ` [PULL 41/43] iotests/229: " Kevin Wolf
2020-06-17 14:49 ` [PULL 42/43] iotests/{190,291}: compat=0.10 " Kevin Wolf
2020-06-17 14:49 ` [PULL 43/43] iotests: Add copyright line in qcow2.py Kevin Wolf
2020-06-17 15:48 ` [PULL 00/43] Block layer patches no-reply
2020-06-18 14:30 ` Peter Maydell
2020-06-25  8:39   ` Klaus Jensen
2020-06-25 10:39     ` 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=20200617144909.192176-3-kwolf@redhat.com \
    --to=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /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).