hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue

[PATCH] hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue

Thomas Huth posted 1 patch 2 years, 9 months ago

Download mbox

Test checkpatch passed

Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20210715103755.1035566-1-thuth@redhat.com

Maintainers: Dmitry Fleytman <dmitry.fleytman@gmail.com>, Jason Wang <jasowang@redhat.com>

hw/net/vmxnet3.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)

Expand all Fold all

[PATCH] hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue

Posted by Thomas Huth 2 years, 9 months ago

QEMU should never abort just because the guest is doing something odd.
Let's simply log the error and ignore the bad transmit queue instead.

Buglink: https://bugs.launchpad.net/qemu/+bug/1926111
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
 hw/net/vmxnet3.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/hw/net/vmxnet3.c b/hw/net/vmxnet3.c
index eff299f629..f6bd8c53b1 100644
--- a/hw/net/vmxnet3.c
+++ b/hw/net/vmxnet3.c
@@ -23,6 +23,7 @@
 #include "net/checksum.h"
 #include "sysemu/sysemu.h"
 #include "qemu/bswap.h"
+#include "qemu/log.h"
 #include "qemu/module.h"
 #include "hw/pci/msix.h"
 #include "hw/pci/msi.h"
@@ -1093,8 +1094,12 @@ vmxnet3_io_bar0_write(void *opaque, hwaddr addr,
         int tx_queue_idx =
             VMW_MULTIREG_IDX_BY_ADDR(addr, VMXNET3_REG_TXPROD,
                                      VMXNET3_REG_ALIGN);
-        assert(tx_queue_idx <= s->txq_num);
-        vmxnet3_process_tx_queue(s, tx_queue_idx);
+        if (tx_queue_idx <= s->txq_num) {
+            vmxnet3_process_tx_queue(s, tx_queue_idx);
+        } else {
+            qemu_log_mask(LOG_GUEST_ERROR, "vmxnet3: Illegal TX queue %d/%d\n",
+                          tx_queue_idx, s->txq_num);
+        }
         return;
     }
 
-- 
2.27.0

Re: [PATCH] hw/net/vmxnet3: Do not abort if the guest is trying to use an invalid TX queue

Posted by Richard Henderson 2 years, 9 months ago

On 7/15/21 3:37 AM, Thomas Huth wrote:
> QEMU should never abort just because the guest is doing something odd.
> Let's simply log the error and ignore the bad transmit queue instead.
> 
> Buglink:https://bugs.launchpad.net/qemu/+bug/1926111
> Signed-off-by: Thomas Huth<thuth@redhat.com>
> ---
>   hw/net/vmxnet3.c | 9 +++++++--
>   1 file changed, 7 insertions(+), 2 deletions(-)

Reviewed-by: Richard Henderson <richard.henderson@linaro.org>

r~