Series comparison

-[Qemu-devel] [PULL 0/1] Block patches
+[PULL 0/3] Block patches
-The following changes since commit 0b5e750bea635b167eb03d86c3d9a09bbd43bc06:
+The following changes since commit ef9f8fcbec6276414921dcd042575129a6331a2d:
-  Merge remote-tracking branch 'remotes/stefanha/tags/block-pull-request' into staging (2019-02-12 10:53:37 +0000)
+  Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-03-04-2' into staging (2020-03-05 19:39:47 +0000)
 are available in the Git repository at:
-  git://github.com/stefanha/qemu.git tags/block-pull-request
+  https://github.com/stefanha/qemu.git tags/block-pull-request
-for you to fetch changes up to 42824b4d16da56a50ff4027f6cd22378e0e2666e:
+for you to fetch changes up to 1f40ace7b5634f93801c8474b9eb77fe2e00289c:
-  virtio-blk: set correct config size for the host driver (2019-02-13 16:18:17 +0800)
+  tests: Fix a bug with count variables (2020-03-06 10:35:15 +0000)
 ----------------------------------------------------------------
 Pull request
-Fix a virtio-blk migration regression.
+These patches would have gone through Thomas Huth but he is away on leave.
 ----------------------------------------------------------------
-Changpeng Liu (1):
+Alexander Bulekov (2):
-  virtio-blk: set correct config size for the host driver
+  fuzz: fix style/typos in linker-script comments
   qtest: fix fuzzer-related 80-char limit violations
- hw/block/virtio-blk.c | 13 +++++++++----
+Tianjia Zhang (1):
-file changed, 9 insertions(+), 4 deletions(-)
+  tests: Fix a bug with count variables
  qtest.c                       |  3 ++-
  tests/qtest/fuzz/fork_fuzz.ld | 16 ++++++++++------
  tests/qtest/fuzz/qos_fuzz.c   |  5 ++++-
  tests/test-rcu-list.c         |  2 +-
 files changed, 17 insertions(+), 9 deletions(-)
 --
-.20.1
+.24.1

-New patch
+[PULL 1/3] fuzz: fix style/typos in linker-script comments
+From: Alexander Bulekov <alxndr@bu.edu>
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
+Reviewed-by: Eric Blake <eblake@redhat.com>
+Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
+Message-id: 20200227031439.31386-2-alxndr@bu.edu
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+---
+ tests/qtest/fuzz/fork_fuzz.ld | 16 ++++++++++------
+file changed, 10 insertions(+), 6 deletions(-)
+diff --git a/tests/qtest/fuzz/fork_fuzz.ld b/tests/qtest/fuzz/fork_fuzz.ld
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/qtest/fuzz/fork_fuzz.ld
++++ b/tests/qtest/fuzz/fork_fuzz.ld
+@@ -XXX,XX +XXX,XX @@
+-/* We adjust linker script modification to place all of the stuff that needs to
+- * persist across fuzzing runs into a contiguous seciton of memory. Then, it is
++/*
++ * We adjust linker script modification to place all of the stuff that needs to
++ * persist across fuzzing runs into a contiguous section of memory. Then, it is
+  * easy to re-map the counter-related memory as shared.
+-*/
++ */
+ SECTIONS
+ {
+@@ -XXX,XX +XXX,XX @@ SECTIONS
+   }
+   .data.fuzz_ordered :
+   {
+-      /* Coverage counters. They're not necessary for fuzzing, but are useful
++      /*
++       * Coverage counters. They're not necessary for fuzzing, but are useful
+        * for analyzing the fuzzing performance
+        */
+       __start___llvm_prf_cnts = .;
+@@ -XXX,XX +XXX,XX @@ SECTIONS
+       __FUZZ_COUNTERS_END = .;
+   }
+ }
+-/* Dont overwrite the SECTIONS in the default linker script. Instead insert the
+- * above into the default script */
++/*
++ * Don't overwrite the SECTIONS in the default linker script. Instead insert the
++ * above into the default script
++ */
+ INSERT AFTER .data;
+--
+.24.1

