Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/4626/?format=api
{ "id": 4626, "url": "http://patches.dpdk.org/api/patches/4626/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1430834880-14482-1-git-send-email-pablo.de.lara.guarch@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1430834880-14482-1-git-send-email-pablo.de.lara.guarch@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1430834880-14482-1-git-send-email-pablo.de.lara.guarch@intel.com", "date": "2015-05-05T14:08:00", "name": "[dpdk-dev,v3] kni: fix compilation issue in KNI vhost on kernel 3.19/4.0", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "23f7b2f1be8a81848251acfd55a3cff281eabf4d", "submitter": { "id": 9, "url": "http://patches.dpdk.org/api/people/9/?format=api", "name": "De Lara Guarch, Pablo", "email": "pablo.de.lara.guarch@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1430834880-14482-1-git-send-email-pablo.de.lara.guarch@intel.com/mbox/", "series": [], "comments": "http://patches.dpdk.org/api/patches/4626/comments/", "check": "pending", "checks": "http://patches.dpdk.org/api/patches/4626/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [IPv6:::1])\n\tby dpdk.org (Postfix) with ESMTP id 50B112A07;\n\tTue, 5 May 2015 16:08:05 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id 3EC74FE5\n\tfor <dev@dpdk.org>; Tue, 5 May 2015 16:08:03 +0200 (CEST)", "from orsmga002.jf.intel.com ([10.7.209.21])\n\tby orsmga101.jf.intel.com with ESMTP; 05 May 2015 07:08:03 -0700", "from irvmail001.ir.intel.com ([163.33.26.43])\n\tby orsmga002.jf.intel.com with ESMTP; 05 May 2015 07:08:01 -0700", "from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com\n\t[10.237.217.46])\n\tby irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id\n\tt45E80ch013995 for <dev@dpdk.org>; Tue, 5 May 2015 15:08:00 +0100", "from sivswdev02.ir.intel.com (localhost [127.0.0.1])\n\tby sivswdev02.ir.intel.com with ESMTP id t45E80RI014518\n\tfor <dev@dpdk.org>; Tue, 5 May 2015 15:08:00 +0100", "(from pdelarax@localhost)\n\tby sivswdev02.ir.intel.com with id t45E80HG014514\n\tfor dev@dpdk.org; Tue, 5 May 2015 15:08:00 +0100" ], "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.13,372,1427785200\"; d=\"scan'208\";a=\"724000344\"", "From": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "To": "dev@dpdk.org", "Date": "Tue, 5 May 2015 15:08:00 +0100", "Message-Id": "<1430834880-14482-1-git-send-email-pablo.de.lara.guarch@intel.com>", "X-Mailer": "git-send-email 1.7.4.1", "In-Reply-To": "<1430829319-22242-1-git-send-email-pablo.de.lara.guarch@intel.com>", "References": "<1430829319-22242-1-git-send-email-pablo.de.lara.guarch@intel.com>", "Subject": "[dpdk-dev] [PATCH v3] kni: fix compilation issue in KNI vhost on\n\tkernel 3.19/4.0", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "patches and discussions about DPDK <dev.dpdk.org>", "List-Unsubscribe": "<http://dpdk.org/ml/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://dpdk.org/ml/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<http://dpdk.org/ml/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "Due to commit c0371da6 in kernel 3.19, which removed msg_iov\nand msg_iovlen from struct msghdr, DPDK would not build.\nAlso, functions memcpy_toiovecend and memcpy_fromiovecend\nwere removed in commits ba7438ae and 57dd8a07, being substituted by\ncopy_from_iter and copy_to_iter.\n\nThis patch makes use of struct iov_iter, which has references\nto msg_iov and msg_iovln, and makes use of copy_from_iter\nand copy_to_iter.\n\nChanges in v2:\n- Replaced functions memcpy_toiovecend and memcpy_fromiovecend\n with copy_from_iter and copy_to_iter\n\nChanges in v3:\n- Fixed variable names\n- Add missing checks\n\nReported-by: Thomas Monjalon <thomas.monjalon@6wind.com>\nSigned-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>\n---\n lib/librte_eal/linuxapp/kni/compat.h | 4 +++\n lib/librte_eal/linuxapp/kni/kni_vhost.c | 37 ++++++++++++++++++++++++------\n 2 files changed, 33 insertions(+), 8 deletions(-)", "diff": "diff --git a/lib/librte_eal/linuxapp/kni/compat.h b/lib/librte_eal/linuxapp/kni/compat.h\nindex 1313523..1ad22ba 100644\n--- a/lib/librte_eal/linuxapp/kni/compat.h\n+++ b/lib/librte_eal/linuxapp/kni/compat.h\n@@ -19,3 +19,7 @@\n #define sk_sleep(s) (s)->sk_sleep\n \n #endif /* < 2.6.35 */\n+\n+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0)\n+#define HAVE_IOV_ITER_MSGHDR\n+#endif\ndiff --git a/lib/librte_eal/linuxapp/kni/kni_vhost.c b/lib/librte_eal/linuxapp/kni/kni_vhost.c\nindex 7141f83..83d3351 100644\n--- a/lib/librte_eal/linuxapp/kni/kni_vhost.c\n+++ b/lib/librte_eal/linuxapp/kni/kni_vhost.c\n@@ -76,7 +76,7 @@ static struct proto kni_raw_proto = {\n };\n \n static inline int\n-kni_vhost_net_tx(struct kni_dev *kni, struct iovec *iov,\n+kni_vhost_net_tx(struct kni_dev *kni, struct msghdr *m,\n \t\t unsigned offset, unsigned len)\n {\n \tstruct rte_kni_mbuf *pkt_kva = NULL;\n@@ -84,7 +84,11 @@ kni_vhost_net_tx(struct kni_dev *kni, struct iovec *iov,\n \tint ret;\n \n \tKNI_DBG_TX(\"tx offset=%d, len=%d, iovlen=%d\\n\",\n-\t\t offset, len, (int)iov->iov_len);\n+#ifdef HAVE_IOV_ITER_MSGHDR\n+\t\t offset, len, (int)m->msg_iter.iov->iov_len);\n+#else\n+\t\t offset, len, (int)m->msg_iov->iov_len);\n+#endif\n \n \t/**\n \t * Check if it has at least one free entry in tx_q and\n@@ -108,7 +112,12 @@ kni_vhost_net_tx(struct kni_dev *kni, struct iovec *iov,\n \t\tdata_kva = pkt_kva->buf_addr + pkt_kva->data_off\n \t\t - kni->mbuf_va + kni->mbuf_kva;\n \n-\t\tmemcpy_fromiovecend(data_kva, iov, offset, len);\n+#ifdef HAVE_IOV_ITER_MSGHDR\n+\t\tcopy_from_iter(data_kva, len, &m->msg_iter);\n+#else\n+\t\tmemcpy_fromiovecend(data_kva, m->msg_iov, offset, len);\n+#endif\n+\n \t\tif (unlikely(len < ETH_ZLEN)) {\n \t\t\tmemset(data_kva + len, 0, ETH_ZLEN - len);\n \t\t\tlen = ETH_ZLEN;\n@@ -143,7 +152,7 @@ drop:\n }\n \n static inline int\n-kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov,\n+kni_vhost_net_rx(struct kni_dev *kni, struct msghdr *m,\n \t\t unsigned offset, unsigned len)\n {\n \tuint32_t pkt_len;\n@@ -177,10 +186,18 @@ kni_vhost_net_rx(struct kni_dev *kni, struct iovec *iov,\n \t\tgoto drop;\n \n \tKNI_DBG_RX(\"rx offset=%d, len=%d, pkt_len=%d, iovlen=%d\\n\",\n-\t\t offset, len, pkt_len, (int)iov->iov_len);\n+#ifdef HAVE_IOV_ITER_MSGHDR\n+\t\t offset, len, pkt_len, (int)m->msg_iter.iov->iov_len);\n+#else\n+\t\t offset, len, pkt_len, (int)m->msg_iov->iov_len);\n+#endif\n \n \tdata_kva = kva->buf_addr + kva->data_off - kni->mbuf_va + kni->mbuf_kva;\n-\tif (unlikely(memcpy_toiovecend(iov, data_kva, offset, pkt_len)))\n+#ifdef HAVE_IOV_ITER_MSGHDR\n+\tif (unlikely(copy_to_iter(data_kva, pkt_len, &m->msg_iter)))\n+#else\n+\tif (unlikely(memcpy_toiovecend(m->msg_iov, data_kva, offset, pkt_len)))\n+#endif\n \t\tgoto drop;\n \n \t/* Update statistics */\n@@ -348,7 +365,11 @@ kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,\n \t\treturn 0;\n \n \tKNI_DBG_TX(\"kni_sndmsg len %ld, flags 0x%08x, nb_iov %d\\n\",\n+#ifdef HAVE_IOV_ITER_MSGHDR\n+\t\t len, q->flags, (int)m->msg_iter.iov->iov_len);\n+#else\n \t\t len, q->flags, (int)m->msg_iovlen);\n+#endif\n \n #ifdef RTE_KNI_VHOST_VNET_HDR_EN\n \tif (likely(q->flags & IFF_VNET_HDR)) {\n@@ -362,7 +383,7 @@ kni_sock_sndmsg(struct kiocb *iocb, struct socket *sock,\n \tif (unlikely(len < ETH_HLEN + q->vnet_hdr_sz))\n \t\treturn -EINVAL;\n \n-\treturn kni_vhost_net_tx(q->kni, m->msg_iov, vnet_hdr_len, len);\n+\treturn kni_vhost_net_tx(q->kni, m, vnet_hdr_len, len);\n }\n \n static int\n@@ -391,7 +412,7 @@ kni_sock_rcvmsg(struct kiocb *iocb, struct socket *sock,\n #endif\n \n \tif (unlikely(0 == (pkt_len = kni_vhost_net_rx(q->kni,\n-\t\tm->msg_iov, vnet_hdr_len, len))))\n+\t\tm, vnet_hdr_len, len))))\n \t\treturn 0;\n \n #ifdef RTE_KNI_VHOST_VNET_HDR_EN\n", "prefixes": [ "dpdk-dev", "v3" ] }