From patchwork Sun Jan 31 18:13:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wei Xu X-Patchwork-Id: 576233 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4F208140BC4 for ; Mon, 1 Feb 2016 05:16:00 +1100 (AEDT) Received: from localhost ([::1]:42724 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPwXW-0006ME-Aw for incoming@patchwork.ozlabs.org; Sun, 31 Jan 2016 13:15:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36722) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPwVi-0002VT-Nz for qemu-devel@nongnu.org; Sun, 31 Jan 2016 13:14:07 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aPwVh-0006Ad-Pk for qemu-devel@nongnu.org; Sun, 31 Jan 2016 13:14:06 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46604) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aPwVh-0006AZ-Kr for qemu-devel@nongnu.org; Sun, 31 Jan 2016 13:14:05 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (Postfix) with ESMTPS id 61CFC263C for ; Sun, 31 Jan 2016 18:14:05 +0000 (UTC) Received: from wei-thinkpad.nay.redhat.com (vpn1-6-127.pek2.redhat.com [10.72.6.127]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0VIDVgS014091; Sun, 31 Jan 2016 13:14:01 -0500 From: wexu@redhat.com To: qemu-devel@nongnu.org Date: Mon, 1 Feb 2016 02:13:25 +0800 Message-Id: <1454264009-24094-7-git-send-email-wexu@redhat.com> In-Reply-To: <1454264009-24094-1-git-send-email-wexu@redhat.com> References: <1454264009-24094-1-git-send-email-wexu@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: Wei Xu , victork@redhat.com, mst@redhat.com, jasowang@redhat.com, yvugenfi@redhat.com, Wei Xu , marcel@redhat.com, dfleytma@redhat.com Subject: [Qemu-devel] [RFC Patch v2 06/10] virtio-net rsc: IPv4 checksum X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Wei Xu If a field in the IPv4 header is modified, then the checksum have to be recalculated before sending it out. 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 93df0d5..88fc4f8 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);