-[Qemu-devel] [PULL 1/1] virtio-blk: set correct config size for the host driver
+[PULL 2/3] qtest: fix fuzzer-related 80-char limit violations
-From: Changpeng Liu <changpeng.liu@intel.com>
+From: Alexander Bulekov <alxndr@bu.edu>
-Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features
+Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
-support" added fields to struct virtio_blk_config. This changes
+Reviewed-by: Eric Blake <eblake@redhat.com>
-the size of the config space and breaks migration from QEMU 3.1
+Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
-and older:
+Message-id: 20200227031439.31386-3-alxndr@bu.edu
 qemu-system-ppc64: get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
 qemu-system-ppc64: Failed to load PCIDevice:config
 qemu-system-ppc64: Failed to load virtio-blk:virtio
 qemu-system-ppc64: error while loading state for instance 0x0 of device 'pci@800000020000000:01.0/virtio-blk'
 qemu-system-ppc64: load of migration failed: Invalid argument
 Since virtio-blk doesn't support the "discard" and "write zeroes"
 features, it shouldn't even expose the associated fields in the
 config space actually. Just include all fields up to num_queues to
 match QEMU 3.1 and older.
 Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
 Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
 Message-id: 1550022537-27565-1-git-send-email-changpeng.liu@intel.com
 Message-Id: <1550022537-27565-1-git-send-email-changpeng.liu@intel.com>
 Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
 ---
- hw/block/virtio-blk.c | 13 +++++++++----
+ qtest.c                     | 3 ++-
-file changed, 9 insertions(+), 4 deletions(-)
+ tests/qtest/fuzz/qos_fuzz.c | 5 ++++-
 files changed, 6 insertions(+), 2 deletions(-)
-diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
+diff --git a/qtest.c b/qtest.c
 index XXXXXXX..XXXXXXX 100644
---- a/hw/block/virtio-blk.c
+--- a/qtest.c
-+++ b/hw/block/virtio-blk.c
++++ b/qtest.c
-@@ -XXX,XX +XXX,XX @@
+@@ -XXX,XX +XXX,XX @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **
- #include "hw/virtio/virtio-bus.h"
+     }
- #include "hw/virtio/virtio-access.h"
+ }
-+/* We don't support discard yet, hide associated config fields. */
+-void qtest_server_set_send_handler(void (*send)(void*, const char*), void *opaque)
-+#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \
++void qtest_server_set_send_handler(void (*send)(void*, const char*),
-+                                     max_discard_sectors)
++                                   void *opaque)
 +
  static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
                                      VirtIOBlockReq *req)
  {
-@@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
+     qtest_server_send = send;
-     blkcfg.alignment_offset = 0;
+     qtest_server_send_opaque = opaque;
-     blkcfg.wce = blk_enable_write_cache(s->blk);
+diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
-     virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues);
+index XXXXXXX..XXXXXXX 100644
--    memcpy(config, &blkcfg, sizeof(struct virtio_blk_config));
+--- a/tests/qtest/fuzz/qos_fuzz.c
-+    memcpy(config, &blkcfg, VIRTIO_BLK_CFG_SIZE);
++++ b/tests/qtest/fuzz/qos_fuzz.c
-+    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
+@@ -XXX,XX +XXX,XX @@ static void walk_path(QOSGraphNode *orig_path, int len)
- }
+     QOSGraphNode *path;
+     QOSGraphEdge *edge;
- static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
-@@ -XXX,XX +XXX,XX @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
+-    /* etype set to QEDGE_CONSUMED_BY so that machine can add to the command line */
-     VirtIOBlock *s = VIRTIO_BLK(vdev);
++    /*
-     struct virtio_blk_config blkcfg;
++     * etype set to QEDGE_CONSUMED_BY so that machine can add to the command
++     * line
--    memcpy(&blkcfg, config, sizeof(blkcfg));
++     */
-+    memcpy(&blkcfg, config, VIRTIO_BLK_CFG_SIZE);
+     QOSEdgeType etype = QEDGE_CONSUMED_BY;
-+    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
+     /* twice QOS_PATH_MAX_ELEMENT_SIZE since each edge can have its arg */
      aio_context_acquire(blk_get_aio_context(s->blk));
      blk_set_enable_write_cache(s->blk, blkcfg.wce != 0);
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
          return;
      }
 -    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
 -                sizeof(struct virtio_blk_config));
 +    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, VIRTIO_BLK_CFG_SIZE);
      s->blk = conf->conf.blk;
      s->rq = NULL;
 --
-.20.1
+.24.1

-New patch
+[PULL 3/3] tests: Fix a bug with count variables
+From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
+The counting code here should use the local variable n_nodes_local.
+Otherwise, the variable n_nodes is counting incorrectly, causing the
+counting logic of the code to be wrong.
+Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
+Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
+Link: https://lore.kernel.org/r/20200207115433.118254-1-tianjia.zhang@linux.alibaba.com
+Message-Id: <20200207115433.118254-1-tianjia.zhang@linux.alibaba.com>
+---
+ tests/test-rcu-list.c | 2 +-
+file changed, 1 insertion(+), 1 deletion(-)
+diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
+index XXXXXXX..XXXXXXX 100644
+--- a/tests/test-rcu-list.c
++++ b/tests/test-rcu-list.c
+@@ -XXX,XX +XXX,XX @@ static void *rcu_q_updater(void *arg)
+             j++;
+             if (target_el == j) {
+                 struct list_element *new_el = g_new(struct list_element, 1);
+-                n_nodes += n_nodes_local;
++                n_nodes_local++;
+                 TEST_LIST_INSERT_AFTER_RCU(el, new_el, entry);
+                 break;
+             }
+--
+.24.1

