Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

QEMU 9.1 branch preview #73

Closed
wants to merge 3,039 commits into from
Closed

QEMU 9.1 branch preview #73

wants to merge 3,039 commits into from

Conversation

rivos-eblot
Copy link

CI only for QEMU 9.1

mstsirkin and others added 30 commits August 1, 2024 04:32
@mstsirkin
Revert "pcie_sriov: Reuse SR-IOV VF device instances"
b1282f1 
This reverts commit 139610a.

Signed-off-by: Michael S. Tsirkin <[email protected]>
@mstsirkin
Revert "pcie_sriov: Ensure VF function number does not overflow"
19c45c0 
This reverts commit 7771870.

Signed-off-by: Michael S. Tsirkin <[email protected]>
@mstsirkin
Revert "pcie_sriov: Do not manually unrealize"
b0fdaee 
This reverts commit c613ad2.

Signed-off-by: Michael S. Tsirkin <[email protected]>
@mstsirkin
Revert "hw/ppc/spapr_pci: Do not reject VFs created after a PF"
47279e8 
This reverts commit 26f8609.

Signed-off-by: Michael S. Tsirkin <[email protected]>
@mstsirkin
Revert "hw/ppc/spapr_pci: Do not create DT for disabled PCI device"
f1feffc 
This reverts commit 723c5b4.

Signed-off-by: Michael S. Tsirkin <[email protected]>
@mstsirkin
Revert "hw/pci: Rename has_power to enabled"
9382900 
This reverts commit 6a31b21.

Signed-off-by: Michael S. Tsirkin <[email protected]>
@pm215 @mstsirkin
hw/i386/amd_iommu: Don't leak memory in amdvi_update_iotlb()
9a45b07 
In amdvi_update_iotlb() we will only put a new entry in the hash
table if to_cache.perm is not IOMMU_NONE.  However we allocate the
memory for the new AMDVIIOTLBEntry and for the hash table key
regardless.  This means that in the IOMMU_NONE case we will leak the
memory we alloacted.

Move the allocations into the if() to the point where we know we're
going to add the item to the hash table.

Cc: [email protected]
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2452
Signed-off-by: Peter Maydell <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
@hujiaodigua @mstsirkin
intel_iommu: Fix for IQA reg read dropped DW field
5154577 
If VT-D hardware supports scalable mode, Linux will set the IQA DW field
(bit11). In qemu, the vtd_mem_write and vtd_update_iq_dw set DW field well.
However, vtd_mem_read the DW field wrong because "& VTD_IQA_QS" dropped the
value of DW.
Replace "&VTD_IQA_QS" with "& (VTD_IQA_QS | VTD_IQA_DW_MASK)" could save
the DW field.

Test patch as below:

config the "x-scalable-mode" option:
"-device intel-iommu,caching-mode=on,x-scalable-mode=on,aw-bits=48"

After Linux OS boot, check the IQA_REG DW Field by usage 1 or 2:

1. IOMMU_DEBUGFS:
Before fix:
cat /sys/kernel/debug/iommu/intel/iommu_regset |grep IQA
IQA             	0x90		0x00000001001da001

After fix:
cat /sys/kernel/debug/iommu/intel/iommu_regset |grep IQA
IQA             	0x90		0x00000001001da801

Check DW field(bit11) is 1.

2. devmem2 read the IQA_REG (offset 0x90):
Before fix:
devmem2 0xfed90090
/dev/mem opened.
Memory mapped at address 0x7f72c795b000.
Value at address 0xFED90090 (0x7f72c795b090): 0x1DA001

After fix:
devmem2 0xfed90090
/dev/mem opened.
Memory mapped at address 0x7fc95281c000.
Value at address 0xFED90090 (0x7fc95281c090): 0x1DA801

Check DW field(bit11) is 1.

Signed-off-by: yeeli <[email protected]>
Message-Id: <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Michael S. Tsirkin <[email protected]>
@marco-palumbi @pm215
hw/arm/mps2-tz.c: fix RX/TX interrupts order
5a558be 
The order of the RX and TX interrupts are swapped.
This commit fixes the order as per the following documents:
 * https://developer.arm.com/documentation/dai0505/latest/
 * https://developer.arm.com/documentation/dai0521/latest/
 * https://developer.arm.com/documentation/dai0524/latest/
 * https://developer.arm.com/documentation/dai0547/latest/

Cc: [email protected]
Signed-off-by: Marco Palumbi <[email protected]>
Message-id: [email protected]
Reviewed-by: Peter Maydell <[email protected]>
Signed-off-by: Peter Maydell <[email protected]>
@pm215
accel/kvm/kvm-all: Fixes the missing break in vCPU unpark logic
036144c 
Loop should exit prematurely on successfully finding out the parked vCPU (struct
KVMParkedVcpu) in the 'struct KVMState' maintained 'kvm_parked_vcpus' list of
parked vCPUs.

