Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/63049/?format=api
{ "id": 63049, "url": "http://patches.dpdk.org/api/patches/63049/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20191115170752.9488-2-vattunuru@marvell.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": "<20191115170752.9488-2-vattunuru@marvell.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20191115170752.9488-2-vattunuru@marvell.com", "date": "2019-11-15T17:07:51", "name": "[v14,1/2] kni: support IOVA mode in kernel module", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bba1b885cc2334d7406bba98070c40258cb60bbd", "submitter": { "id": 1277, "url": "http://patches.dpdk.org/api/people/1277/?format=api", "name": "Vamsi Krishna Attunuru", "email": "vattunuru@marvell.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20191115170752.9488-2-vattunuru@marvell.com/mbox/", "series": [ { "id": 7480, "url": "http://patches.dpdk.org/api/series/7480/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=7480", "date": "2019-11-15T17:07:50", "name": "kni: support IOVA mode", "version": 14, "mbox": "http://patches.dpdk.org/series/7480/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/63049/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/63049/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from dpdk.org (dpdk.org [92.243.14.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 656F2A04CC;\n\tFri, 15 Nov 2019 18:08:16 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 37A6D2F4F;\n\tFri, 15 Nov 2019 18:08:16 +0100 (CET)", "from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com\n [67.231.156.173]) by dpdk.org (Postfix) with ESMTP id C93522C27\n for <dev@dpdk.org>; Fri, 15 Nov 2019 18:08:14 +0100 (CET)", "from pps.filterd (m0045851.ppops.net [127.0.0.1])\n by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id\n xAFH5Qci004450; Fri, 15 Nov 2019 09:08:14 -0800", "from sc-exch04.marvell.com ([199.233.58.184])\n by mx0b-0016f401.pphosted.com with ESMTP id 2w8whr0uaw-2\n (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT);\n Fri, 15 Nov 2019 09:08:13 -0800", "from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH04.marvell.com\n (10.93.176.84) with Microsoft SMTP Server (TLS) id 15.0.1367.3; Fri, 15 Nov\n 2019 09:08:11 -0800", "from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com\n (10.93.176.81) with Microsoft SMTP Server id 15.0.1367.3 via Frontend\n Transport; Fri, 15 Nov 2019 09:08:11 -0800", "from hyd1vattunuru-dt.caveonetworks.com (unknown [10.29.52.72])\n by maili.marvell.com (Postfix) with ESMTP id 3566F3F7040;\n Fri, 15 Nov 2019 09:08:07 -0800 (PST)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;\n h=from : to : cc :\n subject : date : message-id : in-reply-to : references : mime-version :\n content-type; s=pfpt0818; bh=e8ErPZUAl6k+2d2fLoVPnE/8YHRpo/Y4I+/guIdBoD8=;\n b=YvrEoNmQck5KNghUx9uoOPRymHI1H1jwQ5OQ5IFpbyCpIGOkAG9wyqATFCOm63p4fcmO\n m6+9C59BqNWCr9xDIN6+++0tP2YcVlS0njDE72psIVSTPR/ZYvj51ZGsQNYIAARf7hyT\n 3rz2pcLb0DwMyQWiElbqK2pD1gWud6u5mYkXU8jDTxL6UyXJOMtmxtlohTSibaSCOKzj\n IARoKBVz2NjL8+LiJhaKtCxagJv+5etfcNj03MD3AUxJS9QRpinROa+GWeJ81o8uewMq\n Yh9KIOY3m1D+E3gx/2Hrmd1MQAAQ6fAQ/Nbmb2cMktZJ7L5YXTYYSicgRmYKnMtdsRVo DQ==", "From": "<vattunuru@marvell.com>", "To": "<dev@dpdk.org>", "CC": "<thomas@monjalon.net>, <jerinj@marvell.com>, <kirankumark@marvell.com>,\n <olivier.matz@6wind.com>, <ferruh.yigit@intel.com>,\n <anatoly.burakov@intel.com>, <arybchenko@solarflare.com>,\n <stephen@networkplumber.org>, <david.marchand@redhat.com>, Vamsi Attunuru\n <vattunuru@marvell.com>", "Date": "Fri, 15 Nov 2019 22:37:51 +0530", "Message-ID": "<20191115170752.9488-2-vattunuru@marvell.com>", "X-Mailer": "git-send-email 2.8.4", "In-Reply-To": "<20191115170752.9488-1-vattunuru@marvell.com>", "References": "<20191115111807.20935-1-vattunuru@marvell.com>\n <20191115170752.9488-1-vattunuru@marvell.com>", "MIME-Version": "1.0", "Content-Type": "text/plain", "X-Proofpoint-Virus-Version": "vendor=fsecure engine=2.50.10434:6.0.95,18.0.572\n definitions=2019-11-15_05:2019-11-15,2019-11-15 signatures=0", "Subject": "[dpdk-dev] [PATCH v14 1/2] kni: support IOVA mode in kernel module", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Vamsi Attunuru <vattunuru@marvell.com>\n\nPatch adds support for kernel module to work in\nIOVA = VA mode by providing address translation\nroutines to convert IOVA aka user space VA to\nkernel virtual addresses.\n\nWhen compared with IOVA = PA mode, KNI netdev ports\ndoes not have any impact on performance with this\napproach, also there is no performance impact on\nIOVA = PA mode with this patch.\n\nThis approach does not work with the kernel versions\nless than 4.6.0.\n\nSigned-off-by: Vamsi Attunuru <vattunuru@marvell.com>\nSigned-off-by: Kiran Kumar K <kirankumark@marvell.com>\n---\n kernel/linux/kni/compat.h | 14 +++++\n kernel/linux/kni/kni_dev.h | 42 +++++++++++++++\n kernel/linux/kni/kni_misc.c | 39 ++++++++++----\n kernel/linux/kni/kni_net.c | 62 ++++++++++++++++++-----\n lib/librte_eal/linux/eal/include/rte_kni_common.h | 1 +\n 5 files changed, 136 insertions(+), 22 deletions(-)", "diff": "diff --git a/kernel/linux/kni/compat.h b/kernel/linux/kni/compat.h\nindex 562d8bf..062b170 100644\n--- a/kernel/linux/kni/compat.h\n+++ b/kernel/linux/kni/compat.h\n@@ -121,3 +121,17 @@\n #if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0)\n #define HAVE_SIGNAL_FUNCTIONS_OWN_HEADER\n #endif\n+\n+#if KERNEL_VERSION(4, 6, 0) <= LINUX_VERSION_CODE\n+\n+#define HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\n+\n+#if KERNEL_VERSION(4, 9, 0) > LINUX_VERSION_CODE\n+#define GET_USER_PAGES_REMOTE_API_V1\n+#elif KERNEL_VERSION(4, 9, 0) == LINUX_VERSION_CODE\n+#define GET_USER_PAGES_REMOTE_API_V2\n+#else\n+#define GET_USER_PAGES_REMOTE_API_V3\n+#endif\n+\n+#endif\ndiff --git a/kernel/linux/kni/kni_dev.h b/kernel/linux/kni/kni_dev.h\nindex c1ca678..fb641b6 100644\n--- a/kernel/linux/kni/kni_dev.h\n+++ b/kernel/linux/kni/kni_dev.h\n@@ -41,6 +41,8 @@ struct kni_dev {\n \t/* kni list */\n \tstruct list_head list;\n \n+\tuint8_t iova_mode;\n+\n \tuint32_t core_id; /* Core ID to bind */\n \tchar name[RTE_KNI_NAMESIZE]; /* Network device name */\n \tstruct task_struct *pthread;\n@@ -84,8 +86,48 @@ struct kni_dev {\n \tvoid *va[MBUF_BURST_SZ];\n \tvoid *alloc_pa[MBUF_BURST_SZ];\n \tvoid *alloc_va[MBUF_BURST_SZ];\n+\n+\tstruct task_struct *usr_tsk;\n };\n \n+#ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\n+static inline phys_addr_t iova_to_phys(struct task_struct *tsk,\n+\t\t\t\t unsigned long iova)\n+{\n+\tphys_addr_t offset, phys_addr;\n+\tstruct page *page = NULL;\n+\tlong ret;\n+\n+\toffset = iova & (PAGE_SIZE - 1);\n+\n+\t/* Read one page struct info */\n+#ifdef GET_USER_PAGES_REMOTE_API_V3\n+\tret = get_user_pages_remote(tsk, tsk->mm, iova, 1,\n+\t\t\t\t FOLL_TOUCH, &page, NULL, NULL);\n+#endif\n+#ifdef GET_USER_PAGES_REMOTE_API_V2\n+\tret = get_user_pages_remote(tsk, tsk->mm, iova, 1,\n+\t\t\t\t FOLL_TOUCH, &page, NULL);\n+#endif\n+#ifdef GET_USER_PAGES_REMOTE_API_V1\n+\tret = get_user_pages_remote(tsk, tsk->mm, iova, 1\n+\t\t\t\t 0, 0, &page, NULL);\n+#endif\n+\tif (ret < 0)\n+\t\treturn 0;\n+\n+\tphys_addr = page_to_phys(page) | offset;\n+\tput_page(page);\n+\n+\treturn phys_addr;\n+}\n+\n+static inline void *iova_to_kva(struct task_struct *tsk, unsigned long iova)\n+{\n+\treturn phys_to_virt(iova_to_phys(tsk, iova));\n+}\n+#endif\n+\n void kni_net_release_fifo_phy(struct kni_dev *kni);\n void kni_net_rx(struct kni_dev *kni);\n void kni_net_init(struct net_device *dev);\ndiff --git a/kernel/linux/kni/kni_misc.c b/kernel/linux/kni/kni_misc.c\nindex 84ef03b..cda71bd 100644\n--- a/kernel/linux/kni/kni_misc.c\n+++ b/kernel/linux/kni/kni_misc.c\n@@ -348,15 +348,36 @@ kni_ioctl_create(struct net *net, uint32_t ioctl_num,\n \tstrncpy(kni->name, dev_info.name, RTE_KNI_NAMESIZE);\n \n \t/* Translate user space info into kernel space info */\n-\tkni->tx_q = phys_to_virt(dev_info.tx_phys);\n-\tkni->rx_q = phys_to_virt(dev_info.rx_phys);\n-\tkni->alloc_q = phys_to_virt(dev_info.alloc_phys);\n-\tkni->free_q = phys_to_virt(dev_info.free_phys);\n-\n-\tkni->req_q = phys_to_virt(dev_info.req_phys);\n-\tkni->resp_q = phys_to_virt(dev_info.resp_phys);\n-\tkni->sync_va = dev_info.sync_va;\n-\tkni->sync_kva = phys_to_virt(dev_info.sync_phys);\n+\tif (dev_info.iova_mode) {\n+#ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\n+\t\tkni->tx_q = iova_to_kva(current, dev_info.tx_phys);\n+\t\tkni->rx_q = iova_to_kva(current, dev_info.rx_phys);\n+\t\tkni->alloc_q = iova_to_kva(current, dev_info.alloc_phys);\n+\t\tkni->free_q = iova_to_kva(current, dev_info.free_phys);\n+\n+\t\tkni->req_q = iova_to_kva(current, dev_info.req_phys);\n+\t\tkni->resp_q = iova_to_kva(current, dev_info.resp_phys);\n+\t\tkni->sync_va = dev_info.sync_va;\n+\t\tkni->sync_kva = iova_to_kva(current, dev_info.sync_phys);\n+\t\tkni->usr_tsk = current;\n+\t\tkni->iova_mode = 1;\n+#else\n+\t\tpr_err(\"KNI module does not support IOVA to VA translation\\n\");\n+\t\treturn -EINVAL;\n+#endif\n+\t} else {\n+\n+\t\tkni->tx_q = phys_to_virt(dev_info.tx_phys);\n+\t\tkni->rx_q = phys_to_virt(dev_info.rx_phys);\n+\t\tkni->alloc_q = phys_to_virt(dev_info.alloc_phys);\n+\t\tkni->free_q = phys_to_virt(dev_info.free_phys);\n+\n+\t\tkni->req_q = phys_to_virt(dev_info.req_phys);\n+\t\tkni->resp_q = phys_to_virt(dev_info.resp_phys);\n+\t\tkni->sync_va = dev_info.sync_va;\n+\t\tkni->sync_kva = phys_to_virt(dev_info.sync_phys);\n+\t\tkni->iova_mode = 0;\n+\t}\n \n \tkni->mbuf_size = dev_info.mbuf_size;\n \ndiff --git a/kernel/linux/kni/kni_net.c b/kernel/linux/kni/kni_net.c\nindex f25b127..1ba9b1b 100644\n--- a/kernel/linux/kni/kni_net.c\n+++ b/kernel/linux/kni/kni_net.c\n@@ -36,6 +36,22 @@ static void kni_net_rx_normal(struct kni_dev *kni);\n /* kni rx function pointer, with default to normal rx */\n static kni_net_rx_t kni_net_rx_func = kni_net_rx_normal;\n \n+#ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\n+/* iova to kernel virtual address */\n+static inline void *\n+iova2kva(struct kni_dev *kni, void *iova)\n+{\n+\treturn phys_to_virt(iova_to_phys(kni->usr_tsk, (unsigned long)iova));\n+}\n+\n+static inline void *\n+iova2data_kva(struct kni_dev *kni, struct rte_kni_mbuf *m)\n+{\n+\treturn phys_to_virt(iova_to_phys(kni->usr_tsk, m->buf_physaddr) +\n+\t\t\t m->data_off);\n+}\n+#endif\n+\n /* physical address to kernel virtual address */\n static void *\n pa2kva(void *pa)\n@@ -62,6 +78,26 @@ kva2data_kva(struct rte_kni_mbuf *m)\n \treturn phys_to_virt(m->buf_physaddr + m->data_off);\n }\n \n+static inline void *\n+get_kva(struct kni_dev *kni, void *pa)\n+{\n+#ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\n+\tif (kni->iova_mode == 1)\n+\t\treturn iova2kva(kni, pa);\n+#endif\n+\treturn pa2kva(pa);\n+}\n+\n+static inline void *\n+get_data_kva(struct kni_dev *kni, void *pkt_kva)\n+{\n+#ifdef HAVE_IOVA_TO_KVA_MAPPING_SUPPORT\n+\tif (kni->iova_mode == 1)\n+\t\treturn iova2data_kva(kni, pkt_kva);\n+#endif\n+\treturn kva2data_kva(pkt_kva);\n+}\n+\n /*\n * It can be called to process the request.\n */\n@@ -178,7 +214,7 @@ kni_fifo_trans_pa2va(struct kni_dev *kni,\n \t\t\treturn;\n \n \t\tfor (i = 0; i < num_rx; i++) {\n-\t\t\tkva = pa2kva(kni->pa[i]);\n+\t\t\tkva = get_kva(kni, kni->pa[i]);\n \t\t\tkni->va[i] = pa2va(kni->pa[i], kva);\n \n \t\t\tkva_nb_segs = kva->nb_segs;\n@@ -266,8 +302,8 @@ kni_net_tx(struct sk_buff *skb, struct net_device *dev)\n \tif (likely(ret == 1)) {\n \t\tvoid *data_kva;\n \n-\t\tpkt_kva = pa2kva(pkt_pa);\n-\t\tdata_kva = kva2data_kva(pkt_kva);\n+\t\tpkt_kva = get_kva(kni, pkt_pa);\n+\t\tdata_kva = get_data_kva(kni, pkt_kva);\n \t\tpkt_va = pa2va(pkt_pa, pkt_kva);\n \n \t\tlen = skb->len;\n@@ -338,9 +374,9 @@ kni_net_rx_normal(struct kni_dev *kni)\n \n \t/* Transfer received packets to netif */\n \tfor (i = 0; i < num_rx; i++) {\n-\t\tkva = pa2kva(kni->pa[i]);\n+\t\tkva = get_kva(kni, kni->pa[i]);\n \t\tlen = kva->pkt_len;\n-\t\tdata_kva = kva2data_kva(kva);\n+\t\tdata_kva = get_data_kva(kni, kva);\n \t\tkni->va[i] = pa2va(kni->pa[i], kva);\n \n \t\tskb = netdev_alloc_skb(dev, len);\n@@ -437,9 +473,9 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)\n \t\tnum = ret;\n \t\t/* Copy mbufs */\n \t\tfor (i = 0; i < num; i++) {\n-\t\t\tkva = pa2kva(kni->pa[i]);\n+\t\t\tkva = get_kva(kni, kni->pa[i]);\n \t\t\tlen = kva->data_len;\n-\t\t\tdata_kva = kva2data_kva(kva);\n+\t\t\tdata_kva = get_data_kva(kni, kva);\n \t\t\tkni->va[i] = pa2va(kni->pa[i], kva);\n \n \t\t\twhile (kva->next) {\n@@ -449,8 +485,8 @@ kni_net_rx_lo_fifo(struct kni_dev *kni)\n \t\t\t\tkva = next_kva;\n \t\t\t}\n \n-\t\t\talloc_kva = pa2kva(kni->alloc_pa[i]);\n-\t\t\talloc_data_kva = kva2data_kva(alloc_kva);\n+\t\t\talloc_kva = get_kva(kni, kni->alloc_pa[i]);\n+\t\t\talloc_data_kva = get_data_kva(kni, alloc_kva);\n \t\t\tkni->alloc_va[i] = pa2va(kni->alloc_pa[i], alloc_kva);\n \n \t\t\tmemcpy(alloc_data_kva, data_kva, len);\n@@ -517,9 +553,9 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)\n \n \t/* Copy mbufs to sk buffer and then call tx interface */\n \tfor (i = 0; i < num; i++) {\n-\t\tkva = pa2kva(kni->pa[i]);\n+\t\tkva = get_kva(kni, kni->pa[i]);\n \t\tlen = kva->pkt_len;\n-\t\tdata_kva = kva2data_kva(kva);\n+\t\tdata_kva = get_data_kva(kni, kva);\n \t\tkni->va[i] = pa2va(kni->pa[i], kva);\n \n \t\tskb = netdev_alloc_skb(dev, len);\n@@ -550,8 +586,8 @@ kni_net_rx_lo_fifo_skb(struct kni_dev *kni)\n \t\t\t\t\tbreak;\n \n \t\t\t\tprev_kva = kva;\n-\t\t\t\tkva = pa2kva(kva->next);\n-\t\t\t\tdata_kva = kva2data_kva(kva);\n+\t\t\t\tkva = get_kva(kni, kva->next);\n+\t\t\t\tdata_kva = get_data_kva(kni, kva);\n \t\t\t\t/* Convert physical address to virtual address */\n \t\t\t\tprev_kva->next = pa2va(prev_kva->next, kva);\n \t\t\t}\ndiff --git a/lib/librte_eal/linux/eal/include/rte_kni_common.h b/lib/librte_eal/linux/eal/include/rte_kni_common.h\nindex 46f75a7..2427a96 100644\n--- a/lib/librte_eal/linux/eal/include/rte_kni_common.h\n+++ b/lib/librte_eal/linux/eal/include/rte_kni_common.h\n@@ -125,6 +125,7 @@ struct rte_kni_device_info {\n \tunsigned int min_mtu;\n \tunsigned int max_mtu;\n \tuint8_t mac_addr[6];\n+\tuint8_t iova_mode;\n };\n \n #define KNI_DEVICE \"kni\"\n", "prefixes": [ "v14", "1/2" ] }