Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/123290/?format=api
{ "id": 123290, "url": "http://patches.dpdk.org/api/patches/123290/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20230207151747.245808-10-maxime.coquelin@redhat.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": "<20230207151747.245808-10-maxime.coquelin@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20230207151747.245808-10-maxime.coquelin@redhat.com", "date": "2023-02-07T15:17:35", "name": "[v2,09/21] net/virtio: refactor indirect desc headers init", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "4fc4811988b2b85913d4961833395c001ef40db9", "submitter": { "id": 512, "url": "http://patches.dpdk.org/api/people/512/?format=api", "name": "Maxime Coquelin", "email": "maxime.coquelin@redhat.com" }, "delegate": { "id": 2642, "url": "http://patches.dpdk.org/api/users/2642/?format=api", "username": "mcoquelin", "first_name": "Maxime", "last_name": "Coquelin", "email": "maxime.coquelin@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20230207151747.245808-10-maxime.coquelin@redhat.com/mbox/", "series": [ { "id": 26854, "url": "http://patches.dpdk.org/api/series/26854/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=26854", "date": "2023-02-07T15:17:33", "name": "Add control queue & MQ support to Virtio-user vDPA", "version": 2, "mbox": "http://patches.dpdk.org/series/26854/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/123290/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/123290/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 697A941C30;\n\tTue, 7 Feb 2023 16:20:12 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id 4F58342DBF;\n\tTue, 7 Feb 2023 16:18:57 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [170.10.133.124])\n by mails.dpdk.org (Postfix) with ESMTP id DD31242D3F\n for <dev@dpdk.org>; Tue, 7 Feb 2023 16:18:49 +0100 (CET)", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-66--iYn9SqvOoS3B6epTWRMJQ-1; Tue, 07 Feb 2023 10:18:48 -0500", "from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com\n [10.11.54.7])\n (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id C6738102F1E7;\n Tue, 7 Feb 2023 15:18:08 +0000 (UTC)", "from max-t490s.redhat.com (unknown [10.39.208.26])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 75FFA140EBF4;\n Tue, 7 Feb 2023 15:18:07 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1675783129;\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=Tnhz9SdhdHaDf70vOhcKXLmSyLoooYFFUUqUzuXiunI=;\n b=GllObcmMp2rkl+H54iW8BFDsQcUiUzcK/Hm83cEZAwRhCjxMbeJ8GL+pB95848X+IWoSbw\n eX4qKGQN9hnaqSFIxZbgk6kdIHg7FOdNSmUzPNVwYEshAFrovDZaq5KpVP3NOB+zvf3wmi\n xmpB9q+UhqLtmYMn1fDA7C1hiQaFkro=", "X-MC-Unique": "-iYn9SqvOoS3B6epTWRMJQ-1", "From": "Maxime Coquelin <maxime.coquelin@redhat.com>", "To": "dev@dpdk.org, chenbo.xia@intel.com, david.marchand@redhat.com,\n eperezma@redhat.com, stephen@networkplumber.org", "Cc": "Maxime Coquelin <maxime.coquelin@redhat.com>", "Subject": "[PATCH v2 09/21] net/virtio: refactor indirect desc headers init", "Date": "Tue, 7 Feb 2023 16:17:35 +0100", "Message-Id": "<20230207151747.245808-10-maxime.coquelin@redhat.com>", "In-Reply-To": "<20230207151747.245808-1-maxime.coquelin@redhat.com>", "References": "<20230207151747.245808-1-maxime.coquelin@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.7", "X-Mimecast-Spam-Score": "0", "X-Mimecast-Originator": "redhat.com", "Content-Transfer-Encoding": "8bit", "Content-Type": "text/plain; charset=\"US-ASCII\"; x-default=true", "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" }, "content": "This patch refactors the indirect descriptors headers\ninitialization in a dedicated function, and makes it used\nby both queue init and reset functions.\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 | 30 +------------\n drivers/net/virtio/virtqueue.c | 68 ++++++++++++++++++++++--------\n drivers/net/virtio/virtqueue.h | 2 +\n 3 files changed, 54 insertions(+), 46 deletions(-)", "diff": "diff --git a/drivers/net/virtio/virtio_ethdev.c b/drivers/net/virtio/virtio_ethdev.c\nindex 4f6d777951..f839a24d12 100644\n--- a/drivers/net/virtio/virtio_ethdev.c\n+++ b/drivers/net/virtio/virtio_ethdev.c\n@@ -347,7 +347,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \tunsigned int vq_size, size;\n \tstruct virtio_hw *hw = dev->data->dev_private;\n \tstruct virtnet_rx *rxvq = NULL;\n-\tstruct virtnet_tx *txvq = NULL;\n \tstruct virtnet_ctl *cvq = NULL;\n \tstruct virtqueue *vq;\n \tvoid *sw_ring = NULL;\n@@ -465,7 +464,7 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \t\trxvq = &vq->rxq;\n \t\trxvq->fake_mbuf = fake_mbuf;\n \t} else if (queue_type == VTNET_TQ) {\n-\t\ttxvq = &vq->txq;\n+\t\tvirtqueue_txq_indirect_headers_init(vq);\n \t} else if (queue_type == VTNET_CQ) {\n \t\tcvq = &vq->cq;\n \t\thw->cvq = cvq;\n@@ -477,33 +476,6 @@ virtio_init_queue(struct rte_eth_dev *dev, uint16_t queue_idx)\n \telse\n \t\tvq->mbuf_addr_offset = offsetof(struct rte_mbuf, buf_iova);\n \n-\tif (queue_type == VTNET_TQ) {\n-\t\tstruct virtio_tx_region *txr;\n-\t\tunsigned int i;\n-\n-\t\ttxr = txvq->hdr_mz->addr;\n-\t\tfor (i = 0; i < vq_size; i++) {\n-\t\t\t/* first indirect descriptor is always the tx header */\n-\t\t\tif (!virtio_with_packed_queue(hw)) {\n-\t\t\t\tstruct vring_desc *start_dp = txr[i].tx_indir;\n-\t\t\t\tvring_desc_init_split(start_dp,\n-\t\t\t\t\t\t RTE_DIM(txr[i].tx_indir));\n-\t\t\t\tstart_dp->addr = txvq->hdr_mem + i * sizeof(*txr)\n-\t\t\t\t\t+ offsetof(struct virtio_tx_region, tx_hdr);\n-\t\t\t\tstart_dp->len = hw->vtnet_hdr_size;\n-\t\t\t\tstart_dp->flags = VRING_DESC_F_NEXT;\n-\t\t\t} else {\n-\t\t\t\tstruct vring_packed_desc *start_dp =\n-\t\t\t\t\ttxr[i].tx_packed_indir;\n-\t\t\t\tvring_desc_init_indirect_packed(start_dp,\n-\t\t\t\t RTE_DIM(txr[i].tx_packed_indir));\n-\t\t\t\tstart_dp->addr = txvq->hdr_mem + i * sizeof(*txr)\n-\t\t\t\t\t+ offsetof(struct virtio_tx_region, tx_hdr);\n-\t\t\t\tstart_dp->len = hw->vtnet_hdr_size;\n-\t\t\t}\n-\t\t}\n-\t}\n-\n \tif (VIRTIO_OPS(hw)->setup_queue(hw, vq) < 0) {\n \t\tPMD_INIT_LOG(ERR, \"setup_queue failed\");\n \t\tret = -EINVAL;\ndiff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c\nindex 41e3529546..fb651a4ca3 100644\n--- a/drivers/net/virtio/virtqueue.c\n+++ b/drivers/net/virtio/virtqueue.c\n@@ -143,6 +143,54 @@ virtqueue_rxvq_flush(struct virtqueue *vq)\n \t\tvirtqueue_rxvq_flush_split(vq);\n }\n \n+static void\n+virtqueue_txq_indirect_header_init_packed(struct virtqueue *vq, uint32_t idx)\n+{\n+\tstruct virtio_tx_region *txr;\n+\tstruct vring_packed_desc *desc;\n+\trte_iova_t hdr_mem;\n+\n+\ttxr = vq->txq.hdr_mz->addr;\n+\thdr_mem = vq->txq.hdr_mem;\n+\tdesc = txr[idx].tx_packed_indir;\n+\n+\tvring_desc_init_indirect_packed(desc, RTE_DIM(txr[idx].tx_packed_indir));\n+\tdesc->addr = hdr_mem + idx * sizeof(*txr) + offsetof(struct virtio_tx_region, tx_hdr);\n+\tdesc->len = vq->hw->vtnet_hdr_size;\n+}\n+\n+static void\n+virtqueue_txq_indirect_header_init_split(struct virtqueue *vq, uint32_t idx)\n+{\n+\tstruct virtio_tx_region *txr;\n+\tstruct vring_desc *desc;\n+\trte_iova_t hdr_mem;\n+\n+\ttxr = vq->txq.hdr_mz->addr;\n+\thdr_mem = vq->txq.hdr_mem;\n+\tdesc = txr[idx].tx_indir;\n+\n+\tvring_desc_init_split(desc, RTE_DIM(txr[idx].tx_indir));\n+\tdesc->addr = hdr_mem + idx * sizeof(*txr) + offsetof(struct virtio_tx_region, tx_hdr);\n+\tdesc->len = vq->hw->vtnet_hdr_size;\n+\tdesc->flags = VRING_DESC_F_NEXT;\n+}\n+\n+void\n+virtqueue_txq_indirect_headers_init(struct virtqueue *vq)\n+{\n+\tuint32_t i;\n+\n+\tif (!virtio_with_feature(vq->hw, VIRTIO_RING_F_INDIRECT_DESC))\n+\t\treturn;\n+\n+\tfor (i = 0; i < vq->vq_nentries; i++)\n+\t\tif (virtio_with_packed_queue(vq->hw))\n+\t\t\tvirtqueue_txq_indirect_header_init_packed(vq, i);\n+\t\telse\n+\t\t\tvirtqueue_txq_indirect_header_init_split(vq, i);\n+}\n+\n int\n virtqueue_rxvq_reset_packed(struct virtqueue *vq)\n {\n@@ -182,10 +230,7 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)\n {\n \tint size = vq->vq_nentries;\n \tstruct vq_desc_extra *dxp;\n-\tstruct virtnet_tx *txvq;\n \tuint16_t desc_idx;\n-\tstruct virtio_tx_region *txr;\n-\tstruct vring_packed_desc *start_dp;\n \n \tvq->vq_used_cons_idx = 0;\n \tvq->vq_desc_head_idx = 0;\n@@ -197,10 +242,8 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)\n \tvq->vq_packed.cached_flags = VRING_PACKED_DESC_F_AVAIL;\n \tvq->vq_packed.event_flags_shadow = 0;\n \n-\ttxvq = &vq->txq;\n-\ttxr = txvq->hdr_mz->addr;\n \tmemset(vq->mz->addr, 0, vq->mz->len);\n-\tmemset(txvq->hdr_mz->addr, 0, txvq->hdr_mz->len);\n+\tmemset(vq->txq.hdr_mz->addr, 0, vq->txq.hdr_mz->len);\n \n \tfor (desc_idx = 0; desc_idx < vq->vq_nentries; desc_idx++) {\n \t\tdxp = &vq->vq_descx[desc_idx];\n@@ -208,20 +251,11 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq)\n \t\t\trte_pktmbuf_free(dxp->cookie);\n \t\t\tdxp->cookie = NULL;\n \t\t}\n-\n-\t\tif (virtio_with_feature(vq->hw, VIRTIO_RING_F_INDIRECT_DESC)) {\n-\t\t\t/* first indirect descriptor is always the tx header */\n-\t\t\tstart_dp = txr[desc_idx].tx_packed_indir;\n-\t\t\tvring_desc_init_indirect_packed(start_dp,\n-\t\t\t\t\t\t\tRTE_DIM(txr[desc_idx].tx_packed_indir));\n-\t\t\tstart_dp->addr = txvq->hdr_mem + desc_idx * sizeof(*txr)\n-\t\t\t\t\t + offsetof(struct virtio_tx_region, tx_hdr);\n-\t\t\tstart_dp->len = vq->hw->vtnet_hdr_size;\n-\t\t}\n \t}\n \n+\tvirtqueue_txq_indirect_headers_init(vq);\n \tvring_desc_init_packed(vq, size);\n-\n \tvirtqueue_disable_intr(vq);\n+\n \treturn 0;\n }\ndiff --git a/drivers/net/virtio/virtqueue.h b/drivers/net/virtio/virtqueue.h\nindex 8b7bfae643..d453c3ec26 100644\n--- a/drivers/net/virtio/virtqueue.h\n+++ b/drivers/net/virtio/virtqueue.h\n@@ -384,6 +384,8 @@ int virtqueue_rxvq_reset_packed(struct virtqueue *vq);\n \n int virtqueue_txvq_reset_packed(struct virtqueue *vq);\n \n+void virtqueue_txq_indirect_headers_init(struct virtqueue *vq);\n+\n static inline int\n virtqueue_full(const struct virtqueue *vq)\n {\n", "prefixes": [ "v2", "09/21" ] }