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 v12 04/17] Add a function make external buffer owner to query capability.
Date: Thu, 30 Sep 2010 22:04:21 +0800 [thread overview]
Message-ID: <70ab1be92cf869690d009c0f45ac8988bca60386.1285853725.git.xiaohui.xin@intel.com> (raw)
In-Reply-To: <1285855474-12110-1-git-send-email-xiaohui.xin@intel.com>
In-Reply-To: <59d8a50047ee01e26658fd676d26c0162b79e5fd.1285853725.git.xiaohui.xin@intel.com>
From: Xin Xiaohui <xiaohui.xin@intel.com>
The external buffer owner can use the functions to get
the capability of the underlying NIC driver.
Signed-off-by: Xin Xiaohui <xiaohui.xin@intel.com>
Signed-off-by: Zhao Yu <yzhaonew@gmail.com>
Reviewed-by: Jeff Dike <jdike@linux.intel.com>
---
include/linux/netdevice.h | 2 +
net/core/dev.c | 49 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 51 insertions(+), 0 deletions(-)
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h
index 24a31e7..27f5024 100644
--- a/include/linux/netdevice.h
+++ b/include/linux/netdevice.h
@@ -1608,6 +1608,8 @@ extern gro_result_t napi_frags_finish(struct napi_struct *napi,
gro_result_t ret);
extern struct sk_buff * napi_frags_skb(struct napi_struct *napi);
extern gro_result_t napi_gro_frags(struct napi_struct *napi);
+extern int netdev_mp_port_prep(struct net_device *dev,
+ struct mp_port *port);
static inline void napi_free_frags(struct napi_struct *napi)
{
diff --git a/net/core/dev.c b/net/core/dev.c
index 264137f..c11e32c 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -2468,6 +2468,55 @@ void netif_nit_deliver(struct sk_buff *skb)
rcu_read_unlock();
}
+/* To support meidate passthru(zero-copy) with NIC driver,
+ * we'd better query NIC driver for the capability it can
+ * provide, especially for packet split mode, now we only
+ * query for the header size, and the payload a descriptor
+ * may carry. If a driver does not use the API to export,
+ * then we may try to use a default value, currently,
+ * we use the default value from an IGB driver. Now,
+ * it's only called by mpassthru device.
+ */
+#if defined(CONFIG_MEDIATE_PASSTHRU) || defined(CONFIG_MEDIATE_PASSTHRU_MODULE)
+int netdev_mp_port_prep(struct net_device *dev,
+ struct mp_port *port)
+{
+ int rc;
+ int npages, data_len;
+ const struct net_device_ops *ops = dev->netdev_ops;
+
+ if (ops->ndo_mp_port_prep) {
+ rc = ops->ndo_mp_port_prep(dev, port);
+ if (rc)
+ return rc;
+ } else {
+ /* If the NIC driver did not report this,
+ * then we try to use default value.
+ */
+ port->hdr_len = 128;
+ port->data_len = 2048;
+ port->npages = 1;
+ }
+
+ if (port->hdr_len <= 0)
+ goto err;
+
+ npages = port->npages;
+ data_len = port->data_len;
+ if (npages <= 0 || npages > MAX_SKB_FRAGS ||
+ (data_len < PAGE_SIZE * (npages - 1) ||
+ data_len > PAGE_SIZE * npages))
+ goto err;
+
+ return 0;
+err:
+ dev_warn(&dev->dev, "invalid page constructor parameters\n");
+
+ return -EINVAL;
+}
+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-09-30 13:46 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-09-30 14:04 [PATCH v12 00/17] Provide a zero-copy method on KVM virtio-net xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 01/17] Add a new structure for skb buffer from external xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 02/17] Add a new struct for device to manipulate external buffer xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 03/17] Add a ndo_mp_port_prep pointer to net_device_ops xiaohui.xin
2010-09-30 14:04 ` xiaohui.xin [this message]
2010-09-30 14:04 ` [PATCH v12 05/17] Add a function to indicate if device use external buffer xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 06/17] Use callback to deal with skb_release_data() specially xiaohui.xin
2010-10-01 7:14 ` David Miller
2010-10-11 7:06 ` Xin, Xiaohui
2010-10-11 15:27 ` David Miller
2010-10-11 15:42 ` Eric Dumazet
2010-10-12 1:24 ` Xin, Xiaohui
2010-09-30 14:04 ` [PATCH v12 07/17]Modify netdev_alloc_page() to get external buffer xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 08/17] Modify netdev_free_page() to release " xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 09/17] Don't do skb recycle, if device use " xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 10/17] Add a hook to intercept external buffers from NIC driver xiaohui.xin
2010-09-30 14:22 ` Eric Dumazet
2010-10-11 7:06 ` Xin, Xiaohui
2010-09-30 14:04 ` [PATCH v12 11/17] Add header file for mp device xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 13/17] Add a kconfig entry and make entry " xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 12/17] Add mp(mediate passthru) device xiaohui.xin
2010-10-03 13:12 ` Michael S. Tsirkin
2010-10-18 8:30 ` Xin, Xiaohui
2010-09-30 14:04 ` [PATCH v12 14/17] Provides multiple submits and asynchronous notifications xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 15/17]An example how to modifiy NIC driver to use napi_gro_frags() interface xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 16/17]An example how to alloc user buffer based on " xiaohui.xin
2010-09-30 14:04 ` [PATCH v12 17/17]add two new ioctls for mp device xiaohui.xin
2010-10-01 0:00 ` [PATCH v12 00/17] Provide a zero-copy method on KVM virtio-net 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=70ab1be92cf869690d009c0f45ac8988bca60386.1285853725.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®