Fixes: Coverity CID 1558552
Fixes: 08c3286 ("accel/kvm: Extract common KVM vCPU {creation,parking} code")
Reported-by: Peter Maydell <[email protected]>
Signed-off-by: Salil Mehta <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Reviewed-by: Gavin Shan <[email protected]>
Reviewed-by: Zhao Liu <[email protected]>
Reviewed-by: Igor Mammedov <[email protected]>
Message-id: [email protected]
Suggested-by: Peter Maydell <[email protected]>
Message-ID: <CAFEAcA-3_d1c7XSXWkFubD-LsW5c5i95e6xxV09r2C9yGtzcdA@mail.gmail.com>
Signed-off-by: Salil Mehta <[email protected]>
Signed-off-by: Peter Maydell <[email protected]>
@pm215
target/arm: Handle denormals correctly for FMOPA (widening)
55f9f4e 
The FMOPA (widening) SME instruction takes pairs of half-precision
floating point values, widens them to single-precision, does a
two-way dot product and accumulates the results into a
single-precision destination.  We don't quite correctly handle the
FPCR bits FZ and FZ16 which control flushing of denormal inputs and
outputs.  This is because at the moment we pass a single float_status
value to the helper function, which then uses that configuration for
all the fp operations it does.  However, because the inputs to this
operation are float16 and the outputs are float32 we need to use the
fp_status_f16 for the float16 input widening but the normal fp_status
for everything else.  Otherwise we will apply the flushing control
FPCR.FZ16 to the 32-bit output rather than the FPCR.FZ control, and
incorrectly flush a denormal output to zero when we should not (or
vice-versa).

(In commit 207d30b we tried to fix the FZ handling but
didn't get it right, switching from "use FPCR.FZ for everything" to
"use FPCR.FZ16 for everything".)

Pass the CPU env to the sme_fmopa_h helper instead of an fp_status
pointer, and have the helper pass an extra fp_status into the
f16_dotadd() function so that we can use the right status for the
right parts of this operation.

Cc: [email protected]
Fixes: 207d30b ("target/arm: Use FPST_F16 for SME FMOPA (widening)")
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/2373
Signed-off-by: Peter Maydell <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
@pm215
target/xtensa: Correct assert condition in handle_interrupt()
5e8e4f0 
In commit ad18376 we added an assert that the level value was
in-bounds for the array we're about to index into.  However, the
assert condition is wrong -- env->config->interrupt_vector is an
array of uint32_t, so we should bounds check the index against
ARRAY_SIZE(...), not against sizeof().

Resolves: Coverity CID 1507131
Fixes: ad18376 ("target/xtensa: Assert that interrupt level is within bounds")
Signed-off-by: Peter Maydell <[email protected]>
Acked-by: Max Filippov <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-id: [email protected]
@rth7680
Merge tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/m…
5e25c93 
…st/qemu into staging

virtio,pci,pc: fixes

revert virtio pci/SR-IOV emulation at author's request
a couple of fixes in virtio,vtd

Signed-off-by: Michael S. Tsirkin <[email protected]>

# -----BEGIN PGP SIGNATURE-----
#
# iQFDBAABCAAtFiEEXQn9CHHI+FuUyooNKB8NuNKNVGkFAmarSFUPHG1zdEByZWRo
# YXQuY29tAAoJECgfDbjSjVRp7fwH/3wNCGhgHhF5dhKRKRn8hqhxYl2rXnv0LKYI
# Rgsoxh3kw6oKBXxLG/B4V2GkqDSU8q8NuHnvGmmAUQ/uHmwTWbBbrZ+HwMMmaRhT
# Ox8kIXiVYAtw24yLKDvyoKbMLjLKb9/QqTT4rbsQ9yl5PLxwoGGJEu/ifM1MbZZY
# f5CDtj3hRArIZEjMt0Q3h+G7///BRVZxQ/0de57whGXcr349qgMpiIThvlCOj7Yf
# rQ68AGS4yk1Jk0oxiYyWjo43o8JbB5bMnCrkzDy4ZdY5Sw9zGb48CmcrBUl4J9lv
# NVDYK63dsvRS0ew7PxaEwu32MIQLJcn5s521m81/ZAhbdyzLnlI=
# =/2+K
# -----END PGP SIGNATURE-----
# gpg: Signature made Thu 01 Aug 2024 06:33:25 PM AEST
# gpg:                using RSA key 5D09FD0871C8F85B94CA8A0D281F0DB8D28D5469
# gpg:                issuer "[email protected]"
# gpg: Good signature from "Michael S. Tsirkin <[email protected]>" [undefined]
# gpg:                 aka "Michael S. Tsirkin <[email protected]>" [undefined]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 0270 606B 6F3C DF3D 0B17  0970 C350 3912 AFBE 8E67
#      Subkey fingerprint: 5D09 FD08 71C8 F85B 94CA  8A0D 281F 0DB8 D28D 5469