From: Changpeng Liu <changpeng.liu@intel.com>

Commit caa1ee43 "vhost-user-blk: add discard/write zeroes features
support" added fields to struct virtio_blk_config. This changes
the size of the config space and breaks migration from QEMU 3.1
and older:

qemu-system-ppc64: get_pci_config_device: Bad config data: i=0x10 read: 41 device: 1 cmask: ff wmask: 80 w1cmask:0
qemu-system-ppc64: Failed to load PCIDevice:config
qemu-system-ppc64: Failed to load virtio-blk:virtio
qemu-system-ppc64: error while loading state for instance 0x0 of device 'pci@800000020000000:01.0/virtio-blk'
qemu-system-ppc64: load of migration failed: Invalid argument

Since virtio-blk doesn't support the "discard" and "write zeroes"
features, it shouldn't even expose the associated fields in the
config space actually. Just include all fields up to num_queues to
match QEMU 3.1 and older.

Signed-off-by: Changpeng Liu <changpeng.liu@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Message-id: 1550022537-27565-1-git-send-email-changpeng.liu@intel.com
Message-Id: <1550022537-27565-1-git-send-email-changpeng.liu@intel.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 hw/block/virtio-blk.c | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/hw/block/virtio-blk.c b/hw/block/virtio-blk.c
index XXXXXXX..XXXXXXX 100644
--- a/hw/block/virtio-blk.c
+++ b/hw/block/virtio-blk.c
@@ -XXX,XX +XXX,XX @@
 #include "hw/virtio/virtio-bus.h"
 #include "hw/virtio/virtio-access.h"
 
+/* We don't support discard yet, hide associated config fields. */
+#define VIRTIO_BLK_CFG_SIZE offsetof(struct virtio_blk_config, \
+                                     max_discard_sectors)
+
 static void virtio_blk_init_request(VirtIOBlock *s, VirtQueue *vq,
                                     VirtIOBlockReq *req)
 {
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_update_config(VirtIODevice *vdev, uint8_t *config)
     blkcfg.alignment_offset = 0;
     blkcfg.wce = blk_enable_write_cache(s->blk);
     virtio_stw_p(vdev, &blkcfg.num_queues, s->conf.num_queues);
-    memcpy(config, &blkcfg, sizeof(struct virtio_blk_config));
+    memcpy(config, &blkcfg, VIRTIO_BLK_CFG_SIZE);
+    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
 }
 
 static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_set_config(VirtIODevice *vdev, const uint8_t *config)
     VirtIOBlock *s = VIRTIO_BLK(vdev);
     struct virtio_blk_config blkcfg;
 
-    memcpy(&blkcfg, config, sizeof(blkcfg));
+    memcpy(&blkcfg, config, VIRTIO_BLK_CFG_SIZE);
+    QEMU_BUILD_BUG_ON(VIRTIO_BLK_CFG_SIZE > sizeof(blkcfg));
 
     aio_context_acquire(blk_get_aio_context(s->blk));
     blk_set_enable_write_cache(s->blk, blkcfg.wce != 0);
@@ -XXX,XX +XXX,XX @@ static void virtio_blk_device_realize(DeviceState *dev, Error **errp)
         return;
     }
 
-    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK,
-                sizeof(struct virtio_blk_config));
+    virtio_init(vdev, "virtio-blk", VIRTIO_ID_BLOCK, VIRTIO_BLK_CFG_SIZE);
 
     s->blk = conf->conf.blk;
     s->rq = NULL;
-- 
2.20.1

The following changes since commit ef9f8fcbec6276414921dcd042575129a6331a2d:

Merge remote-tracking branch 'remotes/stefanberger/tags/pull-tpm-2020-03-04-2' into staging (2020-03-05 19:39:47 +0000)

are available in the Git repository at:

https://github.com/stefanha/qemu.git tags/block-pull-request

for you to fetch changes up to 1f40ace7b5634f93801c8474b9eb77fe2e00289c:

tests: Fix a bug with count variables (2020-03-06 10:35:15 +0000)

----------------------------------------------------------------
Pull request

These patches would have gone through Thomas Huth but he is away on leave.

----------------------------------------------------------------

Alexander Bulekov (2):
  fuzz: fix style/typos in linker-script comments
  qtest: fix fuzzer-related 80-char limit violations

Tianjia Zhang (1):
  tests: Fix a bug with count variables

