From patchwork Tue May 12 01:34:24 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Venkat Venkatsubra X-Patchwork-Id: 471094 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D968614016A for ; Tue, 12 May 2015 11:34:49 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752247AbbELBeq (ORCPT ); Mon, 11 May 2015 21:34:46 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:46495 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752196AbbELBeo (ORCPT ); Mon, 11 May 2015 21:34:44 -0400 Received: from userv0022.oracle.com (userv0022.oracle.com [156.151.31.74]) by userp1040.oracle.com (Sentrion-MTA-4.3.2/Sentrion-MTA-4.3.2) with ESMTP id t4C1Ya20005629 (version=TLSv1 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Tue, 12 May 2015 01:34:36 GMT Received: from userv0121.oracle.com (userv0121.oracle.com [156.151.31.72]) by userv0022.oracle.com (8.13.8/8.13.8) with ESMTP id t4C1YZA1030858 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL); Tue, 12 May 2015 01:34:35 GMT Received: from abhmp0015.oracle.com (abhmp0015.oracle.com [141.146.116.21]) by userv0121.oracle.com (8.13.8/8.13.8) with ESMTP id t4C1YZV3006995; Tue, 12 May 2015 01:34:35 GMT Received: from oracle.com (/139.185.48.5) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Mon, 11 May 2015 18:34:34 -0700 Date: Mon, 11 May 2015 18:34:24 -0700 From: Venkat Venkatsubra To: netdev@vger.kernel.org, xen-devel@lists.xenproject.org Cc: davem@davemloft.net, david.vrabel@citrix.com, konrad.wilk@oracle.com, boris.ostrovsky@oracle.com, wei.liu2@citrix.com, paul.durrant@citrix.com Subject: [PATCH] xen-netfront: reset skb transport header before checksum Message-ID: <20150512013424.GA7960@oracle.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In ed1f50c3a ("net: add skb_checksum_setup") some checksum functions were introduced in core. Subsequent change b5cf66cd1 ("xen-netfront: use new skb_checksum_setup function") made use of those functions to replace its own implementation. With that change ip_hdr() and tcp_hdr() were not pointing at the right place. d554f73df ("xen-netfront: reset skb network header before checksum") fixed the ip_hdr(). This patch fixes tcp_hdr(). We saw this problem when LRO was enabled on the host and it results in netfront setting skb->ip_summed to CHECKSUM_UNNECESSARY. Signed-off-by: Venkat Venkatsubra --- drivers/net/xen-netfront.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index 3f45afd..ed5c242 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -889,6 +889,7 @@ static int handle_incoming_queue(struct netfront_queue *queue, /* Ethernet work: Delayed to here as it peeks the header. */ skb->protocol = eth_type_trans(skb, queue->info->netdev); skb_reset_network_header(skb); + skb_set_transport_header(skb, ip_hdrlen(skb)); if (checksum_setup(queue->info->netdev, skb)) { kfree_skb(skb);