[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH arm-devs v2 14/14] net/cadence_gem: Don't rx packets
From: |
Peter Crosthwaite |
Subject: |
[Qemu-devel] [PATCH arm-devs v2 14/14] net/cadence_gem: Don't rx packets when no rx buffer available |
Date: |
Tue, 3 Dec 2013 22:02:03 -0800 |
Return false from can_receive() when no valid buffer descriptor is
available. Ensures against mass packet droppage in some applications.
Signed-off-by: Peter Crosthwaite <address@hidden>
---
changed since v1:
Typos ("dont" "cant" "recieve") (PMM review)
hw/net/cadence_gem.c | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/hw/net/cadence_gem.c b/hw/net/cadence_gem.c
index f6e38ca..92dc2f2 100644
--- a/hw/net/cadence_gem.c
+++ b/hw/net/cadence_gem.c
@@ -463,6 +463,15 @@ static int gem_can_receive(NetClientState *nc)
return 0;
}
+ if (rx_desc_get_ownership(s->rx_desc) == 1) {
+ if (s->can_rx_state != 2) {
+ s->can_rx_state = 2;
+ DB_PRINT("can't receive - busy buffer descriptor 0x%x\n",
+ s->rx_desc_addr);
+ }
+ return 0;
+ }
+
if (s->can_rx_state != 0) {
s->can_rx_state = 0;
DB_PRINT("can receive 0x%x\n", s->rx_desc_addr);
@@ -1142,7 +1151,7 @@ static void gem_write(void *opaque, hwaddr offset,
uint64_t val,
/* Reset to start of Q when transmit disabled. */
s->tx_desc_addr = s->regs[GEM_TXQBASE];
}
- if (val & GEM_NWCTRL_RXENA) {
+ if (gem_can_receive(qemu_get_queue(s->nic))) {
qemu_flush_queued_packets(qemu_get_queue(s->nic));
}
break;
--
1.8.4.4
- [Qemu-devel] [PATCH arm-devs v2 03/14] net/cadence_gem: Don't assert against 0 buffer address, (continued)
- [Qemu-devel] [PATCH arm-devs v2 03/14] net/cadence_gem: Don't assert against 0 buffer address, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 04/14] net/cadence_gem: simplify rx buf descriptor walking, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 06/14] net/cadence_gem: Implement RX descriptor match mode flags, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 07/14] net/cadence_gem: Implement SAR match bit in rx desc, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 08/14] net/cadence_gem: Implement SAR (de)activation, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 11/14] net/cadence_gem: Fix small packet FCS stripping, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 12/14] net/cadence_gem: Fix register w1c logic, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 13/14] net/cadence_gem: Improve can_receive debug printfery, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 10/14] net/cadence_gem: Fix rx multi-fragment packets, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 09/14] net/cadence_gem: Add missing VMSTATE_END_OF_LIST, Peter Crosthwaite, 2013/12/04
- [Qemu-devel] [PATCH arm-devs v2 14/14] net/cadence_gem: Don't rx packets when no rx buffer available,
Peter Crosthwaite <=
- [Qemu-devel] [PATCH arm-devs v2 05/14] net/cadence_gem: Prefetch rx descriptors ASAP, Peter Crosthwaite, 2013/12/04
- Re: [Qemu-devel] [PATCH arm-devs v2 00/14] Cadence GEM Bugfixes and missing features, Peter Maydell, 2013/12/06