Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/61333/?format=api
{ "id": 61333, "url": "http://patches.dpdk.org/api/patches/61333/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/0c5205b372743b7600e4d3d8076f664243fd9b6e.1571245316.git.anatoly.burakov@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": "<0c5205b372743b7600e4d3d8076f664243fd9b6e.1571245316.git.anatoly.burakov@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/0c5205b372743b7600e4d3d8076f664243fd9b6e.1571245316.git.anatoly.burakov@intel.com", "date": "2019-10-16T17:03:41", "name": "[v3,6/9] distributor: remove deprecated code", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9589ba3d95447a67f07ea1d9a9f51ab68fd3e90a", "submitter": { "id": 4, "url": "http://patches.dpdk.org/api/people/4/?format=api", "name": "Anatoly Burakov", "email": "anatoly.burakov@intel.com" }, "delegate": null, "mbox": "http://patches.dpdk.org/project/dpdk/patch/0c5205b372743b7600e4d3d8076f664243fd9b6e.1571245316.git.anatoly.burakov@intel.com/mbox/", "series": [ { "id": 6889, "url": "http://patches.dpdk.org/api/series/6889/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=6889", "date": "2019-10-16T17:03:35", "name": "Implement the new ABI policy and add helper scripts", "version": 3, "mbox": "http://patches.dpdk.org/series/6889/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/61333/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/61333/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 [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 4ADE11E9D0;\n\tWed, 16 Oct 2019 19:04:09 +0200 (CEST)", "from mga03.intel.com (mga03.intel.com [134.134.136.65])\n\tby dpdk.org (Postfix) with ESMTP id 84D8C1E99E\n\tfor <dev@dpdk.org>; Wed, 16 Oct 2019 19:03:58 +0200 (CEST)", "from fmsmga004.fm.intel.com ([10.253.24.48])\n\tby orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t16 Oct 2019 10:03:58 -0700", "from silpixa00399498.ir.intel.com (HELO\n\tsilpixa00399498.ger.corp.intel.com) ([10.237.223.151])\n\tby fmsmga004.fm.intel.com with ESMTP; 16 Oct 2019 10:03:55 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.67,304,1566889200\"; d=\"scan'208\";a=\"220845015\"", "From": "Anatoly Burakov <anatoly.burakov@intel.com>", "To": "dev@dpdk.org", "Cc": "Marcin Baran <marcinx.baran@intel.com>, David Hunt <david.hunt@intel.com>,\n\tjohn.mcnamara@intel.com, bruce.richardson@intel.com,\n\tthomas@monjalon.net, david.marchand@redhat.com", "Date": "Wed, 16 Oct 2019 18:03:41 +0100", "Message-Id": "<0c5205b372743b7600e4d3d8076f664243fd9b6e.1571245316.git.anatoly.burakov@intel.com>", "X-Mailer": "git-send-email 2.17.1", "In-Reply-To": [ "<cover.1571245316.git.anatoly.burakov@intel.com>", "<cover.1571245316.git.anatoly.burakov@intel.com>" ], "References": [ "<cover.1571245316.git.anatoly.burakov@intel.com>", "<cover.1571229052.git.anatoly.burakov@intel.com>\n\t<cover.1571245316.git.anatoly.burakov@intel.com>" ], "Subject": "[dpdk-dev] [PATCH v3 6/9] distributor: remove deprecated code", "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\t<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\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "From: Marcin Baran <marcinx.baran@intel.com>\n\nRemove code for old ABI versions ahead of ABI version bump.\n\nSigned-off-by: Marcin Baran <marcinx.baran@intel.com>\nSigned-off-by: Anatoly Burakov <anatoly.burakov@intel.com>\n---\n\nNotes:\n v3:\n - Removed single mode from distributor as per Dave's comments\n \n v2:\n - Moved this to before ABI version bump to avoid compile breakage\n\n app/test/test_distributor.c | 102 ++---\n app/test/test_distributor_perf.c | 12 -\n lib/librte_distributor/Makefile | 1 -\n lib/librte_distributor/meson.build | 2 +-\n lib/librte_distributor/rte_distributor.c | 126 +-----\n lib/librte_distributor/rte_distributor.h | 1 -\n .../rte_distributor_private.h | 35 --\n .../rte_distributor_v1705.h | 61 ---\n lib/librte_distributor/rte_distributor_v20.c | 402 ------------------\n lib/librte_distributor/rte_distributor_v20.h | 218 ----------\n .../rte_distributor_version.map | 16 +-\n 11 files changed, 38 insertions(+), 938 deletions(-)\n delete mode 100644 lib/librte_distributor/rte_distributor_v1705.h\n delete mode 100644 lib/librte_distributor/rte_distributor_v20.c\n delete mode 100644 lib/librte_distributor/rte_distributor_v20.h", "diff": "diff --git a/app/test/test_distributor.c b/app/test/test_distributor.c\nindex 7090b55f88..af42f3a991 100644\n--- a/app/test/test_distributor.c\n+++ b/app/test/test_distributor.c\n@@ -511,18 +511,9 @@ test_flush_with_worker_shutdown(struct worker_params *wp,\n static\n int test_error_distributor_create_name(void)\n {\n-\tstruct rte_distributor *d = NULL;\n \tstruct rte_distributor *db = NULL;\n \tchar *name = NULL;\n \n-\td = rte_distributor_create(name, rte_socket_id(),\n-\t\t\trte_lcore_count() - 1,\n-\t\t\tRTE_DIST_ALG_SINGLE);\n-\tif (d != NULL || rte_errno != EINVAL) {\n-\t\tprintf(\"ERROR: No error on create() with NULL name param\\n\");\n-\t\treturn -1;\n-\t}\n-\n \tdb = rte_distributor_create(name, rte_socket_id(),\n \t\t\trte_lcore_count() - 1,\n \t\t\tRTE_DIST_ALG_BURST);\n@@ -538,17 +529,8 @@ int test_error_distributor_create_name(void)\n static\n int test_error_distributor_create_numworkers(void)\n {\n-\tstruct rte_distributor *ds = NULL;\n \tstruct rte_distributor *db = NULL;\n \n-\tds = rte_distributor_create(\"test_numworkers\", rte_socket_id(),\n-\t\t\tRTE_MAX_LCORE + 10,\n-\t\t\tRTE_DIST_ALG_SINGLE);\n-\tif (ds != NULL || rte_errno != EINVAL) {\n-\t\tprintf(\"ERROR: No error on create() with num_workers > MAX\\n\");\n-\t\treturn -1;\n-\t}\n-\n \tdb = rte_distributor_create(\"test_numworkers\", rte_socket_id(),\n \t\t\tRTE_MAX_LCORE + 10,\n \t\t\tRTE_DIST_ALG_BURST);\n@@ -589,11 +571,8 @@ quit_workers(struct worker_params *wp, struct rte_mempool *p)\n static int\n test_distributor(void)\n {\n-\tstatic struct rte_distributor *ds;\n \tstatic struct rte_distributor *db;\n-\tstatic struct rte_distributor *dist[2];\n \tstatic struct rte_mempool *p;\n-\tint i;\n \n \tif (rte_lcore_count() < 2) {\n \t\tprintf(\"Not enough cores for distributor_autotest, expecting at least 2\\n\");\n@@ -613,20 +592,6 @@ test_distributor(void)\n \t\trte_distributor_clear_returns(db);\n \t}\n \n-\tif (ds == NULL) {\n-\t\tds = rte_distributor_create(\"Test_dist_single\",\n-\t\t\t\trte_socket_id(),\n-\t\t\t\trte_lcore_count() - 1,\n-\t\t\tRTE_DIST_ALG_SINGLE);\n-\t\tif (ds == NULL) {\n-\t\t\tprintf(\"Error creating single distributor\\n\");\n-\t\t\treturn -1;\n-\t\t}\n-\t} else {\n-\t\trte_distributor_flush(ds);\n-\t\trte_distributor_clear_returns(ds);\n-\t}\n-\n \tconst unsigned nb_bufs = (511 * rte_lcore_count()) < BIG_BATCH ?\n \t\t\t(BIG_BATCH * 2) - 1 : (511 * rte_lcore_count());\n \tif (p == NULL) {\n@@ -638,52 +603,39 @@ test_distributor(void)\n \t\t}\n \t}\n \n-\tdist[0] = ds;\n-\tdist[1] = db;\n-\n-\tfor (i = 0; i < 2; i++) {\n-\n-\t\tworker_params.dist = dist[i];\n-\t\tif (i)\n-\t\t\tstrlcpy(worker_params.name, \"burst\",\n-\t\t\t\t\tsizeof(worker_params.name));\n-\t\telse\n-\t\t\tstrlcpy(worker_params.name, \"single\",\n-\t\t\t\t\tsizeof(worker_params.name));\n-\n-\t\trte_eal_mp_remote_launch(handle_work,\n-\t\t\t\t&worker_params, SKIP_MASTER);\n-\t\tif (sanity_test(&worker_params, p) < 0)\n+\tworker_params.dist = db;\n+\n+\trte_eal_mp_remote_launch(handle_work,\n+\t\t\t&worker_params, SKIP_MASTER);\n+\tif (sanity_test(&worker_params, p) < 0)\n+\t\tgoto err;\n+\tquit_workers(&worker_params, p);\n+\n+\trte_eal_mp_remote_launch(handle_work_with_free_mbufs,\n+\t\t\t&worker_params, SKIP_MASTER);\n+\tif (sanity_test_with_mbuf_alloc(&worker_params, p) < 0)\n+\t\tgoto err;\n+\tquit_workers(&worker_params, p);\n+\n+\tif (rte_lcore_count() > 2) {\n+\t\trte_eal_mp_remote_launch(handle_work_for_shutdown_test,\n+\t\t\t\t&worker_params,\n+\t\t\t\tSKIP_MASTER);\n+\t\tif (sanity_test_with_worker_shutdown(&worker_params,\n+\t\t\t\tp) < 0)\n \t\t\tgoto err;\n \t\tquit_workers(&worker_params, p);\n \n-\t\trte_eal_mp_remote_launch(handle_work_with_free_mbufs,\n-\t\t\t\t&worker_params, SKIP_MASTER);\n-\t\tif (sanity_test_with_mbuf_alloc(&worker_params, p) < 0)\n+\t\trte_eal_mp_remote_launch(handle_work_for_shutdown_test,\n+\t\t\t\t&worker_params,\n+\t\t\t\tSKIP_MASTER);\n+\t\tif (test_flush_with_worker_shutdown(&worker_params,\n+\t\t\t\tp) < 0)\n \t\t\tgoto err;\n \t\tquit_workers(&worker_params, p);\n \n-\t\tif (rte_lcore_count() > 2) {\n-\t\t\trte_eal_mp_remote_launch(handle_work_for_shutdown_test,\n-\t\t\t\t\t&worker_params,\n-\t\t\t\t\tSKIP_MASTER);\n-\t\t\tif (sanity_test_with_worker_shutdown(&worker_params,\n-\t\t\t\t\tp) < 0)\n-\t\t\t\tgoto err;\n-\t\t\tquit_workers(&worker_params, p);\n-\n-\t\t\trte_eal_mp_remote_launch(handle_work_for_shutdown_test,\n-\t\t\t\t\t&worker_params,\n-\t\t\t\t\tSKIP_MASTER);\n-\t\t\tif (test_flush_with_worker_shutdown(&worker_params,\n-\t\t\t\t\tp) < 0)\n-\t\t\t\tgoto err;\n-\t\t\tquit_workers(&worker_params, p);\n-\n-\t\t} else {\n-\t\t\tprintf(\"Too few cores to run worker shutdown test\\n\");\n-\t\t}\n-\n+\t} else {\n+\t\tprintf(\"Too few cores to run worker shutdown test\\n\");\n \t}\n \n \tif (test_error_distributor_create_numworkers() == -1 ||\ndiff --git a/app/test/test_distributor_perf.c b/app/test/test_distributor_perf.c\nindex 664530ff9e..a0bbae1a16 100644\n--- a/app/test/test_distributor_perf.c\n+++ b/app/test/test_distributor_perf.c\n@@ -215,18 +215,6 @@ test_distributor_perf(void)\n \t/* first time how long it takes to round-trip a cache line */\n \ttime_cache_line_switch();\n \n-\tif (ds == NULL) {\n-\t\tds = rte_distributor_create(\"Test_perf\", rte_socket_id(),\n-\t\t\t\trte_lcore_count() - 1,\n-\t\t\t\tRTE_DIST_ALG_SINGLE);\n-\t\tif (ds == NULL) {\n-\t\t\tprintf(\"Error creating distributor\\n\");\n-\t\t\treturn -1;\n-\t\t}\n-\t} else {\n-\t\trte_distributor_clear_returns(ds);\n-\t}\n-\n \tif (db == NULL) {\n \t\tdb = rte_distributor_create(\"Test_burst\", rte_socket_id(),\n \t\t\t\trte_lcore_count() - 1,\ndiff --git a/lib/librte_distributor/Makefile b/lib/librte_distributor/Makefile\nindex 0ef80dcff4..54e9b0cc27 100644\n--- a/lib/librte_distributor/Makefile\n+++ b/lib/librte_distributor/Makefile\n@@ -15,7 +15,6 @@ EXPORT_MAP := rte_distributor_version.map\n LIBABIVER := 1\n \n # all source are stored in SRCS-y\n-SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) := rte_distributor_v20.c\n SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor.c\n ifeq ($(CONFIG_RTE_ARCH_X86),y)\n SRCS-$(CONFIG_RTE_LIBRTE_DISTRIBUTOR) += rte_distributor_match_sse.c\ndiff --git a/lib/librte_distributor/meson.build b/lib/librte_distributor/meson.build\nindex dba7e3b2aa..d3e2aaa9e0 100644\n--- a/lib/librte_distributor/meson.build\n+++ b/lib/librte_distributor/meson.build\n@@ -1,7 +1,7 @@\n # SPDX-License-Identifier: BSD-3-Clause\n # Copyright(c) 2017 Intel Corporation\n \n-sources = files('rte_distributor.c', 'rte_distributor_v20.c')\n+sources = files('rte_distributor.c')\n if arch_subdir == 'x86'\n \tsources += files('rte_distributor_match_sse.c')\n else\ndiff --git a/lib/librte_distributor/rte_distributor.c b/lib/librte_distributor/rte_distributor.c\nindex 21eb1fb0a1..d74fa468c8 100644\n--- a/lib/librte_distributor/rte_distributor.c\n+++ b/lib/librte_distributor/rte_distributor.c\n@@ -18,8 +18,6 @@\n \n #include \"rte_distributor_private.h\"\n #include \"rte_distributor.h\"\n-#include \"rte_distributor_v20.h\"\n-#include \"rte_distributor_v1705.h\"\n \n TAILQ_HEAD(rte_dist_burst_list, rte_distributor);\n \n@@ -33,7 +31,7 @@ EAL_REGISTER_TAILQ(rte_dist_burst_tailq)\n /**** Burst Packet APIs called by workers ****/\n \n void\n-rte_distributor_request_pkt_v1705(struct rte_distributor *d,\n+rte_distributor_request_pkt(struct rte_distributor *d,\n \t\tunsigned int worker_id, struct rte_mbuf **oldpkt,\n \t\tunsigned int count)\n {\n@@ -42,12 +40,6 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,\n \n \tvolatile int64_t *retptr64;\n \n-\tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n-\t\trte_distributor_request_pkt_v20(d->d_v20,\n-\t\t\tworker_id, oldpkt[0]);\n-\t\treturn;\n-\t}\n-\n \tretptr64 = &(buf->retptr64[0]);\n \t/* Spin while handshake bits are set (scheduler clears it) */\n \twhile (unlikely(*retptr64 & RTE_DISTRIB_GET_BUF)) {\n@@ -78,14 +70,9 @@ rte_distributor_request_pkt_v1705(struct rte_distributor *d,\n \t */\n \t*retptr64 |= RTE_DISTRIB_GET_BUF;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_request_pkt, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(void rte_distributor_request_pkt(struct rte_distributor *d,\n-\t\tunsigned int worker_id, struct rte_mbuf **oldpkt,\n-\t\tunsigned int count),\n-\t\trte_distributor_request_pkt_v1705);\n \n int\n-rte_distributor_poll_pkt_v1705(struct rte_distributor *d,\n+rte_distributor_poll_pkt(struct rte_distributor *d,\n \t\tunsigned int worker_id, struct rte_mbuf **pkts)\n {\n \tstruct rte_distributor_buffer *buf = &d->bufs[worker_id];\n@@ -93,11 +80,6 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,\n \tint count = 0;\n \tunsigned int i;\n \n-\tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n-\t\tpkts[0] = rte_distributor_poll_pkt_v20(d->d_v20, worker_id);\n-\t\treturn (pkts[0]) ? 1 : 0;\n-\t}\n-\n \t/* If bit is set, return */\n \tif (buf->bufptr64[0] & RTE_DISTRIB_GET_BUF)\n \t\treturn -1;\n@@ -119,27 +101,14 @@ rte_distributor_poll_pkt_v1705(struct rte_distributor *d,\n \n \treturn count;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_poll_pkt, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(int rte_distributor_poll_pkt(struct rte_distributor *d,\n-\t\tunsigned int worker_id, struct rte_mbuf **pkts),\n-\t\trte_distributor_poll_pkt_v1705);\n \n int\n-rte_distributor_get_pkt_v1705(struct rte_distributor *d,\n+rte_distributor_get_pkt(struct rte_distributor *d,\n \t\tunsigned int worker_id, struct rte_mbuf **pkts,\n \t\tstruct rte_mbuf **oldpkt, unsigned int return_count)\n {\n \tint count;\n \n-\tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n-\t\tif (return_count <= 1) {\n-\t\t\tpkts[0] = rte_distributor_get_pkt_v20(d->d_v20,\n-\t\t\t\tworker_id, oldpkt[0]);\n-\t\t\treturn (pkts[0]) ? 1 : 0;\n-\t\t} else\n-\t\t\treturn -EINVAL;\n-\t}\n-\n \trte_distributor_request_pkt(d, worker_id, oldpkt, return_count);\n \n \tcount = rte_distributor_poll_pkt(d, worker_id, pkts);\n@@ -153,27 +122,14 @@ rte_distributor_get_pkt_v1705(struct rte_distributor *d,\n \t}\n \treturn count;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_get_pkt, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(int rte_distributor_get_pkt(struct rte_distributor *d,\n-\t\tunsigned int worker_id, struct rte_mbuf **pkts,\n-\t\tstruct rte_mbuf **oldpkt, unsigned int return_count),\n-\t\trte_distributor_get_pkt_v1705);\n \n int\n-rte_distributor_return_pkt_v1705(struct rte_distributor *d,\n+rte_distributor_return_pkt(struct rte_distributor *d,\n \t\tunsigned int worker_id, struct rte_mbuf **oldpkt, int num)\n {\n \tstruct rte_distributor_buffer *buf = &d->bufs[worker_id];\n \tunsigned int i;\n \n-\tif (unlikely(d->alg_type == RTE_DIST_ALG_SINGLE)) {\n-\t\tif (num == 1)\n-\t\t\treturn rte_distributor_return_pkt_v20(d->d_v20,\n-\t\t\t\tworker_id, oldpkt[0]);\n-\t\telse\n-\t\t\treturn -EINVAL;\n-\t}\n-\n \tfor (i = 0; i < RTE_DIST_BURST_SIZE; i++)\n \t\t/* Switch off the return bit first */\n \t\tbuf->retptr64[i] &= ~RTE_DISTRIB_RETURN_BUF;\n@@ -187,10 +143,6 @@ rte_distributor_return_pkt_v1705(struct rte_distributor *d,\n \n \treturn 0;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_return_pkt, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(int rte_distributor_return_pkt(struct rte_distributor *d,\n-\t\tunsigned int worker_id, struct rte_mbuf **oldpkt, int num),\n-\t\trte_distributor_return_pkt_v1705);\n \n /**** APIs called on distributor core ***/\n \n@@ -336,7 +288,7 @@ release(struct rte_distributor *d, unsigned int wkr)\n \n /* process a set of packets to distribute them to workers */\n int\n-rte_distributor_process_v1705(struct rte_distributor *d,\n+rte_distributor_process(struct rte_distributor *d,\n \t\tstruct rte_mbuf **mbufs, unsigned int num_mbufs)\n {\n \tunsigned int next_idx = 0;\n@@ -347,11 +299,6 @@ rte_distributor_process_v1705(struct rte_distributor *d,\n \tuint16_t flows[RTE_DIST_BURST_SIZE] __rte_cache_aligned;\n \tunsigned int i, j, w, wid;\n \n-\tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n-\t\t/* Call the old API */\n-\t\treturn rte_distributor_process_v20(d->d_v20, mbufs, num_mbufs);\n-\t}\n-\n \tif (unlikely(num_mbufs == 0)) {\n \t\t/* Flush out all non-full cache-lines to workers. */\n \t\tfor (wid = 0 ; wid < d->num_workers; wid++) {\n@@ -470,14 +417,10 @@ rte_distributor_process_v1705(struct rte_distributor *d,\n \n \treturn num_mbufs;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_process, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(int rte_distributor_process(struct rte_distributor *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned int num_mbufs),\n-\t\trte_distributor_process_v1705);\n \n /* return to the caller, packets returned from workers */\n int\n-rte_distributor_returned_pkts_v1705(struct rte_distributor *d,\n+rte_distributor_returned_pkts(struct rte_distributor *d,\n \t\tstruct rte_mbuf **mbufs, unsigned int max_mbufs)\n {\n \tstruct rte_distributor_returned_pkts *returns = &d->returns;\n@@ -485,12 +428,6 @@ rte_distributor_returned_pkts_v1705(struct rte_distributor *d,\n \t\t\tmax_mbufs : returns->count;\n \tunsigned int i;\n \n-\tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n-\t\t/* Call the old API */\n-\t\treturn rte_distributor_returned_pkts_v20(d->d_v20,\n-\t\t\t\tmbufs, max_mbufs);\n-\t}\n-\n \tfor (i = 0; i < retval; i++) {\n \t\tunsigned int idx = (returns->start + i) &\n \t\t\t\tRTE_DISTRIB_RETURNS_MASK;\n@@ -502,10 +439,6 @@ rte_distributor_returned_pkts_v1705(struct rte_distributor *d,\n \n \treturn retval;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_returned_pkts, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(int rte_distributor_returned_pkts(struct rte_distributor *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned int max_mbufs),\n-\t\trte_distributor_returned_pkts_v1705);\n \n /*\n * Return the number of packets in-flight in a distributor, i.e. packets\n@@ -527,16 +460,11 @@ total_outstanding(const struct rte_distributor *d)\n * queued up.\n */\n int\n-rte_distributor_flush_v1705(struct rte_distributor *d)\n+rte_distributor_flush(struct rte_distributor *d)\n {\n \tunsigned int flushed;\n \tunsigned int wkr;\n \n-\tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n-\t\t/* Call the old API */\n-\t\treturn rte_distributor_flush_v20(d->d_v20);\n-\t}\n-\n \tflushed = total_outstanding(d);\n \n \twhile (total_outstanding(d) > 0)\n@@ -556,33 +484,21 @@ rte_distributor_flush_v1705(struct rte_distributor *d)\n \n \treturn flushed;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_flush, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(int rte_distributor_flush(struct rte_distributor *d),\n-\t\trte_distributor_flush_v1705);\n \n /* clears the internal returns array in the distributor */\n void\n-rte_distributor_clear_returns_v1705(struct rte_distributor *d)\n+rte_distributor_clear_returns(struct rte_distributor *d)\n {\n \tunsigned int wkr;\n \n-\tif (d->alg_type == RTE_DIST_ALG_SINGLE) {\n-\t\t/* Call the old API */\n-\t\trte_distributor_clear_returns_v20(d->d_v20);\n-\t\treturn;\n-\t}\n-\n \t/* throw away returns, so workers can exit */\n \tfor (wkr = 0; wkr < d->num_workers; wkr++)\n \t\td->bufs[wkr].retptr64[0] = 0;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_clear_returns, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(void rte_distributor_clear_returns(struct rte_distributor *d),\n-\t\trte_distributor_clear_returns_v1705);\n \n /* creates a distributor instance */\n struct rte_distributor *\n-rte_distributor_create_v1705(const char *name,\n+rte_distributor_create(const char *name,\n \t\tunsigned int socket_id,\n \t\tunsigned int num_workers,\n \t\tunsigned int alg_type)\n@@ -593,8 +509,6 @@ rte_distributor_create_v1705(const char *name,\n \tconst struct rte_memzone *mz;\n \tunsigned int i;\n \n-\t/* TODO Reorganise function properly around RTE_DIST_ALG_SINGLE/BURST */\n-\n \t/* compilation-time checks */\n \tRTE_BUILD_BUG_ON((sizeof(*d) & RTE_CACHE_LINE_MASK) != 0);\n \tRTE_BUILD_BUG_ON((RTE_DISTRIB_MAX_WORKERS & 7) != 0);\n@@ -605,23 +519,6 @@ rte_distributor_create_v1705(const char *name,\n \t\treturn NULL;\n \t}\n \n-\tif (alg_type == RTE_DIST_ALG_SINGLE) {\n-\t\td = malloc(sizeof(struct rte_distributor));\n-\t\tif (d == NULL) {\n-\t\t\trte_errno = ENOMEM;\n-\t\t\treturn NULL;\n-\t\t}\n-\t\td->d_v20 = rte_distributor_create_v20(name,\n-\t\t\t\tsocket_id, num_workers);\n-\t\tif (d->d_v20 == NULL) {\n-\t\t\tfree(d);\n-\t\t\t/* rte_errno will have been set */\n-\t\t\treturn NULL;\n-\t\t}\n-\t\td->alg_type = alg_type;\n-\t\treturn d;\n-\t}\n-\n \tsnprintf(mz_name, sizeof(mz_name), RTE_DISTRIB_PREFIX\"%s\", name);\n \tmz = rte_memzone_reserve(mz_name, sizeof(*d), socket_id, NO_FLAGS);\n \tif (mz == NULL) {\n@@ -656,8 +553,3 @@ rte_distributor_create_v1705(const char *name,\n \n \treturn d;\n }\n-BIND_DEFAULT_SYMBOL(rte_distributor_create, _v1705, 17.05);\n-MAP_STATIC_SYMBOL(struct rte_distributor *rte_distributor_create(\n-\t\tconst char *name, unsigned int socket_id,\n-\t\tunsigned int num_workers, unsigned int alg_type),\n-\t\trte_distributor_create_v1705);\ndiff --git a/lib/librte_distributor/rte_distributor.h b/lib/librte_distributor/rte_distributor.h\nindex 327c0c4ab2..41c06093ee 100644\n--- a/lib/librte_distributor/rte_distributor.h\n+++ b/lib/librte_distributor/rte_distributor.h\n@@ -20,7 +20,6 @@ extern \"C\" {\n /* Type of distribution (burst/single) */\n enum rte_distributor_alg_type {\n \tRTE_DIST_ALG_BURST = 0,\n-\tRTE_DIST_ALG_SINGLE,\n \tRTE_DIST_NUM_ALG_TYPES\n };\n \ndiff --git a/lib/librte_distributor/rte_distributor_private.h b/lib/librte_distributor/rte_distributor_private.h\nindex 33cd89410c..552eecc88f 100644\n--- a/lib/librte_distributor/rte_distributor_private.h\n+++ b/lib/librte_distributor/rte_distributor_private.h\n@@ -48,18 +48,6 @@ extern \"C\" {\n \n #define RTE_DISTRIBUTOR_NAMESIZE 32 /**< Length of name for instance */\n \n-/**\n- * Buffer structure used to pass the pointer data between cores. This is cache\n- * line aligned, but to improve performance and prevent adjacent cache-line\n- * prefetches of buffers for other workers, e.g. when worker 1's buffer is on\n- * the next cache line to worker 0, we pad this out to three cache lines.\n- * Only 64-bits of the memory is actually used though.\n- */\n-union rte_distributor_buffer_v20 {\n-\tvolatile int64_t bufptr64;\n-\tchar pad[RTE_CACHE_LINE_SIZE*3];\n-} __rte_cache_aligned;\n-\n /*\n * Transfer up to 8 mbufs at a time to/from workers, and\n * flow matching algorithm optimized for 8 flow IDs at a time\n@@ -80,27 +68,6 @@ struct rte_distributor_returned_pkts {\n \tstruct rte_mbuf *mbufs[RTE_DISTRIB_MAX_RETURNS];\n };\n \n-struct rte_distributor_v20 {\n-\tTAILQ_ENTRY(rte_distributor_v20) next; /**< Next in list. */\n-\n-\tchar name[RTE_DISTRIBUTOR_NAMESIZE]; /**< Name of the ring. */\n-\tunsigned int num_workers; /**< Number of workers polling */\n-\n-\tuint32_t in_flight_tags[RTE_DISTRIB_MAX_WORKERS];\n-\t\t/**< Tracks the tag being processed per core */\n-\tuint64_t in_flight_bitmask;\n-\t\t/**< on/off bits for in-flight tags.\n-\t\t * Note that if RTE_DISTRIB_MAX_WORKERS is larger than 64 then\n-\t\t * the bitmask has to expand.\n-\t\t */\n-\n-\tstruct rte_distributor_backlog backlog[RTE_DISTRIB_MAX_WORKERS];\n-\n-\tunion rte_distributor_buffer_v20 bufs[RTE_DISTRIB_MAX_WORKERS];\n-\n-\tstruct rte_distributor_returned_pkts returns;\n-};\n-\n /* All different signature compare functions */\n enum rte_distributor_match_function {\n \tRTE_DIST_MATCH_SCALAR = 0,\n@@ -153,8 +120,6 @@ struct rte_distributor {\n \tstruct rte_distributor_returned_pkts returns;\n \n \tenum rte_distributor_match_function dist_match_fn;\n-\n-\tstruct rte_distributor_v20 *d_v20;\n };\n \n void\ndiff --git a/lib/librte_distributor/rte_distributor_v1705.h b/lib/librte_distributor/rte_distributor_v1705.h\ndeleted file mode 100644\nindex df4d9e8150..0000000000\n--- a/lib/librte_distributor/rte_distributor_v1705.h\n+++ /dev/null\n@@ -1,61 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2017 Intel Corporation\n- */\n-\n-#ifndef _RTE_DISTRIB_V1705_H_\n-#define _RTE_DISTRIB_V1705_H_\n-\n-/**\n- * @file\n- * RTE distributor\n- *\n- * The distributor is a component which is designed to pass packets\n- * one-at-a-time to workers, with dynamic load balancing.\n- */\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-struct rte_distributor *\n-rte_distributor_create_v1705(const char *name, unsigned int socket_id,\n-\t\tunsigned int num_workers,\n-\t\tunsigned int alg_type);\n-\n-int\n-rte_distributor_process_v1705(struct rte_distributor *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned int num_mbufs);\n-\n-int\n-rte_distributor_returned_pkts_v1705(struct rte_distributor *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned int max_mbufs);\n-\n-int\n-rte_distributor_flush_v1705(struct rte_distributor *d);\n-\n-void\n-rte_distributor_clear_returns_v1705(struct rte_distributor *d);\n-\n-int\n-rte_distributor_get_pkt_v1705(struct rte_distributor *d,\n-\tunsigned int worker_id, struct rte_mbuf **pkts,\n-\tstruct rte_mbuf **oldpkt, unsigned int retcount);\n-\n-int\n-rte_distributor_return_pkt_v1705(struct rte_distributor *d,\n-\tunsigned int worker_id, struct rte_mbuf **oldpkt, int num);\n-\n-void\n-rte_distributor_request_pkt_v1705(struct rte_distributor *d,\n-\t\tunsigned int worker_id, struct rte_mbuf **oldpkt,\n-\t\tunsigned int count);\n-\n-int\n-rte_distributor_poll_pkt_v1705(struct rte_distributor *d,\n-\t\tunsigned int worker_id, struct rte_mbuf **mbufs);\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif\ndiff --git a/lib/librte_distributor/rte_distributor_v20.c b/lib/librte_distributor/rte_distributor_v20.c\ndeleted file mode 100644\nindex cdc0969a89..0000000000\n--- a/lib/librte_distributor/rte_distributor_v20.c\n+++ /dev/null\n@@ -1,402 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2010-2014 Intel Corporation\n- */\n-\n-#include <stdio.h>\n-#include <sys/queue.h>\n-#include <string.h>\n-#include <rte_mbuf.h>\n-#include <rte_memory.h>\n-#include <rte_memzone.h>\n-#include <rte_errno.h>\n-#include <rte_compat.h>\n-#include <rte_string_fns.h>\n-#include <rte_eal_memconfig.h>\n-#include <rte_pause.h>\n-#include <rte_tailq.h>\n-\n-#include \"rte_distributor_v20.h\"\n-#include \"rte_distributor_private.h\"\n-\n-TAILQ_HEAD(rte_distributor_list, rte_distributor_v20);\n-\n-static struct rte_tailq_elem rte_distributor_tailq = {\n-\t.name = \"RTE_DISTRIBUTOR\",\n-};\n-EAL_REGISTER_TAILQ(rte_distributor_tailq)\n-\n-/**** APIs called by workers ****/\n-\n-void\n-rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned worker_id, struct rte_mbuf *oldpkt)\n-{\n-\tunion rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];\n-\tint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)\n-\t\t\t| RTE_DISTRIB_GET_BUF;\n-\twhile (unlikely(buf->bufptr64 & RTE_DISTRIB_FLAGS_MASK))\n-\t\trte_pause();\n-\tbuf->bufptr64 = req;\n-}\n-VERSION_SYMBOL(rte_distributor_request_pkt, _v20, 2.0);\n-\n-struct rte_mbuf *\n-rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned worker_id)\n-{\n-\tunion rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];\n-\tif (buf->bufptr64 & RTE_DISTRIB_GET_BUF)\n-\t\treturn NULL;\n-\n-\t/* since bufptr64 is signed, this should be an arithmetic shift */\n-\tint64_t ret = buf->bufptr64 >> RTE_DISTRIB_FLAG_BITS;\n-\treturn (struct rte_mbuf *)((uintptr_t)ret);\n-}\n-VERSION_SYMBOL(rte_distributor_poll_pkt, _v20, 2.0);\n-\n-struct rte_mbuf *\n-rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned worker_id, struct rte_mbuf *oldpkt)\n-{\n-\tstruct rte_mbuf *ret;\n-\trte_distributor_request_pkt_v20(d, worker_id, oldpkt);\n-\twhile ((ret = rte_distributor_poll_pkt_v20(d, worker_id)) == NULL)\n-\t\trte_pause();\n-\treturn ret;\n-}\n-VERSION_SYMBOL(rte_distributor_get_pkt, _v20, 2.0);\n-\n-int\n-rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned worker_id, struct rte_mbuf *oldpkt)\n-{\n-\tunion rte_distributor_buffer_v20 *buf = &d->bufs[worker_id];\n-\tuint64_t req = (((int64_t)(uintptr_t)oldpkt) << RTE_DISTRIB_FLAG_BITS)\n-\t\t\t| RTE_DISTRIB_RETURN_BUF;\n-\tbuf->bufptr64 = req;\n-\treturn 0;\n-}\n-VERSION_SYMBOL(rte_distributor_return_pkt, _v20, 2.0);\n-\n-/**** APIs called on distributor core ***/\n-\n-/* as name suggests, adds a packet to the backlog for a particular worker */\n-static int\n-add_to_backlog(struct rte_distributor_backlog *bl, int64_t item)\n-{\n-\tif (bl->count == RTE_DISTRIB_BACKLOG_SIZE)\n-\t\treturn -1;\n-\n-\tbl->pkts[(bl->start + bl->count++) & (RTE_DISTRIB_BACKLOG_MASK)]\n-\t\t\t= item;\n-\treturn 0;\n-}\n-\n-/* takes the next packet for a worker off the backlog */\n-static int64_t\n-backlog_pop(struct rte_distributor_backlog *bl)\n-{\n-\tbl->count--;\n-\treturn bl->pkts[bl->start++ & RTE_DISTRIB_BACKLOG_MASK];\n-}\n-\n-/* stores a packet returned from a worker inside the returns array */\n-static inline void\n-store_return(uintptr_t oldbuf, struct rte_distributor_v20 *d,\n-\t\tunsigned *ret_start, unsigned *ret_count)\n-{\n-\t/* store returns in a circular buffer - code is branch-free */\n-\td->returns.mbufs[(*ret_start + *ret_count) & RTE_DISTRIB_RETURNS_MASK]\n-\t\t\t= (void *)oldbuf;\n-\t*ret_start += (*ret_count == RTE_DISTRIB_RETURNS_MASK) & !!(oldbuf);\n-\t*ret_count += (*ret_count != RTE_DISTRIB_RETURNS_MASK) & !!(oldbuf);\n-}\n-\n-static inline void\n-handle_worker_shutdown(struct rte_distributor_v20 *d, unsigned int wkr)\n-{\n-\td->in_flight_tags[wkr] = 0;\n-\td->in_flight_bitmask &= ~(1UL << wkr);\n-\td->bufs[wkr].bufptr64 = 0;\n-\tif (unlikely(d->backlog[wkr].count != 0)) {\n-\t\t/* On return of a packet, we need to move the\n-\t\t * queued packets for this core elsewhere.\n-\t\t * Easiest solution is to set things up for\n-\t\t * a recursive call. That will cause those\n-\t\t * packets to be queued up for the next free\n-\t\t * core, i.e. it will return as soon as a\n-\t\t * core becomes free to accept the first\n-\t\t * packet, as subsequent ones will be added to\n-\t\t * the backlog for that core.\n-\t\t */\n-\t\tstruct rte_mbuf *pkts[RTE_DISTRIB_BACKLOG_SIZE];\n-\t\tunsigned i;\n-\t\tstruct rte_distributor_backlog *bl = &d->backlog[wkr];\n-\n-\t\tfor (i = 0; i < bl->count; i++) {\n-\t\t\tunsigned idx = (bl->start + i) &\n-\t\t\t\t\tRTE_DISTRIB_BACKLOG_MASK;\n-\t\t\tpkts[i] = (void *)((uintptr_t)(bl->pkts[idx] >>\n-\t\t\t\t\tRTE_DISTRIB_FLAG_BITS));\n-\t\t}\n-\t\t/* recursive call.\n-\t\t * Note that the tags were set before first level call\n-\t\t * to rte_distributor_process.\n-\t\t */\n-\t\trte_distributor_process_v20(d, pkts, i);\n-\t\tbl->count = bl->start = 0;\n-\t}\n-}\n-\n-/* this function is called when process() fn is called without any new\n- * packets. It goes through all the workers and clears any returned packets\n- * to do a partial flush.\n- */\n-static int\n-process_returns(struct rte_distributor_v20 *d)\n-{\n-\tunsigned wkr;\n-\tunsigned flushed = 0;\n-\tunsigned ret_start = d->returns.start,\n-\t\t\tret_count = d->returns.count;\n-\n-\tfor (wkr = 0; wkr < d->num_workers; wkr++) {\n-\n-\t\tconst int64_t data = d->bufs[wkr].bufptr64;\n-\t\tuintptr_t oldbuf = 0;\n-\n-\t\tif (data & RTE_DISTRIB_GET_BUF) {\n-\t\t\tflushed++;\n-\t\t\tif (d->backlog[wkr].count)\n-\t\t\t\td->bufs[wkr].bufptr64 =\n-\t\t\t\t\t\tbacklog_pop(&d->backlog[wkr]);\n-\t\t\telse {\n-\t\t\t\td->bufs[wkr].bufptr64 = RTE_DISTRIB_GET_BUF;\n-\t\t\t\td->in_flight_tags[wkr] = 0;\n-\t\t\t\td->in_flight_bitmask &= ~(1UL << wkr);\n-\t\t\t}\n-\t\t\toldbuf = data >> RTE_DISTRIB_FLAG_BITS;\n-\t\t} else if (data & RTE_DISTRIB_RETURN_BUF) {\n-\t\t\thandle_worker_shutdown(d, wkr);\n-\t\t\toldbuf = data >> RTE_DISTRIB_FLAG_BITS;\n-\t\t}\n-\n-\t\tstore_return(oldbuf, d, &ret_start, &ret_count);\n-\t}\n-\n-\td->returns.start = ret_start;\n-\td->returns.count = ret_count;\n-\n-\treturn flushed;\n-}\n-\n-/* process a set of packets to distribute them to workers */\n-int\n-rte_distributor_process_v20(struct rte_distributor_v20 *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned num_mbufs)\n-{\n-\tunsigned next_idx = 0;\n-\tunsigned wkr = 0;\n-\tstruct rte_mbuf *next_mb = NULL;\n-\tint64_t next_value = 0;\n-\tuint32_t new_tag = 0;\n-\tunsigned ret_start = d->returns.start,\n-\t\t\tret_count = d->returns.count;\n-\n-\tif (unlikely(num_mbufs == 0))\n-\t\treturn process_returns(d);\n-\n-\twhile (next_idx < num_mbufs || next_mb != NULL) {\n-\n-\t\tint64_t data = d->bufs[wkr].bufptr64;\n-\t\tuintptr_t oldbuf = 0;\n-\n-\t\tif (!next_mb) {\n-\t\t\tnext_mb = mbufs[next_idx++];\n-\t\t\tnext_value = (((int64_t)(uintptr_t)next_mb)\n-\t\t\t\t\t<< RTE_DISTRIB_FLAG_BITS);\n-\t\t\t/*\n-\t\t\t * User is advocated to set tag value for each\n-\t\t\t * mbuf before calling rte_distributor_process.\n-\t\t\t * User defined tags are used to identify flows,\n-\t\t\t * or sessions.\n-\t\t\t */\n-\t\t\tnew_tag = next_mb->hash.usr;\n-\n-\t\t\t/*\n-\t\t\t * Note that if RTE_DISTRIB_MAX_WORKERS is larger than 64\n-\t\t\t * then the size of match has to be expanded.\n-\t\t\t */\n-\t\t\tuint64_t match = 0;\n-\t\t\tunsigned i;\n-\t\t\t/*\n-\t\t\t * to scan for a match use \"xor\" and \"not\" to get a 0/1\n-\t\t\t * value, then use shifting to merge to single \"match\"\n-\t\t\t * variable, where a one-bit indicates a match for the\n-\t\t\t * worker given by the bit-position\n-\t\t\t */\n-\t\t\tfor (i = 0; i < d->num_workers; i++)\n-\t\t\t\tmatch |= (!(d->in_flight_tags[i] ^ new_tag)\n-\t\t\t\t\t<< i);\n-\n-\t\t\t/* Only turned-on bits are considered as match */\n-\t\t\tmatch &= d->in_flight_bitmask;\n-\n-\t\t\tif (match) {\n-\t\t\t\tnext_mb = NULL;\n-\t\t\t\tunsigned worker = __builtin_ctzl(match);\n-\t\t\t\tif (add_to_backlog(&d->backlog[worker],\n-\t\t\t\t\t\tnext_value) < 0)\n-\t\t\t\t\tnext_idx--;\n-\t\t\t}\n-\t\t}\n-\n-\t\tif ((data & RTE_DISTRIB_GET_BUF) &&\n-\t\t\t\t(d->backlog[wkr].count || next_mb)) {\n-\n-\t\t\tif (d->backlog[wkr].count)\n-\t\t\t\td->bufs[wkr].bufptr64 =\n-\t\t\t\t\t\tbacklog_pop(&d->backlog[wkr]);\n-\n-\t\t\telse {\n-\t\t\t\td->bufs[wkr].bufptr64 = next_value;\n-\t\t\t\td->in_flight_tags[wkr] = new_tag;\n-\t\t\t\td->in_flight_bitmask |= (1UL << wkr);\n-\t\t\t\tnext_mb = NULL;\n-\t\t\t}\n-\t\t\toldbuf = data >> RTE_DISTRIB_FLAG_BITS;\n-\t\t} else if (data & RTE_DISTRIB_RETURN_BUF) {\n-\t\t\thandle_worker_shutdown(d, wkr);\n-\t\t\toldbuf = data >> RTE_DISTRIB_FLAG_BITS;\n-\t\t}\n-\n-\t\t/* store returns in a circular buffer */\n-\t\tstore_return(oldbuf, d, &ret_start, &ret_count);\n-\n-\t\tif (++wkr == d->num_workers)\n-\t\t\twkr = 0;\n-\t}\n-\t/* to finish, check all workers for backlog and schedule work for them\n-\t * if they are ready */\n-\tfor (wkr = 0; wkr < d->num_workers; wkr++)\n-\t\tif (d->backlog[wkr].count &&\n-\t\t\t\t(d->bufs[wkr].bufptr64 & RTE_DISTRIB_GET_BUF)) {\n-\n-\t\t\tint64_t oldbuf = d->bufs[wkr].bufptr64 >>\n-\t\t\t\t\tRTE_DISTRIB_FLAG_BITS;\n-\t\t\tstore_return(oldbuf, d, &ret_start, &ret_count);\n-\n-\t\t\td->bufs[wkr].bufptr64 = backlog_pop(&d->backlog[wkr]);\n-\t\t}\n-\n-\td->returns.start = ret_start;\n-\td->returns.count = ret_count;\n-\treturn num_mbufs;\n-}\n-VERSION_SYMBOL(rte_distributor_process, _v20, 2.0);\n-\n-/* return to the caller, packets returned from workers */\n-int\n-rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned max_mbufs)\n-{\n-\tstruct rte_distributor_returned_pkts *returns = &d->returns;\n-\tunsigned retval = (max_mbufs < returns->count) ?\n-\t\t\tmax_mbufs : returns->count;\n-\tunsigned i;\n-\n-\tfor (i = 0; i < retval; i++) {\n-\t\tunsigned idx = (returns->start + i) & RTE_DISTRIB_RETURNS_MASK;\n-\t\tmbufs[i] = returns->mbufs[idx];\n-\t}\n-\treturns->start += i;\n-\treturns->count -= i;\n-\n-\treturn retval;\n-}\n-VERSION_SYMBOL(rte_distributor_returned_pkts, _v20, 2.0);\n-\n-/* return the number of packets in-flight in a distributor, i.e. packets\n- * being worked on or queued up in a backlog.\n- */\n-static inline unsigned\n-total_outstanding(const struct rte_distributor_v20 *d)\n-{\n-\tunsigned wkr, total_outstanding;\n-\n-\ttotal_outstanding = __builtin_popcountl(d->in_flight_bitmask);\n-\n-\tfor (wkr = 0; wkr < d->num_workers; wkr++)\n-\t\ttotal_outstanding += d->backlog[wkr].count;\n-\n-\treturn total_outstanding;\n-}\n-\n-/* flush the distributor, so that there are no outstanding packets in flight or\n- * queued up. */\n-int\n-rte_distributor_flush_v20(struct rte_distributor_v20 *d)\n-{\n-\tconst unsigned flushed = total_outstanding(d);\n-\n-\twhile (total_outstanding(d) > 0)\n-\t\trte_distributor_process_v20(d, NULL, 0);\n-\n-\treturn flushed;\n-}\n-VERSION_SYMBOL(rte_distributor_flush, _v20, 2.0);\n-\n-/* clears the internal returns array in the distributor */\n-void\n-rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d)\n-{\n-\td->returns.start = d->returns.count = 0;\n-#ifndef __OPTIMIZE__\n-\tmemset(d->returns.mbufs, 0, sizeof(d->returns.mbufs));\n-#endif\n-}\n-VERSION_SYMBOL(rte_distributor_clear_returns, _v20, 2.0);\n-\n-/* creates a distributor instance */\n-struct rte_distributor_v20 *\n-rte_distributor_create_v20(const char *name,\n-\t\tunsigned socket_id,\n-\t\tunsigned num_workers)\n-{\n-\tstruct rte_distributor_v20 *d;\n-\tstruct rte_distributor_list *distributor_list;\n-\tchar mz_name[RTE_MEMZONE_NAMESIZE];\n-\tconst struct rte_memzone *mz;\n-\n-\t/* compilation-time checks */\n-\tRTE_BUILD_BUG_ON((sizeof(*d) & RTE_CACHE_LINE_MASK) != 0);\n-\tRTE_BUILD_BUG_ON((RTE_DISTRIB_MAX_WORKERS & 7) != 0);\n-\tRTE_BUILD_BUG_ON(RTE_DISTRIB_MAX_WORKERS >\n-\t\t\t\tsizeof(d->in_flight_bitmask) * CHAR_BIT);\n-\n-\tif (name == NULL || num_workers >= RTE_DISTRIB_MAX_WORKERS) {\n-\t\trte_errno = EINVAL;\n-\t\treturn NULL;\n-\t}\n-\n-\tsnprintf(mz_name, sizeof(mz_name), RTE_DISTRIB_PREFIX\"%s\", name);\n-\tmz = rte_memzone_reserve(mz_name, sizeof(*d), socket_id, NO_FLAGS);\n-\tif (mz == NULL) {\n-\t\trte_errno = ENOMEM;\n-\t\treturn NULL;\n-\t}\n-\n-\td = mz->addr;\n-\tstrlcpy(d->name, name, sizeof(d->name));\n-\td->num_workers = num_workers;\n-\n-\tdistributor_list = RTE_TAILQ_CAST(rte_distributor_tailq.head,\n-\t\t\t\t\t rte_distributor_list);\n-\n-\trte_mcfg_tailq_write_lock();\n-\tTAILQ_INSERT_TAIL(distributor_list, d, next);\n-\trte_mcfg_tailq_write_unlock();\n-\n-\treturn d;\n-}\n-VERSION_SYMBOL(rte_distributor_create, _v20, 2.0);\ndiff --git a/lib/librte_distributor/rte_distributor_v20.h b/lib/librte_distributor/rte_distributor_v20.h\ndeleted file mode 100644\nindex 12865658ba..0000000000\n--- a/lib/librte_distributor/rte_distributor_v20.h\n+++ /dev/null\n@@ -1,218 +0,0 @@\n-/* SPDX-License-Identifier: BSD-3-Clause\n- * Copyright(c) 2010-2014 Intel Corporation\n- */\n-\n-#ifndef _RTE_DISTRIB_V20_H_\n-#define _RTE_DISTRIB_V20_H_\n-\n-/**\n- * @file\n- * RTE distributor\n- *\n- * The distributor is a component which is designed to pass packets\n- * one-at-a-time to workers, with dynamic load balancing.\n- */\n-\n-#ifdef __cplusplus\n-extern \"C\" {\n-#endif\n-\n-#define RTE_DISTRIBUTOR_NAMESIZE 32 /**< Length of name for instance */\n-\n-struct rte_distributor_v20;\n-struct rte_mbuf;\n-\n-/**\n- * Function to create a new distributor instance\n- *\n- * Reserves the memory needed for the distributor operation and\n- * initializes the distributor to work with the configured number of workers.\n- *\n- * @param name\n- * The name to be given to the distributor instance.\n- * @param socket_id\n- * The NUMA node on which the memory is to be allocated\n- * @param num_workers\n- * The maximum number of workers that will request packets from this\n- * distributor\n- * @return\n- * The newly created distributor instance\n- */\n-struct rte_distributor_v20 *\n-rte_distributor_create_v20(const char *name, unsigned int socket_id,\n-\t\tunsigned int num_workers);\n-\n-/* *** APIS to be called on the distributor lcore *** */\n-/*\n- * The following APIs are the public APIs which are designed for use on a\n- * single lcore which acts as the distributor lcore for a given distributor\n- * instance. These functions cannot be called on multiple cores simultaneously\n- * without using locking to protect access to the internals of the distributor.\n- *\n- * NOTE: a given lcore cannot act as both a distributor lcore and a worker lcore\n- * for the same distributor instance, otherwise deadlock will result.\n- */\n-\n-/**\n- * Process a set of packets by distributing them among workers that request\n- * packets. The distributor will ensure that no two packets that have the\n- * same flow id, or tag, in the mbuf will be processed at the same time.\n- *\n- * The user is advocated to set tag for each mbuf before calling this function.\n- * If user doesn't set the tag, the tag value can be various values depending on\n- * driver implementation and configuration.\n- *\n- * This is not multi-thread safe and should only be called on a single lcore.\n- *\n- * @param d\n- * The distributor instance to be used\n- * @param mbufs\n- * The mbufs to be distributed\n- * @param num_mbufs\n- * The number of mbufs in the mbufs array\n- * @return\n- * The number of mbufs processed.\n- */\n-int\n-rte_distributor_process_v20(struct rte_distributor_v20 *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned int num_mbufs);\n-\n-/**\n- * Get a set of mbufs that have been returned to the distributor by workers\n- *\n- * This should only be called on the same lcore as rte_distributor_process()\n- *\n- * @param d\n- * The distributor instance to be used\n- * @param mbufs\n- * The mbufs pointer array to be filled in\n- * @param max_mbufs\n- * The size of the mbufs array\n- * @return\n- * The number of mbufs returned in the mbufs array.\n- */\n-int\n-rte_distributor_returned_pkts_v20(struct rte_distributor_v20 *d,\n-\t\tstruct rte_mbuf **mbufs, unsigned int max_mbufs);\n-\n-/**\n- * Flush the distributor component, so that there are no in-flight or\n- * backlogged packets awaiting processing\n- *\n- * This should only be called on the same lcore as rte_distributor_process()\n- *\n- * @param d\n- * The distributor instance to be used\n- * @return\n- * The number of queued/in-flight packets that were completed by this call.\n- */\n-int\n-rte_distributor_flush_v20(struct rte_distributor_v20 *d);\n-\n-/**\n- * Clears the array of returned packets used as the source for the\n- * rte_distributor_returned_pkts() API call.\n- *\n- * This should only be called on the same lcore as rte_distributor_process()\n- *\n- * @param d\n- * The distributor instance to be used\n- */\n-void\n-rte_distributor_clear_returns_v20(struct rte_distributor_v20 *d);\n-\n-/* *** APIS to be called on the worker lcores *** */\n-/*\n- * The following APIs are the public APIs which are designed for use on\n- * multiple lcores which act as workers for a distributor. Each lcore should use\n- * a unique worker id when requesting packets.\n- *\n- * NOTE: a given lcore cannot act as both a distributor lcore and a worker lcore\n- * for the same distributor instance, otherwise deadlock will result.\n- */\n-\n-/**\n- * API called by a worker to get a new packet to process. Any previous packet\n- * given to the worker is assumed to have completed processing, and may be\n- * optionally returned to the distributor via the oldpkt parameter.\n- *\n- * @param d\n- * The distributor instance to be used\n- * @param worker_id\n- * The worker instance number to use - must be less that num_workers passed\n- * at distributor creation time.\n- * @param oldpkt\n- * The previous packet, if any, being processed by the worker\n- *\n- * @return\n- * A new packet to be processed by the worker thread.\n- */\n-struct rte_mbuf *\n-rte_distributor_get_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned int worker_id, struct rte_mbuf *oldpkt);\n-\n-/**\n- * API called by a worker to return a completed packet without requesting a\n- * new packet, for example, because a worker thread is shutting down\n- *\n- * @param d\n- * The distributor instance to be used\n- * @param worker_id\n- * The worker instance number to use - must be less that num_workers passed\n- * at distributor creation time.\n- * @param mbuf\n- * The previous packet being processed by the worker\n- */\n-int\n-rte_distributor_return_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned int worker_id, struct rte_mbuf *mbuf);\n-\n-/**\n- * API called by a worker to request a new packet to process.\n- * Any previous packet given to the worker is assumed to have completed\n- * processing, and may be optionally returned to the distributor via\n- * the oldpkt parameter.\n- * Unlike rte_distributor_get_pkt(), this function does not wait for a new\n- * packet to be provided by the distributor.\n- *\n- * NOTE: after calling this function, rte_distributor_poll_pkt() should\n- * be used to poll for the packet requested. The rte_distributor_get_pkt()\n- * API should *not* be used to try and retrieve the new packet.\n- *\n- * @param d\n- * The distributor instance to be used\n- * @param worker_id\n- * The worker instance number to use - must be less that num_workers passed\n- * at distributor creation time.\n- * @param oldpkt\n- * The previous packet, if any, being processed by the worker\n- */\n-void\n-rte_distributor_request_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned int worker_id, struct rte_mbuf *oldpkt);\n-\n-/**\n- * API called by a worker to check for a new packet that was previously\n- * requested by a call to rte_distributor_request_pkt(). It does not wait\n- * for the new packet to be available, but returns NULL if the request has\n- * not yet been fulfilled by the distributor.\n- *\n- * @param d\n- * The distributor instance to be used\n- * @param worker_id\n- * The worker instance number to use - must be less that num_workers passed\n- * at distributor creation time.\n- *\n- * @return\n- * A new packet to be processed by the worker thread, or NULL if no\n- * packet is yet available.\n- */\n-struct rte_mbuf *\n-rte_distributor_poll_pkt_v20(struct rte_distributor_v20 *d,\n-\t\tunsigned int worker_id);\n-\n-#ifdef __cplusplus\n-}\n-#endif\n-\n-#endif\ndiff --git a/lib/librte_distributor/rte_distributor_version.map b/lib/librte_distributor/rte_distributor_version.map\nindex 3a285b394e..5643ab85fb 100644\n--- a/lib/librte_distributor/rte_distributor_version.map\n+++ b/lib/librte_distributor/rte_distributor_version.map\n@@ -1,4 +1,4 @@\n-DPDK_2.0 {\n+DPDK_17.05 {\n \tglobal:\n \n \trte_distributor_clear_returns;\n@@ -13,17 +13,3 @@ DPDK_2.0 {\n \n \tlocal: *;\n };\n-\n-DPDK_17.05 {\n-\tglobal:\n-\n-\trte_distributor_clear_returns;\n-\trte_distributor_create;\n-\trte_distributor_flush;\n-\trte_distributor_get_pkt;\n-\trte_distributor_poll_pkt;\n-\trte_distributor_process;\n-\trte_distributor_request_pkt;\n-\trte_distributor_return_pkt;\n-\trte_distributor_returned_pkts;\n-} DPDK_2.0;\n", "prefixes": [ "v3", "6/9" ] }