Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757242Ab0G2LFc (ORCPT ); Thu, 29 Jul 2010 07:05:32 -0400 Received: from mga11.intel.com ([192.55.52.93]:58755 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756915Ab0G2LB2 (ORCPT ); Thu, 29 Jul 2010 07:01:28 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.55,279,1278313200"; d="scan'208";a="590877561" 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: [RFC PATCH v8 08/16] Modify netdev_free_page() to release external buffer Date: Thu, 29 Jul 2010 19:14:40 +0800 Message-Id: <1280402088-5849-9-git-send-email-xiaohui.xin@intel.com> X-Mailer: git-send-email 1.5.4.4 In-Reply-To: <1280402088-5849-8-git-send-email-xiaohui.xin@intel.com> References: <1280402088-5849-1-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-2-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-3-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-4-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-5-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-6-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-7-git-send-email-xiaohui.xin@intel.com> <1280402088-5849-8-git-send-email-xiaohui.xin@intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2079 Lines: 72 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/