* tag 'for_upstream' of https://git.kernel.org/pub/scm/virt/kvm/mst/qemu:
  intel_iommu: Fix for IQA reg read dropped DW field
  hw/i386/amd_iommu: Don't leak memory in amdvi_update_iotlb()
  Revert "hw/pci: Rename has_power to enabled"
  Revert "hw/ppc/spapr_pci: Do not create DT for disabled PCI device"
  Revert "hw/ppc/spapr_pci: Do not reject VFs created after a PF"
  Revert "pcie_sriov: Do not manually unrealize"
  Revert "pcie_sriov: Ensure VF function number does not overflow"
  Revert "pcie_sriov: Reuse SR-IOV VF device instances"
  Revert "pcie_sriov: Release VFs failed to realize"
  Revert "pcie_sriov: Remove num_vfs from PCIESriovPF"
  Revert "pcie_sriov: Register VFs after migration"
  Revert "hw/pci: Fix SR-IOV VF number calculation"
  Revert "pcie_sriov: Ensure PF and VF are mutually exclusive"
  Revert "pcie_sriov: Check PCI Express for SR-IOV PF"
  Revert "pcie_sriov: Allow user to create SR-IOV device"
  Revert "virtio-pci: Implement SR-IOV PF"
  Revert "virtio-net: Implement SR-IOV VF"
  Revert "docs: Document composable SR-IOV device"
  virtio-rng: block max-bytes=0

Signed-off-by: Richard Henderson <[email protected]>
@rth7680
Merge tag 'pull-target-arm-20240801' of https://git.linaro.org/people…
3166912 
…/pmaydell/qemu-arm into staging

target-arm queue:
 * hw/arm/mps2-tz.c: fix RX/TX interrupts order
 * accel/kvm/kvm-all: Fixes the missing break in vCPU unpark logic
 * target/arm: Handle denormals correctly for FMOPA (widening)
 * target/xtensa: Correct assert condition in handle_interrupt()

# -----BEGIN PGP SIGNATURE-----
#
# iQJNBAABCAA3FiEE4aXFk81BneKOgxXPPCUl7RQ2DN4FAmarmisZHHBldGVyLm1h
# eWRlbGxAbGluYXJvLm9yZwAKCRA8JSXtFDYM3uw4D/sGvG3uo4mncEm1DmXugj8E
# yUcnHsc6fTSP9gm0v65DmUY59+kDM9R+17STOFOhP1c851tEbv7HXQBAqI+fNoME
# 22yNxhKasWqPNOjy0XGakBDDTmMQpGUE1JcdUYc+pA9XMy+IxxkkfheedOmZ+OZ1
# r8vqzm9a2+vJLo1q00XlVrUajclXOduaRl9wKijRVcgAVtLbsdWuF3LCp6swt17O
# Zw1xARKz9nWnOQzZBWTo0VfDf53z5isaUZFNTA6XJUliBd7yxOEHHf5XM1t92Uw0
# Lilk7NWlvdpEh3EcCPdUd4UuZA+NhyK6IlZALSbWkf3BXImxslMWGVrxiWR/Zjoh
# YJzBbvtM+hP/gP+X6EzfQh/ycPoygrc9l2IwqhaIQ7ZwkukkCNs/HlcSc1JOWfLd
# ZmM7oybKRyDQ4pnc3YyqT597+sRJSUBFzss6Qy3SKqPMlhB4V+cPTV/QHV5O4xjo
# fdip3NVSSffcyiGZmwtTn0biWWUKqUubew8400gj3opbG8DGc2SyYB2vTQlEhJlp
# jm6AoA5tRdBxlLtNoG4VmZ5XlKCchoXiewImndDHHdSPPiKK9m99+JeqGegdDfLU
# 4jxv5LmMyb1MdM961yq3A4cKN0RKUwFpnrqc3DLGRu9eHBOlmfyG5vWNQafKf24r
# 4ZVUpCes0Y0rbsgbWq64+w==
# =fh2k
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 02 Aug 2024 12:22:35 AM AEST
# gpg:                using RSA key E1A5C593CD419DE28E8315CF3C2525ED14360CDE
# gpg:                issuer "[email protected]"
# gpg: Good signature from "Peter Maydell <[email protected]>" [full]
# gpg:                 aka "Peter Maydell <[email protected]>" [full]
# gpg:                 aka "Peter Maydell <[email protected]>" [full]
# gpg:                 aka "Peter Maydell <[email protected]>" [unknown]

