From patchwork Fri Oct 15 09:12:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 255681 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 o9F8uOoe004100 for ; Fri, 15 Oct 2010 08:56:26 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754807Ab0JOIzn (ORCPT ); Fri, 15 Oct 2010 04:55:43 -0400 Received: from mga01.intel.com ([192.55.52.88]:60392 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754496Ab0JOIw6 (ORCPT ); Fri, 15 Oct 2010 04:52:58 -0400 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 15 Oct 2010 01:52:58 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.57,335,1283756400"; d="scan'208";a="616995413" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.36.73]) by fmsmga002.fm.intel.com with ESMTP; 15 Oct 2010 01:52:56 -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 v13 08/16] Modify netdev_free_page() to release external buffer Date: Fri, 15 Oct 2010 17:12:09 +0800 Message-Id: <68e965e8500ffd954f1cbf373e950809025b7634.1287132437.git.xiaohui.xin@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1287133937-5538-1-git-send-email-xiaohui.xin@intel.com> References: <1287133937-5538-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]); Fri, 15 Oct 2010 08:56:26 +0000 (UTC) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 696e690..8cfde3e 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1585,9 +1585,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 f39d372..02439e0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -299,6 +299,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) {