Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/66003/?format=api
{ "id": 66003, "url": "http://patches.dpdk.org/api/patches/66003/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20200224113515.1744-3-konstantin.ananyev@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": "<20200224113515.1744-3-konstantin.ananyev@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20200224113515.1744-3-konstantin.ananyev@intel.com", "date": "2020-02-24T11:35:11", "name": "[RFC,2/6] ring: rework ring layout to allow new sync schemes", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "bf54fe2cf9a414200adec05c7f0d43445dcbe41e", "submitter": { "id": 33, "url": "http://patches.dpdk.org/api/people/33/?format=api", "name": "Ananyev, Konstantin", "email": "konstantin.ananyev@intel.com" }, "delegate": { "id": 1, "url": "http://patches.dpdk.org/api/users/1/?format=api", "username": "tmonjalo", "first_name": "Thomas", "last_name": "Monjalon", "email": "thomas@monjalon.net" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20200224113515.1744-3-konstantin.ananyev@intel.com/mbox/", "series": [ { "id": 8659, "url": "http://patches.dpdk.org/api/series/8659/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=8659", "date": "2020-02-24T11:35:09", "name": "New sync modes for ring", "version": 1, "mbox": "http://patches.dpdk.org/series/8659/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/66003/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/66003/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 8AE60A0524;\n\tMon, 24 Feb 2020 12:35:44 +0100 (CET)", "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 518F81BFC8;\n\tMon, 24 Feb 2020 12:35:27 +0100 (CET)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n by dpdk.org (Postfix) with ESMTP id D40861BFAA\n for <dev@dpdk.org>; Mon, 24 Feb 2020 12:35:23 +0100 (CET)", "from fmsmga005.fm.intel.com ([10.253.24.32])\n by orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n 24 Feb 2020 03:35:23 -0800", "from sivswdev08.ir.intel.com ([10.237.217.47])\n by fmsmga005.fm.intel.com with ESMTP; 24 Feb 2020 03:35:21 -0800" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.70,480,1574150400\"; d=\"scan'208\";a=\"435878533\"", "From": "Konstantin Ananyev <konstantin.ananyev@intel.com>", "To": "dev@dpdk.org", "Cc": "olivier.matz@6wind.com, Konstantin Ananyev <konstantin.ananyev@intel.com>", "Date": "Mon, 24 Feb 2020 11:35:11 +0000", "Message-Id": "<20200224113515.1744-3-konstantin.ananyev@intel.com>", "X-Mailer": "git-send-email 2.18.0", "In-Reply-To": "<20200224113515.1744-1-konstantin.ananyev@intel.com>", "References": "<20200224113515.1744-1-konstantin.ananyev@intel.com>", "Subject": "[dpdk-dev] [RFC 2/6] ring: rework ring layout to allow new sync\n\tschemes", "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": "Change from *single* to *sync_type* to allow different\nsynchronisation schemes to be applied.\nChange layout to make sure that *sync_type* and *tail*\nwill always reside on same offsets.\n\nSigned-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>\n---\n app/test/test_pdump.c | 6 +--\n lib/librte_pdump/rte_pdump.c | 2 +-\n lib/librte_port/rte_port_ring.c | 12 +++---\n lib/librte_ring/rte_ring.c | 6 ++-\n lib/librte_ring/rte_ring.h | 76 ++++++++++++++++++++++++---------\n lib/librte_ring/rte_ring_elem.h | 8 ++--\n 6 files changed, 71 insertions(+), 39 deletions(-)", "diff": "diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c\nindex ad183184c..6a1180bcb 100644\n--- a/app/test/test_pdump.c\n+++ b/app/test/test_pdump.c\n@@ -57,8 +57,7 @@ run_pdump_client_tests(void)\n \tif (ret < 0)\n \t\treturn -1;\n \tmp->flags = 0x0000;\n-\tring_client = rte_ring_create(\"SR0\", RING_SIZE, rte_socket_id(),\n-\t\t\t\t RING_F_SP_ENQ | RING_F_SC_DEQ);\n+\tring_client = rte_ring_create(\"SR0\", RING_SIZE, rte_socket_id(), 0);\n \tif (ring_client == NULL) {\n \t\tprintf(\"rte_ring_create SR0 failed\");\n \t\treturn -1;\n@@ -71,9 +70,6 @@ run_pdump_client_tests(void)\n \t}\n \trte_eth_dev_probing_finish(eth_dev);\n \n-\tring_client->prod.single = 0;\n-\tring_client->cons.single = 0;\n-\n \tprintf(\"\\n***** flags = RTE_PDUMP_FLAG_TX *****\\n\");\n \n \tfor (itr = 0; itr < NUM_ITR; itr++) {\ndiff --git a/lib/librte_pdump/rte_pdump.c b/lib/librte_pdump/rte_pdump.c\nindex 8a01ac510..65364f2c5 100644\n--- a/lib/librte_pdump/rte_pdump.c\n+++ b/lib/librte_pdump/rte_pdump.c\n@@ -380,7 +380,7 @@ pdump_validate_ring_mp(struct rte_ring *ring, struct rte_mempool *mp)\n \t\trte_errno = EINVAL;\n \t\treturn -1;\n \t}\n-\tif (ring->prod.single || ring->cons.single) {\n+\tif (rte_ring_prod_single(ring) || rte_ring_cons_single(ring)) {\n \t\tPDUMP_LOG(ERR, \"ring with either SP or SC settings\"\n \t\t\" is not valid for pdump, should have MP and MC settings\\n\");\n \t\trte_errno = EINVAL;\ndiff --git a/lib/librte_port/rte_port_ring.c b/lib/librte_port/rte_port_ring.c\nindex 47fcdd06a..2f6c050fa 100644\n--- a/lib/librte_port/rte_port_ring.c\n+++ b/lib/librte_port/rte_port_ring.c\n@@ -44,8 +44,8 @@ rte_port_ring_reader_create_internal(void *params, int socket_id,\n \t/* Check input parameters */\n \tif ((conf == NULL) ||\n \t\t(conf->ring == NULL) ||\n-\t\t(conf->ring->cons.single && is_multi) ||\n-\t\t(!(conf->ring->cons.single) && !is_multi)) {\n+\t\t(rte_ring_cons_single(conf->ring) && is_multi) ||\n+\t\t(!rte_ring_cons_single(conf->ring) && !is_multi)) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Invalid Parameters\\n\", __func__);\n \t\treturn NULL;\n \t}\n@@ -171,8 +171,8 @@ rte_port_ring_writer_create_internal(void *params, int socket_id,\n \t/* Check input parameters */\n \tif ((conf == NULL) ||\n \t\t(conf->ring == NULL) ||\n-\t\t(conf->ring->prod.single && is_multi) ||\n-\t\t(!(conf->ring->prod.single) && !is_multi) ||\n+\t\t(rte_ring_prod_single(conf->ring) && is_multi) ||\n+\t\t(!rte_ring_prod_single(conf->ring) && !is_multi) ||\n \t\t(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX)) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Invalid Parameters\\n\", __func__);\n \t\treturn NULL;\n@@ -440,8 +440,8 @@ rte_port_ring_writer_nodrop_create_internal(void *params, int socket_id,\n \t/* Check input parameters */\n \tif ((conf == NULL) ||\n \t\t(conf->ring == NULL) ||\n-\t\t(conf->ring->prod.single && is_multi) ||\n-\t\t(!(conf->ring->prod.single) && !is_multi) ||\n+\t\t(rte_ring_prod_single(conf->ring) && is_multi) ||\n+\t\t(!rte_ring_prod_single(conf->ring) && !is_multi) ||\n \t\t(conf->tx_burst_sz > RTE_PORT_IN_BURST_SIZE_MAX)) {\n \t\tRTE_LOG(ERR, PORT, \"%s: Invalid Parameters\\n\", __func__);\n \t\treturn NULL;\ndiff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c\nindex 77e5de099..fa5733907 100644\n--- a/lib/librte_ring/rte_ring.c\n+++ b/lib/librte_ring/rte_ring.c\n@@ -106,8 +106,10 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count,\n \tif (ret < 0 || ret >= (int)sizeof(r->name))\n \t\treturn -ENAMETOOLONG;\n \tr->flags = flags;\n-\tr->prod.single = (flags & RING_F_SP_ENQ) ? __IS_SP : __IS_MP;\n-\tr->cons.single = (flags & RING_F_SC_DEQ) ? __IS_SC : __IS_MC;\n+\tr->prod.sync_type = (flags & RING_F_SP_ENQ) ?\n+\t\tRTE_RING_SYNC_ST : RTE_RING_SYNC_MT;\n+\tr->cons.sync_type = (flags & RING_F_SC_DEQ) ?\n+\t\tRTE_RING_SYNC_ST : RTE_RING_SYNC_MT;\n \n \tif (flags & RING_F_EXACT_SZ) {\n \t\tr->size = rte_align32pow2(count + 1);\ndiff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h\nindex 18fc5d845..aa8c628eb 100644\n--- a/lib/librte_ring/rte_ring.h\n+++ b/lib/librte_ring/rte_ring.h\n@@ -61,11 +61,22 @@ enum rte_ring_queue_behavior {\n #define RTE_RING_NAMESIZE (RTE_MEMZONE_NAMESIZE - \\\n \t\t\t sizeof(RTE_RING_MZ_PREFIX) + 1)\n \n-/* structure to hold a pair of head/tail values and other metadata */\n+/** prod/cons sync types */\n+enum {\n+\tRTE_RING_SYNC_MT, /**< multi-thread safe (default mode) */\n+\tRTE_RING_SYNC_ST, /**< single thread only */\n+};\n+\n+/**\n+ * structure to hold a pair of head/tail values and other metadata.\n+ * used by RTE_RING_SYNC_MT, RTE_RING_SYNC_ST sync types.\n+ * Depending on sync_type format of that structure might be different,\n+ * but offset for *sync_type* and *tail* values should remain the same.\n+ */\n struct rte_ring_headtail {\n-\tvolatile uint32_t head; /**< Prod/consumer head. */\n-\tvolatile uint32_t tail; /**< Prod/consumer tail. */\n-\tuint32_t single; /**< True if single prod/cons */\n+\tuint32_t sync_type; /**< sync type of prod/cons */\n+\tvolatile uint32_t tail __rte_aligned(8); /**< prod/consumer tail. */\n+\tvolatile uint32_t head; /**< prod/consumer head. */\n };\n \n /**\n@@ -116,11 +127,10 @@ struct rte_ring {\n #define RING_F_EXACT_SZ 0x0004\n #define RTE_RING_SZ_MASK (0x7fffffffU) /**< Ring size mask */\n \n-/* @internal defines for passing to the enqueue dequeue worker functions */\n-#define __IS_SP 1\n-#define __IS_MP 0\n-#define __IS_SC 1\n-#define __IS_MC 0\n+#define __IS_SP RTE_RING_SYNC_ST\n+#define __IS_MP RTE_RING_SYNC_MT\n+#define __IS_SC RTE_RING_SYNC_ST\n+#define __IS_MC RTE_RING_SYNC_MT\n \n /**\n * Calculate the memory size needed for a ring\n@@ -420,7 +430,7 @@ rte_ring_mp_enqueue_bulk(struct rte_ring *r, void * const *obj_table,\n \t\t\t unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue(r, obj_table, n, RTE_RING_QUEUE_FIXED,\n-\t\t\t__IS_MP, free_space);\n+\t\t\tRTE_RING_SYNC_MT, free_space);\n }\n \n /**\n@@ -443,7 +453,7 @@ rte_ring_sp_enqueue_bulk(struct rte_ring *r, void * const *obj_table,\n \t\t\t unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue(r, obj_table, n, RTE_RING_QUEUE_FIXED,\n-\t\t\t__IS_SP, free_space);\n+\t\t\tRTE_RING_SYNC_ST, free_space);\n }\n \n /**\n@@ -470,7 +480,7 @@ rte_ring_enqueue_bulk(struct rte_ring *r, void * const *obj_table,\n \t\t unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue(r, obj_table, n, RTE_RING_QUEUE_FIXED,\n-\t\t\tr->prod.single, free_space);\n+\t\t\tr->prod.sync_type, free_space);\n }\n \n /**\n@@ -554,7 +564,7 @@ rte_ring_mc_dequeue_bulk(struct rte_ring *r, void **obj_table,\n \t\tunsigned int n, unsigned int *available)\n {\n \treturn __rte_ring_do_dequeue(r, obj_table, n, RTE_RING_QUEUE_FIXED,\n-\t\t\t__IS_MC, available);\n+\t\t\tRTE_RING_SYNC_MT, available);\n }\n \n /**\n@@ -578,7 +588,7 @@ rte_ring_sc_dequeue_bulk(struct rte_ring *r, void **obj_table,\n \t\tunsigned int n, unsigned int *available)\n {\n \treturn __rte_ring_do_dequeue(r, obj_table, n, RTE_RING_QUEUE_FIXED,\n-\t\t\t__IS_SC, available);\n+\t\t\tRTE_RING_SYNC_ST, available);\n }\n \n /**\n@@ -605,7 +615,7 @@ rte_ring_dequeue_bulk(struct rte_ring *r, void **obj_table, unsigned int n,\n \t\tunsigned int *available)\n {\n \treturn __rte_ring_do_dequeue(r, obj_table, n, RTE_RING_QUEUE_FIXED,\n-\t\t\t\tr->cons.single, available);\n+\t\t\t\tr->cons.sync_type, available);\n }\n \n /**\n@@ -777,6 +787,30 @@ rte_ring_get_capacity(const struct rte_ring *r)\n \treturn r->capacity;\n }\n \n+static inline uint32_t\n+rte_ring_get_prod_sync_type(const struct rte_ring *r)\n+{\n+\treturn r->prod.sync_type;\n+}\n+\n+static inline int\n+rte_ring_prod_single(const struct rte_ring *r)\n+{\n+\treturn (rte_ring_get_prod_sync_type(r) == RTE_RING_SYNC_ST);\n+}\n+\n+static inline uint32_t\n+rte_ring_get_cons_sync_type(const struct rte_ring *r)\n+{\n+\treturn r->cons.sync_type;\n+}\n+\n+static inline int\n+rte_ring_cons_single(const struct rte_ring *r)\n+{\n+\treturn (rte_ring_get_cons_sync_type(r) == RTE_RING_SYNC_ST);\n+}\n+\n /**\n * Dump the status of all rings on the console\n *\n@@ -820,7 +854,7 @@ rte_ring_mp_enqueue_burst(struct rte_ring *r, void * const *obj_table,\n \t\t\t unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue(r, obj_table, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE, __IS_MP, free_space);\n+\t\t\tRTE_RING_QUEUE_VARIABLE, RTE_RING_SYNC_MT, free_space);\n }\n \n /**\n@@ -843,7 +877,7 @@ rte_ring_sp_enqueue_burst(struct rte_ring *r, void * const *obj_table,\n \t\t\t unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue(r, obj_table, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE, __IS_SP, free_space);\n+\t\t\tRTE_RING_QUEUE_VARIABLE, RTE_RING_SYNC_ST, free_space);\n }\n \n /**\n@@ -870,7 +904,7 @@ rte_ring_enqueue_burst(struct rte_ring *r, void * const *obj_table,\n \t\t unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue(r, obj_table, n, RTE_RING_QUEUE_VARIABLE,\n-\t\t\tr->prod.single, free_space);\n+\t\t\tr->prod.sync_type, free_space);\n }\n \n /**\n@@ -898,7 +932,7 @@ rte_ring_mc_dequeue_burst(struct rte_ring *r, void **obj_table,\n \t\tunsigned int n, unsigned int *available)\n {\n \treturn __rte_ring_do_dequeue(r, obj_table, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE, __IS_MC, available);\n+\t\t\tRTE_RING_QUEUE_VARIABLE, RTE_RING_SYNC_MT, available);\n }\n \n /**\n@@ -923,7 +957,7 @@ rte_ring_sc_dequeue_burst(struct rte_ring *r, void **obj_table,\n \t\tunsigned int n, unsigned int *available)\n {\n \treturn __rte_ring_do_dequeue(r, obj_table, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE, __IS_SC, available);\n+\t\t\tRTE_RING_QUEUE_VARIABLE, RTE_RING_SYNC_ST, available);\n }\n \n /**\n@@ -951,7 +985,7 @@ rte_ring_dequeue_burst(struct rte_ring *r, void **obj_table,\n {\n \treturn __rte_ring_do_dequeue(r, obj_table, n,\n \t\t\t\tRTE_RING_QUEUE_VARIABLE,\n-\t\t\t\tr->cons.single, available);\n+\t\t\t\tr->cons.sync_type, available);\n }\n \n #ifdef __cplusplus\ndiff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h\nindex 3976757ed..ff7a28ea5 100644\n--- a/lib/librte_ring/rte_ring_elem.h\n+++ b/lib/librte_ring/rte_ring_elem.h\n@@ -570,7 +570,7 @@ rte_ring_enqueue_bulk_elem(struct rte_ring *r, const void *obj_table,\n \t\tunsigned int esize, unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue_elem(r, obj_table, esize, n,\n-\t\t\tRTE_RING_QUEUE_FIXED, r->prod.single, free_space);\n+\t\t\tRTE_RING_QUEUE_FIXED, r->prod.sync_type, free_space);\n }\n \n /**\n@@ -734,7 +734,7 @@ rte_ring_dequeue_bulk_elem(struct rte_ring *r, void *obj_table,\n \t\tunsigned int esize, unsigned int n, unsigned int *available)\n {\n \treturn __rte_ring_do_dequeue_elem(r, obj_table, esize, n,\n-\t\t\tRTE_RING_QUEUE_FIXED, r->cons.single, available);\n+\t\t\tRTE_RING_QUEUE_FIXED, r->cons.sync_type, available);\n }\n \n /**\n@@ -902,7 +902,7 @@ rte_ring_enqueue_burst_elem(struct rte_ring *r, const void *obj_table,\n \t\tunsigned int esize, unsigned int n, unsigned int *free_space)\n {\n \treturn __rte_ring_do_enqueue_elem(r, obj_table, esize, n,\n-\t\t\tRTE_RING_QUEUE_VARIABLE, r->prod.single, free_space);\n+\t\t\tRTE_RING_QUEUE_VARIABLE, r->prod.sync_type, free_space);\n }\n \n /**\n@@ -995,7 +995,7 @@ rte_ring_dequeue_burst_elem(struct rte_ring *r, void *obj_table,\n {\n \treturn __rte_ring_do_dequeue_elem(r, obj_table, esize, n,\n \t\t\t\tRTE_RING_QUEUE_VARIABLE,\n-\t\t\t\tr->cons.single, available);\n+\t\t\t\tr->cons.sync_type, available);\n }\n \n #ifdef __cplusplus\n", "prefixes": [ "RFC", "2/6" ] }