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 <xiaohui.xin@intel.com> Subject: [RFC PATCH v9 08/16] Modify netdev_free_page() to release external buffer Date: Fri, 6 Aug 2010 17:23:36 +0800 [thread overview] Message-ID: <1281086624-5765-9-git-send-email-xiaohui.xin@intel.com> (raw) In-Reply-To: <1281086624-5765-8-git-send-email-xiaohui.xin@intel.com> From: Xin Xiaohui <xiaohui.xin@intel.com> Currently, it can get external buffers from mp device. Signed-off-by: Xin Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Zhao Yu <yzhao81new@gmail.com> Reviewed-by: Jeff Dike <jdike@linux.intel.com> --- 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
WARNING: multiple messages have this Message-ID (diff)
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 <xiaohui.xin@intel.com> Subject: [RFC PATCH v9 08/16] Modify netdev_free_page() to release external buffer Date: Fri, 6 Aug 2010 17:23:36 +0800 [thread overview] Message-ID: <1281086624-5765-9-git-send-email-xiaohui.xin@intel.com> (raw) In-Reply-To: <1281086624-5765-8-git-send-email-xiaohui.xin@intel.com> From: Xin Xiaohui <xiaohui.xin@intel.com> Currently, it can get external buffers from mp device. Signed-off-by: Xin Xiaohui <xiaohui.xin@intel.com> Signed-off-by: Zhao Yu <yzhao81new@gmail.com> Reviewed-by: Jeff Dike <jdike@linux.intel.com> --- 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
next prev parent reply other threads:[~2010-08-06 9:09 UTC|newest] Thread overview: 64+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-08-06 9:23 [RFC PATCH v9 00/16] Provide a zero-copy method on KVM virtio-net xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 01/16] Add a new structure for skb buffer from external xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 02/16] Add a new struct for device to manipulate external buffer xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 03/16] Add a ndo_mp_port_prep func to net_device_ops xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 04/16] Add a function make external buffer owner to query capability xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 05/16] Add a function to indicate if device use external buffer xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 06/16] Use callback to deal with skb_release_data() specially xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 07/16] Modify netdev_alloc_page() to get external buffer xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin [this message] 2010-08-06 9:23 ` [RFC PATCH v9 08/16] Modify netdev_free_page() to release " xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 09/16] Don't do skb recycle, if device use " xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 10/16] Add a hook to intercept external buffers from NIC driver xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 11/16] Add header file for mp device xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 13/16] Add a kconfig entry and make entry " xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 12/16] Add mp(mediate passthru) device xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 14/16] Provides multiple submits and asynchronous notifications xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 15/16] An example how to modifiy NIC driver to use napi_gro_frags() interface xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-08-06 9:23 ` [RFC PATCH v9 16/16] An example how to alloc user buffer based on " xiaohui.xin 2010-08-06 9:23 ` xiaohui.xin 2010-09-06 11:11 ` [RFC PATCH v9 12/16] Add mp(mediate passthru) device Michael S. Tsirkin 2010-09-10 13:40 ` Xin, Xiaohui 2010-09-11 7:41 ` Xin, Xiaohui 2010-09-12 13:37 ` Michael S. Tsirkin 2010-09-15 3:13 ` Xin, Xiaohui 2010-09-15 11:28 ` Michael S. Tsirkin 2010-09-17 3:16 ` Xin, Xiaohui 2010-09-20 8:08 ` xiaohui.xin 2010-09-20 11:36 ` Michael S. Tsirkin 2010-09-21 1:39 ` Xin, Xiaohui 2010-09-21 13:14 ` Michael S. Tsirkin 2010-09-22 11:41 ` Xin, Xiaohui 2010-09-22 11:55 ` Michael S. Tsirkin 2010-09-23 12:56 ` Xin, Xiaohui 2010-09-26 11:50 ` Michael S. Tsirkin 2010-09-27 0:42 ` Xin, Xiaohui 2010-09-11 9:42 ` Xin, Xiaohui 2010-08-11 1:23 ` [RFC PATCH v9 00/16] Provide a zero-copy method on KVM virtio-net Shirley Ma 2010-08-11 1:23 ` Shirley Ma 2010-08-11 1:43 ` Shirley Ma 2010-08-11 1:43 ` Shirley Ma 2010-08-11 6:01 ` Shirley Ma 2010-08-11 6:01 ` Shirley Ma 2010-08-11 6:55 ` Shirley Ma 2010-08-11 6:55 ` Shirley Ma 2010-09-03 10:52 ` Michael S. Tsirkin 2010-09-13 18:48 ` Shirley Ma 2010-09-13 21:35 ` Shirley Ma 2010-09-03 10:14 ` Michael S. Tsirkin 2010-09-03 20:29 ` Sridhar Samudrala
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1281086624-5765-9-git-send-email-xiaohui.xin@intel.com \ --to=xiaohui.xin@intel.com \ --cc=davem@davemloft.net \ --cc=herbert@gondor.hengli.com.au \ --cc=jdike@linux.intel.com \ --cc=kvm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@elte.hu \ --cc=mst@redhat.com \ --cc=netdev@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.