[PATCH 2/3] graph: add support for node free API
From: Kiran Kumar K
Add support for rte_node_free API to free the node and its
memory, if node is not part of any of the created graphs.
Signed-off-by: Kiran Kumar K
---
lib/graph/graph.c | 16
lib/graph/graph_private.h | 13 +
lib/graph/node.c | 21 +
lib/graph/rte_graph.h | 15 +++
lib/graph/version.map | 7 +++
5 files changed, 72 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index dff8e690a8..80b5bde757 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -20,6 +20,22 @@
static struct graph_head graph_list = STAILQ_HEAD_INITIALIZER(graph_list);
static rte_spinlock_t graph_lock = RTE_SPINLOCK_INITIALIZER;
+uint8_t
+graph_is_node_activ_in_graph(struct node *node)
+{
+ struct graph *graph;
+
+ STAILQ_FOREACH(graph, &graph_list, next) {
+ struct graph_node *graph_node;
+
+ STAILQ_FOREACH(graph_node, &graph->node_list, next)
+ if (graph_node->node == node)
+ return 1;
+ }
+
+ return 0;
+}
+
/* Private functions */
static struct graph *
graph_from_id(rte_graph_t id)
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index fdaf5649b8..af5a3986ad 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -440,4 +440,17 @@ int graph_sched_wq_create(struct graph *_graph, struct
graph *_parent_graph,
*/
void graph_sched_wq_destroy(struct graph *_graph);
+/**
+ * @internal
+ *
+ * Check if given node present in any of the created graphs.
+ *
+ * @param node
+ * The node object
+ *
+ * @return
+ * 0 if not present in any graph, else return 1.
+ */
+uint8_t graph_is_node_activ_in_graph(struct node *_node);
+
#endif /* _RTE_GRAPH_PRIVATE_H_ */
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 0f382d744c..8f4d8661c7 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -476,3 +476,24 @@ rte_node_max_count(void)
}
return node_id;
}
+
+int
+rte_node_free(rte_node_t id)
+{
+ struct node *node;
+
+ if (node_from_id(id) == NULL)
+ goto fail;
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (id == node->id) {
+ if (graph_is_node_activ_in_graph(node))
+ return -1;
+ STAILQ_REMOVE(&node_list, node, node, next);
+ free(node);
+ return 0;
+ }
+ }
+fail:
+ return -1;
+}
diff --git a/lib/graph/rte_graph.h b/lib/graph/rte_graph.h
index f5e575dbed..097d0dc9d5 100644
--- a/lib/graph/rte_graph.h
+++ b/lib/graph/rte_graph.h
@@ -22,6 +22,7 @@
#include
#include
+#include
#ifdef __cplusplus
extern "C" {
@@ -661,6 +662,20 @@ rte_node_is_invalid(rte_node_t id)
return (id == RTE_NODE_ID_INVALID);
}
+/**
+ * Release the memory allocated for a node created using RTE_NODE_REGISTER or
rte_node_clone,
+ * if it is not linked to any graphs.
+ *
+ * @param id
+ * Node id to check.
+ *
+ * @return
+ * - 0: Success.
+ * -<0: Failure.
+ */
+__rte_experimental
+int rte_node_free(rte_node_t id);
+
/**
* Test the validity of edge id.
*
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 44fadc00fd..bbbebcf87e 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -59,3 +59,10 @@ EXPERIMENTAL {
# added in 24.11
rte_node_xstat_increment;
};
+
+EXPERIMENTAL {
+ global:
+
+ # added in 25.03
+ rte_node_free;
+};
--
2.43.0
[PATCH 3/3] test/graph: fix graph autotest second run test failure
From: Kiran Kumar K
The graph autotest second run test is failing due to the
node name is already present in the node list. Adding changes
to free nodes at the time of test cleanup.
Fixes: 6b89650418fe ("test/graph: add functional tests")
Signed-off-by: Kiran Kumar K
---
app/test/test_graph.c | 96 ---
1 file changed, 90 insertions(+), 6 deletions(-)
diff --git a/app/test/test_graph.c b/app/test/test_graph.c
index 2840a25b13..e712dbebf7 100644
--- a/app/test/test_graph.c
+++ b/app/test/test_graph.c
@@ -68,6 +68,8 @@ static void *mbuf_p[MAX_NODES + 1][MBUFF_SIZE];
static rte_graph_t graph_id;
static uint64_t obj_stats[MAX_NODES + 1];
static uint64_t fn_calls[MAX_NODES + 1];
+static uint32_t dummy_nodes_id[MAX_NODES];
+static int dummy_nodes_id_count;
const char *node_patterns[] = {
"test_node_source1", "test_node00",
@@ -541,6 +543,66 @@ test_lookup_functions(void)
return 0;
}
+static int
+test_node_id(void)
+{
+ uint32_t node_id, odummy_id, dummy_id, dummy_id1;
+
+ node_id = rte_node_from_name("test_node00");
+
+ dummy_id = rte_node_clone(node_id, "test_node_id00");
+ if (rte_node_is_invalid(dummy_id)) {
+ printf("Got invalid id when clone\n");
+ return -1;
+ }
+
+ dummy_id1 = rte_node_clone(node_id, "test_node_id01");
+ if (rte_node_is_invalid(dummy_id1)) {
+ printf("Got invalid id when clone\n");
+ return -1;
+ }
+
+ /* Expect next node id to be node_id + 1 */
+ if ((dummy_id + 1) != dummy_id1) {
+ printf("Node id didn't match, expected = %d got = %d\n",
+ dummy_id+1, dummy_id1);
+ return -1;
+ }
+
+ odummy_id = dummy_id;
+ /* Free one of the cloned node */
+ if (rte_node_free(dummy_id)) {
+ printf("Failed to free node\n");
+ return -1;
+ }
+
+ /* Clone again, should get the same id, that is freed */
+ dummy_id = rte_node_clone(node_id, "test_node_id00");
+ if (rte_node_is_invalid(dummy_id)) {
+ printf("Got invalid id when clone\n");
+ return -1;
+ }
+
+ if (dummy_id != odummy_id) {
+ printf("Node id didn't match, expected = %d got = %d\n",
+ odummy_id, dummy_id);
+ return -1;
+ }
+
+ /* Free the node */
+ if (rte_node_free(dummy_id)) {
+ printf("Failed to free node\n");
+ return -1;
+ }
+
+ if (rte_node_free(dummy_id1)) {
+ printf("Failed to free node\n");
+ return -1;
+ }
+
+ return 0;
+}
+
static int
test_node_clone(void)
{
@@ -551,11 +613,12 @@ test_node_clone(void)
node_id = rte_node_from_name("test_node00");
tm->test_node[0].idx = node_id;
- dummy_id = rte_node_clone(node_id, "test_node00");
- if (rte_node_is_invalid(dummy_id)) {
+ dummy_nodes_id[dummy_nodes_id_count] = rte_node_clone(node_id,
"test_node00");
+ if (rte_node_is_invalid(dummy_nodes_id[dummy_nodes_id_count])) {
printf("Got invalid id when clone, Expecting fail\n");
return -1;
}
+ dummy_nodes_id_count++;
/* Clone with same name, should fail */
dummy_id = rte_node_clone(node_id, "test_node00");
@@ -635,15 +698,15 @@ test_create_graph(void)
.nb_node_patterns = 6,
.node_patterns = node_patterns_dummy,
};
- uint32_t dummy_node_id;
uint32_t node_id;
node_id = rte_node_from_name("test_node00");
- dummy_node_id = rte_node_clone(node_id, "dummy_node");
- if (rte_node_is_invalid(dummy_node_id)) {
+ dummy_nodes_id[dummy_nodes_id_count] = rte_node_clone(node_id,
"dummy_node");
+ if (rte_node_is_invalid(dummy_nodes_id[dummy_nodes_id_count])) {
printf("Got invalid node id\n");
return -1;
}
+ dummy_nodes_id_count++;
graph_id = rte_graph_create("worker0", &gconf);
if (graph_id != RTE_GRAPH_ID_INVALID) {
@@ -1026,17 +1089,38 @@ graph_setup(void)
}
printf("test_node_clone: pass\n");
+ if (test_node_id()) {
+ printf("test_node_id: fail\n");
+ return -1;
+ }
+ printf("test_node_id: pass\n");
+
return 0;
}
static void
graph_teardown(void)
{
- int id;
+ int id, i;
id = rte_graph_destroy(rte_graph_from_name("worker0"));
if (id)
printf("Graph Destroy failed\n");
+
+ for (i = 1; i < MAX_NODES; i++) {
+ if (rte_node_free(test_main.test_node[i].idx)) {
+ printf("Node free failed\n");
+ return;
+ }
+ }
+
+ for (i = 0; i < dummy_nodes_id_count; i++) {
+ if (rte_node_free(dummy_nodes_id
[PATCH 1/3] graph: avoid global node ID counter
From: Kiran Kumar K
The node id is determined based on a global variable that is
incremented every time a node is created. Adding changes to
remove the global counter. Make sure that the node list is always
ordered by increasing node ids. When creating a new node, pick a free
id which is not allocated.
Signed-off-by: Kiran Kumar K
---
lib/graph/graph_private.h | 8
lib/graph/node.c | 81 +--
2 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index da48d73587..fdaf5649b8 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -29,14 +29,6 @@ extern int rte_graph_logtype;
#define graph_info(...) GRAPH_LOG(INFO, __VA_ARGS__)
#define graph_dbg(...) GRAPH_LOG(DEBUG, __VA_ARGS__)
-#define ID_CHECK(id, id_max)
\
- do { \
- if ((id) >= (id_max)) {\
- rte_errno = EINVAL;\
- goto fail; \
- } \
- } while (0)
-
#define SET_ERR_JMP(err, where, fmt, ...)
\
do { \
graph_err(fmt, ##__VA_ARGS__); \
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 63db629da8..0f382d744c 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -15,9 +15,51 @@
#include "graph_private.h"
static struct node_head node_list = STAILQ_HEAD_INITIALIZER(node_list);
-static rte_node_t node_id;
-#define NODE_ID_CHECK(id) ID_CHECK(id, node_id)
+static struct node *
+node_from_id(rte_node_t id)
+{
+ struct node *node;
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (node->id == id)
+ return node;
+ }
+ rte_errno = EINVAL;
+ return NULL;
+}
+
+static rte_node_t
+next_next_free_id(void)
+{
+ struct node *node;
+ rte_node_t id = 0;
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (id < node->id)
+ break;
+ id = node->id + 1;
+ }
+ return id;
+}
+
+static void
+node_insert_ordered(struct node *node)
+{
+ struct node *after, *g;
+
+ after = NULL;
+ STAILQ_FOREACH(g, &node_list, next) {
+ if (g->id < node->id)
+ after = g;
+ else if (g->id > node->id)
+ break;
+ }
+ if (after == NULL)
+ STAILQ_INSERT_HEAD(&node_list, node, next);
+ else
+ STAILQ_INSERT_AFTER(&node_list, after, node, next);
+}
/* Private functions */
struct node_head *
@@ -116,10 +158,10 @@ __rte_node_register(const struct rte_node_register *reg)
}
node->lcore_id = RTE_MAX_LCORE;
- node->id = node_id++;
+ node->id = next_next_free_id();
- /* Add the node at tail */
- STAILQ_INSERT_TAIL(&node_list, node, next);
+ /* Add the node in ordered list */
+ node_insert_ordered(node);
graph_spinlock_unlock();
return node->id;
@@ -194,7 +236,9 @@ rte_node_clone(rte_node_t id, const char *name)
{
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
+
STAILQ_FOREACH(node, &node_list, next)
if (node->id == id)
return node_clone(node, name);
@@ -220,7 +264,8 @@ rte_node_id_to_name(rte_node_t id)
{
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
STAILQ_FOREACH(node, &node_list, next)
if (node->id == id)
return node->name;
@@ -234,7 +279,8 @@ rte_node_edge_count(rte_node_t id)
{
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
STAILQ_FOREACH(node, &node_list, next)
if (node->id == id)
return node->nb_edges;
@@ -303,7 +349,8 @@ rte_node_edge_shrink(rte_node_t id, rte_edge_t size)
rte_edge_t rc = RTE_EDGE_ID_INVALID;
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
graph_spinlock_lock();
STAILQ_FOREACH(node, &node_list, next) {
@@ -330,7 +377,8 @@ rte_node_edge_update(rte_node_t id, rte_edge_t from, const
char **next_nodes,
rte_edge_t rc = RTE_EDGE_ID_INVALID;
struct node *n, *prev;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
graph_spinlock_lock();
Re: [PATCH] config: limit lcore variable maximum size to 4k
On 2024-11-09 00:11, Thomas Monjalon wrote: 08/11/2024 23:34, Mattias Rönnblom: On 2024-11-08 23:13, Thomas Monjalon wrote: 08/11/2024 20:53, Morten Brørup: From: Morten Brørup [mailto:m...@smartsharesystems.com] Sent: Friday, 8 November 2024 19.35 From: David Marchand [mailto:david.march...@redhat.com] Sent: Friday, 8 November 2024 19.18 OVS locks all pages to avoid page faults while processing packets. It sounds smart, so I just took a look at how it does this. I'm not sure, but it seems like it only locks pages that are actually mapped (current and future). 1M for each lcore translates to allocating 128M with default build options on x86. This resulted in OOM while running unit tests in parallel. Is the root cause the lcore variables library itself, or the unit test using a lot of memory for testing the lcore variables? We don't want to fix the library if the problem is elsewhere. The fix works for our urgent issue and we want to make a release candidate soon. At the moment, the more demanding DPDK user of lcore variable is rte_service, with a 2112 bytes object. Limit the lcore variable maximum size to 4k which looks more reasonable. 4 KB is not future proof. Here's an example where 16 KB is cutting it close: https://inbox.dpdk.org/dev/98CBD80474FA8B44BF855DF32C47DC35E9F7D0@smart server.smartshare.dk/ Depends on how we are going to use it. 4 KB suffices if we only want to use it for "small" structures. This is what is stated in the doc: "Lcore variables are suitable for small objects" "The amount of data kept in lcore variables is projected to be small" Would 64 KB work as a compromise? Let's consider based on the need. The lcore variables are new and we don't want it to degrade the DPDK footprint, at least not in this first version. 4 KB is a memory page on common systems, it looks reasonnable and big enough for a "variable". Applied, thanks. Why do you have maintainers if you just ignore them? I didn't receive your replies when I started to write this. Please be comprehensive. We are in a hurry to stabilize this before the release candidate which is already late. I'll change to 128 KB as you recommend before pushing to the repository. Thanks. PS: maybe I should not have merged this feature in 24.11. Ideally, it should have been merged earlier in the release cycle. I did offer the documentation you asked for as a separate patch, to be delivered later.
Re: [PATCH] config: limit lcore variable maximum size to 4k
On 2024-11-09 00:52, Morten Brørup wrote: From: Mattias Rönnblom [mailto:hof...@lysator.liu.se] Sent: Friday, 8 November 2024 23.23 On 2024-11-08 20:53, Morten Brørup wrote: From: Morten Brørup [mailto:m...@smartsharesystems.com] Sent: Friday, 8 November 2024 19.35 From: David Marchand [mailto:david.march...@redhat.com] Sent: Friday, 8 November 2024 19.18 OVS locks all pages to avoid page faults while processing packets. It sounds smart, so I just took a look at how it does this. I'm not sure, but it seems like it only locks pages that are actually mapped (current and future). mlockall(MLOCK_CURRENT) will bring in the whole BSS, it seems. Plus all the rest like unused parts of the execution stacks, the data section and unused code (text) in the binary and all libraries it has linked to. It makes a simple (e.g., a unit test) DPDK 24.07 program use ~33x more residential memory. After lcore variables, the same MLOCK_CURRENT-ed program is ~30% larger than before. So, a relatively modest increase. Thank you for testing this, Mattias. What are the absolute numbers, i.e. in KB, to get an idea of the numbers I should be looking for? Hello world type program with static linking. Default DPDK config. x86_64. DPDK version MAX_LCORE_VAR EAL params mlock RSS [MB] 22.11 - --no-huge -m 1000 no 22 24.11 1048576 --no-huge -m 1000 no 22 24.11 1048576 --no-huge -m 1000 yes1576 24.11 4096--no-huge -m 1000 yes1445 22.11 - - yes333* 24.11 1048576 - yes542* 24.11 4096- yes411* * Excluding huge pages If you are more selective what libraries you bring in, the footprint will be lower. How large a fraction is effectively unavoidable, I don't know. The relative increase will depends on how much memory the application uses, obviously. The hello world app doesn't have any app-level state. I wonder why the footprint grows at all... Intuitively the same variables should consume approximately the same amount of RAM, regardless how they are allocated. Speculating... lcore variables use malloc(), which in turn does not bring in memory pages unless they are needed. Much of the lcore buffer will be unused, and not resident. I covered this, including some example calculation of the space savings, in an earlier thread. It may be in the programmer's guide as well, I don't remember. The lcore_states were allocated through rte_calloc() and thus used some space in the already allocated hugepages, so they didn't add more pages to the footprint. But they do when allocated and initialized as lcore variables. The first lcore variable allocated/initialized uses RTE_MAX_LCORE (128) pages of 4 KB each = 512 KB total. It seems unlikely that adding 512 KB increases the footprint by 30 %. mlockall() brings in all currently-untouched malloc()ed pages, growing the set of residential pages. The numbers are less drastic, obviously, for many real-world programs, which have large packet pools and other memory hogs. Agree. However, it would be good to understand why switching to lcore variables has this effect on the footprint when using mlockall() like OVS.
RE: [EXTERNAL] [PATCH v2] graph: mcore: optimize graph search
> -Original Message-
> From: Huichao Cai
> Sent: Monday, November 11, 2024 9:33 AM
> To: Jerin Jacob ; Kiran Kumar Kokkilagadda
> ; Nithin Kumar Dabilpuram
> ; yanzhirun_...@163.com
> Cc: dev@dpdk.org; Huichao cai
> Subject: [EXTERNAL] [PATCH v2] graph: mcore: optimize graph search
>
> From: Huichao cai In the function
> __rte_graph_mcore_dispatch_sched_node_enqueue, use a slower loop to
> search for the graph, modify the search logic to record the result of the
> first
> search, and use this record for subsequent
> From: Huichao cai
>
> In the function __rte_graph_mcore_dispatch_sched_node_enqueue,
> use a slower loop to search for the graph, modify the search logic to record
> the
> result of the first search, and use this record for subsequent searches to
> improve search speed.
>
> Signed-off-by: Huichao cai
> ---
> lib/graph/rte_graph_model_mcore_dispatch.c | 11 +++
> lib/graph/rte_graph_worker_common.h| 1 +
> 2 files changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/lib/graph/rte_graph_model_mcore_dispatch.c
> b/lib/graph/rte_graph_model_mcore_dispatch.c
> index a590fc9..a81d338 100644
> --- a/lib/graph/rte_graph_model_mcore_dispatch.c
> +++ b/lib/graph/rte_graph_model_mcore_dispatch.c
> @@ -118,11 +118,14 @@
> struct rte_graph_rq_head *rq) {
> const unsigned int lcore_id = node->dispatch.lcore_id;
> - struct rte_graph *graph;
> + struct rte_graph *graph = node->dispatch.graph;
>
> - SLIST_FOREACH(graph, rq, next)
> - if (graph->dispatch.lcore_id == lcore_id)
> - break;
> + if (unlikely((!graph) || (graph->dispatch.lcore_id != lcore_id))) {
> + SLIST_FOREACH(graph, rq, next)
> + if (graph->dispatch.lcore_id == lcore_id)
> + break;
> + node->dispatch.graph = graph;
> + }
>
> return graph != NULL ? __graph_sched_node_enqueue(node, graph) :
> false; } diff --git a/lib/graph/rte_graph_worker_common.h
> b/lib/graph/rte_graph_worker_common.h
> index a518af2..4c2432b 100644
> --- a/lib/graph/rte_graph_worker_common.h
> +++ b/lib/graph/rte_graph_worker_common.h
> @@ -110,6 +110,7 @@ struct __rte_cache_aligned rte_node {
> unsigned int lcore_id; /**< Node running lcore. */
> uint64_t total_sched_objs; /**< Number of objects
> scheduled. */
> uint64_t total_sched_fail; /**< Number of scheduled
> failure. */
> + struct rte_graph *graph; /**< Graph corresponding to
> lcore_id. */
Need to conclude the ABI related discussion here before making change
https://patches.dpdk.org/project/dpdk/patch/1730966682-2632-1-git-send-email-chcch...@163.com/
> } dispatch;
> };
> rte_graph_off_t xstat_off; /**< Offset to xstat counters. */
> --
> 1.8.3.1
RE: [EXT] Re: [v5 00/42] DPAA2 specific patches
Hi Thomas, Thanks a lot for helping merge these patches. We apologize for the inconvenience caused to you resolving the issues. We'll be more vigilant in future reviews to avoid similar disruptions. Regards, Vanshika > -Original Message- > From: Thomas Monjalon > Sent: Sunday, November 10, 2024 7:04 AM > To: Vanshika Shukla ; Gagandeep Singh > ; Hemant Agrawal ; Jun > Yang ; Rohit Raj > Cc: dev@dpdk.org; David Marchand > Subject: [EXT] Re: [v5 00/42] DPAA2 specific patches > > Caution: This is an external email. Please take care when clicking links or > opening attachments. When in doubt, report the message using the 'Report > this email' button > > > 23/10/2024 13:59, vanshika.shu...@nxp.com: > > Apeksha Gupta (2): > > net/dpaa2: add proper MTU debugging print > > net/dpaa2: store drop priority in mbuf > > > > Brick Yang (1): > > net/dpaa2: update DPNI link status method > > > > Gagandeep Singh (3): > > bus/fslmc: upgrade with MC version 10.37 > > net/dpaa2: fix memory corruption in TM > > net/dpaa2: support software taildrop > > > > Hemant Agrawal (2): > > net/dpaa2: add support to dump dpdmux counters > > bus/fslmc: change dpcon close as internal symbol > > > > Jun Yang (23): > > net/dpaa2: enhance Tx scatter-gather mempool > > net/dpaa2: add new PMD API to check dpaa platform version > > bus/fslmc: improve BMAN buffer acquire > > bus/fslmc: get MC VFIO group FD directly > > bus/fslmc: enhance MC VFIO multiprocess support > > bus/fslmc: dynamic IOVA mode configuration > > bus/fslmc: remove VFIO IRQ mapping > > bus/fslmc: create dpaa2 device with it's object > > bus/fslmc: introduce VFIO DMA mapping API for fslmc > > net/dpaa2: flow API refactor > > net/dpaa2: dump Rx parser result > > net/dpaa2: enhancement of raw flow extract > > net/dpaa2: frame attribute flags parser > > net/dpaa2: add VXLAN distribution support > > net/dpaa2: protocol inside tunnel distribution > > net/dpaa2: eCPRI support by parser result > > net/dpaa2: add GTP flow support > > net/dpaa2: check if Soft parser is loaded > > net/dpaa2: soft parser flow verification > > net/dpaa2: add flow support for IPsec AH and ESP > > net/dpaa2: check IOVA before sending MC command > > net/dpaa2: add API to get endpoint name > > net/dpaa2: dpdmux single flow/multiple rules support > > > > Rohit Raj (6): > > bus/fslmc: add close API to close DPAA2 device > > net/dpaa2: support link state for eth interfaces > > bus/fslmc: free VFIO group FD in case of add group failure > > bus/fslmc: fix coverity issue > > bus/fslmc: change qbman eq desc from d to desc > > net/dpaa2: change miss flow ID macro name > > > > Sachin Saxena (1): > > net/dpaa2: improve DPDMUX error behavior settings > > > > Vanshika Shukla (4): > > net/dpaa2: support PTP packet one-step timestamp > > net/dpaa2: dpdmux: add support for CVLAN > > net/dpaa2: support VLAN traffic splitting > > net/dpaa2: add support for C-VLAN and MAC > > This series is not clean at all. > There are a lot of unrelated changes in the middle of patches like reindent or > cast cleanup. > Some commits are breaking compilation. > Some useless code is added and removed in the last commit. > The features matrix for the flow items and actions are not updated. > Some error messages are polluting the cleanup stage for everybody. > The patch for DPDMUX based on C-VLAN and MAC address is present twice. > Not even talking about conflicts because of a parallel series. > > I'm not sure why I'm trying to merge these patches, I suppose I'm trying to be > kind. > I've fixed all blocking issues and applied. >
[PATCH v15 0/3] power: introduce PM QoS interface
The deeper the idle state, the lower the power consumption, but the longer the resume time. Some service are delay sensitive and very except the low resume time, like interrupt packet receiving mode. And the "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs interface is used to set and get the resume latency limit on the cpuX for userspace. Please see the description in kernel document[1]. Each cpuidle governor in Linux select which idle state to enter based on this CPU resume latency in their idle task. The per-CPU PM QoS API can be used to control this CPU's idle state selection and limit just enter the shallowest idle state to low the delay when wake up from idle state by setting strict resume latency (zero value). [1] https://www.kernel.org/doc/html/latest/admin-guide/abi-testing.html?highlight=pm_qos_resume_latency_us#abi-sys-devices-power-pm-qos-resume-latency-us --- v15: - fix conflicts due to the new merged patches that rework power lib. - add Acked-by: Konstantin Ananyev for patch 3/3. v14: - use parse_uint to parse --cpu-resume-latency instead of adding a new parse_int() v13: - not allow negative value for --cpu-resume-latency. - restore to the original value as Konstantin suggested. v12: - add Acked-by Chengwen and Konstantin - fix overflow issue in l3fwd-power when parse command line - add a command parameter to set CPU resume latency v11: - operate the cpu id the lcore mapped by the new function power_get_lcore_mapped_cpu_id(). v10: - replace LINE_MAX with a custom macro and fix two typos. v9: - move new feature description from release_24_07.rst to release_24_11.rst. v8: - update the latest code to resolve CI warning v7: - remove a dead code rte_lcore_is_enabled in patch[2/2] v6: - update release_24_07.rst based on dpdk repo to resolve CI warning. v5: - use LINE_MAX to replace BUFSIZ, and use snprintf to replace sprintf. v4: - fix some comments basd on Stephen - add stdint.h include - add Acked-by Morten Brørup v3: - add RTE_POWER_xxx prefix for some macro in header - add the check for lcore_id with rte_lcore_is_enabled v2: - use PM QoS on CPU wide to replace the one on system wide Huisong Li (3): power: introduce PM QoS API on CPU wide examples/l3fwd-power: fix data overflow when parse command line examples/l3fwd-power: add PM QoS configuration doc/guides/prog_guide/power_man.rst | 19 +++ doc/guides/rel_notes/release_24_11.rst| 5 + .../sample_app_ug/l3_forward_power_man.rst| 5 +- examples/l3fwd-power/main.c | 96 +++--- lib/power/meson.build | 2 + lib/power/rte_power_qos.c | 123 ++ lib/power/rte_power_qos.h | 73 +++ lib/power/version.map | 4 + 8 files changed, 306 insertions(+), 21 deletions(-) create mode 100644 lib/power/rte_power_qos.c create mode 100644 lib/power/rte_power_qos.h -- 2.22.0
答复: [PATCH v6 01/17] net/r8169: add PMD driver skeleton
Dear Ferruh,
I apologize for the issues that have arisen during the process of splitting a
complete driver into several small patches.
On 11/8/2024 12:11 PM, Howard Wang wrote:
> Meson build infrastructure, r8169_ethdev minimal skeleton, header with
> Realtek NIC device and vendor IDs.
>
> Signed-off-by: Howard Wang
<...>
===> I referred to Atlantic’s approach for this, and as a matter of fact, his
first commit message was done in this manner.
I will think again about how it should be modified.
net/atlantic: add PMD driver skeleton
Makefile/meson build infrastructure, atl_ethdev minimal skeleton,
header with aquantia aQtion NIC device and vendor IDs.
Signed-off-by: Igor Russkikh
Signed-off-by: Pavel Belous
What do you think to add macros for the PCI device IDs, naming them makes it
easier to know which devices are supported.
===> Regarding the device ID, for 0x8125, the supported device is indeed called
8125. So, should we name a macro like DEVICE_ID_RTL8125 to replace it?
Best regards,
Howard Wang
-邮件原件-
发件人: Ferruh Yigit
发送时间: 2024年11月11日 8:15
收件人: 王颢 ; dev@dpdk.org
抄送: pro_nic_d...@realtek.com
主题: Re: [PATCH v6 01/17] net/r8169: add PMD driver skeleton
External mail.
On 11/8/2024 12:11 PM, Howard Wang wrote:
> Meson build infrastructure, r8169_ethdev minimal skeleton, header with
> Realtek NIC device and vendor IDs.
>
> Signed-off-by: Howard Wang
<...>
> +/*
> + * The set of PCI devices this driver supports */ static const
> +struct rte_pci_id pci_id_r8169_map[] = {
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8125) },
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8162) },
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8126) },
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5000) },
>
What do you think to add macros for the PCI device IDs, naming them makes it
easier to know which devices are supported.
<...>
> +
> +#define RTL_DEV_PRIVATE(eth_dev) \
> + ((struct rtl_adapter *)((eth_dev)->data->dev_private))
> +
>
This macro is only used a few patches later, what do you think to add this
macro when used?
[PATCH v2] graph: mcore: optimize graph search
From: Huichao cai
In the function __rte_graph_mcore_dispatch_sched_node_enqueue,
use a slower loop to search for the graph, modify the search logic
to record the result of the first search, and use this record for
subsequent searches to improve search speed.
Signed-off-by: Huichao cai
---
lib/graph/rte_graph_model_mcore_dispatch.c | 11 +++
lib/graph/rte_graph_worker_common.h| 1 +
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/lib/graph/rte_graph_model_mcore_dispatch.c
b/lib/graph/rte_graph_model_mcore_dispatch.c
index a590fc9..a81d338 100644
--- a/lib/graph/rte_graph_model_mcore_dispatch.c
+++ b/lib/graph/rte_graph_model_mcore_dispatch.c
@@ -118,11 +118,14 @@
struct rte_graph_rq_head *rq)
{
const unsigned int lcore_id = node->dispatch.lcore_id;
- struct rte_graph *graph;
+ struct rte_graph *graph = node->dispatch.graph;
- SLIST_FOREACH(graph, rq, next)
- if (graph->dispatch.lcore_id == lcore_id)
- break;
+ if (unlikely((!graph) || (graph->dispatch.lcore_id != lcore_id))) {
+ SLIST_FOREACH(graph, rq, next)
+ if (graph->dispatch.lcore_id == lcore_id)
+ break;
+ node->dispatch.graph = graph;
+ }
return graph != NULL ? __graph_sched_node_enqueue(node, graph) : false;
}
diff --git a/lib/graph/rte_graph_worker_common.h
b/lib/graph/rte_graph_worker_common.h
index a518af2..4c2432b 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -110,6 +110,7 @@ struct __rte_cache_aligned rte_node {
unsigned int lcore_id; /**< Node running lcore. */
uint64_t total_sched_objs; /**< Number of objects
scheduled. */
uint64_t total_sched_fail; /**< Number of scheduled
failure. */
+ struct rte_graph *graph; /**< Graph corresponding to
lcore_id. */
} dispatch;
};
rte_graph_off_t xstat_off; /**< Offset to xstat counters. */
--
1.8.3.1
Re: [PATCH 1/2] net/dpaa2: fix build with Gcc 15
On 11/10/2024 6:41 PM, Stephen Hemminger wrote:
> Compiler no longer allows initializing byte array with string.
> warning: initializer-string for array of ‘unsigned char’ is too long
>[-Wunterminated-string-initialization]
> 169 | .vni = "\xff\xff\xff",
> |^~
>
> Fixes: 39c8044ffb7b ("net/dpaa2: support VXLAN flow matching")
> Cc: jun.y...@nxp.com
>
> Signed-off-by: Stephen Hemminger
>
Acked-by: Ferruh Yigit
Applied to dpdk-next-net/main, thanks.
Re: [PATCH 2/2] net/mlx5: fix build with Gcc 15
On 11/10/2024 6:41 PM, Stephen Hemminger wrote:
> Fixes warnings from Gcc 15 about using string for initialization.
> ../drivers/net/mlx5/mlx5_flow.c: In function ‘mlx5_legacy_dmac_flow_create’:
> ../drivers/net/mlx5/mlx5_flow.c:8568:44: warning: initializer-string for
> array of ‘unsigned char’ is too long [-Wunterminated-string-initialization]
> 8568 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> |^~
> ../drivers/net/mlx5/mlx5_flow.c: In function
> ‘mlx5_legacy_dmac_vlan_flow_create’:
> ../drivers/net/mlx5/mlx5_flow.c:8583:44: warning: initializer-string for
> array of ‘unsigned char’ is too long [-Wunterminated-string-initialization]
> 8583 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
> |^~
>
> Fixes: cf99567fe566 ("net/mlx5: add legacy unicast flow rules management")
> Cc: dsosnow...@nvidia.com
>
> Signed-off-by: Stephen Hemminger
>
Dariusz already sent a fix before, will get it:
https://patches.dpdk.org/project/dpdk/patch/20241108160724.730989-1-dsosnow...@nvidia.com/
[PATCH v21 03/13] common/zsda: add logging macros
Add zxdh logging implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 1 +
drivers/common/zsda/zsda_device.c | 23 ---
drivers/common/zsda/zsda_logs.c | 19 +++
drivers/common/zsda/zsda_logs.h | 27 +++
4 files changed, 63 insertions(+), 7 deletions(-)
create mode 100644 drivers/common/zsda/zsda_logs.c
create mode 100644 drivers/common/zsda/zsda_logs.h
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 68bc549c27..342d000c6d 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -10,4 +10,5 @@ endif
deps += ['bus_pci', 'mbuf']
sources += files(
'zsda_device.c',
+ 'zsda_logs.c',
)
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
index 8d691b3bb8..1be3ea8016 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -9,6 +9,7 @@
#include
#include "zsda_device.h"
+#include "zsda_logs.h"
/* per-process array of device data */
struct zsda_device_info zsda_devs[RTE_PMD_ZSDA_MAX_PCI_DEVICES];
@@ -32,9 +33,10 @@ zsda_pci_get_named_dev(const char *name)
{
unsigned int i;
- if (name == NULL)
+ if (name == NULL) {
+ ZSDA_LOG(ERR, "Failed! name is NULL.");
return NULL;
-
+ }
for (i = 0; i < RTE_PMD_ZSDA_MAX_PCI_DEVICES; i++) {
if (zsda_devs[i].mz &&
(strcmp(((struct zsda_pci_device *)zsda_devs[i].mz->addr)
@@ -81,8 +83,10 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
const struct rte_memzone *mz = rte_memzone_lookup(name);
- if (mz == NULL)
+ if (mz == NULL) {
+ ZSDA_LOG(ERR, "Secondary can't find %s mz", name);
return NULL;
+ }
zsda_pci_dev = mz->addr;
zsda_devs[zsda_pci_dev->zsda_dev_id].mz = mz;
zsda_devs[zsda_pci_dev->zsda_dev_id].pci_dev = pci_dev;
@@ -90,8 +94,10 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
return zsda_pci_dev;
}
- if (zsda_pci_get_named_dev(name) != NULL)
+ if (zsda_pci_get_named_dev(name) != NULL) {
+ ZSDA_LOG(ERR, "Failed! config");
return NULL;
+ }
zsda_dev_id = zsda_pci_find_free_device_index();
@@ -102,9 +108,10 @@ zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
rte_memzone_reserve(name, sizeof(struct zsda_pci_device),
(int)(socket_id & 0xfff), 0);
- if (zsda_devs[zsda_dev_id].mz == NULL)
+ if (zsda_devs[zsda_dev_id].mz == NULL) {
+ ZSDA_LOG(ERR, "Failed! malloc");
return NULL;
-
+ }
zsda_pci_dev = zsda_devs[zsda_dev_id].mz->addr;
memset(zsda_pci_dev, 0, sizeof(*zsda_pci_dev));
memcpy(zsda_pci_dev->name, name, ZSDA_DEV_NAME_MAX_LEN);
@@ -158,8 +165,10 @@ zsda_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
struct zsda_pci_device *zsda_pci_dev;
zsda_pci_dev = zsda_pci_device_allocate(pci_dev);
- if (zsda_pci_dev == NULL)
+ if (zsda_pci_dev == NULL) {
+ ZSDA_LOG(ERR, "Failed! zsda_pci_dev is NULL");
return -ENODEV;
+ }
return ret;
}
diff --git a/drivers/common/zsda/zsda_logs.c b/drivers/common/zsda/zsda_logs.c
new file mode 100644
index 00..f76d9d9d0d
--- /dev/null
+++ b/drivers/common/zsda/zsda_logs.c
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include
+
+#include "zsda_logs.h"
+
+int
+zsda_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
+ const void *buf, unsigned int len)
+{
+ if (rte_log_can_log(logtype, level))
+ rte_hexdump(rte_log_get_stream(), title, buf, len);
+
+ return 0;
+}
+
+RTE_LOG_REGISTER_SUFFIX(zsda_logtype_gen, gen, NOTICE);
diff --git a/drivers/common/zsda/zsda_logs.h b/drivers/common/zsda/zsda_logs.h
new file mode 100644
index 00..9d77254773
--- /dev/null
+++ b/drivers/common/zsda/zsda_logs.h
@@ -0,0 +1,27 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#ifndef _ZSDA_LOGS_H_
+#define _ZSDA_LOGS_H_
+
+#include
+
+extern int zsda_logtype_gen;
+#define RTE_LOGTYPE_ZSDA_GEN zsda_logtype_gen
+
+#define ZSDA_LOG(level, ...) \
+ RTE_LOG_LINE_PREFIX(level, ZSDA_GEN, "%s(): ", \
+ __func__, __VA_ARGS__)
+
+/**
+ * zsda_hexdump_log - Dump out memory in a special hex dump format.
+ *
+ * Dump out the message buffer in a special hex dump output format with
+ * characters printed for each line of 16 hex values. The message will be sent
+ * to the stream u
[PATCH v21 01/13] config: add zsda device number
Add the number of zsda devices. Signed-off-by: Hanxiao Li --- config/rte_config.h | 4 1 file changed, 4 insertions(+) diff --git a/config/rte_config.h b/config/rte_config.h index dd7bb0d35b..e1e85b3291 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -117,6 +117,10 @@ #define RTE_PMD_QAT_COMP_SGL_MAX_SEGMENTS 16 #define RTE_PMD_QAT_COMP_IM_BUFFER_SIZE 65536 +/* ZSDA device */ +/* Max. number of ZSDA devices which can be attached */ +#define RTE_PMD_ZSDA_MAX_PCI_DEVICES 256 + /* virtio crypto defines */ #define RTE_MAX_VIRTIO_CRYPTO 32 -- 2.27.0
[PATCH v21 00/13] drivers/zsda: introduce zsda drivers
v21: - modify some errors. v20 - add release note which was forgot in last version v19: - delete cryptodev drivers and prepare to submit it next time. - only submit compressdev driver this time. - resplit the patches. v18: - add code in drivers/meson.build to compile zsda drivers. - make every patch compile without any warnings or errors. v17: - fix some spelling errors v16: - resplit patches. - complete documentation which is yet there in that patch. - every patch should compile without any warnings or errors. - delete unused comments. v15: - split to more patches. v14: - Uniform Byte Alignment. v13: - resolve some comiler warnings that are being suppressed. v12: - use RTE_LOG_LINE_PREFIX in logging macro. - delete the check for null with rte_mempool_free. - delete some unused initial values. v11: - use RTE_LOG_LINE in logging macro. - fix some known bugs. v10: - delete new blank line at EOF - Cleaning up some code in zsda_log.h v9: - add a new feature in default.ini. - Re-split the patch according to the new PMD guidelines https://patches.dpdk.org/project/dpdk/patch/20241006184 254.53499-1-nandinipersad...@gmail.com/ - Split SM4-XTS tests into a new series to releases. - Separate out datapath(enqueue/dequeue) as a separate patch. v8: - fix some errors in cryptodevs/features/zsda.ini. v7: - add release notes and some documentations. - add MAINTAINERS context in the patch where the file/folder is added. - add files in meason.build which are included in the patch only. - add a check for unsupported on Windows. - notice the implicit cast in C. - add cover letter. - compile each of the patches individually. Hanxiao Li (13): config: add zsda device number common/zsda: add zsdadev driver common/zsda: add logging macros common/zsda: add functions to operate hardware queue common/zsda: add definition and use of msg chan. compress/zsda: add zsda compressdev driver skeleton compress/zsda: add zsda compressdev dev ops compress/zsda: add zsda compressdev stats ops compress/zsda: add zsda compressdev xform ops compress/zsda: add zsda compressdev qp ops compress/zsda: add zsda compressdev enqueue datapath compress/zsda: add zsda compressdev dequeue datapath compress/zsda: add zsda compressdev capabilities MAINTAINERS | 6 + config/rte_config.h | 4 + doc/guides/compressdevs/features/zsda.ini | 15 + doc/guides/compressdevs/index.rst | 1 + doc/guides/compressdevs/zsda.rst | 201 + doc/guides/rel_notes/release_24_11.rst| 7 + drivers/common/zsda/meson.build | 26 + drivers/common/zsda/zsda_device.c | 206 + drivers/common/zsda/zsda_device.h | 60 ++ drivers/common/zsda/zsda_logs.c | 19 + drivers/common/zsda/zsda_logs.h | 27 + drivers/common/zsda/zsda_qp.c | 935 ++ drivers/common/zsda/zsda_qp.h | 182 + drivers/common/zsda/zsda_qp_common.c | 192 + drivers/common/zsda/zsda_qp_common.h | 198 + drivers/compress/zsda/zsda_comp.c | 388 + drivers/compress/zsda/zsda_comp.h | 45 ++ drivers/compress/zsda/zsda_comp_pmd.c | 465 +++ drivers/compress/zsda/zsda_comp_pmd.h | 42 + drivers/meson.build | 1 + 20 files changed, 3020 insertions(+) create mode 100644 doc/guides/compressdevs/features/zsda.ini create mode 100644 doc/guides/compressdevs/zsda.rst create mode 100644 drivers/common/zsda/meson.build create mode 100644 drivers/common/zsda/zsda_device.c create mode 100644 drivers/common/zsda/zsda_device.h create mode 100644 drivers/common/zsda/zsda_logs.c create mode 100644 drivers/common/zsda/zsda_logs.h create mode 100644 drivers/common/zsda/zsda_qp.c create mode 100644 drivers/common/zsda/zsda_qp.h create mode 100644 drivers/common/zsda/zsda_qp_common.c create mode 100644 drivers/common/zsda/zsda_qp_common.h create mode 100644 drivers/compress/zsda/zsda_comp.c create mode 100644 drivers/compress/zsda/zsda_comp.h create mode 100644 drivers/compress/zsda/zsda_comp_pmd.c create mode 100644 drivers/compress/zsda/zsda_comp_pmd.h -- 2.27.0
[PATCH v21 07/13] compress/zsda: add zsda compressdev dev ops
add zsda compressdev dev interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 1 +
drivers/common/zsda/zsda_qp_common.c | 57 ++
drivers/common/zsda/zsda_qp_common.h | 36 +++
drivers/compress/zsda/zsda_comp_pmd.c | 144 +-
drivers/compress/zsda/zsda_comp_pmd.h | 5 +
5 files changed, 238 insertions(+), 5 deletions(-)
create mode 100644 drivers/common/zsda/zsda_qp_common.c
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 6ee2a68f4b..6e6d5ab006 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -12,6 +12,7 @@ sources += files(
'zsda_device.c',
'zsda_logs.c',
'zsda_qp.c',
+ 'zsda_qp_common.c',
)
zsda_compress = true
diff --git a/drivers/common/zsda/zsda_qp_common.c
b/drivers/common/zsda/zsda_qp_common.c
new file mode 100644
index 00..9c7152eb24
--- /dev/null
+++ b/drivers/common/zsda/zsda_qp_common.c
@@ -0,0 +1,57 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include "zsda_qp_common.h"
+
+static void
+zsda_queue_delete(const struct zsda_queue *queue)
+{
+ const struct rte_memzone *mz;
+
+ if (queue == NULL) {
+ ZSDA_LOG(DEBUG, "Invalid queue");
+ return;
+ }
+
+ mz = rte_memzone_lookup(queue->memz_name);
+ if (mz != NULL) {
+ memset(queue->base_addr, 0x0,
+ (uint16_t)(queue->queue_size * queue->msg_size));
+ rte_memzone_free(mz);
+ } else
+ ZSDA_LOG(DEBUG, "queue %s doesn't exist", queue->memz_name);
+}
+
+int
+zsda_queue_pair_release(struct zsda_qp **qp_addr)
+{
+ struct zsda_qp *qp = *qp_addr;
+ uint32_t i;
+ enum zsda_service_type type;
+
+ if (qp == NULL) {
+ ZSDA_LOG(DEBUG, "qp already freed");
+ return 0;
+ }
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (!qp->srv[type].used)
+ continue;
+
+ zsda_queue_delete(&(qp->srv[type].tx_q));
+ zsda_queue_delete(&(qp->srv[type].rx_q));
+ qp->srv[type].used = false;
+ for (i = 0; i < qp->srv[type].nb_descriptors; i++)
+ rte_mempool_put(qp->srv[type].op_cookie_pool,
+ qp->srv[type].op_cookies[i]);
+
+ rte_mempool_free(qp->srv[type].op_cookie_pool);
+ rte_free(qp->srv[type].op_cookies);
+ }
+
+ rte_free(qp);
+ *qp_addr = NULL;
+
+ return ZSDA_SUCCESS;
+}
diff --git a/drivers/common/zsda/zsda_qp_common.h
b/drivers/common/zsda/zsda_qp_common.h
index a867268840..4bcec4ad4c 100644
--- a/drivers/common/zsda/zsda_qp_common.h
+++ b/drivers/common/zsda/zsda_qp_common.h
@@ -31,4 +31,40 @@ enum zsda_service_type {
#define ZSDA_CSR_READ8(addr) rte_read8((addr))
#define ZSDA_CSR_WRITE8(addr, value) rte_write8_relaxed((value), (addr))
+struct zsda_queue {
+ char memz_name[RTE_MEMZONE_NAMESIZE];
+ uint8_t *io_addr;
+ uint8_t *base_addr;/* Base address */
+ rte_iova_t base_phys_addr; /* Queue physical address */
+ uint16_t head; /* Shadow copy of the head */
+ uint16_t tail; /* Shadow copy of the tail */
+ uint16_t modulo_mask;
+ uint16_t msg_size;
+ uint16_t queue_size;
+ uint16_t cycle_size;
+ uint16_t pushed_wqe;
+
+ uint8_t hw_queue_number;
+ uint32_t csr_head; /* last written head value */
+ uint32_t csr_tail; /* last written tail value */
+
+ uint8_t valid;
+ uint16_t sid;
+};
+
+struct qp_srv {
+ bool used;
+ struct zsda_queue tx_q;
+ struct zsda_queue rx_q;
+ struct rte_mempool *op_cookie_pool;
+ void **op_cookies;
+ uint16_t nb_descriptors;
+};
+
+struct zsda_qp {
+ struct qp_srv srv[ZSDA_MAX_SERVICES];
+};
+
+int zsda_queue_pair_release(struct zsda_qp **qp_addr);
+
#endif /* _ZSDA_QP_COMMON_H_ */
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index d1c33f448c..3bdcd66f6a 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -8,13 +8,145 @@
#include "zsda_qp_common.h"
#include "zsda_comp_pmd.h"
+static int
+zsda_comp_xform_size(void)
+{
+ return RTE_ALIGN_CEIL(sizeof(struct zsda_comp_xform), 8);
+}
+
+static struct rte_mempool *
+zsda_comp_create_xform_pool(struct zsda_comp_dev_private *comp_dev,
+ struct rte_compressdev_config *config,
+ uint32_t num_elements)
+{
+ char xform_pool_name[RTE_MEMPOOL_NAMESIZE];
+ struct rte_mempool *mp;
+
+ snprintf(xform_pool_name, RTE_MEMPOOL_NAMESIZE, "%s_xforms",
+comp_dev->z
Re: [PATCH] net/mlx5: fix MAC address initialization
On 11/8/2024 4:07 PM, Dariusz Sosnowski wrote:
> Offending patch added code which broke compilation on GCC 15,
> where MAC address was initialized with a string, causing the following
> errors:
>
> ../drivers/net/mlx5/mlx5_flow.c:
> In function ‘mlx5_legacy_dmac_flow_create’:
> ../drivers/net/mlx5/mlx5_flow.c:8568:44:
> error: initializer-string for array of ‘unsigned char’ is too long
> [-Werror=unterminated-string-initialization]
> 8568 | .hdr.dst_addr.addr_bytes =
> "\xff\xff\xff\xff\xff\xff",
> |
> ^~
>
> ../drivers/net/mlx5/mlx5_flow.c: In function
> ‘mlx5_legacy_dmac_vlan_flow_create’:
> ../drivers/net/mlx5/mlx5_flow.c:8583:44:
> error: initializer-string for array of ‘unsigned char’ is too long
> [-Werror=unterminated-string-initialization]
> 8583 | .hdr.dst_addr.addr_bytes =
> "\xff\xff\xff\xff\xff\xff",
> |
> ^~
>
> This patch fixes this issue by converting it to array initialization.
>
> Fixes: cf99567fe566 ("net/mlx5: add legacy unicast flow rules management")
>
> Signed-off-by: Dariusz Sosnowski
>
Acked-by: Ferruh Yigit
Applied to dpdk-next-net/main, thanks.
Re: [v21,01/13] config: add zsda device number
Hi Akhil: I noticed that the state of patches is truned to 'Changes Requested', after turned to 'Deferred'. So I modify and submit patches as soon as possible. After modifying the patches, it was a bit late. I noticed some errors, after submitting them. so I submitted v20 and v21 later. I'm so sorry, if so many emails disturb you. Besides, there is a misspelled error in comments of patch 11/13. Is this a serious problem? If not, I will modify it in next series of patches. Because I have only submitted one of four parts so far. And If you think it's better to merged in next release. Well, It's ok. Thanks and sorry, Hanxiao Li
[PATCH v15 3/3] examples/l3fwd-power: add PM QoS configuration
The '--cpu-resume-latency' can use to control C-state selection.
Setting the CPU resume latency to 0 can limit the CPU just to enter
C0-state to improve performance, which also may increase the power
consumption of platform.
Signed-off-by: Huisong Li
Acked-by: Morten Brørup
Acked-by: Chengwen Feng
Acked-by: Konstantin Ananyev
---
.../sample_app_ug/l3_forward_power_man.rst| 5 +-
examples/l3fwd-power/main.c | 55 +++
2 files changed, 59 insertions(+), 1 deletion(-)
diff --git a/doc/guides/sample_app_ug/l3_forward_power_man.rst
b/doc/guides/sample_app_ug/l3_forward_power_man.rst
index 9c9684fea7..70fa83669a 100644
--- a/doc/guides/sample_app_ug/l3_forward_power_man.rst
+++ b/doc/guides/sample_app_ug/l3_forward_power_man.rst
@@ -67,7 +67,8 @@ based on the speculative sleep duration of the core.
In this application, we introduce a heuristic algorithm that allows packet
processing cores to sleep for a short period
if there is no Rx packet received on recent polls.
In this way, CPUIdle automatically forces the corresponding cores to enter
deeper C-states
-instead of always running to the C0 state waiting for packets.
+instead of always running to the C0 state waiting for packets. But user can
set the CPU resume latency to control C-state selection.
+Setting the CPU resume latency to 0 can limit the CPU just to enter C0-state
to improve performance, which may increase power consumption of platform.
.. note::
@@ -105,6 +106,8 @@ where,
* --config (port,queue,lcore)[,(port,queue,lcore)]: determines which queues
from which ports are mapped to which cores.
+* --cpu-resume-latency LATENCY: set CPU resume latency to control C-state
selection, 0 : just allow to enter C0-state.
+
* --max-pkt-len: optional, maximum packet length in decimal (64-9600)
* --no-numa: optional, disables numa awareness
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 7bc524aa16..ae8b55924e 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -47,6 +47,7 @@
#include
#include
#include
+#include
#include "perf_core.h"
#include "main.h"
@@ -265,6 +266,9 @@ static uint32_t pause_duration = 1;
static uint32_t scale_freq_min;
static uint32_t scale_freq_max;
+static int cpu_resume_latency = -1;
+static int resume_latency_bk[RTE_MAX_LCORE];
+
static struct rte_mempool * pktmbuf_pool[NB_SOCKETS];
@@ -1497,6 +1501,8 @@ print_usage(const char *prgname)
" -U: set min/max frequency for uncore to maximum value\n"
" -i (frequency index): set min/max frequency for uncore to
specified frequency index\n"
" --config (port,queue,lcore): rx queues configuration\n"
+ " --cpu-resume-latency LATENCY: set CPU resume latency to
control C-state selection,"
+ " 0 : just allow to enter C0-state\n"
" --high-perf-cores CORELIST: list of high performance cores\n"
" --perf-config: similar as config, cores specified as indices"
" for bins containing high or regular performance cores\n"
@@ -1735,6 +1741,7 @@ parse_pmd_mgmt_config(const char *name)
#define CMD_LINE_OPT_PAUSE_DURATION "pause-duration"
#define CMD_LINE_OPT_SCALE_FREQ_MIN "scale-freq-min"
#define CMD_LINE_OPT_SCALE_FREQ_MAX "scale-freq-max"
+#define CMD_LINE_OPT_CPU_RESUME_LATENCY "cpu-resume-latency"
/* Parse the argument given in the command line of the application */
static int
@@ -1749,6 +1756,7 @@ parse_args(int argc, char **argv)
{"perf-config", 1, 0, 0},
{"high-perf-cores", 1, 0, 0},
{"no-numa", 0, 0, 0},
+ {CMD_LINE_OPT_CPU_RESUME_LATENCY, 1, 0, 0},
{CMD_LINE_OPT_MAX_PKT_LEN, 1, 0, 0},
{CMD_LINE_OPT_PARSE_PTYPE, 0, 0, 0},
{CMD_LINE_OPT_LEGACY, 0, 0, 0},
@@ -1934,6 +1942,15 @@ parse_args(int argc, char **argv)
printf("Scaling frequency maximum
configured\n");
}
+ if (!strncmp(lgopts[option_index].name,
+ CMD_LINE_OPT_CPU_RESUME_LATENCY,
+
sizeof(CMD_LINE_OPT_CPU_RESUME_LATENCY))) {
+ if (parse_uint(optarg, INT_MAX,
+ (uint32_t
*)&cpu_resume_latency) != 0)
+ return -1;
+ printf("PM QoS configured\n");
+ }
+
break;
default:
@@ -2257,6 +2274,35 @@ init_power_library(void)
return -1;
}
}
+
+ if (cpu_resume_latency != -1) {
+ RTE_LCORE_FOREACH(lcore_id) {
+ /* Back old CPU resume latency. */
+ ret = rte_power_qos_get_cpu_resume_latency(lcore_id);
+
[PATCH v15 1/3] power: introduce PM QoS API on CPU wide
The deeper the idle state, the lower the power consumption, but the longer
the resume time. Some service are delay sensitive and very except the low
resume time, like interrupt packet receiving mode.
And the "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs
interface is used to set and get the resume latency limit on the cpuX for
userspace. Each cpuidle governor in Linux select which idle state to enter
based on this CPU resume latency in their idle task.
The per-CPU PM QoS API can be used to control this CPU's idle state
selection and limit just enter the shallowest idle state to low the delay
when wake up from by setting strict resume latency (zero value).
Signed-off-by: Huisong Li
Acked-by: Morten Brørup
Acked-by: Chengwen Feng
Acked-by: Konstantin Ananyev
Acked-by: Sivaprasad Tummala
---
doc/guides/prog_guide/power_man.rst| 19
doc/guides/rel_notes/release_24_11.rst | 5 +
lib/power/meson.build | 2 +
lib/power/rte_power_qos.c | 123 +
lib/power/rte_power_qos.h | 73 +++
lib/power/version.map | 4 +
6 files changed, 226 insertions(+)
create mode 100644 lib/power/rte_power_qos.c
create mode 100644 lib/power/rte_power_qos.h
diff --git a/doc/guides/prog_guide/power_man.rst
b/doc/guides/prog_guide/power_man.rst
index 1ebab77ee9..ecae6b46ef 100644
--- a/doc/guides/prog_guide/power_man.rst
+++ b/doc/guides/prog_guide/power_man.rst
@@ -107,6 +107,25 @@ User Cases
The power management mechanism is used to save power when performing L3
forwarding.
+PM QoS
+--
+
+The "/sys/devices/system/cpu/cpuX/power/pm_qos_resume_latency_us" sysfs
+interface is used to set and get the resume latency limit on the cpuX for
+userspace. Each cpuidle governor in Linux select which idle state to enter
+based on this CPU resume latency in their idle task.
+
+The deeper the idle state, the lower the power consumption, but the longer
+the resume time. Some service are latency sensitive and very except the low
+resume time, like interrupt packet receiving mode.
+
+Applications can set and get the CPU resume latency by the
+``rte_power_qos_set_cpu_resume_latency()`` and
``rte_power_qos_get_cpu_resume_latency()``
+respectively. Applications can set a strict resume latency (zero value) by
+the ``rte_power_qos_set_cpu_resume_latency()`` to low the resume latency and
+get better performance (instead, the power consumption of platform may
increase).
+
+
Ethernet PMD Power Management API
-
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 543becba28..187e6823d7 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -276,6 +276,11 @@ New Features
This field is used to pass an extra configuration settings such as ability
to lookup IPv4 addresses in network byte order.
+* **Introduce per-CPU PM QoS interface.**
+
+ * Add per-CPU PM QoS interface to low the resume latency when wake up from
+idle state.
+
* **Added new API to register telemetry endpoint callbacks with private
arguments.**
A new ``rte_telemetry_register_cmd_arg`` function is available to pass an
opaque value to
diff --git a/lib/power/meson.build b/lib/power/meson.build
index 4f4dc19687..313aaa6701 100644
--- a/lib/power/meson.build
+++ b/lib/power/meson.build
@@ -16,6 +16,7 @@ sources = files(
'rte_power_cpufreq.c',
'rte_power_uncore.c',
'rte_power_pmd_mgmt.c',
+'rte_power_qos.c',
)
headers = files(
'power_cpufreq.h',
@@ -24,6 +25,7 @@ headers = files(
'rte_power_guest_channel.h',
'rte_power_pmd_mgmt.h',
'rte_power_uncore.h',
+'rte_power_qos.h',
)
deps += ['timer', 'ethdev']
diff --git a/lib/power/rte_power_qos.c b/lib/power/rte_power_qos.c
new file mode 100644
index 00..4dd0532b36
--- /dev/null
+++ b/lib/power/rte_power_qos.c
@@ -0,0 +1,123 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 HiSilicon Limited
+ */
+
+#include
+#include
+#include
+
+#include
+#include
+
+#include "power_common.h"
+#include "rte_power_qos.h"
+
+#define PM_QOS_SYSFILE_RESUME_LATENCY_US \
+ "/sys/devices/system/cpu/cpu%u/power/pm_qos_resume_latency_us"
+
+#define PM_QOS_CPU_RESUME_LATENCY_BUF_LEN 32
+
+int
+rte_power_qos_set_cpu_resume_latency(uint16_t lcore_id, int latency)
+{
+ char buf[PM_QOS_CPU_RESUME_LATENCY_BUF_LEN];
+ uint32_t cpu_id;
+ FILE *f;
+ int ret;
+
+ if (!rte_lcore_is_enabled(lcore_id)) {
+ POWER_LOG(ERR, "lcore id %u is not enabled", lcore_id);
+ return -EINVAL;
+ }
+ ret = power_get_lcore_mapped_cpu_id(lcore_id, &cpu_id);
+ if (ret != 0)
+ return ret;
+
+ if (latency < 0) {
+ POWER_LOG(ERR, "latency should be greater than and equal to 0");
+
[PATCH v15 2/3] examples/l3fwd-power: fix data overflow when parse command line
Many variables are 'uint32_t', like, 'pause_duration', 'scale_freq_min'
and so on. They use parse_int() to parse it from command line.
But overflow problem occurs when this function return.
Fixes: 59f2853c4cae ("examples/l3fwd_power: add configuration options")
Cc: sta...@dpdk.org
Signed-off-by: Huisong Li
Acked-by: Konstantin Ananyev
Acked-by: Chengwen Feng
Acked-by: Sivaprasad Tummala
---
examples/l3fwd-power/main.c | 41 +++--
1 file changed, 21 insertions(+), 20 deletions(-)
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 272e069207..7bc524aa16 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -1520,8 +1520,12 @@ print_usage(const char *prgname)
prgname);
}
+/*
+ * Caller must give the right upper limit so as to ensure receiver variable
+ * doesn't overflow.
+ */
static int
-parse_int(const char *opt)
+parse_uint(const char *opt, uint32_t max, uint32_t *res)
{
char *end = NULL;
unsigned long val;
@@ -1531,23 +1535,15 @@ parse_int(const char *opt)
if ((opt[0] == '\0') || (end == NULL) || (*end != '\0'))
return -1;
- return val;
-}
-
-static int parse_max_pkt_len(const char *pktlen)
-{
- char *end = NULL;
- unsigned long len;
-
- /* parse decimal string */
- len = strtoul(pktlen, &end, 10);
- if ((pktlen[0] == '\0') || (end == NULL) || (*end != '\0'))
+ if (val > max) {
+ RTE_LOG(ERR, L3FWD_POWER, "%s parameter shouldn't exceed %u.\n",
+ opt, max);
return -1;
+ }
- if (len == 0)
- return -1;
+ *res = val;
- return len;
+ return 0;
}
static int
@@ -1894,8 +1890,9 @@ parse_args(int argc, char **argv)
if (!strncmp(lgopts[option_index].name,
CMD_LINE_OPT_MAX_PKT_LEN,
sizeof(CMD_LINE_OPT_MAX_PKT_LEN))) {
+ if (parse_uint(optarg, UINT32_MAX,
&max_pkt_len) != 0)
+ return -1;
printf("Custom frame size is configured\n");
- max_pkt_len = parse_max_pkt_len(optarg);
}
if (!strncmp(lgopts[option_index].name,
@@ -1908,29 +1905,33 @@ parse_args(int argc, char **argv)
if (!strncmp(lgopts[option_index].name,
CMD_LINE_OPT_MAX_EMPTY_POLLS,
sizeof(CMD_LINE_OPT_MAX_EMPTY_POLLS))) {
+ if (parse_uint(optarg, UINT32_MAX,
&max_empty_polls) != 0)
+ return -1;
printf("Maximum empty polls configured\n");
- max_empty_polls = parse_int(optarg);
}
if (!strncmp(lgopts[option_index].name,
CMD_LINE_OPT_PAUSE_DURATION,
sizeof(CMD_LINE_OPT_PAUSE_DURATION))) {
+ if (parse_uint(optarg, UINT32_MAX,
&pause_duration) != 0)
+ return -1;
printf("Pause duration configured\n");
- pause_duration = parse_int(optarg);
}
if (!strncmp(lgopts[option_index].name,
CMD_LINE_OPT_SCALE_FREQ_MIN,
sizeof(CMD_LINE_OPT_SCALE_FREQ_MIN))) {
+ if (parse_uint(optarg, UINT32_MAX,
&scale_freq_min) != 0)
+ return -1;
printf("Scaling frequency minimum
configured\n");
- scale_freq_min = parse_int(optarg);
}
if (!strncmp(lgopts[option_index].name,
CMD_LINE_OPT_SCALE_FREQ_MAX,
sizeof(CMD_LINE_OPT_SCALE_FREQ_MAX))) {
+ if (parse_uint(optarg, UINT32_MAX,
&scale_freq_max) != 0)
+ return -1;
printf("Scaling frequency maximum
configured\n");
- scale_freq_max = parse_int(optarg);
}
break;
--
2.22.0
[PATCH v21 06/13] compress/zsda: add zsda compressdev driver skeleton
Add zsda compressdev driver interface skeleton Signed-off-by: Hanxiao Li --- MAINTAINERS | 3 + doc/guides/compressdevs/features/zsda.ini | 6 + doc/guides/compressdevs/index.rst | 1 + doc/guides/compressdevs/zsda.rst | 178 ++ drivers/common/zsda/meson.build | 12 +- drivers/common/zsda/zsda_device.h | 12 +- drivers/common/zsda/zsda_qp.c | 30 +++- drivers/common/zsda/zsda_qp.h | 14 +- drivers/common/zsda/zsda_qp_common.h | 7 + drivers/compress/zsda/zsda_comp_pmd.c | 128 drivers/compress/zsda/zsda_comp_pmd.h | 37 + 11 files changed, 416 insertions(+), 12 deletions(-) create mode 100644 doc/guides/compressdevs/features/zsda.ini create mode 100644 doc/guides/compressdevs/zsda.rst create mode 100644 drivers/compress/zsda/zsda_comp_pmd.c create mode 100644 drivers/compress/zsda/zsda_comp_pmd.h diff --git a/MAINTAINERS b/MAINTAINERS index 0318d7357c..dc3fa2097a 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1271,6 +1271,9 @@ F: doc/guides/compressdevs/features/zlib.ini ZTE Storage Data Accelerator(ZSDA) M: Hanxiao Li F: drivers/common/zsda/ +F: drivers/compress/zsda/ +F: doc/guides/compressdevs/zsda.rst +F: doc/guides/compressdevs/features/zsda.ini DMAdev Drivers -- diff --git a/doc/guides/compressdevs/features/zsda.ini b/doc/guides/compressdevs/features/zsda.ini new file mode 100644 index 00..5cc9a3b1a6 --- /dev/null +++ b/doc/guides/compressdevs/features/zsda.ini @@ -0,0 +1,6 @@ +; +; Refer to default.ini for the full list of available PMD features. +; +; Supported features of 'ZSDA' compression driver. +; +[Features] diff --git a/doc/guides/compressdevs/index.rst b/doc/guides/compressdevs/index.rst index 87ed4f72a4..bab226ffbc 100644 --- a/doc/guides/compressdevs/index.rst +++ b/doc/guides/compressdevs/index.rst @@ -17,3 +17,4 @@ Compression Device Drivers qat_comp uadk zlib +zsda diff --git a/doc/guides/compressdevs/zsda.rst b/doc/guides/compressdevs/zsda.rst new file mode 100644 index 00..c02423d650 --- /dev/null +++ b/doc/guides/compressdevs/zsda.rst @@ -0,0 +1,178 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(c) 2024 ZTE Corporation. + +ZTE Storage Data Accelerator (ZSDA) Poll Mode Driver +=== + +The ZSDA compression PMD provides poll mode compression & decompression driver +support for the following hardware accelerator devices: + +* ``ZTE Processing accelerators 1cf2`` + + +Features + + + +Installation + + +The ZSDA compression PMD is built by default with a standard DPDK build. + +It depends on a ZSDA kernel driver, see :ref:`building_zsda`. + + +.. _building_zsda: + +Building PMDs on ZSDA +- + +A ZSDA device can host multiple acceleration services: + +* data compression + +These services are provided to DPDK applications via PMDs which register to +implement the compressdev APIs. The PMDs use common ZSDA driver code +which manages the ZSDA PCI device. + + +Configuring and Building the DPDK ZSDA PMDs +~~~ + +Further information on configuring, building and installing DPDK is described +:doc:`here <../linux_gsg/build_dpdk>`. + +.. _building_zsda_config: + +Build Configuration +~~~ +These is the build configuration options affecting ZSDA, and its default values: + +.. code-block:: console + + RTE_PMD_ZSDA_MAX_PCI_DEVICES=256 + + +Device and driver naming + + +* The zsda compressdev driver name is "compress_zsda". + The rte_compressdev_devices_get() returns the devices exposed by this driver. + +* Each zsda compression device has a unique name, in format + , e.g. ":cc:00.3_zsda". + This name can be passed to rte_compressdev_get_dev_id() to get the device_id. + + +Enable VFs + + +Instructions for installation are below, but first an explanation of the +relationships between the PF/VF devices and the PMDs visible to +DPDK applications. + +Each ZSDA PF device exposes a number of VF devices. Each VF device can +enable one compressdev PMD. + +These ZSDA PMDs share the same underlying device and pci-mgmt code, but are +enumerated independently on their respective APIs and appear as independent +devices to applications. + +.. Note:: + + Each VF can only be used by one DPDK process. It is not possible to share + the same VF across multiple processes, even if these processes are using + different acceleration services. + Conversely one DPDK process can use one or more ZSDA VFs and can expose + compressdev instances on each of those VFs. + + +The examples below are based on the 1cf2 device, if you have a different device +use the corresponding values in the above table. + +In BIOS ensure that SRIOV is enabled and either: + +* Disable VT-d or +* Ena
[PATCH v21 05/13] common/zsda: add definition and use of msg chan.
Add msg chan functions and the use to get
hardware information or operate hardware.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp.c | 309 ++
drivers/common/zsda/zsda_qp.h | 91 ++
2 files changed, 400 insertions(+)
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 8060d89ea1..0bb0f598b7 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -11,8 +11,48 @@
#include "zsda_qp.h"
#include "zsda_qp_common.h"
+
+#define MAGIC_SEND 0xab
+#define MAGIC_RECV 0xcd
+#define ADMIN_VER 1
+
static uint8_t zsda_num_used_qps;
+static const uint8_t crc8_table[256] = {
+ 0x00, 0x41, 0x13, 0x52, 0x26, 0x67, 0x35, 0x74, 0x4c, 0x0d, 0x5f, 0x1e,
+ 0x6a, 0x2b, 0x79, 0x38, 0x09, 0x48, 0x1a, 0x5b, 0x2f, 0x6e, 0x3c, 0x7d,
+ 0x45, 0x04, 0x56, 0x17, 0x63, 0x22, 0x70, 0x31, 0x12, 0x53, 0x01, 0x40,
+ 0x34, 0x75, 0x27, 0x66, 0x5e, 0x1f, 0x4d, 0x0c, 0x78, 0x39, 0x6b, 0x2a,
+ 0x1b, 0x5a, 0x08, 0x49, 0x3d, 0x7c, 0x2e, 0x6f, 0x57, 0x16, 0x44, 0x05,
+ 0x71, 0x30, 0x62, 0x23, 0x24, 0x65, 0x37, 0x76, 0x02, 0x43, 0x11, 0x50,
+ 0x68, 0x29, 0x7b, 0x3a, 0x4e, 0x0f, 0x5d, 0x1c, 0x2d, 0x6c, 0x3e, 0x7f,
+ 0x0b, 0x4a, 0x18, 0x59, 0x61, 0x20, 0x72, 0x33, 0x47, 0x06, 0x54, 0x15,
+ 0x36, 0x77, 0x25, 0x64, 0x10, 0x51, 0x03, 0x42, 0x7a, 0x3b, 0x69, 0x28,
+ 0x5c, 0x1d, 0x4f, 0x0e, 0x3f, 0x7e, 0x2c, 0x6d, 0x19, 0x58, 0x0a, 0x4b,
+ 0x73, 0x32, 0x60, 0x21, 0x55, 0x14, 0x46, 0x07, 0x48, 0x09, 0x5b, 0x1a,
+ 0x6e, 0x2f, 0x7d, 0x3c, 0x04, 0x45, 0x17, 0x56, 0x22, 0x63, 0x31, 0x70,
+ 0x41, 0x00, 0x52, 0x13, 0x67, 0x26, 0x74, 0x35, 0x0d, 0x4c, 0x1e, 0x5f,
+ 0x2b, 0x6a, 0x38, 0x79, 0x5a, 0x1b, 0x49, 0x08, 0x7c, 0x3d, 0x6f, 0x2e,
+ 0x16, 0x57, 0x05, 0x44, 0x30, 0x71, 0x23, 0x62, 0x53, 0x12, 0x40, 0x01,
+ 0x75, 0x34, 0x66, 0x27, 0x1f, 0x5e, 0x0c, 0x4d, 0x39, 0x78, 0x2a, 0x6b,
+ 0x6c, 0x2d, 0x7f, 0x3e, 0x4a, 0x0b, 0x59, 0x18, 0x20, 0x61, 0x33, 0x72,
+ 0x06, 0x47, 0x15, 0x54, 0x65, 0x24, 0x76, 0x37, 0x43, 0x02, 0x50, 0x11,
+ 0x29, 0x68, 0x3a, 0x7b, 0x0f, 0x4e, 0x1c, 0x5d, 0x7e, 0x3f, 0x6d, 0x2c,
+ 0x58, 0x19, 0x4b, 0x0a, 0x32, 0x73, 0x21, 0x60, 0x14, 0x55, 0x07, 0x46,
+ 0x77, 0x36, 0x64, 0x25, 0x51, 0x10, 0x42, 0x03, 0x3b, 0x7a, 0x28, 0x69,
+ 0x1d, 0x5c, 0x0e, 0x4f};
+
+static uint8_t
+zsda_crc8(const uint8_t *message, const int length)
+{
+ uint8_t crc = 0;
+ int i;
+
+ for (i = 0; i < length; i++)
+ crc = crc8_table[crc ^ message[i]];
+ return crc;
+}
+
static uint8_t
zsda_get_num_used_qps(const struct rte_pci_device *pci_dev)
{
@@ -173,6 +213,262 @@ zsda_queue_clear(const struct rte_pci_device *pci_dev)
return ret;
}
+static uint32_t
+zsda_set_reg_8(void *addr, const uint8_t val0, const uint8_t val1,
+ const uint8_t val2, const uint8_t val3)
+{
+ uint8_t val[4];
+
+ val[0] = val0;
+ val[1] = val1;
+ val[2] = val2;
+ val[3] = val3;
+ ZSDA_CSR_WRITE32(addr, *(uint32_t *)val);
+ return *(uint32_t *)val;
+}
+
+static uint8_t
+zsda_get_reg_8(void *addr, const int offset)
+{
+ uint32_t val = ZSDA_CSR_READ32(addr);
+
+ return *(((uint8_t *)&val) + offset);
+}
+
+static inline uint32_t
+zsda_modulo_32(uint32_t data, uint32_t modulo_mask)
+{
+ return (data) & (modulo_mask);
+}
+static inline uint16_t
+zsda_modulo_16(uint16_t data, uint16_t modulo_mask)
+{
+ return (data) & (modulo_mask);
+}
+static inline uint8_t
+zsda_modulo_8(uint8_t data, uint8_t modulo_mask)
+{
+ return (data) & (modulo_mask);
+}
+
+static int
+zsda_send_admin_msg(const struct rte_pci_device *pci_dev, void *req,
+ const uint32_t len)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ uint8_t wq_flag;
+ uint8_t crc;
+ uint16_t admin_db;
+ uint32_t retry = ZSDA_TIME_NUM;
+ int i;
+ uint16_t db;
+ int repeat = sizeof(struct zsda_admin_req) / sizeof(uint32_t);
+
+ if (len > ADMIN_BUF_DATA_LEN)
+ return -EINVAL;
+
+ for (i = 0; i < repeat; i++) {
+ ZSDA_CSR_WRITE32(((uint32_t *)(mmio_base + ZSDA_ADMIN_WQ) + i),
+*((uint32_t *)req + i));
+ }
+
+ crc = zsda_crc8((uint8_t *)req, ADMIN_BUF_DATA_LEN);
+ zsda_set_reg_8(mmio_base + ZSDA_ADMIN_WQ_BASE7, crc, ADMIN_VER,
MAGIC_SEND, 0);
+ rte_delay_us_sleep(ZSDA_TIME_SLEEP_US);
+ rte_wmb();
+
+ admin_db = ZSDA_CSR_READ32(mmio_base + ZSDA_ADMIN_WQ_TAIL);
+ db = zsda_modulo_32(admin_db, 0x1ff);
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_WQ_TAIL, db);
+
+ do {
+ rte_delay_us_sleep(ZSDA_TIME_SLEEP_US);
+ wq_flag = zsda_get_reg_8(mmio_base + ZSDA_ADMIN_WQ_BASE7, 2);
+ if (wq_flag == MAGIC_RECV)
+ break;
+
+ retry--;
+
[PATCH v21 10/13] compress/zsda: add zsda compressdev qp ops
Add zsda compressdev qp interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_device.c | 1 -
drivers/common/zsda/zsda_device.h | 3 +-
drivers/common/zsda/zsda_qp.c | 248 ++
drivers/common/zsda/zsda_qp.h | 122 +
drivers/common/zsda/zsda_qp_common.c | 2 +-
drivers/common/zsda/zsda_qp_common.h | 67 +++
drivers/compress/zsda/zsda_comp_pmd.c | 107 ++-
7 files changed, 507 insertions(+), 43 deletions(-)
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
index 5c835651ea..5297c80ef9 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -11,7 +11,6 @@
#include "zsda_device.h"
#include "zsda_logs.h"
#include "zsda_qp.h"
-
/* per-process array of device data */
struct zsda_device_info zsda_devs[RTE_PMD_ZSDA_MAX_PCI_DEVICES];
static int zsda_nb_pci_devices;
diff --git a/drivers/common/zsda/zsda_device.h
b/drivers/common/zsda/zsda_device.h
index b744e8df2d..0bd1805d25 100644
--- a/drivers/common/zsda/zsda_device.h
+++ b/drivers/common/zsda/zsda_device.h
@@ -5,13 +5,12 @@
#ifndef _ZSDA_DEVICE_H_
#define _ZSDA_DEVICE_H_
-#include
#include "bus_pci_driver.h"
+
#include "zsda_qp_common.h"
#define MAX_QPS_ON_FUNCTION128
#define ZSDA_DEV_NAME_MAX_LEN 64
-#define ZSDA_MAX_DEV RTE_PMD_ZSDA_MAX_PCI_DEVICES
struct zsda_device_info {
const struct rte_memzone *mz;
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 7e000d5b3f..658b0b69e3 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -12,6 +12,8 @@
#define MAGIC_SEND 0xab
#define MAGIC_RECV 0xcd
#define ADMIN_VER 1
+#define RING_DIR_TX 0
+#define RING_DIR_RX 1
static uint8_t zsda_num_used_qps;
@@ -523,3 +525,249 @@ zsda_queue_init(struct zsda_pci_device *zsda_pci_dev)
return ret;
}
+
+struct zsda_qp_hw *
+zsda_qps_hw_per_service(struct zsda_pci_device *zsda_pci_dev,
+ const enum zsda_service_type service)
+{
+ struct zsda_qp_hw *qp_hw = NULL;
+
+ if (service < ZSDA_SERVICE_INVALID)
+ qp_hw = &(zsda_pci_dev->zsda_hw_qps[service]);
+
+ return qp_hw;
+}
+
+static const struct rte_memzone *
+zsda_queue_dma_zone_reserve(const char *queue_name,
+ const unsigned int queue_size,
+ const unsigned int socket_id)
+{
+ const struct rte_memzone *mz;
+
+ mz = rte_memzone_lookup(queue_name);
+ if (mz != 0) {
+ if (((size_t)queue_size <= mz->len) &&
+ ((socket_id == (SOCKET_ID_ANY & 0x)) ||
+(socket_id == (mz->socket_id & 0x {
+ ZSDA_LOG(DEBUG,
+"re-use memzone already allocated for %s",
+queue_name);
+ return mz;
+ }
+ ZSDA_LOG(ERR, "Failed! queue_name exist");
+ return NULL;
+ }
+
+ mz = rte_memzone_reserve_aligned(queue_name, queue_size,
+ (int)(socket_id & 0xfff),
+ RTE_MEMZONE_IOVA_CONTIG, queue_size);
+
+ return mz;
+}
+
+static int
+zsda_queue_create(const uint32_t dev_id, struct zsda_queue *queue,
+ const struct zsda_qp_config *qp_conf, const uint8_t dir)
+{
+ void *io_addr;
+ const struct rte_memzone *qp_mz;
+ struct qinfo qcfg = {0};
+
+ uint16_t desc_size = ((dir == RING_DIR_TX) ? qp_conf->hw->tx_msg_size
+ : qp_conf->hw->rx_msg_size);
+ unsigned int queue_size_bytes = qp_conf->nb_descriptors * desc_size;
+
+ queue->hw_queue_number =
+ ((dir == RING_DIR_TX) ? qp_conf->hw->tx_ring_num
+ : qp_conf->hw->rx_ring_num);
+
+ struct rte_pci_device *pci_dev = zsda_devs[dev_id].pci_dev;
+ struct zsda_pci_device *zsda_dev =
+ (struct zsda_pci_device *)zsda_devs[dev_id].mz->addr;
+
+ zsda_get_queue_cfg_by_id(zsda_dev, queue->hw_queue_number, &qcfg);
+
+ if (dir == RING_DIR_TX)
+ snprintf(queue->memz_name, sizeof(queue->memz_name),
+"%s_%d_%s_%s_%d", pci_dev->driver->driver.name, dev_id,
+qp_conf->service_str, "qptxmem",
+queue->hw_queue_number);
+ else
+ snprintf(queue->memz_name, sizeof(queue->memz_name),
+"%s_%d_%s_%s_%d", pci_dev->driver->driver.name, dev_id,
+qp_conf->service_str, "qprxmem",
+queue->hw_queue_number);
+
+ qp_mz = zsda_queue_dma_zone_reserve(queue->memz_name, queue_size_bytes,
+ rte_socket_id());
+ if (qp_mz == NULL) {
+
[PATCH v21 11/13] compress/zsda: add zsda compressdev enqueue datapath
Add zsda compressdev enqueue datapath.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 2 +-
drivers/common/zsda/zsda_qp.c | 107
drivers/common/zsda/zsda_qp.h | 23 ++-
drivers/common/zsda/zsda_qp_common.c | 72
drivers/common/zsda/zsda_qp_common.h | 41 +
drivers/compress/zsda/zsda_comp.c | 233 ++
drivers/compress/zsda/zsda_comp.h | 36
drivers/compress/zsda/zsda_comp_pmd.c | 19 ++-
8 files changed, 515 insertions(+), 18 deletions(-)
create mode 100644 drivers/compress/zsda/zsda_comp.c
create mode 100644 drivers/compress/zsda/zsda_comp.h
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 6e6d5ab006..152150e5ef 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -20,7 +20,7 @@ zsda_compress_path = 'compress/zsda'
zsda_compress_relpath = '../../' + zsda_compress_path
includes += include_directories(zsda_compress_relpath)
if zsda_compress
- foreach f: ['zsda_comp_pmd.c']
+ foreach f: ['zsda_comp_pmd.c', 'zsda_comp.c']
sources += files(join_paths(zsda_compress_relpath, f))
endforeach
endif
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index 658b0b69e3..c2a7d9b28b 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -771,3 +771,110 @@ zsda_common_setup_qp(uint32_t zsda_dev_id, struct zsda_qp
**qp_addr,
}
return ret;
}
+
+
+static int
+zsda_find_next_free_cookie(const struct zsda_queue *queue, void **op_cookie,
+ uint16_t *idx)
+{
+ uint16_t old_tail = queue->tail;
+ uint16_t tail = queue->tail;
+ struct zsda_op_cookie *cookie;
+
+ do {
+ cookie = op_cookie[tail];
+ if (!cookie->used) {
+ *idx = tail & (queue->queue_size - 1);
+ return ZSDA_SUCCESS;
+ }
+ tail = zsda_modulo_16(tail++, queue->modulo_mask);
+ } while (old_tail != tail);
+
+ return -EINVAL;
+}
+
+static int
+zsda_enqueue(void *op, struct zsda_qp *qp)
+{
+ uint16_t new_tail;
+ enum zsda_service_type type;
+ void **op_cookie;
+ int ret = ZSDA_SUCCESS;
+ struct zsda_queue *queue;
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (qp->srv[type].used) {
+ if (!qp->srv[type].match(op))
+ continue;
+ queue = &qp->srv[type].tx_q;
+ op_cookie = qp->srv[type].op_cookies;
+
+ if (zsda_find_next_free_cookie(queue, op_cookie,
+ &new_tail)) {
+ ret = -EBUSY;
+ break;
+ }
+ ret = qp->srv[type].tx_cb(op, queue, op_cookie,
+ new_tail);
+ if (ret) {
+ qp->srv[type].stats.enqueue_err_count++;
+ ZSDA_LOG(ERR, "Failed! config wqe");
+ break;
+ }
+ qp->srv[type].stats.enqueued_count++;
+
+ queue->tail = zsda_modulo_16(new_tail + 1,
+queue->queue_size - 1);
+
+ if (new_tail > queue->tail)
+ queue->valid =
+ zsda_modulo_8(queue->valid + 1,
+ (uint8_t)(queue->cycle_size - 1));
+
+ queue->pushed_wqe++;
+ break;
+ }
+ }
+
+ return ret;
+}
+
+static void
+zsda_tx_write_tail(struct zsda_queue *queue)
+{
+ if (queue->pushed_wqe)
+ WRITE_CSR_WQ_TAIL(queue->io_addr, queue->hw_queue_number,
+ queue->tail);
+
+ queue->pushed_wqe = 0;
+}
+
+uint16_t
+zsda_enqueue_op_burst(struct zsda_qp *qp, void **ops, const uint16_t nb_ops)
+{
+ int ret = ZSDA_SUCCESS;
+ enum zsda_service_type type;
+ uint16_t i;
+ uint16_t nb_send = 0;
+ void *op;
+
+ if (nb_ops > ZSDA_MAX_DESC) {
+ ZSDA_LOG(ERR, "Enqueue number bigger than %d", ZSDA_MAX_DESC);
+ return 0;
+ }
+
+ for (i = 0; i < nb_ops; i++) {
+ op = ops[i];
+ ret = zsda_enqueue(op, qp);
+ if (ret < 0)
+ break;
+ nb_send++;
+ }
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++)
+ if (qp->srv[type].used)
+ zsda_tx_write_tail(&qp->srv[type].tx_q);
+
+ return nb_send;
+}
+
diff --git a/drivers/common/zsda/zsda_qp.h b/drivers/common/zsda/z
[PATCH v21 02/13] common/zsda: add zsdadev driver
Add basic zsdadev init and register PCI probe functions
Signed-off-by: Hanxiao Li
---
MAINTAINERS | 3 +
drivers/common/zsda/meson.build | 13 ++
drivers/common/zsda/zsda_device.c | 191 ++
drivers/common/zsda/zsda_device.h | 53 +
drivers/meson.build | 1 +
5 files changed, 261 insertions(+)
create mode 100644 drivers/common/zsda/meson.build
create mode 100644 drivers/common/zsda/zsda_device.c
create mode 100644 drivers/common/zsda/zsda_device.h
diff --git a/MAINTAINERS b/MAINTAINERS
index c5a703b5c0..0318d7357c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1268,6 +1268,9 @@ F: drivers/compress/zlib/
F: doc/guides/compressdevs/zlib.rst
F: doc/guides/compressdevs/features/zlib.ini
+ZTE Storage Data Accelerator(ZSDA)
+M: Hanxiao Li
+F: drivers/common/zsda/
DMAdev Drivers
--
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
new file mode 100644
index 00..68bc549c27
--- /dev/null
+++ b/drivers/common/zsda/meson.build
@@ -0,0 +1,13 @@
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2024 ZTE Corporation
+
+if is_windows
+build = false
+reason = 'not supported on Windows'
+subdir_done()
+endif
+
+deps += ['bus_pci', 'mbuf']
+sources += files(
+ 'zsda_device.c',
+ )
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
new file mode 100644
index 00..8d691b3bb8
--- /dev/null
+++ b/drivers/common/zsda/zsda_device.c
@@ -0,0 +1,191 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+
+#include
+#include
+
+#include
+
+#include "zsda_device.h"
+
+/* per-process array of device data */
+struct zsda_device_info zsda_devs[RTE_PMD_ZSDA_MAX_PCI_DEVICES];
+static int zsda_nb_pci_devices;
+
+/*
+ * The set of PCI devices this driver supports
+ */
+static const struct rte_pci_id pci_id_zsda_map[] = {
+ {
+ RTE_PCI_DEVICE(0x1cf2, 0x8050),
+ },
+ {
+ RTE_PCI_DEVICE(0x1cf2, 0x8051),
+ },
+ {.device_id = 0},
+};
+
+static struct zsda_pci_device *
+zsda_pci_get_named_dev(const char *name)
+{
+ unsigned int i;
+
+ if (name == NULL)
+ return NULL;
+
+ for (i = 0; i < RTE_PMD_ZSDA_MAX_PCI_DEVICES; i++) {
+ if (zsda_devs[i].mz &&
+ (strcmp(((struct zsda_pci_device *)zsda_devs[i].mz->addr)
+ ->name,
+ name) == 0))
+ return (struct zsda_pci_device *)zsda_devs[i].mz->addr;
+ }
+
+ return NULL;
+}
+static uint8_t
+zsda_pci_find_free_device_index(void)
+{
+ uint32_t dev_id;
+
+ for (dev_id = 0; dev_id < RTE_PMD_ZSDA_MAX_PCI_DEVICES; dev_id++)
+ if (zsda_devs[dev_id].mz == NULL)
+ break;
+
+ return dev_id & (ZSDA_MAX_DEV - 1);
+}
+
+static struct zsda_pci_device *
+zsda_get_zsda_dev_from_pci_dev(const struct rte_pci_device *pci_dev)
+{
+ char name[ZSDA_DEV_NAME_MAX_LEN];
+
+ rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+
+ return zsda_pci_get_named_dev(name);
+}
+
+static struct zsda_pci_device *
+zsda_pci_device_allocate(struct rte_pci_device *pci_dev)
+{
+ struct zsda_pci_device *zsda_pci_dev;
+ uint8_t zsda_dev_id;
+ char name[ZSDA_DEV_NAME_MAX_LEN];
+ unsigned int socket_id = rte_socket_id();
+
+ rte_pci_device_name(&pci_dev->addr, name, sizeof(name));
+ snprintf(name + strlen(name), (ZSDA_DEV_NAME_MAX_LEN - strlen(name)),
+"_zsda");
+ if (rte_eal_process_type() == RTE_PROC_SECONDARY) {
+ const struct rte_memzone *mz = rte_memzone_lookup(name);
+
+ if (mz == NULL)
+ return NULL;
+ zsda_pci_dev = mz->addr;
+ zsda_devs[zsda_pci_dev->zsda_dev_id].mz = mz;
+ zsda_devs[zsda_pci_dev->zsda_dev_id].pci_dev = pci_dev;
+ zsda_nb_pci_devices++;
+ return zsda_pci_dev;
+ }
+
+ if (zsda_pci_get_named_dev(name) != NULL)
+ return NULL;
+
+ zsda_dev_id = zsda_pci_find_free_device_index();
+
+ if (zsda_dev_id == (RTE_PMD_ZSDA_MAX_PCI_DEVICES - 1))
+ return NULL;
+
+ zsda_devs[zsda_dev_id].mz =
+ rte_memzone_reserve(name, sizeof(struct zsda_pci_device),
+ (int)(socket_id & 0xfff), 0);
+
+ if (zsda_devs[zsda_dev_id].mz == NULL)
+ return NULL;
+
+ zsda_pci_dev = zsda_devs[zsda_dev_id].mz->addr;
+ memset(zsda_pci_dev, 0, sizeof(*zsda_pci_dev));
+ memcpy(zsda_pci_dev->name, name, ZSDA_DEV_NAME_MAX_LEN);
+ zsda_pci_dev->zsda_dev_id = zsda_dev_id;
+ zsda_pci_dev->pci_dev = pci_dev;
+ zsda_devs[zsda_dev_id].pci_dev = pci_dev;
+
+ zsda_nb_pci_devices++;
+
+
[PATCH v21 13/13] compress/zsda: add zsda compressdev capabilities
Add zsda compressdev capabilities.
Signed-off-by: Hanxiao Li
---
doc/guides/compressdevs/features/zsda.ini | 9 +
doc/guides/compressdevs/zsda.rst | 23 +++
doc/guides/rel_notes/release_24_11.rst| 7 +++
drivers/compress/zsda/zsda_comp_pmd.c | 15 ++-
4 files changed, 53 insertions(+), 1 deletion(-)
diff --git a/doc/guides/compressdevs/features/zsda.ini
b/doc/guides/compressdevs/features/zsda.ini
index 5cc9a3b1a6..3b087ea7f9 100644
--- a/doc/guides/compressdevs/features/zsda.ini
+++ b/doc/guides/compressdevs/features/zsda.ini
@@ -4,3 +4,12 @@
; Supported features of 'ZSDA' compression driver.
;
[Features]
+HW Accelerated = Y
+OOP SGL In SGL Out = Y
+OOP SGL In LB Out = Y
+OOP LB In SGL Out = Y
+Deflate= Y
+Adler32= Y
+Crc32 = Y
+Fixed = Y
+Dynamic= Y
diff --git a/doc/guides/compressdevs/zsda.rst b/doc/guides/compressdevs/zsda.rst
index c02423d650..30d1c55766 100644
--- a/doc/guides/compressdevs/zsda.rst
+++ b/doc/guides/compressdevs/zsda.rst
@@ -13,6 +13,29 @@ support for the following hardware accelerator devices:
Features
+ZSDA compression PMD has support for:
+
+Compression/Decompression algorithm:
+
+* DEFLATE - using Fixed and Dynamic Huffman encoding
+
+Checksum generation:
+
+* CRC32, Adler32
+
+Huffman code type:
+
+* FIXED
+* DYNAMIC
+
+
+Limitations
+---
+
+* Compressdev level 0, no compression, is not supported.
+* No BSD support as BSD ZSDA kernel driver not available.
+* Stateful is not supported.
+
Installation
diff --git a/doc/guides/rel_notes/release_24_11.rst
b/doc/guides/rel_notes/release_24_11.rst
index 0ff70d9057..583e509a45 100644
--- a/doc/guides/rel_notes/release_24_11.rst
+++ b/doc/guides/rel_notes/release_24_11.rst
@@ -24,6 +24,13 @@ DPDK Release 24.11
New Features
+* **Added ZTE Storage Data Accelerator(ZSDA) device driver.**
+
+ * Added a new compress driver for ZSDA devices to support
+the deflate compression and decompression algorithm.
+
+See the :doc:`../compressdevs/zsda` guide for more details on the new
driver.
+
.. This section should contain new features added in this release.
Sample format:
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index ea3de2f505..85c934ace1 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -9,6 +9,19 @@
#include "zsda_comp_pmd.h"
#include "zsda_comp.h"
+static const struct rte_compressdev_capabilities zsda_comp_capabilities[] = {
+ {
+ .algo = RTE_COMP_ALGO_DEFLATE,
+ .comp_feature_flags = RTE_COMP_FF_HUFFMAN_DYNAMIC |
+
RTE_COMP_FF_OOP_SGL_IN_SGL_OUT |
+
RTE_COMP_FF_OOP_SGL_IN_LB_OUT |
+
RTE_COMP_FF_OOP_LB_IN_SGL_OUT |
+
RTE_COMP_FF_CRC32_CHECKSUM |
+
RTE_COMP_FF_ADLER32_CHECKSUM,
+ .window_size = {.min = 15, .max = 15, .increment = 0},
+ },
+};
+
static int
zsda_comp_xform_size(void)
{
@@ -405,7 +418,7 @@ zsda_comp_dev_create(struct zsda_pci_device *zsda_pci_dev)
comp_dev->zsda_pci_dev = zsda_pci_dev;
comp_dev->compressdev = compressdev;
- capabilities = NULL;
+ capabilities = zsda_comp_capabilities;
comp_dev->capa_mz = rte_memzone_lookup(capa_memz_name);
if (comp_dev->capa_mz == NULL) {
--
2.27.0
[PATCH v21 04/13] common/zsda: add functions to operate hardware queue
Add functions to operate hardware queue,
such as queue start,stop and clear.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/meson.build | 1 +
drivers/common/zsda/zsda_device.c| 7 +
drivers/common/zsda/zsda_qp.c| 196 +++
drivers/common/zsda/zsda_qp.h| 37 +
drivers/common/zsda/zsda_qp_common.h | 27
5 files changed, 268 insertions(+)
create mode 100644 drivers/common/zsda/zsda_qp.c
create mode 100644 drivers/common/zsda/zsda_qp.h
create mode 100644 drivers/common/zsda/zsda_qp_common.h
diff --git a/drivers/common/zsda/meson.build b/drivers/common/zsda/meson.build
index 342d000c6d..4c910d7e7d 100644
--- a/drivers/common/zsda/meson.build
+++ b/drivers/common/zsda/meson.build
@@ -11,4 +11,5 @@ deps += ['bus_pci', 'mbuf']
sources += files(
'zsda_device.c',
'zsda_logs.c',
+ 'zsda_qp.c',
)
diff --git a/drivers/common/zsda/zsda_device.c
b/drivers/common/zsda/zsda_device.c
index 1be3ea8016..5c835651ea 100644
--- a/drivers/common/zsda/zsda_device.c
+++ b/drivers/common/zsda/zsda_device.c
@@ -10,6 +10,7 @@
#include "zsda_device.h"
#include "zsda_logs.h"
+#include "zsda_qp.h"
/* per-process array of device data */
struct zsda_device_info zsda_devs[RTE_PMD_ZSDA_MAX_PCI_DEVICES];
@@ -170,6 +171,12 @@ zsda_pci_probe(struct rte_pci_driver *pci_drv __rte_unused,
return -ENODEV;
}
+ ret = zsda_queue_init(zsda_pci_dev);
+ if (ret) {
+ ZSDA_LOG(ERR, "Failed! queue init.");
+ return ret;
+ }
+
return ret;
}
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
new file mode 100644
index 00..8060d89ea1
--- /dev/null
+++ b/drivers/common/zsda/zsda_qp.c
@@ -0,0 +1,196 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2024 ZTE Corporation
+ */
+
+#include
+
+#include
+
+#include "zsda_logs.h"
+#include "zsda_device.h"
+#include "zsda_qp.h"
+#include "zsda_qp_common.h"
+
+static uint8_t zsda_num_used_qps;
+
+static uint8_t
+zsda_get_num_used_qps(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ uint8_t num_used_qps;
+
+ num_used_qps = ZSDA_CSR_READ8(mmio_base + 0);
+
+ return num_used_qps;
+}
+
+static int
+zsda_check_write(uint8_t *addr, const uint32_t dst_value)
+{
+ int times = ZSDA_TIME_NUM;
+ uint32_t val;
+
+ val = ZSDA_CSR_READ32(addr);
+
+ while ((val != dst_value) && times--) {
+ val = ZSDA_CSR_READ32(addr);
+ rte_delay_us_sleep(ZSDA_TIME_SLEEP_US);
+ }
+ if (val == dst_value)
+ return ZSDA_SUCCESS;
+ else
+ return ZSDA_FAILED;
+}
+
+static int
+zsda_admin_q_start(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ int ret;
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_START, 0);
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_START, ZSDA_Q_START);
+ ret = zsda_check_write(mmio_base + ZSDA_ADMIN_Q_START, ZSDA_Q_START);
+
+ return ret;
+}
+
+static int __rte_unused
+zsda_admin_q_stop(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ int ret;
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_STOP_RESP, ZSDA_RESP_INVALID);
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_STOP, ZSDA_Q_STOP);
+
+ ret = zsda_check_write(mmio_base + ZSDA_ADMIN_Q_STOP_RESP,
+ ZSDA_RESP_VALID);
+
+ if (ret)
+ ZSDA_LOG(INFO, "Failed! zsda_admin q stop");
+
+ return ret;
+}
+
+static int __rte_unused
+zsda_admin_q_clear(const struct rte_pci_device *pci_dev)
+{
+ uint8_t *mmio_base = pci_dev->mem_resource[0].addr;
+ int ret;
+
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_CLR_RESP, ZSDA_RESP_INVALID);
+ ZSDA_CSR_WRITE32(mmio_base + ZSDA_ADMIN_Q_CLR, ZSDA_RESP_VALID);
+
+ ret = zsda_check_write(mmio_base + ZSDA_ADMIN_Q_CLR_RESP,
+ ZSDA_RESP_VALID);
+
+ if (ret)
+ ZSDA_LOG(INFO, "Failed! zsda_admin q clear");
+
+ return ret;
+}
+
+
+static int
+zsda_queue_start_single(uint8_t *mmio_base, const uint8_t id)
+{
+ uint8_t *addr_start = mmio_base + ZSDA_IO_Q_START + (4 * id);
+
+ ZSDA_CSR_WRITE32(addr_start, ZSDA_Q_START);
+ return zsda_check_write(addr_start, ZSDA_Q_START);
+}
+
+
+static int
+zsda_queue_stop_single(uint8_t *mmio_base, const uint8_t id)
+{
+ int ret;
+ uint8_t *addr_stop = mmio_base + ZSDA_IO_Q_STOP + (4 * id);
+ uint8_t *addr_resp = mmio_base + ZSDA_IO_Q_STOP_RESP + (4 * id);
+
+ ZSDA_CSR_WRITE32(addr_resp, ZSDA_RESP_INVALID);
+ ZSDA_CSR_WRITE32(addr_stop, ZSDA_Q_STOP);
+
+ ret = zsda_check_write(addr_resp, ZSDA_RESP_VALID);
+ ZSDA_CSR_WRITE32(addr_resp, ZSDA_RESP_IN
[PATCH v21 09/13] compress/zsda: add zsda compressdev xform ops
Add zsda compressdev xform interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/compress/zsda/zsda_comp_pmd.c | 55 +--
1 file changed, 52 insertions(+), 3 deletions(-)
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index 555178cd12..e9682e93cd 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -154,13 +154,62 @@ zsda_comp_stats_get(struct rte_compressdev *dev,
stats->dequeue_err_count = stats_info.dequeue_err_count;
}
-
static void
zsda_comp_stats_reset(struct rte_compressdev *dev)
{
zsda_stats_reset(dev->data->queue_pairs, dev->data->nb_queue_pairs);
}
+static int
+zsda_comp_private_xform_create(struct rte_compressdev *dev,
+ const struct rte_comp_xform *xform,
+ void **private_xform)
+{
+ struct zsda_comp_dev_private *zsda = dev->data->dev_private;
+
+ if (unlikely(private_xform == NULL)) {
+ ZSDA_LOG(ERR, "Failed! private_xform is NULL");
+ return -EINVAL;
+ }
+ if (unlikely(zsda->xformpool == NULL)) {
+ ZSDA_LOG(ERR, "Failed! zsda->xformpool is NULL");
+ return -ENOMEM;
+ }
+ if (rte_mempool_get(zsda->xformpool, private_xform)) {
+ ZSDA_LOG(ERR, "Failed! zsda->xformpool is NULL");
+ return -ENOMEM;
+ }
+
+ struct zsda_comp_xform *zsda_xform = *private_xform;
+ zsda_xform->type = xform->type;
+
+ if (zsda_xform->type == RTE_COMP_COMPRESS)
+ zsda_xform->checksum_type = xform->compress.chksum;
+ else
+ zsda_xform->checksum_type = xform->decompress.chksum;
+
+ if (zsda_xform->checksum_type == RTE_COMP_CHECKSUM_CRC32_ADLER32)
+ return -EINVAL;
+
+ return ZSDA_SUCCESS;
+}
+
+static int
+zsda_comp_private_xform_free(struct rte_compressdev *dev __rte_unused,
+void *private_xform)
+{
+ struct zsda_comp_xform *zsda_xform = private_xform;
+
+ if (zsda_xform) {
+ memset(zsda_xform, 0, zsda_comp_xform_size());
+ struct rte_mempool *mp = rte_mempool_from_obj(zsda_xform);
+
+ rte_mempool_put(mp, zsda_xform);
+ return ZSDA_SUCCESS;
+ }
+ return -EINVAL;
+}
+
static struct rte_compressdev_ops compress_zsda_ops = {
.dev_configure = zsda_comp_dev_config,
@@ -174,8 +223,8 @@ static struct rte_compressdev_ops compress_zsda_ops = {
.queue_pair_setup = NULL,
.queue_pair_release = NULL,
- .private_xform_create = NULL,
- .private_xform_free = NULL
+ .private_xform_create = zsda_comp_private_xform_create,
+ .private_xform_free = zsda_comp_private_xform_free,
};
/* An rte_driver is needed in the registration of the device with compressdev.
--
2.27.0
[PATCH v21 12/13] compress/zsda: add zsda compressdev dequeue datapath
Add zsda compressdev dequeue datapath.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp.c | 55 +
drivers/common/zsda/zsda_qp.h | 1 +
drivers/common/zsda/zsda_qp_common.h | 4 +
drivers/compress/zsda/zsda_comp.c | 155 ++
drivers/compress/zsda/zsda_comp.h | 9 ++
drivers/compress/zsda/zsda_comp_pmd.c | 14 ++-
6 files changed, 235 insertions(+), 3 deletions(-)
diff --git a/drivers/common/zsda/zsda_qp.c b/drivers/common/zsda/zsda_qp.c
index c2a7d9b28b..fd45558868 100644
--- a/drivers/common/zsda/zsda_qp.c
+++ b/drivers/common/zsda/zsda_qp.c
@@ -878,3 +878,58 @@ zsda_enqueue_op_burst(struct zsda_qp *qp, void **ops,
const uint16_t nb_ops)
return nb_send;
}
+static void
+zsda_dequeue(struct qp_srv *srv, void **ops, const uint16_t nb_ops, uint16_t
*nb)
+{
+ uint16_t head;
+ struct zsda_cqe *cqe;
+ struct zsda_queue *queue = &srv->rx_q;
+ struct zsda_op_cookie *cookie;
+ head = queue->head;
+
+ while (*nb < nb_ops) {
+ cqe = (struct zsda_cqe *)(
+ (uint8_t *)queue->base_addr + head * queue->msg_size);
+
+ if (!CQE_VALID(cqe->err1))
+ break;
+ cookie = srv->op_cookies[cqe->sid];
+
+ ops[*nb] = cookie->op;
+ if (srv->rx_cb(cookie, cqe) == ZSDA_SUCCESS)
+ srv->stats.dequeued_count++;
+ else {
+ ZSDA_LOG(ERR,
+"ERR! Cqe, opcode 0x%x, sid 0x%x, "
+"tx_real_length 0x%x, err0 0x%x, err1 0x%x",
+cqe->op_code, cqe->sid, cqe->tx_real_length,
+cqe->err0, cqe->err1);
+ srv->stats.dequeue_err_count++;
+ }
+ (*nb)++;
+ cookie->used = false;
+
+ head = zsda_modulo_16(head + 1, queue->modulo_mask);
+ queue->head = head;
+ WRITE_CSR_CQ_HEAD(queue->io_addr, queue->hw_queue_number, head);
+ memset(cqe, 0x0, sizeof(struct zsda_cqe));
+ }
+}
+
+uint16_t
+zsda_dequeue_op_burst(struct zsda_qp *qp, void **ops, const uint16_t nb_ops)
+{
+ uint16_t nb = 0;
+ uint32_t type = 0;
+ struct qp_srv *srv;
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (!qp->srv[type].used)
+ continue;
+ srv = &qp->srv[type];
+ zsda_dequeue(srv, ops, nb_ops, &nb);
+ if (nb >= nb_ops)
+ return nb_ops;
+ }
+ return nb;
+}
diff --git a/drivers/common/zsda/zsda_qp.h b/drivers/common/zsda/zsda_qp.h
index 012ed19c62..931953b61c 100644
--- a/drivers/common/zsda/zsda_qp.h
+++ b/drivers/common/zsda/zsda_qp.h
@@ -177,5 +177,6 @@ int zsda_common_setup_qp(uint32_t dev_id, struct zsda_qp
**qp_addr,
const uint16_t queue_pair_id, const struct zsda_qp_config
*conf);
uint16_t zsda_enqueue_op_burst(struct zsda_qp *qp, void **ops, const uint16_t
nb_ops);
+uint16_t zsda_dequeue_op_burst(struct zsda_qp *qp, void **ops, const uint16_t
nb_ops);
#endif /* _ZSDA_QP_H_ */
diff --git a/drivers/common/zsda/zsda_qp_common.h
b/drivers/common/zsda/zsda_qp_common.h
index aa3ddf6f42..2b3d493460 100644
--- a/drivers/common/zsda/zsda_qp_common.h
+++ b/drivers/common/zsda/zsda_qp_common.h
@@ -47,6 +47,10 @@ enum zsda_service_type {
#define ZSDA_OPC_DECOMP_ZLIB 0x19 /* Decomp infalte-Zlib */
#define ZSDA_OPC_INVALID 0xff
+#define CQE_VALID(value) (value & 0x8000)
+#define CQE_ERR0(value) (value & 0x)
+#define CQE_ERR1(value) (value & 0x7FFF)
+
enum wqe_element_type {
WQE_ELM_TYPE_PHYS_ADDR = 1,
WQE_ELM_TYPE_LIST,
diff --git a/drivers/compress/zsda/zsda_comp.c
b/drivers/compress/zsda/zsda_comp.c
index c00e0c2a4b..c22d690e5e 100644
--- a/drivers/compress/zsda/zsda_comp.c
+++ b/drivers/compress/zsda/zsda_comp.c
@@ -10,6 +10,83 @@
#define GZIP_TRAILER_SIZE 8
#define CHECKSUM_SIZE 4
+#define POLYNOMIAL 0xEDB88320
+static uint32_t crc32_table[8][256];
+static int table_config;
+
+static void
+build_crc32_table(void)
+{
+ for (uint32_t i = 0; i < 256; i++) {
+ uint32_t crc = i;
+ for (uint32_t j = 0; j < 8; j++)
+ crc = (crc >> 1) ^ ((crc & 1) ? POLYNOMIAL : 0);
+ crc32_table[0][i] = crc;
+ }
+
+ for (int i = 1; i < 8; i++) {
+ for (uint32_t j = 0; j < 256; j++)
+ crc32_table[i][j] = (crc32_table[i-1][j] >> 8) ^
+ crc32_table[0][crc32_table[i-1][j] &
0xFF];
+ }
+ table_config = 1;
+}
+
+static uint32_t
+zsda_crc32(const uint8_t *data, size_t length)
+{
+ uint32_t crc = 0x;
+
+ if (!table_config)
+ build_crc32_table();
+
+ while (length
[PATCH v21 08/13] compress/zsda: add zsda compressdev stats ops
Add zsda compressdev stats interface implementation.
Signed-off-by: Hanxiao Li
---
drivers/common/zsda/zsda_qp_common.c | 63 +++
drivers/common/zsda/zsda_qp_common.h | 16 +++
drivers/compress/zsda/zsda_comp_pmd.c | 25 ++-
3 files changed, 102 insertions(+), 2 deletions(-)
diff --git a/drivers/common/zsda/zsda_qp_common.c
b/drivers/common/zsda/zsda_qp_common.c
index 9c7152eb24..70367e6c82 100644
--- a/drivers/common/zsda/zsda_qp_common.c
+++ b/drivers/common/zsda/zsda_qp_common.c
@@ -55,3 +55,66 @@ zsda_queue_pair_release(struct zsda_qp **qp_addr)
return ZSDA_SUCCESS;
}
+
+void
+zsda_stats_get(void **queue_pairs, const uint32_t nb_queue_pairs,
+ struct zsda_qp_stat *stats)
+{
+ enum zsda_service_type type;
+ uint32_t i;
+ struct zsda_qp *qp;
+
+ if ((stats == NULL) || (queue_pairs == NULL)) {
+ ZSDA_LOG(ERR, "Failed! stats or queue_pairs is NULL");
+ return;
+ }
+
+ for (i = 0; i < nb_queue_pairs; i++) {
+ qp = queue_pairs[i];
+
+ if (qp == NULL) {
+ ZSDA_LOG(ERR, "Failed! queue_pairs[i] is NULL");
+ break;
+ }
+
+ for (type = 0; type < ZSDA_SERVICE_INVALID; type++) {
+ if (qp->srv[type].used) {
+ stats->enqueued_count +=
+ qp->srv[type].stats.enqueued_count;
+ stats->dequeued_count +=
+ qp->srv[type].stats.dequeued_count;
+ stats->enqueue_err_count +=
+ qp->srv[type].stats.enqueue_err_count;
+ stats->dequeue_err_count +=
+ qp->srv[type].stats.dequeue_err_count;
+ }
+ }
+ }
+}
+
+void
+zsda_stats_reset(void **queue_pairs, const uint32_t nb_queue_pairs)
+{
+ enum zsda_service_type type;
+ uint32_t i;
+ struct zsda_qp *qp;
+
+ if (queue_pairs == NULL) {
+ ZSDA_LOG(ERR, "Failed! queue_pairs is NULL");
+ return;
+ }
+
+ for (i = 0; i < nb_queue_pairs; i++) {
+ qp = queue_pairs[i];
+
+ if (qp == NULL) {
+ ZSDA_LOG(ERR, "Failed! queue_pairs[i] is NULL");
+ break;
+ }
+ for (type = 0; type < ZSDA_MAX_SERVICES; type++) {
+ if (qp->srv[type].used)
+ memset(&(qp->srv[type].stats), 0,
+ sizeof(struct zsda_qp_stat));
+ }
+ }
+}
diff --git a/drivers/common/zsda/zsda_qp_common.h
b/drivers/common/zsda/zsda_qp_common.h
index 4bcec4ad4c..603c0e9e3a 100644
--- a/drivers/common/zsda/zsda_qp_common.h
+++ b/drivers/common/zsda/zsda_qp_common.h
@@ -52,10 +52,23 @@ struct zsda_queue {
uint16_t sid;
};
+struct zsda_qp_stat {
+ /**< Count of all operations enqueued */
+ uint64_t enqueued_count;
+ /**< Count of all operations dequeued */
+ uint64_t dequeued_count;
+
+ /**< Total error count on operations enqueued */
+ uint64_t enqueue_err_count;
+ /**< Total error count on operations dequeued */
+ uint64_t dequeue_err_count;
+};
+
struct qp_srv {
bool used;
struct zsda_queue tx_q;
struct zsda_queue rx_q;
+ struct zsda_qp_stat stats;
struct rte_mempool *op_cookie_pool;
void **op_cookies;
uint16_t nb_descriptors;
@@ -66,5 +79,8 @@ struct zsda_qp {
};
int zsda_queue_pair_release(struct zsda_qp **qp_addr);
+void zsda_stats_get(void **queue_pairs, const uint32_t nb_queue_pairs,
+ struct zsda_qp_stat *stats);
+void zsda_stats_reset(void **queue_pairs, const uint32_t nb_queue_pairs);
#endif /* _ZSDA_QP_COMMON_H_ */
diff --git a/drivers/compress/zsda/zsda_comp_pmd.c
b/drivers/compress/zsda/zsda_comp_pmd.c
index 3bdcd66f6a..555178cd12 100644
--- a/drivers/compress/zsda/zsda_comp_pmd.c
+++ b/drivers/compress/zsda/zsda_comp_pmd.c
@@ -140,6 +140,27 @@ zsda_comp_dev_info_get(struct rte_compressdev *dev,
}
}
+static void
+zsda_comp_stats_get(struct rte_compressdev *dev,
+ struct rte_compressdev_stats *stats)
+{
+ struct zsda_qp_stat stats_info = {0};
+
+ zsda_stats_get(dev->data->queue_pairs, dev->data->nb_queue_pairs,
+ &stats_info);
+ stats->enqueued_count = stats_info.enqueued_count;
+ stats->dequeued_count = stats_info.dequeued_count;
+ stats->enqueue_err_count = stats_info.enqueue_err_count;
+ stats->dequeue_err_count = stats_info.dequeue_err_count;
+}
+
+
+static void
+zsda_comp_stats_reset(struct rte_compressdev *dev)
+{
+ zsda_stats_reset(dev->data->queue_pairs, dev->data->nb_queue_pairs);
RE: Re:RE: [EXTERNAL] [PATCH] graph: optimize graph search when scheduling nodes
> -Original Message- > From: David Marchand > Sent: Friday, November 8, 2024 7:08 PM > To: Jerin Jacob > Cc: Huichao Cai ; Kiran Kumar Kokkilagadda > ; Nithin Kumar Dabilpuram > ; yanzhirun_...@163.com; dev@dpdk.org; > Thomas Monjalon ; Robin Jarry > Subject: Re: Re:RE: [EXTERNAL] [PATCH] graph: optimize graph search when > scheduling nodes > > Hello Jerin, On Fri, Nov 8, 2024 at 1: 22 PM Jerin Jacob com> > wrote: > > > Is n't breaking the ABI? > > > > So can't we modify the ABI, or > is > there any special operation required to modify > > > Hello Jerin, Hello David, > > On Fri, Nov 8, 2024 at 1:22 PM Jerin Jacob wrote: > > > > Is n't breaking the ABI? > > > > > > So can't we modify the ABI, or is there any special operation > > > required to modify the ABI? > > > > Only LTS release (xx.11) can change the ABI after sending deprecation > > notice. > > Looking at the pahole output, one option will be making dispatch and > > new semi fastpath Additions like xstat_off can be min cache aligned > > to make room for future expansion and to make sure have better > performance. > > Adding holes may be a short term solution, but in my opinion, the slow path > part should be entirely hidden and we only expose the fp part. The new cache line alignment items are proposed are fastpath items only. > Reminder, those holes must be in a "known state" as we release v24.11 so that > the presence of future additions can be safely detected. > > > -- > David Marchand
[PATCH v2 3/3] test/graph: fix graph autotest second run test failure
From: Kiran Kumar K
The graph autotest second run test is failing due to the
node name is already present in the node list. Adding changes
to free nodes at the time of test cleanup.
Fixes: 6b89650418fe ("test/graph: add functional tests")
Signed-off-by: Kiran Kumar K
---
app/test/test_graph.c | 96 ---
1 file changed, 90 insertions(+), 6 deletions(-)
diff --git a/app/test/test_graph.c b/app/test/test_graph.c
index 2840a25b13..e712dbebf7 100644
--- a/app/test/test_graph.c
+++ b/app/test/test_graph.c
@@ -68,6 +68,8 @@ static void *mbuf_p[MAX_NODES + 1][MBUFF_SIZE];
static rte_graph_t graph_id;
static uint64_t obj_stats[MAX_NODES + 1];
static uint64_t fn_calls[MAX_NODES + 1];
+static uint32_t dummy_nodes_id[MAX_NODES];
+static int dummy_nodes_id_count;
const char *node_patterns[] = {
"test_node_source1", "test_node00",
@@ -541,6 +543,66 @@ test_lookup_functions(void)
return 0;
}
+static int
+test_node_id(void)
+{
+ uint32_t node_id, odummy_id, dummy_id, dummy_id1;
+
+ node_id = rte_node_from_name("test_node00");
+
+ dummy_id = rte_node_clone(node_id, "test_node_id00");
+ if (rte_node_is_invalid(dummy_id)) {
+ printf("Got invalid id when clone\n");
+ return -1;
+ }
+
+ dummy_id1 = rte_node_clone(node_id, "test_node_id01");
+ if (rte_node_is_invalid(dummy_id1)) {
+ printf("Got invalid id when clone\n");
+ return -1;
+ }
+
+ /* Expect next node id to be node_id + 1 */
+ if ((dummy_id + 1) != dummy_id1) {
+ printf("Node id didn't match, expected = %d got = %d\n",
+ dummy_id+1, dummy_id1);
+ return -1;
+ }
+
+ odummy_id = dummy_id;
+ /* Free one of the cloned node */
+ if (rte_node_free(dummy_id)) {
+ printf("Failed to free node\n");
+ return -1;
+ }
+
+ /* Clone again, should get the same id, that is freed */
+ dummy_id = rte_node_clone(node_id, "test_node_id00");
+ if (rte_node_is_invalid(dummy_id)) {
+ printf("Got invalid id when clone\n");
+ return -1;
+ }
+
+ if (dummy_id != odummy_id) {
+ printf("Node id didn't match, expected = %d got = %d\n",
+ odummy_id, dummy_id);
+ return -1;
+ }
+
+ /* Free the node */
+ if (rte_node_free(dummy_id)) {
+ printf("Failed to free node\n");
+ return -1;
+ }
+
+ if (rte_node_free(dummy_id1)) {
+ printf("Failed to free node\n");
+ return -1;
+ }
+
+ return 0;
+}
+
static int
test_node_clone(void)
{
@@ -551,11 +613,12 @@ test_node_clone(void)
node_id = rte_node_from_name("test_node00");
tm->test_node[0].idx = node_id;
- dummy_id = rte_node_clone(node_id, "test_node00");
- if (rte_node_is_invalid(dummy_id)) {
+ dummy_nodes_id[dummy_nodes_id_count] = rte_node_clone(node_id,
"test_node00");
+ if (rte_node_is_invalid(dummy_nodes_id[dummy_nodes_id_count])) {
printf("Got invalid id when clone, Expecting fail\n");
return -1;
}
+ dummy_nodes_id_count++;
/* Clone with same name, should fail */
dummy_id = rte_node_clone(node_id, "test_node00");
@@ -635,15 +698,15 @@ test_create_graph(void)
.nb_node_patterns = 6,
.node_patterns = node_patterns_dummy,
};
- uint32_t dummy_node_id;
uint32_t node_id;
node_id = rte_node_from_name("test_node00");
- dummy_node_id = rte_node_clone(node_id, "dummy_node");
- if (rte_node_is_invalid(dummy_node_id)) {
+ dummy_nodes_id[dummy_nodes_id_count] = rte_node_clone(node_id,
"dummy_node");
+ if (rte_node_is_invalid(dummy_nodes_id[dummy_nodes_id_count])) {
printf("Got invalid node id\n");
return -1;
}
+ dummy_nodes_id_count++;
graph_id = rte_graph_create("worker0", &gconf);
if (graph_id != RTE_GRAPH_ID_INVALID) {
@@ -1026,17 +1089,38 @@ graph_setup(void)
}
printf("test_node_clone: pass\n");
+ if (test_node_id()) {
+ printf("test_node_id: fail\n");
+ return -1;
+ }
+ printf("test_node_id: pass\n");
+
return 0;
}
static void
graph_teardown(void)
{
- int id;
+ int id, i;
id = rte_graph_destroy(rte_graph_from_name("worker0"));
if (id)
printf("Graph Destroy failed\n");
+
+ for (i = 1; i < MAX_NODES; i++) {
+ if (rte_node_free(test_main.test_node[i].idx)) {
+ printf("Node free failed\n");
+ return;
+ }
+ }
+
+ for (i = 0; i < dummy_nodes_id_count; i++) {
+ if (rte_node_free(dummy_nodes_id
[PATCH v2 1/3] graph: avoid global node ID counter
From: Kiran Kumar K
The node id is determined based on a global variable that is
incremented every time a node is created. Adding changes to
remove the global counter. Make sure that the node list is always
ordered by increasing node ids. When creating a new node, pick a free
id which is not allocated.
Signed-off-by: Kiran Kumar K
---
lib/graph/graph_private.h | 8
lib/graph/node.c | 81 +--
2 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index da48d73587..fdaf5649b8 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -29,14 +29,6 @@ extern int rte_graph_logtype;
#define graph_info(...) GRAPH_LOG(INFO, __VA_ARGS__)
#define graph_dbg(...) GRAPH_LOG(DEBUG, __VA_ARGS__)
-#define ID_CHECK(id, id_max)
\
- do { \
- if ((id) >= (id_max)) {\
- rte_errno = EINVAL;\
- goto fail; \
- } \
- } while (0)
-
#define SET_ERR_JMP(err, where, fmt, ...)
\
do { \
graph_err(fmt, ##__VA_ARGS__); \
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 63db629da8..0f382d744c 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -15,9 +15,51 @@
#include "graph_private.h"
static struct node_head node_list = STAILQ_HEAD_INITIALIZER(node_list);
-static rte_node_t node_id;
-#define NODE_ID_CHECK(id) ID_CHECK(id, node_id)
+static struct node *
+node_from_id(rte_node_t id)
+{
+ struct node *node;
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (node->id == id)
+ return node;
+ }
+ rte_errno = EINVAL;
+ return NULL;
+}
+
+static rte_node_t
+next_next_free_id(void)
+{
+ struct node *node;
+ rte_node_t id = 0;
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (id < node->id)
+ break;
+ id = node->id + 1;
+ }
+ return id;
+}
+
+static void
+node_insert_ordered(struct node *node)
+{
+ struct node *after, *g;
+
+ after = NULL;
+ STAILQ_FOREACH(g, &node_list, next) {
+ if (g->id < node->id)
+ after = g;
+ else if (g->id > node->id)
+ break;
+ }
+ if (after == NULL)
+ STAILQ_INSERT_HEAD(&node_list, node, next);
+ else
+ STAILQ_INSERT_AFTER(&node_list, after, node, next);
+}
/* Private functions */
struct node_head *
@@ -116,10 +158,10 @@ __rte_node_register(const struct rte_node_register *reg)
}
node->lcore_id = RTE_MAX_LCORE;
- node->id = node_id++;
+ node->id = next_next_free_id();
- /* Add the node at tail */
- STAILQ_INSERT_TAIL(&node_list, node, next);
+ /* Add the node in ordered list */
+ node_insert_ordered(node);
graph_spinlock_unlock();
return node->id;
@@ -194,7 +236,9 @@ rte_node_clone(rte_node_t id, const char *name)
{
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
+
STAILQ_FOREACH(node, &node_list, next)
if (node->id == id)
return node_clone(node, name);
@@ -220,7 +264,8 @@ rte_node_id_to_name(rte_node_t id)
{
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
STAILQ_FOREACH(node, &node_list, next)
if (node->id == id)
return node->name;
@@ -234,7 +279,8 @@ rte_node_edge_count(rte_node_t id)
{
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
STAILQ_FOREACH(node, &node_list, next)
if (node->id == id)
return node->nb_edges;
@@ -303,7 +349,8 @@ rte_node_edge_shrink(rte_node_t id, rte_edge_t size)
rte_edge_t rc = RTE_EDGE_ID_INVALID;
struct node *node;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
graph_spinlock_lock();
STAILQ_FOREACH(node, &node_list, next) {
@@ -330,7 +377,8 @@ rte_node_edge_update(rte_node_t id, rte_edge_t from, const
char **next_nodes,
rte_edge_t rc = RTE_EDGE_ID_INVALID;
struct node *n, *prev;
- NODE_ID_CHECK(id);
+ if (node_from_id(id) == NULL)
+ goto fail;
graph_spinlock_lock();
[PATCH v2 2/3] graph: add support for node free API
From: Kiran Kumar K
Add support for rte_node_free API to free the node and its
memory, if node is not part of any of the created graphs.
Signed-off-by: Kiran Kumar K
---
lib/graph/graph.c | 16
lib/graph/graph_private.h | 13 +
lib/graph/node.c | 21 +
lib/graph/rte_graph.h | 15 +++
lib/graph/version.map | 3 +++
5 files changed, 68 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index dff8e690a8..3a2648a1fc 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -20,6 +20,22 @@
static struct graph_head graph_list = STAILQ_HEAD_INITIALIZER(graph_list);
static rte_spinlock_t graph_lock = RTE_SPINLOCK_INITIALIZER;
+uint8_t
+graph_is_node_active_in_graph(struct node *node)
+{
+ struct graph *graph;
+
+ STAILQ_FOREACH(graph, &graph_list, next) {
+ struct graph_node *graph_node;
+
+ STAILQ_FOREACH(graph_node, &graph->node_list, next)
+ if (graph_node->node == node)
+ return 1;
+ }
+
+ return 0;
+}
+
/* Private functions */
static struct graph *
graph_from_id(rte_graph_t id)
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index fdaf5649b8..a29dad76d0 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -440,4 +440,17 @@ int graph_sched_wq_create(struct graph *_graph, struct
graph *_parent_graph,
*/
void graph_sched_wq_destroy(struct graph *_graph);
+/**
+ * @internal
+ *
+ * Check if given node present in any of the created graphs.
+ *
+ * @param node
+ * The node object
+ *
+ * @return
+ * 0 if not present in any graph, else return 1.
+ */
+uint8_t graph_is_node_active_in_graph(struct node *_node);
+
#endif /* _RTE_GRAPH_PRIVATE_H_ */
diff --git a/lib/graph/node.c b/lib/graph/node.c
index 0f382d744c..669c845a2b 100644
--- a/lib/graph/node.c
+++ b/lib/graph/node.c
@@ -476,3 +476,24 @@ rte_node_max_count(void)
}
return node_id;
}
+
+int
+rte_node_free(rte_node_t id)
+{
+ struct node *node;
+
+ if (node_from_id(id) == NULL)
+ goto fail;
+
+ STAILQ_FOREACH(node, &node_list, next) {
+ if (id == node->id) {
+ if (graph_is_node_active_in_graph(node))
+ return -1;
+ STAILQ_REMOVE(&node_list, node, node, next);
+ free(node);
+ return 0;
+ }
+ }
+fail:
+ return -1;
+}
diff --git a/lib/graph/rte_graph.h b/lib/graph/rte_graph.h
index f5e575dbed..097d0dc9d5 100644
--- a/lib/graph/rte_graph.h
+++ b/lib/graph/rte_graph.h
@@ -22,6 +22,7 @@
#include
#include
+#include
#ifdef __cplusplus
extern "C" {
@@ -661,6 +662,20 @@ rte_node_is_invalid(rte_node_t id)
return (id == RTE_NODE_ID_INVALID);
}
+/**
+ * Release the memory allocated for a node created using RTE_NODE_REGISTER or
rte_node_clone,
+ * if it is not linked to any graphs.
+ *
+ * @param id
+ * Node id to check.
+ *
+ * @return
+ * - 0: Success.
+ * -<0: Failure.
+ */
+__rte_experimental
+int rte_node_free(rte_node_t id);
+
/**
* Test the validity of edge id.
*
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 44fadc00fd..a793ea1d8e 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -58,4 +58,7 @@ EXPERIMENTAL {
# added in 24.11
rte_node_xstat_increment;
+
+ # added in 25.03
+ rte_node_free;
};
--
2.43.0
[PATCH v2 2/3] net/macb: add NEON vectorized Rx/Tx
To optimize Rx/Tx burst process,
add NEON vector instructions on arm architecture.
Signed-off-by: liwencheng
---
drivers/net/macb/macb_rxtx.c | 2 +
drivers/net/macb/macb_rxtx_vec_neon.c | 672 ++
drivers/net/macb/meson.build | 4 +
3 files changed, 678 insertions(+)
create mode 100644 drivers/net/macb/macb_rxtx_vec_neon.c
diff --git a/drivers/net/macb/macb_rxtx.c b/drivers/net/macb/macb_rxtx.c
index 7104ec5..fa36a1e 100644
--- a/drivers/net/macb/macb_rxtx.c
+++ b/drivers/net/macb/macb_rxtx.c
@@ -1354,6 +1354,7 @@ int __rte_cold eth_macb_rx_init(struct rte_eth_dev *dev)
return 0;
}
+#if !defined(RTE_ARCH_ARM64)
uint16_t
eth_macb_recv_pkts_vec(void __rte_unused *rx_queue,
struct rte_mbuf __rte_unused **rx_pkts,
@@ -1377,3 +1378,4 @@ eth_macb_xmit_pkts_vec(void __rte_unused *tx_queue,
{
return 0;
}
+#endif
diff --git a/drivers/net/macb/macb_rxtx_vec_neon.c
b/drivers/net/macb/macb_rxtx_vec_neon.c
new file mode 100644
index 000..7d064b7
--- /dev/null
+++ b/drivers/net/macb/macb_rxtx_vec_neon.c
@@ -0,0 +1,672 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2022 Phytium Technology Co., Ltd.
+ */
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+
+#include "macb_rxtx.h"
+
+#pragma GCC diagnostic ignored "-Wcast-qual"
+
+#define MACB_UINT8_BIT (CHAR_BIT * sizeof(uint8_t))
+
+#define MACB_DESC_EOF_MASK 0x80808080
+
+static inline uint32_t macb_get_packet_type(struct rte_mbuf *rxm)
+{
+ struct rte_ether_hdr *eth_hdr;
+ uint16_t ether_type;
+
+ eth_hdr = rte_pktmbuf_mtod(rxm, struct rte_ether_hdr *);
+ ether_type = eth_hdr->ether_type;
+
+ if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV4))
+ return RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV4;
+ else if (ether_type == rte_cpu_to_be_16(RTE_ETHER_TYPE_IPV6))
+ return RTE_PTYPE_L2_ETHER | RTE_PTYPE_L3_IPV6;
+ else
+ return RTE_PTYPE_UNKNOWN;
+}
+
+static inline uint8x8_t macb_mbuf_initializer(struct macb_rx_queue *rxq)
+{
+ struct rte_mbuf mbuf = {.buf_addr = 0}; /* zeroed mbuf */
+ uint64x1_t mbuf_initializer = vdup_n_u64(0);
+ uint8x8_t rearm_data_vec;
+
+ mbuf.data_off = RTE_PKTMBUF_HEADROOM + MACB_RX_DATA_OFFSET;
+ mbuf.nb_segs = 1;
+ mbuf.port = rxq->port_id;
+ rte_mbuf_refcnt_set(&mbuf, 1);
+
+ /* prevent compiler reordering: rearm_data covers previous fields */
+ rte_compiler_barrier();
+ mbuf_initializer =
+ vset_lane_u64(*(uint64_t *)(&mbuf.rearm_data),
mbuf_initializer, 0);
+ rearm_data_vec = vld1_u8((uint8_t *)&mbuf_initializer);
+ return rearm_data_vec;
+}
+
+static inline void macb_rxq_rearm(struct macb_rx_queue *rxq)
+{
+ uint64_t dma_addr;
+ struct macb_dma_desc *desc;
+ unsigned int entry;
+ struct rte_mbuf *nmb;
+ struct macb *bp;
+ register int i = 0;
+ struct macb_rx_entry *rxe;
+
+ uint32x2_t zero = vdup_n_u32(0);
+ uint8x8_t rearm_data_vec;
+
+ bp = rxq->bp;
+ rxe = &rxq->rx_sw_ring[rxq->rxrearm_start];
+
+ entry = macb_rx_ring_wrap(bp, rxq->rxrearm_start);
+ desc = macb_rx_desc(rxq, entry);
+
+ rearm_data_vec = macb_mbuf_initializer(rxq);
+
+ /* Pull 'n' more MBUFs into the software ring */
+ if (unlikely(rte_mempool_get_bulk(rxq->mb_pool, (void *)rxe,
+ MACB_RXQ_REARM_THRESH) < 0)) {
+ if (rxq->rxrearm_nb + (unsigned int)MACB_RXQ_REARM_THRESH >=
+ rxq->nb_rx_desc) {
+ MACB_LOG(ERR, "allocate mbuf fail!\n");
+ for (i = 0; i < MACB_DESCS_PER_LOOP; i++) {
+ rxe[i].mbuf = &rxq->fake_mbuf;
+ vst1_u32((uint32_t
*)&desc[MACB_DESC_ADDR_INTERVAL * i], zero);
+ }
+ }
+ rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed +=
+ MACB_RXQ_REARM_THRESH;
+ return;
+ }
+
+ for (i = 0; i < MACB_RXQ_REARM_THRESH; ++i) {
+ nmb = rxe[i].mbuf;
+ entry = macb_rx_ring_wrap(bp, rxq->rxrearm_start);
+ desc = macb_rx_desc(rxq, entry);
+ rxq->rxrearm_start++;
+ vst1_u8((uint8_t *)&nmb->rearm_data, rearm_data_vec);
+ dma_addr = rte_cpu_to_le_64(rte_mbuf_data_iova_default(nmb));
+ if (unlikely(entry == rxq->nb_rx_desc - 1))
+ dma_addr |= MACB_BIT(RX_WRAP);
+ desc->ctrl = 0;
+ /* Setting addr clears RX_USED and allows reception,
+* make sure ctrl is cleared first to avoid a race.
+*/
+
[PATCH v2 3/3] usertools/dpdk-devbind: add bind/unbind for platform device
This patch mainly adds functions for bind and unbind platform devices,
such as bind_platform_one and unbind_platform_one.
Signed-off-by: liwencheng
Acked-by: Stephen Hemminger
---
usertools/dpdk-devbind.py | 101 +-
1 file changed, 99 insertions(+), 2 deletions(-)
diff --git a/usertools/dpdk-devbind.py b/usertools/dpdk-devbind.py
index 80c35f9..4b65b55 100755
--- a/usertools/dpdk-devbind.py
+++ b/usertools/dpdk-devbind.py
@@ -147,10 +147,32 @@ def module_is_loaded(module):
return module in loaded_modules
+def get_platform_devices():
+global platform_devices
+
+platform_device_path = "/sys/bus/platform/devices/"
+platform_devices = os.listdir(platform_device_path)
+
+
+def devices_are_platform(devs):
+all_devices_are_platform = True
+
+get_platform_devices()
+for d in devs:
+if d not in platform_devices:
+all_devices_are_platform = False
+break
+
+return all_devices_are_platform
+
+
def check_modules():
'''Checks that igb_uio is loaded'''
global dpdk_drivers
+if devices_are_platform(args):
+return
+
# list of supported modules
mods = [{"Name": driver, "Found": False} for driver in dpdk_drivers]
@@ -321,11 +343,38 @@ def dev_id_from_dev_name(dev_name):
for d in devices.keys():
if dev_name in devices[d]["Interface"].split(","):
return devices[d]["Slot"]
+
+# Check if it is a platform device
+if dev_name in platform_devices:
+return dev_name
+
# if nothing else matches - error
raise ValueError("Unknown device: %s. "
"Please specify device in \"bus:slot.func\" format" %
dev_name)
+def unbind_platform_one(dev_name):
+filename = "/sys/bus/platform/devices/%s/driver" % dev_name
+
+if exists(filename):
+try:
+f = open(os.path.join(filename, "unbind"), "w")
+except OSError as err:
+sys.exit("Error: unbind failed for %s - Cannot open %s: %s" %
+ (dev_name, os.path.join(filename, "unbind"), err))
+f.write(dev_name)
+f.close()
+filename = "/sys/bus/platform/devices/%s/driver_override" % dev_name
+try:
+f = open(filename, "w")
+except OSError as err:
+sys.exit("Error: unbind failed for %s - Cannot open %s: %s" %
+ (dev_name, filename, err))
+f.write("")
+f.close()
+print("Successfully unbind platform device %s" % dev_name)
+
+
def unbind_one(dev_id, force):
'''Unbind the device identified by "dev_id" from its current driver'''
dev = devices[dev_id]
@@ -351,6 +400,48 @@ def unbind_one(dev_id, force):
f.close()
+def bind_platform_one(dev_name, driver):
+filename = "/sys/bus/platform/drivers/%s" % driver
+
+if not exists(filename):
+print("The driver %s is not loaded" % driver)
+return
+# unbind any existing drivers we don't want
+filename = "/sys/bus/platform/devices/%s/driver" % dev_name
+if exists(filename):
+unbind_platform_one(dev_name)
+# driver_override can be used to specify the driver
+filename = "/sys/bus/platform/devices/%s/driver_override" % dev_name
+if exists(filename):
+try:
+f = open(filename, "w")
+except OSError as err:
+sys.exit("Error: unbind failed for %s - Cannot open %s: %s"
+ % (dev_name, filename, err))
+try:
+f.write(driver)
+f.close()
+except OSError as err:
+sys.exit("Error: unbind failed for %s - Cannot write %s: %s"
+ % (dev_name, filename, err))
+# do the bind by writing to /sys
+filename = "/sys/bus/platform/drivers/%s/bind" % driver
+try:
+f = open(filename, "w")
+except OSError as err:
+print("Error: bind failed for %s - Cannot open %s: %s"
+ % (dev_name, filename, err), file=sys.stderr)
+return
+try:
+f.write(dev_name)
+f.close()
+except OSError as err:
+print("Error: bind failed for %s - Cannot bind to driver %s: %s"
+ % (dev_name, driver, err), file=sys.stderr)
+return
+print("Successfully bind platform device %s to driver %s" % (dev_name,
driver))
+
+
def bind_one(dev_id, driver, force):
'''Bind the device given by "dev_id" to the driver "driver". If the device
is already bound to a different driver, it will be unbound first'''
@@ -475,7 +566,10 @@ def unbind_all(dev_list, force=False):
sys.exit(1)
for d in dev_list:
-unbind_one(d, force)
+if d in platform_devices:
+unbind_platform_one(d)
+else:
+unbind_one(d, force)
def has_iommu():
@@ -537,7 +631,10 @@ def bind_all(dev_list, driver, force=False):
check_noiommu_mode()
for d in dev_list:
-bind_one(d, driver, force)
+
Re: [PATCH v10 3/6] test/power: removed function pointer validations
28/10/2024 20:55, Sivaprasad Tummala: > After refactoring the power library, power management operations are now > consistently supported regardless of the operating environment, making > function pointer checks unnecessary and thus removed from applications. > > v2: > - removed function pointer validation in l3fwd-power app. > > Signed-off-by: Sivaprasad Tummala This patch must be first, because the rework makes the compiler stops on this test.
Re: [PATCH v10 1/6] power: refactor core power management library
28/10/2024 20:55, Sivaprasad Tummala: > drivers/meson.build | 1 + > .../power/acpi/acpi_cpufreq.c | 22 +- > .../power/acpi/acpi_cpufreq.h | 6 +- > drivers/power/acpi/meson.build| 10 + > .../power/amd_pstate/amd_pstate_cpufreq.c | 24 +- > .../power/amd_pstate/amd_pstate_cpufreq.h | 10 +- > drivers/power/amd_pstate/meson.build | 10 + > .../power/cppc/cppc_cpufreq.c | 22 +- > .../power/cppc/cppc_cpufreq.h | 8 +- > drivers/power/cppc/meson.build| 10 + > .../power/kvm_vm}/guest_channel.c | 2 +- > .../power/kvm_vm}/guest_channel.h | 0 > .../power/kvm_vm/kvm_vm.c | 22 +- > .../power/kvm_vm/kvm_vm.h | 6 +- > drivers/power/kvm_vm/meson.build | 14 + > drivers/power/meson.build | 12 + > drivers/power/pstate/meson.build | 10 + > .../power/pstate/pstate_cpufreq.c | 22 +- > .../power/pstate/pstate_cpufreq.h | 6 +- For consistency, we must name it intel_pstate, not just "pstate".
Re: [PATCH v10 4/6] drivers/power: uncore support for AMD EPYC processors
28/10/2024 20:55, Sivaprasad Tummala:
> --- /dev/null
> +++ b/drivers/power/amd_uncore/amd_uncore.h
> +#ifdef __cplusplus
> +extern "C" {
> +#endif
As said in previous versions, you don't need this in an internal header.
[...]
> +
> +#ifdef __cplusplus
> +}
> +#endif
> +
> +#endif /* POWER_INTEL_UNCORE_H */
ah ah :)
Re: [PATCH v10 5/6] maintainers: update for drivers/power
28/10/2024 20:55, Sivaprasad Tummala: > Update maintainers for drivers/power/*. > > Signed-off-by: Sivaprasad Tummala > --- > MAINTAINERS | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/MAINTAINERS b/MAINTAINERS > index e25e9465b5..df7a756612 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1753,6 +1753,7 @@ M: Anatoly Burakov > M: David Hunt > M: Sivaprasad Tummala > F: lib/power/ > +F: drivers/power/* You must not add this wildcard, it does not work. And this patch can be squashed in the rework.
Re: [PATCH v10 0/6] power: refactor power management library
On Sun, 10 Nov 2024 19:35:55 +0100 Thomas Monjalon wrote: > 28/10/2024 20:55, Sivaprasad Tummala: > > This patchset refactors the power management library, addressing both > > core and uncore power management. The primary changes involve the > > creation of dedicated directories for each driver within > > 'drivers/power/core/*' and 'drivers/power/uncore/*'. > > > > This refactor significantly improves code organization, enhances > > clarity, and boosts maintainability. It lays the foundation for more > > focused development on individual drivers and facilitates seamless > > integration of future enhancements, particularly the AMD uncore driver. > > > > Furthermore, this effort aims to streamline code maintenance by > > consolidating common functions for cpufreq and cppc across various > > core drivers, thus reducing code duplication. > > > > Sivaprasad Tummala (6): > > power: refactor core power management library > > power: refactor uncore power management library > > test/power: removed function pointer validations > > drivers/power: uncore support for AMD EPYC processors > > maintainers: update for drivers/power > > power: rename library sources for cpu frequency management > > I'm a bit sad there is not more reviews. > > I've moved the pointers check removal first, > renamed intel_pstate files (not the functions), > fixed few things like __cplusplus, include guards, > sorting and maintainers file. > > Applied > > I think this broke the build. The next unrelated change in CI is failing. Fixing the initialization in mlx5 patch failed. ---BEGIN LOGS [Begin job log] "ubuntu-22.04-gcc-stdatomic" at step Build and test Message: drivers/event/skeleton: Defining dependency "event_skeleton" Message: drivers/event/sw: Defining dependency "event_sw" Message: drivers/event/octeontx: Defining dependency "event_octeontx" Run-time dependency flexran_sdk_ldpc_decoder_5gnr found: NO (tried pkgconfig and cmake) Message: drivers/baseband/acc: Defining dependency "baseband_acc" Message: drivers/baseband/fpga_5gnr_fec: Defining dependency "baseband_fpga_5gnr_fec" Message: drivers/baseband/fpga_lte_fec: Defining dependency "baseband_fpga_lte_fec" Message: drivers/baseband/la12xx: Defining dependency "baseband_la12xx" Message: drivers/baseband/null: Defining dependency "baseband_null" Run-time dependency flexran_sdk_turbo found: NO (tried pkgconfig and cmake) Run-time dependency flexran_sdk_ldpc_decoder_5gnr found: NO (tried pkgconfig and cmake) Message: drivers/baseband/turbo_sw: Defining dependency "baseband_turbo_sw" Has header "cuda.h" : NO Message: drivers/power/acpi: Defining dependency "power_acpi" Message: drivers/power/amd_pstate: Defining dependency "power_amd_pstate" Library e_smi64 found: NO Message: drivers/power/cppc: Defining dependency "power_cppc" Message: drivers/power/intel_pstate: Defining dependency "power_intel_pstate" Message: drivers/power/intel_uncore: Defining dependency "power_intel_uncore" Message: drivers/power/kvm_vm: Defining dependency "power_kvm_vm" drivers/meson.build:132:8: ERROR: Include dir power/pstate does not exist. A full log can be found at /home/runner/work/dpdk/dpdk/build/meson-logs/meson-log.txt ##[error]Process completed with exit code 1. [End job log] "ubuntu-22.04-gcc-stdatomic" at step Build and test
Re: [PATCH v10 0/6] power: refactor power management library
28/10/2024 20:55, Sivaprasad Tummala: > This patchset refactors the power management library, addressing both > core and uncore power management. The primary changes involve the > creation of dedicated directories for each driver within > 'drivers/power/core/*' and 'drivers/power/uncore/*'. > > This refactor significantly improves code organization, enhances > clarity, and boosts maintainability. It lays the foundation for more > focused development on individual drivers and facilitates seamless > integration of future enhancements, particularly the AMD uncore driver. > > Furthermore, this effort aims to streamline code maintenance by > consolidating common functions for cpufreq and cppc across various > core drivers, thus reducing code duplication. > > Sivaprasad Tummala (6): > power: refactor core power management library > power: refactor uncore power management library > test/power: removed function pointer validations > drivers/power: uncore support for AMD EPYC processors > maintainers: update for drivers/power > power: rename library sources for cpu frequency management I'm a bit sad there is not more reviews. I've moved the pointers check removal first, renamed intel_pstate files (not the functions), fixed few things like __cplusplus, include guards, sorting and maintainers file. Applied
[PATCH 0/2] Build with Gcc 15 fixes
Ferruh had fixed most of these, but a couple more crept in. A couple more Gcc 15 fixes Stephen Hemminger (2): net/dpaa2: fix build with Gcc 15 net/mlx5: fix build with Gcc 15 drivers/net/dpaa2/dpaa2_flow.c | 2 +- drivers/net/mlx5/mlx5_flow.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) -- 2.45.2
[PATCH 2/2] net/mlx5: fix build with Gcc 15
Fixes warnings from Gcc 15 about using string for initialization.
../drivers/net/mlx5/mlx5_flow.c: In function ‘mlx5_legacy_dmac_flow_create’:
../drivers/net/mlx5/mlx5_flow.c:8568:44: warning: initializer-string for array
of ‘unsigned char’ is too long [-Wunterminated-string-initialization]
8568 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
|^~
../drivers/net/mlx5/mlx5_flow.c: In function
‘mlx5_legacy_dmac_vlan_flow_create’:
../drivers/net/mlx5/mlx5_flow.c:8583:44: warning: initializer-string for array
of ‘unsigned char’ is too long [-Wunterminated-string-initialization]
8583 | .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
|^~
Fixes: cf99567fe566 ("net/mlx5: add legacy unicast flow rules management")
Cc: dsosnow...@nvidia.com
Signed-off-by: Stephen Hemminger
---
drivers/net/mlx5/mlx5_flow.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_flow.c b/drivers/net/mlx5/mlx5_flow.c
index 9c43201e05..f8cfa661ec 100644
--- a/drivers/net/mlx5/mlx5_flow.c
+++ b/drivers/net/mlx5/mlx5_flow.c
@@ -8565,7 +8565,7 @@ mlx5_legacy_dmac_flow_create(struct rte_eth_dev *dev,
const struct rte_ether_add
.hdr.dst_addr = *addr,
};
struct rte_flow_item_eth unicast_mask = {
- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
},
};
return mlx5_ctrl_flow(dev, &unicast, &unicast_mask);
@@ -8580,7 +8580,7 @@ mlx5_legacy_dmac_vlan_flow_create(struct rte_eth_dev *dev,
.hdr.dst_addr = *addr,
};
struct rte_flow_item_eth unicast_mask = {
- .hdr.dst_addr.addr_bytes = "\xff\xff\xff\xff\xff\xff",
+ .hdr.dst_addr.addr_bytes = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
},
};
struct rte_flow_item_vlan vlan_spec = {
.hdr.vlan_tci = rte_cpu_to_be_16(vid),
--
2.45.2
[PATCH 1/2] net/dpaa2: fix build with Gcc 15
Compiler no longer allows initializing byte array with string.
warning: initializer-string for array of ‘unsigned char’ is too long
[-Wunterminated-string-initialization]
169 | .vni = "\xff\xff\xff",
|^~
Fixes: 39c8044ffb7b ("net/dpaa2: support VXLAN flow matching")
Cc: jun.y...@nxp.com
Signed-off-by: Stephen Hemminger
---
drivers/net/dpaa2/dpaa2_flow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/net/dpaa2/dpaa2_flow.c b/drivers/net/dpaa2/dpaa2_flow.c
index cfbcb29df1..de850ae0cf 100644
--- a/drivers/net/dpaa2/dpaa2_flow.c
+++ b/drivers/net/dpaa2/dpaa2_flow.c
@@ -166,7 +166,7 @@ static const struct rte_flow_item_gre
dpaa2_flow_item_gre_mask = {
static const struct rte_flow_item_vxlan dpaa2_flow_item_vxlan_mask = {
.flags = 0xff,
- .vni = "\xff\xff\xff",
+ .vni = { 0xff, 0xff, 0xff },
};
static const struct rte_flow_item_ecpri dpaa2_flow_item_ecpri_mask = {
--
2.45.2
Re: [PATCH 0/2] net/hns3: bugfix for hns3
On 11/7/2024 11:56 AM, Jie Hai wrote: > This patchset fixes some bugs. > > Dengdui Huang (2): > net/hns3: fix error code for repeatedly create counter > net/hns3: fix cannot fully use hardware flow director table > Acked-by: Stephen Hemminger Series applied to dpdk-next-net/main, thanks.
Re: [PATCH v10 0/6] power: refactor power management library
10/11/2024 20:29, Stephen Hemminger: > On Sun, 10 Nov 2024 19:35:55 +0100 > Thomas Monjalon wrote: > > > 28/10/2024 20:55, Sivaprasad Tummala: > > > This patchset refactors the power management library, addressing both > > > core and uncore power management. The primary changes involve the > > > creation of dedicated directories for each driver within > > > 'drivers/power/core/*' and 'drivers/power/uncore/*'. > > > > > > This refactor significantly improves code organization, enhances > > > clarity, and boosts maintainability. It lays the foundation for more > > > focused development on individual drivers and facilitates seamless > > > integration of future enhancements, particularly the AMD uncore driver. > > > > > > Furthermore, this effort aims to streamline code maintenance by > > > consolidating common functions for cpufreq and cppc across various > > > core drivers, thus reducing code duplication. > > > > > > Sivaprasad Tummala (6): > > > power: refactor core power management library > > > power: refactor uncore power management library > > > test/power: removed function pointer validations > > > drivers/power: uncore support for AMD EPYC processors > > > maintainers: update for drivers/power > > > power: rename library sources for cpu frequency management > > > > I'm a bit sad there is not more reviews. > > > > I've moved the pointers check removal first, > > renamed intel_pstate files (not the functions), > > fixed few things like __cplusplus, include guards, > > sorting and maintainers file. > > > > Applied > > > > > > I think this broke the build. The next unrelated change in CI is failing. > Fixing the initialization in mlx5 patch failed. Indeed. Thanks for the notice. It should be fixed now.
Re: [PATCH v6 01/17] net/r8169: add PMD driver skeleton
On 11/8/2024 12:11 PM, Howard Wang wrote:
> Meson build infrastructure, r8169_ethdev minimal skeleton,
> header with Realtek NIC device and vendor IDs.
>
> Signed-off-by: Howard Wang
<...>
> +/*
> + * The set of PCI devices this driver supports
> + */
> +static const struct rte_pci_id pci_id_r8169_map[] = {
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8125) },
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8162) },
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x8126) },
> + { RTE_PCI_DEVICE(PCI_VENDOR_ID_REALTEK, 0x5000) },
>
What do you think to add macros for the PCI device IDs, naming them
makes it easier to know which devices are supported.
<...>
> +
> +#define RTL_DEV_PRIVATE(eth_dev) \
> + ((struct rtl_adapter *)((eth_dev)->data->dev_private))
> +
>
This macro is only used a few patches later, what do you think to add
this macro when used?
Re: [PATCH v6 05/17] net/r8169: add support for hw config
On 11/8/2024 12:11 PM, Howard Wang wrote:
> Implement the rtl_hw_config function to configure the hardware.
>
> Signed-off-by: Howard Wang
>
<...>
> +void
> +rtl_nic_reset(struct rtl_hw *hw)
> +{
> + int i;
> +
> + rtl_disable_rx_packet_filter(hw);
> +
> + rtl_enable_rxdvgate(hw);
> +
> + rtl_stop_all_request(hw);
> +
> + rtl_wait_txrx_fifo_empty(hw);
> +
> + rte_delay_ms(2);
> +
> + /* Soft reset the chip. */
> + RTL_W8(hw, ChipCmd, CmdReset);
> +
> + /* Check that the chip has finished the reset. */
> + for (i = 100; i > 0; i--) {
> + rte_delay_us(100);
> + if ((RTL_R8(hw, ChipCmd) & CmdReset) == 0)
> + break;
> + }
> +}
>
Can you please make functions static as much as possible? Like above
'rtl_nic_reset()' seems can be static.
That is OK keep as it is if functions will be called later in the set.
Re: [PATCH v6 08/17] net/r8169: add support for phy configuration
On 11/8/2024 12:11 PM, Howard Wang wrote: > This patch contains phy config, ephy config and so on. > > Signed-off-by: Howard Wang > <...> > @@ -62,6 +62,12 @@ rtl_dev_start(struct rte_eth_dev *dev) > struct rtl_hw *hw = &adapter->hw; > int err; > > + rtl_powerup_pll(hw); > + > + rtl_hw_ephy_config(hw); > + > + rtl_hw_phy_config(hw); > + > rtl_hw_config(hw); > > /* Initialize transmission unit */ > @@ -74,6 +80,8 @@ rtl_dev_start(struct rte_eth_dev *dev) > goto error; > } > > + rtl_mdio_write(hw, 0x1F, 0x); > + > It is very hard know what code like above does, which makes harder for anyone to read and understand your code, can you please either create macros for registers or comment as much as possible, so others can improve/fix your code when required.
Re: [PATCH v6 09/17] net/r8169: add support for hw initialization
On 11/8/2024 12:11 PM, Howard Wang wrote: > This patch initializes software variables, resets the NIC, and performs > other hw initialization tasks. > > Signed-off-by: Howard Wang > <...> > @@ -24,8 +24,8 @@ > #define MII_EXPANSION0x06/* Expansion register > */ > #define MII_CTRL1000 0x09/* 1000BASE-T control */ > #define MII_STAT1000 0x0a/* 1000BASE-T status */ > -#define MII_MMD_CTRL 0x0d/* MMD Access Control Register */ > -#define MII_MMD_DATA 0x0e/* MMD Access Data Register*/ > +#define MII_MMD_CTRL0x0d/* MMD Access Control Register > */ > +#define MII_MMD_DATA0x0e/* MMD Access Data Register > */ > Probably unintendent change. Also I can see 'MII_LPA', 'MII_RERRCOUNTER', 'ADVERTISE_LPACK' and a few more uses spaces instead of tab, which can be fixed in the patch they are added.
Re: [PATCH v6 12/17] net/r8169: implement Tx path
On 11/8/2024 12:11 PM, Howard Wang wrote: > Add implementation for TX datapath. > > Signed-off-by: Howard Wang > --- > doc/guides/nics/features/r8169.ini | 6 +- > doc/guides/nics/r8169.rst | 1 + > drivers/net/r8169/r8169_ethdev.c | 6 + > drivers/net/r8169/r8169_ethdev.h | 11 + > drivers/net/r8169/r8169_rxtx.c | 682 - > 5 files changed, 686 insertions(+), 20 deletions(-) > > diff --git a/doc/guides/nics/features/r8169.ini > b/doc/guides/nics/features/r8169.ini > index 1095b038d8..f36b912c53 100644 > --- a/doc/guides/nics/features/r8169.ini > +++ b/doc/guides/nics/features/r8169.ini > @@ -9,16 +9,14 @@ Link speed configuration = Y > Link status = Y > Link status event= Y > Scattered Rx = Y > +TSO = Y > Flow control = Y > CRC offload = Y > L3 checksum offload = Y > L4 checksum offload = Y > Packet type parsing = Y > Rx descriptor status = Y > -Basic stats = Y > -Extended stats = Y > -Stats per queue = Y > -FW version = Y > +Tx descriptor status = Y > Tx descriptor status requires 'tx_descriptor_status' dev ops which seems not implemented in the driver.
Re: [PATCH v6 11/17] net/r8169: implement Rx path
On 11/8/2024 12:11 PM, Howard Wang wrote: > Add implementation for RX datapath. > > Signed-off-by: Howard Wang > --- > doc/guides/nics/features/r8169.ini | 12 + > doc/guides/nics/r8169.rst | 8 + > drivers/net/r8169/r8169_compat.h | 24 + > drivers/net/r8169/r8169_ethdev.c | 76 ++- > drivers/net/r8169/r8169_ethdev.h | 18 + > drivers/net/r8169/r8169_rxtx.c | 790 - > 6 files changed, 925 insertions(+), 3 deletions(-) > > diff --git a/doc/guides/nics/features/r8169.ini > b/doc/guides/nics/features/r8169.ini > index 54a5ee0170..1095b038d8 100644 > --- a/doc/guides/nics/features/r8169.ini > +++ b/doc/guides/nics/features/r8169.ini > @@ -8,6 +8,18 @@ Speed capabilities = Y > Link speed configuration = Y > Link status = Y > Link status event= Y > +Scattered Rx = Y > +Flow control = Y > +CRC offload = Y > +L3 checksum offload = Y > +L4 checksum offload = Y > As far as I can see following features are not enabled, at least not in this patch, can you please double check? I can see they are fixed in later patches, but can you please fix here. > +Packet type parsing = Y > +Rx descriptor status = Y > +Basic stats = Y > +Extended stats = Y > +Stats per queue = Y > +FW version = Y > +Registers dump = Y > Linux= Y > x86-32 = Y > x86-64 = Y
Re: [PATCH v6 13/17] net/r8169: implement device statistics
On 11/8/2024 12:11 PM, Howard Wang wrote: > Signed-off-by: Howard Wang > --- > doc/guides/nics/features/r8169.ini | 3 ++ > drivers/net/r8169/r8169_compat.h | 16 ++ > drivers/net/r8169/r8169_ethdev.c | 48 ++ > drivers/net/r8169/r8169_ethdev.h | 3 ++ > drivers/net/r8169/r8169_hw.c | 80 ++ > drivers/net/r8169/r8169_hw.h | 6 +++ > 6 files changed, 156 insertions(+) > > diff --git a/doc/guides/nics/features/r8169.ini > b/doc/guides/nics/features/r8169.ini > index f36b912c53..b983f7ce55 100644 > --- a/doc/guides/nics/features/r8169.ini > +++ b/doc/guides/nics/features/r8169.ini > @@ -17,6 +17,9 @@ L4 checksum offload = Y > Packet type parsing = Y > Rx descriptor status = Y > Tx descriptor status = Y > +Basic stats = Y > +Extended stats = Y > +Stats per queue = Y > "Extended stats" & "Stats per queue" seems not implemented, at least not yet.
Re: [PATCH v6 00/17] Modify code as suggested by the maintainer.
On 11/8/2024 12:11 PM, Howard Wang wrote: > Remove some headers and code that are not used. > Improve r8169.ini and r8169.rst gradually. > > Howard Wang (17): > net/r8169: add PMD driver skeleton > net/r8169: add logging structure > net/r8169: add hardware registers access routines > net/r8169: implement core logic for Tx/Rx > net/r8169: add support for hw config > net/r8169: add phy registers access routines > net/r8169: add support for hardware operations > net/r8169: add support for phy configuration > net/r8169: add support for hw initialization > net/r8169: add link status and interrupt management > net/r8169: implement Rx path > net/r8169: implement Tx path > net/r8169: implement device statistics > net/r8169: implement promisc and allmulti modes > net/r8169: implement MTU configuration > net/r8169: add support for getting fw version > net/r8169: add driver_start and driver_stop > Hi Howard, Thanks for the updates. Series should build after each patch, but it seems broken in the set, starting from patch 4/17 there are some warnings, and they are fixed after a few patches. But can you please sure it builds fine after each patch? Above build issue is the main blocker for the set, but there are a few minor issues listed below: 1. please fix issue highlighted by check-git-log.sh `./devtools/check-git-log.sh -n17` 2. Please fix meson syntax warnings `./devtools/check-meson.py` Also I put some comments to individual patches.
