Re: [PATCH v5 01/10] memarea: introduce memarea library
Hi Mattias, Thanks for your review, most will fix in v6. On 2022/10/7 4:15, Mattias Rönnblom wrote: > On 2022-10-05 06:09, datshan wrote: >> From: Chengwen Feng >> >> The memarea library is an allocator of variable-size object which based >> on a memory region. >> >> This patch provides create/destroy API. >> >> Signed-off-by: Chengwen Feng >> --- >> MAINTAINERS | 5 + >> doc/api/doxy-api-index.md | 3 +- >> doc/api/doxy-api.conf.in | 1 + >> doc/guides/prog_guide/index.rst | 1 + >> doc/guides/prog_guide/memarea_lib.rst | 39 ++ >> doc/guides/rel_notes/release_22_11.rst | 6 + >> lib/eal/common/eal_common_log.c | 1 + >> lib/eal/include/rte_log.h | 1 + >> lib/memarea/memarea_private.h | 30 + >> lib/memarea/meson.build | 16 +++ >> lib/memarea/rte_memarea.c | 157 + >> lib/memarea/rte_memarea.h | 145 +++ >> lib/memarea/version.map | 12 ++ >> lib/meson.build | 1 + >> 14 files changed, 417 insertions(+), 1 deletion(-) >> create mode 100644 doc/guides/prog_guide/memarea_lib.rst >> create mode 100644 lib/memarea/memarea_private.h >> create mode 100644 lib/memarea/meson.build >> create mode 100644 lib/memarea/rte_memarea.c >> create mode 100644 lib/memarea/rte_memarea.h >> create mode 100644 lib/memarea/version.map >> >> diff --git a/MAINTAINERS b/MAINTAINERS >> index a55b379d73..b9c638221d 100644 >> --- a/MAINTAINERS >> +++ b/MAINTAINERS >> @@ -1550,6 +1550,11 @@ F: app/test/test_lpm* >> F: app/test/test_func_reentrancy.c >> F: app/test/test_xmmt_ops.h >> +Memarea - EXPERIMENTAL >> +M: Chengwen Feng >> +F: lib/memarea >> +F: doc/guides/prog_guide/memarea_lib.rst >> + >> Membership - EXPERIMENTAL >> M: Yipeng Wang >> M: Sameh Gobriel >> diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md >> index de488c7abf..24456604f8 100644 >> --- a/doc/api/doxy-api-index.md >> +++ b/doc/api/doxy-api-index.md >> @@ -62,7 +62,8 @@ The public API headers are grouped by topics: >> [memzone](@ref rte_memzone.h), >> [mempool](@ref rte_mempool.h), >> [malloc](@ref rte_malloc.h), >> - [memcpy](@ref rte_memcpy.h) >> + [memcpy](@ref rte_memcpy.h), >> + [memarea](@ref rte_memarea.h) >> - **timers**: >> [cycles](@ref rte_cycles.h), >> diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in >> index f0886c3bd1..8334ebcbd6 100644 >> --- a/doc/api/doxy-api.conf.in >> +++ b/doc/api/doxy-api.conf.in >> @@ -53,6 +53,7 @@ INPUT = >> @TOPDIR@/doc/api/doxy-api-index.md \ >> @TOPDIR@/lib/latencystats \ >> @TOPDIR@/lib/lpm \ >> @TOPDIR@/lib/mbuf \ >> + @TOPDIR@/lib/memarea \ >> @TOPDIR@/lib/member \ >> @TOPDIR@/lib/mempool \ >> @TOPDIR@/lib/meter \ >> diff --git a/doc/guides/prog_guide/index.rst >> b/doc/guides/prog_guide/index.rst >> index 8564883018..e9015d65e3 100644 >> --- a/doc/guides/prog_guide/index.rst >> +++ b/doc/guides/prog_guide/index.rst >> @@ -37,6 +37,7 @@ Programmer's Guide >> hash_lib >> toeplitz_hash_lib >> efd_lib >> + memarea_lib >> member_lib >> lpm_lib >> lpm6_lib >> diff --git a/doc/guides/prog_guide/memarea_lib.rst >> b/doc/guides/prog_guide/memarea_lib.rst >> new file mode 100644 >> index 00..b96dad15f6 >> --- /dev/null >> +++ b/doc/guides/prog_guide/memarea_lib.rst >> @@ -0,0 +1,39 @@ >> +.. SPDX-License-Identifier: BSD-3-Clause >> + Copyright(c) 2022 HiSilicon Limited >> + >> +Memarea Library >> +=== >> + >> +Introduction >> + >> + >> +The memarea library provides an allocator of variable-size objects, it is >> +oriented towards the application layer, which could provides 'region-based >> +memory management' function [1]. >> + >> +The main features are as follows: >> + >> +* The default aligement size is ``RTE_CACHE_LINE_SIZE``. >> + >> +* The memory region can be initialized from the following memory sources: >> + a) RTE memory: e.g. invoke ``rte_malloc_socket`` to obtain. b) System API: >> + e.g. invoke posix_memalign to obtain. c) User provided address: it can be >> from >> + extendedd memory as long as it is available. d) User provided memarea: it >> can >> + be from another memarea. >> + >> +* It provides refcnt feature which could be useful in multi-reader scenario. >> + >> +* It supports MT-safe as long as it's specified at creation time. >> + >> +Library API Overview >> + >> + >> +The ``rte_memarea_create()`` function is used to create a memarea, the >> function >> +returns the pointer to the created memarea or ``NULL`` if the creation >> failed. >> + >> +The ``rte_mem
RE: [PATCH v4] net/iavf: fix TSO offload for tunnel case
> -Original Message-
> From: Nicolau, Radu
> Sent: Friday, September 30, 2022 5:05 PM
> To: Zeng, ZhichaoX ; dev@dpdk.org
> Cc: Yang, Qiming ; Zhou, YidingX
> ; Zhang, Qi Z ; Wu, Jingjing
> ; Xing, Beilei ; Sinha, Abhijit
> ; Doherty, Declan
> Subject: Re: [PATCH v4] net/iavf: fix TSO offload for tunnel case
>
>
> On 9/29/2022 6:27 AM, Zhichao Zeng wrote:
> > This patch is to fix the tunnel TSO not enabling issue, simplify the
> > logic of calculating 'Tx Buffer Size' of data descriptor with IPSec,
> > and fix handling that the mbuf size exceeds the TX descriptor hardware
> > limit(1B-16KB) which causes malicious behavior to the NIC.
> >
> > Fixes: 1e728b01120c ("net/iavf: rework Tx path")
> >
> > Signed-off-by: Zhichao Zeng
> >
> > ---
> Acked-by: Radu Nicolau
Applied to dpdk-next-net-intel.
Thanks
Qi
Re: [PATCH] vhost: enable CONFIG feature
On 2022/9/26 15:26, Xia, Chenbo wrote:
-Original Message-
From: Hao Chen
Sent: Tuesday, September 13, 2022 5:55 PM
To: maxime.coque...@redhat.com; Xia, Chenbo
Cc: dev@dpdk.org; ho...@yusur.tech; z...@yusur.tech; Hao Chen
Subject: [PATCH] vhost: enable CONFIG feature
Enable this feature, so that libvirt or qemu can call vdpa vendor
driver's ops '.get_config' through 'vhost_net_get_config' to get
the mac address of the vdpa hardware without manual configuration.
I think we should add this in vendor's vdpa driver, not in common library.
Because some hardware and the sw back-end can't support get/set config.
Thanks,
Chenbo
Yeah, maybe add "if (vdpa_protocol_features & (1ULL <<
VHOST_USER_PROTOCOL_F_CONFIG)) *protocol_features |= (1ULL <<
VHOST_USER_PROTOCOL_F_CONFIG);" at the end of function
'rte_vhost_driver_get_protocol_features' will be better. I will send
patch v2.
Thanks.
Signed-off-by: Hao Chen
---
lib/vhost/vhost_user.h | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/vhost/vhost_user.h b/lib/vhost/vhost_user.h
index 8ecca68597..12e8d116f3 100644
--- a/lib/vhost/vhost_user.h
+++ b/lib/vhost/vhost_user.h
@@ -23,7 +23,8 @@
(1ULL <<
VHOST_USER_PROTOCOL_F_SLAVE_SEND_FD) | \
(1ULL <<
VHOST_USER_PROTOCOL_F_HOST_NOTIFIER) | \
(1ULL <<
VHOST_USER_PROTOCOL_F_PAGEFAULT) |
\
-(1ULL << VHOST_USER_PROTOCOL_F_STATUS))
+(1ULL << VHOST_USER_PROTOCOL_F_STATUS)
| \
+(1ULL << VHOST_USER_PROTOCOL_F_CONFIG))
typedef enum VhostUserRequest {
VHOST_USER_NONE = 0,
--
2.34.1
Re: [PATCH v5 07/10] memarea: support backup memory mechanism
Hi Mattias,
On 2022/10/7 3:53, Mattias Rönnblom wrote:
> On 2022-10-05 06:09, datshan wrote:
>> From: Chengwen Feng
>>
>> This patch supports backup memory mechanism, the memarea could use
>> another memarea as a backup.
>
> Maybe it's worth mentioning what backup means already here.
>
> "This patch adds a memarea backup mechanism, where an allocation request
> which cannot be met by a certain memarea is deferred to its backup memarea."
+1
>
> I assume they can be nested indefinitely?
Theoretically, yes.
And I'm going to add, to avoid loops
>
>>
>> Signed-off-by: Chengwen Feng
>> ---
>> doc/guides/prog_guide/memarea_lib.rst | 3 +++
>> lib/memarea/memarea_private.h | 2 ++
>> lib/memarea/rte_memarea.c | 22 ++
>> lib/memarea/rte_memarea.h | 7 +++
>> 4 files changed, 34 insertions(+)
>>
>> diff --git a/doc/guides/prog_guide/memarea_lib.rst
>> b/doc/guides/prog_guide/memarea_lib.rst
>> index c77012fe44..842d35f77a 100644
>> --- a/doc/guides/prog_guide/memarea_lib.rst
>> +++ b/doc/guides/prog_guide/memarea_lib.rst
>> @@ -25,6 +25,9 @@ The main features are as follows:
>> * It supports MT-safe as long as it's specified at creation time.
>> +* It provides backup memory mechanism, the memarea could use another
>> memarea
>> + as a backup.
>> +
>> Library API Overview
>>
>> diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
>> index 98406879b9..08735ca81f 100644
>> --- a/lib/memarea/memarea_private.h
>> +++ b/lib/memarea/memarea_private.h
>> @@ -23,11 +23,13 @@ struct rte_memarea {
>> struct rte_memarea_param init;
>> rte_spinlock_t lock;
>> void *area_addr;
>> + void *top_addr;
>> struct memarea_elem_list elem_list;
>> struct memarea_elem_list free_list;
>> uint64_t alloc_fails;
>> uint64_t refcnt_check_fails;
>> + uint64_t bak_alloc_fails;
>> } __rte_cache_aligned;
>> #endif /* MEMAREA_PRIVATE_H */
>> diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
>> index b70830d0bb..f45191aa7f 100644
>> --- a/lib/memarea/rte_memarea.c
>> +++ b/lib/memarea/rte_memarea.c
>> @@ -132,6 +132,7 @@ rte_memarea_create(const struct rte_memarea_param *init)
>> TAILQ_INIT(&ma->elem_list);
>> TAILQ_INIT(&ma->free_list);
>> ma->area_addr = addr;
>> + ma->top_addr = (void *)((uintptr_t)addr + init->total_sz - 1);
>
> RTE_PTR_ADD()
>
>> elem = addr;
>> elem->size = init->total_sz - sizeof(struct memarea_elem);
>> elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
>> @@ -200,6 +201,15 @@ memarea_add_node(struct rte_memarea *ma, struct
>> memarea_elem *elem, size_t need_
>> elem->size = align_size;
>> }
>> +static inline void *
>> +memarea_alloc_backup(struct rte_memarea *ma, size_t size, uint32_t cookie)
>> +{
>> + void *ptr = rte_memarea_alloc(ma->init.bak_memarea, size, cookie);
>> + if (unlikely(ptr == NULL))
>> + ma->bak_alloc_fails++;
>> + return ptr;
>> +}
>> +
>> void *
>> rte_memarea_alloc(struct rte_memarea *ma, size_t size, uint32_t cookie)
>> {
>> @@ -221,6 +231,8 @@ rte_memarea_alloc(struct rte_memarea *ma, size_t size,
>> uint32_t cookie)
>> ptr = (void *)((uintptr_t)elem + sizeof(struct memarea_elem));
>> break;
>> }
>> + if (ptr == NULL && ma->init.bak_memarea != NULL)
>
> Maybe you want an unlikely() around the above, too. I assume using the backup
> area is an exceptional case.
+1
>
>> + ptr = memarea_alloc_backup(ma, size, cookie);
>> if (unlikely(ptr == NULL))
>> ma->alloc_fails++;
>> memarea_unlock(ma);
>> @@ -283,6 +295,12 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
>> *ptr, int16_t value)
>> return;
>> memarea_lock(ma);
>> + if (ptr < ma->area_addr || ptr > ma->top_addr) {
>> + rte_memarea_update_refcnt(ma->init.bak_memarea, ptr, value);
>> + memarea_unlock(ma);
>> + return;
>> + }
>> +
>> if (unlikely(elem->refcnt <= 0 || elem->refcnt + value < 0)) {
>> RTE_LOG(ERR, MEMAREA,
>> "memarea: %s cookie: 0x%x curr refcnt: %d update refcnt: %d
>> check fail!\n",
>> @@ -373,10 +391,14 @@ rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool
>> dump_all)
>> fprintf(f, " algorithm: %s\n", memarea_alg_name(ma->init.alg));
>> fprintf(f, " total-size: 0x%zx\n", ma->init.total_sz);
>> fprintf(f, " mt-safe: %s\n", ma->init.mt_safe ? "yes" : "no");
>> + if (ma->init.bak_memarea)
>> + fprintf(f, " backup-memarea-name: %s\n",
>> ma->init.bak_memarea->init.name);
>> fprintf(f, " total-regions: %u\n", memarea_elem_list_num(ma));
>> fprintf(f, " total-free-regions: %u\n", memarea_free_list_num(ma));
>> fprintf(f, " alloc_fails: %" PRIu64 "\n", ma->alloc_fails);
>> fprintf(f, " refcnt_check_fails: %" PRIu64
Re: [PATCH v5 03/10] memarea: support alloc/free/update-refcnt API
Hi Mattias,
On 2022/10/7 3:43, Mattias Rönnblom wrote:
> On 2022-10-05 06:09, datshan wrote:
>> From: Chengwen Feng
>>
>> This patch supports rte_memarea_alloc()/rte_memarea_free()/
>> rte_memarea_update_refcnt() API.
>>
>> Signed-off-by: Chengwen Feng
>> ---
>> doc/guides/prog_guide/memarea_lib.rst | 10 ++
>> lib/memarea/memarea_private.h | 3 +
>> lib/memarea/rte_memarea.c | 143 ++
>> lib/memarea/rte_memarea.h | 56 ++
>> lib/memarea/version.map | 3 +
>> 5 files changed, 215 insertions(+)
>>
>> diff --git a/doc/guides/prog_guide/memarea_lib.rst
>> b/doc/guides/prog_guide/memarea_lib.rst
>> index b96dad15f6..41bc0a90cd 100644
>> --- a/doc/guides/prog_guide/memarea_lib.rst
>> +++ b/doc/guides/prog_guide/memarea_lib.rst
>> @@ -33,6 +33,16 @@ returns the pointer to the created memarea or ``NULL`` if
>> the creation failed.
>> The ``rte_memarea_destroy()`` function is used to destroy a memarea.
>> +The ``rte_memarea_alloc()`` function is used to alloc one memory object
>> from
>> +the memarea.
>> +
>> +The ``rte_memarea_free()`` function is used to free one memory object which
>> +allocated by ``rte_memarea_alloc()``.
>> +
>> +The ``rte_memarea_update_refcnt()`` function is used to update the memory
>> +object's reference count, if the count reaches zero, the memory object will
>> +be freed to memarea.
>> +
>> Reference
>> -
>> diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
>> index c76392d3e6..98406879b9 100644
>> --- a/lib/memarea/memarea_private.h
>> +++ b/lib/memarea/memarea_private.h
>> @@ -25,6 +25,9 @@ struct rte_memarea {
>> void *area_addr;
>> struct memarea_elem_list elem_list;
>> struct memarea_elem_list free_list;
>> +
>> + uint64_t alloc_fails;
>> + uint64_t refcnt_check_fails;
>> } __rte_cache_aligned;
>> #endif /* MEMAREA_PRIVATE_H */
>> diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
>> index 868da7661d..a072f07f20 100644
>> --- a/lib/memarea/rte_memarea.c
>> +++ b/lib/memarea/rte_memarea.c
>> @@ -4,6 +4,7 @@
>> #include
>> #include
>> +#include
>> #include
>> #include
>> @@ -94,6 +95,8 @@ memarea_alloc_area(const struct rte_memarea_param *init)
>> ptr = memarea_alloc_from_system_api(init->total_sz);
>> else if (init->source == RTE_MEMAREA_SOURCE_USER_ADDR)
>> ptr = init->user_addr;
>> + else if (init->source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
>> + ptr = rte_memarea_alloc(init->user_memarea, init->total_sz, 0);
>> if (ptr == NULL)
>> RTE_LOG(ERR, MEMAREA, "memarea: %s alloc memory area fail!\n",
>> init->name);
>> @@ -145,6 +148,8 @@ memarea_free_area(struct rte_memarea *ma)
>> rte_free(ma->area_addr);
>> else if (ma->init.source == RTE_MEMAREA_SOURCE_SYSTEM_API)
>> free(ma->area_addr);
>> + else if (ma->init.source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
>> + rte_memarea_free(ma->init.user_memarea, ma->area_addr);
>> }
>> void
>> @@ -155,3 +160,141 @@ rte_memarea_destroy(struct rte_memarea *ma)
>> memarea_free_area(ma);
>> rte_free(ma);
>> }
>> +
>> +static inline void
>> +memarea_lock(struct rte_memarea *ma)
>> +{
>> + if (ma->init.mt_safe)
>> + rte_spinlock_lock(&ma->lock);
>> +}
>> +
>> +static inline void
>> +memarea_unlock(struct rte_memarea *ma)
>> +{
>> + if (ma->init.mt_safe)
>> + rte_spinlock_unlock(&ma->lock);
>> +}
>> +
>> +#define memarea_roundup(val, align) val) + ((align) - 1)) / (align)) *
>> (align))
>> +
>
> You should be able to use RTE_ALIGN_CEIL() instead of your own roundup macro,
> assuming this function isn't used in a patch I'm yet to review, with a
> potentially non-power-of-2 align parameter value.
>
> If not, change the macro to a function.
Current, the default align size is CACHE_LINE_SIZE, and it's power-of-2, so
will use RTE_ALIGN_CEIL in v6.
>
>> +static inline bool
>> +memarea_whether_add_node(size_t free_size, size_t need_size)
>> +{
>> + size_t align_size = memarea_roundup(need_size, RTE_CACHE_LINE_SIZE);
>> + return free_size > align_size && (free_size - align_size) >
>> sizeof(struct memarea_elem);
>> +}
>> +
>> +static inline void
>> +memarea_add_node(struct rte_memarea *ma, struct memarea_elem *elem, size_t
>> need_size)
>> +{
>> + size_t align_size = memarea_roundup(need_size, RTE_CACHE_LINE_SIZE);
>> + struct memarea_elem *new_elem;
>> + new_elem = (struct memarea_elem *)((uintptr_t)elem + sizeof(struct
>> memarea_elem) +
>> + align_size);
>
> Use RTE_PTR_ADD().
>
>> + new_elem->size = elem->size - align_size - sizeof(struct memarea_elem);
>> + new_elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
>> + new_elem->refcnt = 0;
>> + TAILQ_INSERT_AFTER(&ma->elem_list, elem, new_elem, elem_node);
>> + TAILQ_INSERT_AFTER(&ma->free_list, elem, new
[PATCH v3] net/iavf: fix error of virtchnl command
When the device is bonded, bond pmd will register callback for LSC event.
This callback will execute some virtchnl commands in eal-intr-thread to
reinitialize the device with interrupts disabled. In this case, responses
to all commands not be received.
This commit starts a thread to handle all events to fix this issue.
Fixes: 48de41ca11f0 ("net/avf: enable link status update")
CC: sta...@dpdk.org
Signed-off-by: Yiding Zhou
---
v3: fix CI error
---
drivers/net/iavf/iavf.h| 2 +
drivers/net/iavf/iavf_ethdev.c | 5 ++
drivers/net/iavf/iavf_vchnl.c | 134 -
3 files changed, 140 insertions(+), 1 deletion(-)
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 26b858f6f0..1edebab8dc 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -424,6 +424,8 @@ _atomic_set_async_response_cmd(struct iavf_info *vf, enum
virtchnl_ops ops)
}
int iavf_check_api_version(struct iavf_adapter *adapter);
int iavf_get_vf_resource(struct iavf_adapter *adapter);
+void iavf_dev_event_handler_fini(void);
+int iavf_dev_event_handler_init(void);
void iavf_handle_virtchnl_msg(struct rte_eth_dev *dev);
int iavf_enable_vlan_strip(struct iavf_adapter *adapter);
int iavf_disable_vlan_strip(struct iavf_adapter *adapter);
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 782be82c7f..633d684804 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -2631,6 +2631,9 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
ð_dev->data->mac_addrs[0]);
+ if (iavf_dev_event_handler_init())
+ goto init_vf_err;
+
if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) {
/* register callback func to eal lib */
rte_intr_callback_register(pci_dev->intr_handle,
@@ -2785,6 +2788,8 @@ iavf_dev_uninit(struct rte_eth_dev *dev)
iavf_dev_close(dev);
+ iavf_dev_event_handler_fini();
+
return 0;
}
diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 0fa2617cd2..6284a5b125 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -2,6 +2,7 @@
* Copyright(c) 2017 Intel Corporation
*/
+#include
#include
#include
#include
@@ -11,6 +12,7 @@
#include
#include
#include
+#include
#include
#include
@@ -27,6 +29,136 @@
#define MAX_TRY_TIMES 2000
#define ASQ_DELAY_MS 1
+#define MAX_EVENT_PENDING 16
+
+struct iavf_arq_event_element {
+ TAILQ_ENTRY(iavf_arq_event_element) next;
+ struct rte_eth_dev *dev;
+ enum rte_eth_event_type event;
+ void *param;
+};
+
+struct iavf_event_handler {
+ rte_atomic32_t ndev;
+ pthread_t tid;
+ int fd[2];
+ pthread_mutex_t lock;
+ TAILQ_HEAD(event_lsit, iavf_arq_event_element) pending;
+};
+
+static struct iavf_event_handler event_handler = {
+ .fd = {-1, -1},
+};
+
+#ifndef TAILQ_FOREACH_SAFE
+#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
+ for ((var) = TAILQ_FIRST((head)); \
+ (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
+ (var) = (tvar))
+#endif
+
+static void *
+iavf_dev_event_handle(void *param __rte_unused)
+{
+ struct iavf_event_handler *handler = &event_handler;
+ TAILQ_HEAD(event_list, iavf_arq_event_element) pending;
+
+ while (true) {
+ char unused[MAX_EVENT_PENDING];
+ ssize_t nr = read(handler->fd[0], &unused, sizeof(unused));
+ if (nr <= 0)
+ break;
+
+ TAILQ_INIT(&pending);
+ pthread_mutex_lock(&handler->lock);
+ TAILQ_CONCAT(&pending, &handler->pending, next);
+ pthread_mutex_unlock(&handler->lock);
+
+ struct iavf_arq_event_element *pos, *save_next;
+ TAILQ_FOREACH_SAFE(pos, &pending, next, save_next) {
+ TAILQ_REMOVE(&pending, pos, next);
+ rte_eth_dev_callback_process(pos->dev, pos->event,
pos->param);
+ rte_free(pos);
+ }
+ }
+ return NULL;
+}
+
+static void
+iavf_dev_event_post(struct rte_eth_dev *dev,
+ enum rte_eth_event_type event,
+ void *param)
+{
+ struct iavf_event_handler *handler = &event_handler;
+ char notify_byte;
+ struct iavf_arq_event_element *elem = rte_malloc(NULL, sizeof(*elem),
0);
+ if (!elem)
+ return;
+
+ elem->dev = dev;
+ elem->event = event;
+ elem->param = param;
+
+ pthread_mutex_lock(&handler->lock);
+ TAILQ_INSERT_TAIL(&handler->pending, elem, next);
+ pthread_mutex_unlock(&handler->lock);
+
+ RTE_SET_USED(write(handler->fd[1], ¬ify_byte, 1));
+}
+
+int
+iavf_dev_event_handler_init(void)
+{
+ struct iavf_event_handler *handler =
[PATCH resend v3 0/6] crypto/uadk: introduce uadk crypto driver
Introduce a new crypto PMD for hardware accelerators based on UADK [1].
UADK is a framework for user applications to access hardware accelerators.
UADK relies on IOMMU SVA (Shared Virtual Address) feature, which share
the same page table between IOMMU and MMU.
Thereby user application can directly use virtual address for device dma,
which enhances the performance as well as easy usability.
[1] https://github.com/Linaro/uadk
Test:
sudo dpdk-test --vdev=crypto_uadk (--log-level=6)
RTE>>cryptodev_uadk_autotest
RTE>>quit
resend:
Rebase on next/for-main, which just merged series "cryptodev: rework session
framework".
update in v3:
Split patches according to Akhil's suggestions
Please split the patches as below.
1. introduce driver - create files with meson.build and with probe/remove
and device ops defined but not implemented. You do not need to write empty
functions.
Add basic documentation also which defines what the driver is.
You can explain the build dependency here.
2. define queue structs and setup/remove APIs
3. Add data path
4. implement cipher op. Add capabilities and documentation of what is supported
in each of the patch. Add feature flags etc.
5. implement auth, add capabilities and documentation
6. test app changes.
Update in v2:
Change uadk_supported_platform to uadk_crypto_version, which matches better
than platform.
enum uadk_crypto_version {
UADK_CRYPTO_V2,
UADK_CRYPTO_V3,
};
Update in v1, compared with rfc
Suggested from Akhil Goyal
Only consider crypto PMD first
Split patch into small (individually compiled) patches.
Update MAINTAINERS and doc/guides/cryptodevs/features/uadk.ini
Zhangfei Gao (6):
crypto/uadk: introduce uadk crypto driver
crypto/uadk: support basic operations
crypto/uadk: support enqueue/dequeue operations
crypto/uadk: support cipher algorithms
crypto/uadk: support auth algorithms
test/crypto: add cryptodev_uadk_autotest
MAINTAINERS |6 +
app/test/test_cryptodev.c |7 +
app/test/test_cryptodev.h |1 +
doc/guides/cryptodevs/features/uadk.ini | 55 ++
doc/guides/cryptodevs/index.rst |1 +
doc/guides/cryptodevs/uadk.rst | 74 ++
drivers/crypto/meson.build |1 +
drivers/crypto/uadk/meson.build | 36 +
drivers/crypto/uadk/uadk_crypto_pmd.c | 1145 +++
drivers/crypto/uadk/version.map |3 +
10 files changed, 1329 insertions(+)
create mode 100644 doc/guides/cryptodevs/features/uadk.ini
create mode 100644 doc/guides/cryptodevs/uadk.rst
create mode 100644 drivers/crypto/uadk/meson.build
create mode 100644 drivers/crypto/uadk/uadk_crypto_pmd.c
create mode 100644 drivers/crypto/uadk/version.map
--
2.36.1
[PATCH resend v3 2/6] crypto/uadk: support basic operations
Support the basic dev control operations: configure, close, start,
stop and get info, as well as queue pairs operations.
Signed-off-by: Zhangfei Gao
---
drivers/crypto/uadk/uadk_crypto_pmd.c | 213 --
1 file changed, 204 insertions(+), 9 deletions(-)
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd.c
b/drivers/crypto/uadk/uadk_crypto_pmd.c
index ec9bb174c7..1d1a4b2897 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd.c
+++ b/drivers/crypto/uadk/uadk_crypto_pmd.c
@@ -12,6 +12,25 @@
#include
#include
+/* Maximum length for digest (SHA-512 needs 64 bytes) */
+#define DIGEST_LENGTH_MAX 64
+
+struct uadk_qp {
+ /* Ring for placing process packets */
+ struct rte_ring *processed_pkts;
+ /* Queue pair statistics */
+ struct rte_cryptodev_stats qp_stats;
+ /* Queue Pair Identifier */
+ uint16_t id;
+ /* Unique Queue Pair Name */
+ char name[RTE_CRYPTODEV_NAME_MAX_LEN];
+ /* Buffer used to store the digest generated
+* by the driver when verifying a digest provided
+* by the user (using authentication verify operation)
+*/
+ uint8_t temp_digest[DIGEST_LENGTH_MAX];
+} __rte_cache_aligned;
+
enum uadk_crypto_version {
UADK_CRYPTO_V2,
UADK_CRYPTO_V3,
@@ -30,16 +49,192 @@ RTE_LOG_REGISTER_DEFAULT(uadk_crypto_logtype, INFO);
"%s() line %u: " fmt "\n", __func__, __LINE__, \
## __VA_ARGS__)
+static const struct rte_cryptodev_capabilities uadk_crypto_v2_capabilities[] =
{
+ /* End of capabilities */
+ RTE_CRYPTODEV_END_OF_CAPABILITIES_LIST()
+};
+
+/* Configure device */
+static int
+uadk_crypto_pmd_config(struct rte_cryptodev *dev __rte_unused,
+ struct rte_cryptodev_config *config __rte_unused)
+{
+ return 0;
+}
+
+/* Start device */
+static int
+uadk_crypto_pmd_start(struct rte_cryptodev *dev __rte_unused)
+{
+ return 0;
+}
+
+/* Stop device */
+static void
+uadk_crypto_pmd_stop(struct rte_cryptodev *dev __rte_unused)
+{
+}
+
+/* Close device */
+static int
+uadk_crypto_pmd_close(struct rte_cryptodev *dev __rte_unused)
+{
+ return 0;
+}
+
+/* Get device statistics */
+static void
+uadk_crypto_pmd_stats_get(struct rte_cryptodev *dev,
+ struct rte_cryptodev_stats *stats)
+{
+ int qp_id;
+
+ for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
+ struct uadk_qp *qp = dev->data->queue_pairs[qp_id];
+
+ stats->enqueued_count += qp->qp_stats.enqueued_count;
+ stats->dequeued_count += qp->qp_stats.dequeued_count;
+ stats->enqueue_err_count += qp->qp_stats.enqueue_err_count;
+ stats->dequeue_err_count += qp->qp_stats.dequeue_err_count;
+ }
+}
+
+/* Reset device statistics */
+static void
+uadk_crypto_pmd_stats_reset(struct rte_cryptodev *dev __rte_unused)
+{
+ int qp_id;
+
+ for (qp_id = 0; qp_id < dev->data->nb_queue_pairs; qp_id++) {
+ struct uadk_qp *qp = dev->data->queue_pairs[qp_id];
+
+ memset(&qp->qp_stats, 0, sizeof(qp->qp_stats));
+ }
+}
+
+/* Get device info */
+static void
+uadk_crypto_pmd_info_get(struct rte_cryptodev *dev,
+struct rte_cryptodev_info *dev_info)
+{
+ struct uadk_crypto_priv *priv = dev->data->dev_private;
+
+ if (dev_info != NULL) {
+ dev_info->driver_id = dev->driver_id;
+ dev_info->driver_name = dev->device->driver->name;
+ dev_info->max_nb_queue_pairs = 128;
+ /* No limit of number of sessions */
+ dev_info->sym.max_nb_sessions = 0;
+ dev_info->feature_flags = dev->feature_flags;
+
+ if (priv->version == UADK_CRYPTO_V2)
+ dev_info->capabilities = uadk_crypto_v2_capabilities;
+ }
+}
+
+/* Release queue pair */
+static int
+uadk_crypto_pmd_qp_release(struct rte_cryptodev *dev, uint16_t qp_id)
+{
+ struct uadk_qp *qp = dev->data->queue_pairs[qp_id];
+
+ if (qp) {
+ rte_ring_free(qp->processed_pkts);
+ rte_free(qp);
+ dev->data->queue_pairs[qp_id] = NULL;
+ }
+
+ return 0;
+}
+
+/* set a unique name for the queue pair based on its name, dev_id and qp_id */
+static int
+uadk_pmd_qp_set_unique_name(struct rte_cryptodev *dev,
+ struct uadk_qp *qp)
+{
+ unsigned int n = snprintf(qp->name, sizeof(qp->name),
+ "uadk_crypto_pmd_%u_qp_%u",
+ dev->data->dev_id, qp->id);
+
+ if (n >= sizeof(qp->name))
+ return -EINVAL;
+
+ return 0;
+}
+
+/* Create a ring to place process packets on */
+static struct rte_ring *
+uadk_pmd_qp_create_processed_pkts_ring(struct uadk_qp *qp,
+ unsigned int ring_size, int socket_id)
+{
+ struct rte_ring *r = qp->proce
[PATCH resend v3 1/6] crypto/uadk: introduce uadk crypto driver
Introduce a new crypto PMD for hardware accelerators based on UADK [1]. UADK is a framework for user applications to access hardware accelerators. UADK relies on IOMMU SVA (Shared Virtual Address) feature, which share the same page table between IOMMU and MMU. Thereby user application can directly use virtual address for device dma, which enhances the performance as well as easy usability. This patch adds the basic framework. [1] https://github.com/Linaro/uadk Signed-off-by: Zhangfei Gao --- MAINTAINERS | 6 ++ doc/guides/cryptodevs/features/uadk.ini | 33 +++ doc/guides/cryptodevs/index.rst | 1 + doc/guides/cryptodevs/uadk.rst | 53 ++ drivers/crypto/meson.build | 1 + drivers/crypto/uadk/meson.build | 36 +++ drivers/crypto/uadk/uadk_crypto_pmd.c | 122 drivers/crypto/uadk/version.map | 3 + 8 files changed, 255 insertions(+) create mode 100644 doc/guides/cryptodevs/features/uadk.ini create mode 100644 doc/guides/cryptodevs/uadk.rst create mode 100644 drivers/crypto/uadk/meson.build create mode 100644 drivers/crypto/uadk/uadk_crypto_pmd.c create mode 100644 drivers/crypto/uadk/version.map diff --git a/MAINTAINERS b/MAINTAINERS index 5472fccf61..ed00b9afd1 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1064,6 +1064,12 @@ M: Kai Ji F: drivers/crypto/scheduler/ F: doc/guides/cryptodevs/scheduler.rst +HiSilicon UADK crypto +M: Zhangfei Gao +F: drivers/crypto/uadk/ +F: doc/guides/cryptodevs/uadk.rst +F: doc/guides/cryptodevs/features/uadk.ini + Intel QuickAssist M: Kai Ji F: drivers/crypto/qat/ diff --git a/doc/guides/cryptodevs/features/uadk.ini b/doc/guides/cryptodevs/features/uadk.ini new file mode 100644 index 00..df5ad40e3d --- /dev/null +++ b/doc/guides/cryptodevs/features/uadk.ini @@ -0,0 +1,33 @@ +; +; Supported features of the 'uadk' crypto driver. +; +; Refer to default.ini for the full list of available PMD features. +; +[Features] +HW Accelerated = Y + +; +; Supported crypto algorithms of the 'uadk' crypto driver. +; +[Cipher] + +; +; Supported authentication algorithms of the 'uadk' crypto driver. +; +[Auth] + +; +; Supported AEAD algorithms of the 'uadk' crypto driver. +; +[AEAD] + +; +; Supported Asymmetric algorithms of the 'uadk' crypto driver. +; +[Asymmetric] + +; +; Supported Operating systems of the 'uadk' crypto driver. +; +[OS] +Linux = Y diff --git a/doc/guides/cryptodevs/index.rst b/doc/guides/cryptodevs/index.rst index 39cca6dbde..cb4ce227e9 100644 --- a/doc/guides/cryptodevs/index.rst +++ b/doc/guides/cryptodevs/index.rst @@ -30,5 +30,6 @@ Crypto Device Drivers scheduler snow3g qat +uadk virtio zuc diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst new file mode 100644 index 00..a170224cac --- /dev/null +++ b/doc/guides/cryptodevs/uadk.rst @@ -0,0 +1,53 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright 2022-2023 Huawei Technologies Co.,Ltd. All rights reserved. +Copyright 2022-2023 Linaro ltd. + +UADK Crypto Poll Mode Driver +=== + +UADK crypto PMD provides poll mode driver +All cryptographic operations are using UADK crypto API. +Hardware accelerators using UADK are supposed to be supported. + + +Features + + +UADK crypto PMD has support for: + + +Test steps +--- + + .. code-block:: console + + 1. Build + cd dpdk + mkdir build + meson build (--reconfigure) + cd build + ninja + sudo ninja install + + 2. Prepare + echo 1024 > /sys/devices/system/node/node0/hugepages/hugepages-2048kB/nr_hugepages + echo 1024 > /sys/devices/system/node/node1/hugepages/hugepages-2048kB/nr_hugepages + echo 1024 > /sys/devices/system/node/node2/hugepages/hugepages-2048kB/nr_hugepages + echo 1024 > /sys/devices/system/node/node3/hugepages/hugepages-2048kB/nr_hugepages + mkdir -p /mnt/huge_2mb + mount -t hugetlbfs none /mnt/huge_2mb -o pagesize=2MB + + 3. Run test app + +Dependency + + +UADK crypto PMD relies on UADK library [1] + +UADK is a framework for user applications to access hardware accelerators. +UADK relies on IOMMU SVA (Shared Virtual Address) feature, which share +the same page table between IOMMU and MMU. +As a result, user application can directly use virtual address for device dma, +which enhances the performance as well as easy usability. + +[1] https://github.com/Linaro/uadk diff --git a/drivers/crypto/meson.build b/drivers/crypto/meson.build index 147b8cf633..ee5377deff 100644 --- a/drivers/crypto/meson.build +++ b/drivers/crypto/meson.build @@ -18,6 +18,7 @@ drivers = [ 'octeontx', 'openssl', 'scheduler', +'uadk', 'virtio', ] diff --git a/drivers/crypto/uadk/meson.build b/drivers/crypto/uadk/meson.build new file mode 100644 ind
[PATCH resend v3 3/6] crypto/uadk: support enqueue/dequeue operations
This commit adds the enqueue and dequeue operations.
Signed-off-by: Zhangfei Gao
---
drivers/crypto/uadk/uadk_crypto_pmd.c | 53 ++-
1 file changed, 51 insertions(+), 2 deletions(-)
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd.c
b/drivers/crypto/uadk/uadk_crypto_pmd.c
index 1d1a4b2897..051d6726b0 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd.c
+++ b/drivers/crypto/uadk/uadk_crypto_pmd.c
@@ -240,6 +240,55 @@ static struct rte_cryptodev_ops uadk_crypto_pmd_ops = {
.sym_session_clear = NULL,
};
+static uint16_t
+uadk_crypto_enqueue_burst(void *queue_pair, struct rte_crypto_op **ops,
+ uint16_t nb_ops)
+{
+ struct uadk_qp *qp = queue_pair;
+ struct rte_crypto_op *op;
+ uint16_t enqd = 0;
+ int i, ret;
+
+ for (i = 0; i < nb_ops; i++) {
+ op = ops[i];
+ op->status = RTE_CRYPTO_OP_STATUS_NOT_PROCESSED;
+
+ if (op->status == RTE_CRYPTO_OP_STATUS_NOT_PROCESSED)
+ op->status = RTE_CRYPTO_OP_STATUS_SUCCESS;
+
+ if (op->status != RTE_CRYPTO_OP_STATUS_ERROR) {
+ ret = rte_ring_enqueue(qp->processed_pkts, (void *)op);
+ if (ret < 0)
+ goto enqueue_err;
+ qp->qp_stats.enqueued_count++;
+ enqd++;
+ } else {
+ /* increment count if failed to enqueue op */
+ qp->qp_stats.enqueue_err_count++;
+ }
+ }
+
+ return enqd;
+
+enqueue_err:
+ qp->qp_stats.enqueue_err_count++;
+ return enqd;
+}
+
+static uint16_t
+uadk_crypto_dequeue_burst(void *queue_pair, struct rte_crypto_op **ops,
+ uint16_t nb_ops)
+{
+ struct uadk_qp *qp = queue_pair;
+ unsigned int nb_dequeued;
+
+ nb_dequeued = rte_ring_dequeue_burst(qp->processed_pkts,
+ (void **)ops, nb_ops, NULL);
+ qp->qp_stats.dequeued_count += nb_dequeued;
+
+ return nb_dequeued;
+}
+
static int
uadk_cryptodev_probe(struct rte_vdev_device *vdev)
{
@@ -276,8 +325,8 @@ uadk_cryptodev_probe(struct rte_vdev_device *vdev)
dev->dev_ops = &uadk_crypto_pmd_ops;
dev->driver_id = uadk_cryptodev_driver_id;
- dev->dequeue_burst = NULL;
- dev->enqueue_burst = NULL;
+ dev->dequeue_burst = uadk_crypto_dequeue_burst;
+ dev->enqueue_burst = uadk_crypto_enqueue_burst;
dev->feature_flags = RTE_CRYPTODEV_FF_HW_ACCELERATED;
priv = dev->data->dev_private;
priv->version = version;
--
2.36.1
[PATCH resend v3 4/6] crypto/uadk: support cipher algorithms
Cipher algorithms:
* ``RTE_CRYPTO_CIPHER_AES_ECB``
* ``RTE_CRYPTO_CIPHER_AES_CBC``
* ``RTE_CRYPTO_CIPHER_AES_XTS``
* ``RTE_CRYPTO_CIPHER_DES_CBC``
Signed-off-by: Zhangfei Gao
---
doc/guides/cryptodevs/features/uadk.ini | 10 +
doc/guides/cryptodevs/uadk.rst | 6 +
drivers/crypto/uadk/uadk_crypto_pmd.c | 330 +++-
3 files changed, 341 insertions(+), 5 deletions(-)
diff --git a/doc/guides/cryptodevs/features/uadk.ini
b/doc/guides/cryptodevs/features/uadk.ini
index df5ad40e3d..005e08ac8d 100644
--- a/doc/guides/cryptodevs/features/uadk.ini
+++ b/doc/guides/cryptodevs/features/uadk.ini
@@ -4,12 +4,22 @@
; Refer to default.ini for the full list of available PMD features.
;
[Features]
+Symmetric crypto = Y
HW Accelerated = Y
;
; Supported crypto algorithms of the 'uadk' crypto driver.
;
[Cipher]
+AES CBC (128) = Y
+AES CBC (192) = Y
+AES CBC (256) = Y
+AES ECB (128) = Y
+AES ECB (192) = Y
+AES ECB (256) = Y
+AES XTS (128) = Y
+AES XTS (256) = Y
+DES CBC= Y
;
; Supported authentication algorithms of the 'uadk' crypto driver.
diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst
index a170224cac..054f5103cc 100644
--- a/doc/guides/cryptodevs/uadk.rst
+++ b/doc/guides/cryptodevs/uadk.rst
@@ -15,6 +15,12 @@ Features
UADK crypto PMD has support for:
+Cipher algorithms:
+
+* ``RTE_CRYPTO_CIPHER_AES_ECB``
+* ``RTE_CRYPTO_CIPHER_AES_CBC``
+* ``RTE_CRYPTO_CIPHER_AES_XTS``
+* ``RTE_CRYPTO_CIPHER_DES_CBC``
Test steps
---
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd.c
b/drivers/crypto/uadk/uadk_crypto_pmd.c
index 051d6726b0..8e2e3b7877 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd.c
+++ b/drivers/crypto/uadk/uadk_crypto_pmd.c
@@ -31,12 +31,35 @@ struct uadk_qp {
uint8_t temp_digest[DIGEST_LENGTH_MAX];
} __rte_cache_aligned;
+enum uadk_chain_order {
+ UADK_CHAIN_ONLY_CIPHER,
+ UADK_CHAIN_NOT_SUPPORTED
+};
+
+struct uadk_crypto_session {
+ handle_t handle_cipher;
+ enum uadk_chain_order chain_order;
+
+ /* IV parameters */
+ struct {
+ uint16_t length;
+ uint16_t offset;
+ } iv;
+
+ /* Cipher Parameters */
+ struct {
+ enum rte_crypto_cipher_operation direction;
+ struct wd_cipher_req req;
+ } cipher;
+} __rte_cache_aligned;
+
enum uadk_crypto_version {
UADK_CRYPTO_V2,
UADK_CRYPTO_V3,
};
struct uadk_crypto_priv {
+ bool env_cipher_init;
enum uadk_crypto_version version;
} __rte_cache_aligned;
@@ -50,6 +73,86 @@ RTE_LOG_REGISTER_DEFAULT(uadk_crypto_logtype, INFO);
## __VA_ARGS__)
static const struct rte_cryptodev_capabilities uadk_crypto_v2_capabilities[] =
{
+ { /* AES ECB */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+ {.cipher = {
+ .algo = RTE_CRYPTO_CIPHER_AES_ECB,
+ .block_size = 16,
+ .key_size = {
+ .min = 16,
+ .max = 32,
+ .increment = 8
+ },
+ .iv_size = {
+ .min = 0,
+ .max = 0,
+ .increment = 0
+ }
+ }, }
+ }, }
+ },
+ { /* AES CBC */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+ {.cipher = {
+ .algo = RTE_CRYPTO_CIPHER_AES_CBC,
+ .block_size = 16,
+ .key_size = {
+ .min = 16,
+ .max = 32,
+ .increment = 8
+ },
+ .iv_size = {
+ .min = 16,
+ .max = 16,
+ .increment = 0
+ }
+ }, }
+ }, }
+ },
+ { /* AES XTS */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_CIPHER,
+ {.cipher = {
+ .algo = RTE_CRYPTO_CIPHER_AES_XTS,
+ .block_size = 1,
+ .key_size = {
+ .min = 32,
+ .max = 6
[PATCH resend v3 5/6] crypto/uadk: support auth algorithms
Hash algorithms:
* ``RTE_CRYPTO_AUTH_MD5``
* ``RTE_CRYPTO_AUTH_MD5_HMAC``
* ``RTE_CRYPTO_AUTH_SHA1``
* ``RTE_CRYPTO_AUTH_SHA1_HMAC``
* ``RTE_CRYPTO_AUTH_SHA224``
* ``RTE_CRYPTO_AUTH_SHA224_HMAC``
* ``RTE_CRYPTO_AUTH_SHA256``
* ``RTE_CRYPTO_AUTH_SHA256_HMAC``
* ``RTE_CRYPTO_AUTH_SHA384``
* ``RTE_CRYPTO_AUTH_SHA384_HMAC``
* ``RTE_CRYPTO_AUTH_SHA512``
* ``RTE_CRYPTO_AUTH_SHA512_HMAC``
Signed-off-by: Zhangfei Gao
---
doc/guides/cryptodevs/features/uadk.ini | 12 +
doc/guides/cryptodevs/uadk.rst | 15 +
drivers/crypto/uadk/uadk_crypto_pmd.c | 459
3 files changed, 486 insertions(+)
diff --git a/doc/guides/cryptodevs/features/uadk.ini
b/doc/guides/cryptodevs/features/uadk.ini
index 005e08ac8d..2e8a37a2b3 100644
--- a/doc/guides/cryptodevs/features/uadk.ini
+++ b/doc/guides/cryptodevs/features/uadk.ini
@@ -25,6 +25,18 @@ DES CBC= Y
; Supported authentication algorithms of the 'uadk' crypto driver.
;
[Auth]
+MD5 = Y
+MD5 HMAC = Y
+SHA1 = Y
+SHA1 HMAC= Y
+SHA224 = Y
+SHA224 HMAC = Y
+SHA256 = Y
+SHA256 HMAC = Y
+SHA384 = Y
+SHA384 HMAC = Y
+SHA512 = Y
+SHA512 HMAC = Y
;
; Supported AEAD algorithms of the 'uadk' crypto driver.
diff --git a/doc/guides/cryptodevs/uadk.rst b/doc/guides/cryptodevs/uadk.rst
index 054f5103cc..23ed70e82b 100644
--- a/doc/guides/cryptodevs/uadk.rst
+++ b/doc/guides/cryptodevs/uadk.rst
@@ -22,6 +22,21 @@ Cipher algorithms:
* ``RTE_CRYPTO_CIPHER_AES_XTS``
* ``RTE_CRYPTO_CIPHER_DES_CBC``
+Hash algorithms:
+
+* ``RTE_CRYPTO_AUTH_MD5``
+* ``RTE_CRYPTO_AUTH_MD5_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA1``
+* ``RTE_CRYPTO_AUTH_SHA1_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA224``
+* ``RTE_CRYPTO_AUTH_SHA224_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA256``
+* ``RTE_CRYPTO_AUTH_SHA256_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA384``
+* ``RTE_CRYPTO_AUTH_SHA384_HMAC``
+* ``RTE_CRYPTO_AUTH_SHA512``
+* ``RTE_CRYPTO_AUTH_SHA512_HMAC``
+
Test steps
---
diff --git a/drivers/crypto/uadk/uadk_crypto_pmd.c
b/drivers/crypto/uadk/uadk_crypto_pmd.c
index 8e2e3b7877..a166efa36c 100644
--- a/drivers/crypto/uadk/uadk_crypto_pmd.c
+++ b/drivers/crypto/uadk/uadk_crypto_pmd.c
@@ -33,11 +33,15 @@ struct uadk_qp {
enum uadk_chain_order {
UADK_CHAIN_ONLY_CIPHER,
+ UADK_CHAIN_ONLY_AUTH,
+ UADK_CHAIN_CIPHER_AUTH,
+ UADK_CHAIN_AUTH_CIPHER,
UADK_CHAIN_NOT_SUPPORTED
};
struct uadk_crypto_session {
handle_t handle_cipher;
+ handle_t handle_digest;
enum uadk_chain_order chain_order;
/* IV parameters */
@@ -51,6 +55,13 @@ struct uadk_crypto_session {
enum rte_crypto_cipher_operation direction;
struct wd_cipher_req req;
} cipher;
+
+ /* Authentication Parameters */
+ struct {
+ struct wd_digest_req req;
+ enum rte_crypto_auth_operation operation;
+ uint16_t digest_length;
+ } auth;
} __rte_cache_aligned;
enum uadk_crypto_version {
@@ -60,6 +71,7 @@ enum uadk_crypto_version {
struct uadk_crypto_priv {
bool env_cipher_init;
+ bool env_auth_init;
enum uadk_crypto_version version;
} __rte_cache_aligned;
@@ -73,6 +85,252 @@ RTE_LOG_REGISTER_DEFAULT(uadk_crypto_logtype, INFO);
## __VA_ARGS__)
static const struct rte_cryptodev_capabilities uadk_crypto_v2_capabilities[] =
{
+ { /* MD5 HMAC */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+ {.auth = {
+ .algo = RTE_CRYPTO_AUTH_MD5_HMAC,
+ .block_size = 64,
+ .key_size = {
+ .min = 0,
+ .max = 0,
+ .increment = 0
+ },
+ .digest_size = {
+ .min = 16,
+ .max = 16,
+ .increment = 0
+ },
+ .iv_size = { 0 }
+ }, }
+ }, }
+ },
+ { /* MD5 */
+ .op = RTE_CRYPTO_OP_TYPE_SYMMETRIC,
+ {.sym = {
+ .xform_type = RTE_CRYPTO_SYM_XFORM_AUTH,
+ {.auth = {
+ .algo = RTE_CRYPTO_AUTH_MD5,
+ .block_size = 64,
+ .key_size = {
+ .min = 0,
+ .max = 0,
+ .increment = 0
+ },
+ .digest_size = {
+ .min = 16,
+
[PATCH resend v3 6/6] test/crypto: add cryptodev_uadk_autotest
Example:
sudo dpdk-test --vdev=crypto_uadk --log-level=6
RTE>>cryptodev_uadk_autotest
RTE>>quit
Signed-off-by: Zhangfei Gao
---
app/test/test_cryptodev.c | 7 +++
app/test/test_cryptodev.h | 1 +
2 files changed, 8 insertions(+)
diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c
index c6d47a035e..3449d41cf6 100644
--- a/app/test/test_cryptodev.c
+++ b/app/test/test_cryptodev.c
@@ -16427,6 +16427,12 @@ test_cryptodev_qat(void)
return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));
}
+static int
+test_cryptodev_uadk(void)
+{
+ return run_cryptodev_testsuite(RTE_STR(CRYPTODEV_NAME_UADK_PMD));
+}
+
static int
test_cryptodev_virtio(void)
{
@@ -16770,6 +16776,7 @@ REGISTER_TEST_COMMAND(cryptodev_sw_mvsam_autotest,
test_cryptodev_mrvl);
REGISTER_TEST_COMMAND(cryptodev_dpaa2_sec_autotest, test_cryptodev_dpaa2_sec);
REGISTER_TEST_COMMAND(cryptodev_dpaa_sec_autotest, test_cryptodev_dpaa_sec);
REGISTER_TEST_COMMAND(cryptodev_ccp_autotest, test_cryptodev_ccp);
+REGISTER_TEST_COMMAND(cryptodev_uadk_autotest, test_cryptodev_uadk);
REGISTER_TEST_COMMAND(cryptodev_virtio_autotest, test_cryptodev_virtio);
REGISTER_TEST_COMMAND(cryptodev_octeontx_autotest, test_cryptodev_octeontx);
REGISTER_TEST_COMMAND(cryptodev_caam_jr_autotest, test_cryptodev_caam_jr);
diff --git a/app/test/test_cryptodev.h b/app/test/test_cryptodev.h
index 29a7d4db2b..abd795f54a 100644
--- a/app/test/test_cryptodev.h
+++ b/app/test/test_cryptodev.h
@@ -74,6 +74,7 @@
#define CRYPTODEV_NAME_CN9K_PMDcrypto_cn9k
#define CRYPTODEV_NAME_CN10K_PMD crypto_cn10k
#define CRYPTODEV_NAME_MLX5_PMDcrypto_mlx5
+#define CRYPTODEV_NAME_UADK_PMDcrypto_uadk
enum cryptodev_api_test_type {
--
2.36.1
[PATCH v3] net/iavf: fix error of virtchnl command
When the device is bonded, bond pmd will register callback for LSC event.
This callback will execute some virtchnl commands in eal-intr-thread to
reinitialize the device with interrupts disabled. In this case, responses
to all commands not be received.
This commit starts a thread to handle all events to fix this issue.
Fixes: 48de41ca11f0 ("net/avf: enable link status update")
CC: sta...@dpdk.org
Signed-off-by: Yiding Zhou
---
v3: fix CI errors
---
drivers/net/iavf/iavf.h| 2 +
drivers/net/iavf/iavf_ethdev.c | 5 ++
drivers/net/iavf/iavf_vchnl.c | 136 -
3 files changed, 142 insertions(+), 1 deletion(-)
diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h
index 26b858f6f0..1edebab8dc 100644
--- a/drivers/net/iavf/iavf.h
+++ b/drivers/net/iavf/iavf.h
@@ -424,6 +424,8 @@ _atomic_set_async_response_cmd(struct iavf_info *vf, enum
virtchnl_ops ops)
}
int iavf_check_api_version(struct iavf_adapter *adapter);
int iavf_get_vf_resource(struct iavf_adapter *adapter);
+void iavf_dev_event_handler_fini(void);
+int iavf_dev_event_handler_init(void);
void iavf_handle_virtchnl_msg(struct rte_eth_dev *dev);
int iavf_enable_vlan_strip(struct iavf_adapter *adapter);
int iavf_disable_vlan_strip(struct iavf_adapter *adapter);
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 782be82c7f..633d684804 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -2631,6 +2631,9 @@ iavf_dev_init(struct rte_eth_dev *eth_dev)
rte_ether_addr_copy((struct rte_ether_addr *)hw->mac.addr,
ð_dev->data->mac_addrs[0]);
+ if (iavf_dev_event_handler_init())
+ goto init_vf_err;
+
if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) {
/* register callback func to eal lib */
rte_intr_callback_register(pci_dev->intr_handle,
@@ -2785,6 +2788,8 @@ iavf_dev_uninit(struct rte_eth_dev *dev)
iavf_dev_close(dev);
+ iavf_dev_event_handler_fini();
+
return 0;
}
diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c
index 0fa2617cd2..35ceccaedd 100644
--- a/drivers/net/iavf/iavf_vchnl.c
+++ b/drivers/net/iavf/iavf_vchnl.c
@@ -2,6 +2,7 @@
* Copyright(c) 2017 Intel Corporation
*/
+#include
#include
#include
#include
@@ -11,6 +12,7 @@
#include
#include
#include
+#include
#include
#include
@@ -27,6 +29,138 @@
#define MAX_TRY_TIMES 2000
#define ASQ_DELAY_MS 1
+#define MAX_EVENT_PENDING 16
+
+struct iavf_arq_event_element {
+ TAILQ_ENTRY(iavf_arq_event_element) next;
+ struct rte_eth_dev *dev;
+ enum rte_eth_event_type event;
+ void *param;
+};
+
+struct iavf_event_handler {
+ rte_atomic32_t ndev;
+ pthread_t tid;
+ int fd[2];
+ pthread_mutex_t lock;
+ TAILQ_HEAD(event_lsit, iavf_arq_event_element) pending;
+};
+
+static struct iavf_event_handler event_handler = {
+ .fd = {-1, -1},
+};
+
+#ifndef TAILQ_FOREACH_SAFE
+#define TAILQ_FOREACH_SAFE(var, head, field, tvar) \
+ for ((var) = TAILQ_FIRST((head)); \
+ (var) && ((tvar) = TAILQ_NEXT((var), field), 1); \
+ (var) = (tvar))
+#endif
+
+static void *
+iavf_dev_event_handle(void *param __rte_unused)
+{
+ struct iavf_event_handler *handler = &event_handler;
+ TAILQ_HEAD(event_list, iavf_arq_event_element) pending;
+
+ while (true) {
+ char unused[MAX_EVENT_PENDING];
+ ssize_t nr = read(handler->fd[0], &unused, sizeof(unused));
+ if (nr <= 0)
+ break;
+
+ TAILQ_INIT(&pending);
+ pthread_mutex_lock(&handler->lock);
+ TAILQ_CONCAT(&pending, &handler->pending, next);
+ pthread_mutex_unlock(&handler->lock);
+
+ struct iavf_arq_event_element *pos, *save_next;
+ TAILQ_FOREACH_SAFE(pos, &pending, next, save_next) {
+ TAILQ_REMOVE(&pending, pos, next);
+ rte_eth_dev_callback_process(pos->dev, pos->event,
pos->param);
+ rte_free(pos);
+ }
+ }
+ return NULL;
+}
+
+static void
+iavf_dev_event_post(struct rte_eth_dev *dev,
+ enum rte_eth_event_type event,
+ void *param)
+{
+ struct iavf_event_handler *handler = &event_handler;
+ char notify_byte;
+ struct iavf_arq_event_element *elem = rte_malloc(NULL, sizeof(*elem),
0);
+ if (!elem)
+ return;
+
+ elem->dev = dev;
+ elem->event = event;
+ elem->param = param;
+
+ pthread_mutex_lock(&handler->lock);
+ TAILQ_INSERT_TAIL(&handler->pending, elem, next);
+ pthread_mutex_unlock(&handler->lock);
+
+ ssize_t nw = write(handler->fd[1], ¬ify_byte, 1);
+ RTE_SET_USED(nw);
+}
+
+int
+iavf_dev_event_handler_init(void)
+{
+ struct iav
[PATCH v8 0/8] app/procinfo: add some extended features
Thiss patchset is to add some extended features for dpdk-proc-info. Thanks to Reshma and Stephen help to review the patchset. v7(v4)->v8: - Add Acked-by: Reshma Pattan for PATCH 4,6. - add Rx/Tx descriptor dump. - adjust procinfo doc guide. v3->v4: - Add Acked-by: Reshma Pattan for PATCH 1,2,3,5,7. - Rename show-module-info to show-module-eeprom to make more clear. v2->v3: Fix some comments from Stephen. - Use --version option for DPDK version. - add --firmware-version option to show firmware. - Use errors on stderr, not stdout. - Delete some unnecessary code. v1->v2: Fix some comments from Reshma. Dongdong Liu (4): app/procinfo: add firmware version dump app/procinfo: fix some wrong doxygen syntax app/procinfo: support descriptor dump doc: add some extended features in procinfo guide Jie Hai (1): app/procinfo: add dump of Rx/Tx burst mode Min Hu (Connor) (3): app/procinfo: add dpdk version dump app/procinfo: add RSS RETA dump app/procinfo: add module eeprom info dump app/proc-info/main.c | 301 ++--- doc/guides/tools/proc_info.rst | 36 +++- 2 files changed, 313 insertions(+), 24 deletions(-) -- 2.22.0
[PATCH v8 1/8] app/procinfo: add dpdk version dump
From: "Min Hu (Connor)"
Add support for dump dpdk version.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --version
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index d52ac8a038..d459c706d1 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
/* Maximum long option length for option parsing. */
#define MAX_LONG_OPT_SZ 64
@@ -102,6 +103,8 @@ static char *mempool_iter_name;
/**< Enable dump regs. */
static uint32_t enable_dump_regs;
static char *dump_regs_file_prefix;
+/* Enable show DPDK version. */
+static uint32_t enable_shw_version;
/**< display usage */
static void
@@ -130,6 +133,7 @@ proc_info_usage(const char *prgname)
" --show-crypto: to display crypto information\n"
" --show-ring[=name]: to display ring information\n"
" --show-mempool[=name]: to display mempool information\n"
+ " --version: to display DPDK version\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -242,6 +246,7 @@ proc_info_parse_args(int argc, char **argv)
{"show-mempool", optional_argument, NULL, 0},
{"iter-mempool", required_argument, NULL, 0},
{"dump-regs", required_argument, NULL, 0},
+ {"version", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -313,7 +318,9 @@ proc_info_parse_args(int argc, char **argv)
"dump-regs", MAX_LONG_OPT_SZ)) {
enable_dump_regs = 1;
dump_regs_file_prefix = optarg;
- }
+ } else if (!strncmp(long_option[option_index].name,
+ "version", MAX_LONG_OPT_SZ))
+ enable_shw_version = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1476,6 +1483,14 @@ dump_regs(char *file_prefix)
}
}
+static void
+show_version(void)
+{
+ snprintf(bdr_str, MAX_STRING_LEN, " show - DPDK version ");
+ STATS_BDR_STR(10, bdr_str);
+ printf("DPDK version: %s\n", rte_version());
+}
+
int
main(int argc, char **argv)
{
@@ -1589,6 +1604,8 @@ main(int argc, char **argv)
iter_mempool(mempool_iter_name);
if (enable_dump_regs)
dump_regs(dump_regs_file_prefix);
+ if (enable_shw_version)
+ show_version();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v8 4/8] app/procinfo: add module eeprom info dump
From: "Min Hu (Connor)"
This patch add support for module eeprom info dump.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --show-module-eeprom
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 52
1 file changed, 52 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 4021279b17..90e7e41e38 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -48,6 +48,7 @@
#define ETHDEV_FWVERS_LEN 32
#define RTE_RETA_CONF_GROUP_NUM 32
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
+#define EEPROM_DUMP_CHUNKSIZE 1024
#define STATS_BDR_FMT ""
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
@@ -113,6 +114,8 @@ static uint32_t enable_shw_version;
static uint32_t enable_shw_fw_version;
/* Enable show RSS reta. */
static uint32_t enable_shw_rss_reta;
+/* Enable show module eeprom information. */
+static uint32_t enable_shw_module_eeprom;
/**< display usage */
static void
@@ -144,6 +147,7 @@ proc_info_usage(const char *prgname)
" --version: to display DPDK version\n"
" --firmware-version: to display ethdev firmware version\n"
" --show-rss-reta: to display ports redirection table\n"
+ " --show-module-eeprom: to display ports module eeprom
information\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -259,6 +263,7 @@ proc_info_parse_args(int argc, char **argv)
{"version", 0, NULL, 0},
{"firmware-version", 0, NULL, 0},
{"show-rss-reta", 0, NULL, 0},
+ {"show-module-eeprom", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -339,6 +344,9 @@ proc_info_parse_args(int argc, char **argv)
else if (!strncmp(long_option[option_index].name,
"show-rss-reta", MAX_LONG_OPT_SZ))
enable_shw_rss_reta = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "show-module-eeprom", MAX_LONG_OPT_SZ))
+ enable_shw_module_eeprom = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1579,6 +1587,48 @@ show_port_rss_reta_info(void)
}
}
+static void
+show_module_eeprom_info(void)
+{
+ unsigned char bytes_eeprom[EEPROM_DUMP_CHUNKSIZE];
+ struct rte_eth_dev_module_info module_info;
+ struct rte_dev_eeprom_info eeprom_info;
+ uint16_t i;
+ int ret;
+
+ RTE_ETH_FOREACH_DEV(i) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << i)) == 0)
+ continue;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " Port %u ", i);
+ STATS_BDR_STR(5, bdr_str);
+
+ ret = rte_eth_dev_get_module_info(i, &module_info);
+ if (ret != 0) {
+ fprintf(stderr, "Module EEPROM information read error:
%s\n",
+ strerror(-ret));
+ return;
+ }
+
+ eeprom_info.offset = 0;
+ eeprom_info.length = module_info.eeprom_len;
+ eeprom_info.data = bytes_eeprom;
+
+ ret = rte_eth_dev_get_module_eeprom(i, &eeprom_info);
+ if (ret != 0) {
+ fprintf(stderr, "Module EEPROM read error: %s\n",
+ strerror(-ret));
+ return;
+ }
+
+ rte_hexdump(stdout, "hexdump", eeprom_info.data,
+ eeprom_info.length);
+ printf("Finish -- Port: %u MODULE EEPROM length: %d bytes\n",
+ i, eeprom_info.length);
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -1698,6 +1748,8 @@ main(int argc, char **argv)
show_firmware_version();
if (enable_shw_rss_reta)
show_port_rss_reta_info();
+ if (enable_shw_module_eeprom)
+ show_module_eeprom_info();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v8 3/8] app/procinfo: add RSS RETA dump
From: "Min Hu (Connor)"
This patch add support for RSS reta dump.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --show-rss-reta
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 57
1 file changed, 57 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 7b407c47d0..4021279b17 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -46,6 +46,8 @@
#define MAX_STRING_LEN 256
#define ETHDEV_FWVERS_LEN 32
+#define RTE_RETA_CONF_GROUP_NUM 32
+#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define STATS_BDR_FMT ""
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
@@ -109,6 +111,8 @@ static char *dump_regs_file_prefix;
static uint32_t enable_shw_version;
/* Enable show ethdev firmware version. */
static uint32_t enable_shw_fw_version;
+/* Enable show RSS reta. */
+static uint32_t enable_shw_rss_reta;
/**< display usage */
static void
@@ -139,6 +143,7 @@ proc_info_usage(const char *prgname)
" --show-mempool[=name]: to display mempool information\n"
" --version: to display DPDK version\n"
" --firmware-version: to display ethdev firmware version\n"
+ " --show-rss-reta: to display ports redirection table\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -253,6 +258,7 @@ proc_info_parse_args(int argc, char **argv)
{"dump-regs", required_argument, NULL, 0},
{"version", 0, NULL, 0},
{"firmware-version", 0, NULL, 0},
+ {"show-rss-reta", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -330,6 +336,9 @@ proc_info_parse_args(int argc, char **argv)
else if (!strncmp(long_option[option_index].name,
"firmware-version", MAX_LONG_OPT_SZ))
enable_shw_fw_version = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "show-rss-reta", MAX_LONG_OPT_SZ))
+ enable_shw_rss_reta = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1524,6 +1533,52 @@ show_firmware_version(void)
}
}
+static void
+show_port_rss_reta_info(void)
+{
+ struct rte_eth_rss_reta_entry64 reta_conf[RTE_RETA_CONF_GROUP_NUM + 1];
+ struct rte_eth_dev_info dev_info;
+ uint16_t i, idx, shift;
+ uint16_t num;
+ uint16_t id;
+ int ret;
+
+ RTE_ETH_FOREACH_DEV(id) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << id)) == 0)
+ continue;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " Port %u ", id);
+ STATS_BDR_STR(5, bdr_str);
+
+ ret = rte_eth_dev_info_get(id, &dev_info);
+ if (ret != 0) {
+ fprintf(stderr, "Error getting device info: %s\n",
+ strerror(-ret));
+ return;
+ }
+
+ num = DIV_ROUND_UP(dev_info.reta_size, RTE_ETH_RETA_GROUP_SIZE);
+ memset(reta_conf, 0, sizeof(reta_conf));
+ for (i = 0; i < num; i++)
+ reta_conf[i].mask = ~0ULL;
+
+ ret = rte_eth_dev_rss_reta_query(id, reta_conf,
dev_info.reta_size);
+ if (ret != 0) {
+ fprintf(stderr, "Error getting RSS RETA info: %s\n",
+ strerror(-ret));
+ return;
+ }
+
+ for (i = 0; i < dev_info.reta_size; i++) {
+ idx = i / RTE_ETH_RETA_GROUP_SIZE;
+ shift = i % RTE_ETH_RETA_GROUP_SIZE;
+ printf("RSS RETA configuration: hash index=%u,
queue=%u\n",
+ i, reta_conf[idx].reta[shift]);
+ }
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -1641,6 +1696,8 @@ main(int argc, char **argv)
show_version();
if (enable_shw_fw_version)
show_firmware_version();
+ if (enable_shw_rss_reta)
+ show_port_rss_reta_info();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v8 2/8] app/procinfo: add firmware version dump
Add support for dump ethdev firmware version.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --firmware-version
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 35 +++
1 file changed, 35 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index d459c706d1..7b407c47d0 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -45,6 +45,8 @@
#define MAX_LONG_OPT_SZ 64
#define MAX_STRING_LEN 256
+#define ETHDEV_FWVERS_LEN 32
+
#define STATS_BDR_FMT ""
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
STATS_BDR_FMT, s, w, STATS_BDR_FMT)
@@ -105,6 +107,8 @@ static uint32_t enable_dump_regs;
static char *dump_regs_file_prefix;
/* Enable show DPDK version. */
static uint32_t enable_shw_version;
+/* Enable show ethdev firmware version. */
+static uint32_t enable_shw_fw_version;
/**< display usage */
static void
@@ -134,6 +138,7 @@ proc_info_usage(const char *prgname)
" --show-ring[=name]: to display ring information\n"
" --show-mempool[=name]: to display mempool information\n"
" --version: to display DPDK version\n"
+ " --firmware-version: to display ethdev firmware version\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -247,6 +252,7 @@ proc_info_parse_args(int argc, char **argv)
{"iter-mempool", required_argument, NULL, 0},
{"dump-regs", required_argument, NULL, 0},
{"version", 0, NULL, 0},
+ {"firmware-version", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -321,6 +327,9 @@ proc_info_parse_args(int argc, char **argv)
} else if (!strncmp(long_option[option_index].name,
"version", MAX_LONG_OPT_SZ))
enable_shw_version = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "firmware-version", MAX_LONG_OPT_SZ))
+ enable_shw_fw_version = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1491,6 +1500,30 @@ show_version(void)
printf("DPDK version: %s\n", rte_version());
}
+static void
+show_firmware_version(void)
+{
+ char fw_version[ETHDEV_FWVERS_LEN];
+ uint16_t i;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " show - firmware version ");
+ STATS_BDR_STR(10, bdr_str);
+
+ RTE_ETH_FOREACH_DEV(i) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << i)) == 0)
+ continue;
+
+ if (rte_eth_dev_fw_version_get(i, fw_version,
+ ETHDEV_FWVERS_LEN) == 0)
+ printf("Ethdev port %u firmware version: %s\n", i,
+ fw_version);
+ else
+ printf("Ethdev port %u firmware version: %s\n", i,
+ "not available");
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -1606,6 +1639,8 @@ main(int argc, char **argv)
dump_regs(dump_regs_file_prefix);
if (enable_shw_version)
show_version();
+ if (enable_shw_fw_version)
+ show_firmware_version();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v8 5/8] app/procinfo: add dump of Rx/Tx burst mode
From: Jie Hai
Add dump of Rx/Tx burst mode in --show-port.
Sample output changes:
- rx queue
- -- 0 descriptors 0/1024 drop_en rx buffer size 2048 \
mempool mb_pool_0 socket 0
+ -- 0 descriptors 0/1024 drop_en rx buffer size 2048 \
mempool mb_pool_0 socket 0 burst mode : Vector Neon
- tx queue
- -- 0 descriptors 1024 thresh 32/928 \
offloads : MBUF_FAST_FREE
+ -- 0 descriptors 1024 thresh 32/928 \
offloads : MBUF_FAST_FREE burst mode : Scalar
Signed-off-by: Jie Hai
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 90e7e41e38..67217ab68b 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -845,6 +845,7 @@ show_port(void)
for (j = 0; j < dev_info.nb_rx_queues; j++) {
struct rte_eth_rxq_info queue_info;
+ struct rte_eth_burst_mode mode;
int count;
ret = rte_eth_rx_queue_info_get(i, j, &queue_info);
@@ -880,11 +881,18 @@ show_port(void)
if (queue_info.conf.offloads != 0)
show_offloads(queue_info.conf.offloads,
rte_eth_dev_rx_offload_name);
+ if (rte_eth_rx_burst_mode_get(i, j, &mode) == 0)
+ printf(" burst mode : %s%s",
+ mode.info,
+ mode.flags &
RTE_ETH_BURST_FLAG_PER_QUEUE ?
+ " (per queue)" : "");
+
printf("\n");
}
for (j = 0; j < dev_info.nb_tx_queues; j++) {
struct rte_eth_txq_info queue_info;
+ struct rte_eth_burst_mode mode;
ret = rte_eth_tx_queue_info_get(i, j, &queue_info);
if (ret != 0)
@@ -905,6 +913,13 @@ show_port(void)
if (queue_info.conf.offloads != 0)
show_offloads(queue_info.conf.offloads,
rte_eth_dev_tx_offload_name);
+
+ if (rte_eth_tx_burst_mode_get(i, j, &mode) == 0)
+ printf(" burst mode : %s%s",
+ mode.info,
+ mode.flags &
RTE_ETH_BURST_FLAG_PER_QUEUE ?
+ " (per queue)" : "");
+
printf("\n");
}
--
2.22.0
[PATCH v8 6/8] app/procinfo: fix some wrong doxygen syntax
This code is to do cleanup for the wrong doxygen syntax comments
The DPDK API is documented using doxygen comment annotations in the
header files. The procinfo code seems no need to use doxygen comment.
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 40
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 67217ab68b..fe8285d2ce 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -54,33 +54,33 @@
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
STATS_BDR_FMT, s, w, STATS_BDR_FMT)
-/**< mask of enabled ports */
+/* mask of enabled ports */
static unsigned long enabled_port_mask;
-/**< Enable stats. */
+/* Enable stats. */
static uint32_t enable_stats;
-/**< Enable xstats. */
+/* Enable xstats. */
static uint32_t enable_xstats;
-/**< Enable collectd format*/
+/* Enable collectd format */
static uint32_t enable_collectd_format;
-/**< FD to send collectd format messages to STDOUT*/
+/* FD to send collectd format messages to STDOUT */
static int stdout_fd;
-/**< Host id process is running on */
+/* Host id process is running on */
static char host_id[MAX_LONG_OPT_SZ];
#ifdef RTE_LIB_METRICS
-/**< Enable metrics. */
+/* Enable metrics. */
static uint32_t enable_metrics;
#endif
-/**< Enable stats reset. */
+/* Enable stats reset. */
static uint32_t reset_stats;
-/**< Enable xstats reset. */
+/* Enable xstats reset. */
static uint32_t reset_xstats;
-/**< Enable memory info. */
+/* Enable memory info. */
static uint32_t mem_info;
-/**< Enable displaying xstat name. */
+/* Enable displaying xstat name. */
static uint32_t enable_xstats_name;
static char *xstats_name;
-/**< Enable xstats by ids. */
+/* Enable xstats by ids. */
#define MAX_NB_XSTATS_IDS 1024
static uint32_t nb_xstats_ids;
static uint64_t xstats_ids[MAX_NB_XSTATS_IDS];
@@ -88,24 +88,24 @@ static uint64_t xstats_ids[MAX_NB_XSTATS_IDS];
/* show border */
static char bdr_str[MAX_STRING_LEN];
-/**< Enable show port. */
+/* Enable show port. */
static uint32_t enable_shw_port;
/* Enable show port private info. */
static uint32_t enable_shw_port_priv;
-/**< Enable show tm. */
+/* Enable show tm. */
static uint32_t enable_shw_tm;
-/**< Enable show crypto. */
+/* Enable show crypto. */
static uint32_t enable_shw_crypto;
-/**< Enable show ring. */
+/* Enable show ring. */
static uint32_t enable_shw_ring;
static char *ring_name;
-/**< Enable show mempool. */
+/* Enable show mempool. */
static uint32_t enable_shw_mempool;
static char *mempool_name;
-/**< Enable iter mempool. */
+/* Enable iter mempool. */
static uint32_t enable_iter_mempool;
static char *mempool_iter_name;
-/**< Enable dump regs. */
+/* Enable dump regs. */
static uint32_t enable_dump_regs;
static char *dump_regs_file_prefix;
/* Enable show DPDK version. */
@@ -117,7 +117,7 @@ static uint32_t enable_shw_rss_reta;
/* Enable show module eeprom information. */
static uint32_t enable_shw_module_eeprom;
-/**< display usage */
+/* display usage */
static void
proc_info_usage(const char *prgname)
{
--
2.22.0
[PATCH v8 7/8] app/procinfo: support descriptor dump
This patch support Rx/Tx descriptor dump
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx --
--show-rx-descriptor queue_id:offset:num
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx --
--show-tx-descriptor queue_id:offset:num
queue_id: A queue identifier on this port.
offset: The offset of the descriptor starting from tail.
num: The number of the descriptors to dump.
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
---
app/proc-info/main.c | 81
1 file changed, 81 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index fe8285d2ce..1558f4b7d1 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -54,6 +54,9 @@
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
STATS_BDR_FMT, s, w, STATS_BDR_FMT)
+typedef int (*desc_dump_t)(uint16_t port_id, uint16_t queue_id,
+ uint16_t offset, uint16_t num, FILE *file);
+
/* mask of enabled ports */
static unsigned long enabled_port_mask;
/* Enable stats. */
@@ -117,6 +120,21 @@ static uint32_t enable_shw_rss_reta;
/* Enable show module eeprom information. */
static uint32_t enable_shw_module_eeprom;
+/* Enable dump Rx/Tx descriptor. */
+static uint32_t enable_shw_rx_desc_dump;
+static uint32_t enable_shw_tx_desc_dump;
+
+#define DESC_PARAM_NUM 3
+
+struct desc_param {
+ uint16_t queue_id; /* A queue identifier on this port. */
+ uint16_t offset; /* The offset of the descriptor starting from tail.
*/
+ uint16_t num; /* The number of the descriptors to dump. */
+};
+
+static struct desc_param rx_desc_param;
+static struct desc_param tx_desc_param;
+
/* display usage */
static void
proc_info_usage(const char *prgname)
@@ -148,6 +166,14 @@ proc_info_usage(const char *prgname)
" --firmware-version: to display ethdev firmware version\n"
" --show-rss-reta: to display ports redirection table\n"
" --show-module-eeprom: to display ports module eeprom
information\n"
+ " --show-rx-descriptor queue_id:offset:num to display ports Rx
descriptor information. "
+ "queue_id: A Rx queue identifier on this port. "
+ "offset: The offset of the descriptor starting from
tail. "
+ "num: The number of the descriptors to dump.\n"
+ " --show-tx-descriptor queue_id:offset:num to display ports Tx
descriptor information. "
+ "queue_id: A Tx queue identifier on this port. "
+ "offset: The offset of the descriptor starting from
tail. "
+ "num: The number of the descriptors to dump.\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -200,6 +226,20 @@ parse_xstats_ids(char *list, uint64_t *ids, int limit) {
return length;
}
+static int
+parse_descriptor_param(char *list, struct desc_param *desc)
+{
+ int ret;
+
+ ret = sscanf(list, "%hu:%hu:%hu", &desc->queue_id, &desc->offset,
+&desc->num);
+ if (ret != DESC_PARAM_NUM) {
+ return -EINVAL;
+ }
+
+ return 0;
+}
+
static int
proc_info_preparse_args(int argc, char **argv)
{
@@ -264,6 +304,8 @@ proc_info_parse_args(int argc, char **argv)
{"firmware-version", 0, NULL, 0},
{"show-rss-reta", 0, NULL, 0},
{"show-module-eeprom", 0, NULL, 0},
+ {"show-rx-descriptor", required_argument, NULL, 1},
+ {"show-tx-descriptor", required_argument, NULL, 1},
{NULL, 0, 0, 0}
};
@@ -367,6 +409,24 @@ proc_info_parse_args(int argc, char **argv)
return -1;
}
nb_xstats_ids = ret;
+ } else if (!strncmp(long_option[option_index].name,
+ "show-rx-descriptor", MAX_LONG_OPT_SZ)) {
+ int ret = parse_descriptor_param(optarg,
+ &rx_desc_param);
+ if (ret < 0) {
+ printf("Rx descriptor param parse
error.\n");
+ return -1;
+ }
+ enable_shw_rx_desc_dump = 1;
+ } else if (!strncmp(long_option[option_index].name,
+ "show-tx-descriptor", MAX_LONG_OPT_SZ)) {
+ int ret = parse_descriptor_param(optarg,
+ &tx_desc_param);
+ if (ret < 0) {
+ printf("Tx descripto
[PATCH v8 8/8] doc: add some extended features in procinfo guide
Add the below extended features in procinfo guide. --show-port-private --version --firmware-version --show-rss-reta --show-module-eeprom --show-rx-descriptor --show-tx-descriptor Signed-off-by: Dongdong Liu Acked-by: Reshma Pattan --- doc/guides/tools/proc_info.rst | 36 -- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 9772d97ef0..ceb069f55e 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,9 +17,12 @@ The application has a number of command line options: .. code-block:: console - .//app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + .//app/dpdk-proc-info -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | - --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] + --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name | + --show-port-private | --version | --firmware-version | --show-rss-reta | + --show-module-eeprom | --show-rx-descriptor queue_id:offset:num | + --show-rx-descriptor queue_id:offset:num] Parameters ~~ @@ -69,6 +72,35 @@ mempool. For invalid or no mempool name, whole list is dump. The iter-mempool parameter iterates and displays mempool elements specified by name. For invalid or no mempool name no elements are displayed. +**--show-port-private** +The show-port-private parameter displays ports private information. + +**--version** +The version parameter displays DPDK version. + +**--firmware-version** +The firmware-version parameter displays ethdev firmware version. + +**--show-rss-reta** +The show-rss-reta parameter displays ports rss redirection table. + +**--show-module-eeprom** +The show-module-eeprom parameter displays ports module eeprom information. + +**--show-rx-descriptor queue_id:offset:num** +The show-rx-descriptor parameter displays ports Rx descriptor information +specfied by queue_id, offset and num. +queue_id: A Rx queue identifier on this port. +offset: The offset of the descriptor starting from tail. +num: The number of the descriptors to dump. + +**--show-tx-descriptor queue_id:offset:num** +The show-tx-descriptor parameter displays ports Tx descriptor information +specfied by queue_id, offset and num. +queue_id: A Tx queue identifier on this port. +offset: The offset of the descriptor starting from tail. +num: The number of the descriptors to dump. + Limitations --- -- 2.22.0
Re: [PATCH v5 3/3] app/procinfo: support descriptor dump
Hi Reshma
Many thanks for your review.
I have sent out the below patchset. this patchset have fixed the comments.
[v8,7/8] app/procinfo: support descriptor dump
https://patches.dpdk.org/project/dpdk/list/?series=25047
Thanks,
Dongdong.
On 2022/10/7 22:43, Pattan, Reshma wrote:
-Original Message-
+/* Enable dump Rx/Tx descriptor. */
+#define DESC_PARAM_NUM 3
+
+struct desc_param {
+ uint16_t queue_id; /* A queue identifier on this port. */
+ uint16_t offset;/* The offset of the descriptor starting from tail.
*/
+ uint16_t num; /* The number of the descriptors to dump. */
+ bool valid;
You don't need to keep if the descriptor parameters are valid or not, as you
are exiting the application when you see invalid parameters are entered by user.
+static int
+parse_descriptor_param(char *list, struct desc_param *desc) {
+ int ret;
+
+ ret = sscanf(list, "%hu:%hu:%hu", &desc->queue_id, &desc->offset,
+&desc->num);
+ if (ret != DESC_PARAM_NUM) {
+ desc->valid = false;
+ return -EINVAL;
On error return application is exiting , so no need to maintain desc->valid
main(int argc, char **argv)
{
@@ -1564,6 +1638,12 @@ main(int argc, char **argv)
metrics_display(i);
#endif
+ if (rx_desc_param.valid)
So if rx_desc dump is requested in command line you can set some global variable like
"enable-show-rx-desc-dump" and display below info only if that variable is set.
So we no need to use valid here.
+ nic_descriptor_display(i, &rx_desc_param,
+ rte_eth_rx_descriptor_dump);
+ if (tx_desc_param.valid)
Same here as above comment.
.
[PATCH v9 0/8] app/procinfo: add some extended features
This patchset is to add some extended features for dpdk-proc-info. Thanks to Reshma and Stephen help to review the patchset. v8->v9: - Fixed some checkpatch warnings. v7(v4)->v8: - Add Acked-by: Reshma Pattan for PATCH 4,6. - Add Rx/Tx descriptor dump. - Adjust procinfo doc guide. v3->v4: - Add Acked-by: Reshma Pattan for PATCH 1,2,3,5,7. - Rename show-module-info to show-module-eeprom to make more clear. v2->v3: Fix some comments from Stephen. - Use --version option for DPDK version. - Add --firmware-version option to show firmware. - Use errors on stderr, not stdout. - Delete some unnecessary code. v1->v2: Fix some comments from Reshma. Dongdong Liu (4): app/procinfo: add firmware version dump app/procinfo: fix some wrong doxygen syntax app/procinfo: support descriptor dump doc: add some extended features in procinfo guide Jie Hai (1): app/procinfo: add dump of Rx/Tx burst mode Min Hu (Connor) (3): app/procinfo: add dpdk version dump app/procinfo: add RSS RETA dump app/procinfo: add module eeprom info dump app/proc-info/main.c | 300 ++--- doc/guides/tools/proc_info.rst | 36 +++- 2 files changed, 312 insertions(+), 24 deletions(-) -- 2.22.0
[PATCH v9 1/8] app/procinfo: add dpdk version dump
From: "Min Hu (Connor)"
Add support for dump dpdk version.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --version
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 19 ++-
1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index d52ac8a038..d459c706d1 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -39,6 +39,7 @@
#include
#include
#include
+#include
/* Maximum long option length for option parsing. */
#define MAX_LONG_OPT_SZ 64
@@ -102,6 +103,8 @@ static char *mempool_iter_name;
/**< Enable dump regs. */
static uint32_t enable_dump_regs;
static char *dump_regs_file_prefix;
+/* Enable show DPDK version. */
+static uint32_t enable_shw_version;
/**< display usage */
static void
@@ -130,6 +133,7 @@ proc_info_usage(const char *prgname)
" --show-crypto: to display crypto information\n"
" --show-ring[=name]: to display ring information\n"
" --show-mempool[=name]: to display mempool information\n"
+ " --version: to display DPDK version\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -242,6 +246,7 @@ proc_info_parse_args(int argc, char **argv)
{"show-mempool", optional_argument, NULL, 0},
{"iter-mempool", required_argument, NULL, 0},
{"dump-regs", required_argument, NULL, 0},
+ {"version", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -313,7 +318,9 @@ proc_info_parse_args(int argc, char **argv)
"dump-regs", MAX_LONG_OPT_SZ)) {
enable_dump_regs = 1;
dump_regs_file_prefix = optarg;
- }
+ } else if (!strncmp(long_option[option_index].name,
+ "version", MAX_LONG_OPT_SZ))
+ enable_shw_version = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1476,6 +1483,14 @@ dump_regs(char *file_prefix)
}
}
+static void
+show_version(void)
+{
+ snprintf(bdr_str, MAX_STRING_LEN, " show - DPDK version ");
+ STATS_BDR_STR(10, bdr_str);
+ printf("DPDK version: %s\n", rte_version());
+}
+
int
main(int argc, char **argv)
{
@@ -1589,6 +1604,8 @@ main(int argc, char **argv)
iter_mempool(mempool_iter_name);
if (enable_dump_regs)
dump_regs(dump_regs_file_prefix);
+ if (enable_shw_version)
+ show_version();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v9 2/8] app/procinfo: add firmware version dump
Add support for dump ethdev firmware version.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --firmware-version
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 35 +++
1 file changed, 35 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index d459c706d1..7b407c47d0 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -45,6 +45,8 @@
#define MAX_LONG_OPT_SZ 64
#define MAX_STRING_LEN 256
+#define ETHDEV_FWVERS_LEN 32
+
#define STATS_BDR_FMT ""
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
STATS_BDR_FMT, s, w, STATS_BDR_FMT)
@@ -105,6 +107,8 @@ static uint32_t enable_dump_regs;
static char *dump_regs_file_prefix;
/* Enable show DPDK version. */
static uint32_t enable_shw_version;
+/* Enable show ethdev firmware version. */
+static uint32_t enable_shw_fw_version;
/**< display usage */
static void
@@ -134,6 +138,7 @@ proc_info_usage(const char *prgname)
" --show-ring[=name]: to display ring information\n"
" --show-mempool[=name]: to display mempool information\n"
" --version: to display DPDK version\n"
+ " --firmware-version: to display ethdev firmware version\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -247,6 +252,7 @@ proc_info_parse_args(int argc, char **argv)
{"iter-mempool", required_argument, NULL, 0},
{"dump-regs", required_argument, NULL, 0},
{"version", 0, NULL, 0},
+ {"firmware-version", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -321,6 +327,9 @@ proc_info_parse_args(int argc, char **argv)
} else if (!strncmp(long_option[option_index].name,
"version", MAX_LONG_OPT_SZ))
enable_shw_version = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "firmware-version", MAX_LONG_OPT_SZ))
+ enable_shw_fw_version = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1491,6 +1500,30 @@ show_version(void)
printf("DPDK version: %s\n", rte_version());
}
+static void
+show_firmware_version(void)
+{
+ char fw_version[ETHDEV_FWVERS_LEN];
+ uint16_t i;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " show - firmware version ");
+ STATS_BDR_STR(10, bdr_str);
+
+ RTE_ETH_FOREACH_DEV(i) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << i)) == 0)
+ continue;
+
+ if (rte_eth_dev_fw_version_get(i, fw_version,
+ ETHDEV_FWVERS_LEN) == 0)
+ printf("Ethdev port %u firmware version: %s\n", i,
+ fw_version);
+ else
+ printf("Ethdev port %u firmware version: %s\n", i,
+ "not available");
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -1606,6 +1639,8 @@ main(int argc, char **argv)
dump_regs(dump_regs_file_prefix);
if (enable_shw_version)
show_version();
+ if (enable_shw_fw_version)
+ show_firmware_version();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v9 3/8] app/procinfo: add RSS RETA dump
From: "Min Hu (Connor)"
This patch add support for RSS reta dump.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --show-rss-reta
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 57
1 file changed, 57 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 7b407c47d0..4021279b17 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -46,6 +46,8 @@
#define MAX_STRING_LEN 256
#define ETHDEV_FWVERS_LEN 32
+#define RTE_RETA_CONF_GROUP_NUM 32
+#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#define STATS_BDR_FMT ""
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
@@ -109,6 +111,8 @@ static char *dump_regs_file_prefix;
static uint32_t enable_shw_version;
/* Enable show ethdev firmware version. */
static uint32_t enable_shw_fw_version;
+/* Enable show RSS reta. */
+static uint32_t enable_shw_rss_reta;
/**< display usage */
static void
@@ -139,6 +143,7 @@ proc_info_usage(const char *prgname)
" --show-mempool[=name]: to display mempool information\n"
" --version: to display DPDK version\n"
" --firmware-version: to display ethdev firmware version\n"
+ " --show-rss-reta: to display ports redirection table\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -253,6 +258,7 @@ proc_info_parse_args(int argc, char **argv)
{"dump-regs", required_argument, NULL, 0},
{"version", 0, NULL, 0},
{"firmware-version", 0, NULL, 0},
+ {"show-rss-reta", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -330,6 +336,9 @@ proc_info_parse_args(int argc, char **argv)
else if (!strncmp(long_option[option_index].name,
"firmware-version", MAX_LONG_OPT_SZ))
enable_shw_fw_version = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "show-rss-reta", MAX_LONG_OPT_SZ))
+ enable_shw_rss_reta = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1524,6 +1533,52 @@ show_firmware_version(void)
}
}
+static void
+show_port_rss_reta_info(void)
+{
+ struct rte_eth_rss_reta_entry64 reta_conf[RTE_RETA_CONF_GROUP_NUM + 1];
+ struct rte_eth_dev_info dev_info;
+ uint16_t i, idx, shift;
+ uint16_t num;
+ uint16_t id;
+ int ret;
+
+ RTE_ETH_FOREACH_DEV(id) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << id)) == 0)
+ continue;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " Port %u ", id);
+ STATS_BDR_STR(5, bdr_str);
+
+ ret = rte_eth_dev_info_get(id, &dev_info);
+ if (ret != 0) {
+ fprintf(stderr, "Error getting device info: %s\n",
+ strerror(-ret));
+ return;
+ }
+
+ num = DIV_ROUND_UP(dev_info.reta_size, RTE_ETH_RETA_GROUP_SIZE);
+ memset(reta_conf, 0, sizeof(reta_conf));
+ for (i = 0; i < num; i++)
+ reta_conf[i].mask = ~0ULL;
+
+ ret = rte_eth_dev_rss_reta_query(id, reta_conf,
dev_info.reta_size);
+ if (ret != 0) {
+ fprintf(stderr, "Error getting RSS RETA info: %s\n",
+ strerror(-ret));
+ return;
+ }
+
+ for (i = 0; i < dev_info.reta_size; i++) {
+ idx = i / RTE_ETH_RETA_GROUP_SIZE;
+ shift = i % RTE_ETH_RETA_GROUP_SIZE;
+ printf("RSS RETA configuration: hash index=%u,
queue=%u\n",
+ i, reta_conf[idx].reta[shift]);
+ }
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -1641,6 +1696,8 @@ main(int argc, char **argv)
show_version();
if (enable_shw_fw_version)
show_firmware_version();
+ if (enable_shw_rss_reta)
+ show_port_rss_reta_info();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v9 4/8] app/procinfo: add module eeprom info dump
From: "Min Hu (Connor)"
This patch add support for module eeprom info dump.
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx -- --show-module-eeprom
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 52
1 file changed, 52 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 4021279b17..90e7e41e38 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -48,6 +48,7 @@
#define ETHDEV_FWVERS_LEN 32
#define RTE_RETA_CONF_GROUP_NUM 32
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
+#define EEPROM_DUMP_CHUNKSIZE 1024
#define STATS_BDR_FMT ""
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
@@ -113,6 +114,8 @@ static uint32_t enable_shw_version;
static uint32_t enable_shw_fw_version;
/* Enable show RSS reta. */
static uint32_t enable_shw_rss_reta;
+/* Enable show module eeprom information. */
+static uint32_t enable_shw_module_eeprom;
/**< display usage */
static void
@@ -144,6 +147,7 @@ proc_info_usage(const char *prgname)
" --version: to display DPDK version\n"
" --firmware-version: to display ethdev firmware version\n"
" --show-rss-reta: to display ports redirection table\n"
+ " --show-module-eeprom: to display ports module eeprom
information\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -259,6 +263,7 @@ proc_info_parse_args(int argc, char **argv)
{"version", 0, NULL, 0},
{"firmware-version", 0, NULL, 0},
{"show-rss-reta", 0, NULL, 0},
+ {"show-module-eeprom", 0, NULL, 0},
{NULL, 0, 0, 0}
};
@@ -339,6 +344,9 @@ proc_info_parse_args(int argc, char **argv)
else if (!strncmp(long_option[option_index].name,
"show-rss-reta", MAX_LONG_OPT_SZ))
enable_shw_rss_reta = 1;
+ else if (!strncmp(long_option[option_index].name,
+ "show-module-eeprom", MAX_LONG_OPT_SZ))
+ enable_shw_module_eeprom = 1;
break;
case 1:
/* Print xstat single value given by name*/
@@ -1579,6 +1587,48 @@ show_port_rss_reta_info(void)
}
}
+static void
+show_module_eeprom_info(void)
+{
+ unsigned char bytes_eeprom[EEPROM_DUMP_CHUNKSIZE];
+ struct rte_eth_dev_module_info module_info;
+ struct rte_dev_eeprom_info eeprom_info;
+ uint16_t i;
+ int ret;
+
+ RTE_ETH_FOREACH_DEV(i) {
+ /* Skip if port is not in mask */
+ if ((enabled_port_mask & (1ul << i)) == 0)
+ continue;
+
+ snprintf(bdr_str, MAX_STRING_LEN, " Port %u ", i);
+ STATS_BDR_STR(5, bdr_str);
+
+ ret = rte_eth_dev_get_module_info(i, &module_info);
+ if (ret != 0) {
+ fprintf(stderr, "Module EEPROM information read error:
%s\n",
+ strerror(-ret));
+ return;
+ }
+
+ eeprom_info.offset = 0;
+ eeprom_info.length = module_info.eeprom_len;
+ eeprom_info.data = bytes_eeprom;
+
+ ret = rte_eth_dev_get_module_eeprom(i, &eeprom_info);
+ if (ret != 0) {
+ fprintf(stderr, "Module EEPROM read error: %s\n",
+ strerror(-ret));
+ return;
+ }
+
+ rte_hexdump(stdout, "hexdump", eeprom_info.data,
+ eeprom_info.length);
+ printf("Finish -- Port: %u MODULE EEPROM length: %d bytes\n",
+ i, eeprom_info.length);
+ }
+}
+
int
main(int argc, char **argv)
{
@@ -1698,6 +1748,8 @@ main(int argc, char **argv)
show_firmware_version();
if (enable_shw_rss_reta)
show_port_rss_reta_info();
+ if (enable_shw_module_eeprom)
+ show_module_eeprom_info();
RTE_ETH_FOREACH_DEV(i)
rte_eth_dev_close(i);
--
2.22.0
[PATCH v9 6/8] app/procinfo: fix some wrong doxygen syntax
This code is to do cleanup for the wrong doxygen syntax comments
The DPDK API is documented using doxygen comment annotations in the
header files. The procinfo code seems no need to use doxygen comment.
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 40
1 file changed, 20 insertions(+), 20 deletions(-)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 67217ab68b..fe8285d2ce 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -54,33 +54,33 @@
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
STATS_BDR_FMT, s, w, STATS_BDR_FMT)
-/**< mask of enabled ports */
+/* mask of enabled ports */
static unsigned long enabled_port_mask;
-/**< Enable stats. */
+/* Enable stats. */
static uint32_t enable_stats;
-/**< Enable xstats. */
+/* Enable xstats. */
static uint32_t enable_xstats;
-/**< Enable collectd format*/
+/* Enable collectd format */
static uint32_t enable_collectd_format;
-/**< FD to send collectd format messages to STDOUT*/
+/* FD to send collectd format messages to STDOUT */
static int stdout_fd;
-/**< Host id process is running on */
+/* Host id process is running on */
static char host_id[MAX_LONG_OPT_SZ];
#ifdef RTE_LIB_METRICS
-/**< Enable metrics. */
+/* Enable metrics. */
static uint32_t enable_metrics;
#endif
-/**< Enable stats reset. */
+/* Enable stats reset. */
static uint32_t reset_stats;
-/**< Enable xstats reset. */
+/* Enable xstats reset. */
static uint32_t reset_xstats;
-/**< Enable memory info. */
+/* Enable memory info. */
static uint32_t mem_info;
-/**< Enable displaying xstat name. */
+/* Enable displaying xstat name. */
static uint32_t enable_xstats_name;
static char *xstats_name;
-/**< Enable xstats by ids. */
+/* Enable xstats by ids. */
#define MAX_NB_XSTATS_IDS 1024
static uint32_t nb_xstats_ids;
static uint64_t xstats_ids[MAX_NB_XSTATS_IDS];
@@ -88,24 +88,24 @@ static uint64_t xstats_ids[MAX_NB_XSTATS_IDS];
/* show border */
static char bdr_str[MAX_STRING_LEN];
-/**< Enable show port. */
+/* Enable show port. */
static uint32_t enable_shw_port;
/* Enable show port private info. */
static uint32_t enable_shw_port_priv;
-/**< Enable show tm. */
+/* Enable show tm. */
static uint32_t enable_shw_tm;
-/**< Enable show crypto. */
+/* Enable show crypto. */
static uint32_t enable_shw_crypto;
-/**< Enable show ring. */
+/* Enable show ring. */
static uint32_t enable_shw_ring;
static char *ring_name;
-/**< Enable show mempool. */
+/* Enable show mempool. */
static uint32_t enable_shw_mempool;
static char *mempool_name;
-/**< Enable iter mempool. */
+/* Enable iter mempool. */
static uint32_t enable_iter_mempool;
static char *mempool_iter_name;
-/**< Enable dump regs. */
+/* Enable dump regs. */
static uint32_t enable_dump_regs;
static char *dump_regs_file_prefix;
/* Enable show DPDK version. */
@@ -117,7 +117,7 @@ static uint32_t enable_shw_rss_reta;
/* Enable show module eeprom information. */
static uint32_t enable_shw_module_eeprom;
-/**< display usage */
+/* display usage */
static void
proc_info_usage(const char *prgname)
{
--
2.22.0
[PATCH v9 5/8] app/procinfo: add dump of Rx/Tx burst mode
From: Jie Hai
Add dump of Rx/Tx burst mode in --show-port.
Sample output changes:
- rx queue
- -- 0 descriptors 0/1024 drop_en rx buffer size 2048 \
mempool mb_pool_0 socket 0
+ -- 0 descriptors 0/1024 drop_en rx buffer size 2048 \
mempool mb_pool_0 socket 0 burst mode : Vector Neon
- tx queue
- -- 0 descriptors 1024 thresh 32/928 \
offloads : MBUF_FAST_FREE
+ -- 0 descriptors 1024 thresh 32/928 \
offloads : MBUF_FAST_FREE burst mode : Scalar
Signed-off-by: Jie Hai
Signed-off-by: Dongdong Liu
Acked-by: Reshma Pattan
---
app/proc-info/main.c | 15 +++
1 file changed, 15 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index 90e7e41e38..67217ab68b 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -845,6 +845,7 @@ show_port(void)
for (j = 0; j < dev_info.nb_rx_queues; j++) {
struct rte_eth_rxq_info queue_info;
+ struct rte_eth_burst_mode mode;
int count;
ret = rte_eth_rx_queue_info_get(i, j, &queue_info);
@@ -880,11 +881,18 @@ show_port(void)
if (queue_info.conf.offloads != 0)
show_offloads(queue_info.conf.offloads,
rte_eth_dev_rx_offload_name);
+ if (rte_eth_rx_burst_mode_get(i, j, &mode) == 0)
+ printf(" burst mode : %s%s",
+ mode.info,
+ mode.flags &
RTE_ETH_BURST_FLAG_PER_QUEUE ?
+ " (per queue)" : "");
+
printf("\n");
}
for (j = 0; j < dev_info.nb_tx_queues; j++) {
struct rte_eth_txq_info queue_info;
+ struct rte_eth_burst_mode mode;
ret = rte_eth_tx_queue_info_get(i, j, &queue_info);
if (ret != 0)
@@ -905,6 +913,13 @@ show_port(void)
if (queue_info.conf.offloads != 0)
show_offloads(queue_info.conf.offloads,
rte_eth_dev_tx_offload_name);
+
+ if (rte_eth_tx_burst_mode_get(i, j, &mode) == 0)
+ printf(" burst mode : %s%s",
+ mode.info,
+ mode.flags &
RTE_ETH_BURST_FLAG_PER_QUEUE ?
+ " (per queue)" : "");
+
printf("\n");
}
--
2.22.0
[PATCH v9 7/8] app/procinfo: support descriptor dump
This patch support Rx/Tx descriptor dump
The command is like:
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx --
--show-rx-descriptor queue_id:offset:num
dpdk-proc-info -a :xx:xx.x --file-prefix=xxx --
--show-tx-descriptor queue_id:offset:num
queue_id: A queue identifier on this port.
offset: The offset of the descriptor starting from tail.
num: The number of the descriptors to dump.
Signed-off-by: Min Hu (Connor)
Signed-off-by: Dongdong Liu
---
app/proc-info/main.c | 80
1 file changed, 80 insertions(+)
diff --git a/app/proc-info/main.c b/app/proc-info/main.c
index fe8285d2ce..3ab97a0127 100644
--- a/app/proc-info/main.c
+++ b/app/proc-info/main.c
@@ -54,6 +54,9 @@
#define STATS_BDR_STR(w, s) printf("%.*s%s%.*s\n", w, \
STATS_BDR_FMT, s, w, STATS_BDR_FMT)
+typedef int (*desc_dump_t)(uint16_t port_id, uint16_t queue_id,
+ uint16_t offset, uint16_t num, FILE *file);
+
/* mask of enabled ports */
static unsigned long enabled_port_mask;
/* Enable stats. */
@@ -117,6 +120,21 @@ static uint32_t enable_shw_rss_reta;
/* Enable show module eeprom information. */
static uint32_t enable_shw_module_eeprom;
+/* Enable dump Rx/Tx descriptor. */
+static uint32_t enable_shw_rx_desc_dump;
+static uint32_t enable_shw_tx_desc_dump;
+
+#define DESC_PARAM_NUM 3
+
+struct desc_param {
+ uint16_t queue_id; /* A queue identifier on this port. */
+ uint16_t offset; /* The offset of the descriptor starting from tail.
*/
+ uint16_t num; /* The number of the descriptors to dump. */
+};
+
+static struct desc_param rx_desc_param;
+static struct desc_param tx_desc_param;
+
/* display usage */
static void
proc_info_usage(const char *prgname)
@@ -148,6 +166,14 @@ proc_info_usage(const char *prgname)
" --firmware-version: to display ethdev firmware version\n"
" --show-rss-reta: to display ports redirection table\n"
" --show-module-eeprom: to display ports module eeprom
information\n"
+ " --show-rx-descriptor queue_id:offset:num to display ports Rx
descriptor information. "
+ "queue_id: A Rx queue identifier on this port. "
+ "offset: The offset of the descriptor starting from
tail. "
+ "num: The number of the descriptors to dump.\n"
+ " --show-tx-descriptor queue_id:offset:num to display ports Tx
descriptor information. "
+ "queue_id: A Tx queue identifier on this port. "
+ "offset: The offset of the descriptor starting from
tail. "
+ "num: The number of the descriptors to dump.\n"
" --iter-mempool=name: iterate mempool elements to display
content\n"
" --dump-regs=file-prefix: dump registers to file with the
file-prefix\n",
prgname);
@@ -200,6 +226,19 @@ parse_xstats_ids(char *list, uint64_t *ids, int limit) {
return length;
}
+static int
+parse_descriptor_param(char *list, struct desc_param *desc)
+{
+ int ret;
+
+ ret = sscanf(list, "%hu:%hu:%hu", &desc->queue_id, &desc->offset,
+&desc->num);
+ if (ret != DESC_PARAM_NUM)
+ return -EINVAL;
+
+ return 0;
+}
+
static int
proc_info_preparse_args(int argc, char **argv)
{
@@ -264,6 +303,8 @@ proc_info_parse_args(int argc, char **argv)
{"firmware-version", 0, NULL, 0},
{"show-rss-reta", 0, NULL, 0},
{"show-module-eeprom", 0, NULL, 0},
+ {"show-rx-descriptor", required_argument, NULL, 1},
+ {"show-tx-descriptor", required_argument, NULL, 1},
{NULL, 0, 0, 0}
};
@@ -367,6 +408,24 @@ proc_info_parse_args(int argc, char **argv)
return -1;
}
nb_xstats_ids = ret;
+ } else if (!strncmp(long_option[option_index].name,
+ "show-rx-descriptor", MAX_LONG_OPT_SZ)) {
+ int ret = parse_descriptor_param(optarg,
+ &rx_desc_param);
+ if (ret < 0) {
+ printf("Rx descriptor param parse
error.\n");
+ return -1;
+ }
+ enable_shw_rx_desc_dump = 1;
+ } else if (!strncmp(long_option[option_index].name,
+ "show-tx-descriptor", MAX_LONG_OPT_SZ)) {
+ int ret = parse_descriptor_param(optarg,
+ &tx_desc_param);
+ if (ret < 0) {
+ printf("Tx descriptor param pars
[PATCH v9 8/8] doc: add some extended features in procinfo guide
Add the below extended features in procinfo guide. --show-port-private --version --firmware-version --show-rss-reta --show-module-eeprom --show-rx-descriptor --show-tx-descriptor Signed-off-by: Dongdong Liu Acked-by: Reshma Pattan --- doc/guides/tools/proc_info.rst | 36 -- 1 file changed, 34 insertions(+), 2 deletions(-) diff --git a/doc/guides/tools/proc_info.rst b/doc/guides/tools/proc_info.rst index 9772d97ef0..ad70bc47a5 100644 --- a/doc/guides/tools/proc_info.rst +++ b/doc/guides/tools/proc_info.rst @@ -17,9 +17,12 @@ The application has a number of command line options: .. code-block:: console - .//app/dpdk-procinfo -- -m | [-p PORTMASK] [--stats | --xstats | + .//app/dpdk-proc-info -- -m | [-p PORTMASK] [--stats | --xstats | --stats-reset | --xstats-reset] [ --show-port | --show-tm | --show-crypto | - --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name ] + --show-ring[=name] | --show-mempool[=name] | --iter-mempool=name | + --show-port-private | --version | --firmware-version | --show-rss-reta | + --show-module-eeprom | --show-rx-descriptor queue_id:offset:num | + --show-tx-descriptor queue_id:offset:num] Parameters ~~ @@ -69,6 +72,35 @@ mempool. For invalid or no mempool name, whole list is dump. The iter-mempool parameter iterates and displays mempool elements specified by name. For invalid or no mempool name no elements are displayed. +**--show-port-private** +The show-port-private parameter displays ports private information. + +**--version** +The version parameter displays DPDK version. + +**--firmware-version** +The firmware-version parameter displays ethdev firmware version. + +**--show-rss-reta** +The show-rss-reta parameter displays ports rss redirection table. + +**--show-module-eeprom** +The show-module-eeprom parameter displays ports module eeprom information. + +**--show-rx-descriptor queue_id:offset:num** +The show-rx-descriptor parameter displays ports Rx descriptor information +specified by queue_id, offset and num. +queue_id: A Rx queue identifier on this port. +offset: The offset of the descriptor starting from tail. +num: The number of the descriptors to dump. + +**--show-tx-descriptor queue_id:offset:num** +The show-tx-descriptor parameter displays ports Tx descriptor information +specified by queue_id, offset and num. +queue_id: A Tx queue identifier on this port. +offset: The offset of the descriptor starting from tail. +num: The number of the descriptors to dump. + Limitations --- -- 2.22.0
Re: [PATCH v5 0/3] support ethdev Rx/Tx descriptor dump
On 2022/10/7 0:42, Ferruh Yigit wrote: On 10/6/2022 1:05 PM, Dongdong Liu wrote: Support ethdev Rx/Tx descriptor dump by using procinfo tool. Thanks to Ferruh, Andrew and Reshma help to review the patchset. NOTE: October 1st to October 7th is China's National Day holiday. I don't have a test environment available at the moment. I will test this patchset on October 8th. Current compile is ok. I have tested the patchset and it works ok. v4->v5: - Rename the Rx/Tx descriptor dump API and provide 'offset' parameter. - Refactor procinfo dump descriptor code as Reshma suggested. v3->v4: - Modify the desc dump API to dump specified number of descriptors. - Modify the hn3 pmd implementation and procinfo part Dongdong Liu (3): ethdev: introduce ethdev desc dump API net/hns3: support Rx/Tx bd dump app/procinfo: support descriptor dump I will wait review from Reshma for procinfo, but will merge rest to make them available for -rc1, procinfo can get after -rc1, Except from procinfo patch, 3/3, Series applied to dpdk-next-net/main, thanks. Release notes and .map file order updated while merging. Thanks for the work. I have sent out the below patchset for the procinfo. [PATCH v9 0/8] app/procinfo: add some extended features https://patches.dpdk.org/project/dpdk/list/?series=25048 [v9,7/8] app/procinfo: support descriptor dump https://patches.dpdk.org/project/dpdk/patch/20221008105353.18195-8-liudongdo...@huawei.com/ Thanks, Dongdong. .
[PATCH v6 02/10] test/memarea: support memarea test
This patch supports memarea test about API rte_memarea_create and
rte_memarea_destroy.
Signed-off-by: Chengwen Feng
---
MAINTAINERS | 1 +
app/test/meson.build| 2 +
app/test/test_memarea.c | 168
3 files changed, 171 insertions(+)
create mode 100644 app/test/test_memarea.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 6c1cb637b0..7adeef31bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1566,6 +1566,7 @@ Memarea - EXPERIMENTAL
M: Chengwen Feng
F: lib/memarea
F: doc/guides/prog_guide/memarea_lib.rst
+F: app/test/test_memarea*
Membership - EXPERIMENTAL
M: Yipeng Wang
diff --git a/app/test/meson.build b/app/test/meson.build
index d5cad72116..778de8d65d 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -84,6 +84,7 @@ test_sources = files(
'test_malloc.c',
'test_malloc_perf.c',
'test_mbuf.c',
+'test_memarea.c',
'test_member.c',
'test_member_perf.c',
'test_memcpy.c',
@@ -199,6 +200,7 @@ fast_tests = [
['malloc_autotest', false, true],
['mbuf_autotest', false, true],
['mcslock_autotest', false, true],
+['memarea_autotest', true, true],
['memcpy_autotest', true, true],
['memory_autotest', false, true],
['mempool_autotest', false, true],
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
new file mode 100644
index 00..6b6612dc82
--- /dev/null
+++ b/app/test/test_memarea.c
@@ -0,0 +1,168 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2022 HiSilicon Limited
+ */
+
+#include
+#include
+
+#include "test.h"
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+static int
+test_memarea(void)
+{
+ printf("memarea not supported on Windows, skipping test\n");
+ return TEST_SKIPPED;
+}
+
+#else
+
+#include
+#include
+
+#define MEMAREA_TEST_DEFAULT_SIZE 0x1000
+
+#define MEMAREA_TEST_API_RUN(test_func) \
+ do { \
+ int ret = test_func(); \
+ if (ret < 0) { \
+ printf("%s Failed\n", #test_func); \
+ fails++; \
+ } else { \
+ printf("%s Passed\n", #test_func); \
+ } \
+ } while (0)
+
+static int fails;
+
+static void
+test_memarea_prepare(void)
+{
+ fails = 0;
+}
+
+static int
+test_memarea_retcode(void)
+{
+ return fails > 0 ? -1 : 0;
+}
+
+static void
+test_memarea_init_def_param(struct rte_memarea_param *init)
+{
+ memset(init, 0, sizeof(struct rte_memarea_param));
+ sprintf(init->name, "%s", "test-memarea");
+ init->source = RTE_MEMAREA_SOURCE_LIBC;
+ init->total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ init->mt_safe = 1;
+}
+
+static int
+test_memarea_create_bad_param(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ int i;
+
+ /* test for NULL */
+ ma = rte_memarea_create(NULL);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for invalid name */
+ memset(&init, 0, sizeof(init));
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+ memset(&init.name, 1, sizeof(init.name));
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for invalid source */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER_MEMAREA + 1;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for total_sz */
+ test_memarea_init_def_param(&init);
+ init.total_sz = 0;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for user address NULL */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for user address align invalid */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER;
+ for (i = 1; i < RTE_CACHE_LINE_SIZE; i++) {
+ init.user_addr = (void *)((uintptr_t)i);
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+ }
+
+ /* test for user memarea NULL */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER_MEMAREA;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for alg invalid */
+ test_memarea_init_def_param(&init);
+ init.alg = RTE_MEMAREA_ALG_DEFAULT + 1;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ return 0;
+}
+
+static int
+test_memarea_create_destroy(void)
+{
+ uint8_t user_buffer[MEMAREA_TEST_DEFAULT_SIZE + RTE_CACHE_LINE_SIZE];
+
[PATCH v6 01/10] memarea: introduce memarea library
The memarea library is an allocator of variable-size object which based on a memory region. This patch provides create/destroy API. Signed-off-by: Chengwen Feng --- MAINTAINERS| 5 + doc/api/doxy-api-index.md | 3 +- doc/api/doxy-api.conf.in | 1 + doc/guides/prog_guide/index.rst| 1 + doc/guides/prog_guide/memarea_lib.rst | 39 ++ doc/guides/rel_notes/release_22_11.rst | 6 + lib/eal/common/eal_common_log.c| 1 + lib/eal/include/rte_log.h | 1 + lib/memarea/memarea_private.h | 30 + lib/memarea/meson.build| 16 +++ lib/memarea/rte_memarea.c | 157 + lib/memarea/rte_memarea.h | 146 +++ lib/memarea/version.map| 12 ++ lib/meson.build| 1 + 14 files changed, 418 insertions(+), 1 deletion(-) create mode 100644 doc/guides/prog_guide/memarea_lib.rst create mode 100644 lib/memarea/memarea_private.h create mode 100644 lib/memarea/meson.build create mode 100644 lib/memarea/rte_memarea.c create mode 100644 lib/memarea/rte_memarea.h create mode 100644 lib/memarea/version.map diff --git a/MAINTAINERS b/MAINTAINERS index 3757ccc3b3..6c1cb637b0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1562,6 +1562,11 @@ F: app/test/test_lpm* F: app/test/test_func_reentrancy.c F: app/test/test_xmmt_ops.h +Memarea - EXPERIMENTAL +M: Chengwen Feng +F: lib/memarea +F: doc/guides/prog_guide/memarea_lib.rst + Membership - EXPERIMENTAL M: Yipeng Wang M: Sameh Gobriel diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index de488c7abf..24456604f8 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -62,7 +62,8 @@ The public API headers are grouped by topics: [memzone](@ref rte_memzone.h), [mempool](@ref rte_mempool.h), [malloc](@ref rte_malloc.h), - [memcpy](@ref rte_memcpy.h) + [memcpy](@ref rte_memcpy.h), + [memarea](@ref rte_memarea.h) - **timers**: [cycles](@ref rte_cycles.h), diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index f0886c3bd1..8334ebcbd6 100644 --- a/doc/api/doxy-api.conf.in +++ b/doc/api/doxy-api.conf.in @@ -53,6 +53,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \ @TOPDIR@/lib/latencystats \ @TOPDIR@/lib/lpm \ @TOPDIR@/lib/mbuf \ + @TOPDIR@/lib/memarea \ @TOPDIR@/lib/member \ @TOPDIR@/lib/mempool \ @TOPDIR@/lib/meter \ diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst index 8564883018..e9015d65e3 100644 --- a/doc/guides/prog_guide/index.rst +++ b/doc/guides/prog_guide/index.rst @@ -37,6 +37,7 @@ Programmer's Guide hash_lib toeplitz_hash_lib efd_lib +memarea_lib member_lib lpm_lib lpm6_lib diff --git a/doc/guides/prog_guide/memarea_lib.rst b/doc/guides/prog_guide/memarea_lib.rst new file mode 100644 index 00..27b280da6e --- /dev/null +++ b/doc/guides/prog_guide/memarea_lib.rst @@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2022 HiSilicon Limited + +Memarea Library +=== + +Introduction + + +The memarea library provides an allocator of variable-size objects, it is +oriented towards the application layer, which could provides 'region-based +memory management' function [1]. + +The main features are as follows: + +* The allocated object aligned at ``RTE_CACHE_LINE_SIZE`` default. + +* The memory region can be initialized from the following memory sources: + a) HEAP: e.g. invoke ``rte_malloc_socket``. b) LIBC: e.g. invoke + posix_memalign to obtain. c) User provided: it can be from e.g. + rte_extmem_xxx as long as it is available. d) User provided memarea: it can + be from another memarea. + +* It provides refcnt feature which could be useful in multi-reader scenario. + +* It supports MT-safe as long as it's specified at creation time. + +Library API Overview + + +The ``rte_memarea_create()`` function is used to create a memarea, the function +returns the pointer to the created memarea or ``NULL`` if the creation failed. + +The ``rte_memarea_destroy()`` function is used to destroy a memarea. + +Reference +- + +[1] https://en.wikipedia.org/wiki/Region-based_memory_management diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index 1cd5a39e02..b3088ff539 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -63,6 +63,12 @@ New Features In theory this implementation should work with any target based on ``LoongArch`` ISA. +* **Added memarea library.** + + The memarea library is an allocator of variable-size objects, it is oriented + towa
[PATCH v6 00/10] introduce memarea library
The memarea library is an allocator of variable-size object which based on a memory region. The main features are as follows: - The allocated object aligned at RTE_CACHE_LINE_SIZE default. - The memory region can be initialized from the following memory sources: 1. HEAP: e.g. invoke rte_malloc_socket. 2. LIBC: e.g. invoke posix_memalign. 3. User provided: it can be from e.g. rte_extmem_xxx as long as it is available. The memory's start address must be aligned to RTE_CACHE_LINE_SIZE. 4. User provided memarea: it can be from another memarea. - It provides refcnt feature which could be useful in multi-reader scenario. - It provides backup memory mechanism, the memarea could use another memarea as a backup. It will attempts to allocate object from backup memarea when the current memarea failed to allocate. Note: a) The memarea is oriented towards the application layer, which could provides 'region-based memory management' [1] function. b) The eal library also provide memory zone/heap management, but these are tied to huge pages management. [1] https://en.wikipedia.org/wiki/Region-based_memory_management Signed-off-by: Chengwen Feng Chengwen Feng (10): memarea: introduce memarea library test/memarea: support memarea test memarea: support alloc/free/update-refcnt API test/memarea: support alloc/free/update-refcnt test memarea: support dump API test/memarea: support dump test memarea: support backup memory mechanism test/memarea: support backup memory test memarea: detect memory corruption based on magic test/memarea: support no MT-safe test --- v6: * address Mattias's comments. v5: * fix 09/10 patch spell warning. v4: * repost patches as there are spread over different series in patchwork. v3: * add memory source of RTE memory. * add algorithm field to facilitate the introduction of new algorithms. * fix memarea log don't output problem. v2: * fix compile issues reported by dpdk-test-report. * address Dimitry and Jerin's comments. * add no MT-safe test. MAINTAINERS| 6 + app/test/meson.build | 2 + app/test/test_memarea.c| 420 doc/api/doxy-api-index.md | 3 +- doc/api/doxy-api.conf.in | 1 + doc/guides/prog_guide/index.rst| 1 + doc/guides/prog_guide/memarea_lib.rst | 56 doc/guides/rel_notes/release_22_11.rst | 6 + lib/eal/common/eal_common_log.c| 1 + lib/eal/include/rte_log.h | 1 + lib/memarea/memarea_private.h | 37 +++ lib/memarea/meson.build| 16 + lib/memarea/rte_memarea.c | 428 + lib/memarea/rte_memarea.h | 234 ++ lib/memarea/version.map| 16 + lib/meson.build| 1 + 16 files changed, 1228 insertions(+), 1 deletion(-) create mode 100644 app/test/test_memarea.c create mode 100644 doc/guides/prog_guide/memarea_lib.rst create mode 100644 lib/memarea/memarea_private.h create mode 100644 lib/memarea/meson.build create mode 100644 lib/memarea/rte_memarea.c create mode 100644 lib/memarea/rte_memarea.h create mode 100644 lib/memarea/version.map -- 2.17.1
[PATCH v6 06/10] test/memarea: support dump test
This patch supports rte_memarea_dump() test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index 5ace384b8a..d159e4f2ef 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -297,6 +297,38 @@ test_memarea_alloc_free(void)
return 0;
}
+static int
+test_memarea_dump(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ int ret;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test for invalid parameters */
+ ret = rte_memarea_dump(NULL, stderr, false);
+ RTE_TEST_ASSERT(ret == -EINVAL, "Expected EINVAL");
+ ret = rte_memarea_dump(ma, NULL, false);
+ RTE_TEST_ASSERT(ret == -EINVAL, "Expected EINVAL");
+
+ /* test for dump */
+ (void)rte_memarea_alloc(ma, 1, 0);
+ (void)rte_memarea_alloc(ma, 1, 0);
+ (void)rte_memarea_alloc(ma, 1, 0);
+ ret = rte_memarea_dump(ma, stderr, true);
+ RTE_TEST_ASSERT(ret == 0, "Expected ZERO");
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
static int
test_memarea(void)
{
@@ -307,6 +339,7 @@ test_memarea(void)
MEMAREA_TEST_API_RUN(test_memarea_alloc_fail);
MEMAREA_TEST_API_RUN(test_memarea_free_fail);
MEMAREA_TEST_API_RUN(test_memarea_alloc_free);
+ MEMAREA_TEST_API_RUN(test_memarea_dump);
return test_memarea_retcode();
}
--
2.17.1
[PATCH v6 03/10] memarea: support alloc/free/update-refcnt API
This patch supports rte_memarea_alloc()/rte_memarea_free()/
rte_memarea_update_refcnt() API.
Signed-off-by: Chengwen Feng
---
doc/guides/prog_guide/memarea_lib.rst | 10 ++
lib/memarea/memarea_private.h | 3 +
lib/memarea/rte_memarea.c | 141 ++
lib/memarea/rte_memarea.h | 56 ++
lib/memarea/version.map | 3 +
5 files changed, 213 insertions(+)
diff --git a/doc/guides/prog_guide/memarea_lib.rst
b/doc/guides/prog_guide/memarea_lib.rst
index 27b280da6e..97decf27de 100644
--- a/doc/guides/prog_guide/memarea_lib.rst
+++ b/doc/guides/prog_guide/memarea_lib.rst
@@ -33,6 +33,16 @@ returns the pointer to the created memarea or ``NULL`` if
the creation failed.
The ``rte_memarea_destroy()`` function is used to destroy a memarea.
+The ``rte_memarea_alloc()`` function is used to alloc one memory object from
+the memarea.
+
+The ``rte_memarea_free()`` function is used to free one memory object which
+allocated by ``rte_memarea_alloc()``.
+
+The ``rte_memarea_update_refcnt()`` function is used to update the memory
+object's reference count, if the count reaches zero, the memory object will
+be freed to memarea.
+
Reference
-
diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
index c76392d3e6..98406879b9 100644
--- a/lib/memarea/memarea_private.h
+++ b/lib/memarea/memarea_private.h
@@ -25,6 +25,9 @@ struct rte_memarea {
void*area_addr;
struct memarea_elem_list elem_list;
struct memarea_elem_list free_list;
+
+ uint64_t alloc_fails;
+ uint64_t refcnt_check_fails;
} __rte_cache_aligned;
#endif /* MEMAREA_PRIVATE_H */
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index bb0bfc2149..522092637e 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -4,6 +4,7 @@
#include
#include
+#include
#include
#include
@@ -94,6 +95,8 @@ memarea_alloc_area(const struct rte_memarea_param *init)
ptr = memarea_alloc_from_libc(init->total_sz);
else if (init->source == RTE_MEMAREA_SOURCE_USER)
ptr = init->user_addr;
+ else if (init->source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ ptr = rte_memarea_alloc(init->user_memarea, init->total_sz, 0);
if (ptr == NULL)
RTE_LOG(ERR, MEMAREA, "memarea: %s alloc memory area fail!\n",
init->name);
@@ -145,6 +148,8 @@ memarea_free_area(struct rte_memarea *ma)
rte_free(ma->area_addr);
else if (ma->init.source == RTE_MEMAREA_SOURCE_LIBC)
free(ma->area_addr);
+ else if (ma->init.source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ rte_memarea_free(ma->init.user_memarea, ma->area_addr);
}
void
@@ -155,3 +160,139 @@ rte_memarea_destroy(struct rte_memarea *ma)
memarea_free_area(ma);
rte_free(ma);
}
+
+static inline void
+memarea_lock(struct rte_memarea *ma)
+{
+ if (ma->init.mt_safe)
+ rte_spinlock_lock(&ma->lock);
+}
+
+static inline void
+memarea_unlock(struct rte_memarea *ma)
+{
+ if (ma->init.mt_safe)
+ rte_spinlock_unlock(&ma->lock);
+}
+
+static inline bool
+memarea_whether_add_node(size_t free_size, size_t need_size)
+{
+ size_t align_size = RTE_ALIGN_CEIL(need_size, RTE_CACHE_LINE_SIZE);
+ return free_size > align_size && (free_size - align_size) >
sizeof(struct memarea_elem);
+}
+
+static inline void
+memarea_add_node(struct rte_memarea *ma, struct memarea_elem *elem, size_t
need_size)
+{
+ size_t align_size = RTE_ALIGN_CEIL(need_size, RTE_CACHE_LINE_SIZE);
+ struct memarea_elem *new_elem;
+ new_elem = (struct memarea_elem *)RTE_PTR_ADD(elem, sizeof(struct
memarea_elem) +
+ align_size);
+ new_elem->size = elem->size - align_size - sizeof(struct memarea_elem);
+ new_elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
+ new_elem->refcnt = 0;
+ TAILQ_INSERT_AFTER(&ma->elem_list, elem, new_elem, elem_node);
+ TAILQ_INSERT_AFTER(&ma->free_list, elem, new_elem, free_node);
+ elem->size = align_size;
+}
+
+void *
+rte_memarea_alloc(struct rte_memarea *ma, size_t size, uint32_t cookie)
+{
+ struct memarea_elem *elem;
+ void *ptr = NULL;
+
+ if (unlikely(ma == NULL || size == 0))
+ return NULL;
+
+ memarea_lock(ma);
+ TAILQ_FOREACH(elem, &ma->free_list, free_node) {
+ if (elem->size < size)
+ continue;
+ if (memarea_whether_add_node(elem->size, size))
+ memarea_add_node(ma, elem, size);
+ elem->cookie = cookie;
+ elem->refcnt = 1;
+ TAILQ_REMOVE(&ma->free_list, elem, free_node);
+ ptr = RTE_PTR_ADD(elem, sizeof(struct memarea_elem));
+ break;
+ }
+ if (unlikely(ptr == NULL))
[PATCH v6 05/10] memarea: support dump API
This patch supports rte_memarea_dump() API which could be used for
debug.
Signed-off-by: Chengwen Feng
---
doc/guides/prog_guide/memarea_lib.rst | 3 +
lib/memarea/rte_memarea.c | 85 +++
lib/memarea/rte_memarea.h | 21 +++
lib/memarea/version.map | 1 +
4 files changed, 110 insertions(+)
diff --git a/doc/guides/prog_guide/memarea_lib.rst
b/doc/guides/prog_guide/memarea_lib.rst
index 97decf27de..720d8099e2 100644
--- a/doc/guides/prog_guide/memarea_lib.rst
+++ b/doc/guides/prog_guide/memarea_lib.rst
@@ -43,6 +43,9 @@ The ``rte_memarea_update_refcnt()`` function is used to
update the memory
object's reference count, if the count reaches zero, the memory object will
be freed to memarea.
++The ``rte_memarea_dump()`` function is used to dump the internal information
++of a memarea.
+
Reference
-
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index 522092637e..bc51d2a5ff 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -2,6 +2,7 @@
* Copyright(c) 2022 HiSilicon Limited
*/
+#include
#include
#include
#include
@@ -296,3 +297,87 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
*ptr, int16_t value)
memarea_free_elem(ma, elem);
memarea_unlock(ma);
}
+
+static const char *
+memarea_source_name(enum rte_memarea_source source)
+{
+ if (source == RTE_MEMAREA_SOURCE_HEAP)
+ return "heap";
+ else if (source == RTE_MEMAREA_SOURCE_LIBC)
+ return "libc";
+ else if (source == RTE_MEMAREA_SOURCE_USER)
+ return "user";
+ else if (source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ return "user-memarea";
+ else
+ return "unknown";
+}
+
+static const char *
+memarea_alg_name(enum rte_memarea_alg alg)
+{
+ if (alg == RTE_MEMAREA_ALG_DEFAULT)
+ return "default";
+ else
+ return "unknown";
+}
+
+static uint32_t
+memarea_elem_list_num(struct rte_memarea *ma)
+{
+ struct memarea_elem *elem;
+ uint32_t num = 0;
+
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ num++;
+
+ return num;
+}
+
+static uint32_t
+memarea_free_list_num(struct rte_memarea *ma)
+{
+ struct memarea_elem *elem;
+ uint32_t num = 0;
+
+ TAILQ_FOREACH(elem, &ma->free_list, free_node)
+ num++;
+
+ return num;
+}
+
+static void
+memarea_dump_all(struct rte_memarea *ma, FILE *f)
+{
+ struct memarea_elem *elem;
+
+ fprintf(f, " regions:\n");
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ fprintf(f, "size: 0x%zx cookie: 0x%x refcnt: %d\n",
+ elem->size, elem->cookie, elem->refcnt);
+}
+
+int
+rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool dump_all)
+{
+ if (ma == NULL || f == NULL)
+ return -EINVAL;
+
+ memarea_lock(ma);
+ fprintf(f, "memarea name: %s\n", ma->init.name);
+ fprintf(f, " source: %s\n", memarea_source_name(ma->init.source));
+ if (ma->init.source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ fprintf(f, " source-user-memarea: %s\n",
ma->init.user_memarea->init.name);
+ fprintf(f, " algorithm: %s\n", memarea_alg_name(ma->init.alg));
+ fprintf(f, " total-size: 0x%zx\n", ma->init.total_sz);
+ fprintf(f, " mt-safe: %s\n", ma->init.mt_safe ? "yes" : "no");
+ fprintf(f, " total-regions: %u\n", memarea_elem_list_num(ma));
+ fprintf(f, " total-free-regions: %u\n", memarea_free_list_num(ma));
+ fprintf(f, " alloc_fails: %" PRIu64 "\n", ma->alloc_fails);
+ fprintf(f, " refcnt_check_fails: %" PRIu64 "\n",
ma->refcnt_check_fails);
+ if (dump_all)
+ memarea_dump_all(ma, f);
+ memarea_unlock(ma);
+
+ return 0;
+}
diff --git a/lib/memarea/rte_memarea.h b/lib/memarea/rte_memarea.h
index 9e25969bf4..4bf2f36c7c 100644
--- a/lib/memarea/rte_memarea.h
+++ b/lib/memarea/rte_memarea.h
@@ -195,6 +195,27 @@ void rte_memarea_free(struct rte_memarea *ma, void *ptr);
__rte_experimental
void rte_memarea_update_refcnt(struct rte_memarea *ma, void *ptr, int16_t
value);
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Dump memarea.
+ *
+ * Dump one memarea.
+ *
+ * @param ma
+ * The pointer of memarea.
+ * @param f
+ * The file to write the output to.
+ * @param dump_all
+ * Indicate whether to dump the allocated and free memory objects
information.
+ *
+ * @return
+ * 0 on success. Otherwise negative value is returned.
+ */
+__rte_experimental
+int rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool dump_all);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/memarea/version.map b/lib/memarea/version.map
index a0026fc5f9..d8ddd93c13 100644
--- a/lib/memarea/version.map
+++ b/lib/memarea/version.map
@@ -4,6 +4,7 @@ EXPERIMENTAL {
rte_mem
[PATCH v6 08/10] test/memarea: support backup memory test
This patch supports backup memory mechanism test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 41 +
1 file changed, 41 insertions(+)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index d159e4f2ef..28c66b886c 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -329,6 +329,46 @@ test_memarea_dump(void)
return 0;
}
+static int
+test_memarea_backup(void)
+{
+ struct rte_memarea *ma, *bak_ma;
+ struct rte_memarea_param init;
+ void *ptr;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ strcat(init.name, "_backup");
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ bak_ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(bak_ma != NULL, "Expected Non-NULL");
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE >> 2;
+ init.bak_memarea = bak_ma;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test for backup */
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 3, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ (void)rte_memarea_dump(ma, stderr, true);
+ (void)rte_memarea_dump(bak_ma, stderr, true);
+ rte_memarea_free(ma, ptr);
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE, 0);
+ RTE_TEST_ASSERT(ptr == NULL, "Expected NULL");
+ (void)rte_memarea_dump(ma, stderr, true);
+ (void)rte_memarea_dump(bak_ma, stderr, true);
+
+ rte_memarea_destroy(ma);
+ rte_memarea_destroy(bak_ma);
+
+ return 0;
+}
+
static int
test_memarea(void)
{
@@ -340,6 +380,7 @@ test_memarea(void)
MEMAREA_TEST_API_RUN(test_memarea_free_fail);
MEMAREA_TEST_API_RUN(test_memarea_alloc_free);
MEMAREA_TEST_API_RUN(test_memarea_dump);
+ MEMAREA_TEST_API_RUN(test_memarea_backup);
return test_memarea_retcode();
}
--
2.17.1
[PATCH v6 10/10] test/memarea: support no MT-safe test
MT-safe is enabled by default in previous test, this patch adds no
MT-safe test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 30 ++
1 file changed, 30 insertions(+)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index 28c66b886c..adadc6dcfc 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -369,6 +369,35 @@ test_memarea_backup(void)
return 0;
}
+static int
+test_memarea_no_mt_safe(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ int ret;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ init.mt_safe = false;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test for all API */
+ (void)rte_memarea_alloc(ma, 1, 0);
+ (void)rte_memarea_alloc(ma, 1, 0);
+ rte_memarea_free(ma, rte_memarea_alloc(ma, 1, 0));
+ rte_memarea_update_refcnt(ma, rte_memarea_alloc(ma, 1, 0), 1);
+ rte_memarea_update_refcnt(ma, rte_memarea_alloc(ma, 1, 0), -1);
+ ret = rte_memarea_dump(ma, stderr, true);
+ RTE_TEST_ASSERT(ret == 0, "Expected ZERO");
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
static int
test_memarea(void)
{
@@ -381,6 +410,7 @@ test_memarea(void)
MEMAREA_TEST_API_RUN(test_memarea_alloc_free);
MEMAREA_TEST_API_RUN(test_memarea_dump);
MEMAREA_TEST_API_RUN(test_memarea_backup);
+ MEMAREA_TEST_API_RUN(test_memarea_no_mt_safe);
return test_memarea_retcode();
}
--
2.17.1
[PATCH v6 07/10] memarea: support backup memory mechanism
This patch adds a memarea backup mechanism, where an allocation request
which cannot be met by the current memarea is deferred to its backup
memarea.
Signed-off-by: Chengwen Feng
---
doc/guides/prog_guide/memarea_lib.rst | 4
lib/memarea/memarea_private.h | 2 ++
lib/memarea/rte_memarea.c | 22 ++
lib/memarea/rte_memarea.h | 11 +++
4 files changed, 39 insertions(+)
diff --git a/doc/guides/prog_guide/memarea_lib.rst
b/doc/guides/prog_guide/memarea_lib.rst
index 720d8099e2..feebafabcc 100644
--- a/doc/guides/prog_guide/memarea_lib.rst
+++ b/doc/guides/prog_guide/memarea_lib.rst
@@ -25,6 +25,10 @@ The main features are as follows:
* It supports MT-safe as long as it's specified at creation time.
+* It provides backup memory mechanism, the memarea could use another memarea
+ as a backup. It will attempts to allocate object from backup memarea when
+ the current memarea failed to allocate.
+
Library API Overview
diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
index 98406879b9..08735ca81f 100644
--- a/lib/memarea/memarea_private.h
+++ b/lib/memarea/memarea_private.h
@@ -23,11 +23,13 @@ struct rte_memarea {
struct rte_memarea_param init;
rte_spinlock_t lock;
void*area_addr;
+ void*top_addr;
struct memarea_elem_list elem_list;
struct memarea_elem_list free_list;
uint64_t alloc_fails;
uint64_t refcnt_check_fails;
+ uint64_t bak_alloc_fails;
} __rte_cache_aligned;
#endif /* MEMAREA_PRIVATE_H */
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index bc51d2a5ff..f95f89b6ec 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -132,6 +132,7 @@ rte_memarea_create(const struct rte_memarea_param *init)
TAILQ_INIT(&ma->elem_list);
TAILQ_INIT(&ma->free_list);
ma->area_addr = addr;
+ ma->top_addr = RTE_PTR_ADD(addr, init->total_sz - 1);
elem = addr;
elem->size = init->total_sz - sizeof(struct memarea_elem);
elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
@@ -198,6 +199,15 @@ memarea_add_node(struct rte_memarea *ma, struct
memarea_elem *elem, size_t need_
elem->size = align_size;
}
+static inline void *
+memarea_alloc_backup(struct rte_memarea *ma, size_t size, uint32_t cookie)
+{
+ void *ptr = rte_memarea_alloc(ma->init.bak_memarea, size, cookie);
+ if (unlikely(ptr == NULL))
+ ma->bak_alloc_fails++;
+ return ptr;
+}
+
void *
rte_memarea_alloc(struct rte_memarea *ma, size_t size, uint32_t cookie)
{
@@ -219,6 +229,8 @@ rte_memarea_alloc(struct rte_memarea *ma, size_t size,
uint32_t cookie)
ptr = RTE_PTR_ADD(elem, sizeof(struct memarea_elem));
break;
}
+ if (unlikely(ptr == NULL && ma->init.bak_memarea != NULL))
+ ptr = memarea_alloc_backup(ma, size, cookie);
if (unlikely(ptr == NULL))
ma->alloc_fails++;
memarea_unlock(ma);
@@ -281,6 +293,12 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
*ptr, int16_t value)
return;
memarea_lock(ma);
+ if (unlikely(ptr < ma->area_addr || ptr > ma->top_addr)) {
+ rte_memarea_update_refcnt(ma->init.bak_memarea, ptr, value);
+ memarea_unlock(ma);
+ return;
+ }
+
if (unlikely(elem->refcnt <= 0 || elem->refcnt + value < 0)) {
RTE_LOG(ERR, MEMAREA,
"memarea: %s cookie: 0x%x curr refcnt: %d update
refcnt: %d check fail!\n",
@@ -371,10 +389,14 @@ rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool
dump_all)
fprintf(f, " algorithm: %s\n", memarea_alg_name(ma->init.alg));
fprintf(f, " total-size: 0x%zx\n", ma->init.total_sz);
fprintf(f, " mt-safe: %s\n", ma->init.mt_safe ? "yes" : "no");
+ if (ma->init.bak_memarea)
+ fprintf(f, " backup-memarea-name: %s\n",
ma->init.bak_memarea->init.name);
fprintf(f, " total-regions: %u\n", memarea_elem_list_num(ma));
fprintf(f, " total-free-regions: %u\n", memarea_free_list_num(ma));
fprintf(f, " alloc_fails: %" PRIu64 "\n", ma->alloc_fails);
fprintf(f, " refcnt_check_fails: %" PRIu64 "\n",
ma->refcnt_check_fails);
+ if (ma->init.bak_memarea)
+ fprintf(f, " backup_alloc_fails: %" PRIu64 "\n",
ma->bak_alloc_fails);
if (dump_all)
memarea_dump_all(ma, f);
memarea_unlock(ma);
diff --git a/lib/memarea/rte_memarea.h b/lib/memarea/rte_memarea.h
index 4bf2f36c7c..815d0e3d75 100644
--- a/lib/memarea/rte_memarea.h
+++ b/lib/memarea/rte_memarea.h
@@ -40,6 +40,13 @@
* specified, all the functions of the memarea API are lock-free, and assume
* to not be invoked in parallel on different logical cores to work on the
* s
[PATCH v6 04/10] test/memarea: support alloc/free/update-refcnt test
This patch supports rte_memarea_alloc()/rte_memarea_free()/
rte_memarea_update_refcnt() test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 150 +++-
1 file changed, 149 insertions(+), 1 deletion(-)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index 6b6612dc82..5ace384b8a 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -57,6 +57,12 @@ test_memarea_init_def_param(struct rte_memarea_param *init)
init->mt_safe = 1;
}
+static void
+test_memarea_fill_allocated_region(void *ptr, size_t size)
+{
+ memset(ptr, 0xff, size);
+}
+
static int
test_memarea_create_bad_param(void)
{
@@ -122,8 +128,8 @@ static int
test_memarea_create_destroy(void)
{
uint8_t user_buffer[MEMAREA_TEST_DEFAULT_SIZE + RTE_CACHE_LINE_SIZE];
+ struct rte_memarea *ma, *user_ma;
struct rte_memarea_param init;
- struct rte_memarea *ma;
/* test for create with HEAP */
test_memarea_init_def_param(&init);
@@ -149,6 +155,145 @@ test_memarea_create_destroy(void)
RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
rte_memarea_destroy(ma);
+ /* test for create with user-memarea */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ user_ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(user_ma != NULL, "Expected Non-NULL");
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER_MEMAREA;
+ init.total_sz = init.total_sz >> 1;
+ init.user_memarea = user_ma;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+ rte_memarea_destroy(ma);
+ rte_memarea_destroy(user_ma);
+
+ return 0;
+}
+
+static int
+test_memarea_alloc_fail(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ void *ptr[2];
+
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test alloc fail with big size */
+ ptr[0] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE, 0);
+ RTE_TEST_ASSERT(ptr[0] == NULL, "Expected NULL");
+
+ /* test alloc fail because no memory */
+ ptr[0] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE -
RTE_CACHE_LINE_SIZE, 0);
+ RTE_TEST_ASSERT(ptr[0] != NULL, "Expected Non-NULL");
+ ptr[1] = rte_memarea_alloc(ma, 1, 0);
+ RTE_TEST_ASSERT(ptr[1] == NULL, "Expected NULL");
+ rte_memarea_free(ma, ptr[0]);
+
+ /* test alloc fail when second fail */
+ ptr[0] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr[0] != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr[0], MEMAREA_TEST_DEFAULT_SIZE >>
1);
+ ptr[1] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr[1] == NULL, "Expected NULL");
+ rte_memarea_free(ma, ptr[0]);
+ ptr[1] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr[1] != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr[1], MEMAREA_TEST_DEFAULT_SIZE >>
1);
+ rte_memarea_free(ma, ptr[1]);
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
+static int
+test_memarea_free_fail(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ void *ptr;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test invalid parameters with update-refcnt */
+ rte_memarea_update_refcnt(NULL, (void *)(uintptr_t)1, 0);
+ rte_memarea_update_refcnt(ma, NULL, 0);
+ rte_memarea_update_refcnt(NULL, NULL, 0);
+
+ /* test free with refcnt fail */
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr, MEMAREA_TEST_DEFAULT_SIZE >> 1);
+ rte_memarea_free(ma, ptr);
+ rte_memarea_free(ma, ptr);
+
+ /* test update refcnt with fail */
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr, MEMAREA_TEST_DEFAULT_SIZE >> 1);
+ rte_memarea_update_refcnt(ma, ptr, -2);
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr == NULL, "Expected NULL");
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
+static int
+test_memarea_alloc_free(void)
+{
+#define ALLOC_MAX_NUM 8
+ struct r
[PATCH v6 09/10] memarea: detect memory corruption based on magic
This patch provides lightweight mechanism for detecting memory
corruption which based on magic field in each element node.
Signed-off-by: Chengwen Feng
---
lib/memarea/memarea_private.h | 2 ++
lib/memarea/rte_memarea.c | 29 ++---
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
index 08735ca81f..4f5393e6f9 100644
--- a/lib/memarea/memarea_private.h
+++ b/lib/memarea/memarea_private.h
@@ -7,10 +7,12 @@
#include
+#define MEMAREA_ELEM_MAGIC_NUM 0xbeef1234
#define MEMAREA_FREE_ELEM_COOKIE 0x
struct memarea_elem {
size_t size;
+ uint32_t magic;
uint32_t cookie;
int32_t refcnt; /* Non-zero indicates that it has been allocated */
TAILQ_ENTRY(memarea_elem) elem_node;
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index f95f89b6ec..2983a36801 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -135,6 +135,7 @@ rte_memarea_create(const struct rte_memarea_param *init)
ma->top_addr = RTE_PTR_ADD(addr, init->total_sz - 1);
elem = addr;
elem->size = init->total_sz - sizeof(struct memarea_elem);
+ elem->magic = MEMAREA_ELEM_MAGIC_NUM;
elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
elem->refcnt = 0;
TAILQ_INSERT_TAIL(&ma->elem_list, elem, elem_node);
@@ -192,6 +193,7 @@ memarea_add_node(struct rte_memarea *ma, struct
memarea_elem *elem, size_t need_
new_elem = (struct memarea_elem *)RTE_PTR_ADD(elem, sizeof(struct
memarea_elem) +
align_size);
new_elem->size = elem->size - align_size - sizeof(struct memarea_elem);
+ new_elem->magic = MEMAREA_ELEM_MAGIC_NUM;
new_elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
new_elem->refcnt = 0;
TAILQ_INSERT_AFTER(&ma->elem_list, elem, new_elem, elem_node);
@@ -219,6 +221,8 @@ rte_memarea_alloc(struct rte_memarea *ma, size_t size,
uint32_t cookie)
memarea_lock(ma);
TAILQ_FOREACH(elem, &ma->free_list, free_node) {
+ if (unlikely(elem->magic != MEMAREA_ELEM_MAGIC_NUM))
+ break;
if (elem->size < size)
continue;
if (memarea_whether_add_node(elem->size, size))
@@ -251,6 +255,7 @@ memarea_merge_node(struct rte_memarea *ma, struct
memarea_elem *curr,
{
curr->size += next->size + sizeof(struct memarea_elem);
next->size = 0;
+ next->magic = ~MEMAREA_ELEM_MAGIC_NUM;
next->cookie = 0;
TAILQ_REMOVE(&ma->elem_list, next, elem_node);
if (del_next_from_free)
@@ -293,6 +298,13 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
*ptr, int16_t value)
return;
memarea_lock(ma);
+ if (unlikely(elem->magic != MEMAREA_ELEM_MAGIC_NUM)) {
+ RTE_LOG(ERR, MEMAREA, "memarea: %s magic: 0x%x check fail!\n",
+ ma->init.name, elem->magic);
+ memarea_unlock(ma);
+ return;
+ }
+
if (unlikely(ptr < ma->area_addr || ptr > ma->top_addr)) {
rte_memarea_update_refcnt(ma->init.bak_memarea, ptr, value);
memarea_unlock(ma);
@@ -346,8 +358,11 @@ memarea_elem_list_num(struct rte_memarea *ma)
struct memarea_elem *elem;
uint32_t num = 0;
- TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node) {
+ if (elem->magic != MEMAREA_ELEM_MAGIC_NUM)
+ break;
num++;
+ }
return num;
}
@@ -358,8 +373,11 @@ memarea_free_list_num(struct rte_memarea *ma)
struct memarea_elem *elem;
uint32_t num = 0;
- TAILQ_FOREACH(elem, &ma->free_list, free_node)
+ TAILQ_FOREACH(elem, &ma->free_list, free_node) {
+ if (elem->magic != MEMAREA_ELEM_MAGIC_NUM)
+ break;
num++;
+ }
return num;
}
@@ -370,9 +388,14 @@ memarea_dump_all(struct rte_memarea *ma, FILE *f)
struct memarea_elem *elem;
fprintf(f, " regions:\n");
- TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node) {
+ if (elem->magic != MEMAREA_ELEM_MAGIC_NUM) {
+ fprintf(f, "magic: 0x%x check fail!\n",
elem->magic);
+ break;
+ }
fprintf(f, "size: 0x%zx cookie: 0x%x refcnt: %d\n",
elem->size, elem->cookie, elem->refcnt);
+ }
}
int
--
2.17.1
[PATCH v7 06/10] test/memarea: support dump test
This patch supports rte_memarea_dump() test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 33 +
1 file changed, 33 insertions(+)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index 5ace384b8a..d159e4f2ef 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -297,6 +297,38 @@ test_memarea_alloc_free(void)
return 0;
}
+static int
+test_memarea_dump(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ int ret;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test for invalid parameters */
+ ret = rte_memarea_dump(NULL, stderr, false);
+ RTE_TEST_ASSERT(ret == -EINVAL, "Expected EINVAL");
+ ret = rte_memarea_dump(ma, NULL, false);
+ RTE_TEST_ASSERT(ret == -EINVAL, "Expected EINVAL");
+
+ /* test for dump */
+ (void)rte_memarea_alloc(ma, 1, 0);
+ (void)rte_memarea_alloc(ma, 1, 0);
+ (void)rte_memarea_alloc(ma, 1, 0);
+ ret = rte_memarea_dump(ma, stderr, true);
+ RTE_TEST_ASSERT(ret == 0, "Expected ZERO");
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
static int
test_memarea(void)
{
@@ -307,6 +339,7 @@ test_memarea(void)
MEMAREA_TEST_API_RUN(test_memarea_alloc_fail);
MEMAREA_TEST_API_RUN(test_memarea_free_fail);
MEMAREA_TEST_API_RUN(test_memarea_alloc_free);
+ MEMAREA_TEST_API_RUN(test_memarea_dump);
return test_memarea_retcode();
}
--
2.17.1
[PATCH v7 03/10] memarea: support alloc/free/update-refcnt API
This patch supports rte_memarea_alloc()/rte_memarea_free()/
rte_memarea_update_refcnt() API.
Signed-off-by: Chengwen Feng
---
doc/guides/prog_guide/memarea_lib.rst | 10 ++
lib/memarea/memarea_private.h | 3 +
lib/memarea/rte_memarea.c | 141 ++
lib/memarea/rte_memarea.h | 56 ++
lib/memarea/version.map | 3 +
5 files changed, 213 insertions(+)
diff --git a/doc/guides/prog_guide/memarea_lib.rst
b/doc/guides/prog_guide/memarea_lib.rst
index 27b280da6e..97decf27de 100644
--- a/doc/guides/prog_guide/memarea_lib.rst
+++ b/doc/guides/prog_guide/memarea_lib.rst
@@ -33,6 +33,16 @@ returns the pointer to the created memarea or ``NULL`` if
the creation failed.
The ``rte_memarea_destroy()`` function is used to destroy a memarea.
+The ``rte_memarea_alloc()`` function is used to alloc one memory object from
+the memarea.
+
+The ``rte_memarea_free()`` function is used to free one memory object which
+allocated by ``rte_memarea_alloc()``.
+
+The ``rte_memarea_update_refcnt()`` function is used to update the memory
+object's reference count, if the count reaches zero, the memory object will
+be freed to memarea.
+
Reference
-
diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
index c76392d3e6..98406879b9 100644
--- a/lib/memarea/memarea_private.h
+++ b/lib/memarea/memarea_private.h
@@ -25,6 +25,9 @@ struct rte_memarea {
void*area_addr;
struct memarea_elem_list elem_list;
struct memarea_elem_list free_list;
+
+ uint64_t alloc_fails;
+ uint64_t refcnt_check_fails;
} __rte_cache_aligned;
#endif /* MEMAREA_PRIVATE_H */
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index bb0bfc2149..522092637e 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -4,6 +4,7 @@
#include
#include
+#include
#include
#include
@@ -94,6 +95,8 @@ memarea_alloc_area(const struct rte_memarea_param *init)
ptr = memarea_alloc_from_libc(init->total_sz);
else if (init->source == RTE_MEMAREA_SOURCE_USER)
ptr = init->user_addr;
+ else if (init->source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ ptr = rte_memarea_alloc(init->user_memarea, init->total_sz, 0);
if (ptr == NULL)
RTE_LOG(ERR, MEMAREA, "memarea: %s alloc memory area fail!\n",
init->name);
@@ -145,6 +148,8 @@ memarea_free_area(struct rte_memarea *ma)
rte_free(ma->area_addr);
else if (ma->init.source == RTE_MEMAREA_SOURCE_LIBC)
free(ma->area_addr);
+ else if (ma->init.source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ rte_memarea_free(ma->init.user_memarea, ma->area_addr);
}
void
@@ -155,3 +160,139 @@ rte_memarea_destroy(struct rte_memarea *ma)
memarea_free_area(ma);
rte_free(ma);
}
+
+static inline void
+memarea_lock(struct rte_memarea *ma)
+{
+ if (ma->init.mt_safe)
+ rte_spinlock_lock(&ma->lock);
+}
+
+static inline void
+memarea_unlock(struct rte_memarea *ma)
+{
+ if (ma->init.mt_safe)
+ rte_spinlock_unlock(&ma->lock);
+}
+
+static inline bool
+memarea_whether_add_node(size_t free_size, size_t need_size)
+{
+ size_t align_size = RTE_ALIGN_CEIL(need_size, RTE_CACHE_LINE_SIZE);
+ return free_size > align_size && (free_size - align_size) >
sizeof(struct memarea_elem);
+}
+
+static inline void
+memarea_add_node(struct rte_memarea *ma, struct memarea_elem *elem, size_t
need_size)
+{
+ size_t align_size = RTE_ALIGN_CEIL(need_size, RTE_CACHE_LINE_SIZE);
+ struct memarea_elem *new_elem;
+ new_elem = (struct memarea_elem *)RTE_PTR_ADD(elem, sizeof(struct
memarea_elem) +
+ align_size);
+ new_elem->size = elem->size - align_size - sizeof(struct memarea_elem);
+ new_elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
+ new_elem->refcnt = 0;
+ TAILQ_INSERT_AFTER(&ma->elem_list, elem, new_elem, elem_node);
+ TAILQ_INSERT_AFTER(&ma->free_list, elem, new_elem, free_node);
+ elem->size = align_size;
+}
+
+void *
+rte_memarea_alloc(struct rte_memarea *ma, size_t size, uint32_t cookie)
+{
+ struct memarea_elem *elem;
+ void *ptr = NULL;
+
+ if (unlikely(ma == NULL || size == 0))
+ return NULL;
+
+ memarea_lock(ma);
+ TAILQ_FOREACH(elem, &ma->free_list, free_node) {
+ if (elem->size < size)
+ continue;
+ if (memarea_whether_add_node(elem->size, size))
+ memarea_add_node(ma, elem, size);
+ elem->cookie = cookie;
+ elem->refcnt = 1;
+ TAILQ_REMOVE(&ma->free_list, elem, free_node);
+ ptr = RTE_PTR_ADD(elem, sizeof(struct memarea_elem));
+ break;
+ }
+ if (unlikely(ptr == NULL))
[PATCH v7 04/10] test/memarea: support alloc/free/update-refcnt test
This patch supports rte_memarea_alloc()/rte_memarea_free()/
rte_memarea_update_refcnt() test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 150 +++-
1 file changed, 149 insertions(+), 1 deletion(-)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index 6b6612dc82..5ace384b8a 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -57,6 +57,12 @@ test_memarea_init_def_param(struct rte_memarea_param *init)
init->mt_safe = 1;
}
+static void
+test_memarea_fill_allocated_region(void *ptr, size_t size)
+{
+ memset(ptr, 0xff, size);
+}
+
static int
test_memarea_create_bad_param(void)
{
@@ -122,8 +128,8 @@ static int
test_memarea_create_destroy(void)
{
uint8_t user_buffer[MEMAREA_TEST_DEFAULT_SIZE + RTE_CACHE_LINE_SIZE];
+ struct rte_memarea *ma, *user_ma;
struct rte_memarea_param init;
- struct rte_memarea *ma;
/* test for create with HEAP */
test_memarea_init_def_param(&init);
@@ -149,6 +155,145 @@ test_memarea_create_destroy(void)
RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
rte_memarea_destroy(ma);
+ /* test for create with user-memarea */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ user_ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(user_ma != NULL, "Expected Non-NULL");
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER_MEMAREA;
+ init.total_sz = init.total_sz >> 1;
+ init.user_memarea = user_ma;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+ rte_memarea_destroy(ma);
+ rte_memarea_destroy(user_ma);
+
+ return 0;
+}
+
+static int
+test_memarea_alloc_fail(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ void *ptr[2];
+
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test alloc fail with big size */
+ ptr[0] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE, 0);
+ RTE_TEST_ASSERT(ptr[0] == NULL, "Expected NULL");
+
+ /* test alloc fail because no memory */
+ ptr[0] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE -
RTE_CACHE_LINE_SIZE, 0);
+ RTE_TEST_ASSERT(ptr[0] != NULL, "Expected Non-NULL");
+ ptr[1] = rte_memarea_alloc(ma, 1, 0);
+ RTE_TEST_ASSERT(ptr[1] == NULL, "Expected NULL");
+ rte_memarea_free(ma, ptr[0]);
+
+ /* test alloc fail when second fail */
+ ptr[0] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr[0] != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr[0], MEMAREA_TEST_DEFAULT_SIZE >>
1);
+ ptr[1] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr[1] == NULL, "Expected NULL");
+ rte_memarea_free(ma, ptr[0]);
+ ptr[1] = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr[1] != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr[1], MEMAREA_TEST_DEFAULT_SIZE >>
1);
+ rte_memarea_free(ma, ptr[1]);
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
+static int
+test_memarea_free_fail(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ void *ptr;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test invalid parameters with update-refcnt */
+ rte_memarea_update_refcnt(NULL, (void *)(uintptr_t)1, 0);
+ rte_memarea_update_refcnt(ma, NULL, 0);
+ rte_memarea_update_refcnt(NULL, NULL, 0);
+
+ /* test free with refcnt fail */
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr, MEMAREA_TEST_DEFAULT_SIZE >> 1);
+ rte_memarea_free(ma, ptr);
+ rte_memarea_free(ma, ptr);
+
+ /* test update refcnt with fail */
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ test_memarea_fill_allocated_region(ptr, MEMAREA_TEST_DEFAULT_SIZE >> 1);
+ rte_memarea_update_refcnt(ma, ptr, -2);
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr == NULL, "Expected NULL");
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
+static int
+test_memarea_alloc_free(void)
+{
+#define ALLOC_MAX_NUM 8
+ struct r
[PATCH v7 02/10] test/memarea: support memarea test
This patch supports memarea test about API rte_memarea_create and
rte_memarea_destroy.
Signed-off-by: Chengwen Feng
---
MAINTAINERS | 1 +
app/test/meson.build| 2 +
app/test/test_memarea.c | 168
3 files changed, 171 insertions(+)
create mode 100644 app/test/test_memarea.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 6c1cb637b0..7adeef31bf 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1566,6 +1566,7 @@ Memarea - EXPERIMENTAL
M: Chengwen Feng
F: lib/memarea
F: doc/guides/prog_guide/memarea_lib.rst
+F: app/test/test_memarea*
Membership - EXPERIMENTAL
M: Yipeng Wang
diff --git a/app/test/meson.build b/app/test/meson.build
index d5cad72116..778de8d65d 100644
--- a/app/test/meson.build
+++ b/app/test/meson.build
@@ -84,6 +84,7 @@ test_sources = files(
'test_malloc.c',
'test_malloc_perf.c',
'test_mbuf.c',
+'test_memarea.c',
'test_member.c',
'test_member_perf.c',
'test_memcpy.c',
@@ -199,6 +200,7 @@ fast_tests = [
['malloc_autotest', false, true],
['mbuf_autotest', false, true],
['mcslock_autotest', false, true],
+['memarea_autotest', true, true],
['memcpy_autotest', true, true],
['memory_autotest', false, true],
['mempool_autotest', false, true],
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
new file mode 100644
index 00..6b6612dc82
--- /dev/null
+++ b/app/test/test_memarea.c
@@ -0,0 +1,168 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2022 HiSilicon Limited
+ */
+
+#include
+#include
+
+#include "test.h"
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+static int
+test_memarea(void)
+{
+ printf("memarea not supported on Windows, skipping test\n");
+ return TEST_SKIPPED;
+}
+
+#else
+
+#include
+#include
+
+#define MEMAREA_TEST_DEFAULT_SIZE 0x1000
+
+#define MEMAREA_TEST_API_RUN(test_func) \
+ do { \
+ int ret = test_func(); \
+ if (ret < 0) { \
+ printf("%s Failed\n", #test_func); \
+ fails++; \
+ } else { \
+ printf("%s Passed\n", #test_func); \
+ } \
+ } while (0)
+
+static int fails;
+
+static void
+test_memarea_prepare(void)
+{
+ fails = 0;
+}
+
+static int
+test_memarea_retcode(void)
+{
+ return fails > 0 ? -1 : 0;
+}
+
+static void
+test_memarea_init_def_param(struct rte_memarea_param *init)
+{
+ memset(init, 0, sizeof(struct rte_memarea_param));
+ sprintf(init->name, "%s", "test-memarea");
+ init->source = RTE_MEMAREA_SOURCE_LIBC;
+ init->total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ init->mt_safe = 1;
+}
+
+static int
+test_memarea_create_bad_param(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ int i;
+
+ /* test for NULL */
+ ma = rte_memarea_create(NULL);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for invalid name */
+ memset(&init, 0, sizeof(init));
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+ memset(&init.name, 1, sizeof(init.name));
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for invalid source */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER_MEMAREA + 1;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for total_sz */
+ test_memarea_init_def_param(&init);
+ init.total_sz = 0;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for user address NULL */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for user address align invalid */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER;
+ for (i = 1; i < RTE_CACHE_LINE_SIZE; i++) {
+ init.user_addr = (void *)((uintptr_t)i);
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+ }
+
+ /* test for user memarea NULL */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_USER_MEMAREA;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ /* test for alg invalid */
+ test_memarea_init_def_param(&init);
+ init.alg = RTE_MEMAREA_ALG_DEFAULT + 1;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma == NULL, "Expected NULL");
+
+ return 0;
+}
+
+static int
+test_memarea_create_destroy(void)
+{
+ uint8_t user_buffer[MEMAREA_TEST_DEFAULT_SIZE + RTE_CACHE_LINE_SIZE];
+
[PATCH v7 00/10] introduce memarea library
The memarea library is an allocator of variable-size object which based on a memory region. The main features are as follows: - The allocated object aligned at RTE_CACHE_LINE_SIZE default. - The memory region can be initialized from the following memory sources: 1. HEAP: e.g. invoke rte_malloc_socket. 2. LIBC: e.g. invoke posix_memalign. 3. User provided: it can be from e.g. rte_extmem_xxx as long as it is available. The memory's start address must be aligned to RTE_CACHE_LINE_SIZE. 4. User provided memarea: it can be from another memarea. - It provides refcnt feature which could be useful in multi-reader scenario. - It provides backup memory mechanism, the memarea could use another memarea as a backup. It will attempts to allocate object from backup memarea when the current memarea failed to allocate. Note: a) The memarea is oriented towards the application layer, which could provides 'region-based memory management' [1] function. b) The eal library also provide memory zone/heap management, but these are tied to huge pages management. [1] https://en.wikipedia.org/wiki/Region-based_memory_management Signed-off-by: Chengwen Feng Chengwen Feng (10): memarea: introduce memarea library test/memarea: support memarea test memarea: support alloc/free/update-refcnt API test/memarea: support alloc/free/update-refcnt test memarea: support dump API test/memarea: support dump test memarea: support backup memory mechanism test/memarea: support backup memory test memarea: detect memory corruption based on magic test/memarea: support no MT-safe test --- v6: * address Mattias's comments. * repost patches as there are spread over different series in patchwork. v5: * fix 09/10 patch spell warning. v4: * repost patches as there are spread over different series in patchwork. v3: * add memory source of RTE memory. * add algorithm field to facilitate the introduction of new algorithms. * fix memarea log don't output problem. v2: * fix compile issues reported by dpdk-test-report. * address Dimitry and Jerin's comments. * add no MT-safe test. MAINTAINERS| 6 + app/test/meson.build | 2 + app/test/test_memarea.c| 420 doc/api/doxy-api-index.md | 3 +- doc/api/doxy-api.conf.in | 1 + doc/guides/prog_guide/index.rst| 1 + doc/guides/prog_guide/memarea_lib.rst | 56 doc/guides/rel_notes/release_22_11.rst | 6 + lib/eal/common/eal_common_log.c| 1 + lib/eal/include/rte_log.h | 1 + lib/memarea/memarea_private.h | 37 +++ lib/memarea/meson.build| 16 + lib/memarea/rte_memarea.c | 428 + lib/memarea/rte_memarea.h | 234 ++ lib/memarea/version.map| 16 + lib/meson.build| 1 + 16 files changed, 1228 insertions(+), 1 deletion(-) create mode 100644 app/test/test_memarea.c create mode 100644 doc/guides/prog_guide/memarea_lib.rst create mode 100644 lib/memarea/memarea_private.h create mode 100644 lib/memarea/meson.build create mode 100644 lib/memarea/rte_memarea.c create mode 100644 lib/memarea/rte_memarea.h create mode 100644 lib/memarea/version.map -- 2.17.1
[PATCH v7 05/10] memarea: support dump API
This patch supports rte_memarea_dump() API which could be used for
debug.
Signed-off-by: Chengwen Feng
---
doc/guides/prog_guide/memarea_lib.rst | 3 +
lib/memarea/rte_memarea.c | 85 +++
lib/memarea/rte_memarea.h | 21 +++
lib/memarea/version.map | 1 +
4 files changed, 110 insertions(+)
diff --git a/doc/guides/prog_guide/memarea_lib.rst
b/doc/guides/prog_guide/memarea_lib.rst
index 97decf27de..720d8099e2 100644
--- a/doc/guides/prog_guide/memarea_lib.rst
+++ b/doc/guides/prog_guide/memarea_lib.rst
@@ -43,6 +43,9 @@ The ``rte_memarea_update_refcnt()`` function is used to
update the memory
object's reference count, if the count reaches zero, the memory object will
be freed to memarea.
++The ``rte_memarea_dump()`` function is used to dump the internal information
++of a memarea.
+
Reference
-
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index 522092637e..bc51d2a5ff 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -2,6 +2,7 @@
* Copyright(c) 2022 HiSilicon Limited
*/
+#include
#include
#include
#include
@@ -296,3 +297,87 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
*ptr, int16_t value)
memarea_free_elem(ma, elem);
memarea_unlock(ma);
}
+
+static const char *
+memarea_source_name(enum rte_memarea_source source)
+{
+ if (source == RTE_MEMAREA_SOURCE_HEAP)
+ return "heap";
+ else if (source == RTE_MEMAREA_SOURCE_LIBC)
+ return "libc";
+ else if (source == RTE_MEMAREA_SOURCE_USER)
+ return "user";
+ else if (source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ return "user-memarea";
+ else
+ return "unknown";
+}
+
+static const char *
+memarea_alg_name(enum rte_memarea_alg alg)
+{
+ if (alg == RTE_MEMAREA_ALG_DEFAULT)
+ return "default";
+ else
+ return "unknown";
+}
+
+static uint32_t
+memarea_elem_list_num(struct rte_memarea *ma)
+{
+ struct memarea_elem *elem;
+ uint32_t num = 0;
+
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ num++;
+
+ return num;
+}
+
+static uint32_t
+memarea_free_list_num(struct rte_memarea *ma)
+{
+ struct memarea_elem *elem;
+ uint32_t num = 0;
+
+ TAILQ_FOREACH(elem, &ma->free_list, free_node)
+ num++;
+
+ return num;
+}
+
+static void
+memarea_dump_all(struct rte_memarea *ma, FILE *f)
+{
+ struct memarea_elem *elem;
+
+ fprintf(f, " regions:\n");
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ fprintf(f, "size: 0x%zx cookie: 0x%x refcnt: %d\n",
+ elem->size, elem->cookie, elem->refcnt);
+}
+
+int
+rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool dump_all)
+{
+ if (ma == NULL || f == NULL)
+ return -EINVAL;
+
+ memarea_lock(ma);
+ fprintf(f, "memarea name: %s\n", ma->init.name);
+ fprintf(f, " source: %s\n", memarea_source_name(ma->init.source));
+ if (ma->init.source == RTE_MEMAREA_SOURCE_USER_MEMAREA)
+ fprintf(f, " source-user-memarea: %s\n",
ma->init.user_memarea->init.name);
+ fprintf(f, " algorithm: %s\n", memarea_alg_name(ma->init.alg));
+ fprintf(f, " total-size: 0x%zx\n", ma->init.total_sz);
+ fprintf(f, " mt-safe: %s\n", ma->init.mt_safe ? "yes" : "no");
+ fprintf(f, " total-regions: %u\n", memarea_elem_list_num(ma));
+ fprintf(f, " total-free-regions: %u\n", memarea_free_list_num(ma));
+ fprintf(f, " alloc_fails: %" PRIu64 "\n", ma->alloc_fails);
+ fprintf(f, " refcnt_check_fails: %" PRIu64 "\n",
ma->refcnt_check_fails);
+ if (dump_all)
+ memarea_dump_all(ma, f);
+ memarea_unlock(ma);
+
+ return 0;
+}
diff --git a/lib/memarea/rte_memarea.h b/lib/memarea/rte_memarea.h
index 9e25969bf4..4bf2f36c7c 100644
--- a/lib/memarea/rte_memarea.h
+++ b/lib/memarea/rte_memarea.h
@@ -195,6 +195,27 @@ void rte_memarea_free(struct rte_memarea *ma, void *ptr);
__rte_experimental
void rte_memarea_update_refcnt(struct rte_memarea *ma, void *ptr, int16_t
value);
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Dump memarea.
+ *
+ * Dump one memarea.
+ *
+ * @param ma
+ * The pointer of memarea.
+ * @param f
+ * The file to write the output to.
+ * @param dump_all
+ * Indicate whether to dump the allocated and free memory objects
information.
+ *
+ * @return
+ * 0 on success. Otherwise negative value is returned.
+ */
+__rte_experimental
+int rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool dump_all);
+
#ifdef __cplusplus
}
#endif
diff --git a/lib/memarea/version.map b/lib/memarea/version.map
index a0026fc5f9..d8ddd93c13 100644
--- a/lib/memarea/version.map
+++ b/lib/memarea/version.map
@@ -4,6 +4,7 @@ EXPERIMENTAL {
rte_mem
[PATCH v7 01/10] memarea: introduce memarea library
The memarea library is an allocator of variable-size object which based on a memory region. This patch provides create/destroy API. Signed-off-by: Chengwen Feng --- MAINTAINERS| 5 + doc/api/doxy-api-index.md | 3 +- doc/api/doxy-api.conf.in | 1 + doc/guides/prog_guide/index.rst| 1 + doc/guides/prog_guide/memarea_lib.rst | 39 ++ doc/guides/rel_notes/release_22_11.rst | 6 + lib/eal/common/eal_common_log.c| 1 + lib/eal/include/rte_log.h | 1 + lib/memarea/memarea_private.h | 30 + lib/memarea/meson.build| 16 +++ lib/memarea/rte_memarea.c | 157 + lib/memarea/rte_memarea.h | 146 +++ lib/memarea/version.map| 12 ++ lib/meson.build| 1 + 14 files changed, 418 insertions(+), 1 deletion(-) create mode 100644 doc/guides/prog_guide/memarea_lib.rst create mode 100644 lib/memarea/memarea_private.h create mode 100644 lib/memarea/meson.build create mode 100644 lib/memarea/rte_memarea.c create mode 100644 lib/memarea/rte_memarea.h create mode 100644 lib/memarea/version.map diff --git a/MAINTAINERS b/MAINTAINERS index 3757ccc3b3..6c1cb637b0 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1562,6 +1562,11 @@ F: app/test/test_lpm* F: app/test/test_func_reentrancy.c F: app/test/test_xmmt_ops.h +Memarea - EXPERIMENTAL +M: Chengwen Feng +F: lib/memarea +F: doc/guides/prog_guide/memarea_lib.rst + Membership - EXPERIMENTAL M: Yipeng Wang M: Sameh Gobriel diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md index de488c7abf..24456604f8 100644 --- a/doc/api/doxy-api-index.md +++ b/doc/api/doxy-api-index.md @@ -62,7 +62,8 @@ The public API headers are grouped by topics: [memzone](@ref rte_memzone.h), [mempool](@ref rte_mempool.h), [malloc](@ref rte_malloc.h), - [memcpy](@ref rte_memcpy.h) + [memcpy](@ref rte_memcpy.h), + [memarea](@ref rte_memarea.h) - **timers**: [cycles](@ref rte_cycles.h), diff --git a/doc/api/doxy-api.conf.in b/doc/api/doxy-api.conf.in index f0886c3bd1..8334ebcbd6 100644 --- a/doc/api/doxy-api.conf.in +++ b/doc/api/doxy-api.conf.in @@ -53,6 +53,7 @@ INPUT = @TOPDIR@/doc/api/doxy-api-index.md \ @TOPDIR@/lib/latencystats \ @TOPDIR@/lib/lpm \ @TOPDIR@/lib/mbuf \ + @TOPDIR@/lib/memarea \ @TOPDIR@/lib/member \ @TOPDIR@/lib/mempool \ @TOPDIR@/lib/meter \ diff --git a/doc/guides/prog_guide/index.rst b/doc/guides/prog_guide/index.rst index 8564883018..e9015d65e3 100644 --- a/doc/guides/prog_guide/index.rst +++ b/doc/guides/prog_guide/index.rst @@ -37,6 +37,7 @@ Programmer's Guide hash_lib toeplitz_hash_lib efd_lib +memarea_lib member_lib lpm_lib lpm6_lib diff --git a/doc/guides/prog_guide/memarea_lib.rst b/doc/guides/prog_guide/memarea_lib.rst new file mode 100644 index 00..27b280da6e --- /dev/null +++ b/doc/guides/prog_guide/memarea_lib.rst @@ -0,0 +1,39 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2022 HiSilicon Limited + +Memarea Library +=== + +Introduction + + +The memarea library provides an allocator of variable-size objects, it is +oriented towards the application layer, which could provides 'region-based +memory management' function [1]. + +The main features are as follows: + +* The allocated object aligned at ``RTE_CACHE_LINE_SIZE`` default. + +* The memory region can be initialized from the following memory sources: + a) HEAP: e.g. invoke ``rte_malloc_socket``. b) LIBC: e.g. invoke + posix_memalign to obtain. c) User provided: it can be from e.g. + rte_extmem_xxx as long as it is available. d) User provided memarea: it can + be from another memarea. + +* It provides refcnt feature which could be useful in multi-reader scenario. + +* It supports MT-safe as long as it's specified at creation time. + +Library API Overview + + +The ``rte_memarea_create()`` function is used to create a memarea, the function +returns the pointer to the created memarea or ``NULL`` if the creation failed. + +The ``rte_memarea_destroy()`` function is used to destroy a memarea. + +Reference +- + +[1] https://en.wikipedia.org/wiki/Region-based_memory_management diff --git a/doc/guides/rel_notes/release_22_11.rst b/doc/guides/rel_notes/release_22_11.rst index aef2d622dd..1bf5b2b8db 100644 --- a/doc/guides/rel_notes/release_22_11.rst +++ b/doc/guides/rel_notes/release_22_11.rst @@ -63,6 +63,12 @@ New Features In theory this implementation should work with any target based on ``LoongArch`` ISA. +* **Added memarea library.** + + The memarea library is an allocator of variable-size objects, it is oriented + towa
[PATCH v7 08/10] test/memarea: support backup memory test
This patch supports backup memory mechanism test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 41 +
1 file changed, 41 insertions(+)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index d159e4f2ef..28c66b886c 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -329,6 +329,46 @@ test_memarea_dump(void)
return 0;
}
+static int
+test_memarea_backup(void)
+{
+ struct rte_memarea *ma, *bak_ma;
+ struct rte_memarea_param init;
+ void *ptr;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ strcat(init.name, "_backup");
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ bak_ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(bak_ma != NULL, "Expected Non-NULL");
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE >> 2;
+ init.bak_memarea = bak_ma;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test for backup */
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 3, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE >> 1, 0);
+ RTE_TEST_ASSERT(ptr != NULL, "Expected Non-NULL");
+ (void)rte_memarea_dump(ma, stderr, true);
+ (void)rte_memarea_dump(bak_ma, stderr, true);
+ rte_memarea_free(ma, ptr);
+ ptr = rte_memarea_alloc(ma, MEMAREA_TEST_DEFAULT_SIZE, 0);
+ RTE_TEST_ASSERT(ptr == NULL, "Expected NULL");
+ (void)rte_memarea_dump(ma, stderr, true);
+ (void)rte_memarea_dump(bak_ma, stderr, true);
+
+ rte_memarea_destroy(ma);
+ rte_memarea_destroy(bak_ma);
+
+ return 0;
+}
+
static int
test_memarea(void)
{
@@ -340,6 +380,7 @@ test_memarea(void)
MEMAREA_TEST_API_RUN(test_memarea_free_fail);
MEMAREA_TEST_API_RUN(test_memarea_alloc_free);
MEMAREA_TEST_API_RUN(test_memarea_dump);
+ MEMAREA_TEST_API_RUN(test_memarea_backup);
return test_memarea_retcode();
}
--
2.17.1
[PATCH v7 10/10] test/memarea: support no MT-safe test
MT-safe is enabled by default in previous test, this patch adds no
MT-safe test.
Signed-off-by: Chengwen Feng
---
app/test/test_memarea.c | 30 ++
1 file changed, 30 insertions(+)
diff --git a/app/test/test_memarea.c b/app/test/test_memarea.c
index 28c66b886c..adadc6dcfc 100644
--- a/app/test/test_memarea.c
+++ b/app/test/test_memarea.c
@@ -369,6 +369,35 @@ test_memarea_backup(void)
return 0;
}
+static int
+test_memarea_no_mt_safe(void)
+{
+ struct rte_memarea_param init;
+ struct rte_memarea *ma;
+ int ret;
+
+ /* prepare env */
+ test_memarea_init_def_param(&init);
+ init.source = RTE_MEMAREA_SOURCE_LIBC;
+ init.total_sz = MEMAREA_TEST_DEFAULT_SIZE;
+ init.mt_safe = false;
+ ma = rte_memarea_create(&init);
+ RTE_TEST_ASSERT(ma != NULL, "Expected Non-NULL");
+
+ /* test for all API */
+ (void)rte_memarea_alloc(ma, 1, 0);
+ (void)rte_memarea_alloc(ma, 1, 0);
+ rte_memarea_free(ma, rte_memarea_alloc(ma, 1, 0));
+ rte_memarea_update_refcnt(ma, rte_memarea_alloc(ma, 1, 0), 1);
+ rte_memarea_update_refcnt(ma, rte_memarea_alloc(ma, 1, 0), -1);
+ ret = rte_memarea_dump(ma, stderr, true);
+ RTE_TEST_ASSERT(ret == 0, "Expected ZERO");
+
+ rte_memarea_destroy(ma);
+
+ return 0;
+}
+
static int
test_memarea(void)
{
@@ -381,6 +410,7 @@ test_memarea(void)
MEMAREA_TEST_API_RUN(test_memarea_alloc_free);
MEMAREA_TEST_API_RUN(test_memarea_dump);
MEMAREA_TEST_API_RUN(test_memarea_backup);
+ MEMAREA_TEST_API_RUN(test_memarea_no_mt_safe);
return test_memarea_retcode();
}
--
2.17.1
[PATCH v7 09/10] memarea: detect memory corruption based on magic
This patch provides lightweight mechanism for detecting memory
corruption which based on magic field in each element node.
Signed-off-by: Chengwen Feng
---
lib/memarea/memarea_private.h | 2 ++
lib/memarea/rte_memarea.c | 29 ++---
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
index 08735ca81f..4f5393e6f9 100644
--- a/lib/memarea/memarea_private.h
+++ b/lib/memarea/memarea_private.h
@@ -7,10 +7,12 @@
#include
+#define MEMAREA_ELEM_MAGIC_NUM 0xbeef1234
#define MEMAREA_FREE_ELEM_COOKIE 0x
struct memarea_elem {
size_t size;
+ uint32_t magic;
uint32_t cookie;
int32_t refcnt; /* Non-zero indicates that it has been allocated */
TAILQ_ENTRY(memarea_elem) elem_node;
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index f95f89b6ec..2983a36801 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -135,6 +135,7 @@ rte_memarea_create(const struct rte_memarea_param *init)
ma->top_addr = RTE_PTR_ADD(addr, init->total_sz - 1);
elem = addr;
elem->size = init->total_sz - sizeof(struct memarea_elem);
+ elem->magic = MEMAREA_ELEM_MAGIC_NUM;
elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
elem->refcnt = 0;
TAILQ_INSERT_TAIL(&ma->elem_list, elem, elem_node);
@@ -192,6 +193,7 @@ memarea_add_node(struct rte_memarea *ma, struct
memarea_elem *elem, size_t need_
new_elem = (struct memarea_elem *)RTE_PTR_ADD(elem, sizeof(struct
memarea_elem) +
align_size);
new_elem->size = elem->size - align_size - sizeof(struct memarea_elem);
+ new_elem->magic = MEMAREA_ELEM_MAGIC_NUM;
new_elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
new_elem->refcnt = 0;
TAILQ_INSERT_AFTER(&ma->elem_list, elem, new_elem, elem_node);
@@ -219,6 +221,8 @@ rte_memarea_alloc(struct rte_memarea *ma, size_t size,
uint32_t cookie)
memarea_lock(ma);
TAILQ_FOREACH(elem, &ma->free_list, free_node) {
+ if (unlikely(elem->magic != MEMAREA_ELEM_MAGIC_NUM))
+ break;
if (elem->size < size)
continue;
if (memarea_whether_add_node(elem->size, size))
@@ -251,6 +255,7 @@ memarea_merge_node(struct rte_memarea *ma, struct
memarea_elem *curr,
{
curr->size += next->size + sizeof(struct memarea_elem);
next->size = 0;
+ next->magic = ~MEMAREA_ELEM_MAGIC_NUM;
next->cookie = 0;
TAILQ_REMOVE(&ma->elem_list, next, elem_node);
if (del_next_from_free)
@@ -293,6 +298,13 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
*ptr, int16_t value)
return;
memarea_lock(ma);
+ if (unlikely(elem->magic != MEMAREA_ELEM_MAGIC_NUM)) {
+ RTE_LOG(ERR, MEMAREA, "memarea: %s magic: 0x%x check fail!\n",
+ ma->init.name, elem->magic);
+ memarea_unlock(ma);
+ return;
+ }
+
if (unlikely(ptr < ma->area_addr || ptr > ma->top_addr)) {
rte_memarea_update_refcnt(ma->init.bak_memarea, ptr, value);
memarea_unlock(ma);
@@ -346,8 +358,11 @@ memarea_elem_list_num(struct rte_memarea *ma)
struct memarea_elem *elem;
uint32_t num = 0;
- TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node) {
+ if (elem->magic != MEMAREA_ELEM_MAGIC_NUM)
+ break;
num++;
+ }
return num;
}
@@ -358,8 +373,11 @@ memarea_free_list_num(struct rte_memarea *ma)
struct memarea_elem *elem;
uint32_t num = 0;
- TAILQ_FOREACH(elem, &ma->free_list, free_node)
+ TAILQ_FOREACH(elem, &ma->free_list, free_node) {
+ if (elem->magic != MEMAREA_ELEM_MAGIC_NUM)
+ break;
num++;
+ }
return num;
}
@@ -370,9 +388,14 @@ memarea_dump_all(struct rte_memarea *ma, FILE *f)
struct memarea_elem *elem;
fprintf(f, " regions:\n");
- TAILQ_FOREACH(elem, &ma->elem_list, elem_node)
+ TAILQ_FOREACH(elem, &ma->elem_list, elem_node) {
+ if (elem->magic != MEMAREA_ELEM_MAGIC_NUM) {
+ fprintf(f, "magic: 0x%x check fail!\n",
elem->magic);
+ break;
+ }
fprintf(f, "size: 0x%zx cookie: 0x%x refcnt: %d\n",
elem->size, elem->cookie, elem->refcnt);
+ }
}
int
--
2.17.1
[PATCH v7 07/10] memarea: support backup memory mechanism
This patch adds a memarea backup mechanism, where an allocation request
which cannot be met by the current memarea is deferred to its backup
memarea.
Signed-off-by: Chengwen Feng
---
doc/guides/prog_guide/memarea_lib.rst | 4
lib/memarea/memarea_private.h | 2 ++
lib/memarea/rte_memarea.c | 22 ++
lib/memarea/rte_memarea.h | 11 +++
4 files changed, 39 insertions(+)
diff --git a/doc/guides/prog_guide/memarea_lib.rst
b/doc/guides/prog_guide/memarea_lib.rst
index 720d8099e2..feebafabcc 100644
--- a/doc/guides/prog_guide/memarea_lib.rst
+++ b/doc/guides/prog_guide/memarea_lib.rst
@@ -25,6 +25,10 @@ The main features are as follows:
* It supports MT-safe as long as it's specified at creation time.
+* It provides backup memory mechanism, the memarea could use another memarea
+ as a backup. It will attempts to allocate object from backup memarea when
+ the current memarea failed to allocate.
+
Library API Overview
diff --git a/lib/memarea/memarea_private.h b/lib/memarea/memarea_private.h
index 98406879b9..08735ca81f 100644
--- a/lib/memarea/memarea_private.h
+++ b/lib/memarea/memarea_private.h
@@ -23,11 +23,13 @@ struct rte_memarea {
struct rte_memarea_param init;
rte_spinlock_t lock;
void*area_addr;
+ void*top_addr;
struct memarea_elem_list elem_list;
struct memarea_elem_list free_list;
uint64_t alloc_fails;
uint64_t refcnt_check_fails;
+ uint64_t bak_alloc_fails;
} __rte_cache_aligned;
#endif /* MEMAREA_PRIVATE_H */
diff --git a/lib/memarea/rte_memarea.c b/lib/memarea/rte_memarea.c
index bc51d2a5ff..f95f89b6ec 100644
--- a/lib/memarea/rte_memarea.c
+++ b/lib/memarea/rte_memarea.c
@@ -132,6 +132,7 @@ rte_memarea_create(const struct rte_memarea_param *init)
TAILQ_INIT(&ma->elem_list);
TAILQ_INIT(&ma->free_list);
ma->area_addr = addr;
+ ma->top_addr = RTE_PTR_ADD(addr, init->total_sz - 1);
elem = addr;
elem->size = init->total_sz - sizeof(struct memarea_elem);
elem->cookie = MEMAREA_FREE_ELEM_COOKIE;
@@ -198,6 +199,15 @@ memarea_add_node(struct rte_memarea *ma, struct
memarea_elem *elem, size_t need_
elem->size = align_size;
}
+static inline void *
+memarea_alloc_backup(struct rte_memarea *ma, size_t size, uint32_t cookie)
+{
+ void *ptr = rte_memarea_alloc(ma->init.bak_memarea, size, cookie);
+ if (unlikely(ptr == NULL))
+ ma->bak_alloc_fails++;
+ return ptr;
+}
+
void *
rte_memarea_alloc(struct rte_memarea *ma, size_t size, uint32_t cookie)
{
@@ -219,6 +229,8 @@ rte_memarea_alloc(struct rte_memarea *ma, size_t size,
uint32_t cookie)
ptr = RTE_PTR_ADD(elem, sizeof(struct memarea_elem));
break;
}
+ if (unlikely(ptr == NULL && ma->init.bak_memarea != NULL))
+ ptr = memarea_alloc_backup(ma, size, cookie);
if (unlikely(ptr == NULL))
ma->alloc_fails++;
memarea_unlock(ma);
@@ -281,6 +293,12 @@ rte_memarea_update_refcnt(struct rte_memarea *ma, void
*ptr, int16_t value)
return;
memarea_lock(ma);
+ if (unlikely(ptr < ma->area_addr || ptr > ma->top_addr)) {
+ rte_memarea_update_refcnt(ma->init.bak_memarea, ptr, value);
+ memarea_unlock(ma);
+ return;
+ }
+
if (unlikely(elem->refcnt <= 0 || elem->refcnt + value < 0)) {
RTE_LOG(ERR, MEMAREA,
"memarea: %s cookie: 0x%x curr refcnt: %d update
refcnt: %d check fail!\n",
@@ -371,10 +389,14 @@ rte_memarea_dump(struct rte_memarea *ma, FILE *f, bool
dump_all)
fprintf(f, " algorithm: %s\n", memarea_alg_name(ma->init.alg));
fprintf(f, " total-size: 0x%zx\n", ma->init.total_sz);
fprintf(f, " mt-safe: %s\n", ma->init.mt_safe ? "yes" : "no");
+ if (ma->init.bak_memarea)
+ fprintf(f, " backup-memarea-name: %s\n",
ma->init.bak_memarea->init.name);
fprintf(f, " total-regions: %u\n", memarea_elem_list_num(ma));
fprintf(f, " total-free-regions: %u\n", memarea_free_list_num(ma));
fprintf(f, " alloc_fails: %" PRIu64 "\n", ma->alloc_fails);
fprintf(f, " refcnt_check_fails: %" PRIu64 "\n",
ma->refcnt_check_fails);
+ if (ma->init.bak_memarea)
+ fprintf(f, " backup_alloc_fails: %" PRIu64 "\n",
ma->bak_alloc_fails);
if (dump_all)
memarea_dump_all(ma, f);
memarea_unlock(ma);
diff --git a/lib/memarea/rte_memarea.h b/lib/memarea/rte_memarea.h
index 4bf2f36c7c..815d0e3d75 100644
--- a/lib/memarea/rte_memarea.h
+++ b/lib/memarea/rte_memarea.h
@@ -40,6 +40,13 @@
* specified, all the functions of the memarea API are lock-free, and assume
* to not be invoked in parallel on different logical cores to work on the
* s
Re: [PATCH v7 00/10] introduce memarea library
On 2022/10/8 19:58, Chengwen Feng wrote: > The memarea library is an allocator of variable-size object which based > on a memory region. The main features are as follows: > ... > > --- > v6: > * address Mattias's comments. > * repost patches as there are spread over different series in patchwork. Sorry about the confusion, the repost operation should be classified as v7. As it's cover-letter, I didn't send v8 to fix it. If necessary, I will send v8. > v5: > * fix 09/10 patch spell warning. > v4: > * repost patches as there are spread over different series in patchwork. > v3: > * add memory source of RTE memory. > * add algorithm field to facilitate the introduction of new algorithms. > * fix memarea log don't output problem. > v2: > * fix compile issues reported by dpdk-test-report. > * address Dimitry and Jerin's comments. > * add no MT-safe test. > > MAINTAINERS| 6 + > app/test/meson.build | 2 + > app/test/test_memarea.c| 420 > doc/api/doxy-api-index.md | 3 +- > doc/api/doxy-api.conf.in | 1 + > doc/guides/prog_guide/index.rst| 1 + > doc/guides/prog_guide/memarea_lib.rst | 56 > doc/guides/rel_notes/release_22_11.rst | 6 + > lib/eal/common/eal_common_log.c| 1 + > lib/eal/include/rte_log.h | 1 + > lib/memarea/memarea_private.h | 37 +++ > lib/memarea/meson.build| 16 + > lib/memarea/rte_memarea.c | 428 + > lib/memarea/rte_memarea.h | 234 ++ > lib/memarea/version.map| 16 + > lib/meson.build| 1 + > 16 files changed, 1228 insertions(+), 1 deletion(-) > create mode 100644 app/test/test_memarea.c > create mode 100644 doc/guides/prog_guide/memarea_lib.rst > create mode 100644 lib/memarea/memarea_private.h > create mode 100644 lib/memarea/meson.build > create mode 100644 lib/memarea/rte_memarea.c > create mode 100644 lib/memarea/rte_memarea.h > create mode 100644 lib/memarea/version.map >
RE: [PATCH v8 2/4] ethdev: introduce protocol hdr based buffer split
Hi Andrew,
> -Original Message-
> From: Andrew Rybchenko
> Sent: Thursday, October 6, 2022 6:12 PM
> To: Wang, YuanX ; dev@dpdk.org; Thomas
> Monjalon ; Ferruh Yigit
> Cc: ferruh.yi...@xilinx.com; m...@ashroe.eu; Li, Xiaoyun
> ; Singh, Aman Deep ;
> Zhang, Yuying ; Zhang, Qi Z
> ; Yang, Qiming ;
> jerinjac...@gmail.com; viachesl...@nvidia.com;
> step...@networkplumber.org; Ding, Xuan ;
> hpoth...@marvell.com; Tang, Yaqi ; Wenxuan Wu
>
> Subject: Re: [PATCH v8 2/4] ethdev: introduce protocol hdr based buffer split
>
> On 10/6/22 02:18, Yuan Wang wrote:
> > Currently, Rx buffer split supports length based split. With Rx queue
> > offload RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT enabled and Rx packet
> segment
> > configured, PMD will be able to split the received packets into
> > multiple segments.
> >
> > However, length based buffer split is not suitable for NICs that do
> > split based on protocol headers. Given an arbitrarily variable length
> > in Rx packet segment, it is almost impossible to pass a fixed protocol
> > header to driver. Besides, the existence of tunneling results in the
> > composition of a packet is various, which makes the situation even worse.
> >
> > This patch extends current buffer split to support protocol header
> > based buffer split. A new proto_hdr field is introduced in the
> > reserved field of rte_eth_rxseg_split structure to specify protocol
> > header. The proto_hdr field defines the split position of packet,
> > splitting will always happen after the protocol header defined in the
> > Rx packet segment. When Rx queue offload
> > RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT is enabled and corresponding
> protocol
> > header is configured, driver will split the ingress packets into multiple
> segments.
> >
> > Examples for proto_hdr field defines:
> > To split after ETH-IPV4-UDP, it should be defined as proto_hdr =
> > RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4_EXT_UNKNOWN |
> > RTE_PTYPE_L4_UDP
> >
> > For inner ETH-IPV4-UDP, it should be defined as proto_hdr =
> > RTE_PTYPE_TUNNEL_GRENAT | RTE_PTYPE_INNER_L2_ETHER |
> > RTE_PTYPE_INNER_L3_IPV4_EXT_UNKNOWN |
> > RTE_PTYPE_INNER_L4_UDP
> >
> > If the protocol header is repeated with the previously defined one,
> > the repeated part can be omitted. For example, split after ETH,
> > ETH-IPV4 and ETH-IPV4-UDP, it should be defined as
> > proto_hdr0 = RTE_PTYPE_L2_ETHER
> > proto_hdr1 = RTE_PTYPE_L3_IPV4_EXT_UNKNOWN
> > proto_hdr2 = RTE_PTYPE_L4_UDP
>
> Ack
>
> >
> > struct rte_eth_rxseg_split {
> > struct rte_mempool *mp; /* memory pools to allocate segment from
> */
> > uint16_t length; /* segment maximal data length,
> > configures split point */
> > uint16_t offset; /* data offset from beginning
> > of mbuf data buffer */
> > /**
> > * Proto_hdr defines a bit mask of the protocol sequence as
> > * RTE_PTYPE_*, configures split point. The last RTE_PTYPE*
> > * in the mask indicates the split position.
> > * If one protocol header is defined to split packets into two
> > * segments, for non-tunneling packets, the complete protocol
> > * sequence should be defined.
> > * For tunneling packets, for simplicity,
> > * only the tunnel and inner part of comple protocol sequence
> > * is required.
> > * If several protocol headers are defined to split packets into
> > * multi-segments, the repeated parts of adjacent segments
> > * should be omitted.
> > */
> > uint32_t proto_hdr;
> > };
>
> Sorry, but I see no reason to repeat in the descrtion.
> What is the purpose of the duplication?
The intension for repeating here is to make the commit log more comprehensive.
We can remove these lines to make log cleaner.
>
> >
> > If protocol header split can be supported by a PMD, the
> > rte_eth_buffer_split_get_supported_hdr_ptypes function can be use to
> > obtain a list of these protocol headers.
> >
> > For example, let's suppose we configured the Rx queue with the
> > following segments:
> > seg0 - pool0, proto_hdr0=RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4,
> > off0=2B
> > seg1 - pool1, proto_hdr1=RTE_PTYPE_L4_UDP, off1=128B
> > seg2 - pool2, off1=0B
> >
> > The packet consists of ETH_IPV4_UDP_PAYLOAD will be split like
> > following:
> > seg0 - ipv4 header @ RTE_PKTMBUF_HEADROOM + 2 in mbuf from
> pool0
> > seg1 - udp header @ 128 in mbuf from pool1
> > seg2 - payload @ 0 in mbuf from pool2
> >
> > Note: NIC will only do split when the packets exactly match all the
> > protocol headers in the segments. For example, if ARP packets received
> > with above config, the NIC won't do split for ARP packets since it
> > does not contains ipv4 header and udp header. These packets will be
> > put
>
> ipv4 -> IPv4, udp -> UDP.
>
> > into th
Any way to promote secondary process to primary process
Hello, I would like to kill the primary process and then promote the seconary process to primary. After checking the apis in dpdk source code, I think dpdk doesn't provide the promote interface. Any one knows why we don't have this interface? No usage scenario? or it's impossible to implement? Bellow is my scenario: I would like to upgrade my application(openvswitch). Because the hugepage initialization and dev probe is expensive, the application down time is very long(could be more than 10 seconds). So I would like to launch the new application(upgrade version) as secondary process, while keep the old application still running. New application shares memory from old application, so it can use the hugepage and already probed devices. Imediately old process is killed, new application starts forward packets. After old process(primary process) is killed, we would like to promote the new process from secondary to primary. Thanks, Cheng
Re: [PATCH v2 0/8] ethdev: introduce hairpin memory capabilities
06/10/2022 13:00, Dariusz Sosnowski: > The hairpin queues are used to transmit packets received on the wire, back to > the wire. > How hairpin queues are implemented and configured is decided internally by > the PMD and > applications have no control over the configuration of Rx and Tx hairpin > queues. > This patchset addresses that by: > > - Extending hairpin queue capabilities reported by PMDs. > - Exposing new configuration options for Rx and Tx hairpin queues. > > Main goal of this patchset is to allow applications to provide configuration > hints > regarding memory placement of hairpin queues. > These hints specify whether buffers of hairpin queues should be placed in > host memory > or in dedicated device memory. > > For example, in context of NVIDIA Connect-X and BlueField devices, > this distinction is important for several reasons: > > - By default, data buffers and packet descriptors are placed in device memory > region > which is shared with other resources (e.g. flow rules). > This results in memory contention on the device, > which may lead to degraded performance under heavy load. > - Placing hairpin queues in dedicated device memory can decrease latency of > hairpinned traffic, > since hairpin queue processing will not be memory starved by other > operations. > Side effect of this memory configuration is that it leaves less memory for > other resources, > possibly causing memory contention in non-hairpin traffic. > - Placing hairpin queues in host memory can increase throughput of hairpinned > traffic at the cost of increasing latency. > Each packet processed by hairpin queues will incur additional PCI > transactions (increase in latency), > but memory contention on the device is avoided. > > Depending on the workload and whether throughput or latency has a higher > priority for developers, > it would be beneficial if developers could choose the best hairpin > configuration for their use case. > > To address that, this patchset adds the following configuration options (in > rte_eth_hairpin_conf struct): > > - use_locked_device_memory - If set, PMD will allocate specialized on-device > memory for the queue. > - use_rte_memory - If set, PMD will use DPDK-managed memory for the queue. > - force_memory - If set, PMD will be forced to use provided memory > configuration. > If no appropriate resources are available, the queue allocation will fail. > If unset and no appropriate resources are available, PMD will fallback to > its default behavior. > > Implementing support for these flags is optional and applications should be > allowed to not set any of these new flags. > This will result in default memory configuration provided by the PMD. > Application developers should consult the PMD documentation in that case. > > These changes were originally proposed in > http://patches.dpdk.org/project/dpdk/patch/20220811120530.191683-1-dsosnow...@nvidia.com/. > > Dariusz Sosnowski (8): > ethdev: introduce hairpin memory capabilities > common/mlx5: add hairpin SQ buffer type capabilities > common/mlx5: add hairpin RQ buffer type capabilities > net/mlx5: allow hairpin Tx queue in RTE memory > net/mlx5: allow hairpin Rx queue in locked memory > doc: add notes for hairpin to mlx5 documentation > app/testpmd: add hairpin queues memory modes > app/flow-perf: add hairpin queue memory config Doc squashed in mlx5 commits. Applied, thanks.
Re: [PATCH v8 0/4] ethdev: support mulitiple mbuf pools per Rx queue
07/10/2022 19:29, Andrew Rybchenko: > I'm not sure in testpmd patch. Review would be useful and may be we > should postpone it to rc2. > > v8: > - Process review notes > v7: > - Drop RTE_ETH_RX_OFFLOAD_MUL_MEMPOOL offload which seems to be >unnecessary. Positive max_rx_mempools in dev_info is sufficient to >indicate that the capability is support and positive number of >mempools in Rx configuration is sufficient to request it. > - Add helper patch to factor out Rx mempool check to be shared >for single mempool, buffer split and multiple mempools case. > - Refine check for a way to provide Rx buffers to be one and only one. >Either single mempool, or buffer split, or multi mempool. > - Drop feature advertisement in net/cnxk patch since there is no >such feature defined yet. I have no strong opinion if a new feature >is required or not. > v6: > - Updated release notes, release_22_11.rst. > v5: > - Declared memory pools as struct rte_mempool **rx_mempools rather than >as struct rte_mempool *mp. > - Added the feature in release notes. > - Updated conditions and strings as per review comments. > v4: > - Renamed Offload capability name from RTE_ETH_RX_OFFLOAD_BUFFER_SORT >to RTE_ETH_RX_OFFLOAD_MUL_MEMPOOL. > - In struct rte_eth_rxconf, defined new pointer, which holds array of >type struct rte_eth_rx_mempool(memory pools). This array is used >by PMD to program multiple mempools. > v3: > - Implemented Pool Sort capability as new Rx offload capability, >RTE_ETH_RX_OFFLOAD_BUFFER_SORT. > v2: > - Along with spec changes, uploading testpmd and driver changes. > > Andrew Rybchenko (1): > ethdev: factor out helper function to check Rx mempool > > Hanumanth Pothula (3): > ethdev: support multiple mbuf pools per Rx queue > net/cnxk: support mulitiple mbuf pools per Rx queue > app/testpmd: support mulitiple mbuf pools per Rx queue Applied, except testpmd patch, as recommended by Andrew, thanks.
Re: [PATCH v4] mempool: fix get objects from mempool with cache
07/10/2022 12:44, Andrew Rybchenko: > From: Morten Brørup > > A flush threshold for the mempool cache was introduced in DPDK version > 1.3, but rte_mempool_do_generic_get() was not completely updated back > then, and some inefficiencies were introduced. > > Fix the following in rte_mempool_do_generic_get(): > > 1. The code that initially screens the cache request was not updated > with the change in DPDK version 1.3. > The initial screening compared the request length to the cache size, > which was correct before, but became irrelevant with the introduction of > the flush threshold. E.g. the cache can hold up to flushthresh objects, > which is more than its size, so some requests were not served from the > cache, even though they could be. > The initial screening has now been corrected to match the initial > screening in rte_mempool_do_generic_put(), which verifies that a cache > is present, and that the length of the request does not overflow the > memory allocated for the cache. > > This bug caused a major performance degradation in scenarios where the > application burst length is the same as the cache size. In such cases, > the objects were not ever fetched from the mempool cache, regardless if > they could have been. > This scenario occurs e.g. if an application has configured a mempool > with a size matching the application's burst size. > > 2. The function is a helper for rte_mempool_generic_get(), so it must > behave according to the description of that function. > Specifically, objects must first be returned from the cache, > subsequently from the backend. > After the change in DPDK version 1.3, this was not the behavior when > the request was partially satisfied from the cache; instead, the objects > from the backend were returned ahead of the objects from the cache. > This bug degraded application performance on CPUs with a small L1 cache, > which benefit from having the hot objects first in the returned array. > (This is probably also the reason why the function returns the objects > in reverse order, which it still does.) > Now, all code paths first return objects from the cache, subsequently > from the backend. > > The function was not behaving as described (by the function using it) > and expected by applications using it. This in itself is also a bug. > > 3. If the cache could not be backfilled, the function would attempt > to get all the requested objects from the backend (instead of only the > number of requested objects minus the objects available in the backend), > and the function would fail if that failed. > Now, the first part of the request is always satisfied from the cache, > and if the subsequent backfilling of the cache from the backend fails, > only the remaining requested objects are retrieved from the backend. > > The function would fail despite there are enough objects in the cache > plus the common pool. > > 4. The code flow for satisfying the request from the cache was slightly > inefficient: > The likely code path where the objects are simply served from the cache > was treated as unlikely. Now it is treated as likely. > > Signed-off-by: Morten Brørup > Signed-off-by: Andrew Rybchenko > Reviewed-by: Morten Brørup Applied, thanks.
[PATCH v4] net/bonding: call Tx prepare before Tx burst
Normally, to use the HW offloads capability (e.g. checksum and TSO) in
the Tx direction, the application needs to call rte_eth_tx_prepare() to
do some adjustment with the packets before sending them. But the
tx_prepare callback of the bonding driver is not implemented. Therefore,
the sent packets may have errors (e.g. checksum errors).
However, it is difficult to design the tx_prepare callback for bonding
driver. Because when a bonded device sends packets, the bonded device
allocates the packets to different slave devices based on the real-time
link status and bonding mode. That is, it is very difficult for the
bonded device to determine which slave device's prepare function should
be invoked.
So in this patch, the tx_prepare callback of bonding driver is not
implemented. Instead, the rte_eth_tx_prepare() will be called before
rte_eth_tx_burst(). In this way, all tx_offloads can be processed
correctly for all NIC devices.
Note: because it is rara that bond different PMDs together, so just
call tx-prepare once in broadcast bonding mode.
Also the following description was added to the rte_eth_tx_burst()
function:
"@note This function must not modify mbufs (including packets data)
unless the refcnt is 1. The exception is the bonding PMD, which does not
have tx-prepare function, in this case, mbufs maybe modified."
Signed-off-by: Chengchang Tang
Signed-off-by: Chengwen Feng
Reviewed-by: Min Hu (Connor)
---
v4: address Chas and Konstantin's comments.
v3: support tx-prepare when Tx internal generate mbufs.
v2: support tx-prepare enable flag and fail stats.
---
drivers/net/bonding/rte_eth_bond_8023ad.c | 10 -
drivers/net/bonding/rte_eth_bond_pmd.c| 45 ++-
lib/ethdev/rte_ethdev.h | 4 ++
3 files changed, 47 insertions(+), 12 deletions(-)
diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c
b/drivers/net/bonding/rte_eth_bond_8023ad.c
index b3cddd8a20..29a71ae0bf 100644
--- a/drivers/net/bonding/rte_eth_bond_8023ad.c
+++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
@@ -636,9 +636,12 @@ tx_machine(struct bond_dev_private *internals, uint16_t
slave_id)
return;
}
} else {
- uint16_t pkts_sent = rte_eth_tx_burst(slave_id,
+ uint16_t pkts_sent = rte_eth_tx_prepare(slave_id,
internals->mode4.dedicated_queues.tx_qid,
&lacp_pkt, 1);
+ pkts_sent = rte_eth_tx_burst(slave_id,
+ internals->mode4.dedicated_queues.tx_qid,
+ &lacp_pkt, pkts_sent);
if (pkts_sent != 1) {
rte_pktmbuf_free(lacp_pkt);
set_warning_flags(port, WRN_TX_QUEUE_FULL);
@@ -1371,9 +1374,12 @@ bond_mode_8023ad_handle_slow_pkt(struct bond_dev_private
*internals,
}
} else {
/* Send packet directly to the slow queue */
- uint16_t tx_count = rte_eth_tx_burst(slave_id,
+ uint16_t tx_count = rte_eth_tx_prepare(slave_id,
internals->mode4.dedicated_queues.tx_qid,
&pkt, 1);
+ tx_count = rte_eth_tx_burst(slave_id,
+
internals->mode4.dedicated_queues.tx_qid,
+ &pkt, tx_count);
if (tx_count != 1) {
/* reset timer */
port->rx_marker_timer = 0;
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index fd2d95a751..fdc004ba46 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -602,8 +602,11 @@ bond_ethdev_tx_burst_round_robin(void *queue, struct
rte_mbuf **bufs,
/* Send packet burst on each slave device */
for (i = 0; i < num_of_slaves; i++) {
if (slave_nb_pkts[i] > 0) {
+ num_tx_slave = rte_eth_tx_prepare(slaves[i],
+ bd_tx_q->queue_id, slave_bufs[i],
+ slave_nb_pkts[i]);
num_tx_slave = rte_eth_tx_burst(slaves[i],
bd_tx_q->queue_id,
- slave_bufs[i], slave_nb_pkts[i]);
+ slave_bufs[i], num_tx_slave);
/* if tx burst fails move packets to end of bufs */
if (unlikely(num_tx_slave < slave_nb_pkts[i])) {
@@ -628,6 +631,7 @@ bond_ethdev_tx_burst_active_backup(void *queue,
{
struct bond_dev_private *internals;
struct bond_tx_queue *bd_tx_q;
+ uint16_t nb_prep_pkts;
bd_tx_q = (struct bond_tx_queue *)queue;
internals = bd_tx_q->dev_private;
@@ -635,8 +639,11 @@ bond_ethdev_tx
RE: [PATCH] net/iavf: fix memory leak in flow subscription
> -Original Message-
> From: Wang, Jie1X
> Sent: Saturday, October 8, 2022 2:34 PM
> To: dev@dpdk.org
> Cc: Yang, SteveX ; Zhang, Qi Z
> ; Yang, Qiming ; Wu,
> Jingjing ; Xing, Beilei ; Wang,
> Jie1X
> Subject: [PATCH] net/iavf: fix memory leak in flow subscription
>
> When creating flow subscription pattern that it might cause a memory leak.
>
> This patch fix the error by adding a free memory code.
>
> And some typos have also been fixed.
>
> Coverity issue: 381130
> Fixes: b110b2f63e50 ("net/iavf: add flow subscrption supported pattern")
> Fixes: 6416f63aae8b ("net/iavf: support flow subscription rule")
>
> Signed-off-by: Jie Wang
Acked-by: Qi Zhang
Applied to dpdk-next-net-intel.
Thanks
Qi
RE: [PATCH v3] net/iavf: fix error of virtchnl command
> -Original Message-
> From: Yiding Zhou
> Sent: Saturday, October 8, 2022 4:49 PM
> To: dev@dpdk.org
> Cc: Wu, Jingjing ; Xing, Beilei
> ; Zhou, YidingX ;
> sta...@dpdk.org
> Subject: [PATCH v3] net/iavf: fix error of virtchnl command
...
> When the device is bonded, bond pmd will register callback for LSC event.
> This callback will execute some virtchnl commands in eal-intr-thread to
> reinitialize the device with interrupts disabled. In this case, responses to
> all
> commands not be received.
>
> This commit starts a thread to handle all events to fix this issue.
>
> Fixes: 48de41ca11f0 ("net/avf: enable link status update")
> CC: sta...@dpdk.org
>
> Signed-off-by: Yiding Zhou
> ---
> +
> static uint32_t
> iavf_convert_link_speed(enum virtchnl_link_speed virt_link_speed) { @@ -
> 293,7 +427,7 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev,
> uint8_t *msg,
> vf->link_speed = iavf_convert_link_speed(speed);
> }
> iavf_dev_link_update(dev, 0);
> - rte_eth_dev_callback_process(dev,
> RTE_ETH_EVENT_INTR_LSC, NULL);
> + iavf_dev_event_post(dev, RTE_ETH_EVENT_INTR_LSC, NULL);
If we decide to raise an etherdev event from a separate thread, is it better to
do this for all events ?
