From patchwork Fri Oct 15 09:12:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 67900 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 E7C03B70E8 for ; Fri, 15 Oct 2010 19:56:08 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754613Ab0JOIxB (ORCPT ); Fri, 15 Oct 2010 04:53:01 -0400 Received: from mga01.intel.com ([192.55.52.88]:60392 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754603Ab0JOIxA (ORCPT ); Fri, 15 Oct 2010 04:53:00 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 15 Oct 2010 01:52:59 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.57,335,1283756400"; d="scan'208";a="616995423" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.36.73]) by fmsmga002.fm.intel.com with ESMTP; 15 Oct 2010 01:52:58 -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: [PATCH v13 09/16]Don't do skb recycle, if device use external buffer. Date: Fri, 15 Oct 2010 17:12:10 +0800 Message-Id: <3e1189480fb1687496e83e9be6d818e99f9b0692.1287132437.git.xiaohui.xin@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1287133937-5538-1-git-send-email-xiaohui.xin@intel.com> References: <1287133937-5538-1-git-send-email-xiaohui.xin@intel.com> In-Reply-To: References: 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/skbuff.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 02439e0..196aa99 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -558,6 +558,12 @@ bool skb_recycle_check(struct sk_buff *skb, int skb_size) if (skb_shared(skb) || skb_cloned(skb)) return false; + /* if the device wants to do mediate passthru, the skb may + * get external buffer, so don't recycle + */ + if (dev_is_mpassthru(skb->dev)) + return 0; + skb_release_head_state(skb); shinfo = skb_shinfo(skb);