From: Jason Wang <jasowang@redhat.com>
To: peter.maydell@linaro.org, qemu-devel@nongnu.org
Cc: Jason Wang <jasowang@redhat.com>, Martin Wilck <mwilck@suse.com>
Subject: [Qemu-devel] [PULL V2 25/26] e1000: indicate dropped packets in HW counters
Date: Fri, 19 Oct 2018 11:22:24 +0800 [thread overview]
Message-ID: <1539919345-10703-26-git-send-email-jasowang@redhat.com> (raw)
In-Reply-To: <1539919345-10703-1-git-send-email-jasowang@redhat.com>
The e1000 emulation silently discards RX packets if there's
insufficient space in the ring buffer. This leads to errors
on higher-level protocols in the guest, with no indication
about the error cause.
This patch increments the "Missed Packets Count" (MPC) and
"Receive No Buffers Count" (RNBC) HW counters in this case.
As the emulation has no FIFO for buffering packets that can't
immediately be pushed to the guest, these two registers are
practically equivalent (see 10.2.7.4, 10.2.7.33 in
https://www.intel.com/content/www/us/en/embedded/products/networking/82574l-gbe-controller-datasheet.html).
On a Linux guest, the register content will be reflected in
the "rx_missed_errors" and "rx_no_buffer_count" stats from
"ethtool -S", and in the "missed" stat from "ip -s -s link show",
giving at least some hint about the error cause inside the guest.
If the cause is known, problems like this can often be avoided
easily, by increasing the number of RX descriptors in the guest
e1000 driver (e.g under Linux, "e1000.RxDescriptors=1024").
The patch also adds a qemu trace message for this condition.
Signed-off-by: Martin Wilck <mwilck@suse.com>
Signed-off-by: Jason Wang <jasowang@redhat.com>
---
hw/net/e1000.c | 16 +++++++++++++---
hw/net/trace-events | 3 +++
2 files changed, 16 insertions(+), 3 deletions(-)
diff --git a/hw/net/e1000.c b/hw/net/e1000.c
index 13a9494..5e144cb 100644
--- a/hw/net/e1000.c
+++ b/hw/net/e1000.c
@@ -36,6 +36,7 @@
#include "qemu/range.h"
#include "e1000x_common.h"
+#include "trace.h"
static const uint8_t bcast[] = {0xff, 0xff, 0xff, 0xff, 0xff, 0xff};
@@ -847,6 +848,15 @@ static uint64_t rx_desc_base(E1000State *s)
return (bah << 32) + bal;
}
+static void
+e1000_receiver_overrun(E1000State *s, size_t size)
+{
+ trace_e1000_receiver_overrun(size, s->mac_reg[RDH], s->mac_reg[RDT]);
+ e1000x_inc_reg_if_not_full(s->mac_reg, RNBC);
+ e1000x_inc_reg_if_not_full(s->mac_reg, MPC);
+ set_ics(s, 0, E1000_ICS_RXO);
+}
+
static ssize_t
e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
{
@@ -916,8 +926,8 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
desc_offset = 0;
total_size = size + e1000x_fcs_len(s->mac_reg);
if (!e1000_has_rxbufs(s, total_size)) {
- set_ics(s, 0, E1000_ICS_RXO);
- return -1;
+ e1000_receiver_overrun(s, total_size);
+ return -1;
}
do {
desc_size = total_size - desc_offset;
@@ -969,7 +979,7 @@ e1000_receive_iov(NetClientState *nc, const struct iovec *iov, int iovcnt)
rdh_start >= s->mac_reg[RDLEN] / sizeof(desc)) {
DBGOUT(RXERR, "RDH wraparound @%x, RDT %x, RDLEN %x\n",
rdh_start, s->mac_reg[RDT], s->mac_reg[RDLEN]);
- set_ics(s, 0, E1000_ICS_RXO);
+ e1000_receiver_overrun(s, total_size);
return -1;
}
} while (desc_offset < total_size);
diff --git a/hw/net/trace-events b/hw/net/trace-events
index c1dea4b..9d49f62 100644
--- a/hw/net/trace-events
+++ b/hw/net/trace-events
@@ -98,6 +98,9 @@ net_rx_pkt_rss_ip6_ex(void) "Calculating IPv6/EX RSS hash"
net_rx_pkt_rss_hash(size_t rss_length, uint32_t rss_hash) "RSS hash for %zu bytes: 0x%X"
net_rx_pkt_rss_add_chunk(void* ptr, size_t size, size_t input_offset) "Add RSS chunk %p, %zu bytes, RSS input offset %zu bytes"
+# hw/net/e1000.c
+e1000_receiver_overrun(size_t s, uint32_t rdh, uint32_t rdt) "Receiver overrun: dropped packet of %zu bytes, RDH=%u, RDT=%u"
+
# hw/net/e1000x_common.c
e1000x_rx_can_recv_disabled(bool link_up, bool rx_enabled, bool pci_master) "link_up: %d, rx_enabled %d, pci_master %d"
e1000x_vlan_is_vlan_pkt(bool is_vlan_pkt, uint16_t eth_proto, uint16_t vet) "Is VLAN packet: %d, ETH proto: 0x%X, VET: 0x%X"
--
2.5.0
next prev parent reply other threads:[~2018-10-19 3:23 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-19 3:21 [Qemu-devel] [PULL V2 00/26] Net patches Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 01/26] filter-rewriter: Add TCP state machine and fix memory leak in connection_track_table Jason Wang
2018-10-29 11:01 ` Peter Maydell
2018-10-30 2:02 ` Jason Wang
2018-10-30 2:29 ` Zhang Chen
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 02/26] colo-compare: implement the process of checkpoint Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 03/26] colo-compare: use notifier to notify packets comparing result Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 04/26] COLO: integrate colo compare with colo frame Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 05/26] COLO: Add block replication into colo process Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 06/26] COLO: Remove colo_state migration struct Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 07/26] COLO: Load dirty pages into SVM's RAM cache firstly Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 08/26] ram/COLO: Record the dirty pages that SVM received Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 09/26] COLO: Flush memory data from ram cache Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 10/26] qmp event: Add COLO_EXIT event to notify users while exited COLO Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 11/26] qapi/migration.json: Rename COLO unknown mode to none mode Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 12/26] qapi: Add new command to query colo status Jason Wang
2018-10-19 15:30 ` Eric Blake
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 13/26] savevm: split the process of different stages for loadvm/savevm Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 14/26] COLO: flush host dirty ram from cache Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 15/26] filter: Add handle_event method for NetFilterClass Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 16/26] filter-rewriter: handle checkpoint and failover event Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 17/26] COLO: notify net filters about checkpoint/failover event Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 18/26] COLO: quick failover process by kick COLO thread Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 19/26] docs: Add COLO status diagram to COLO-FT.txt Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 20/26] clean up callback when del virtqueue Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 21/26] ne2000: fix possible out of bound access in ne2000_receive Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 22/26] rtl8139: fix possible out of bound access Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 23/26] pcnet: fix possible buffer overflow Jason Wang
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 24/26] net: ignore packet size greater than INT_MAX Jason Wang
2018-11-13 15:41 ` Dima Stepanov
2018-11-14 2:59 ` Jason Wang
2018-11-14 16:23 ` Dima Stepanov
2018-11-15 2:47 ` Jason Wang
2018-11-16 7:48 ` Dima Stepanov
2018-10-19 3:22 ` Jason Wang [this message]
2018-10-19 3:22 ` [Qemu-devel] [PULL V2 26/26] qemu-options: Fix bad "macaddr" property in the documentation Jason Wang
2018-10-19 15:17 ` [Qemu-devel] [PULL V2 00/26] Net patches Peter Maydell
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=1539919345-10703-26-git-send-email-jasowang@redhat.com \
--to=jasowang@redhat.com \
--cc=mwilck@suse.com \
--cc=peter.maydell@linaro.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).