From patchwork Thu Oct 17 20:08:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 176741 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1426522ill; Thu, 17 Oct 2019 13:08:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqz67lTXRSCLk51xqWdu7ZyHI2i6FpQagHxzvo8ePrWk101G1kxaNPfjySay8W1Mbvq1fBcI X-Received: by 2002:aa7:d8d5:: with SMTP id k21mr2785739eds.286.1571342928957; Thu, 17 Oct 2019 13:08:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571342928; cv=none; d=google.com; s=arc-20160816; b=bTU5coFNb4qi4AKxLg+CFnbC4yIhmohlFom5ldt0/HznqKnNXiXwlH5zZPQKnSQO3y KrBmDmvoy8O2yOZkfq5l9hPMWWnLhrKd4By94B+hN79eX5s5VbxRDcize6C7QFZEkvFB h9X87fqa4/g7Te6ndfEbbd1WPIyCy/z9fXWC6XdDHOhVs4Rkd+ugmTjtBtMjUTiZz9du 1raM+BqHLhLVQibyt9Lymqc0jdz09Pcr8ge5zsQ7QZkemepGZ4ZV1MUuWCEicmpGU0ki F7u+XZepEkujujathwOMC27g59i4PnhW498G1R4voWS/LE2lM5RFwj4/hdMGl1JGq1Xq KVDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=T7WJ2BiGQD/6U7enMvdoNynKbNwuaiFB27vW3/DBslU=; b=sr37F1KOLrAaqqtKtAx1fMnxH5X9zqh6fJLfm7vbdyXoGAywiTd5fUePgaj2nfAVlm pCOYegbSwcV+SwtiiGz6ZhzyZXayc/RpuzVwd9MreKdeh1rbRNh57X0GKSLIGcam5edR ctUkMrWRgNC7g2OEdFayyduxvCO+VdGLuxh0jj2eh64jtIFd6xsJ3dwlyO6ka5+ZVHRd xcgrH5tz9CxrxOXJF0E9egfX+Fz+ULbl/wLHR5nz1XqCn4co9/kVh+rap0XYPGEcZFZ1 m9RgB4kH2T1oAlyE/7A+1x9OtnhWAENnRu7vXgh1sHEQ1NTloICErGm/mUqMNTZ+fsgp B0Xg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id v18si1998924ejd.115.2019.10.17.13.08.48; Thu, 17 Oct 2019 13:08:48 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id B55081E8E0; Thu, 17 Oct 2019 22:08:41 +0200 (CEST) Received: from foss.arm.com (unknown [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 1A7C21D50B for ; Thu, 17 Oct 2019 22:08:39 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 4B1A032B; Thu, 17 Oct 2019 13:08:30 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 2A86F3F68E; Thu, 17 Oct 2019 13:08:30 -0700 (PDT) From: Honnappa Nagarahalli To: olivier.matz@6wind.com, sthemmin@microsoft.com, jerinj@marvell.com, bruce.richardson@intel.com, david.marchand@redhat.com, pbhagavatula@marvell.com, konstantin.ananyev@intel.com, drc@linux.vnet.ibm.com, hemant.agrawal@nxp.com, honnappa.nagarahalli@arm.com Cc: dev@dpdk.org, dharmik.thakkar@arm.com, ruifeng.wang@arm.com, gavin.hu@arm.com Date: Thu, 17 Oct 2019 15:08:05 -0500 Message-Id: <20191017200807.20772-2-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017200807.20772-1-honnappa.nagarahalli@arm.com> References: <20190906190510.11146-1-honnappa.nagarahalli@arm.com> <20191017200807.20772-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 1/3] lib/ring: apis to support configurable element size X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Current APIs assume ring elements to be pointers. However, in many use cases, the size can be different. Add new APIs to support configurable ring element sizes. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Dharmik Thakkar Reviewed-by: Gavin Hu Reviewed-by: Ruifeng Wang --- lib/librte_ring/Makefile | 3 +- lib/librte_ring/meson.build | 3 + lib/librte_ring/rte_ring.c | 45 +- lib/librte_ring/rte_ring.h | 1 + lib/librte_ring/rte_ring_elem.h | 946 +++++++++++++++++++++++++++ lib/librte_ring/rte_ring_version.map | 2 + 6 files changed, 991 insertions(+), 9 deletions(-) create mode 100644 lib/librte_ring/rte_ring_elem.h -- 2.17.1 diff --git a/lib/librte_ring/Makefile b/lib/librte_ring/Makefile index 21a36770d..515a967bb 100644 --- a/lib/librte_ring/Makefile +++ b/lib/librte_ring/Makefile @@ -6,7 +6,7 @@ include $(RTE_SDK)/mk/rte.vars.mk # library name LIB = librte_ring.a -CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 +CFLAGS += $(WERROR_FLAGS) -I$(SRCDIR) -O3 -DALLOW_EXPERIMENTAL_API LDLIBS += -lrte_eal EXPORT_MAP := rte_ring_version.map @@ -18,6 +18,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_RING) := rte_ring.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_RING)-include := rte_ring.h \ + rte_ring_elem.h \ rte_ring_generic.h \ rte_ring_c11_mem.h diff --git a/lib/librte_ring/meson.build b/lib/librte_ring/meson.build index ab8b0b469..74219840a 100644 --- a/lib/librte_ring/meson.build +++ b/lib/librte_ring/meson.build @@ -6,3 +6,6 @@ sources = files('rte_ring.c') headers = files('rte_ring.h', 'rte_ring_c11_mem.h', 'rte_ring_generic.h') + +# rte_ring_create_elem and rte_ring_get_memsize_elem are experimental +allow_experimental_apis = true diff --git a/lib/librte_ring/rte_ring.c b/lib/librte_ring/rte_ring.c index d9b308036..6fed3648b 100644 --- a/lib/librte_ring/rte_ring.c +++ b/lib/librte_ring/rte_ring.c @@ -33,6 +33,7 @@ #include #include "rte_ring.h" +#include "rte_ring_elem.h" TAILQ_HEAD(rte_ring_list, rte_tailq_entry); @@ -46,23 +47,42 @@ EAL_REGISTER_TAILQ(rte_ring_tailq) /* return the size of memory occupied by a ring */ ssize_t -rte_ring_get_memsize(unsigned count) +rte_ring_get_memsize_elem(unsigned count, unsigned esize) { ssize_t sz; + /* Supported esize values are 4/8/16. + * Others can be added on need basis. + */ + if ((esize != 4) && (esize != 8) && (esize != 16)) { + RTE_LOG(ERR, RING, + "Unsupported esize value. Supported values are 4, 8 and 16\n"); + + return -EINVAL; + } + /* count must be a power of 2 */ if ((!POWEROF2(count)) || (count > RTE_RING_SZ_MASK )) { RTE_LOG(ERR, RING, - "Requested size is invalid, must be power of 2, and " - "do not exceed the size limit %u\n", RTE_RING_SZ_MASK); + "Requested number of elements is invalid, must be " + "power of 2, and do not exceed the limit %u\n", + RTE_RING_SZ_MASK); + return -EINVAL; } - sz = sizeof(struct rte_ring) + count * sizeof(void *); + sz = sizeof(struct rte_ring) + count * esize; sz = RTE_ALIGN(sz, RTE_CACHE_LINE_SIZE); return sz; } +/* return the size of memory occupied by a ring */ +ssize_t +rte_ring_get_memsize(unsigned count) +{ + return rte_ring_get_memsize_elem(count, sizeof(void *)); +} + void rte_ring_reset(struct rte_ring *r) { @@ -114,10 +134,10 @@ rte_ring_init(struct rte_ring *r, const char *name, unsigned count, return 0; } -/* create the ring */ +/* create the ring for a given element size */ struct rte_ring * -rte_ring_create(const char *name, unsigned count, int socket_id, - unsigned flags) +rte_ring_create_elem(const char *name, unsigned count, unsigned esize, + int socket_id, unsigned flags) { char mz_name[RTE_MEMZONE_NAMESIZE]; struct rte_ring *r; @@ -135,7 +155,7 @@ rte_ring_create(const char *name, unsigned count, int socket_id, if (flags & RING_F_EXACT_SZ) count = rte_align32pow2(count + 1); - ring_size = rte_ring_get_memsize(count); + ring_size = rte_ring_get_memsize_elem(count, esize); if (ring_size < 0) { rte_errno = ring_size; return NULL; @@ -182,6 +202,15 @@ rte_ring_create(const char *name, unsigned count, int socket_id, return r; } +/* create the ring */ +struct rte_ring * +rte_ring_create(const char *name, unsigned count, int socket_id, + unsigned flags) +{ + return rte_ring_create_elem(name, count, sizeof(void *), socket_id, + flags); +} + /* free the ring */ void rte_ring_free(struct rte_ring *r) diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index 2a9f768a1..18fc5d845 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -216,6 +216,7 @@ int rte_ring_init(struct rte_ring *r, const char *name, unsigned count, */ struct rte_ring *rte_ring_create(const char *name, unsigned count, int socket_id, unsigned flags); + /** * De-allocate all memory used by the ring. * diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h new file mode 100644 index 000000000..860f059ad --- /dev/null +++ b/lib/librte_ring/rte_ring_elem.h @@ -0,0 +1,946 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 2019 Arm Limited + * Copyright (c) 2010-2017 Intel Corporation + * Copyright (c) 2007-2009 Kip Macy kmacy@freebsd.org + * All rights reserved. + * Derived from FreeBSD's bufring.h + * Used as BSD-3 Licensed with permission from Kip Macy. + */ + +#ifndef _RTE_RING_ELEM_H_ +#define _RTE_RING_ELEM_H_ + +/** + * @file + * RTE Ring with flexible element size + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "rte_ring.h" + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Calculate the memory size needed for a ring with given element size + * + * This function returns the number of bytes needed for a ring, given + * the number of elements in it and the size of the element. This value + * is the sum of the size of the structure rte_ring and the size of the + * memory needed for storing the elements. The value is aligned to a cache + * line size. + * + * @param count + * The number of elements in the ring (must be a power of 2). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. + * @return + * - The memory size needed for the ring on success. + * - -EINVAL if count is not a power of 2. + */ +__rte_experimental +ssize_t rte_ring_get_memsize_elem(unsigned count, unsigned esize); + +/** + * @warning + * @b EXPERIMENTAL: this API may change without prior notice + * + * Create a new ring named *name* that stores elements with given size. + * + * This function uses ``memzone_reserve()`` to allocate memory. Then it + * calls rte_ring_init() to initialize an empty ring. + * + * The new ring size is set to *count*, which must be a power of + * two. Water marking is disabled by default. The real usable ring size + * is *count-1* instead of *count* to differentiate a free ring from an + * empty ring. + * + * The ring is added in RTE_TAILQ_RING list. + * + * @param name + * The name of the ring. + * @param count + * The number of elements in the ring (must be a power of 2). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. + * @param socket_id + * The *socket_id* argument is the socket identifier in case of + * NUMA. The value can be *SOCKET_ID_ANY* if there is no NUMA + * constraint for the reserved zone. + * @param flags + * An OR of the following: + * - RING_F_SP_ENQ: If this flag is set, the default behavior when + * using ``rte_ring_enqueue()`` or ``rte_ring_enqueue_bulk()`` + * is "single-producer". Otherwise, it is "multi-producers". + * - RING_F_SC_DEQ: If this flag is set, the default behavior when + * using ``rte_ring_dequeue()`` or ``rte_ring_dequeue_bulk()`` + * is "single-consumer". Otherwise, it is "multi-consumers". + * @return + * On success, the pointer to the new allocated ring. NULL on error with + * rte_errno set appropriately. Possible errno values include: + * - E_RTE_NO_CONFIG - function could not get pointer to rte_config structure + * - E_RTE_SECONDARY - function was called from a secondary process instance + * - EINVAL - count provided is not a power of 2 + * - ENOSPC - the maximum number of memzones has already been allocated + * - EEXIST - a memzone with the same name already exists + * - ENOMEM - no appropriate memory area found in which to create memzone + */ +__rte_experimental +struct rte_ring *rte_ring_create_elem(const char *name, unsigned count, + unsigned esize, int socket_id, unsigned flags); + +/* the actual enqueue of pointers on the ring. + * Placed here since identical code needed in both + * single and multi producer enqueue functions. + */ +#define ENQUEUE_PTRS_ELEM(r, ring_start, prod_head, obj_table, esize, n) do { \ + if (esize == 4) \ + ENQUEUE_PTRS_32(r, ring_start, prod_head, obj_table, n); \ + else if (esize == 8) \ + ENQUEUE_PTRS_64(r, ring_start, prod_head, obj_table, n); \ + else if (esize == 16) \ + ENQUEUE_PTRS_128(r, ring_start, prod_head, obj_table, n); \ +} while (0) + +#define ENQUEUE_PTRS_32(r, ring_start, prod_head, obj_table, n) do { \ + unsigned int i; \ + const uint32_t size = (r)->size; \ + uint32_t idx = prod_head & (r)->mask; \ + uint32_t *ring = (uint32_t *)ring_start; \ + uint32_t *obj = (uint32_t *)obj_table; \ + if (likely(idx + n < size)) { \ + for (i = 0; i < (n & ((~(unsigned)0x7))); i += 8, idx += 8) { \ + ring[idx] = obj[i]; \ + ring[idx + 1] = obj[i + 1]; \ + ring[idx + 2] = obj[i + 2]; \ + ring[idx + 3] = obj[i + 3]; \ + ring[idx + 4] = obj[i + 4]; \ + ring[idx + 5] = obj[i + 5]; \ + ring[idx + 6] = obj[i + 6]; \ + ring[idx + 7] = obj[i + 7]; \ + } \ + switch (n & 0x7) { \ + case 7: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 6: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 5: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 4: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 3: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 2: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 1: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + } \ + } else { \ + for (i = 0; idx < size; i++, idx++)\ + ring[idx] = obj[i]; \ + for (idx = 0; i < n; i++, idx++) \ + ring[idx] = obj[i]; \ + } \ +} while (0) + +#define ENQUEUE_PTRS_64(r, ring_start, prod_head, obj_table, n) do { \ + unsigned int i; \ + const uint32_t size = (r)->size; \ + uint32_t idx = prod_head & (r)->mask; \ + uint64_t *ring = (uint64_t *)ring_start; \ + uint64_t *obj = (uint64_t *)obj_table; \ + if (likely(idx + n < size)) { \ + for (i = 0; i < (n & ((~(unsigned)0x3))); i += 4, idx += 4) { \ + ring[idx] = obj[i]; \ + ring[idx + 1] = obj[i + 1]; \ + ring[idx + 2] = obj[i + 2]; \ + ring[idx + 3] = obj[i + 3]; \ + } \ + switch (n & 0x3) { \ + case 3: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 2: \ + ring[idx++] = obj[i++]; /* fallthrough */ \ + case 1: \ + ring[idx++] = obj[i++]; \ + } \ + } else { \ + for (i = 0; idx < size; i++, idx++)\ + ring[idx] = obj[i]; \ + for (idx = 0; i < n; i++, idx++) \ + ring[idx] = obj[i]; \ + } \ +} while (0) + +#define ENQUEUE_PTRS_128(r, ring_start, prod_head, obj_table, n) do { \ + unsigned int i; \ + const uint32_t size = (r)->size; \ + uint32_t idx = prod_head & (r)->mask; \ + __uint128_t *ring = (__uint128_t *)ring_start; \ + __uint128_t *obj = (__uint128_t *)obj_table; \ + if (likely(idx + n < size)) { \ + for (i = 0; i < (n >> 1); i += 2, idx += 2) { \ + ring[idx] = obj[i]; \ + ring[idx + 1] = obj[i + 1]; \ + } \ + switch (n & 0x1) { \ + case 1: \ + ring[idx++] = obj[i++]; \ + } \ + } else { \ + for (i = 0; idx < size; i++, idx++)\ + ring[idx] = obj[i]; \ + for (idx = 0; i < n; i++, idx++) \ + ring[idx] = obj[i]; \ + } \ +} while (0) + +/* the actual copy of pointers on the ring to obj_table. + * Placed here since identical code needed in both + * single and multi consumer dequeue functions. + */ +#define DEQUEUE_PTRS_ELEM(r, ring_start, cons_head, obj_table, esize, n) do { \ + if (esize == 4) \ + DEQUEUE_PTRS_32(r, ring_start, cons_head, obj_table, n); \ + else if (esize == 8) \ + DEQUEUE_PTRS_64(r, ring_start, cons_head, obj_table, n); \ + else if (esize == 16) \ + DEQUEUE_PTRS_128(r, ring_start, cons_head, obj_table, n); \ +} while (0) + +#define DEQUEUE_PTRS_32(r, ring_start, cons_head, obj_table, n) do { \ + unsigned int i; \ + uint32_t idx = cons_head & (r)->mask; \ + const uint32_t size = (r)->size; \ + uint32_t *ring = (uint32_t *)ring_start; \ + uint32_t *obj = (uint32_t *)obj_table; \ + if (likely(idx + n < size)) { \ + for (i = 0; i < (n & (~(unsigned)0x7)); i += 8, idx += 8) {\ + obj[i] = ring[idx]; \ + obj[i + 1] = ring[idx + 1]; \ + obj[i + 2] = ring[idx + 2]; \ + obj[i + 3] = ring[idx + 3]; \ + obj[i + 4] = ring[idx + 4]; \ + obj[i + 5] = ring[idx + 5]; \ + obj[i + 6] = ring[idx + 6]; \ + obj[i + 7] = ring[idx + 7]; \ + } \ + switch (n & 0x7) { \ + case 7: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 6: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 5: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 4: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 3: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 2: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 1: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + } \ + } else { \ + for (i = 0; idx < size; i++, idx++) \ + obj[i] = ring[idx]; \ + for (idx = 0; i < n; i++, idx++) \ + obj[i] = ring[idx]; \ + } \ +} while (0) + +#define DEQUEUE_PTRS_64(r, ring_start, cons_head, obj_table, n) do { \ + unsigned int i; \ + uint32_t idx = cons_head & (r)->mask; \ + const uint32_t size = (r)->size; \ + uint64_t *ring = (uint64_t *)ring_start; \ + uint64_t *obj = (uint64_t *)obj_table; \ + if (likely(idx + n < size)) { \ + for (i = 0; i < (n & (~(unsigned)0x3)); i += 4, idx += 4) {\ + obj[i] = ring[idx]; \ + obj[i + 1] = ring[idx + 1]; \ + obj[i + 2] = ring[idx + 2]; \ + obj[i + 3] = ring[idx + 3]; \ + } \ + switch (n & 0x3) { \ + case 3: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 2: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + case 1: \ + obj[i++] = ring[idx++]; \ + } \ + } else { \ + for (i = 0; idx < size; i++, idx++) \ + obj[i] = ring[idx]; \ + for (idx = 0; i < n; i++, idx++) \ + obj[i] = ring[idx]; \ + } \ +} while (0) + +#define DEQUEUE_PTRS_128(r, ring_start, cons_head, obj_table, n) do { \ + unsigned int i; \ + uint32_t idx = cons_head & (r)->mask; \ + const uint32_t size = (r)->size; \ + __uint128_t *ring = (__uint128_t *)ring_start; \ + __uint128_t *obj = (__uint128_t *)obj_table; \ + if (likely(idx + n < size)) { \ + for (i = 0; i < (n >> 1); i += 2, idx += 2) { \ + obj[i] = ring[idx]; \ + obj[i + 1] = ring[idx + 1]; \ + } \ + switch (n & 0x1) { \ + case 1: \ + obj[i++] = ring[idx++]; /* fallthrough */ \ + } \ + } else { \ + for (i = 0; idx < size; i++, idx++) \ + obj[i] = ring[idx]; \ + for (idx = 0; i < n; i++, idx++) \ + obj[i] = ring[idx]; \ + } \ +} while (0) + +/* Between load and load. there might be cpu reorder in weak model + * (powerpc/arm). + * There are 2 choices for the users + * 1.use rmb() memory barrier + * 2.use one-direction load_acquire/store_release barrier,defined by + * CONFIG_RTE_USE_C11_MEM_MODEL=y + * It depends on performance test results. + * By default, move common functions to rte_ring_generic.h + */ +#ifdef RTE_USE_C11_MEM_MODEL +#include "rte_ring_c11_mem.h" +#else +#include "rte_ring_generic.h" +#endif + +/** + * @internal Enqueue several objects on the ring + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param behavior + * RTE_RING_QUEUE_FIXED: Enqueue a fixed number of items from a ring + * RTE_RING_QUEUE_VARIABLE: Enqueue as many items as possible from ring + * @param is_sp + * Indicates whether to use single producer or multi-producer head update + * @param free_space + * returns the amount of space after the enqueue operation has finished + * @return + * Actual number of objects enqueued. + * If behavior == RTE_RING_QUEUE_FIXED, this will be 0 or n only. + */ +static __rte_always_inline unsigned int +__rte_ring_do_enqueue_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, + enum rte_ring_queue_behavior behavior, unsigned int is_sp, + unsigned int *free_space) +{ + uint32_t prod_head, prod_next; + uint32_t free_entries; + + n = __rte_ring_move_prod_head(r, is_sp, n, behavior, + &prod_head, &prod_next, &free_entries); + if (n == 0) + goto end; + + ENQUEUE_PTRS_ELEM(r, &r[1], prod_head, obj_table, esize, n); + + update_tail(&r->prod, prod_head, prod_next, is_sp, 1); +end: + if (free_space != NULL) + *free_space = free_entries - n; + return n; +} + +/** + * @internal Dequeue several objects from the ring + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to pull from the ring. + * @param behavior + * RTE_RING_QUEUE_FIXED: Dequeue a fixed number of items from a ring + * RTE_RING_QUEUE_VARIABLE: Dequeue as many items as possible from ring + * @param is_sc + * Indicates whether to use single consumer or multi-consumer head update + * @param available + * returns the number of remaining ring entries after the dequeue has finished + * @return + * - Actual number of objects dequeued. + * If behavior == RTE_RING_QUEUE_FIXED, this will be 0 or n only. + */ +static __rte_always_inline unsigned int +__rte_ring_do_dequeue_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, + enum rte_ring_queue_behavior behavior, unsigned int is_sc, + unsigned int *available) +{ + uint32_t cons_head, cons_next; + uint32_t entries; + + n = __rte_ring_move_cons_head(r, (int)is_sc, n, behavior, + &cons_head, &cons_next, &entries); + if (n == 0) + goto end; + + DEQUEUE_PTRS_ELEM(r, &r[1], cons_head, obj_table, esize, n); + + update_tail(&r->cons, cons_head, cons_next, is_sc, 0); + +end: + if (available != NULL) + *available = entries - n; + return n; +} + +/** + * Enqueue several objects on the ring (multi-producers safe). + * + * This function uses a "compare and set" instruction to move the + * producer index atomically. + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param free_space + * if non-NULL, returns the amount of space in the ring after the + * enqueue operation has finished. + * @return + * The number of objects enqueued, either 0 or n + */ +static __rte_always_inline unsigned int +rte_ring_mp_enqueue_bulk_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_FIXED, __IS_MP, free_space); +} + +/** + * Enqueue several objects on a ring (NOT multi-producers safe). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param free_space + * if non-NULL, returns the amount of space in the ring after the + * enqueue operation has finished. + * @return + * The number of objects enqueued, either 0 or n + */ +static __rte_always_inline unsigned int +rte_ring_sp_enqueue_bulk_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_FIXED, __IS_SP, free_space); +} + +/** + * Enqueue several objects on a ring. + * + * This function calls the multi-producer or the single-producer + * version depending on the default behavior that was specified at + * ring creation time (see flags). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param free_space + * if non-NULL, returns the amount of space in the ring after the + * enqueue operation has finished. + * @return + * The number of objects enqueued, either 0 or n + */ +static __rte_always_inline unsigned int +rte_ring_enqueue_bulk_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_FIXED, r->prod.single, free_space); +} + +/** + * Enqueue one object on a ring (multi-producers safe). + * + * This function uses a "compare and set" instruction to move the + * producer index atomically. + * + * @param r + * A pointer to the ring structure. + * @param obj + * A pointer to the object to be added. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @return + * - 0: Success; objects enqueued. + * - -ENOBUFS: Not enough room in the ring to enqueue; no object is enqueued. + */ +static __rte_always_inline int +rte_ring_mp_enqueue_elem(struct rte_ring *r, void *obj, unsigned int esize) +{ + return rte_ring_mp_enqueue_bulk_elem(r, obj, esize, 1, NULL) ? 0 : + -ENOBUFS; +} + +/** + * Enqueue one object on a ring (NOT multi-producers safe). + * + * @param r + * A pointer to the ring structure. + * @param obj + * A pointer to the object to be added. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @return + * - 0: Success; objects enqueued. + * - -ENOBUFS: Not enough room in the ring to enqueue; no object is enqueued. + */ +static __rte_always_inline int +rte_ring_sp_enqueue_elem(struct rte_ring *r, void *obj, unsigned int esize) +{ + return rte_ring_sp_enqueue_bulk_elem(r, obj, esize, 1, NULL) ? 0 : + -ENOBUFS; +} + +/** + * Enqueue one object on a ring. + * + * This function calls the multi-producer or the single-producer + * version, depending on the default behaviour that was specified at + * ring creation time (see flags). + * + * @param r + * A pointer to the ring structure. + * @param obj + * A pointer to the object to be added. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @return + * - 0: Success; objects enqueued. + * - -ENOBUFS: Not enough room in the ring to enqueue; no object is enqueued. + */ +static __rte_always_inline int +rte_ring_enqueue_elem(struct rte_ring *r, void *obj, unsigned int esize) +{ + return rte_ring_enqueue_bulk_elem(r, obj, esize, 1, NULL) ? 0 : + -ENOBUFS; +} + +/** + * Dequeue several objects from a ring (multi-consumers safe). + * + * This function uses a "compare and set" instruction to move the + * consumer index atomically. + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to dequeue from the ring to the obj_table. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects dequeued, either 0 or n + */ +static __rte_always_inline unsigned int +rte_ring_mc_dequeue_bulk_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + return __rte_ring_do_dequeue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_FIXED, __IS_MC, available); +} + +/** + * Dequeue several objects from a ring (NOT multi-consumers safe). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to dequeue from the ring to the obj_table, + * must be strictly positive. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects dequeued, either 0 or n + */ +static __rte_always_inline unsigned int +rte_ring_sc_dequeue_bulk_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + return __rte_ring_do_dequeue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_FIXED, __IS_SC, available); +} + +/** + * Dequeue several objects from a ring. + * + * This function calls the multi-consumers or the single-consumer + * version, depending on the default behaviour that was specified at + * ring creation time (see flags). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to dequeue from the ring to the obj_table. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects dequeued, either 0 or n + */ +static __rte_always_inline unsigned int +rte_ring_dequeue_bulk_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + return __rte_ring_do_dequeue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_FIXED, r->cons.single, available); +} + +/** + * Dequeue one object from a ring (multi-consumers safe). + * + * This function uses a "compare and set" instruction to move the + * consumer index atomically. + * + * @param r + * A pointer to the ring structure. + * @param obj_p + * A pointer to a void * pointer (object) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @return + * - 0: Success; objects dequeued. + * - -ENOENT: Not enough entries in the ring to dequeue; no object is + * dequeued. + */ +static __rte_always_inline int +rte_ring_mc_dequeue_elem(struct rte_ring *r, void *obj_p, + unsigned int esize) +{ + return rte_ring_mc_dequeue_bulk_elem(r, obj_p, esize, 1, NULL) ? 0 : + -ENOENT; +} + +/** + * Dequeue one object from a ring (NOT multi-consumers safe). + * + * @param r + * A pointer to the ring structure. + * @param obj_p + * A pointer to a void * pointer (object) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @return + * - 0: Success; objects dequeued. + * - -ENOENT: Not enough entries in the ring to dequeue, no object is + * dequeued. + */ +static __rte_always_inline int +rte_ring_sc_dequeue_elem(struct rte_ring *r, void *obj_p, + unsigned int esize) +{ + return rte_ring_sc_dequeue_bulk_elem(r, obj_p, esize, 1, NULL) ? 0 : + -ENOENT; +} + +/** + * Dequeue one object from a ring. + * + * This function calls the multi-consumers or the single-consumer + * version depending on the default behaviour that was specified at + * ring creation time (see flags). + * + * @param r + * A pointer to the ring structure. + * @param obj_p + * A pointer to a void * pointer (object) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @return + * - 0: Success, objects dequeued. + * - -ENOENT: Not enough entries in the ring to dequeue, no object is + * dequeued. + */ +static __rte_always_inline int +rte_ring_dequeue_elem(struct rte_ring *r, void *obj_p, unsigned int esize) +{ + return rte_ring_dequeue_bulk_elem(r, obj_p, esize, 1, NULL) ? 0 : + -ENOENT; +} + +/** + * Enqueue several objects on the ring (multi-producers safe). + * + * This function uses a "compare and set" instruction to move the + * producer index atomically. + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param free_space + * if non-NULL, returns the amount of space in the ring after the + * enqueue operation has finished. + * @return + * - n: Actual number of objects enqueued. + */ +static __rte_always_inline unsigned +rte_ring_mp_enqueue_burst_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_VARIABLE, __IS_MP, free_space); +} + +/** + * Enqueue several objects on a ring (NOT multi-producers safe). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param free_space + * if non-NULL, returns the amount of space in the ring after the + * enqueue operation has finished. + * @return + * - n: Actual number of objects enqueued. + */ +static __rte_always_inline unsigned +rte_ring_sp_enqueue_burst_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_VARIABLE, __IS_SP, free_space); +} + +/** + * Enqueue several objects on a ring. + * + * This function calls the multi-producer or the single-producer + * version depending on the default behavior that was specified at + * ring creation time (see flags). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects). + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to add in the ring from the obj_table. + * @param free_space + * if non-NULL, returns the amount of space in the ring after the + * enqueue operation has finished. + * @return + * - n: Actual number of objects enqueued. + */ +static __rte_always_inline unsigned +rte_ring_enqueue_burst_elem(struct rte_ring *r, void * const obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_VARIABLE, r->prod.single, free_space); +} + +/** + * Dequeue several objects from a ring (multi-consumers safe). When the request + * objects are more than the available objects, only dequeue the actual number + * of objects + * + * This function uses a "compare and set" instruction to move the + * consumer index atomically. + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to dequeue from the ring to the obj_table. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * - n: Actual number of objects dequeued, 0 if ring is empty + */ +static __rte_always_inline unsigned +rte_ring_mc_dequeue_burst_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + return __rte_ring_do_dequeue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_VARIABLE, __IS_MC, available); +} + +/** + * Dequeue several objects from a ring (NOT multi-consumers safe).When the + * request objects are more than the available objects, only dequeue the + * actual number of objects + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to dequeue from the ring to the obj_table. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * - n: Actual number of objects dequeued, 0 if ring is empty + */ +static __rte_always_inline unsigned +rte_ring_sc_dequeue_burst_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + return __rte_ring_do_dequeue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_VARIABLE, __IS_SC, available); +} + +/** + * Dequeue multiple objects from a ring up to a maximum number. + * + * This function calls the multi-consumers or the single-consumer + * version, depending on the default behaviour that was specified at + * ring creation time (see flags). + * + * @param r + * A pointer to the ring structure. + * @param obj_table + * A pointer to a table of void * pointers (objects) that will be filled. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * Currently, sizes 4, 8 and 16 are supported. This should be the same + * as passed while creating the ring, otherwise the results are undefined. + * @param n + * The number of objects to dequeue from the ring to the obj_table. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * - Number of objects dequeued + */ +static __rte_always_inline unsigned +rte_ring_dequeue_burst_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + return __rte_ring_do_dequeue_elem(r, obj_table, esize, n, + RTE_RING_QUEUE_VARIABLE, + r->cons.single, available); +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_RING_ELEM_H_ */ diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map index 510c1386e..e410a7503 100644 --- a/lib/librte_ring/rte_ring_version.map +++ b/lib/librte_ring/rte_ring_version.map @@ -21,6 +21,8 @@ DPDK_2.2 { EXPERIMENTAL { global: + rte_ring_create_elem; + rte_ring_get_memsize_elem; rte_ring_reset; }; From patchwork Thu Oct 17 20:08:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 176742 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1426757ill; Thu, 17 Oct 2019 13:08:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqyizDNmNh+2mkXIBAq6vcxLtLSN/q2eMVW7szf8p94+S8GUjLTKYhCHEhckVsqTNtmAu20f X-Received: by 2002:a17:906:9487:: with SMTP id t7mr5201360ejx.231.1571342938602; Thu, 17 Oct 2019 13:08:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571342938; cv=none; d=google.com; s=arc-20160816; b=wydKy9/Lo6Tfoe1BVFyTWGPfmEnQiJb7zlGV2hx+QGKV2w+z0qwD14I8L9c/wNRqGL 3lP2RX7UQZS8AB34dfgJ+nDzbOof6c3jlMcMrdXZxR195mP9yREoLf674gyvatv44f1D TeCLniKo+KiK+fhZ/pi5pcpA6SeAi+6R1wmRRaa2ByP4piPQVca2VfQgQ/HDQTQ7L1Jw MXulRCdzd4kz4vc+eJoU4B22L8lo+9mtqZ3w6hGFcJtn51pm4E5Zat0EH5DdBnA7cirQ mdj6wmlcx4jqE35Nog7GEVc7tz00/N+oz1rG8wlkpWznMcrpkWVPvDjZZabRaZAOLleZ suzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=8RyDtQU/BN8oRd3XeChIaTjRhm3l8NQr3gJpYFM752k=; b=VjgYxDTAUXSnRx+sUfzhd40OuknC2nDB9GDIcRR1ZZ0QVvmPUV4I+pMdMZcqVczbuZ +VPRaohFKn1tp2nsJMhdkK3kmxchnfjeakwdq7iXZqH3QsCgixb+atv+p72Ioj0H7W3k FpMxymVSI+JLEFF9rXQ5OcHkLo9hHCvpenIJyinCBsgOjLk3PPovquylZD6fz3aAYRGm cWY6wTCiNmH1K2BIc0JtvMw+4eU9fxs8JLXh815USPHgYYbs7TaZC1m3JnSk5Z8VfgVD LKOYdb7Mxj9c10rCuo88gjQDK6Kht8VPkxrCepqcVXVDOp6IXbGHpywPyUapUk1Z8ob+ DiJw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id h10si1941509ejf.371.2019.10.17.13.08.58; Thu, 17 Oct 2019 13:08:58 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 44B2D1E9C5; Thu, 17 Oct 2019 22:08:44 +0200 (CEST) Received: from foss.arm.com (unknown [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 1E7CE1D50B for ; Thu, 17 Oct 2019 22:08:40 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0716932D; Thu, 17 Oct 2019 13:08:31 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EB9A23F68E; Thu, 17 Oct 2019 13:08:30 -0700 (PDT) From: Honnappa Nagarahalli To: olivier.matz@6wind.com, sthemmin@microsoft.com, jerinj@marvell.com, bruce.richardson@intel.com, david.marchand@redhat.com, pbhagavatula@marvell.com, konstantin.ananyev@intel.com, drc@linux.vnet.ibm.com, hemant.agrawal@nxp.com, honnappa.nagarahalli@arm.com Cc: dev@dpdk.org, dharmik.thakkar@arm.com, ruifeng.wang@arm.com, gavin.hu@arm.com Date: Thu, 17 Oct 2019 15:08:06 -0500 Message-Id: <20191017200807.20772-3-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017200807.20772-1-honnappa.nagarahalli@arm.com> References: <20190906190510.11146-1-honnappa.nagarahalli@arm.com> <20191017200807.20772-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 2/3] test/ring: add test cases for configurable element size ring X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Add test cases to test APIs for configurable element size ring. Signed-off-by: Honnappa Nagarahalli --- app/test/Makefile | 1 + app/test/meson.build | 1 + app/test/test_ring_perf_elem.c | 419 +++++++++++++++++++++++++++++++++ 3 files changed, 421 insertions(+) create mode 100644 app/test/test_ring_perf_elem.c -- 2.17.1 diff --git a/app/test/Makefile b/app/test/Makefile index 26ba6fe2b..e5cb27b75 100644 --- a/app/test/Makefile +++ b/app/test/Makefile @@ -78,6 +78,7 @@ SRCS-y += test_rand_perf.c SRCS-y += test_ring.c SRCS-y += test_ring_perf.c +SRCS-y += test_ring_perf_elem.c SRCS-y += test_pmd_perf.c ifeq ($(CONFIG_RTE_LIBRTE_TABLE),y) diff --git a/app/test/meson.build b/app/test/meson.build index ec40943bd..995ee9bc7 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -101,6 +101,7 @@ test_sources = files('commands.c', 'test_reorder.c', 'test_ring.c', 'test_ring_perf.c', + 'test_ring_perf_elem.c', 'test_rwlock.c', 'test_sched.c', 'test_service_cores.c', diff --git a/app/test/test_ring_perf_elem.c b/app/test/test_ring_perf_elem.c new file mode 100644 index 000000000..fc5b82d71 --- /dev/null +++ b/app/test/test_ring_perf_elem.c @@ -0,0 +1,419 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation + */ + + +#include +#include +#include +#include +#include +#include +#include + +#include "test.h" + +/* + * Ring + * ==== + * + * Measures performance of various operations using rdtsc + * * Empty ring dequeue + * * Enqueue/dequeue of bursts in 1 threads + * * Enqueue/dequeue of bursts in 2 threads + */ + +#define RING_NAME "RING_PERF" +#define RING_SIZE 4096 +#define MAX_BURST 64 + +/* + * the sizes to enqueue and dequeue in testing + * (marked volatile so they won't be seen as compile-time constants) + */ +static const volatile unsigned bulk_sizes[] = { 8, 32 }; + +struct lcore_pair { + unsigned c1, c2; +}; + +static volatile unsigned lcore_count; + +/**** Functions to analyse our core mask to get cores for different tests ***/ + +static int +get_two_hyperthreads(struct lcore_pair *lcp) +{ + unsigned id1, id2; + unsigned c1, c2, s1, s2; + RTE_LCORE_FOREACH(id1) { + /* inner loop just re-reads all id's. We could skip the + * first few elements, but since number of cores is small + * there is little point + */ + RTE_LCORE_FOREACH(id2) { + if (id1 == id2) + continue; + + c1 = rte_lcore_to_cpu_id(id1); + c2 = rte_lcore_to_cpu_id(id2); + s1 = rte_lcore_to_socket_id(id1); + s2 = rte_lcore_to_socket_id(id2); + if ((c1 == c2) && (s1 == s2)) { + lcp->c1 = id1; + lcp->c2 = id2; + return 0; + } + } + } + return 1; +} + +static int +get_two_cores(struct lcore_pair *lcp) +{ + unsigned id1, id2; + unsigned c1, c2, s1, s2; + RTE_LCORE_FOREACH(id1) { + RTE_LCORE_FOREACH(id2) { + if (id1 == id2) + continue; + + c1 = rte_lcore_to_cpu_id(id1); + c2 = rte_lcore_to_cpu_id(id2); + s1 = rte_lcore_to_socket_id(id1); + s2 = rte_lcore_to_socket_id(id2); + if ((c1 != c2) && (s1 == s2)) { + lcp->c1 = id1; + lcp->c2 = id2; + return 0; + } + } + } + return 1; +} + +static int +get_two_sockets(struct lcore_pair *lcp) +{ + unsigned id1, id2; + unsigned s1, s2; + RTE_LCORE_FOREACH(id1) { + RTE_LCORE_FOREACH(id2) { + if (id1 == id2) + continue; + s1 = rte_lcore_to_socket_id(id1); + s2 = rte_lcore_to_socket_id(id2); + if (s1 != s2) { + lcp->c1 = id1; + lcp->c2 = id2; + return 0; + } + } + } + return 1; +} + +/* Get cycle counts for dequeuing from an empty ring. Should be 2 or 3 cycles */ +static void +test_empty_dequeue(struct rte_ring *r) +{ + const unsigned iter_shift = 26; + const unsigned iterations = 1<r; + const unsigned size = params->size; + unsigned i; + uint32_t burst[MAX_BURST] = {0}; + +#ifdef RTE_USE_C11_MEM_MODEL + if (__atomic_add_fetch(&lcore_count, 1, __ATOMIC_RELAXED) != 2) +#else + if (__sync_add_and_fetch(&lcore_count, 1) != 2) +#endif + while (lcore_count != 2) + rte_pause(); + + const uint64_t sp_start = rte_rdtsc(); + for (i = 0; i < iterations; i++) + while (rte_ring_sp_enqueue_bulk_elem(r, burst, 8, size, NULL) + == 0) + rte_pause(); + const uint64_t sp_end = rte_rdtsc(); + + const uint64_t mp_start = rte_rdtsc(); + for (i = 0; i < iterations; i++) + while (rte_ring_mp_enqueue_bulk_elem(r, burst, 8, size, NULL) + == 0) + rte_pause(); + const uint64_t mp_end = rte_rdtsc(); + + params->spsc = ((double)(sp_end - sp_start))/(iterations*size); + params->mpmc = ((double)(mp_end - mp_start))/(iterations*size); + return 0; +} + +/* + * Function that uses rdtsc to measure timing for ring dequeue. Needs pair + * thread running enqueue_bulk function + */ +static int +dequeue_bulk(void *p) +{ + const unsigned iter_shift = 23; + const unsigned iterations = 1<r; + const unsigned size = params->size; + unsigned i; + uint32_t burst[MAX_BURST] = {0}; + +#ifdef RTE_USE_C11_MEM_MODEL + if (__atomic_add_fetch(&lcore_count, 1, __ATOMIC_RELAXED) != 2) +#else + if (__sync_add_and_fetch(&lcore_count, 1) != 2) +#endif + while (lcore_count != 2) + rte_pause(); + + const uint64_t sc_start = rte_rdtsc(); + for (i = 0; i < iterations; i++) + while (rte_ring_sc_dequeue_bulk_elem(r, burst, 8, size, NULL) + == 0) + rte_pause(); + const uint64_t sc_end = rte_rdtsc(); + + const uint64_t mc_start = rte_rdtsc(); + for (i = 0; i < iterations; i++) + while (rte_ring_mc_dequeue_bulk_elem(r, burst, 8, size, NULL) + == 0) + rte_pause(); + const uint64_t mc_end = rte_rdtsc(); + + params->spsc = ((double)(sc_end - sc_start))/(iterations*size); + params->mpmc = ((double)(mc_end - mc_start))/(iterations*size); + return 0; +} + +/* + * Function that calls the enqueue and dequeue bulk functions on pairs of cores. + * used to measure ring perf between hyperthreads, cores and sockets. + */ +static void +run_on_core_pair(struct lcore_pair *cores, struct rte_ring *r, + lcore_function_t f1, lcore_function_t f2) +{ + struct thread_params param1 = {0}, param2 = {0}; + unsigned i; + for (i = 0; i < sizeof(bulk_sizes)/sizeof(bulk_sizes[0]); i++) { + lcore_count = 0; + param1.size = param2.size = bulk_sizes[i]; + param1.r = param2.r = r; + if (cores->c1 == rte_get_master_lcore()) { + rte_eal_remote_launch(f2, ¶m2, cores->c2); + f1(¶m1); + rte_eal_wait_lcore(cores->c2); + } else { + rte_eal_remote_launch(f1, ¶m1, cores->c1); + rte_eal_remote_launch(f2, ¶m2, cores->c2); + rte_eal_wait_lcore(cores->c1); + rte_eal_wait_lcore(cores->c2); + } + printf("SP/SC bulk enq/dequeue (size: %u): %.2F\n", + bulk_sizes[i], param1.spsc + param2.spsc); + printf("MP/MC bulk enq/dequeue (size: %u): %.2F\n", + bulk_sizes[i], param1.mpmc + param2.mpmc); + } +} + +/* + * Test function that determines how long an enqueue + dequeue of a single item + * takes on a single lcore. Result is for comparison with the bulk enq+deq. + */ +static void +test_single_enqueue_dequeue(struct rte_ring *r) +{ + const unsigned iter_shift = 24; + const unsigned iterations = 1<> iter_shift); + printf("MP/MC single enq/dequeue: %"PRIu64"\n", + (mc_end-mc_start) >> iter_shift); +} + +/* + * Test that does both enqueue and dequeue on a core using the burst() API calls + * instead of the bulk() calls used in other tests. Results should be the same + * as for the bulk function called on a single lcore. + */ +static void +test_burst_enqueue_dequeue(struct rte_ring *r) +{ + const unsigned iter_shift = 23; + const unsigned iterations = 1<> iter_shift) / + bulk_sizes[sz]; + uint64_t sc_avg = ((sc_end-sc_start) >> iter_shift) / + bulk_sizes[sz]; + + printf("SP/SC burst enq/dequeue (size: %u): %"PRIu64"\n", + bulk_sizes[sz], sc_avg); + printf("MP/MC burst enq/dequeue (size: %u): %"PRIu64"\n", + bulk_sizes[sz], mc_avg); + } +} + +/* Times enqueue and dequeue on a single lcore */ +static void +test_bulk_enqueue_dequeue(struct rte_ring *r) +{ + const unsigned iter_shift = 23; + const unsigned iterations = 1< X-Patchwork-Id: 176743 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1427041ill; Thu, 17 Oct 2019 13:09:13 -0700 (PDT) X-Google-Smtp-Source: APXvYqxqdu4Xf9QKlBoaRXOH2JxRN24t5acCPaQoT/RTe9hIzbdvII+OgGCGf7DAr5XwinbZb2On X-Received: by 2002:a50:8d8a:: with SMTP id r10mr5812698edh.302.1571342953206; Thu, 17 Oct 2019 13:09:13 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571342953; cv=none; d=google.com; s=arc-20160816; b=FmW6Z6FnJQkBheSaB9FvhBB1hUZkNKsbiuA/ZGw7s6IZEmhyv/QSOOjwuL152+nOWU +yT40XX3fRMMKRiRS2p+eK9DzRzYQB4tPLzKTLADQ+DUGStn8Ev846jPRhhYGdHqCsoz BnDCypNxoX2K+RJY1hhzQqMjwge92Gay9QSN3dPYHOwKBG5Gxtef/pDJmpPooap6Cl9X 8h3Vn7YH0nuoi9622fBlfkxbl/nwcBMigqzG/5scqJs7ru+ivd6uuApBl4BjVQMPfN/z oTdW+CgNgSkxbukYR7RG+FeZs78ffM3kfdBZjxkuMIo9/srWNDD6PLNwXXYFwFjXds7Q KkkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:cc:to:from; bh=hoa/H4RntthZAGS/xRdOt2z1dm4UtbZFH6YQvuUBdWY=; b=Axpzm7vvN2BJ56FoJep96/ZRl19pwwiabUuNtu2Q/01T9ghP+/nzXtNRJetbW1lbSs J5LJLiAwQl2OhRqlYUE+mQfEyK78jQ18Dm/UX563YtGx6PSsWVDErdszZvO74OwRcbfU YoobvfqBTjYqrtsD0NEj4Gf1A6KVxNFIkgWDlJIy2dqI1YCPVpJV+mKzec+UvQ5aJ99t N5z2KmH9F6TX7h+vp+03wMih48RFxifFCn9Lpj/jto76fBVpZEXUdTJRG0QJAE36w5ly ZnCkCJC3m1zCZpqGYmf9XNYkuij20EZ07Wbj9JD+2oSJWhA3OHRBLdKVJf8u6MpgOzZQ sW8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id u12si2210359ejt.21.2019.10.17.13.09.12; Thu, 17 Oct 2019 13:09:13 -0700 (PDT) Received-SPF: pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) client-ip=92.243.14.124; Authentication-Results: mx.google.com; spf=pass (google.com: domain of dev-bounces@dpdk.org designates 92.243.14.124 as permitted sender) smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DE4FB1E9DA; Thu, 17 Oct 2019 22:08:46 +0200 (CEST) Received: from foss.arm.com (unknown [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 1C2001D50B for ; Thu, 17 Oct 2019 22:08:41 +0200 (CEST) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id DE713332; Thu, 17 Oct 2019 13:08:31 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.34]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C8ADB3F68E; Thu, 17 Oct 2019 13:08:31 -0700 (PDT) From: Honnappa Nagarahalli To: olivier.matz@6wind.com, sthemmin@microsoft.com, jerinj@marvell.com, bruce.richardson@intel.com, david.marchand@redhat.com, pbhagavatula@marvell.com, konstantin.ananyev@intel.com, drc@linux.vnet.ibm.com, hemant.agrawal@nxp.com, honnappa.nagarahalli@arm.com Cc: dev@dpdk.org, dharmik.thakkar@arm.com, ruifeng.wang@arm.com, gavin.hu@arm.com Date: Thu, 17 Oct 2019 15:08:07 -0500 Message-Id: <20191017200807.20772-4-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20191017200807.20772-1-honnappa.nagarahalli@arm.com> References: <20190906190510.11146-1-honnappa.nagarahalli@arm.com> <20191017200807.20772-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 3/3] lib/ring: copy ring elements using memcpy partially X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Copy of ring elements uses memcpy for 32B chunks. The remaining bytes are copied using assignments. Signed-off-by: Honnappa Nagarahalli --- lib/librte_ring/rte_ring_elem.h | 163 +++----------------------------- 1 file changed, 11 insertions(+), 152 deletions(-) -- 2.17.1 diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h index 860f059ad..92e92f150 100644 --- a/lib/librte_ring/rte_ring_elem.h +++ b/lib/librte_ring/rte_ring_elem.h @@ -24,6 +24,7 @@ extern "C" { #include #include #include +#include #include #include #include @@ -108,35 +109,16 @@ __rte_experimental struct rte_ring *rte_ring_create_elem(const char *name, unsigned count, unsigned esize, int socket_id, unsigned flags); -/* the actual enqueue of pointers on the ring. - * Placed here since identical code needed in both - * single and multi producer enqueue functions. - */ -#define ENQUEUE_PTRS_ELEM(r, ring_start, prod_head, obj_table, esize, n) do { \ - if (esize == 4) \ - ENQUEUE_PTRS_32(r, ring_start, prod_head, obj_table, n); \ - else if (esize == 8) \ - ENQUEUE_PTRS_64(r, ring_start, prod_head, obj_table, n); \ - else if (esize == 16) \ - ENQUEUE_PTRS_128(r, ring_start, prod_head, obj_table, n); \ -} while (0) - -#define ENQUEUE_PTRS_32(r, ring_start, prod_head, obj_table, n) do { \ +#define ENQUEUE_PTRS_GEN(r, ring_start, prod_head, obj_table, esize, n) do { \ unsigned int i; \ const uint32_t size = (r)->size; \ uint32_t idx = prod_head & (r)->mask; \ uint32_t *ring = (uint32_t *)ring_start; \ uint32_t *obj = (uint32_t *)obj_table; \ + uint32_t sz = n * (esize / sizeof(uint32_t)); \ if (likely(idx + n < size)) { \ - for (i = 0; i < (n & ((~(unsigned)0x7))); i += 8, idx += 8) { \ - ring[idx] = obj[i]; \ - ring[idx + 1] = obj[i + 1]; \ - ring[idx + 2] = obj[i + 2]; \ - ring[idx + 3] = obj[i + 3]; \ - ring[idx + 4] = obj[i + 4]; \ - ring[idx + 5] = obj[i + 5]; \ - ring[idx + 6] = obj[i + 6]; \ - ring[idx + 7] = obj[i + 7]; \ + for (i = 0; i < (sz & ((~(unsigned)0x7))); i += 8, idx += 8) { \ + memcpy (ring + i, obj + i, 8 * sizeof (uint32_t)); \ } \ switch (n & 0x7) { \ case 7: \ @@ -162,87 +144,16 @@ struct rte_ring *rte_ring_create_elem(const char *name, unsigned count, } \ } while (0) -#define ENQUEUE_PTRS_64(r, ring_start, prod_head, obj_table, n) do { \ - unsigned int i; \ - const uint32_t size = (r)->size; \ - uint32_t idx = prod_head & (r)->mask; \ - uint64_t *ring = (uint64_t *)ring_start; \ - uint64_t *obj = (uint64_t *)obj_table; \ - if (likely(idx + n < size)) { \ - for (i = 0; i < (n & ((~(unsigned)0x3))); i += 4, idx += 4) { \ - ring[idx] = obj[i]; \ - ring[idx + 1] = obj[i + 1]; \ - ring[idx + 2] = obj[i + 2]; \ - ring[idx + 3] = obj[i + 3]; \ - } \ - switch (n & 0x3) { \ - case 3: \ - ring[idx++] = obj[i++]; /* fallthrough */ \ - case 2: \ - ring[idx++] = obj[i++]; /* fallthrough */ \ - case 1: \ - ring[idx++] = obj[i++]; \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++)\ - ring[idx] = obj[i]; \ - for (idx = 0; i < n; i++, idx++) \ - ring[idx] = obj[i]; \ - } \ -} while (0) - -#define ENQUEUE_PTRS_128(r, ring_start, prod_head, obj_table, n) do { \ - unsigned int i; \ - const uint32_t size = (r)->size; \ - uint32_t idx = prod_head & (r)->mask; \ - __uint128_t *ring = (__uint128_t *)ring_start; \ - __uint128_t *obj = (__uint128_t *)obj_table; \ - if (likely(idx + n < size)) { \ - for (i = 0; i < (n >> 1); i += 2, idx += 2) { \ - ring[idx] = obj[i]; \ - ring[idx + 1] = obj[i + 1]; \ - } \ - switch (n & 0x1) { \ - case 1: \ - ring[idx++] = obj[i++]; \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++)\ - ring[idx] = obj[i]; \ - for (idx = 0; i < n; i++, idx++) \ - ring[idx] = obj[i]; \ - } \ -} while (0) - -/* the actual copy of pointers on the ring to obj_table. - * Placed here since identical code needed in both - * single and multi consumer dequeue functions. - */ -#define DEQUEUE_PTRS_ELEM(r, ring_start, cons_head, obj_table, esize, n) do { \ - if (esize == 4) \ - DEQUEUE_PTRS_32(r, ring_start, cons_head, obj_table, n); \ - else if (esize == 8) \ - DEQUEUE_PTRS_64(r, ring_start, cons_head, obj_table, n); \ - else if (esize == 16) \ - DEQUEUE_PTRS_128(r, ring_start, cons_head, obj_table, n); \ -} while (0) - -#define DEQUEUE_PTRS_32(r, ring_start, cons_head, obj_table, n) do { \ +#define DEQUEUE_PTRS_GEN(r, ring_start, cons_head, obj_table, esize, n) do { \ unsigned int i; \ uint32_t idx = cons_head & (r)->mask; \ const uint32_t size = (r)->size; \ uint32_t *ring = (uint32_t *)ring_start; \ uint32_t *obj = (uint32_t *)obj_table; \ + uint32_t sz = n * (esize / sizeof(uint32_t)); \ if (likely(idx + n < size)) { \ - for (i = 0; i < (n & (~(unsigned)0x7)); i += 8, idx += 8) {\ - obj[i] = ring[idx]; \ - obj[i + 1] = ring[idx + 1]; \ - obj[i + 2] = ring[idx + 2]; \ - obj[i + 3] = ring[idx + 3]; \ - obj[i + 4] = ring[idx + 4]; \ - obj[i + 5] = ring[idx + 5]; \ - obj[i + 6] = ring[idx + 6]; \ - obj[i + 7] = ring[idx + 7]; \ + for (i = 0; i < (sz & ((~(unsigned)0x7))); i += 8, idx += 8) { \ + memcpy (obj + i, ring + i, 8 * sizeof (uint32_t)); \ } \ switch (n & 0x7) { \ case 7: \ @@ -268,58 +179,6 @@ struct rte_ring *rte_ring_create_elem(const char *name, unsigned count, } \ } while (0) -#define DEQUEUE_PTRS_64(r, ring_start, cons_head, obj_table, n) do { \ - unsigned int i; \ - uint32_t idx = cons_head & (r)->mask; \ - const uint32_t size = (r)->size; \ - uint64_t *ring = (uint64_t *)ring_start; \ - uint64_t *obj = (uint64_t *)obj_table; \ - if (likely(idx + n < size)) { \ - for (i = 0; i < (n & (~(unsigned)0x3)); i += 4, idx += 4) {\ - obj[i] = ring[idx]; \ - obj[i + 1] = ring[idx + 1]; \ - obj[i + 2] = ring[idx + 2]; \ - obj[i + 3] = ring[idx + 3]; \ - } \ - switch (n & 0x3) { \ - case 3: \ - obj[i++] = ring[idx++]; /* fallthrough */ \ - case 2: \ - obj[i++] = ring[idx++]; /* fallthrough */ \ - case 1: \ - obj[i++] = ring[idx++]; \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++) \ - obj[i] = ring[idx]; \ - for (idx = 0; i < n; i++, idx++) \ - obj[i] = ring[idx]; \ - } \ -} while (0) - -#define DEQUEUE_PTRS_128(r, ring_start, cons_head, obj_table, n) do { \ - unsigned int i; \ - uint32_t idx = cons_head & (r)->mask; \ - const uint32_t size = (r)->size; \ - __uint128_t *ring = (__uint128_t *)ring_start; \ - __uint128_t *obj = (__uint128_t *)obj_table; \ - if (likely(idx + n < size)) { \ - for (i = 0; i < (n >> 1); i += 2, idx += 2) { \ - obj[i] = ring[idx]; \ - obj[i + 1] = ring[idx + 1]; \ - } \ - switch (n & 0x1) { \ - case 1: \ - obj[i++] = ring[idx++]; /* fallthrough */ \ - } \ - } else { \ - for (i = 0; idx < size; i++, idx++) \ - obj[i] = ring[idx]; \ - for (idx = 0; i < n; i++, idx++) \ - obj[i] = ring[idx]; \ - } \ -} while (0) - /* Between load and load. there might be cpu reorder in weak model * (powerpc/arm). * There are 2 choices for the users @@ -373,7 +232,7 @@ __rte_ring_do_enqueue_elem(struct rte_ring *r, void * const obj_table, if (n == 0) goto end; - ENQUEUE_PTRS_ELEM(r, &r[1], prod_head, obj_table, esize, n); + ENQUEUE_PTRS_GEN(r, &r[1], prod_head, obj_table, esize, n); update_tail(&r->prod, prod_head, prod_next, is_sp, 1); end: @@ -420,7 +279,7 @@ __rte_ring_do_dequeue_elem(struct rte_ring *r, void *obj_table, if (n == 0) goto end; - DEQUEUE_PTRS_ELEM(r, &r[1], cons_head, obj_table, esize, n); + DEQUEUE_PTRS_GEN(r, &r[1], cons_head, obj_table, esize, n); update_tail(&r->cons, cons_head, cons_next, is_sc, 0);