qtest.c                       |  3 ++-
 tests/qtest/fuzz/fork_fuzz.ld | 16 ++++++++++------
 tests/qtest/fuzz/qos_fuzz.c   |  5 ++++-
 tests/test-rcu-list.c         |  2 +-
 4 files changed, 17 insertions(+), 9 deletions(-)

-- 
2.24.1

From: Alexander Bulekov <alxndr@bu.edu>

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200227031439.31386-2-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/qtest/fuzz/fork_fuzz.ld | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/tests/qtest/fuzz/fork_fuzz.ld b/tests/qtest/fuzz/fork_fuzz.ld
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/fork_fuzz.ld
+++ b/tests/qtest/fuzz/fork_fuzz.ld
@@ -XXX,XX +XXX,XX @@
-/* We adjust linker script modification to place all of the stuff that needs to
- * persist across fuzzing runs into a contiguous seciton of memory. Then, it is
+/*
+ * We adjust linker script modification to place all of the stuff that needs to
+ * persist across fuzzing runs into a contiguous section of memory. Then, it is
  * easy to re-map the counter-related memory as shared.
-*/
+ */
 
 SECTIONS
 {
@@ -XXX,XX +XXX,XX @@ SECTIONS
   }
   .data.fuzz_ordered :
   {
-      /* Coverage counters. They're not necessary for fuzzing, but are useful
+      /*
+       * Coverage counters. They're not necessary for fuzzing, but are useful
        * for analyzing the fuzzing performance
        */
       __start___llvm_prf_cnts = .;
@@ -XXX,XX +XXX,XX @@ SECTIONS
       __FUZZ_COUNTERS_END = .;
   }
 }
-/* Dont overwrite the SECTIONS in the default linker script. Instead insert the
- * above into the default script */
+/*
+ * Don't overwrite the SECTIONS in the default linker script. Instead insert the
+ * above into the default script
+ */
 INSERT AFTER .data;
-- 
2.24.1

From: Alexander Bulekov <alxndr@bu.edu>

Signed-off-by: Alexander Bulekov <alxndr@bu.edu>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Darren Kenny <darren.kenny@oracle.com>
Message-id: 20200227031439.31386-3-alxndr@bu.edu
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 qtest.c                     | 3 ++-
 tests/qtest/fuzz/qos_fuzz.c | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/qtest.c b/qtest.c
index XXXXXXX..XXXXXXX 100644
--- a/qtest.c
+++ b/qtest.c
@@ -XXX,XX +XXX,XX @@ void qtest_server_init(const char *qtest_chrdev, const char *qtest_log, Error **
     }
 }
 
-void qtest_server_set_send_handler(void (*send)(void*, const char*), void *opaque)
+void qtest_server_set_send_handler(void (*send)(void*, const char*),
+                                   void *opaque)
 {
     qtest_server_send = send;
     qtest_server_send_opaque = opaque;
diff --git a/tests/qtest/fuzz/qos_fuzz.c b/tests/qtest/fuzz/qos_fuzz.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/qtest/fuzz/qos_fuzz.c
+++ b/tests/qtest/fuzz/qos_fuzz.c
@@ -XXX,XX +XXX,XX @@ static void walk_path(QOSGraphNode *orig_path, int len)
     QOSGraphNode *path;
     QOSGraphEdge *edge;
 
-    /* etype set to QEDGE_CONSUMED_BY so that machine can add to the command line */
+    /*
+     * etype set to QEDGE_CONSUMED_BY so that machine can add to the command
+     * line
+     */
     QOSEdgeType etype = QEDGE_CONSUMED_BY;
 
     /* twice QOS_PATH_MAX_ELEMENT_SIZE since each edge can have its arg */
-- 
2.24.1

From: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>

The counting code here should use the local variable n_nodes_local.
Otherwise, the variable n_nodes is counting incorrectly, causing the
counting logic of the code to be wrong.

Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
Link: https://lore.kernel.org/r/20200207115433.118254-1-tianjia.zhang@linux.alibaba.com
Message-Id: <20200207115433.118254-1-tianjia.zhang@linux.alibaba.com>
---
 tests/test-rcu-list.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test-rcu-list.c b/tests/test-rcu-list.c
index XXXXXXX..XXXXXXX 100644
--- a/tests/test-rcu-list.c
+++ b/tests/test-rcu-list.c
@@ -XXX,XX +XXX,XX @@ static void *rcu_q_updater(void *arg)
             j++;
             if (target_el == j) {
                 struct list_element *new_el = g_new(struct list_element, 1);
-                n_nodes += n_nodes_local;
+                n_nodes_local++;
                 TEST_LIST_INSERT_AFTER_RCU(el, new_el, entry);
                 break;
             }
-- 
2.24.1