From patchwork Sat Jun 5 10:14:52 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 54756 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 41AB1B7D20 for ; Sat, 5 Jun 2010 20:11:00 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933091Ab0FEKJv (ORCPT ); Sat, 5 Jun 2010 06:09:51 -0400 Received: from mga01.intel.com ([192.55.52.88]:65455 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932912Ab0FEKHN (ORCPT ); Sat, 5 Jun 2010 06:07:13 -0400 Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 05 Jun 2010 03:03:09 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.53,366,1272870000"; d="scan'208";a="804988081" Received: from unknown (HELO localhost.localdomain) ([10.239.36.142]) by fmsmga001.fm.intel.com with ESMTP; 05 Jun 2010 03:06:51 -0700 From: xiaohui.xin@intel.com To: netdev@vger.kernel.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, mst@redhat.com, mingo@elte.hu, davem@davemloft.net, herbert@gondor.apana.org.au, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [RFC PATCH v7 13/19] To skip GRO if buffer is external currently. Date: Sat, 5 Jun 2010 18:14:52 +0800 Message-Id: <1275732899-5423-13-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1275732899-5423-12-git-send-email-xiaohui.xin@intel.com> References: <1275732899-5423-1-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-2-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-3-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-4-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-5-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-6-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-7-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-8-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-9-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-10-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-11-git-send-email-xiaohui.xin@intel.com> <1275732899-5423-12-git-send-email-xiaohui.xin@intel.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Xin Xiaohui Signed-off-by: Xin Xiaohui Signed-off-by: Zhao Yu Reviewed-by: Jeff Dike --- net/core/dev.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/net/core/dev.c b/net/core/dev.c index dc2f225..6c6b2fe 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -2787,6 +2787,10 @@ enum gro_result dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb) if (skb_is_gso(skb) || skb_has_frags(skb)) goto normal; + /* currently GRO is not supported by mediate passthru */ + if (dev_is_mpassthru(skb->dev)) + goto normal; + rcu_read_lock(); list_for_each_entry_rcu(ptype, head, list) { if (ptype->type != type || ptype->dev || !ptype->gro_receive)