From patchwork Wed Dec 1 08:08:19 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 73743 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D185AB708B for ; Wed, 1 Dec 2010 18:49:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753770Ab0LAHqi (ORCPT ); Wed, 1 Dec 2010 02:46:38 -0500 Received: from mga02.intel.com ([134.134.136.20]:19205 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753689Ab0LAHqg (ORCPT ); Wed, 1 Dec 2010 02:46:36 -0500 Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga101.jf.intel.com with ESMTP; 30 Nov 2010 23:46:35 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,282,1288594800"; d="scan'208";a="682672359" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.36.138]) by orsmga001.jf.intel.com with ESMTP; 30 Nov 2010 23:46:34 -0800 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.apana.org.au, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [PATCH v16 08/17]Modify netdev_free_page() to release external buffer Date: Wed, 1 Dec 2010 16:08:19 +0800 Message-Id: <70ab1b88cfa02f10a66896e5869a75183d945373.1291187695.git.xiaohui.xin@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: References: In-Reply-To: References: Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 6e1e991..6309ce6 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1586,9 +1586,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 b9858c7..d3ece5c 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -298,6 +298,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) {