From patchwork Thu Nov 4 09:05:02 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 301422 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 oA48m6DK010326 for ; Thu, 4 Nov 2010 08:48:08 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755333Ab0KDIsC (ORCPT ); Thu, 4 Nov 2010 04:48:02 -0400 Received: from mga02.intel.com ([134.134.136.20]:34881 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752690Ab0KDIoF (ORCPT ); Thu, 4 Nov 2010 04:44:05 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 04 Nov 2010 01:44:05 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.58,294,1286175600"; d="scan'208";a="570251184" Received: from gw-vmm.sh.intel.com (HELO localhost.localdomain.org) ([10.239.48.110]) by orsmga002.jf.intel.com with ESMTP; 04 Nov 2010 01:44:03 -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 v14 06/17] Use callback to deal with skb_release_data() specially. Date: Thu, 4 Nov 2010 17:05:02 +0800 Message-Id: X-Mailer: git-send-email 1.7.3 In-Reply-To: <1288861513-5707-1-git-send-email-xiaohui.xin@intel.com> References: <1288861513-5707-1-git-send-email-xiaohui.xin@intel.com> In-Reply-To: References: 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, 04 Nov 2010 08:48:08 +0000 (UTC) diff --git a/net/core/skbuff.c b/net/core/skbuff.c index c83b421..5e6d69c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -210,6 +210,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask, /* make sure we initialize shinfo sequentially */ shinfo = skb_shinfo(skb); + shinfo->destructor_arg = NULL; memset(shinfo, 0, offsetof(struct skb_shared_info, dataref)); atomic_set(&shinfo->dataref, 1); @@ -343,6 +344,13 @@ static void skb_release_data(struct sk_buff *skb) if (skb_has_frags(skb)) skb_drop_fraglist(skb); + if (skb->dev && dev_is_mpassthru(skb->dev)) { + struct skb_ext_page *ext_page = + skb_shinfo(skb)->destructor_arg; + if (ext_page && ext_page->dtor) + ext_page->dtor(ext_page); + } + kfree(skb->head); } }