* tag 'pull-target-arm-20240801' of https://git.linaro.org/people/pmaydell/qemu-arm:
  target/xtensa: Correct assert condition in handle_interrupt()
  target/arm: Handle denormals correctly for FMOPA (widening)
  accel/kvm/kvm-all: Fixes the missing break in vCPU unpark logic
  hw/arm/mps2-tz.c: fix RX/TX interrupts order

Signed-off-by: Richard Henderson <[email protected]>
@hudihuda @jasowang
rtl8139: Fix behaviour for old kernels.
9e3b9f2 
Old linux kernel rtl8139 drivers (ex. debian 2.1) uses outb to set the rx
mode for RxConfig. Unfortunatelly qemu does not support outb for RxConfig.

Signed-off-by: Hans <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@akihikodaki @jasowang
virtio-net: Ensure queue index fits with RSS
f1595ce 
Ensure the queue index points to a valid queue when software RSS
enabled. The new calculation matches with the behavior of Linux's TAP
device with the RSS eBPF program.

Fixes: 4474e37 ("virtio-net: implement RX RSS processing")
Reported-by: Zhibin Hu <[email protected]>
Cc: [email protected]
Signed-off-by: Akihiko Odaki <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@eastmoutain @jasowang
virtio-net: Fix network stall at the host side waiting for kick
f937309 
Patch 06b1297 ("virtio-net: fix network stall under load")
added double-check to test whether the available buffer size
can satisfy the request or not, in case the guest has added
some buffers to the avail ring simultaneously after the first
check. It will be lucky if the available buffer size becomes
okay after the double-check, then the host can send the packet
to the guest. If the buffer size still can't satisfy the request,
even if the guest has added some buffers, viritio-net would
stall at the host side forever.

The patch enables notification and checks whether the guest has
added some buffers since last check of available buffers when
the available buffers are insufficient. If no buffer is added,
return false, else recheck the available buffers in the loop.
If the available buffers are sufficient, disable notification
and return true.

Changes:
1. Change the return type of virtqueue_get_avail_bytes() from void
   to int, it returns an opaque that represents the shadow_avail_idx
   of the virtqueue on success, else -1 on error.
2. Add a new API: virtio_queue_enable_notification_and_check(),
   it takes an opaque as input arg which is returned from
   virtqueue_get_avail_bytes(). It enables notification firstly,
   then checks whether the guest has added some buffers since
   last check of available buffers or not by virtio_queue_poll(),
   return ture if yes.

The patch also reverts patch "06b12970174".

The case below can reproduce the stall.

                                       Guest 0
                                     +--------+
                                     | iperf  |
                    ---------------> | server |
         Host       |                +--------+
       +--------+   |                    ...
       | iperf  |----
       | client |----                  Guest n
       +--------+   |                +--------+
                    |                | iperf  |
                    ---------------> | server |
                                     +--------+

Boot many guests from qemu with virtio network:
 qemu ... -netdev tap,id=net_x \
    -device virtio-net-pci-non-transitional,\
    iommu_platform=on,mac=xx:xx:xx:xx:xx:xx,netdev=net_x

Each guest acts as iperf server with commands below:
 iperf3 -s -D -i 10 -p 8001
 iperf3 -s -D -i 10 -p 8002

The host as iperf client:
 iperf3 -c guest_IP -p 8001 -i 30 -w 256k -P 20 -t 40000
 iperf3 -c guest_IP -p 8002 -i 30 -w 256k -P 20 -t 40000

After some time, the host loses connection to the guest,
the guest can send packet to the host, but can't receive
packet from the host.

It's more likely to happen if SWIOTLB is enabled in the guest,
allocating and freeing bounce buffer takes some CPU ticks,
copying from/to bounce buffer takes more CPU ticks, compared
with that there is no bounce buffer in the guest.
Once the rate of producing packets from the host approximates
the rate of receiveing packets in the guest, the guest would
loop in NAPI.

         receive packets    ---
               |             |
               v             |
           free buf      virtnet_poll
               |             |
               v             |
     add buf to avail ring  ---
               |
               |  need kick the host?
               |  NAPI continues
               v
         receive packets    ---
               |             |
               v             |
           free buf      virtnet_poll
               |             |
               v             |
     add buf to avail ring  ---
               |
               v
              ...           ...

On the other hand, the host fetches free buf from avail
ring, if the buf in the avail ring is not enough, the
host notifies the guest the event by writing the avail
idx read from avail ring to the event idx of used ring,
then the host goes to sleep, waiting for the kick signal
from the guest.

Once the guest finds the host is waiting for kick singal
(in virtqueue_kick_prepare_split()), it kicks the host.

