[v3] Detect reentrant RX casued by loopback

[PATCH V3 05/10] sungem: switch to use qemu_receive_packet() for loopback

Posted by Jason Wang 4 years, 11 months ago

This patch switches to use qemu_receive_packet() which can detect
reentrancy and return early.

Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
 hw/net/sungem.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/sungem.c b/hw/net/sungem.c
index 33c3722df6..3684a4d733 100644
--- a/hw/net/sungem.c
+++ b/hw/net/sungem.c
@@ -306,7 +306,7 @@ static void sungem_send_packet(SunGEMState *s, const uint8_t *buf,
     NetClientState *nc = qemu_get_queue(s->nic);
 
     if (s->macregs[MAC_XIFCFG >> 2] & MAC_XIFCFG_LBCK) {
-        nc->info->receive(nc, buf, size);
+        qemu_receive_packet(nc, buf, size);
     } else {
         qemu_send_packet(nc, buf, size);
     }
-- 
2.24.3 (Apple Git-128)

Re: [PATCH V3 05/10] sungem: switch to use qemu_receive_packet() for loopback

Posted by Mark Cave-Ayland 4 years, 11 months ago

On 02/03/2021 05:54, Jason Wang wrote:

> This patch switches to use qemu_receive_packet() which can detect
> reentrancy and return early.
> 
> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> Signed-off-by: Jason Wang <jasowang@redhat.com>
> ---
>   hw/net/sungem.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/hw/net/sungem.c b/hw/net/sungem.c
> index 33c3722df6..3684a4d733 100644
> --- a/hw/net/sungem.c
> +++ b/hw/net/sungem.c
> @@ -306,7 +306,7 @@ static void sungem_send_packet(SunGEMState *s, const uint8_t *buf,
>       NetClientState *nc = qemu_get_queue(s->nic);
>   
>       if (s->macregs[MAC_XIFCFG >> 2] & MAC_XIFCFG_LBCK) {
> -        nc->info->receive(nc, buf, size);
> +        qemu_receive_packet(nc, buf, size);
>       } else {
>           qemu_send_packet(nc, buf, size);
>       }

Reviewed-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>


ATB,

Mark.