From patchwork Thu Feb 3 16:49:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Michael S. Tsirkin" X-Patchwork-Id: 81680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by ozlabs.org (Postfix) with ESMTP id 402D3B712D for ; Fri, 4 Feb 2011 03:55:32 +1100 (EST) Received: from localhost ([127.0.0.1]:38221 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl2O0-0003Fe-8R for incoming@patchwork.ozlabs.org; Thu, 03 Feb 2011 11:50:24 -0500 Received: from [140.186.70.92] (port=34529 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Pl2NE-000340-OW for qemu-devel@nongnu.org; Thu, 03 Feb 2011 11:49:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Pl2N8-0006MP-OL for qemu-devel@nongnu.org; Thu, 03 Feb 2011 11:49:32 -0500 Received: from mx1.redhat.com ([209.132.183.28]:12007) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Pl2N8-0006MG-HZ for qemu-devel@nongnu.org; Thu, 03 Feb 2011 11:49:30 -0500 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id p13GnREn019535 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 3 Feb 2011 11:49:27 -0500 Received: from redhat.com (vpn-200-12.tlv.redhat.com [10.35.200.12]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with SMTP id p13GnLmH006468; Thu, 3 Feb 2011 11:49:23 -0500 Date: Thu, 3 Feb 2011 18:49:10 +0200 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org, Anthony Liguori Message-ID: <20110203164910.GA10672@redhat.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.132.183.28 Cc: Jes.Sorensen@redhat.com, Alex Williamson , agraf@suse.de, stefanha@linux.vnet.ibm.com Subject: [Qemu-devel] [PATCHv2] e1000: multi-buffer packet support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 Red Hat bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=602205 Signed-off-by: Michael S. Tsirkin Acked-by: Alex Williamson Reviewed-by: Stefan Hajnoczi --- Changes from v1: removed dead code hw/e1000.c | 29 +++++++++++++++++++---------- 1 files changed, 19 insertions(+), 10 deletions(-) diff --git a/hw/e1000.c b/hw/e1000.c index af101bd..3427ff3 100644 --- a/hw/e1000.c +++ b/hw/e1000.c @@ -642,6 +642,8 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) uint16_t vlan_special = 0; uint8_t vlan_status = 0, vlan_offset = 0; uint8_t min_buf[MIN_BUF_SIZE]; + size_t desc_offset; + size_t desc_size; if (!(s->mac_reg[RCTL] & E1000_RCTL_EN)) return -1; @@ -654,12 +656,6 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) size = sizeof(min_buf); } - if (size > s->rxbuf_size) { - DBGOUT(RX, "packet too large for buffers (%lu > %d)\n", - (unsigned long)size, s->rxbuf_size); - return -1; - } - if (!receive_filter(s, buf, size)) return size; @@ -672,8 +668,15 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) } rdh_start = s->mac_reg[RDH]; + desc_offset = 0; do { + desc_size = 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 -1; } @@ -684,9 +687,15 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) 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; + (void *)(buf + desc_offset + vlan_offset), + desc_size); + desc_offset += desc_size; + if (desc_offset >= size) { + desc.length = cpu_to_le16(desc_size + fcs_len(s)); + 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"); } @@ -702,7 +711,7 @@ e1000_receive(VLANClientState *nc, const uint8_t *buf, size_t size) set_ics(s, 0, E1000_ICS_RXO); return -1; } - } while (desc.buffer_addr == 0); + } while (desc_offset < size); s->mac_reg[GPRC]++; s->mac_reg[TPR]++;