The host may stall forever at the sequences below:

         Host                        Guest
     ------------                 -----------
 fetch buf, send packet           receive packet ---
         ...                          ...         |
 fetch buf, send packet             add buf       |
         ...                        add buf   virtnet_poll
    buf not enough      avail idx-> add buf       |
    read avail idx                  add buf       |
                                    add buf      ---
                                  receive packet ---
    write event idx                   ...         |
    wait for kick                   add buf   virtnet_poll
                                      ...         |
                                                 ---
                                 no more packet, exit NAPI

In the first loop of NAPI above, indicated in the range of
virtnet_poll above, the host is sending packets while the
guest is receiving packets and adding buffers.
 step 1: The buf is not enough, for example, a big packet
         needs 5 buf, but the available buf count is 3.
         The host read current avail idx.
 step 2: The guest adds some buf, then checks whether the
         host is waiting for kick signal, not at this time.
         The used ring is not empty, the guest continues
         the second loop of NAPI.
 step 3: The host writes the avail idx read from avail
         ring to used ring as event idx via
         virtio_queue_set_notification(q->rx_vq, 1).
 step 4: At the end of the second loop of NAPI, recheck
         whether kick is needed, as the event idx in the
         used ring written by the host is beyound the
         range of kick condition, the guest will not
         send kick signal to the host.

Fixes: 06b1297 ("virtio-net: fix network stall under load")
Cc: [email protected]
Signed-off-by: Wencheng Yang <[email protected]>
Reviewed-by: Michael S. Tsirkin <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@vivier @jasowang
net: update netdev stream/dgram man page
bb1326a 
Add the description of "-netdev stream" and "-netdev dgram" in the QEMU
manpage.

Add some examples on how to use them.

