From patchwork Sun Oct 25 05:45:49 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318954 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695140ilg; Sat, 24 Oct 2020 22:46:34 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxSwBlS5hINOwWzSWbxMtyEnRtLOT0pPAzjbtpmJoY0wpUw2JwhFM5lgT3Y8E59LcKzrxvh X-Received: by 2002:a17:906:bc50:: with SMTP id s16mr9558131ejv.275.1603604794298; Sat, 24 Oct 2020 22:46:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604794; cv=none; d=google.com; s=arc-20160816; b=WBAe/cYE7Gc4MQImTy7XDeJ8sIpxlYV0hoZYVhmtspxVimM/lp0LinPusDL0J0BKdM EpQL3NZpqUhzFiKYf409NCu/0fSJbY7lPpxaXz5dvCbrkc3W6LqWR7CfoyePuN0T+WFI SDFOx/LNZB9EJK+7YdFbkxELCXj9dMZaHLyvi2FUYmI0qriwgUw5Zsn+gyT4AGnGbvZ6 HvlniTf0GcylYXAfVfETCPwGm0uG9Y7AN49VOkokEAkyIV+lx50YplNG8U7fRq4xkgRG qs7e6D37PnXrWX2EiAHtJxQ0ShXo86SsUgPEbYrp4F4W6DZ8sPyR01ycRRjGRkJeN3DS kfYA== 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=3g5Bz3OOoTrB/nmP8r295+82OPGoqsNVQH7DQ1MU/Go=; b=Zxv2MOi+nJWQHouq4EVOTWzhBMyyEQ+sL/TjydXHHg6IrOKUalVwZvSW2PPnG4kgNj pJkbPTDnhIT2O1sj5tfa75fvyz8jsgfWv8QNDDtzbf03JhpzHkhFGATBMj8xqBCMa0oM +XZqBkjiIis5rfi4EoQbVqGNxHhNbZLR9wPhFM2cbm56mwBsVhakK2DcXn/gW10hzxUX uhjR8q0MxtwYPu48/GClDzyTsgF1Gd0G5JKy1WYU3QwC6PrrL0YbmFAOmxgXnF7qvg++ Dk/PLXb/kFm91j0m5PyXfMFxF6zUK4zvTUNus/HGzaTTh8fDU9BTviA7VCfNUjSB3Urg yHpg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id rn17si5487801ejb.666.2020.10.24.22.46.34; Sat, 24 Oct 2020 22:46:34 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 734482A6C; Sun, 25 Oct 2020 06:46:11 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 9EB2929C8 for ; Sun, 25 Oct 2020 06:46:07 +0100 (CET) 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 14B121435; Sat, 24 Oct 2020 22:46:07 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id F04733F66B; Sat, 24 Oct 2020 22:46:06 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:49 -0500 Message-Id: <20201025054556.14277-2-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 1/8] lib/ring: add zero copy APIs 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 zero-copy APIs. These APIs provide the capability to copy the data to/from the ring memory directly, without having a temporary copy (for ex: an array of mbufs on the stack). Use cases that involve copying large amount of data to/from the ring can benefit from these APIs. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Dharmik Thakkar --- lib/librte_ring/meson.build | 1 + lib/librte_ring/rte_ring_elem.h | 1 + lib/librte_ring/rte_ring_peek_zc.h | 548 +++++++++++++++++++++++++++++ 3 files changed, 550 insertions(+) create mode 100644 lib/librte_ring/rte_ring_peek_zc.h -- 2.17.1 Acked-by: Konstantin Ananyev diff --git a/lib/librte_ring/meson.build b/lib/librte_ring/meson.build index 31c0b4649..36fdcb6a5 100644 --- a/lib/librte_ring/meson.build +++ b/lib/librte_ring/meson.build @@ -11,5 +11,6 @@ headers = files('rte_ring.h', 'rte_ring_hts_c11_mem.h', 'rte_ring_peek.h', 'rte_ring_peek_c11_mem.h', + 'rte_ring_peek_zc.h', 'rte_ring_rts.h', 'rte_ring_rts_c11_mem.h') diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h index 938b398fc..7034d29c0 100644 --- a/lib/librte_ring/rte_ring_elem.h +++ b/lib/librte_ring/rte_ring_elem.h @@ -1079,6 +1079,7 @@ rte_ring_dequeue_burst_elem(struct rte_ring *r, void *obj_table, #ifdef ALLOW_EXPERIMENTAL_API #include +#include #endif #include diff --git a/lib/librte_ring/rte_ring_peek_zc.h b/lib/librte_ring/rte_ring_peek_zc.h new file mode 100644 index 000000000..603d30df3 --- /dev/null +++ b/lib/librte_ring/rte_ring_peek_zc.h @@ -0,0 +1,548 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 2020 Arm Limited + * 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_PEEK_ZC_H_ +#define _RTE_RING_PEEK_ZC_H_ + +/** + * @file + * @b EXPERIMENTAL: this API may change without prior notice + * It is not recommended to include this file directly. + * Please include instead. + * + * Ring Peek Zero Copy APIs + * These APIs make it possible to split public enqueue/dequeue API + * into 3 parts: + * - enqueue/dequeue start + * - copy data to/from the ring + * - enqueue/dequeue finish + * Along with the advantages of the peek APIs, these APIs provide the ability + * to avoid copying of the data to temporary area (for ex: array of mbufs + * on the stack). + * + * Note that currently these APIs are available only for two sync modes: + * 1) Single Producer/Single Consumer (RTE_RING_SYNC_ST) + * 2) Serialized Producer/Serialized Consumer (RTE_RING_SYNC_MT_HTS). + * It is user's responsibility to create/init ring with appropriate sync + * modes selected. + * + * Following are some examples showing the API usage. + * 1) + * struct elem_obj {uint64_t a; uint32_t b, c;}; + * struct elem_obj *obj; + * + * // Create ring with sync type RTE_RING_SYNC_ST or RTE_RING_SYNC_MT_HTS + * // Reserve space on the ring + * n = rte_ring_enqueue_zc_bulk_elem_start(r, sizeof(elem_obj), 1, &zcd, NULL); + * + * // Produce the data directly on the ring memory + * obj = (struct elem_obj *)zcd->ptr1; + * obj->a = rte_get_a(); + * obj->b = rte_get_b(); + * obj->c = rte_get_c(); + * rte_ring_enqueue_zc_elem_finish(ring, n); + * + * 2) + * // Create ring with sync type RTE_RING_SYNC_ST or RTE_RING_SYNC_MT_HTS + * // Reserve space on the ring + * n = rte_ring_enqueue_zc_burst_start(r, 32, &zcd, NULL); + * + * // Pkt I/O core polls packets from the NIC + * if (n != 0) { + * nb_rx = rte_eth_rx_burst(portid, queueid, zcd->ptr1, zcd->n1); + * if (nb_rx == zcd->n1 && n != zcd->n1) + * nb_rx = rte_eth_rx_burst(portid, queueid, + * zcd->ptr2, n - zcd->n1); + * + * // Provide packets to the packet processing cores + * rte_ring_enqueue_zc_finish(r, nb_rx); + * } + * + * Note that between _start_ and _finish_ none other thread can proceed + * with enqueue/dequeue operation till _finish_ completes. + */ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +/** + * Ring zero-copy information structure. + * + * This structure contains the pointers and length of the space + * reserved on the ring storage. + */ +struct rte_ring_zc_data { + /* Pointer to the first space in the ring */ + void *ptr1; + /* Pointer to the second space in the ring if there is wrap-around. + * It contains valid value only if wrap-around happens. + */ + void *ptr2; + /* Number of elements in the first pointer. If this is equal to + * the number of elements requested, then ptr2 is NULL. + * Otherwise, subtracting n1 from number of elements requested + * will give the number of elements available at ptr2. + */ + unsigned int n1; +} __rte_cache_aligned; + +static __rte_always_inline void +__rte_ring_get_elem_addr(struct rte_ring *r, uint32_t head, + uint32_t esize, uint32_t num, void **dst1, uint32_t *n1, void **dst2) +{ + uint32_t idx, scale, nr_idx; + uint32_t *ring = (uint32_t *)&r[1]; + + /* Normalize to uint32_t */ + scale = esize / sizeof(uint32_t); + idx = head & r->mask; + nr_idx = idx * scale; + + *dst1 = ring + nr_idx; + *n1 = num; + + if (idx + num > r->size) { + *n1 = r->size - idx; + *dst2 = ring; + } else { + *dst2 = NULL; + } +} + +/** + * @internal This function moves prod head value. + */ +static __rte_always_inline unsigned int +__rte_ring_do_enqueue_zc_elem_start(struct rte_ring *r, unsigned int esize, + uint32_t n, enum rte_ring_queue_behavior behavior, + struct rte_ring_zc_data *zcd, unsigned int *free_space) +{ + uint32_t free, head, next; + + switch (r->prod.sync_type) { + case RTE_RING_SYNC_ST: + n = __rte_ring_move_prod_head(r, RTE_RING_SYNC_ST, n, + behavior, &head, &next, &free); + break; + case RTE_RING_SYNC_MT_HTS: + n = __rte_ring_hts_move_prod_head(r, n, behavior, &head, &free); + break; + case RTE_RING_SYNC_MT: + case RTE_RING_SYNC_MT_RTS: + default: + /* unsupported mode, shouldn't be here */ + RTE_ASSERT(0); + n = 0; + free = 0; + return n; + } + + __rte_ring_get_elem_addr(r, head, esize, n, &zcd->ptr1, + &zcd->n1, &zcd->ptr2); + + if (free_space != NULL) + *free_space = free - n; + return n; +} + +/** + * Start to enqueue several objects on the ring. + * Note that no actual objects are put in the queue by this function, + * it just reserves space for the user on the ring. + * User has to copy objects into the queue using the returned pointers. + * User should call rte_ring_enqueue_zc_elem_finish to complete the + * enqueue operation. + * + * @param r + * A pointer to the ring structure. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * @param n + * The number of objects to add in the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param free_space + * If non-NULL, returns the amount of space in the ring after the + * reservation operation has finished. + * @return + * The number of objects that can be enqueued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_enqueue_zc_bulk_elem_start(struct rte_ring *r, unsigned int esize, + unsigned int n, struct rte_ring_zc_data *zcd, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_zc_elem_start(r, esize, n, + RTE_RING_QUEUE_FIXED, zcd, free_space); +} + +/** + * Start to enqueue several pointers to objects on the ring. + * Note that no actual pointers are put in the queue by this function, + * it just reserves space for the user on the ring. + * User has to copy pointers to objects into the queue using the + * returned pointers. + * User should call rte_ring_enqueue_zc_finish to complete the + * enqueue operation. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to add in the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param free_space + * If non-NULL, returns the amount of space in the ring after the + * reservation operation has finished. + * @return + * The number of objects that can be enqueued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_enqueue_zc_bulk_start(struct rte_ring *r, unsigned int n, + struct rte_ring_zc_data *zcd, unsigned int *free_space) +{ + return rte_ring_enqueue_zc_bulk_elem_start(r, sizeof(uintptr_t), n, + zcd, free_space); +} +/** + * Start to enqueue several objects on the ring. + * Note that no actual objects are put in the queue by this function, + * it just reserves space for the user on the ring. + * User has to copy objects into the queue using the returned pointers. + * User should call rte_ring_enqueue_zc_elem_finish to complete the + * enqueue operation. + * + * @param r + * A pointer to the ring structure. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * @param n + * The number of objects to add in the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param free_space + * If non-NULL, returns the amount of space in the ring after the + * reservation operation has finished. + * @return + * The number of objects that can be enqueued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_enqueue_zc_burst_elem_start(struct rte_ring *r, unsigned int esize, + unsigned int n, struct rte_ring_zc_data *zcd, unsigned int *free_space) +{ + return __rte_ring_do_enqueue_zc_elem_start(r, esize, n, + RTE_RING_QUEUE_VARIABLE, zcd, free_space); +} + +/** + * Start to enqueue several pointers to objects on the ring. + * Note that no actual pointers are put in the queue by this function, + * it just reserves space for the user on the ring. + * User has to copy pointers to objects into the queue using the + * returned pointers. + * User should call rte_ring_enqueue_zc_finish to complete the + * enqueue operation. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to add in the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param free_space + * If non-NULL, returns the amount of space in the ring after the + * reservation operation has finished. + * @return + * The number of objects that can be enqueued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_enqueue_zc_burst_start(struct rte_ring *r, unsigned int n, + struct rte_ring_zc_data *zcd, unsigned int *free_space) +{ + return rte_ring_enqueue_zc_burst_elem_start(r, sizeof(uintptr_t), n, + zcd, free_space); +} + +/** + * Complete enqueuing several objects on the ring. + * Note that number of objects to enqueue should not exceed previous + * enqueue_start return value. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to add to the ring. + */ +__rte_experimental +static __rte_always_inline void +rte_ring_enqueue_zc_elem_finish(struct rte_ring *r, unsigned int n) +{ + uint32_t tail; + + switch (r->prod.sync_type) { + case RTE_RING_SYNC_ST: + n = __rte_ring_st_get_tail(&r->prod, &tail, n); + __rte_ring_st_set_head_tail(&r->prod, tail, n, 1); + break; + case RTE_RING_SYNC_MT_HTS: + n = __rte_ring_hts_get_tail(&r->hts_prod, &tail, n); + __rte_ring_hts_set_head_tail(&r->hts_prod, tail, n, 1); + break; + case RTE_RING_SYNC_MT: + case RTE_RING_SYNC_MT_RTS: + default: + /* unsupported mode, shouldn't be here */ + RTE_ASSERT(0); + } +} + +/** + * Complete enqueuing several pointers to objects on the ring. + * Note that number of objects to enqueue should not exceed previous + * enqueue_start return value. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of pointers to objects to add to the ring. + */ +__rte_experimental +static __rte_always_inline void +rte_ring_enqueue_zc_finish(struct rte_ring *r, unsigned int n) +{ + rte_ring_enqueue_zc_elem_finish(r, n); +} + +/** + * @internal This function moves cons head value and copies up to *n* + * objects from the ring to the user provided obj_table. + */ +static __rte_always_inline unsigned int +__rte_ring_do_dequeue_zc_elem_start(struct rte_ring *r, + uint32_t esize, uint32_t n, enum rte_ring_queue_behavior behavior, + struct rte_ring_zc_data *zcd, unsigned int *available) +{ + uint32_t avail, head, next; + + switch (r->cons.sync_type) { + case RTE_RING_SYNC_ST: + n = __rte_ring_move_cons_head(r, RTE_RING_SYNC_ST, n, + behavior, &head, &next, &avail); + break; + case RTE_RING_SYNC_MT_HTS: + n = __rte_ring_hts_move_cons_head(r, n, behavior, + &head, &avail); + break; + case RTE_RING_SYNC_MT: + case RTE_RING_SYNC_MT_RTS: + default: + /* unsupported mode, shouldn't be here */ + RTE_ASSERT(0); + n = 0; + avail = 0; + return n; + } + + __rte_ring_get_elem_addr(r, head, esize, n, &zcd->ptr1, + &zcd->n1, &zcd->ptr2); + + if (available != NULL) + *available = avail - n; + return n; +} + +/** + * Start to dequeue several objects from the ring. + * Note that no actual objects are copied from the queue by this function. + * User has to copy objects from the queue using the returned pointers. + * User should call rte_ring_dequeue_zc_elem_finish to complete the + * dequeue operation. + * + * @param r + * A pointer to the ring structure. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * @param n + * The number of objects to remove from the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects that can be dequeued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_dequeue_zc_bulk_elem_start(struct rte_ring *r, unsigned int esize, + unsigned int n, struct rte_ring_zc_data *zcd, unsigned int *available) +{ + return __rte_ring_do_dequeue_zc_elem_start(r, esize, n, + RTE_RING_QUEUE_FIXED, zcd, available); +} + +/** + * Start to dequeue several pointers to objects from the ring. + * Note that no actual pointers are removed from the queue by this function. + * User has to copy pointers to objects from the queue using the + * returned pointers. + * User should call rte_ring_dequeue_zc_finish to complete the + * dequeue operation. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to remove from the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects that can be dequeued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_dequeue_zc_bulk_start(struct rte_ring *r, unsigned int n, + struct rte_ring_zc_data *zcd, unsigned int *available) +{ + return rte_ring_dequeue_zc_bulk_elem_start(r, sizeof(uintptr_t), + n, zcd, available); +} + +/** + * Start to dequeue several objects from the ring. + * Note that no actual objects are copied from the queue by this function. + * User has to copy objects from the queue using the returned pointers. + * User should call rte_ring_dequeue_zc_elem_finish to complete the + * dequeue operation. + * + * @param r + * A pointer to the ring structure. + * @param esize + * The size of ring element, in bytes. It must be a multiple of 4. + * This must be the same value used while creating the ring. Otherwise + * the results are undefined. + * @param n + * The number of objects to dequeue from the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects that can be dequeued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_dequeue_zc_burst_elem_start(struct rte_ring *r, unsigned int esize, + unsigned int n, struct rte_ring_zc_data *zcd, unsigned int *available) +{ + return __rte_ring_do_dequeue_zc_elem_start(r, esize, n, + RTE_RING_QUEUE_VARIABLE, zcd, available); +} + +/** + * Start to dequeue several pointers to objects from the ring. + * Note that no actual pointers are removed from the queue by this function. + * User has to copy pointers to objects from the queue using the + * returned pointers. + * User should call rte_ring_dequeue_zc_finish to complete the + * dequeue operation. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to remove from the ring. + * @param zcd + * Structure containing the pointers and length of the space + * reserved on the ring storage. + * @param available + * If non-NULL, returns the number of remaining ring entries after the + * dequeue has finished. + * @return + * The number of objects that can be dequeued, either 0 or n + */ +__rte_experimental +static __rte_always_inline unsigned int +rte_ring_dequeue_zc_burst_start(struct rte_ring *r, unsigned int n, + struct rte_ring_zc_data *zcd, unsigned int *available) +{ + return rte_ring_dequeue_zc_burst_elem_start(r, sizeof(uintptr_t), n, + zcd, available); +} + +/** + * Complete dequeuing several objects from the ring. + * Note that number of objects to dequeued should not exceed previous + * dequeue_start return value. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to remove from the ring. + */ +__rte_experimental +static __rte_always_inline void +rte_ring_dequeue_zc_elem_finish(struct rte_ring *r, unsigned int n) +{ + uint32_t tail; + + switch (r->cons.sync_type) { + case RTE_RING_SYNC_ST: + n = __rte_ring_st_get_tail(&r->cons, &tail, n); + __rte_ring_st_set_head_tail(&r->cons, tail, n, 0); + break; + case RTE_RING_SYNC_MT_HTS: + n = __rte_ring_hts_get_tail(&r->hts_cons, &tail, n); + __rte_ring_hts_set_head_tail(&r->hts_cons, tail, n, 0); + break; + case RTE_RING_SYNC_MT: + case RTE_RING_SYNC_MT_RTS: + default: + /* unsupported mode, shouldn't be here */ + RTE_ASSERT(0); + } +} + +/** + * Complete dequeuing several objects from the ring. + * Note that number of objects to dequeued should not exceed previous + * dequeue_start return value. + * + * @param r + * A pointer to the ring structure. + * @param n + * The number of objects to remove from the ring. + */ +__rte_experimental +static __rte_always_inline void +rte_ring_dequeue_zc_finish(struct rte_ring *r, unsigned int n) +{ + rte_ring_dequeue_elem_finish(r, n); +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_RING_PEEK_ZC_H_ */ From patchwork Sun Oct 25 05:45:50 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318955 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695275ilg; Sat, 24 Oct 2020 22:46:51 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzUOYYIfaBhQgdVwXpmnJjo38uJcEUPRLNT2/T9Nn5cx+dvqirqlWGqyQWbKTzAkPpDpF7h X-Received: by 2002:a05:6402:a45:: with SMTP id bt5mr10247233edb.101.1603604811088; Sat, 24 Oct 2020 22:46:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604811; cv=none; d=google.com; s=arc-20160816; b=S8N9MihMJ5FaJtgjRss6pgQZPgq41C4qPCG+GdByyvsQSzgRGG+WggWYpkdu4S3Dwq CJIXJIZMn5Na1tw7HiamhczPSVmOgoiikn+63ZPSnPMbZjwsqP+G3tH9bteEAQWHBDCT jKG8NFC3h8FRb47fpaXJRxKmpUJ01EDMp1yJrVgN6WZiktbUOSpB/WXh/1H5TDrwnhC5 BPIsG4Pq0dbowF8sJ8b9CWowLgHaRTitiuM7nd/Nll8PehyD1qy3WKiM4tPa8yxKwsL9 jtI0SyMw4ZHsSnPihMENon1PQcweojxin6lTGuGAqBi/1IThs87OEo+3Ig6Nt6gapGe3 hChA== 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=469df2CbOJfoXDTuqr3CcF0i3jtt4a1CqgiPG2XfR7U=; b=TyQSK9egzx8sDCwu7p2OFQ6+sPSbYYdBnZsKS3AC9y7ts3zLfE1lwLbSsh5Dq8Yqkb 7dTHHRMVGbNiTTfUxxCZHus7zoogIlIwxc6ttUSS7Mh3djpXDgF8hjBFoZhVeh2iYlRB q1h+to9zsAUPrNbe9ugK3FOhDTVrl+PSpfUXU56ZUrwQDeVUAx6LavkaXGeyIVGC4+Jl 3tQJCfLTsc+lQ7DpAtBc4pGAgOcLeRJSAjFDZTFfagPunS2N5Rjv0PDKC3fgxUPkYG7l rxPvHCu+jgxUeRNK42uVIGlGb+uFjH4Z6x5piQtJY1vxEcA/BOGoIu7zGDKOEgsS272F uNfg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id be17si4376106edb.35.2020.10.24.22.46.50; Sat, 24 Oct 2020 22:46:51 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 165B62B86; Sun, 25 Oct 2020 06:46:13 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id A180B2A62 for ; Sun, 25 Oct 2020 06:46:09 +0100 (CET) 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 0AE7D113E; Sat, 24 Oct 2020 22:46:08 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id EE0EB3F66B; Sat, 24 Oct 2020 22:46:07 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:50 -0500 Message-Id: <20201025054556.14277-3-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 2/8] test/ring: move common function to header file 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" Move test_ring_inc_ptr to header file so that it can be used by functions in other files. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Dharmik Thakkar --- app/test/test_ring.c | 11 ----------- app/test/test_ring.h | 13 +++++++++++++ 2 files changed, 13 insertions(+), 11 deletions(-) -- 2.17.1 Acked-by: Konstantin Ananyev diff --git a/app/test/test_ring.c b/app/test/test_ring.c index a62cb263b..329d538a9 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c @@ -243,17 +243,6 @@ test_ring_deq_impl(struct rte_ring *r, void **obj, int esize, unsigned int n, NULL); } -static void** -test_ring_inc_ptr(void **obj, int esize, unsigned int n) -{ - /* Legacy queue APIs? */ - if ((esize) == -1) - return ((void **)obj) + n; - else - return (void **)(((uint32_t *)obj) + - (n * esize / sizeof(uint32_t))); -} - static void test_ring_mem_init(void *obj, unsigned int count, int esize) { diff --git a/app/test/test_ring.h b/app/test/test_ring.h index d4b15af7c..b44711398 100644 --- a/app/test/test_ring.h +++ b/app/test/test_ring.h @@ -42,6 +42,19 @@ test_ring_create(const char *name, int esize, unsigned int count, (socket_id), (flags)); } +static inline void* +test_ring_inc_ptr(void *obj, int esize, unsigned int n) +{ + size_t sz; + + sz = sizeof(void *); + /* Legacy queue APIs? */ + if (esize != -1) + sz = esize; + + return (void *)((uint32_t *)obj + (n * sz / sizeof(uint32_t))); +} + static __rte_always_inline unsigned int test_ring_enqueue(struct rte_ring *r, void **obj, int esize, unsigned int n, unsigned int api_type) From patchwork Sun Oct 25 05:45:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318956 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695423ilg; Sat, 24 Oct 2020 22:47:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzeB6n5S0CXxM+0S9QP8UGoJhL4WS0K5zn0lMfahGRDCUAooxGr9ZrGDQKZH5inIBUe0VY5 X-Received: by 2002:aa7:dcc2:: with SMTP id w2mr10067546edu.121.1603604835420; Sat, 24 Oct 2020 22:47:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604835; cv=none; d=google.com; s=arc-20160816; b=sVXV+8BrgQBbKm7QHo+sRlPTwiTvWvKsbZs9D8NHiUULJjczxtjuAKUKoOdDmevbAL QWIhF+WglLksM7pvaASWQxnavXFNOeGFp1864LWhk8DVzVOA8WbfhLMb5DPii8Iq3UTb HQsbXn3n2cbIsT8aBmJAEPN+CmZQvDuzs9XBFovY99epT4gXa/ehlLl8i8HOSrxxfMtT +KePiwTFLss/1/YKyXhlaCHCh538/FsF/vvOGRZuEf6y6ySZzEnJfCQ1KdeNCEy5BUf5 TGEc4zsd0WMqXn2OkuFAxoIRCH+nbM3wS4MlFbFSyvCrH/J+cMVoM/igwS62lLScaYk5 9dEg== 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=X6vlnAvwGbFPUvoAfJAaz+E6j37R5mZOvr4fqfXD6t4=; b=Si8BhvTJ5Hxb72crViCDUD02QI5NRb+iln9hhfSOTzIjvd4a2nbfMeJ3UwfRgt63UE PrvTf0gqpvgErE2cbHl0raugUmNy68HcIdgPS/9tWrqsoury5Ud3Lcx+KDimvtyuFPzk PT64vpL4TTSNYXS1Wqp1aCSJj3dwIqDeaHaCVCg7bDxooHuDCtCcp0JRMbpYbN/9QaLf yxpdMi8EgY4nOM3i9oemg9bbvxo2jwqbLOhJNPybPIrcLzvAOum+bXjfdbMse7GbSGYb uFKap2oim4aD4G2mQVq5nxIUq0dqSphv0R18SkizKAJR5eYXTpZtOF3bFc/2GvLf3nvJ wxRQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id n13si4288983eji.447.2020.10.24.22.47.15; Sat, 24 Oct 2020 22:47:15 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id DFCE42B92; Sun, 25 Oct 2020 06:46:14 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 7E1602A63 for ; Sun, 25 Oct 2020 06:46:09 +0100 (CET) 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 DAD8E143B; Sat, 24 Oct 2020 22:46:08 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id C5BA23F66B; Sat, 24 Oct 2020 22:46:08 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:51 -0500 Message-Id: <20201025054556.14277-4-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 3/8] test/ring: add functional tests for zero copy APIs 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 functional tests for zero copy APIs. Test enqueue/dequeue functions are created using the zero copy APIs to fit into the existing testing method. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Dharmik Thakkar Acked-by: Konstantin Ananyev --- app/test/test_ring.c | 196 +++++++++++++++++++++++++++++++++++++++++++ app/test/test_ring.h | 42 ++++++++++ 2 files changed, 238 insertions(+) -- 2.17.1 diff --git a/app/test/test_ring.c b/app/test/test_ring.c index 329d538a9..3914cb98a 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c @@ -1,5 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation + * Copyright(c) 2020 Arm Limited */ #include @@ -68,6 +69,149 @@ static const int esize[] = {-1, 4, 8, 16, 20}; +/* Wrappers around the zero-copy APIs. The wrappers match + * the normal enqueue/dequeue API declarations. + */ +static unsigned int +test_ring_enqueue_zc_bulk(struct rte_ring *r, void * const *obj_table, + unsigned int n, unsigned int *free_space) +{ + uint32_t ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_enqueue_zc_bulk_start(r, n, &zcd, free_space); + if (ret != 0) { + /* Copy the data to the ring */ + test_ring_copy_to(&zcd, obj_table, sizeof(void *), ret); + rte_ring_enqueue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_enqueue_zc_bulk_elem(struct rte_ring *r, const void *obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_enqueue_zc_bulk_elem_start(r, esize, n, + &zcd, free_space); + if (ret != 0) { + /* Copy the data to the ring */ + test_ring_copy_to(&zcd, obj_table, esize, ret); + rte_ring_enqueue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_enqueue_zc_burst(struct rte_ring *r, void * const *obj_table, + unsigned int n, unsigned int *free_space) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_enqueue_zc_burst_start(r, n, &zcd, free_space); + if (ret != 0) { + /* Copy the data to the ring */ + test_ring_copy_to(&zcd, obj_table, sizeof(void *), ret); + rte_ring_enqueue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_enqueue_zc_burst_elem(struct rte_ring *r, const void *obj_table, + unsigned int esize, unsigned int n, unsigned int *free_space) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_enqueue_zc_burst_elem_start(r, esize, n, + &zcd, free_space); + if (ret != 0) { + /* Copy the data to the ring */ + test_ring_copy_to(&zcd, obj_table, esize, ret); + rte_ring_enqueue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_dequeue_zc_bulk(struct rte_ring *r, void **obj_table, + unsigned int n, unsigned int *available) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_dequeue_zc_bulk_start(r, n, &zcd, available); + if (ret != 0) { + /* Copy the data from the ring */ + test_ring_copy_from(&zcd, obj_table, sizeof(void *), ret); + rte_ring_dequeue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_dequeue_zc_bulk_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_dequeue_zc_bulk_elem_start(r, esize, n, + &zcd, available); + if (ret != 0) { + /* Copy the data from the ring */ + test_ring_copy_from(&zcd, obj_table, esize, ret); + rte_ring_dequeue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_dequeue_zc_burst(struct rte_ring *r, void **obj_table, + unsigned int n, unsigned int *available) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_dequeue_zc_burst_start(r, n, &zcd, available); + if (ret != 0) { + /* Copy the data from the ring */ + test_ring_copy_from(&zcd, obj_table, sizeof(void *), ret); + rte_ring_dequeue_zc_finish(r, ret); + } + + return ret; +} + +static unsigned int +test_ring_dequeue_zc_burst_elem(struct rte_ring *r, void *obj_table, + unsigned int esize, unsigned int n, unsigned int *available) +{ + unsigned int ret; + struct rte_ring_zc_data zcd; + + ret = rte_ring_dequeue_zc_burst_elem_start(r, esize, n, + &zcd, available); + if (ret != 0) { + /* Copy the data from the ring */ + test_ring_copy_from(&zcd, obj_table, esize, ret); + rte_ring_dequeue_zc_finish(r, ret); + } + + return ret; +} + static const struct { const char *desc; uint32_t api_type; @@ -219,6 +363,58 @@ static const struct { .felem = rte_ring_dequeue_burst_elem, }, }, + { + .desc = "SP/SC sync mode (ZC)", + .api_type = TEST_RING_ELEM_BULK | TEST_RING_THREAD_SPSC, + .create_flags = RING_F_SP_ENQ | RING_F_SC_DEQ, + .enq = { + .flegacy = test_ring_enqueue_zc_bulk, + .felem = test_ring_enqueue_zc_bulk_elem, + }, + .deq = { + .flegacy = test_ring_dequeue_zc_bulk, + .felem = test_ring_dequeue_zc_bulk_elem, + }, + }, + { + .desc = "MP_HTS/MC_HTS sync mode (ZC)", + .api_type = TEST_RING_ELEM_BULK | TEST_RING_THREAD_DEF, + .create_flags = RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ, + .enq = { + .flegacy = test_ring_enqueue_zc_bulk, + .felem = test_ring_enqueue_zc_bulk_elem, + }, + .deq = { + .flegacy = test_ring_dequeue_zc_bulk, + .felem = test_ring_dequeue_zc_bulk_elem, + }, + }, + { + .desc = "SP/SC sync mode (ZC)", + .api_type = TEST_RING_ELEM_BURST | TEST_RING_THREAD_SPSC, + .create_flags = RING_F_SP_ENQ | RING_F_SC_DEQ, + .enq = { + .flegacy = test_ring_enqueue_zc_burst, + .felem = test_ring_enqueue_zc_burst_elem, + }, + .deq = { + .flegacy = test_ring_dequeue_zc_burst, + .felem = test_ring_dequeue_zc_burst_elem, + }, + }, + { + .desc = "MP_HTS/MC_HTS sync mode (ZC)", + .api_type = TEST_RING_ELEM_BURST | TEST_RING_THREAD_DEF, + .create_flags = RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ, + .enq = { + .flegacy = test_ring_enqueue_zc_burst, + .felem = test_ring_enqueue_zc_burst_elem, + }, + .deq = { + .flegacy = test_ring_dequeue_zc_burst, + .felem = test_ring_dequeue_zc_burst_elem, + }, + } }; static unsigned int diff --git a/app/test/test_ring.h b/app/test/test_ring.h index b44711398..b525abb79 100644 --- a/app/test/test_ring.h +++ b/app/test/test_ring.h @@ -55,6 +55,48 @@ test_ring_inc_ptr(void *obj, int esize, unsigned int n) return (void *)((uint32_t *)obj + (n * sz / sizeof(uint32_t))); } +static inline void +test_ring_mem_copy(void *dst, void * const *src, int esize, unsigned int num) +{ + size_t sz; + + sz = num * sizeof(void *); + if (esize != -1) + sz = esize * num; + + memcpy(dst, src, sz); +} + +/* Copy to the ring memory */ +static inline void +test_ring_copy_to(struct rte_ring_zc_data *zcd, void * const *src, int esize, + unsigned int num) +{ + test_ring_mem_copy(zcd->ptr1, src, esize, zcd->n1); + if (zcd->n1 != num) { + if (esize == -1) + src = src + zcd->n1; + else + src = (void * const *)((const uint32_t *)src + + (zcd->n1 * esize / sizeof(uint32_t))); + test_ring_mem_copy(zcd->ptr2, src, + esize, num - zcd->n1); + } +} + +/* Copy from the ring memory */ +static inline void +test_ring_copy_from(struct rte_ring_zc_data *zcd, void *dst, int esize, + unsigned int num) +{ + test_ring_mem_copy(dst, zcd->ptr1, esize, zcd->n1); + + if (zcd->n1 != num) { + dst = test_ring_inc_ptr(dst, esize, zcd->n1); + test_ring_mem_copy(dst, zcd->ptr2, esize, num - zcd->n1); + } +} + static __rte_always_inline unsigned int test_ring_enqueue(struct rte_ring *r, void **obj, int esize, unsigned int n, unsigned int api_type) From patchwork Sun Oct 25 05:45:52 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318957 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695562ilg; Sat, 24 Oct 2020 22:47:36 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxKaVxiY3j2AMsjmjAuax8mMytJuwUG/O77qewury2UO3Zl8FXnXZe6sUemHAa6mBCtJhwF X-Received: by 2002:aa7:cf95:: with SMTP id z21mr9993715edx.346.1603604856126; Sat, 24 Oct 2020 22:47:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604856; cv=none; d=google.com; s=arc-20160816; b=yqvER8sUoRMHNLkqscy1brb7e+Oa0U9d0K9yuc/fXZemLOtJgaSqesgGO/dGpeSw5t /t0LmM/oKEqQYOqxHlOOx8UXexm9iOq17aAJJUdwOpfSkpM0eHIArpAQvJQtJawjJ3XF sByhInOXWkc1iAeFApkbhV3RJyHRTF97mYzk9FxX4YfQCqimzUyil7AoBBTYt8qNYLlE GgiwQZdhZVzVYdP+bqqTdguuiO/Dg32TCXj3fGtHOAWzjwlKc685VsmYAk7gpzQhgDfw wTjR6QUpDmfEU3LJT34PF8E9vrMOarwZ1WmdWAkHOxrxSOMOvFJfoAqD3iWMBij7RKot Zxuw== 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=giAs+iaos8h2xeilTXRLQGZ0i98r5pwb3FkL4CccAcQ=; b=0jLTI4w76wG/J1sbW/HKocF5QlofO+olwYi5fIEu2a9ZXCBsQFYaZN03rRtPl0l7h3 EZS7sULkDHmy654BNBRsj/1AlCRzjQegDaaDx2eqdptR+otyyuvDhPKUuOSrXMRQgZlC Dt8JLpBEqGXrdIvQHhBnti1gY2fN4d87xDq7zaG77gyfgQ2ZsX/+TZqxxkrTJZuwJ6M0 IRRQp8xHASl+0n7jxQCZe8tcg12s80vSv9EdYkGhJLBv24Crdv0VNMgE1JP6niI1dD6E 2MRJZ8reUXnYnrNMxfVnpo/LtNstdL+qZzClvsNE5V79yF7y+PDykvZNHc9fCZWg5AbZ zTuQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id d10si4638337edm.314.2020.10.24.22.47.35; Sat, 24 Oct 2020 22:47:36 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 53F8C2BA3; Sun, 25 Oct 2020 06:46:19 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 38B1B2A63 for ; Sun, 25 Oct 2020 06:46:11 +0100 (CET) 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 9CCB11435; Sat, 24 Oct 2020 22:46:09 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 925923F66B; Sat, 24 Oct 2020 22:46:09 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:52 -0500 Message-Id: <20201025054556.14277-5-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 4/8] test/ring: add stress tests for zero copy APIs 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 stress tests for zero copy API. Signed-off-by: Honnappa Nagarahalli Reviewed-by: Dharmik Thakkar Acked-by: Konstantin Ananyev --- app/test/meson.build | 2 + app/test/test_ring_mt_peek_stress_zc.c | 56 +++++++++++++++++++++++ app/test/test_ring_st_peek_stress_zc.c | 63 ++++++++++++++++++++++++++ app/test/test_ring_stress.c | 6 +++ app/test/test_ring_stress.h | 2 + 5 files changed, 129 insertions(+) create mode 100644 app/test/test_ring_mt_peek_stress_zc.c create mode 100644 app/test/test_ring_st_peek_stress_zc.c -- 2.17.1 diff --git a/app/test/meson.build b/app/test/meson.build index 8bfb02890..88c831a92 100644 --- a/app/test/meson.build +++ b/app/test/meson.build @@ -108,9 +108,11 @@ test_sources = files('commands.c', 'test_ring_mpmc_stress.c', 'test_ring_hts_stress.c', 'test_ring_mt_peek_stress.c', + 'test_ring_mt_peek_stress_zc.c', 'test_ring_perf.c', 'test_ring_rts_stress.c', 'test_ring_st_peek_stress.c', + 'test_ring_st_peek_stress_zc.c', 'test_ring_stress.c', 'test_rwlock.c', 'test_sched.c', diff --git a/app/test/test_ring_mt_peek_stress_zc.c b/app/test/test_ring_mt_peek_stress_zc.c new file mode 100644 index 000000000..7e0bd511a --- /dev/null +++ b/app/test/test_ring_mt_peek_stress_zc.c @@ -0,0 +1,56 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2020 Arm Limited + */ + +#include "test_ring.h" +#include "test_ring_stress_impl.h" +#include + +static inline uint32_t +_st_ring_dequeue_bulk(struct rte_ring *r, void **obj, uint32_t n, + uint32_t *avail) +{ + uint32_t m; + struct rte_ring_zc_data zcd; + + m = rte_ring_dequeue_zc_bulk_start(r, n, &zcd, avail); + n = (m == n) ? n : 0; + if (n != 0) { + /* Copy the data from the ring */ + test_ring_copy_from(&zcd, obj, -1, n); + rte_ring_dequeue_zc_finish(r, n); + } + + return n; +} + +static inline uint32_t +_st_ring_enqueue_bulk(struct rte_ring *r, void * const *obj, uint32_t n, + uint32_t *free) +{ + uint32_t m; + struct rte_ring_zc_data zcd; + + m = rte_ring_enqueue_zc_bulk_start(r, n, &zcd, free); + n = (m == n) ? n : 0; + if (n != 0) { + /* Copy the data from the ring */ + test_ring_copy_to(&zcd, obj, -1, n); + rte_ring_enqueue_zc_finish(r, n); + } + + return n; +} + +static int +_st_ring_init(struct rte_ring *r, const char *name, uint32_t num) +{ + return rte_ring_init(r, name, num, + RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ); +} + +const struct test test_ring_mt_peek_stress_zc = { + .name = "MT_PEEK_ZC", + .nb_case = RTE_DIM(tests), + .cases = tests, +}; diff --git a/app/test/test_ring_st_peek_stress_zc.c b/app/test/test_ring_st_peek_stress_zc.c new file mode 100644 index 000000000..b9dbd4a6f --- /dev/null +++ b/app/test/test_ring_st_peek_stress_zc.c @@ -0,0 +1,63 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2020 Arm Limited + */ + +#include "test_ring.h" +#include "test_ring_stress_impl.h" +#include + +static inline uint32_t +_st_ring_dequeue_bulk(struct rte_ring *r, void **obj, uint32_t n, + uint32_t *avail) +{ + uint32_t m; + struct rte_ring_zc_data zcd; + + static rte_spinlock_t lck = RTE_SPINLOCK_INITIALIZER; + + rte_spinlock_lock(&lck); + + m = rte_ring_dequeue_zc_bulk_start(r, n, &zcd, avail); + if (m != 0) { + /* Copy the data from the ring */ + test_ring_copy_from(&zcd, obj, -1, m); + rte_ring_dequeue_zc_finish(r, m); + } + + rte_spinlock_unlock(&lck); + return m; +} + +static inline uint32_t +_st_ring_enqueue_bulk(struct rte_ring *r, void * const *obj, uint32_t n, + uint32_t *free) +{ + uint32_t m; + struct rte_ring_zc_data zcd; + + static rte_spinlock_t lck = RTE_SPINLOCK_INITIALIZER; + + rte_spinlock_lock(&lck); + + m = rte_ring_enqueue_zc_bulk_start(r, n, &zcd, free); + if (m != 0) { + /* Copy the data from the ring */ + test_ring_copy_to(&zcd, obj, -1, m); + rte_ring_enqueue_zc_finish(r, m); + } + + rte_spinlock_unlock(&lck); + return m; +} + +static int +_st_ring_init(struct rte_ring *r, const char *name, uint32_t num) +{ + return rte_ring_init(r, name, num, RING_F_SP_ENQ | RING_F_SC_DEQ); +} + +const struct test test_ring_st_peek_stress_zc = { + .name = "ST_PEEK_ZC", + .nb_case = RTE_DIM(tests), + .cases = tests, +}; diff --git a/app/test/test_ring_stress.c b/app/test/test_ring_stress.c index c4f82ea56..1af45e0fc 100644 --- a/app/test/test_ring_stress.c +++ b/app/test/test_ring_stress.c @@ -49,9 +49,15 @@ test_ring_stress(void) n += test_ring_mt_peek_stress.nb_case; k += run_test(&test_ring_mt_peek_stress); + n += test_ring_mt_peek_stress_zc.nb_case; + k += run_test(&test_ring_mt_peek_stress_zc); + n += test_ring_st_peek_stress.nb_case; k += run_test(&test_ring_st_peek_stress); + n += test_ring_st_peek_stress_zc.nb_case; + k += run_test(&test_ring_st_peek_stress_zc); + printf("Number of tests:\t%u\nSuccess:\t%u\nFailed:\t%u\n", n, k, n - k); return (k != n); diff --git a/app/test/test_ring_stress.h b/app/test/test_ring_stress.h index c85d6fa92..416d68c9a 100644 --- a/app/test/test_ring_stress.h +++ b/app/test/test_ring_stress.h @@ -36,4 +36,6 @@ extern const struct test test_ring_mpmc_stress; extern const struct test test_ring_rts_stress; extern const struct test test_ring_hts_stress; extern const struct test test_ring_mt_peek_stress; +extern const struct test test_ring_mt_peek_stress_zc; extern const struct test test_ring_st_peek_stress; +extern const struct test test_ring_st_peek_stress_zc; From patchwork Sun Oct 25 05:45:53 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318958 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695711ilg; Sat, 24 Oct 2020 22:47:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx5ZxAP6lUwdGAZ5UBWObwfPduMxdNadRWj89lhQg7UsLOzMpfywCWlEfh91PyTwjMjampu X-Received: by 2002:a17:906:8244:: with SMTP id f4mr10096256ejx.236.1603604877516; Sat, 24 Oct 2020 22:47:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604877; cv=none; d=google.com; s=arc-20160816; b=EoiETgxYDrxrNJb0C9lafHlnzRDgVtTIw/zeK4ldtKOmbG4C9dXUJ73vv6nsMOPKWv yVqNsBOB1AgfifLb8ceR4OINyn4JfW4r8ZQsp/R+rl//ileSQLTuwHulZP1Rn0KPnPrH p+romQCzIvGt5jEadeCYzwUF/m2thw/lgNktm3OT5mxmXhUzZDsgJB3vp3wOiR1AM9q8 sQILpcz7fGZ/JJPGwRQ4KUxwHuCdRxaCc+nePRFSFH9qW+dlI5ZlLH4xUGx8vJNsSF69 37+54Ssgvlw9AsJo36LT9fbxgd8tqycSquCMAWnh2hR1OV2dqvKRsynFYiv8pU1mLpYT 66vA== 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=4fK7FgJNF+UIso6tVDxvzeZQ7QcuxXimK5+svhNpr3U=; b=B93fqWysJQZp817s1ec13jYw0kek7/uqmd2dWbYLhfekXx7c8W9oWl/wvL1/yuVVed xGVlchtacy/PY4KDTfloZf8YFgft6ap9MyCbLnLEN7y5tFbHYeIBjVfRWJGrVrxM4nLw Pih6NbKDmlg0DTJmY470OmaEFvRlWZFqfVCbIuYlzHzJ4kV96+iH5SqZ7VWfm12BdMGs bbewN7o9utR85WhvFIwt0MxC2cDCyB0CgYPW6HeaHh9zPZ+qFGlY3Hi0QYUUAuR/XYun Sa65U4c/dcQ7a6Y5YnFu/ocE08FaDnhG346K1mvacnCmo58/InWwhMHs3KR4B8SnRzAZ oZcQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id p10si4867007ejy.70.2020.10.24.22.47.57; Sat, 24 Oct 2020 22:47:57 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id CEA4A2BC7; Sun, 25 Oct 2020 06:46:20 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 01E352B81 for ; Sun, 25 Oct 2020 06:46:12 +0100 (CET) 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 6A871143D; Sat, 24 Oct 2020 22:46:10 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5901C3F66B; Sat, 24 Oct 2020 22:46:10 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:53 -0500 Message-Id: <20201025054556.14277-6-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 5/8] doc/ring: add zero copy peek APIs 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 zero copy peek API documentation. Signed-off-by: Honnappa Nagarahalli --- doc/guides/prog_guide/ring_lib.rst | 41 ++++++++++++++++++++++++++ doc/guides/rel_notes/release_20_11.rst | 9 ++++++ 2 files changed, 50 insertions(+) -- 2.17.1 Acked-by: Konstantin Ananyev diff --git a/doc/guides/prog_guide/ring_lib.rst b/doc/guides/prog_guide/ring_lib.rst index 895484d95..247646d38 100644 --- a/doc/guides/prog_guide/ring_lib.rst +++ b/doc/guides/prog_guide/ring_lib.rst @@ -452,6 +452,47 @@ selected. As an example of usage: Note that between ``_start_`` and ``_finish_`` none other thread can proceed with enqueue(/dequeue) operation till ``_finish_`` completes. +Ring Peek Zero Copy API +----------------------- + +Along with the advantages of the peek APIs, zero copy APIs provide the ability +to copy the data to the ring memory directly without the need for temporary +storage (for ex: array of mbufs on the stack). + +These APIs make it possible to split public enqueue/dequeue API into 3 phases: + +* enqueue/dequeue start + +* copy data to/from the ring + +* enqueue/dequeue finish + +Note that this API is available only for two sync modes: + +* Single Producer/Single Consumer (SP/SC) + +* Multi-producer/Multi-consumer with Head/Tail Sync (HTS) + +It is a user responsibility to create/init ring with appropriate sync modes. +Following is an example of usage: + +.. code-block:: c + + /* Reserve space on the ring */ + n = rte_ring_enqueue_zc_burst_start(r, 32, &zcd, NULL); + /* Pkt I/O core polls packets from the NIC */ + if (n != 0) { + nb_rx = rte_eth_rx_burst(portid, queueid, zcd->ptr1, zcd->n1); + if (nb_rx == zcd->n1 && n != zcd->n1) + nb_rx = rte_eth_rx_burst(portid, queueid, zcd->ptr2, + n - zcd->n1); + /* Provide packets to the packet processing cores */ + rte_ring_enqueue_zc_finish(r, nb_rx); + } + +Note that between ``_start_`` and ``_finish_`` no other thread can proceed +with enqueue(/dequeue) operation till ``_finish_`` completes. + References ---------- diff --git a/doc/guides/rel_notes/release_20_11.rst b/doc/guides/rel_notes/release_20_11.rst index d8ac359e5..fdc78b3da 100644 --- a/doc/guides/rel_notes/release_20_11.rst +++ b/doc/guides/rel_notes/release_20_11.rst @@ -55,6 +55,15 @@ New Features Also, make sure to start the actual text at the margin. ======================================================= +* **Added zero copy APIs for rte_ring.** + + For rings with producer/consumer in ``RTE_RING_SYNC_ST``, ``RTE_RING_SYNC_MT_HTS`` + modes, these APIs split enqueue/dequeue operation into three phases + (enqueue/dequeue start, copy data to/from ring, enqueue/dequeue finish). + Along with the advantages of the peek APIs, these provide the ability to + copy the data to the ring memory directly without the need for temporary + storage. + * **Added write combining store APIs.** Added ``rte_write32_wc`` and ``rte_write32_wc_relaxed`` APIs From patchwork Sun Oct 25 05:45:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318960 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695970ilg; Sat, 24 Oct 2020 22:48:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz86txSkaTgl0LoneISvvkfZzMjUXEVeKL+mCukD4PtnbaHT3B6PJWHYLj6wsmpp24bBWcZ X-Received: by 2002:a17:906:6409:: with SMTP id d9mr9660625ejm.344.1603604920020; Sat, 24 Oct 2020 22:48:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604920; cv=none; d=google.com; s=arc-20160816; b=QhJ5UHvBb3kABhiw3GMsp35iHpMbBHWN8FB833qUurKXlQFAShFOy6kNdh4MnNQa9d +lWhrBVVWVULZMKo7EgfDQls33ueLwXxPOVH7QASEib3uNMz8D7pPHCkfLPD2Y40Idgm ORFwqNASE9FcNJHMWdIURgzabCBBtWPSSb+wJwk7zc/phLtTOe0tygd4rEShg50ghDQf Y7dOXDEIX3IJSuFK+tiyzm+6W/Jn8oxCjZvp5wU2+MfZ1hEqPMLg3GnLvndYG+0uHLA3 NSNbuTzCdgBDaAybShrP+anAOycJTaMcN4h6LtxgbIEsrEW/qGj7GiflkFb9wVqOmcp/ uiqA== 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=G2TfokirCDL4Iwlew9p1Jd9imSeONUbauO+haNUF4HA=; b=YpB7DQnabg7u76sh6hCKpoJyd5Sbxxh+JqCtAr/K94MF0NEfJ3ILV6lqY7ko4XRtON ysjF/w44NRmYrVe6hvFIxiaokrYqzyjgEBDeFzf7SK9k0k9/iA8aoJ09ZqumqkHrljli erba9QhHTiFw3dxWrPI5E8KBMS9bbAvzlBaPiycVfDWXKmQH6vbg+Kj8ytlz7rLpYNCu GIOCRXSxSoa3/WKanXgOLGltbiAHXOpi10BYTTGn+6rqkYPRVxs3AXDcw6Vi8iMgdr7U T0QqeisoDg548yveGs+sxIHCWDyhnXLKO5hqAtMDCb6d4IE2hVV5wNyJJ4fQQpAaIu9m pu8Q== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id u29si4258629edb.137.2020.10.24.22.48.39; Sat, 24 Oct 2020 22:48:40 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E80D82BF9; Sun, 25 Oct 2020 06:46:23 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id B249C2B83; Sun, 25 Oct 2020 06:46:12 +0100 (CET) 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 2590A113E; Sat, 24 Oct 2020 22:46:11 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 1D67D3F66B; Sat, 24 Oct 2020 22:46:11 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com, stable@dpdk.org Date: Sun, 25 Oct 2020 00:45:54 -0500 Message-Id: <20201025054556.14277-7-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 6/8] test/ring: fix the memory dump 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" Pass the correct number of bytes to dump the memory. Fixes: bf28df24e915 ("test/ring: add contention stress test" Cc: konstantin.ananyev@intel.com Cc: stable@dpdk.org Signed-off-by: Honnappa Nagarahalli Reviewed-by: Dharmik Thakkar Acked-by: Konstantin Ananyev --- app/test/test_ring_stress_impl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 diff --git a/app/test/test_ring_stress_impl.h b/app/test/test_ring_stress_impl.h index 3b9a480eb..f9ca63b90 100644 --- a/app/test/test_ring_stress_impl.h +++ b/app/test/test_ring_stress_impl.h @@ -159,7 +159,7 @@ check_updt_elem(struct ring_elem *elm[], uint32_t num, "offending object: %p\n", __func__, rte_lcore_id(), num, i, elm[i]); rte_memdump(stdout, "expected", check, sizeof(*check)); - rte_memdump(stdout, "result", elm[i], sizeof(elm[i])); + rte_memdump(stdout, "result", elm[i], sizeof(*elm[i])); rte_spinlock_unlock(&dump_lock); return -EINVAL; } From patchwork Sun Oct 25 05:45:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318959 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1695837ilg; Sat, 24 Oct 2020 22:48:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYDKIsT4kCUekoP9GiXnhEulvgYoMkPStroIA/ARIvsKONYAAR4OjRdLh5p2Oj3hBmk62n X-Received: by 2002:a17:906:2649:: with SMTP id i9mr10300162ejc.449.1603604898640; Sat, 24 Oct 2020 22:48:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604898; cv=none; d=google.com; s=arc-20160816; b=S4UQdOJcN+hYpVUbd5ZDDwpU1B5aivfxn6TnLYDqeykyp/vzAKQPInlApVjiWgBiRO wzLpgSBgPusN3e603Az/lzQdIdFi15iN4SwSJHt02bpnkFW7oiJv4CidM8HKBzU2Nk8j +uND5ZLaLmhUjFijVYb7Hl8cMPb8PJ1BZmD1o5fq4+slROBG9wKGRY6gEgQzQ3xLTpbL arEtSWpUJtoAX1TEdYnHVjrIMDCrd1xXZZSxgnecsaKHF0sK42LilB5gAWU5R4lSsemJ rZ1FZhaP5LjhSI6PiBeAlQLWZ4/wELRpSzMavO7li+IRSsRs3iFcKpGsi6X4OGylwtQr N/NQ== 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=TPbivzCUEjLa5iLw/D6gbOFDY47NUnGhUiLms7lWHF8=; b=xhI5s4RMS7gUC1EtW/ThfsLo9M/nQhjU1Jnxkgvmu33Ck+bedYDXB8EkSzPJxwfG4B CH9xCBqjah4iPY/DsqyFZXlem6egdOt53lpM0aJyggaL8/TokO2bH9jmtlD+NIxGYf15 e0sU88bsmtI2+AYR8o9WeTM4FkndVHrdNyQxCCQchtAOdwYyDUCi9feaTTSkid+KtJ+E N90SUQJ9CseDe0Y1vPCU8S4Qa3GH2IgU+CQ0wRMQseN2YQZ3iwJtDVl8VOFNXaTIVnGw xIBZ9AgKskQX1+PwQqoWZIhoI2aPcKFBqB5FhLGR5NgJLe7ZGYwKSW0DXGK460ORzfdW 7UEQ== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id d18si4911461ejo.406.2020.10.24.22.48.18; Sat, 24 Oct 2020 22:48:18 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 61F302BE2; Sun, 25 Oct 2020 06:46:22 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id 3DE652B8C for ; Sun, 25 Oct 2020 06:46:12 +0100 (CET) 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 E29481435; Sat, 24 Oct 2020 22:46:11 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id D121A3F66B; Sat, 24 Oct 2020 22:46:11 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:55 -0500 Message-Id: <20201025054556.14277-8-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 7/8] test/ring: remove unnecessary braces 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" Remove unnecessary braces to improve readability. Signed-off-by: Honnappa Nagarahalli --- app/test/test_ring.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) -- 2.17.1 Acked-by: Konstantin Ananyev diff --git a/app/test/test_ring.h b/app/test/test_ring.h index b525abb79..c8bfec839 100644 --- a/app/test/test_ring.h +++ b/app/test/test_ring.h @@ -35,11 +35,11 @@ test_ring_create(const char *name, int esize, unsigned int count, int socket_id, unsigned int flags) { /* Legacy queue APIs? */ - if ((esize) == -1) - return rte_ring_create((name), (count), (socket_id), (flags)); + if (esize == -1) + return rte_ring_create(name, count, socket_id, flags); else - return rte_ring_create_elem((name), (esize), (count), - (socket_id), (flags)); + return rte_ring_create_elem(name, esize, count, + socket_id, flags); } static inline void* @@ -102,7 +102,7 @@ test_ring_enqueue(struct rte_ring *r, void **obj, int esize, unsigned int n, unsigned int api_type) { /* Legacy queue APIs? */ - if ((esize) == -1) + if (esize == -1) switch (api_type) { case (TEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE): return rte_ring_enqueue(r, *obj); @@ -163,7 +163,7 @@ test_ring_dequeue(struct rte_ring *r, void **obj, int esize, unsigned int n, unsigned int api_type) { /* Legacy queue APIs? */ - if ((esize) == -1) + if (esize == -1) switch (api_type) { case (TEST_RING_THREAD_DEF | TEST_RING_ELEM_SINGLE): return rte_ring_dequeue(r, obj); From patchwork Sun Oct 25 05:45:56 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Honnappa Nagarahalli X-Patchwork-Id: 318961 Delivered-To: patch@linaro.org Received: by 2002:a92:d1d1:0:0:0:0:0 with SMTP id u17csp1696119ilg; Sat, 24 Oct 2020 22:49:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy/AyCRRBL5q7xqhqx8NVWYkXUVUGqklyX0M0W+caYxlcq/iy3PGAmh4MIUYDB25Nr9NRhX X-Received: by 2002:a17:906:68c4:: with SMTP id y4mr10007960ejr.197.1603604941222; Sat, 24 Oct 2020 22:49:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1603604941; cv=none; d=google.com; s=arc-20160816; b=MAYRYxlApFy5UzXkCxUa3+t4lGDe1MZNKH3Ewtv3zv5eogLlQ3gpSKrJD6wVHqtJUf VfWF+FI1/7BD3DcEmhYWpApUY4yEwak3uN/+qHNrzcufFZfOQR7CouWSpPlxfa6qLcxq 7Jrtle9xVH68XlLxYGLgfubhEbeWVEsOMZ9ZTuCrrTKu8zMxWZB5v/GhZyosOKeC2WWk zqqJd4lWJY5P4iqWMrHkhaMfU/eImTnL+vhtm9ck0RNkCG71/PW0V5HPNzD2ntg1mIof Mvf4fFFJAHoLSWBid7COOxYQGA7BsKV7/zYxu6H29s47GtEVmYk+VlPW0+42EYX9JQYD GxDA== 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=78666mXMYaSN3u1NISNmYpDNLw1PrePHOYmGvT+MIn0=; b=rziTqu5pSKPqZ4j+4YqI7SVmG7GK3F/2JoGIIIR6XYdvQaHjgqh6viCu2sGpqGZNj1 +KuhbXqO9PWMxSqkdvIfX7VeiopOhlYNph4X36qb7LXz21thuuem67+RknPvsx+UafhW VUEs3WCJ4fsf7aJZDcjRoVJzmmytgOzasK6wKY0T4HO60o++lIv16xK+8DDEJzIyPZNy 7ZayjwHvxgDETd3t8PKg5TrVXJSNGFtJv0JXFhX55KXAgJsLk8qTxtfZWa3cXby1xUG2 vjZbfH4MqLYkx1ac/WeM8nk4VGux8btUR/VPmZJHDzepLvC6oZhPzZhrMQR46dhURd6T ewFg== 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Return-Path: Received: from dpdk.org (dpdk.org. [92.243.14.124]) by mx.google.com with ESMTP id c25si4407332ejs.444.2020.10.24.22.49.01; Sat, 24 Oct 2020 22:49:01 -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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=arm.com Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 7AB562B84; Sun, 25 Oct 2020 06:46:25 +0100 (CET) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by dpdk.org (Postfix) with ESMTP id D72CE2B8C for ; Sun, 25 Oct 2020 06:46:12 +0100 (CET) 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 A582F143B; Sat, 24 Oct 2020 22:46:12 -0700 (PDT) Received: from qc2400f-1.austin.arm.com (qc2400f-1.austin.arm.com [10.118.12.27]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 9DDDF3F66B; Sat, 24 Oct 2020 22:46:12 -0700 (PDT) From: Honnappa Nagarahalli To: dev@dpdk.org, honnappa.nagarahalli@arm.com, konstantin.ananyev@intel.com, stephen@networkplumber.org Cc: dharmik.thakkar@arm.com, ruifeng.wang@arm.com, olivier.matz@6wind.com, david.marchand@redhat.com, nd@arm.com Date: Sun, 25 Oct 2020 00:45:56 -0500 Message-Id: <20201025054556.14277-9-honnappa.nagarahalli@arm.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201025054556.14277-1-honnappa.nagarahalli@arm.com> References: <20200224203931.21256-1-honnappa.nagarahalli@arm.com> <20201025054556.14277-1-honnappa.nagarahalli@arm.com> Subject: [dpdk-dev] [PATCH v5 8/8] test/ring: user uintptr_t instead of unsigned long 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" Use uintptr_t instead of unsigned long while initializing the array of pointers. Signed-off-by: Honnappa Nagarahalli --- app/test/test_ring.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Acked-by: Konstantin Ananyev diff --git a/app/test/test_ring.c b/app/test/test_ring.c index 3914cb98a..5b7fdfa45 100644 --- a/app/test/test_ring.c +++ b/app/test/test_ring.c @@ -447,7 +447,7 @@ test_ring_mem_init(void *obj, unsigned int count, int esize) /* Legacy queue APIs? */ if (esize == -1) for (i = 0; i < count; i++) - ((void **)obj)[i] = (void *)(unsigned long)i; + ((void **)obj)[i] = (void *)(uintptr_t)i; else for (i = 0; i < (count * esize / sizeof(uint32_t)); i++) ((uint32_t *)obj)[i] = i;