[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL for-2.4 10/16] etsec: Flush queue when rx buffer is c
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL for-2.4 10/16] etsec: Flush queue when rx buffer is consumed |
Date: |
Mon, 27 Jul 2015 14:51:55 +0100 |
From: Fam Zheng <address@hidden>
The BH will be scheduled when etsec->rx_buffer_len is becoming 0, which
is the condition of queuing.
Signed-off-by: Fam Zheng <address@hidden>
Reviewed-by: Jason Wang <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
hw/net/fsl_etsec/etsec.c | 11 ++++++++++-
hw/net/fsl_etsec/etsec.h | 2 ++
hw/net/fsl_etsec/rings.c | 3 +++
3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/hw/net/fsl_etsec/etsec.c b/hw/net/fsl_etsec/etsec.c
index f5170ae..0f5cf44 100644
--- a/hw/net/fsl_etsec/etsec.c
+++ b/hw/net/fsl_etsec/etsec.c
@@ -342,13 +342,22 @@ static ssize_t etsec_receive(NetClientState *nc,
const uint8_t *buf,
size_t size)
{
+ ssize_t ret;
eTSEC *etsec = qemu_get_nic_opaque(nc);
#if defined(HEX_DUMP)
fprintf(stderr, "%s receive size:%d\n", etsec->nic->nc.name, size);
qemu_hexdump(buf, stderr, "", size);
#endif
- return etsec_rx_ring_write(etsec, buf, size);
+ /* Flush is unnecessary as are already in receiving path */
+ etsec->need_flush = false;
+ ret = etsec_rx_ring_write(etsec, buf, size);
+ if (ret == 0) {
+ /* The packet will be queued, let's flush it when buffer is avilable
+ * again. */
+ etsec->need_flush = true;
+ }
+ return ret;
}
diff --git a/hw/net/fsl_etsec/etsec.h b/hw/net/fsl_etsec/etsec.h
index fc41773..e7dc0a4 100644
--- a/hw/net/fsl_etsec/etsec.h
+++ b/hw/net/fsl_etsec/etsec.h
@@ -144,6 +144,8 @@ typedef struct eTSEC {
QEMUBH *bh;
struct ptimer_state *ptimer;
+ /* Whether we should flush the rx queue when buffer becomes available. */
+ bool need_flush;
} eTSEC;
#define TYPE_ETSEC_COMMON "eTSEC"
diff --git a/hw/net/fsl_etsec/rings.c b/hw/net/fsl_etsec/rings.c
index a11280b..68e7b6d 100644
--- a/hw/net/fsl_etsec/rings.c
+++ b/hw/net/fsl_etsec/rings.c
@@ -646,6 +646,9 @@ void etsec_walk_rx_ring(eTSEC *etsec, int ring_nbr)
} else {
etsec->rx_buffer_len = 0;
etsec->rx_buffer = NULL;
+ if (etsec->need_flush) {
+ qemu_flush_queued_packets(qemu_get_queue(etsec->nic));
+ }
}
RING_DEBUG("eTSEC End of ring_write: remaining_data:%zu\n",
remaining_data);
--
2.4.3
- [Qemu-devel] [PULL for-2.4 00/16] Net patches, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 03/16] hw/net: add simple phy support to mcf_fec driver, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 01/16] hw/net: create common collection of MII definitions, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 02/16] hw/net: add ANLPAR bit definitions to generic mii, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 04/16] hw/net: fix mcf_fec driver receiver, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 05/16] xgmac: Drop packets with eth_can_rx is false., Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 08/16] usbnet: Drop usbnet_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 06/16] pcnet: Drop pcnet_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 07/16] eepro100: Drop nic_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 10/16] etsec: Flush queue when rx buffer is consumed,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL for-2.4 12/16] milkymist-minimac2: Flush queued packets when link comes up, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 11/16] mcf_fec: Drop mcf_fec_can_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 13/16] mipsnet: Flush queued packets when receiving is enabled, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 14/16] stellaris_enet: Flush queued packets when read done, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 09/16] etsec: Move etsec_can_receive into etsec_receive, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 15/16] dp8393x: Flush packets when link comes up, Stefan Hajnoczi, 2015/07/27
- [Qemu-devel] [PULL for-2.4 16/16] axienet: Flush queued packets when rx is done, Stefan Hajnoczi, 2015/07/27
- Re: [Qemu-devel] [PULL for-2.4 00/16] Net patches, Peter Maydell, 2015/07/27