From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34592) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNpa9-0003mZ-Tg for qemu-devel@nongnu.org; Mon, 25 Jan 2016 17:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aNpa8-0008FL-TC for qemu-devel@nongnu.org; Mon, 25 Jan 2016 17:25:57 -0500 Received: from mx1.redhat.com ([209.132.183.28]:58228) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aNpa8-0008F7-ND for qemu-devel@nongnu.org; Mon, 25 Jan 2016 17:25:56 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 676108CB55 for ; Mon, 25 Jan 2016 22:25:56 +0000 (UTC) From: wexu@redhat.com Date: Tue, 26 Jan 2016 06:24:46 +0800 Message-Id: <1453760690-21221-7-git-send-email-wexu@redhat.com> In-Reply-To: <1453760690-21221-1-git-send-email-wexu@redhat.com> References: <1453760690-21221-1-git-send-email-wexu@redhat.com> Subject: [Qemu-devel] [RFC Patch 06/10] IPv4 checksum. List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: victork@redhat.com, mst@redhat.com, jasowang@redhat.com, yvugenfi@redhat.com, Wei Xu , marcel@redhat.com, dfleytma@redhat.com Signed-off-by: Wei Xu --- hw/net/virtio-net.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c index 8da2815..1ca3dd5 100644 --- a/hw/net/virtio-net.c +++ b/hw/net/virtio-net.c @@ -1630,6 +1630,18 @@ static int virtio_net_load_device(VirtIODevice *vdev, QEMUFile *f, return 0; } +static void virtio_net_rsc_ipv4_checksum(NetRscSeg *seg) +{ + uint32_t sum; + struct ip_header *ip; + + ip = (struct ip_header *)(seg->buf + IP_OFFSET); + + ip->ip_sum = 0; + sum = net_checksum_add_cont(sizeof(struct ip_header), (uint8_t *)ip, 0); + ip->ip_sum = cpu_to_be16(net_checksum_finish(sum)); +} + static void virtio_net_rsc_purge(void *opq) { int ret = 0; @@ -1643,6 +1655,10 @@ static void virtio_net_rsc_purge(void *opq) continue; } + if ((chain->proto == ETH_P_IP) && seg->is_coalesced) { + virtio_net_rsc_ipv4_checksum(seg); + } + ret = virtio_net_do_receive(seg->nc, seg->buf, seg->size); QTAILQ_REMOVE(&chain->buffers, seg, next); g_free(seg->buf); @@ -1853,6 +1869,9 @@ static size_t virtio_net_rsc_callback(NetRscChain *chain, NetClientState *nc, QTAILQ_FOREACH_SAFE(seg, &chain->buffers, next, nseg) { ret = coalesce(chain, seg, buf, size); if (RSC_FINAL == ret) { + if ((chain->proto == ETH_P_IP) && seg->is_coalesced) { + virtio_net_rsc_ipv4_checksum(seg); + } ret = virtio_net_do_receive(seg->nc, seg->buf, seg->size); QTAILQ_REMOVE(&chain->buffers, seg, next); g_free(seg->buf); -- 2.4.0