From patchwork Fri May 7 09:34:57 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 97701 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o479ZES7014825 for ; Fri, 7 May 2010 09:38:00 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755994Ab0EGJd4 (ORCPT ); Fri, 7 May 2010 05:33:56 -0400 Received: from mga09.intel.com ([134.134.136.24]:55769 "EHLO mga09.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755530Ab0EGJaH (ORCPT ); Fri, 7 May 2010 05:30:07 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga102.jf.intel.com with ESMTP; 07 May 2010 02:28:39 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.52,347,1270450800"; d="scan'208";a="515915064" Received: from unknown (HELO localhost.localdomain) ([10.239.36.200]) by orsmga002.jf.intel.com with ESMTP; 07 May 2010 02:29:35 -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, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [RFC][PATCH v5 10/19] Don't do skb recycle, if device use external buffer. Date: Fri, 7 May 2010 17:34:57 +0800 Message-Id: <1273224906-4874-11-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1273224906-4874-10-git-send-email-xiaohui.xin@intel.com> References: <1273224906-4874-1-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-2-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-3-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-4-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-5-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-6-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-7-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-8-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-9-git-send-email-xiaohui.xin@intel.com> <1273224906-4874-10-git-send-email-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 (demeter.kernel.org [140.211.167.41]); Fri, 07 May 2010 09:38:03 +0000 (UTC) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index ae223d2..169f22c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -553,6 +553,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);