diff options
| author | Jason Wang | 2020-07-22 10:57:46 +0200 |
|---|---|---|
| committer | Jason Wang | 2020-07-28 10:57:58 +0200 |
| commit | 22dc8663d9fc7baa22100544c600b6285a63c7a3 (patch) | |
| tree | 629ff8639cff438df773019e1f092b9dc851e972 /net | |
| parent | virtio-net: check the existence of peer before accessing vDPA config (diff) | |
| download | qemu-22dc8663d9fc7baa22100544c600b6285a63c7a3.tar.gz qemu-22dc8663d9fc7baa22100544c600b6285a63c7a3.tar.xz qemu-22dc8663d9fc7baa22100544c600b6285a63c7a3.zip | |
net: forbid the reentrant RX
The memory API allows DMA into NIC's MMIO area. This means the NIC's
RX routine must be reentrant. Instead of auditing all the NIC, we can
simply detect the reentrancy and return early. The queue->delivering
is set and cleared by qemu_net_queue_deliver() for other queue helpers
to know whether the delivering in on going (NIC's receive is being
called). We can check it and return early in qemu_net_queue_flush() to
forbid reentrant RX.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Diffstat (limited to 'net')
| -rw-r--r-- | net/queue.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/net/queue.c b/net/queue.c index 0164727e39..19e32c80fd 100644 --- a/net/queue.c +++ b/net/queue.c @@ -250,6 +250,9 @@ void qemu_net_queue_purge(NetQueue *queue, NetClientState *from) bool qemu_net_queue_flush(NetQueue *queue) { + if (queue->delivering) + return false; + while (!QTAILQ_EMPTY(&queue->packets)) { NetPacket *packet; int ret; |