From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:60357) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQ81d-0000im-7b for qemu-devel@nongnu.org; Mon, 01 Feb 2016 01:31:50 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aQ81a-0004c8-1U for qemu-devel@nongnu.org; Mon, 01 Feb 2016 01:31:49 -0500 Received: from mx1.redhat.com ([209.132.183.28]:43438) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aQ81Z-0004c4-SS for qemu-devel@nongnu.org; Mon, 01 Feb 2016 01:31:45 -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 7C325C0AF7BF for ; Mon, 1 Feb 2016 06:31:45 +0000 (UTC) References: <1454264009-24094-1-git-send-email-wexu@redhat.com> <1454264009-24094-7-git-send-email-wexu@redhat.com> From: Jason Wang Message-ID: <56AEFBC2.3040700@redhat.com> Date: Mon, 1 Feb 2016 14:31:30 +0800 MIME-Version: 1.0 In-Reply-To: <1454264009-24094-7-git-send-email-wexu@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [RFC Patch v2 06/10] virtio-net rsc: IPv4 checksum List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: wexu@redhat.com, qemu-devel@nongnu.org Cc: Wei Xu , victork@redhat.com, mst@redhat.com, yvugenfi@redhat.com, marcel@redhat.com, dfleytma@redhat.com On 02/01/2016 02:13 AM, wexu@redhat.com wrote: > From: Wei Xu > > If a field in the IPv4 header is modified, then the checksum > have to be recalculated before sending it out. This in fact breaks bisection. I think you need either squash this into previous patch or introduce virtio_net_rsc_ipv4_checksum() as a helper before the patch of ipv4 coalescing. > > 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);