From patchwork Tue Nov 9 09:03:13 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Xin, Xiaohui" X-Patchwork-Id: 310582 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 oA98kM3v015615 for ; Tue, 9 Nov 2010 08:46:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754609Ab0KIIop (ORCPT ); Tue, 9 Nov 2010 03:44:45 -0500 Received: from mga11.intel.com ([192.55.52.93]:40024 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754142Ab0KIIlk (ORCPT ); Tue, 9 Nov 2010 03:41:40 -0500 Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 09 Nov 2010 00:41:39 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,174,1288594800"; d="scan'208";a="624917743" Received: from unknown (HELO localhost.localdomain.sh.intel.com) ([10.239.36.134]) by fmsmga002.fm.intel.com with ESMTP; 09 Nov 2010 00:41:38 -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.hengli.com.au, jdike@linux.intel.com Cc: Xin Xiaohui Subject: [PATCH v15 08/17]Modify netdev_free_page() to release external buffer Date: Tue, 9 Nov 2010 17:03:13 +0800 Message-Id: <0f65152a86d2c0f90945cb8fd67a2eb330728229.1289280886.git.xiaohui.xin@intel.com> X-Mailer: git-send-email 1.7.3 In-Reply-To: <1289293402-4791-1-git-send-email-xiaohui.xin@intel.com> References: <1289293402-4791-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]); Tue, 09 Nov 2010 08:46:23 +0000 (UTC) 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 a1018bd..3d81113 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) {