qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Ilya Repko <i.repko@syntacore.com>
To: "Edgar E. Iglesias" <edgar.iglesias@gmail.com>,
	Alistair Francis <alistair@alistair23.me>,
	Peter Maydell <peter.maydell@linaro.org>,
	Jason Wang <jasowang@redhat.com>
Cc: "open list:Xilinx Zynq" <qemu-arm@nongnu.org>,
	"open list:All patches CC here" <qemu-devel@nongnu.org>
Subject: [PATCH] Revert "hw/net: Fix the transmission return size"
Date: Thu, 6 Nov 2025 12:48:37 +0300	[thread overview]
Message-ID: <20251106094837.431976-1-i.repko@syntacore.com> (raw)

This reverts commit 3a6d374b754b4b345195ff6846eeaffedc96a7c5.

During axienet_eth_rx_notify(), s->rxpos is modified to indicate how much
data was pushed to AXI DMA. eth_rx() would then return this value.
If at 0, network subsystem would consider packet reception as failed
and put the packet in a queue for later.

Before we attempt to push packet data to AXI DMA, the packet is stored
in s->rxmem buffer. If an attempt to push data fails, we will reattempt
to deliver it from s->rxmem buffer once s2mm stream gets a new descriptor.
s->rxmem would not be overwritten by a subsequent eth_rx() call, because
eth_can_rx() protects it in case it has any data at all. Leaving the packet
in a NetQueue though effectively duplicates it.

Therefore, eth_rx() must indicate successful packet reception in case
data push to AXI DMA fails.

Signed-off-by: Ilya Repko <i.repko@syntacore.com>
---
 hw/net/xilinx_axienet.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hw/net/xilinx_axienet.c b/hw/net/xilinx_axienet.c
index 31e7708082..101b3f260a 100644
--- a/hw/net/xilinx_axienet.c
+++ b/hw/net/xilinx_axienet.c
@@ -867,7 +867,7 @@ static ssize_t eth_rx(NetClientState *nc, const uint8_t *buf, size_t size)
     axienet_eth_rx_notify(s);
 
     enet_update_irq(s);
-    return s->rxpos;
+    return size;
 }
 
 static size_t
-- 
2.51.1



             reply	other threads:[~2025-11-06  9:49 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-11-06  9:48 Ilya Repko [this message]
2025-11-06 19:16 ` [PATCH] Revert "hw/net: Fix the transmission return size" Edgar E. Iglesias
2025-11-07  9:03   ` Ilya Repko
  -- strict thread matches above, loose matches on Subject: below --
2025-11-05 19:55 Ilya Repko

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251106094837.431976-1-i.repko@syntacore.com \
    --to=i.repko@syntacore.com \
    --cc=alistair@alistair23.me \
    --cc=edgar.iglesias@gmail.com \
    --cc=jasowang@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-arm@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).