e09562d587
- Drop 32bit support from spec file - Dropped 520d417d-xen-Add-stdbool.h-workaround-for-BSD.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/xen?expand=0&rev=282
105 lines
4.0 KiB
Diff
105 lines
4.0 KiB
Diff
From: "Michael S. Tsirkin" <mst@redhat.com>
|
|
Date: Tue, 15 Feb 2011 18:27:48 +0200
|
|
Subject: e1000: multi-buffer packet support
|
|
Patch-mainline: v0.15.0-rc0
|
|
Git-commit: b19487e27ed3009df7f555998a454ba19aefd4b8
|
|
References: bnc#840196
|
|
|
|
e1000 supports multi-buffer packets larger than rxbuf_size.
|
|
|
|
This fixes the following (on linux):
|
|
- in guest: ifconfig eth1 mtu 16110
|
|
- in host: ifconfig tap0 mtu 16110
|
|
ping -s 16082 <guest-ip>
|
|
|
|
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
|
|
Reviewed-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
|
|
Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
Acked-by: Kevin Wolf <kwolf@redhat.com>
|
|
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
|
|
Signed-off-by: Michal Kubecek <mkubecek@suse.cz>
|
|
---
|
|
tools/qemu-xen-traditional-dir-remote/hw/e1000.c | 39 +++++++++++++++++-------
|
|
1 file changed, 28 insertions(+), 11 deletions(-)
|
|
|
|
diff --git a/tools/qemu-xen-traditional-dir-remote/hw/e1000.c b/tools/qemu-xen-traditional-dir-remote/hw/e1000.c
|
|
index 07e681d..34818e0 100644
|
|
--- a/tools/qemu-xen-traditional-dir-remote/hw/e1000.c
|
|
+++ b/tools/qemu-xen-traditional-dir-remote/hw/e1000.c
|
|
@@ -632,16 +632,13 @@ e1000_receive(void *opaque, const uint8_t *buf, int size)
|
|
uint32_t rdh_start;
|
|
uint16_t vlan_special = 0;
|
|
uint8_t vlan_status = 0, vlan_offset = 0;
|
|
+ size_t desc_offset;
|
|
+ size_t desc_size;
|
|
+ size_t total_size;
|
|
|
|
if (!(s->mac_reg[RCTL] & E1000_RCTL_EN))
|
|
return;
|
|
|
|
- if (size > s->rxbuf_size) {
|
|
- DBGOUT(RX, "packet too large for buffers (%d > %d)\n", size,
|
|
- s->rxbuf_size);
|
|
- return;
|
|
- }
|
|
-
|
|
/* Discard oversized packets if !LPE and !SBP. */
|
|
if ((size > MAXIMUM_ETHERNET_LPE_SIZE ||
|
|
(size > MAXIMUM_ETHERNET_VLAN_SIZE
|
|
@@ -668,8 +665,16 @@ e1000_receive(void *opaque, const uint8_t *buf, int size)
|
|
}
|
|
|
|
rdh_start = s->mac_reg[RDH];
|
|
+ desc_offset = 0;
|
|
+ total_size = size + fcs_len(s);
|
|
do {
|
|
+ desc_size = total_size - desc_offset;
|
|
+ if (desc_size > s->rxbuf_size) {
|
|
+ desc_size = s->rxbuf_size;
|
|
+ }
|
|
if (s->mac_reg[RDH] == s->mac_reg[RDT] && s->check_rxov) {
|
|
+ /* Discard all data written so far */
|
|
+ s->mac_reg[RDH] = rdh_start;
|
|
set_ics(s, 0, E1000_ICS_RXO);
|
|
return;
|
|
}
|
|
@@ -679,10 +684,22 @@ e1000_receive(void *opaque, const uint8_t *buf, int size)
|
|
desc.special = vlan_special;
|
|
desc.status |= (vlan_status | E1000_RXD_STAT_DD);
|
|
if (desc.buffer_addr) {
|
|
- cpu_physical_memory_write(le64_to_cpu(desc.buffer_addr),
|
|
- (void *)(buf + vlan_offset), size);
|
|
- desc.length = cpu_to_le16(size + fcs_len(s));
|
|
- desc.status |= E1000_RXD_STAT_EOP|E1000_RXD_STAT_IXSM;
|
|
+ if (desc_offset < size) {
|
|
+ size_t copy_size = size - desc_offset;
|
|
+ if (copy_size > s->rxbuf_size) {
|
|
+ copy_size = s->rxbuf_size;
|
|
+ }
|
|
+ cpu_physical_memory_write(le64_to_cpu(desc.buffer_addr),
|
|
+ (void *)(buf + desc_offset + vlan_offset),
|
|
+ copy_size);
|
|
+ }
|
|
+ desc_offset += desc_size;
|
|
+ if (desc_offset >= total_size) {
|
|
+ desc.length = cpu_to_le16(desc_size);
|
|
+ desc.status |= E1000_RXD_STAT_EOP | E1000_RXD_STAT_IXSM;
|
|
+ } else {
|
|
+ desc.length = cpu_to_le16(desc_size);
|
|
+ }
|
|
} else // as per intel docs; skip descriptors with null buf addr
|
|
DBGOUT(RX, "Null RX descriptor!!\n");
|
|
cpu_physical_memory_write(base, (void *)&desc, sizeof(desc));
|
|
@@ -697,7 +714,7 @@ e1000_receive(void *opaque, const uint8_t *buf, int size)
|
|
set_ics(s, 0, E1000_ICS_RXO);
|
|
return;
|
|
}
|
|
- } while (desc.buffer_addr == 0);
|
|
+ } while (desc_offset < total_size);
|
|
|
|
s->mac_reg[GPRC]++;
|
|
s->mac_reg[TPR]++;
|
|
--
|
|
1.8.1.4
|
|
|