Fixes: 5166fe0 ("qapi: net: add stream and dgram netdevs")
Signed-off-by: Laurent Vivier <[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@vivier @jasowang
net: update netdev stream man page with unix socket
178413a 
Add the description of "-netdev stream" with a unix domain socket.
The code has been added but the man page has not been updated.

Include an example how to use "-netdev stream" and "passt" in place
of "-netdev user".
("passt" is a non privileged translation proxy between layer-2, like
"-netdev stream", and layer-4 on host, like TCP, UDP, ICMP/ICMPv6 echo)

Fixes: 13c6be9 ("net: stream: add unix socket")
Signed-off-by: Laurent Vivier <[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@vivier @jasowang
net: update netdev dgram man page with unix socket
8e67680 
Add the description of "-netdev dgram" with a unix domain socket.
The code has been added but the man page has not been updated.

Fixes: 784e7a2 ("net: dgram: add unix socket")
Signed-off-by: Laurent Vivier <[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@vivier @jasowang
net: update netdev stream man page with the reconnect parameter
f6a3158 
"-netdev stream" supports a reconnect parameter that attempts to
reconnect automatically the socket if it is disconnected. The code
has been added but the man page has not been updated.

Fixes: 148fbf0 ("net: stream: add a new option to automatically reconnect"
Signed-off-by: Laurent Vivier <[email protected]>
Reviewed-by: Marc-André Lureau <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@dwmw2 @jasowang
net: Reinstate '-net nic, model=help' output as documented in man page
64f75f5 
While refactoring the NIC initialization code, I broke '-net nic,model=help'
which no longer outputs a list of available NIC models.

Fixes: 2cdeca0 ("net: report list of available models according to platform")
Cc: [email protected]
Signed-off-by: David Woodhouse <[email protected]>
Reviewed-by: Michael Tokarev <[email protected]>
Signed-off-by: Jason Wang <[email protected]>
@rth7680
Merge tag 'net-pull-request' of https://github.com/jasowang/qemu into…
c4d2425 
… staging

# -----BEGIN PGP SIGNATURE-----
#
# iQEzBAABCAAdFiEEIV1G9IJGaJ7HfzVi7wSWWzmNYhEFAmasTgwACgkQ7wSWWzmN
# YhFUtAgAq45v7fQJ7cKKwRam/VrIkxT5cM59ODwzLSL9kPWfL6f/bJ7xM/zvLyvn
# LNBXFWWu+eNKA73f95cckZwaqZ4U6giGbiesCACn1IpgVtieLS+Lq78jsifKIAsR
# yxFvbT9oLhU0dZ1Up3+isc6V+jeAE4ZYu4KOiIt7PscTEzkJl+vSUjN4X9rRVtUD
# PzONUacL6MoTJtX8UZJZXNzLN9JTsN39Gx+LSDGQ27MDmDvE3R9BW+T0ZgF9JQZ7
# wnrL5sharqF3gxa7X55fPBI1qwY5gWcH0yyJpRdM8guA13vhtvlrhNSypip9eKWi
# HtPHUTKEB5YOvF236WRiuQPIm/GNpA==
# =7HGN
# -----END PGP SIGNATURE-----
# gpg: Signature made Fri 02 Aug 2024 01:10:04 PM AEST
# gpg:                using RSA key 215D46F48246689EC77F3562EF04965B398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <[email protected]>" [undefined]
# gpg: WARNING: This key is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F  3562 EF04 965B 398D 6211

* tag 'net-pull-request' of https://github.com/jasowang/qemu:
  net: Reinstate '-net nic, model=help' output as documented in man page
  net: update netdev stream man page with the reconnect parameter
  net: update netdev dgram man page with unix socket
  net: update netdev stream man page with unix socket
  net: update netdev stream/dgram man page
  virtio-net: Fix network stall at the host side waiting for kick
  virtio-net: Ensure queue index fits with RSS
  rtl8139: Fix behaviour for old kernels.

Signed-off-by: Richard Henderson <[email protected]>
@bonzini
target/i386: SEV: fix mismatch in vcek-disabled property name
d439241 
The vcek-disabled property of the sev-snp-guest object is misspelled
vcek-required (which I suppose would use the opposite polarity) in
the call to object_class_property_add_bool().  Fix it.

Reported-by: Zixi Chen <[email protected]>
Reviewed-by: Pankaj Gupta <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
@akihikodaki
migration: Free removed SaveStateEntry
c80e225 
This fixes LeakSanitizer warnings.

Signed-off-by: Akihiko Odaki <[email protected]>
Reviewed-by: Peter Xu <[email protected]>
Signed-off-by: Fabiano Rosas <[email protected]>
migration: Fix cleanup of iochannel in file migration
84ac6fa 
The QIOChannelFile object already has its reference decremented by
g_autoptr. Trying to unref an extra time causes:

ERROR:../qom/object.c:1241:object_unref: assertion failed: (obj->ref > 0)

Fixes: a701c03 ("migration: Drop reference to QIOChannel if file seeking fails")
Fixes: 6d32796 ("migration: Fix file migration with fdset")
Reported-by: Jim Fehlig <[email protected]>
Reviewed-by: Peter Xu <[email protected]>
Signed-off-by: Fabiano Rosas <[email protected]>
migration/multifd: Fix multifd_send_setup cleanup when channel creati…
0bd5b92 
…on fails

When a channel fails to create, the code currently just returns. This
is wrong for two reasons:

1) Channel n+1 will not get to initialize it's semaphores, leading to
   an assert when terminate_threads tries to post to it:

 qemu-system-x86_64: ../util/qemu-thread-posix.c:92:
 qemu_mutex_lock_impl: Assertion `mutex->initialized' failed.

2) (theoretical) If channel n-1 already started creation it will
   defeat the purpose of the channels_created logic which is in place
   to avoid migrate_fd_cleanup() to run while channels are still being
   created.

   This cannot really happen today because the current failure cases
   for multifd_new_send_channel_create() are all synchronous,
   resulting from qio_channel_file_new_path() getting a bad
   filename. This would hit all channels equally.

   But I don't want to set a trap for future people, so have all
   channels try to create (even if failing), and only fail after the
   channels_created semaphore has been posted.

While here, remove the error_report_err call. There's one already at
migrate_fd_cleanup later on.

Cc: [email protected]
Reported-by: Jim Fehlig <[email protected]>
Fixes: b7b03eb ("migration/multifd: Add outgoing QIOChannelFile support")
Reviewed-by: Peter Xu <[email protected]>
Signed-off-by: Fabiano Rosas <[email protected]>
@akihikodaki @rth7680
hvf: arm: Fix hvf_sysreg_read_cp() call
cb14095 
Changed val from uint64_t to a pointer to uint64_t in hvf_sysreg_read,
but didn't change its usage in hvf_sysreg_read_cp call.

Fixes: e9e6401 ("hvf: arm: Raise an exception for sysreg by default")
Reported-by: Richard Henderson <[email protected]>
Signed-off-by: Akihiko Odaki <[email protected]>
Reviewed-by: Philippe Mathieu-Daudé <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Richard Henderson <[email protected]>
@rth7680
Merge tag 'migration-20240802-pull-request' of https://gitlab.com/far…
f9851d2 
…osas/qemu into staging

Migration pull request

- Akihiko Odaki's fix for a memory leak on ppc migration
- Fabiano's fix for asserts during multifd error handling

# -----BEGIN PGP SIGNATURE-----
#
# iQJEBAABCAAuFiEEqhtIsKIjJqWkw2TPx5jcdBvsMZ0FAmas698QHGZhcm9zYXNA
# c3VzZS5kZQAKCRDHmNx0G+wxnQYFEACNaJderA8VNnyAKyAFD5hCWeZnpZj3UfvO
# l/3CLKBx2WPu+IAMQ+32b8Hpy5v1r4HRkicn0FId86dnbWflqAZJ0wilnPDrzbNG
# oJ9IgDCPobdNCI1JgGVGCddOwraKKRo6/7e7TE5ME3MPV4AZRHs0LGfYPVxGD/5L
# gbV1Zun9SvMk7u/SjE0j8ZG/L3N2rA23Ns/aNfN7KFRLWBccpJ6vKs0q9v6SQnMQ
# iAAypK3d0szCBiuD8iiawPgh6K6pwA7OZ+SmtyGanK2gfNvdJ9YZArbxM3yzqUmJ
# IAYvxXO/xy/cwdGELsjr0lrUFSH15PeQlSUKQ0WEVMv3/okd88jZv7xbyAZy2u5v
# QZXmvb4QMH3wJUZ2rGG+DuZoZIiTL20PPnujxO/kvbhmXjsp4TuDJbKkwW7nvP2Y
# ISuHCBsHcskScu0TSoZ0Fj3sSBXHV5Qw0jZiP37lgjf4eXgJzkadAUh3DCuUI62O
# lqtFxFpBODdKtYfSYR+ThZXhicZx9DOxJHJBU8bXbBi3iGpVZl9O8ywgGi8wpQzh
# cAJk9GbXp/77N94sexzTUHK9ttE00VQUvl8rad+HfZUsBE9E8MsW0zzUaZ8VAH3c
# wzjg1S08rS48c5Ju5PO8iY2Oi5apxdGy9SOyEdpxs+ZE37GbwjoY1Q7C2U+jj72E
# q4/z0NKuWw==
# =1iRF
# -----END PGP SIGNATURE-----
# gpg: Signature made Sat 03 Aug 2024 12:23:27 AM AEST
# gpg:                using RSA key AA1B48B0A22326A5A4C364CFC798DC741BEC319D
# gpg:                issuer "[email protected]"
# gpg: Good signature from "Fabiano Rosas <[email protected]>" [unknown]
# gpg:                 aka "Fabiano Almeida Rosas <[email protected]>" [unknown]
# gpg: WARNING: The key's User ID is not certified with a trusted signature!
# gpg:          There is no indication that the signature belongs to the owner.
# Primary key fingerprint: AA1B 48B0 A223 26A5 A4C3  64CF C798 DC74 1BEC 319D

* tag 'migration-20240802-pull-request' of https://gitlab.com/farosas/qemu:
  migration/multifd: Fix multifd_send_setup cleanup when channel creation fails
  migration: Fix cleanup of iochannel in file migration
  migration: Free removed SaveStateEntry

Signed-off-by: Richard Henderson <[email protected]>
@iii-i @rth7680
linux-user/elfload: Fix pr_pid values in core files
5b0c274 
Analyzing qemu-produced core dumps of multi-threaded apps runs into:

    (gdb) info threads
      [...]
      21   Thread 0x3ff83cc0740 (LWP 9295) warning: Couldn't find general-purpose registers in core file.
    <unavailable> in ?? ()

The reason is that all pr_pid values are the same, because the same
TaskState is used for all CPUs when generating NT_PRSTATUS notes.

Fix by using TaskStates associated with individual CPUs.

Cc: [email protected]
Fixes: 243c470 ("linux-user/elfload: Write corefile elf header in one block")
Signed-off-by: Ilya Leoshkevich <[email protected]>
Reviewed-by: Richard Henderson <[email protected]>
Message-ID: <[email protected]>
Signed-off-by: Richard Henderson <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/riscv: ot_darjeeling, ot_earlgrey: update reset type
27aa431 
This follows Resettable API changes

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_edn.c: clean up code
01f3dc8 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/riscv: dm, tap: make JTAG requested identifier configurable
2db474f 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot[ hw/misc: pulp_rv_dm: define a PULP DM specific requester identifier
f8f0a1c 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ibexdemo, ot_earlgrey, ot_darjeeeling: configure D…
c024d3e 
…M requester id

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_prince: port PRINCE cipher implementation
7758a8d 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_rom_ctlr: add scrambling support
7214b05 
- add support for VMEM 32-bit and 39-bit variants
- add support for HEX 39-bit file format
- add auto-detection of ROM image file (ELF32/VMEM/HEX/BIN)
- remove digest and address ROM image attributes
- add PRINCE cipher support
- add unscrambling and OT compatible digest support
- add configurable key and nonce ROM controller attributes

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_rom_ctrl: add Hsiao ECC error detection.
3ab69e4 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/riscv: configure ROM controller key and nonce attributes
48879c3 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] scripts/opentitan: update scripts for new ROM controller features
a0eb101 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] docs/opentitan: update documentation for new ROM controller feat…
9a3c778 
…ures

Also update CI script

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: fix missing header dependencies
14c8769 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] system: vl.c: declare a generic option group "ot_device" for Ope…
e330f46 
…nTitan devices

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_common: add a new API ot_common_configure_devic…
2f875af 
…es_with_id

This API is similar to ibex_configure_devices_with_id, and amends OpenTitan
devices with properties defined in the "ot_device" group. Properties may be
defined in an external configuration file and loaded with `-readconfig`
regular QEMU option.

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] scripts/opentitan: pyot: add a new option to specify the OT conf…
a090239 
…iguration file

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] scripts/opentitan: clang-tidy: silent useless warning
99e9467 
unsigned pos;
unsigned array[pos]; // ok
unsigned array[pos * 2u]; // warning, recommend unsigned array[(size_t)pos * 2u];

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: use a homogeneous syntax for naming OT devices
1d3a718 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] docs/opentitan: document configuration file OpenTitan constants
28543cc 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/riscv: ot_darjeeling, ot_earlgrey: configure devices with new…
f598203 
… API

This allows to override default crypto properties with ones to be defined
in an external file.

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_common: add a utility function to parse hex str…
fa3dd08 
…ings

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_otp: make constant configurable at runtime
ed1d022 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/riscv: ot_darjeeling: configure OTP controller constants
e53e402 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/opentitan: ot_lc_ctrl: make constant configurable at runtime
9e70bd2 
Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] hw/riscv: ot_darjeeling, ot_earlgrey: configure life cycle contr…
ae1a292 
…oller constants

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot @loiclefort
[ot] scripts/opentitan: cfggen.py: new tool to generate QEMU OT confi…
efb3e3d 
…g file

This tool may be used to parse an OpenTitan repository and generate a QEMU
configuration file that can be used to initialize sensitive data such as
the keys, nonce, tokens, etc.

Signed-off-by: Emmanuel Blot <[email protected]>
@rivos-eblot
Copy link
Author 

scripts/opentitan/pyot.py -c baremetal_test/data/qemu/ot-darjeeling/pyot.hjson -R
+-------------------+--------+---------+--------+-------+
| Name              | Result |    Time | Icount | Error |
+===================+========+=========+========+=======+
| aes-basic-test    |   PASS |   34 ms |        |       |
+-------------------+--------+---------+--------+-------+
| alert-basic-test  |   PASS | 3475 ms |        |       |
+-------------------+--------+---------+--------+-------+
| aontimer-test     |   PASS | 4240 ms |        |       |
+-------------------+--------+---------+--------+-------+
| dma-test          |   PASS |   41 ms |        |       |
+-------------------+--------+---------+--------+-------+
| dummy-dtm-test    |   PASS |  144 ms |        |       |
+-------------------+--------+---------+--------+-------+
| dummy-lcdmi-test  |   PASS |  706 ms |        |       |
+-------------------+--------+---------+--------+-------+
| edn-lim-test      |   PASS | 2698 ms |        |       |
+-------------------+--------+---------+--------+-------+
| gpio-test         |   PASS | 8575 ms |        |       |
+-------------------+--------+---------+--------+-------+
| helloworld        |   PASS |   26 ms |        |       |
+-------------------+--------+---------+--------+-------+
| hmac-test         |   PASS |   30 ms |        |       |
+-------------------+--------+---------+--------+-------+
| lc_ctrl-test      |   PASS | 2636 ms |        |       |
+-------------------+--------+---------+--------+-------+
| mbxhost-test      |   PASS | 1911 ms |        |       |
+-------------------+--------+---------+--------+-------+
| mbxjtag-test      |   PASS |  590 ms |        |       |
+-------------------+--------+---------+--------+-------+
| otbn-test         |   PASS | 2651 ms |        |       |
+-------------------+--------+---------+--------+-------+
| otp-test          |   PASS |  255 ms |        |       |
+-------------------+--------+---------+--------+-------+
| soc-proxy-test    |   PASS | 1218 ms |        |       |
+-------------------+--------+---------+--------+-------+
| spidev-flash-test |   PASS |  491 ms |        |       |
+-------------------+--------+---------+--------+-------+
| spihost-test      |   PASS |   78 ms |        |       |
+-------------------+--------+---------+--------+-------+
| timer-test        |   PASS | 1430 ms |        |       |
+-------------------+--------+---------+--------+-------+

@rivos-eblot rivos-eblot changed the title DO NOT MERGE QEMU 9.1 branch preview Sep 16, 2024
@rivos-eblot rivos-eblot deleted the dev/ebl/dj-9.1 branch September 17, 2024 11:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@loiclefort loiclefort

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.