[Qemu-devel] [PULL 0/5] pc, virtio: fixes

[Qemu-devel] [PULL 0/5] pc, virtio: fixes

[Michael S. Tsirkin]

Please consider for 3.0 if there is another rc.

The following changes since commit f7502360397d291be04bc040e9f96c92ff2d8030:

  Update version for v3.0.0-rc3 release (2018-07-31 19:30:17 +0100)

are available in the Git repository at:

  git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream

for you to fetch changes up to 1c707d6990eaf3db0c9dc4557bba5458977e9f8d:

  tests/acpi: update tables after memory hotplug changes (2018-08-03 11:35:21 +0300)

----------------------------------------------------------------
pc, virtio: fixes

A couple of last minute fixes.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>

----------------------------------------------------------------
Dou Liyang (2):
      hw/acpi-build: Add a check for memory-less NUMA nodes
      tests/acpi-test: update ACPI tables test blobs

Igor Mammedov (1):
      pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size

Michael S. Tsirkin (1):
      tests/acpi: update tables after memory hotplug changes

Tiwei Bie (1):
      vhost: check region type before casting

 hw/i386/acpi-build.c                  |  28 ++++++++++++++++------------
 hw/virtio/vhost.c                     |   4 +++-
 tests/acpi-test-data/pc/SRAT.dimmpxm  | Bin 472 -> 472 bytes
 tests/acpi-test-data/pc/SRAT.memhp    | Bin 264 -> 264 bytes
 tests/acpi-test-data/pc/SRAT.numamem  | Bin 224 -> 224 bytes
 tests/acpi-test-data/q35/SRAT.dimmpxm | Bin 472 -> 472 bytes
 tests/acpi-test-data/q35/SRAT.memhp   | Bin 264 -> 264 bytes
 tests/acpi-test-data/q35/SRAT.numamem | Bin 224 -> 224 bytes
 8 files changed, 19 insertions(+), 13 deletions(-)

[Qemu-devel] [PULL 1/5] vhost: check region type before casting

[Michael S. Tsirkin]

From: Tiwei Bie <tiwei.bie@intel.com>

Check region type first before casting the memory region
to IOMMUMemoryRegion. Otherwise QEMU will abort with below
error message when casting non-IOMMU memory region:

vhost_iommu_region_add: Object 0x561f28bce4f0 is not an
instance of type qemu:iommu-memory-region

Fixes: cb1efcf462a2 ("iommu: Add IOMMU index argument to notifier APIs")
Cc: Peter Maydell <peter.maydell@linaro.org>

