Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/82386/?format=api
{ "id": 82386, "url": "https://patches.dpdk.org/api/patches/82386/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/patch/20201027221343.28551-6-david.marchand@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": "<20201027221343.28551-6-david.marchand@redhat.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20201027221343.28551-6-david.marchand@redhat.com", "date": "2020-10-27T22:13:40", "name": "[5/8] dpaa: switch sequence number to dynamic field", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "7d6cc949d3d0bdac2ab36488c584ca7e07e6512a", "submitter": { "id": 1173, "url": "https://patches.dpdk.org/api/people/1173/?format=api", "name": "David Marchand", "email": "david.marchand@redhat.com" }, "delegate": { "id": 1, "url": "https://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "https://patches.dpdk.org/project/dpdk/patch/20201027221343.28551-6-david.marchand@redhat.com/mbox/", "series": [ { "id": 13394, "url": "https://patches.dpdk.org/api/series/13394/?format=api", "web_url": "https://patches.dpdk.org/project/dpdk/list/?series=13394", "date": "2020-10-27T22:13:35", "name": "remove mbuf seqn", "version": 1, "mbox": "https://patches.dpdk.org/series/13394/mbox/" } ], "comments": "https://patches.dpdk.org/api/patches/82386/comments/", "check": "success", "checks": "https://patches.dpdk.org/api/patches/82386/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 15A3EA04B5;\n\tTue, 27 Oct 2020 23:15:42 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 7B7913772;\n\tTue, 27 Oct 2020 23:14:12 +0100 (CET)", "from us-smtp-delivery-124.mimecast.com\n (us-smtp-delivery-124.mimecast.com [63.128.21.124])\n by dpdk.org (Postfix) with ESMTP id D42BD2C27\n for <dev@dpdk.org>; Tue, 27 Oct 2020 23:14:05 +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-128-hL_sdb-wOqCtj4GbuKOIdw-1; Tue, 27 Oct 2020 18:14:02 -0400", "from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com\n [10.5.11.16])\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 DAA4959;\n Tue, 27 Oct 2020 22:14:00 +0000 (UTC)", "from dmarchan.remote.csb (unknown [10.40.192.40])\n by smtp.corp.redhat.com (Postfix) with ESMTP id D88515C1BB;\n Tue, 27 Oct 2020 22:13:58 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1603836844;\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=ONkmAW3pzqQ9dA2gBWJJxUzd2QXhiudsRfbMOVqGz2A=;\n b=AJuYZyqO12ve+L7+zyoEFtLfHYMHyqmbEUN1A02EmCsyzHYnmdmC6pQq8fjB9x2qGMXljv\n cGvmqqjIhQwnCXbC3jzAHVIFHGVEavv3+TYJHHiuXGEcH8WVsPcLt+qG18dLpFb6g4zk/7\n HzSx/7ZvNFkdBfLxcPCbD7YegkI7V8E=", "X-MC-Unique": "hL_sdb-wOqCtj4GbuKOIdw-1", "From": "David Marchand <david.marchand@redhat.com>", "To": "dev@dpdk.org", "Cc": "Hemant Agrawal <hemant.agrawal@nxp.com>,\n Sachin Saxena <sachin.saxena@oss.nxp.com>, Ray Kinsella <mdr@ashroe.eu>,\n Neil Horman <nhorman@tuxdriver.com>, Akhil Goyal <akhil.goyal@nxp.com>,\n Nipun Gupta <nipun.gupta@nxp.com>", "Date": "Tue, 27 Oct 2020 23:13:40 +0100", "Message-Id": "<20201027221343.28551-6-david.marchand@redhat.com>", "In-Reply-To": "<20201027221343.28551-1-david.marchand@redhat.com>", "References": "<20201027221343.28551-1-david.marchand@redhat.com>", "MIME-Version": "1.0", "X-Scanned-By": "MIMEDefang 2.79 on 10.5.11.16", "Authentication-Results": "relay.mimecast.com;\n auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@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 5/8] dpaa: switch sequence number to dynamic field", "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": "The dpaa drivers have been hacking the deprecated field seqn for\ninternal features.\nIt is moved to a dynamic mbuf field in order to allow removal of seqn.\n\nSigned-off-by: David Marchand <david.marchand@redhat.com>\n---\n drivers/bus/dpaa/dpaa_bus.c | 16 ++++++++++++++++\n drivers/bus/dpaa/rte_dpaa_bus.h | 28 ++++++++++++++++++++++++++++\n drivers/bus/dpaa/version.map | 1 +\n drivers/crypto/dpaa_sec/dpaa_sec.c | 6 +++---\n drivers/event/dpaa/dpaa_eventdev.c | 6 +++---\n drivers/net/dpaa/dpaa_ethdev.h | 7 -------\n drivers/net/dpaa/dpaa_rxtx.c | 6 +++---\n 7 files changed, 54 insertions(+), 16 deletions(-)", "diff": "diff --git a/drivers/bus/dpaa/dpaa_bus.c b/drivers/bus/dpaa/dpaa_bus.c\nindex c94c72106f..ece6a4c424 100644\n--- a/drivers/bus/dpaa/dpaa_bus.c\n+++ b/drivers/bus/dpaa/dpaa_bus.c\n@@ -32,6 +32,7 @@\n #include <rte_ring.h>\n #include <rte_bus.h>\n #include <rte_mbuf_pool_ops.h>\n+#include <rte_mbuf_dyn.h>\n \n #include <dpaa_of.h>\n #include <rte_dpaa_bus.h>\n@@ -55,6 +56,9 @@ unsigned int dpaa_svr_family;\n \n RTE_DEFINE_PER_LCORE(struct dpaa_portal *, dpaa_io);\n \n+#define DPAA_SEQN_DYNFIELD_NAME \"dpaa_seqn_dynfield\"\n+int dpaa_seqn_dynfield_offset = -1;\n+\n struct fm_eth_port_cfg *\n dpaa_get_eth_port_cfg(int dev_id)\n {\n@@ -251,6 +255,11 @@ dpaa_clean_device_list(void)\n \n int rte_dpaa_portal_init(void *arg)\n {\n+\tstatic const struct rte_mbuf_dynfield dpaa_seqn_dynfield_desc = {\n+\t\t.name = DPAA_SEQN_DYNFIELD_NAME,\n+\t\t.size = sizeof(dpaa_seqn_t),\n+\t\t.align = __alignof__(dpaa_seqn_t),\n+\t};\n \tunsigned int cpu, lcore = rte_lcore_id();\n \tint ret;\n \n@@ -264,6 +273,13 @@ int rte_dpaa_portal_init(void *arg)\n \n \tcpu = rte_lcore_to_cpu_id(lcore);\n \n+\tdpaa_seqn_dynfield_offset =\n+\t\trte_mbuf_dynfield_register(&dpaa_seqn_dynfield_desc);\n+\tif (dpaa_seqn_dynfield_offset < 0) {\n+\t\tDPAA_BUS_LOG(ERR, \"Failed to register mbuf field for dpaa sequence number\\n\");\n+\t\treturn -rte_errno;\n+\t}\n+\n \t/* Initialise bman thread portals */\n \tret = bman_thread_init();\n \tif (ret) {\ndiff --git a/drivers/bus/dpaa/rte_dpaa_bus.h b/drivers/bus/dpaa/rte_dpaa_bus.h\nindex fdaa63a09b..5b8c44df72 100644\n--- a/drivers/bus/dpaa/rte_dpaa_bus.h\n+++ b/drivers/bus/dpaa/rte_dpaa_bus.h\n@@ -7,6 +7,7 @@\n #define __RTE_DPAA_BUS_H__\n \n #include <rte_bus.h>\n+#include <rte_mbuf_dyn.h>\n #include <rte_mempool.h>\n #include <dpaax_iova_table.h>\n \n@@ -16,6 +17,33 @@\n #include <fsl_bman.h>\n #include <netcfg.h>\n \n+/* This sequence number field is used to store event entry index for\n+ * driver specific usage. For parallel mode queues, invalid\n+ * index will be set and for atomic mode queues, valid value\n+ * ranging from 1 to 16.\n+ */\n+#define DPAA_INVALID_MBUF_SEQN 0\n+\n+typedef uint32_t dpaa_seqn_t;\n+extern int dpaa_seqn_dynfield_offset;\n+\n+/**\n+ * @warning\n+ * @b EXPERIMENTAL: this API may change without prior notice\n+ *\n+ * Read dpaa sequence number from mbuf.\n+ *\n+ * @param mbuf Structure to read from.\n+ * @return pointer to dpaa sequence number.\n+ */\n+__rte_experimental\n+static inline dpaa_seqn_t *\n+dpaa_seqn(const struct rte_mbuf *mbuf)\n+{\n+\treturn RTE_MBUF_DYNFIELD(mbuf, dpaa_seqn_dynfield_offset,\n+\t\tdpaa_seqn_t *);\n+}\n+\n #define DPAA_MEMPOOL_OPS_NAME\t\"dpaa\"\n \n #define DEV_TO_DPAA_DEVICE(ptr)\t\\\ndiff --git a/drivers/bus/dpaa/version.map b/drivers/bus/dpaa/version.map\nindex 9bd2601213..fe4f9ac5aa 100644\n--- a/drivers/bus/dpaa/version.map\n+++ b/drivers/bus/dpaa/version.map\n@@ -14,6 +14,7 @@ INTERNAL {\n \tdpaa_get_qm_channel_pool;\n \tdpaa_get_link_status;\n \tdpaa_restart_link_autoneg;\n+\tdpaa_seqn_dynfield_offset;\n \tdpaa_update_link_speed;\n \tdpaa_intr_disable;\n \tdpaa_intr_enable;\ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex 55f457ac9a..44c742738f 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -1721,8 +1721,8 @@ dpaa_sec_enqueue_burst(void *qp, struct rte_crypto_op **ops,\n \t\t\t\tDPAA_SEC_BURST : nb_ops;\n \t\tfor (loop = 0; loop < frames_to_send; loop++) {\n \t\t\top = *(ops++);\n-\t\t\tif (op->sym->m_src->seqn != 0) {\n-\t\t\t\tindex = op->sym->m_src->seqn - 1;\n+\t\t\tif (*dpaa_seqn(op->sym->m_src) != 0) {\n+\t\t\t\tindex = *dpaa_seqn(op->sym->m_src) - 1;\n \t\t\t\tif (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) {\n \t\t\t\t\t/* QM_EQCR_DCA_IDXMASK = 0x0f */\n \t\t\t\t\tflags[loop] = ((index & 0x0f) << 8);\n@@ -3212,7 +3212,7 @@ dpaa_sec_process_atomic_event(void *event,\n \tDPAA_PER_LCORE_DQRR_HELD |= 1 << index;\n \tDPAA_PER_LCORE_DQRR_MBUF(index) = ctx->op->sym->m_src;\n \tev->impl_opaque = index + 1;\n-\tctx->op->sym->m_src->seqn = (uint32_t)index + 1;\n+\t*dpaa_seqn(ctx->op->sym->m_src) = (uint32_t)index + 1;\n \t*bufs = (void *)ctx->op;\n \n \trte_mempool_put(ctx->ctx_pool, (void *)ctx);\ndiff --git a/drivers/event/dpaa/dpaa_eventdev.c b/drivers/event/dpaa/dpaa_eventdev.c\nindex 07cd079768..01ddd0eb63 100644\n--- a/drivers/event/dpaa/dpaa_eventdev.c\n+++ b/drivers/event/dpaa/dpaa_eventdev.c\n@@ -99,7 +99,7 @@ dpaa_event_enqueue_burst(void *port, const struct rte_event ev[],\n \t\tcase RTE_EVENT_OP_RELEASE:\n \t\t\tqman_dca_index(ev[i].impl_opaque, 0);\n \t\t\tmbuf = DPAA_PER_LCORE_DQRR_MBUF(i);\n-\t\t\tmbuf->seqn = DPAA_INVALID_MBUF_SEQN;\n+\t\t\t*dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;\n \t\t\tDPAA_PER_LCORE_DQRR_HELD &= ~(1 << i);\n \t\t\tDPAA_PER_LCORE_DQRR_SIZE--;\n \t\t\tbreak;\n@@ -206,7 +206,7 @@ dpaa_event_dequeue_burst(void *port, struct rte_event ev[],\n \t\tif (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) {\n \t\t\tqman_dca_index(i, 0);\n \t\t\tmbuf = DPAA_PER_LCORE_DQRR_MBUF(i);\n-\t\t\tmbuf->seqn = DPAA_INVALID_MBUF_SEQN;\n+\t\t\t*dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;\n \t\t\tDPAA_PER_LCORE_DQRR_HELD &= ~(1 << i);\n \t\t\tDPAA_PER_LCORE_DQRR_SIZE--;\n \t\t}\n@@ -276,7 +276,7 @@ dpaa_event_dequeue_burst_intr(void *port, struct rte_event ev[],\n \t\tif (DPAA_PER_LCORE_DQRR_HELD & (1 << i)) {\n \t\t\tqman_dca_index(i, 0);\n \t\t\tmbuf = DPAA_PER_LCORE_DQRR_MBUF(i);\n-\t\t\tmbuf->seqn = DPAA_INVALID_MBUF_SEQN;\n+\t\t\t*dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;\n \t\t\tDPAA_PER_LCORE_DQRR_HELD &= ~(1 << i);\n \t\t\tDPAA_PER_LCORE_DQRR_SIZE--;\n \t\t}\ndiff --git a/drivers/net/dpaa/dpaa_ethdev.h b/drivers/net/dpaa/dpaa_ethdev.h\nindex 1b8e120e8f..659bceb467 100644\n--- a/drivers/net/dpaa/dpaa_ethdev.h\n+++ b/drivers/net/dpaa/dpaa_ethdev.h\n@@ -22,13 +22,6 @@\n #define DPAA_MBUF_HW_ANNOTATION\t\t64\n #define DPAA_FD_PTA_SIZE\t\t64\n \n-/* mbuf->seqn will be used to store event entry index for\n- * driver specific usage. For parallel mode queues, invalid\n- * index will be set and for atomic mode queues, valid value\n- * ranging from 1 to 16.\n- */\n-#define DPAA_INVALID_MBUF_SEQN 0\n-\n /* we will re-use the HEADROOM for annotation in RX */\n #define DPAA_HW_BUF_RESERVE\t0\n #define DPAA_PACKET_LAYOUT_ALIGN\t64\ndiff --git a/drivers/net/dpaa/dpaa_rxtx.c b/drivers/net/dpaa/dpaa_rxtx.c\nindex e4f012c233..e2459d9b99 100644\n--- a/drivers/net/dpaa/dpaa_rxtx.c\n+++ b/drivers/net/dpaa/dpaa_rxtx.c\n@@ -649,7 +649,7 @@ dpaa_rx_cb_parallel(void *event,\n \tev->queue_id = fq->ev.queue_id;\n \tev->priority = fq->ev.priority;\n \tev->impl_opaque = (uint8_t)DPAA_INVALID_MBUF_SEQN;\n-\tmbuf->seqn = DPAA_INVALID_MBUF_SEQN;\n+\t*dpaa_seqn(mbuf) = DPAA_INVALID_MBUF_SEQN;\n \t*bufs = mbuf;\n \n \treturn qman_cb_dqrr_consume;\n@@ -683,7 +683,7 @@ dpaa_rx_cb_atomic(void *event,\n \tDPAA_PER_LCORE_DQRR_HELD |= 1 << index;\n \tDPAA_PER_LCORE_DQRR_MBUF(index) = mbuf;\n \tev->impl_opaque = index + 1;\n-\tmbuf->seqn = (uint32_t)index + 1;\n+\t*dpaa_seqn(mbuf) = (uint32_t)index + 1;\n \t*bufs = mbuf;\n \n \treturn qman_cb_dqrr_defer;\n@@ -1078,7 +1078,7 @@ dpaa_eth_queue_tx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)\n \t\t\tif (dpaa_svr_family == SVR_LS1043A_FAMILY &&\n \t\t\t\t\t(mbuf->data_off & 0x7F) != 0x0)\n \t\t\t\trealloc_mbuf = 1;\n-\t\t\tseqn = mbuf->seqn;\n+\t\t\tseqn = *dpaa_seqn(mbuf);\n \t\t\tif (seqn != DPAA_INVALID_MBUF_SEQN) {\n \t\t\t\tindex = seqn - 1;\n \t\t\t\tif (DPAA_PER_LCORE_DQRR_HELD & (1 << index)) {\n", "prefixes": [ "5/8" ] }