Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/87298/?format=api
{ "id": 87298, "url": "https://patches.dpdk.org/api/patches/87298/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-11-maxime.coquelin@redhat.com/", "project": { "id": 1, "url": "https://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": "<20210126101639.250481-11-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20210126101639.250481-11-maxime.coquelin@redhat.com", "date": "2021-01-26T10:16:05", "name": "[v4,10/44] net/virtio: force IOVA as VA mode for Virtio-user", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "dbe48e54e044e07b97317733298c3805a9d2394e", "submitter": { "id": 512, "url": "https://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "https://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20210126101639.250481-11-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 14950, "url": "https://patches.dpdk.org/api/series/14950/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=14950", "date": "2021-01-26T10:15:55", "name": "net/virtio: Virtio PMD rework", "version": 4, "mbox": "https://patches.dpdk.org/series/14950/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/87298/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/87298/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 mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id D5B06A052A;\n\tTue, 26 Jan 2021 11:18:30 +0100 (CET)", "from [217.70.189.124] (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 3DB7214134E;\n\tTue, 26 Jan 2021 11:17:25 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [216.205.24.124])\n by mails.dpdk.org (Postfix) with ESMTP id 2E81B14134A\n for <dev@dpdk.org>; Tue, 26 Jan 2021 11:17:22 +0100 (CET)", "from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com\n [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id\n us-mta-31-rniVhAGhNZC6ONwOdp0XMQ-1; Tue, 26 Jan 2021 05:17:18 -0500", "from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com\n [10.5.11.11])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A343A18C8C00;\n Tue, 26 Jan 2021 10:17:17 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.36.110.31])\n by smtp.corp.redhat.com (Postfix) with ESMTP id E12E36F45C;\n Tue, 26 Jan 2021 10:17:15 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1611656241;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:content-type:content-type:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=ZpDYSolB/meBDPt0Kx6gSJ8Ge1IcSDYmRoukbV6TW4M=;\n b=cJ47BHtpD1eZRuAgnkMq5is7TuRZKpJQ63xBXot4OFfgdUcjK3Llt37qkT/5V9dhPLKzqk\n sDRwwjxPii4g4HtnU62Z3dqKF9qCkMU20nAX2bKq4ygGsx1Z5KMFGolNCzxdfoScUGhPLD\n 5Y4vDEEoYI4g1XL53SeMoCGAqCpbHME=", "X-MC-Unique": "rniVhAGhNZC6ONwOdp0XMQ-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, olivier.matz@6wind.com,\n amorenoz@redhat.com, david.marchand@redhat.com", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Date": "Tue, 26 Jan 2021 11:16:05 +0100", "Message-Id": "<20210126101639.250481-11-maxime.coquelin@redhat.com>", "In-Reply-To": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "References": "<20210126101639.250481-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.11", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=maxime.coquelin@redhat.com", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"", "Subject": "[dpdk-dev] [PATCH v4 10/44] net/virtio: force IOVA as VA mode for\n Virtio-user", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "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": "At least Vhost-user backend of Virtio-user PMD requires\nIOVA as VA mode. Until now, it was implemented as a hack\nby forcing to use mbuf's buf_addr field instead of buf_iova.\n\nThis patch removes all this logic and just fails probing\nif IOVA as VA mode is not selected. It simplifies the\ncode overall, and removes some bus-specific logic from\ngeneric virtio_ethdev.c.\n\nSigned-off-by: Maxime Coquelin <maxime.coquelin@redhat.com>\nReviewed-by: Chenbo Xia <chenbo.xia@intel.com>\n---\n drivers/net/virtio/virtio_ethdev.c | 15 ---------\n drivers/net/virtio/virtio_rxtx.c | 34 ++++++++------------\n drivers/net/virtio/virtio_rxtx_packed.h | 2 +-\n drivers/net/virtio/virtio_rxtx_packed_avx.h | 8 ++---\n drivers/net/virtio/virtio_rxtx_packed_neon.h | 8 ++---\n drivers/net/virtio/virtio_rxtx_simple.h | 3 +-\n drivers/net/virtio/virtio_user_ethdev.c | 1 +\n drivers/net/virtio/virtqueue.h | 25 +-------------\n 8 files changed, 26 insertions(+), 70 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 52eb878c42..fb789460e8 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -576,21 +576,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t vtpci_queue_idx)\n \t\thw->cvq = cvq;\n \t}\n \n-\t/* For virtio_user case (that is when hw->virtio_user_dev is not NULL),\n-\t * we use virtual address. And we need properly set _offset_, please see\n-\t * VIRTIO_MBUF_DATA_DMA_ADDR in virtqueue.h for more information.\n-\t */\n-\tif (hw->bus_type == VIRTIO_BUS_PCI_LEGACY || hw->bus_type == VIRTIO_BUS_PCI_MODERN) {\n-\t\tvq->offset = offsetof(struct rte_mbuf, buf_iova);\n-\t} else if (hw->bus_type == VIRTIO_BUS_USER) {\n-\t\tvq->vq_ring_mem = (uintptr_t)mz->addr;\n-\t\tvq->offset = offsetof(struct rte_mbuf, buf_addr);\n-\t\tif (queue_type == VTNET_TQ)\n-\t\t\ttxvq->virtio_net_hdr_mem = (uintptr_t)hdr_mz->addr;\n-\t\telse if (queue_type == VTNET_CQ)\n-\t\t\tcvq->virtio_net_hdr_mem = (uintptr_t)hdr_mz->addr;\n-\t}\n-\n \tif (queue_type == VTNET_TQ) {\n \t\tstruct virtio_tx_region *txr;\n \t\tunsigned int i;\ndiff --git a/drivers/net/virtio/virtio_rxtx.c b/drivers/net/virtio/virtio_rxtx.c\nindex 622d4bf201..6875c8fbee 100644\n--- a/drivers/net/virtio/virtio_rxtx.c\n+++ b/drivers/net/virtio/virtio_rxtx.c\n@@ -271,13 +271,10 @@ virtqueue_enqueue_refill_inorder(struct virtqueue *vq,\n \t\tdxp->cookie = (void *)cookies[i];\n \t\tdxp->ndescs = 1;\n \n-\t\tstart_dp[idx].addr =\n-\t\t\t\tVIRTIO_MBUF_ADDR(cookies[i], vq) +\n-\t\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n-\t\tstart_dp[idx].len =\n-\t\t\t\tcookies[i]->buf_len -\n-\t\t\t\tRTE_PKTMBUF_HEADROOM +\n-\t\t\t\thw->vtnet_hdr_size;\n+\t\tstart_dp[idx].addr = cookies[i]->buf_iova +\n+\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n+\t\tstart_dp[idx].len = cookies[i]->buf_len -\n+\t\t\tRTE_PKTMBUF_HEADROOM + hw->vtnet_hdr_size;\n \t\tstart_dp[idx].flags = VRING_DESC_F_WRITE;\n \n \t\tvq_update_avail_ring(vq, idx);\n@@ -313,12 +310,10 @@ virtqueue_enqueue_recv_refill(struct virtqueue *vq, struct rte_mbuf **cookie,\n \t\tdxp->cookie = (void *)cookie[i];\n \t\tdxp->ndescs = 1;\n \n-\t\tstart_dp[idx].addr =\n-\t\t\tVIRTIO_MBUF_ADDR(cookie[i], vq) +\n+\t\tstart_dp[idx].addr = cookie[i]->buf_iova +\n \t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n-\t\tstart_dp[idx].len =\n-\t\t\tcookie[i]->buf_len - RTE_PKTMBUF_HEADROOM +\n-\t\t\thw->vtnet_hdr_size;\n+\t\tstart_dp[idx].len = cookie[i]->buf_len -\n+\t\t\tRTE_PKTMBUF_HEADROOM + hw->vtnet_hdr_size;\n \t\tstart_dp[idx].flags = VRING_DESC_F_WRITE;\n \t\tvq->vq_desc_head_idx = start_dp[idx].next;\n \t\tvq_update_avail_ring(vq, idx);\n@@ -355,10 +350,10 @@ virtqueue_enqueue_recv_refill_packed(struct virtqueue *vq,\n \t\tdxp->cookie = (void *)cookie[i];\n \t\tdxp->ndescs = 1;\n \n-\t\tstart_dp[idx].addr = VIRTIO_MBUF_ADDR(cookie[i], vq) +\n-\t\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n-\t\tstart_dp[idx].len = cookie[i]->buf_len - RTE_PKTMBUF_HEADROOM\n-\t\t\t\t\t+ hw->vtnet_hdr_size;\n+\t\tstart_dp[idx].addr = cookie[i]->buf_iova +\n+\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n+\t\tstart_dp[idx].len = cookie[i]->buf_len -\n+\t\t\tRTE_PKTMBUF_HEADROOM + hw->vtnet_hdr_size;\n \n \t\tvq->vq_desc_head_idx = dxp->next;\n \t\tif (vq->vq_desc_head_idx == VQ_RING_DESC_CHAIN_END)\n@@ -455,8 +450,7 @@ virtqueue_enqueue_xmit_inorder(struct virtnet_tx *txvq,\n \t\telse\n \t\t\tvirtqueue_xmit_offload(hdr, cookies[i], true);\n \n-\t\tstart_dp[idx].addr =\n-\t\t\tVIRTIO_MBUF_DATA_DMA_ADDR(cookies[i], vq) - head_size;\n+\t\tstart_dp[idx].addr = rte_mbuf_data_iova(cookies[i]) - head_size;\n \t\tstart_dp[idx].len = cookies[i]->data_len + head_size;\n \t\tstart_dp[idx].flags = 0;\n \n@@ -503,7 +497,7 @@ virtqueue_enqueue_xmit_packed_fast(struct virtnet_tx *txvq,\n \telse\n \t\tvirtqueue_xmit_offload(hdr, cookie, true);\n \n-\tdp->addr = VIRTIO_MBUF_DATA_DMA_ADDR(cookie, vq) - head_size;\n+\tdp->addr = rte_mbuf_data_iova(cookie) - head_size;\n \tdp->len = cookie->data_len + head_size;\n \tdp->id = id;\n \n@@ -590,7 +584,7 @@ virtqueue_enqueue_xmit(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \tvirtqueue_xmit_offload(hdr, cookie, vq->hw->has_tx_offload);\n \n \tdo {\n-\t\tstart_dp[idx].addr = VIRTIO_MBUF_DATA_DMA_ADDR(cookie, vq);\n+\t\tstart_dp[idx].addr = rte_mbuf_data_iova(cookie);\n \t\tstart_dp[idx].len = cookie->data_len;\n \t\tif (prepend_header) {\n \t\t\tstart_dp[idx].addr -= head_size;\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed.h b/drivers/net/virtio/virtio_rxtx_packed.h\nindex 016b6fb247..c0fad41c3d 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed.h\n+++ b/drivers/net/virtio/virtio_rxtx_packed.h\n@@ -288,7 +288,7 @@ virtio_recv_refill_packed_vec(struct virtnet_rx *rxvq,\n \t\t\tdxp = &vq->vq_descx[idx + i];\n \t\t\tdxp->cookie = (void *)cookie[total_num + i];\n \n-\t\t\taddr = VIRTIO_MBUF_ADDR(cookie[total_num + i], vq) +\n+\t\t\taddr = cookie[total_num + i]->buf_iova +\n \t\t\t\tRTE_PKTMBUF_HEADROOM - hw->vtnet_hdr_size;\n \t\t\tstart_dp[idx + i].addr = addr;\n \t\t\tstart_dp[idx + i].len = cookie[total_num + i]->buf_len\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed_avx.h b/drivers/net/virtio/virtio_rxtx_packed_avx.h\nindex f831828845..2c610d57de 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed_avx.h\n+++ b/drivers/net/virtio/virtio_rxtx_packed_avx.h\n@@ -71,13 +71,13 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,\n \t}\n \n \t__m512i descs_base = _mm512_set_epi64(tx_pkts[3]->data_len,\n-\t\t\tVIRTIO_MBUF_ADDR(tx_pkts[3], vq),\n+\t\t\ttx_pkts[3]->buf_iova,\n \t\t\ttx_pkts[2]->data_len,\n-\t\t\tVIRTIO_MBUF_ADDR(tx_pkts[2], vq),\n+\t\t\ttx_pkts[2]->buf_iova,\n \t\t\ttx_pkts[1]->data_len,\n-\t\t\tVIRTIO_MBUF_ADDR(tx_pkts[1], vq),\n+\t\t\ttx_pkts[1]->buf_iova,\n \t\t\ttx_pkts[0]->data_len,\n-\t\t\tVIRTIO_MBUF_ADDR(tx_pkts[0], vq));\n+\t\t\ttx_pkts[0]->buf_iova);\n \n \t/* id offset and data offset */\n \t__m512i data_offsets = _mm512_set_epi64((uint64_t)3 << ID_BITS_OFFSET,\ndiff --git a/drivers/net/virtio/virtio_rxtx_packed_neon.h b/drivers/net/virtio/virtio_rxtx_packed_neon.h\nindex 01c77b712d..ae2d099c0b 100644\n--- a/drivers/net/virtio/virtio_rxtx_packed_neon.h\n+++ b/drivers/net/virtio/virtio_rxtx_packed_neon.h\n@@ -97,12 +97,12 @@ virtqueue_enqueue_batch_packed_vec(struct virtnet_tx *txvq,\n \n \tuint64x2x2_t desc[PACKED_BATCH_SIZE / 2];\n \tuint64x2_t base_addr0 = {\n-\t\tVIRTIO_MBUF_ADDR(tx_pkts[0], vq) + tx_pkts[0]->data_off,\n-\t\tVIRTIO_MBUF_ADDR(tx_pkts[1], vq) + tx_pkts[1]->data_off\n+\t\ttx_pkts[0]->buf_iova + tx_pkts[0]->data_off,\n+\t\ttx_pkts[1]->buf_iova + tx_pkts[1]->data_off\n \t};\n \tuint64x2_t base_addr1 = {\n-\t\tVIRTIO_MBUF_ADDR(tx_pkts[2], vq) + tx_pkts[2]->data_off,\n-\t\tVIRTIO_MBUF_ADDR(tx_pkts[3], vq) + tx_pkts[3]->data_off\n+\t\ttx_pkts[2]->buf_iova + tx_pkts[2]->data_off,\n+\t\ttx_pkts[3]->buf_iova + tx_pkts[3]->data_off\n \t};\n \n \tdesc[0].val[0] = base_addr0;\ndiff --git a/drivers/net/virtio/virtio_rxtx_simple.h b/drivers/net/virtio/virtio_rxtx_simple.h\nindex 3d1296a23c..f2a5aedf97 100644\n--- a/drivers/net/virtio/virtio_rxtx_simple.h\n+++ b/drivers/net/virtio/virtio_rxtx_simple.h\n@@ -43,8 +43,7 @@ virtio_rxq_rearm_vec(struct virtnet_rx *rxvq)\n \t\tp = (uintptr_t)&sw_ring[i]->rearm_data;\n \t\t*(uint64_t *)p = rxvq->mbuf_initializer;\n \n-\t\tstart_dp[i].addr =\n-\t\t\tVIRTIO_MBUF_ADDR(sw_ring[i], vq) +\n+\t\tstart_dp[i].addr = sw_ring[i]->buf_iova +\n \t\t\tRTE_PKTMBUF_HEADROOM - vq->hw->vtnet_hdr_size;\n \t\tstart_dp[i].len = sw_ring[i]->buf_len -\n \t\t\tRTE_PKTMBUF_HEADROOM + vq->hw->vtnet_hdr_size;\ndiff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c\nindex 620ecb126c..241fe373b9 100644\n--- a/drivers/net/virtio/virtio_user_ethdev.c\n+++ b/drivers/net/virtio/virtio_user_ethdev.c\n@@ -953,6 +953,7 @@ static struct rte_vdev_driver virtio_user_driver = {\n \t.remove = virtio_user_pmd_remove,\n \t.dma_map = virtio_user_pmd_dma_map,\n \t.dma_unmap = virtio_user_pmd_dma_unmap,\n+\t.drv_flags = RTE_VDEV_DRV_NEED_IOVA_AS_VA,\n };\n \n RTE_PMD_REGISTER_VDEV(net_virtio_user, virtio_user_driver);\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex d78b943443..7611317581 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -113,29 +113,6 @@ virtqueue_store_flags_packed(struct vring_packed_desc *dp,\n \n #define VIRTQUEUE_MAX_NAME_SZ 32\n \n-#ifdef RTE_VIRTIO_USER\n-/**\n- * Return the physical address (or virtual address in case of\n- * virtio-user) of mbuf data buffer.\n- *\n- * The address is firstly casted to the word size (sizeof(uintptr_t))\n- * before casting it to uint64_t. This is to make it work with different\n- * combination of word size (64 bit and 32 bit) and virtio device\n- * (virtio-pci and virtio-user).\n- */\n-#define VIRTIO_MBUF_ADDR(mb, vq) \\\n-\t((uint64_t)(*(uintptr_t *)((uintptr_t)(mb) + (vq)->offset)))\n-#else\n-#define VIRTIO_MBUF_ADDR(mb, vq) ((mb)->buf_iova)\n-#endif\n-\n-/**\n- * Return the physical address (or virtual address in case of\n- * virtio-user) of mbuf data buffer, taking care of mbuf data offset\n- */\n-#define VIRTIO_MBUF_DATA_DMA_ADDR(mb, vq) \\\n-\t(VIRTIO_MBUF_ADDR(mb, vq) + (mb)->data_off)\n-\n #define VTNET_SQ_RQ_QUEUE_IDX 0\n #define VTNET_SQ_TQ_QUEUE_IDX 1\n #define VTNET_SQ_CQ_QUEUE_IDX 2\n@@ -763,7 +740,7 @@ virtqueue_enqueue_xmit_packed(struct virtnet_tx *txvq, struct rte_mbuf *cookie,\n \tdo {\n \t\tuint16_t flags;\n \n-\t\tstart_dp[idx].addr = VIRTIO_MBUF_DATA_DMA_ADDR(cookie, vq);\n+\t\tstart_dp[idx].addr = rte_mbuf_data_iova(cookie);\n \t\tstart_dp[idx].len = cookie->data_len;\n \t\tif (prepend_header) {\n \t\t\tstart_dp[idx].addr -= head_size;\n", "prefixes": [ "v4", "10/44" ] }