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: [PATCH v14 08/17] Modify netdev_free_page() to release external buffer
Date: Thu, 4 Nov 2010 17:05:04 +0800 [thread overview]
Message-ID: <897ced730f589c2f082bf2538795f3efc95d6e59.1288860477.git.xiaohui.xin@intel.com> (raw)
In-Reply-To: <1288861513-5707-1-git-send-email-xiaohui.xin@intel.com>
In-Reply-To: <fc6e95d63a2c62aaf77f8ded22fc43ccefcdbbff.1288860477.git.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 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)
{
--
1.7.3
next prev parent reply other threads:[~2010-11-04 8:44 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-04 9:04 [PATCH v14 00/17] Provide a zero-copy method on KVM virtio-net xiaohui.xin
2010-11-04 9:04 ` [PATCH v14 01/17] Add a new structure for skb buffer from external xiaohui.xin
2010-11-04 9:04 ` [PATCH v14 02/17] Add a new struct for device to manipulate external buffer xiaohui.xin
2010-11-04 9:04 ` [PATCH v14 03/17] Add a ndo_mp_port_prep pointer to net_device_ops xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 04/17] Add a function make external buffer owner to query capability xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 05/17] Add a function to indicate if device use external buffer xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 06/17] Use callback to deal with skb_release_data() specially xiaohui.xin
2010-11-04 9:04 ` Eric Dumazet
2010-11-04 9:07 ` Eric Dumazet
2010-11-08 8:03 ` xiaohui.xin
2010-11-08 8:24 ` Eric Dumazet
2010-11-08 8:39 ` Xin, Xiaohui
2010-11-04 9:05 ` [PATCH v14 07/17]Modify netdev_alloc_page() to get external buffer xiaohui.xin
2010-11-04 9:05 ` xiaohui.xin [this message]
2010-11-04 9:05 ` [PATCH v14 09/17] Don't do skb recycle, if device use " xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 10/17] If device is in zero-copy mode first, bonding will fail xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 11/17] Add a hook to intercept external buffers from NIC driver xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 12/17] Add header file for mp device xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 13/17] Add mp(mediate passthru) device xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 14/17] Add a kconfig entry and make entry for mp device xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 15/17]Provides multiple submits and asynchronous notifications xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 16/17] An example how to modifiy NIC driver to use napi_gro_frags() interface xiaohui.xin
2010-11-04 9:05 ` [PATCH v14 17/17] An example how to alloc user buffer based on " xiaohui.xin
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=897ced730f589c2f082bf2538795f3efc95d6e59.1288860477.git.xiaohui.xin@intel.com \
--to=xiaohui.xin@intel.com \
--cc=davem@davemloft.net \
--cc=herbert@gondor.apana.org.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox