From patchwork Thu Sep 30 14:04:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 220062 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o8UDpwuT024517 for ; Thu, 30 Sep 2010 13:52:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756284Ab0I3NrI (ORCPT ); Thu, 30 Sep 2010 09:47:08 -0400 Received: from mga03.intel.com ([143.182.124.21]:30013 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756275Ab0I3NrG (ORCPT ); Thu, 30 Sep 2010 09:47:06 -0400 Received: from azsmga001.ch.intel.com ([10.2.17.19]) by azsmga101.ch.intel.com with ESMTP; 30 Sep 2010 06:47:06 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.57,259,1283756400"; d="scan'208";a="330506231" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.36.37]) by azsmga001.ch.intel.com with ESMTP; 30 Sep 2010 06:47:04 -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.hengli.com.au, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [PATCH v12 09/17] Don't do skb recycle, if device use external buffer. Date: Thu, 30 Sep 2010 22:04:26 +0800 Message-Id: <480af4c409789eafb08c5aa13e3c195ae1ab747a.1285853725.git.xiaohui.xin@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1285855474-12110-1-git-send-email-xiaohui.xin@intel.com> References: <1285855474-12110-1-git-send-email-xiaohui.xin@intel.com> In-Reply-To: <59d8a50047ee01e26658fd676d26c0162b79e5fd.1285853725.git.xiaohui.xin@intel.com> References: <59d8a50047ee01e26658fd676d26c0162b79e5fd.1285853725.git.xiaohui.xin@intel.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 30 Sep 2010 13:52:00 +0000 (UTC) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 76c8301..1aede3a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -565,6 +565,12 @@ int skb_recycle_check(struct sk_buff *skb, int skb_size) if (skb_shared(skb) || skb_cloned(skb)) return 0; + /* 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); atomic_set(&shinfo->dataref, 1);