From patchwork Wed Jan 5 13:23:31 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Campbell X-Patchwork-Id: 77593 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 433B8B711C for ; Thu, 6 Jan 2011 00:23:40 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752210Ab1AENXf (ORCPT ); Wed, 5 Jan 2011 08:23:35 -0500 Received: from smtp02.citrix.com ([66.165.176.63]:11573 "EHLO SMTP02.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752167Ab1AENXf (ORCPT ); Wed, 5 Jan 2011 08:23:35 -0500 X-IronPort-AV: E=Sophos;i="4.60,278,1291611600"; d="scan'208";a="129657695" Received: from ftlpexchmx01.citrite.net ([10.9.154.126]) by FTLPIPO02.CITRIX.COM with ESMTP; 05 Jan 2011 08:23:34 -0500 Received: from smtp01.ad.xensource.com ([10.219.128.104]) by FTLPEXCHMX01.citrite.net with Microsoft SMTPSVC(6.0.3790.4675); Wed, 5 Jan 2011 08:23:33 -0500 Received: from localhost.localdomain (cosworth.uk.xensource.com [10.80.16.52]) by smtp01.ad.xensource.com (8.13.1/8.13.1) with ESMTP id p05DNV03010581; Wed, 5 Jan 2011 05:23:32 -0800 From: Ian Campbell To: netdev@vger.kernel.org Cc: Ian Campbell , Jeremy Fitzhardinge , xen-devel@lists.xensource.com Subject: [PATCH] xen: netfront: Drop GSO SKBs which do not have csum_blank. Date: Wed, 5 Jan 2011 13:23:31 +0000 Message-Id: <1294233811-28123-1-git-send-email-ian.campbell@citrix.com> X-Mailer: git-send-email 1.5.6.5 X-OriginalArrivalTime: 05 Jan 2011 13:23:34.0121 (UTC) FILETIME=[C0B6C590:01CBACDB] Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The Linux network stack expects all GSO SKBs to have ip_summed == CHECKSUM_PARTIAL (which implies that the frame contains a partial checksum) and the Xen network ring protocol similarly expects an SKB which has GSO set to also have NETRX_csum_blank (which also implies a partial checksum). Therefore drop such frames on receive otherwise they will trigger the warning in skb_gso_segment. Signed-off-by: Ian Campbell Cc: Jeremy Fitzhardinge Cc: xen-devel@lists.xensource.com Cc: netdev@vger.kernel.org --- drivers/net/xen-netfront.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/drivers/net/xen-netfront.c b/drivers/net/xen-netfront.c index cdbeec9..8b8c480 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -836,6 +836,11 @@ static int handle_incoming_queue(struct net_device *dev, dev->stats.rx_errors++; continue; } + } else if (skb_is_gso(skb)) { + kfree_skb(skb); + packets_dropped++; + dev->stats.rx_errors++; + continue; } dev->stats.rx_packets++;