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 v8 06/16] Use callback to deal with skb_release_data() specially.
Date: Thu, 29 Jul 2010 19:14:38 +0800 [thread overview]
Message-ID: <1280402088-5849-7-git-send-email-xiaohui.xin@intel.com> (raw)
In-Reply-To: <1280402088-5849-6-git-send-email-xiaohui.xin@intel.com>
From: Xin Xiaohui <xiaohui.xin@intel.com>
If buffer is external, then use the callback to destruct
buffers.
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 | 3 ++-
net/core/skbuff.c | 8 ++++++++
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h
index 74af06c..ab29675 100644
--- a/include/linux/skbuff.h
+++ b/include/linux/skbuff.h
@@ -197,10 +197,11 @@ struct skb_shared_info {
union skb_shared_tx tx_flags;
struct sk_buff *frag_list;
struct skb_shared_hwtstamps hwtstamps;
- skb_frag_t frags[MAX_SKB_FRAGS];
/* Intermediate layers must ensure that destructor_arg
* remains valid until skb destructor */
void * destructor_arg;
+
+ skb_frag_t frags[MAX_SKB_FRAGS];
};
/* The structure is for a skb which pages may point to
diff --git a/net/core/skbuff.c b/net/core/skbuff.c
index 93c4e06..117d82b 100644
--- a/net/core/skbuff.c
+++ b/net/core/skbuff.c
@@ -217,6 +217,7 @@ struct sk_buff *__alloc_skb(unsigned int size, gfp_t gfp_mask,
shinfo->gso_type = 0;
shinfo->ip6_frag_id = 0;
shinfo->tx_flags.flags = 0;
+ shinfo->destructor_arg = NULL;
skb_frag_list_init(skb);
memset(&shinfo->hwtstamps, 0, sizeof(shinfo->hwtstamps));
@@ -350,6 +351,13 @@ static void skb_release_data(struct sk_buff *skb)
if (skb_has_frags(skb))
skb_drop_fraglist(skb);
+ if (skb->dev && dev_is_mpassthru(skb->dev)) {
+ struct skb_ext_page *ext_page =
+ skb_shinfo(skb)->destructor_arg;
+ if (ext_page && ext_page->dtor)
+ ext_page->dtor(ext_page);
+ }
+
kfree(skb->head);
}
}
--
1.5.4.4
next prev parent reply other threads:[~2010-07-29 11:14 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-07-29 11:14 [RFC PATCH v8 00/16] Provide a zero-copy method on KVM virtio-net xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 01/16] Add a new structure for skb buffer from external xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 02/16] Add a new struct for device to manipulate external buffer xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 03/16] Add a ndo_mp_port_prep func to net_device_ops xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 04/16] Add a function make external buffer owner to query capability xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 05/16] Add a function to indicate if device use external buffer xiaohui.xin
2010-07-29 11:14 ` xiaohui.xin [this message]
2010-07-29 11:14 ` [RFC PATCH v8 07/16] Modify netdev_alloc_page() to get " xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 08/16] Modify netdev_free_page() to release " xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 09/16] Don't do skb recycle, if device use " xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 10/16] Add a hook to intercept external buffers from NIC driver xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 11/16] Add header file for mp device xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 13/16] Add a kconfig entry and make entry " xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 12/16] Add mp(mediate passthru) device xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 14/16] Provides multiple submits and asynchronous notifications xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 15/16] An example how to modifiy NIC driver to use napi_gro_frags() interface xiaohui.xin
2010-07-29 11:14 ` [RFC PATCH v8 16/16] An example how to alloc user buffer based on " xiaohui.xin
2010-07-29 22:31 ` [RFC PATCH v8 00/16] Provide a zero-copy method on KVM virtio-net Shirley Ma
2010-07-30 5:02 ` Avi Kivity
2010-07-30 15:46 ` Shirley Ma
2010-08-01 8:18 ` Avi Kivity
2010-08-02 16:01 ` Shirley Ma
2010-08-02 16:11 ` Avi Kivity
2010-08-02 16:25 ` Shirley Ma
2010-08-02 16:32 ` Avi Kivity
2010-08-11 3:28 ` Shirley Ma
2010-07-30 8:53 ` Xin, Xiaohui
2010-07-30 15:51 ` Shirley Ma
2010-07-31 9:30 ` Arnd Bergmann
2010-08-04 2:06 ` Dong, Eddie
2010-08-04 8:56 ` Arnd Bergmann
2010-08-04 17:09 ` Shirley Ma
2010-08-01 8:31 ` Michael S. Tsirkin
2010-08-02 16:04 ` Shirley Ma
2010-08-02 16:10 ` Shirley Ma
2010-08-03 8:48 ` Xin, Xiaohui
2010-08-03 15:50 ` Shirley Ma
2010-08-05 8:52 ` Xin, Xiaohui
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=1280402088-5849-7-git-send-email-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;
as well as URLs for NNTP newsgroup(s).