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: [PATCH v15 11/17] Add a hook to intercept external buffers from NIC driver.
Date: Tue, 9 Nov 2010 17:03:16 +0800 [thread overview]
Message-ID: <5288ec35e729b69e9bfdc627abcecfef1ab2ec15.1289280886.git.xiaohui.xin@intel.com> (raw)
In-Reply-To: <1289293402-4791-1-git-send-email-xiaohui.xin@intel.com>
In-Reply-To: <fc6e95d63a2c62aaf77f8ded22fc43ccefcdbbff.1289280885.git.xiaohui.xin@intel.com>
From: Xin Xiaohui <xiaohui.xin@intel.com>
The hook is called in __netif_receive_skb().
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>
---
net/core/dev.c | 40 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/net/core/dev.c b/net/core/dev.c
index 84fbb83..bdad1c8 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2814,6 +2814,40 @@ int __skb_bond_should_drop(struct sk_buff *skb, struct net_device *master)
}
EXPORT_SYMBOL(__skb_bond_should_drop);
+#if defined(CONFIG_MEDIATE_PASSTHRU) || defined(CONFIG_MEDIATE_PASSTHRU_MODULE)
+/* Add a hook to intercept mediate passthru(zero-copy) packets,
+ * and insert it to the socket queue owned by mp_port specially.
+ */
+static inline struct sk_buff *handle_mpassthru(struct sk_buff *skb,
+ struct packet_type **pt_prev,
+ int *ret,
+ struct net_device *orig_dev)
+{
+ struct mp_port *mp_port = NULL;
+ struct sock *sk = NULL;
+
+ if (!dev_is_mpassthru(skb->dev) && !dev_is_mpassthru(orig_dev))
+ return skb;
+ if (dev_is_mpassthru(skb->dev))
+ mp_port = skb->dev->mp_port;
+ else if (orig_dev->master == skb->dev && dev_is_mpassthru(orig_dev))
+ mp_port = orig_dev->mp_port;
+
+ if (*pt_prev) {
+ *ret = deliver_skb(skb, *pt_prev, orig_dev);
+ *pt_prev = NULL;
+ }
+
+ sk = mp_port->sock->sk;
+ skb_queue_tail(&sk->sk_receive_queue, skb);
+ sk->sk_state_change(sk);
+
+ return NULL;
+}
+#else
+#define handle_mpassthru(skb, pt_prev, ret, orig_dev) (skb)
+#endif
+
static int __netif_receive_skb(struct sk_buff *skb)
{
struct packet_type *ptype, *pt_prev;
@@ -2891,6 +2925,11 @@ static int __netif_receive_skb(struct sk_buff *skb)
ncls:
#endif
+ /* To intercept mediate passthru(zero-copy) packets here */
+ skb = handle_mpassthru(skb, &pt_prev, &ret, orig_dev);
+ if (!skb)
+ goto out;
+
/* Handle special case of bridge or macvlan */
rx_handler = rcu_dereference(skb->dev->rx_handler);
if (rx_handler) {
@@ -2983,6 +3022,7 @@ err:
EXPORT_SYMBOL(netdev_mp_port_prep);
#endif
+
/**
* netif_receive_skb - process receive buffer from network
* @skb: buffer to process
--
1.7.3
next prev parent reply other threads:[~2010-11-09 8:43 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 9:03 [PATCH v15 00/17] Provide a zero-copy method on KVM virtio-net xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 01/17] Add a new structure for skb buffer from external xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 02/17]Add a new struct for device to manipulate external buffer xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 03/17]Add a ndo_mp_port_prep pointer to net_device_ops xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 04/17]Add a function make external buffer owner to query capability xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 05/17] Add a function to indicate if device use external buffer xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 06/17] Use callback to deal with skb_release_data() specially xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 07/17]Modify netdev_alloc_page() to get external buffer xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 08/17]Modify netdev_free_page() to release " xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 09/17] Don't do skb recycle, if device use " xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 10/17]If device is in zero-copy mode first, bonding will fail xiaohui.xin
2010-11-09 9:03 ` xiaohui.xin [this message]
2010-11-09 9:03 ` [PATCH v15 12/17] Add header file for mp device xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 13/17] Add mp(mediate passthru) device xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 14/17]Add a kconfig entry and make entry for mp device xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 15/17] Provides multiple submits and asynchronous notifications xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 16/17] An example how to modifiy NIC driver to use napi_gro_frags() interface xiaohui.xin
2010-11-09 9:03 ` [PATCH v15 17/17] An example how to alloc user buffer based on " xiaohui.xin
2010-11-09 17:15 ` [PATCH v15 00/17] Provide a zero-copy method on KVM virtio-net David Miller
2010-11-10 9:23 ` xiaohui.xin
2010-11-10 17:46 ` David Miller
2010-11-11 8:28 ` Xin, Xiaohui
2010-11-17 8:09 ` 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=5288ec35e729b69e9bfdc627abcecfef1ab2ec15.1289280886.git.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: 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
all inboxes | Powered by JetHome®