Signed-off-by: Tiwei Bie <tiwei.bie@intel.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/virtio/vhost.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c
index b129cb9ddd..d4cb5894a8 100644
--- a/hw/virtio/vhost.c
+++ b/hw/virtio/vhost.c
@@ -663,12 +663,14 @@ static void vhost_iommu_region_add(MemoryListener *listener,
     struct vhost_iommu *iommu;
     Int128 end;
     int iommu_idx;
-    IOMMUMemoryRegion *iommu_mr = IOMMU_MEMORY_REGION(section->mr);
+    IOMMUMemoryRegion *iommu_mr;
 
     if (!memory_region_is_iommu(section->mr)) {
         return;
     }
 
+    iommu_mr = IOMMU_MEMORY_REGION(section->mr);
+
     iommu = g_malloc0(sizeof(*iommu));
     end = int128_add(int128_make64(section->offset_within_region),
                      section->size);
-- 
MST

[Qemu-devel] [PULL 2/5] hw/acpi-build: Add a check for memory-less NUMA nodes

[Michael S. Tsirkin]

From: Dou Liyang <douly.fnst@cn.fujitsu.com>

Currently, Qemu ACPI builder doesn't consider the memory-less NUMA nodes, eg:

  -m 4G,slots=4,maxmem=8G \
  -numa node,nodeid=0 \
  -numa node,nodeid=1,mem=2G \
  -numa node,nodeid=2,mem=2G \
  -numa node,nodeid=3\

Guest Linux will report

  [    0.000000] ACPI: SRAT: Node 0 PXM 0 [mem 0x00000000-0xffffffffffffffff]
  [    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x00000000-0x0009ffff]
  [    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x00100000-0x7fffffff]
  [    0.000000] ACPI: SRAT: Node 2 PXM 2 [mem 0x80000000-0xbfffffff]
  [    0.000000] ACPI: SRAT: Node 2 PXM 2 [mem 0x100000000-0x13fffffff]
  [    0.000000] ACPI: SRAT: Node 3 PXM 3 [mem 0x140000000-0x13fffffff]
  [    0.000000] ACPI: SRAT: Node 3 PXM 3 [mem 0x140000000-0x33fffffff] hotplug

[mem 0x00000000-0xffffffffffffffff] and [mem 0x140000000-0x13fffffff] are bogus.

Add a check to avoid building srat memory for memory-less NUMA nodes, also update
the test file. Now the info in guest linux will be

  [    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x00000000-0x0009ffff]
  [    0.000000] ACPI: SRAT: Node 1 PXM 1 [mem 0x00100000-0x7fffffff]
  [    0.000000] ACPI: SRAT: Node 2 PXM 2 [mem 0x80000000-0xbfffffff]
  [    0.000000] ACPI: SRAT: Node 2 PXM 2 [mem 0x100000000-0x13fffffff]
  [    0.000000] ACPI: SRAT: Node 3 PXM 3 [mem 0x140000000-0x33fffffff] hotplug

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/acpi-build.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 9e8350c55d..c584642e4e 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2392,9 +2392,12 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
             mem_len = next_base - pcms->below_4g_mem_size;
             next_base = mem_base + mem_len;
         }
-        numamem = acpi_data_push(table_data, sizeof *numamem);
-        build_srat_memory(numamem, mem_base, mem_len, i - 1,
-                          MEM_AFFINITY_ENABLED);
+
+        if (mem_len > 0) {
+            numamem = acpi_data_push(table_data, sizeof *numamem);
+            build_srat_memory(numamem, mem_base, mem_len, i - 1,
+                              MEM_AFFINITY_ENABLED);
+        }
     }
     slots = (table_data->len - numa_start) / sizeof *numamem;
     for (; slots < pcms->numa_nodes + 2; slots++) {
-- 
MST

[Qemu-devel] [PULL 3/5] tests/acpi-test: update ACPI tables test blobs

[Michael S. Tsirkin]

From: Dou Liyang <douly.fnst@cn.fujitsu.com>

Now, QEmu adds a new check for memory-less NUMA nodes in build_srat().

It effects the ACPI test.

So, Update ACPI tables test blobs.

Signed-off-by: Dou Liyang <douly.fnst@cn.fujitsu.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/SRAT.numamem  | Bin 224 -> 224 bytes
 tests/acpi-test-data/q35/SRAT.numamem | Bin 224 -> 224 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/pc/SRAT.numamem b/tests/acpi-test-data/pc/SRAT.numamem
index dbc595d9cb85d3fcb5a4243153f42bb431c9de8f..119922f4973f621602047d1dc160519f810922a3 100644
GIT binary patch
delta 24
gcmaFB_<)fsILI;N0RsaA<JXB?78A3|ChpJx0A~{jk^lez

delta 24
gcmaFB_<)fsILI;N0RsaA<ClqC787?#O*Cl%0A_s%T>t<8

diff --git a/tests/acpi-test-data/q35/SRAT.numamem b/tests/acpi-test-data/q35/SRAT.numamem
index dbc595d9cb85d3fcb5a4243153f42bb431c9de8f..119922f4973f621602047d1dc160519f810922a3 100644
GIT binary patch
delta 24
gcmaFB_<)fsILI;N0RsaA<JXB?78A3|ChpJx0A~{jk^lez

delta 24
gcmaFB_<)fsILI;N0RsaA<ClqC787?#O*Cl%0A_s%T>t<8

-- 
MST

[Qemu-devel] [PULL 4/5] pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size

[Michael S. Tsirkin]

From: Igor Mammedov <imammedo@redhat.com>

