From mboxrd@z Thu Jan 1 00:00:00 1970 From: xiaohui.xin@intel.com Subject: [RFC PATCH v10 08/16] Modify netdev_free_page() to release external buffer Date: Sat, 11 Sep 2010 17:53:01 +0800 Message-ID: <1284198789-5358-9-git-send-email-xiaohui.xin@intel.com> References: <1284198789-5358-1-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-2-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-3-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-4-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-5-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-6-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-7-git-send-email-xiaohui.xin@intel.com> <1284198789-5358-8-git-send-email-xiaohui.xin@intel.com> Cc: Xin Xiaohui 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 Return-path: Received: from mga11.intel.com ([192.55.52.93]:50447 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752181Ab0IKJgw (ORCPT ); Sat, 11 Sep 2010 05:36:52 -0400 In-Reply-To: <1284198789-5358-8-git-send-email-xiaohui.xin@intel.com> Sender: netdev-owner@vger.kernel.org List-ID: From: Xin Xiaohui Currently, it can get external buffers from mp device. Signed-off-by: Xin Xiaohui Signed-off-by: Zhao Yu Reviewed-by: Jeff Dike --- include/linux/skbuff.h | 4 +++- net/core/skbuff.c | 24 ++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletions(-) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index ab29675..3d7f70e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1512,9 +1512,11 @@ static inline struct page *netdev_alloc_page(struct net_device *dev) return __netdev_alloc_page(dev, GFP_ATOMIC); } +extern void __netdev_free_page(struct net_device *dev, struct page *page); + static inline void netdev_free_page(struct net_device *dev, struct page *page) { - __free_page(page); + __netdev_free_page(dev, page); } /** diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 1a61e2b..bbf4707 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -306,6 +306,30 @@ struct page *__netdev_alloc_page(struct net_device *dev, gfp_t gfp_mask) } EXPORT_SYMBOL(__netdev_alloc_page); +void netdev_free_ext_page(struct net_device *dev, struct page *page) +{ + struct skb_ext_page *ext_page = NULL; + if (dev_is_mpassthru(dev) && dev->mp_port->hash) { + ext_page = dev->mp_port->hash(dev, page); + if (ext_page) + ext_page->dtor(ext_page); + else + __free_page(page); + } +} +EXPORT_SYMBOL(netdev_free_ext_page); + +void __netdev_free_page(struct net_device *dev, struct page *page) +{ + if (dev_is_mpassthru(dev)) { + netdev_free_ext_page(dev, page); + return; + } + + __free_page(page); +} +EXPORT_SYMBOL(__netdev_free_page); + void skb_add_rx_frag(struct sk_buff *skb, int i, struct page *page, int off, int size) { -- 1.5.4.4