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 04/16] Add a function make external buffer owner to query capability. Date: Fri, 6 Aug 2010 17:23:32 +0800 [thread overview] Message-ID: <1281086624-5765-5-git-send-email-xiaohui.xin@intel.com> (raw) In-Reply-To: <1281086624-5765-4-git-send-email-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 aba0308..5f192de 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1599,6 +1599,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 mpassthru_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..636f11b 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 mpassthru_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.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 04/16] Add a function make external buffer owner to query capability. Date: Fri, 6 Aug 2010 17:23:32 +0800 [thread overview] Message-ID: <1281086624-5765-5-git-send-email-xiaohui.xin@intel.com> (raw) In-Reply-To: <1281086624-5765-4-git-send-email-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 aba0308..5f192de 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -1599,6 +1599,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 mpassthru_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..636f11b 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 mpassthru_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.5.4.4
next prev parent reply other threads:[~2010-08-06 9:13 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 ` xiaohui.xin [this message] 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 ` [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 ` [RFC PATCH v9 08/16] Modify netdev_free_page() to release " xiaohui.xin 2010-08-06 9:23 ` 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-5-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.