Commit 848a1cc1e (hw/acpi-build: build SRAT memory affinity structures for DIMM devices)
broke the first dimm hotplug in following cases:

 1: there is no coldplugged dimm in the last numa node
    but there is a coldplugged dimm in another node

  -m 4096,slots=4,maxmem=32G               \
  -object memory-backend-ram,id=m0,size=2G \
  -device pc-dimm,memdev=m0,node=0         \
  -numa node,nodeid=0                      \
  -numa node,nodeid=1

 2: if order of dimms on CLI is:
       1st plugged dimm in node1
       2nd plugged dimm in node0

  -m 4096,slots=4,maxmem=32G               \
  -object memory-backend-ram,size=2G,id=m0 \
  -device pc-dimm,memdev=m0,node=1         \
  -object memory-backend-ram,id=m1,size=2G \
  -device pc-dimm,memdev=m1,node=0         \
  -numa node,nodeid=0                      \
  -numa node,nodeid=1

(qemu) object_add memory-backend-ram,id=m2,size=1G
(qemu) device_add pc-dimm,memdev=m2,node=0

the first DIMM hotplug to any node except the last one
fails (Windows is unable to online it).

Length reduction of stub hotplug memory SRAT entry,
fixes issue for some reason.

RHBZ: 1609234

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 hw/i386/acpi-build.c | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index c584642e4e..e1ee8ae9e0 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -2269,7 +2269,16 @@ static void build_srat_hotpluggable_memory(GArray *table_data, uint64_t base,
         numamem = acpi_data_push(table_data, sizeof *numamem);
 
         if (!info) {
-            build_srat_memory(numamem, cur, end - cur, default_node,
+            /*
+             * Entry is required for Windows to enable memory hotplug in OS
+             * and for Linux to enable SWIOTLB when booted with less than
+             * 4G of RAM. Windows works better if the entry sets proximity
+             * to the highest NUMA node in the machine at the end of the
+             * reserved space.
+             * Memory devices may override proximity set by this entry,
+             * providing _PXM method if necessary.
+             */
+            build_srat_memory(numamem, end - 1, 1, default_node,
                               MEM_AFFINITY_HOTPLUGGABLE | MEM_AFFINITY_ENABLED);
             break;
         }
@@ -2405,14 +2414,6 @@ build_srat(GArray *table_data, BIOSLinker *linker, MachineState *machine)
         build_srat_memory(numamem, 0, 0, 0, MEM_AFFINITY_NOFLAGS);
     }
 
-    /*
-     * Entry is required for Windows to enable memory hotplug in OS
-     * and for Linux to enable SWIOTLB when booted with less than
-     * 4G of RAM. Windows works better if the entry sets proximity
-     * to the highest NUMA node in the machine.
-     * Memory devices may override proximity set by this entry,
-     * providing _PXM method if necessary.
-     */
     if (hotplugabble_address_space_size) {
         build_srat_hotpluggable_memory(table_data, machine->device_memory->base,
                                        hotplugabble_address_space_size,
-- 
MST

[Qemu-devel] [PULL 5/5] tests/acpi: update tables after memory hotplug changes

[Michael S. Tsirkin]

Previous patch changes acpi tables, update expected
files accordingly.

Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
---
 tests/acpi-test-data/pc/SRAT.dimmpxm  | Bin 472 -> 472 bytes
 tests/acpi-test-data/pc/SRAT.memhp    | Bin 264 -> 264 bytes
 tests/acpi-test-data/q35/SRAT.dimmpxm | Bin 472 -> 472 bytes
 tests/acpi-test-data/q35/SRAT.memhp   | Bin 264 -> 264 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/acpi-test-data/pc/SRAT.dimmpxm b/tests/acpi-test-data/pc/SRAT.dimmpxm
index 3b10a607d5bba6cebb97d9174c2a54a577bba9a8..5aa6f693ef9819b3d30cbd76cafb0ee8b5fc5534 100644
GIT binary patch
delta 52
qcmcb?e1n-QILI;N1|tIl<F1Wd>lhXO|Ns9T$YTIu7+{7mfHVMsX$lem

delta 52
scmcb?e1n-QILI;N1|tIl<MxeQ>lhUn7#IYAJP>#Rp%@sLVGJM*038_z5&!@I

diff --git a/tests/acpi-test-data/pc/SRAT.memhp b/tests/acpi-test-data/pc/SRAT.memhp
index e508b4ae3cd9e3000209a4f9597913faa4206ec1..5de8a100a4adf968b79a7b154a7f98123d583474 100644
GIT binary patch
delta 51
pcmeBR>R{pu4ss0PU}RumTso2Kp2GkC|Gxt{3?K{x%rFL!1^_r@2$}!@

delta 51
pcmeBR>R{pu4ss0PU}RumTr`pEo&p09068G=141z{FvA!?8UWLX1)2Z=

diff --git a/tests/acpi-test-data/q35/SRAT.dimmpxm b/tests/acpi-test-data/q35/SRAT.dimmpxm
index 3b10a607d5bba6cebb97d9174c2a54a577bba9a8..5aa6f693ef9819b3d30cbd76cafb0ee8b5fc5534 100644
GIT binary patch
delta 52
qcmcb?e1n-QILI;N1|tIl<F1Wd>lhXO|Ns9T$YTIu7+{7mfHVMsX$lem

delta 52
scmcb?e1n-QILI;N1|tIl<MxeQ>lhUn7#IYAJP>#Rp%@sLVGJM*038_z5&!@I

diff --git a/tests/acpi-test-data/q35/SRAT.memhp b/tests/acpi-test-data/q35/SRAT.memhp
index e508b4ae3cd9e3000209a4f9597913faa4206ec1..5de8a100a4adf968b79a7b154a7f98123d583474 100644
GIT binary patch
delta 51
pcmeBR>R{pu4ss0PU}RumTso2Kp2GkC|Gxt{3?K{x%rFL!1^_r@2$}!@

delta 51
pcmeBR>R{pu4ss0PU}RumTr`pEo&p09068G=141z{FvA!?8UWLX1)2Z=

-- 
MST

Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes

[Peter Maydell]

On 3 August 2018 at 10:27, Michael S. Tsirkin <mst@redhat.com> wrote:
> Please consider for 3.0 if there is another rc.
>
> The following changes since commit f7502360397d291be04bc040e9f96c92ff2d8030:
>
>   Update version for v3.0.0-rc3 release (2018-07-31 19:30:17 +0100)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 1c707d6990eaf3db0c9dc4557bba5458977e9f8d:
>
>   tests/acpi: update tables after memory hotplug changes (2018-08-03 11:35:21 +0300)
>
> ----------------------------------------------------------------
> pc, virtio: fixes
>
> A couple of last minute fixes.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------
> Dou Liyang (2):
>       hw/acpi-build: Add a check for memory-less NUMA nodes
>       tests/acpi-test: update ACPI tables test blobs
>
> Igor Mammedov (1):
>       pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size
>
> Michael S. Tsirkin (1):
>       tests/acpi: update tables after memory hotplug changes
>
> Tiwei Bie (1):
>       vhost: check region type before casting

Can you clarify which of these are regressions from 2.12, please?
At this point in the release cycle I only want to apply fixes
for regressions. (Test only updates might also be OK, but I
need more information than just the commit message subject line.)

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes

[Michael S. Tsirkin]

On Fri, Aug 03, 2018 at 11:45:36AM +0100, Peter Maydell wrote:
> On 3 August 2018 at 10:27, Michael S. Tsirkin <mst@redhat.com> wrote:
> > Please consider for 3.0 if there is another rc.
> >
> > The following changes since commit f7502360397d291be04bc040e9f96c92ff2d8030:
> >
> >   Update version for v3.0.0-rc3 release (2018-07-31 19:30:17 +0100)
> >
> > are available in the Git repository at:
> >
> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
> >
> > for you to fetch changes up to 1c707d6990eaf3db0c9dc4557bba5458977e9f8d:
> >
> >   tests/acpi: update tables after memory hotplug changes (2018-08-03 11:35:21 +0300)
> >
> > ----------------------------------------------------------------
> > pc, virtio: fixes
> >
> > A couple of last minute fixes.
> >
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> >
> > ----------------------------------------------------------------
> > Dou Liyang (2):
> >       hw/acpi-build: Add a check for memory-less NUMA nodes
> >       tests/acpi-test: update ACPI tables test blobs

This fixes a regression but from an older release.


> >
> > Igor Mammedov (1):
> >       pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size

This fixes a regression from 2.12.

> > Michael S. Tsirkin (1):
> >       tests/acpi: update tables after memory hotplug changes

This will have to be re-done if we pick this but drop two other fixes.

> >
> > Tiwei Bie (1):
> >       vhost: check region type before casting

Not a regression but an obvious fix.

> 
> Can you clarify which of these are regressions from 2.12, please?
> At this point in the release cycle I only want to apply fixes
> for regressions. (Test only updates might also be OK, but I
> need more information than just the commit message subject line.)
> 
> thanks
> -- PMM

I'll push a variant with just the two patches fixing
regression from 2.12 soon.

-- 
MST

Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes

[Peter Maydell]

On 3 August 2018 at 19:14, Michael S. Tsirkin <mst@redhat.com> wrote:
> On Fri, Aug 03, 2018 at 11:45:36AM +0100, Peter Maydell wrote:
>> On 3 August 2018 at 10:27, Michael S. Tsirkin <mst@redhat.com> wrote:
>> > Please consider for 3.0 if there is another rc.
>> >
>> > The following changes since commit f7502360397d291be04bc040e9f96c92ff2d8030:
>> >
>> >   Update version for v3.0.0-rc3 release (2018-07-31 19:30:17 +0100)
>> >
>> > are available in the Git repository at:
>> >
>> >   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>> >
>> > for you to fetch changes up to 1c707d6990eaf3db0c9dc4557bba5458977e9f8d:
>> >
>> >   tests/acpi: update tables after memory hotplug changes (2018-08-03 11:35:21 +0300)
>> >
>> > ----------------------------------------------------------------
>> > pc, virtio: fixes
>> >
>> > A couple of last minute fixes.
>> >
>> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>> >
>> > ----------------------------------------------------------------
>> > Dou Liyang (2):
>> >       hw/acpi-build: Add a check for memory-less NUMA nodes
>> >       tests/acpi-test: update ACPI tables test blobs
>
> This fixes a regression but from an older release.
>
>
>> >
>> > Igor Mammedov (1):
>> >       pc: acpi: fix memory hotplug regression by reducing stub SRAT entry size
>
> This fixes a regression from 2.12.
>
>> > Michael S. Tsirkin (1):
>> >       tests/acpi: update tables after memory hotplug changes
>
> This will have to be re-done if we pick this but drop two other fixes.
>
>> >
>> > Tiwei Bie (1):
>> >       vhost: check region type before casting
>
> Not a regression but an obvious fix.

This is a regression, because it fixes a code change (by me)
that's new in this release.

thanks
-- PMM

Re: [Qemu-devel] [PULL 0/5] pc, virtio: fixes

[Peter Maydell]

On 3 August 2018 at 10:27, Michael S. Tsirkin <mst@redhat.com> wrote:
> Please consider for 3.0 if there is another rc.
>
> The following changes since commit f7502360397d291be04bc040e9f96c92ff2d8030:
>
>   Update version for v3.0.0-rc3 release (2018-07-31 19:30:17 +0100)
>
> are available in the Git repository at:
>
>   git://git.kernel.org/pub/scm/virt/kvm/mst/qemu.git tags/for_upstream
>
> for you to fetch changes up to 1c707d6990eaf3db0c9dc4557bba5458977e9f8d:
>
>   tests/acpi: update tables after memory hotplug changes (2018-08-03 11:35:21 +0300)
>
> ----------------------------------------------------------------
> pc, virtio: fixes
>
> A couple of last minute fixes.
>
> Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
>
> ----------------------------------------------------------------

Thanks for clarifying the status of the various bugfixes and
preparing the alternate pullreq. After thinking it over, I've
decided to apply this set.

-- PMM