Skip to contentSkip to conversation

graph: fix graph model check in core binding

PATCH Superseded Zhirun Yan 3 participants 13 messages Jul 3, 2023 – Jul 12, 2023

lore
Share & tools
lore

Zhirun Yan

author
#0 lore raw

PATCH 1/1 graph: fix graph model check in core binding

Fix graph model check in core binding with graph. Update release notes for new mcore dispatch model.

---
 doc/guides/rel_notes/release_23_07.rst | 12 ++++++++++++
 lib/graph/graph.c                      |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)
doc/guides/rel_notes/release_23_07.rst +12 -0
index 4459144140..adaecb3e7c 100644
@@ -185,6 +185,13 @@ New Features
 
   * Added SM2 algorithm support in asymmetric crypto operations.
 
+* **Added mcore dispatch model in rte_graph library.**
+
+  * Added set, get and validate model APIs to enhance graph framework
+    to chose different walk models.
+  * Added clone graph, bind graph with lcore and affinity node with
+    lcore APIs to support mcore dispatch model.
+
 * **Added PDCP Library.**
 
   Added an experimental library to provide PDCP UL and DL processing of packets.
@@ -200,6 +207,11 @@ New Features
 
   Enhanced the GRO library to support TCP packets over IPv6 network.
 
+* **Update l3fwd-graph sample application.**
+
+  Added a new cmdline option ``--model`` which can be used to chose
+  RTC or mcore dispatch model.
+
 
 Removed Items
 -------------
lib/graph/graph.c +1 -1
index 0c28d925bc..26f0968a97 100644
@@ -287,7 +287,7 @@ rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore)
 		if (graph->id == id)
 			break;
 
-	if (graph->graph->model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+	if (graph->graph->model != RTE_GRAPH_MODEL_MCORE_DISPATCH)
 		goto fail;
 
 	graph->lcore_id = lcore;
Signature · 1 line
2.37.2
author
#1 lore raw

PATCH v2 1/1 graph: fix graph model check in core binding

Fix graph model check in core binding with graph. And rte_graph_clone() need to use valid params rather than NULL pointer.
Update release notes for new mcore dispatch model.

---
 app/test/test_graph.c                  | 15 ++++++++++++---
 doc/guides/rel_notes/release_23_07.rst | 12 ++++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)
app/test/test_graph.c +12 -3
index 8609c0b3a4..8983363c8e 100644
@@ -702,6 +702,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 	unsigned int worker_lcore = RTE_MAX_LCORE;
 	rte_node_t nid = RTE_NODE_ID_INVALID;
 	char node_name[64] = "test_node00";
+	struct rte_graph_param graph_conf;
 	struct rte_node *node;
 	int ret = 0;
 
@@ -711,7 +712,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 		printf("Set node %s affinity to lcore %u\n", node_name, worker_lcore);
 
 	nid = rte_node_from_name(node_name);
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", &graph_conf);
 	node = rte_graph_node_get(cloned_graph_id, nid);
 
 	if (node->dispatch.lcore_id != worker_lcore) {
@@ -729,11 +730,18 @@ test_graph_model_mcore_dispatch_core_bind_unbind(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
 	unsigned int worker_lcore = RTE_MAX_LCORE;
+	struct rte_graph_param graph_conf;
 	struct rte_graph *graph;
 	int ret = 0;
 
 	worker_lcore = rte_get_next_lcore(worker_lcore, true, 1);
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", &graph_conf);
+
+	ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
+	if (ret != 0) {
+		printf("Set graph mcore dispatch model failed\n");
+		ret = -1;
+	}
 
 	ret = rte_graph_model_mcore_dispatch_core_bind(cloned_graph_id, worker_lcore);
 	if (ret != 0) {
@@ -765,10 +773,11 @@ static int
 test_graph_worker_model_set_get(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
+	struct rte_graph_param graph_conf;
 	struct rte_graph *graph;
 	int ret = 0;
 
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", &graph_conf);
 	ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
 	if (ret != 0) {
 		printf("Set graph mcore dispatch model failed\n");
doc/guides/rel_notes/release_23_07.rst +12 -0
index 4459144140..adaecb3e7c 100644
@@ -185,6 +185,13 @@ New Features
 
   * Added SM2 algorithm support in asymmetric crypto operations.
 
+* **Added mcore dispatch model in rte_graph library.**
+
+  * Added set, get and validate model APIs to enhance graph framework
+    to chose different walk models.
+  * Added clone graph, bind graph with lcore and affinity node with
+    lcore APIs to support mcore dispatch model.
+
 * **Added PDCP Library.**
 
   Added an experimental library to provide PDCP UL and DL processing of packets.
@@ -200,6 +207,11 @@ New Features
 
   Enhanced the GRO library to support TCP packets over IPv6 network.
 
+* **Update l3fwd-graph sample application.**
+
+  Added a new cmdline option ``--model`` which can be used to chose
+  RTC or mcore dispatch model.
+
 
 Removed Items
 -------------
lib/graph/graph.c +1 -1
index 0c28d925bc..26f0968a97 100644
@@ -287,7 +287,7 @@ rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore)
 		if (graph->id == id)
 			break;
 
-	if (graph->graph->model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+	if (graph->graph->model != RTE_GRAPH_MODEL_MCORE_DISPATCH)
 		goto fail;
 
 	graph->lcore_id = lcore;
Signature · 1 line
2.37.2
#2 lore raw
Quoted 4 lines · Zhirun Yan

Fix graph model check in core binding with graph. And rte_graph_clone() need to use valid params rather than NULL pointer.
Update release notes for new mcore dispatch model.

Please add Fixes:

doc/guides/rel_notes/release_23_07.rst New Features · line 191

Quoted 11 lines
---
 app/test/test_graph.c                  | 15 ++++++++++++---
 doc/guides/rel_notes/release_23_07.rst | 12 ++++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)
doc/guides/rel_notes/release_23_07.rst +4 -0
+* **Added mcore dispatch model in rte_graph library.**
+
+  * Added set, get and validate model APIs to enhance graph framework
+    to chose different walk models.

Adding one line for what is "mcore dispatch model" will be good.

doc/guides/rel_notes/release_23_07.rst New Features · line 193

Quoted 2 lines
doc/guides/rel_notes/release_23_07.rst +2 -0
+  * Added clone graph, bind graph with lcore and affinity node with
+    lcore APIs to support mcore dispatch model.

I think, Above, statement, you can remove.

Quoted 13 lines
doc/guides/rel_notes/release_23_07.rst +6 -0
+
 * **Added PDCP Library.**
 
   Added an experimental library to provide PDCP UL and DL processing of packets.
@@ -200,6 +207,11 @@ New Features
 
   Enhanced the GRO library to support TCP packets over IPv6 network.
 
+* **Update l3fwd-graph sample application.**
+
+  Added a new cmdline option ``--model`` which can be used to chose
+  RTC or mcore dispatch model.
+
#3 lore raw
Quoted 10 lines

-----Original Message-----
From: Jerin Jacob <[email protected]>
Sent: Tuesday, July 4, 2023 5:10 PM
To: Yan, Zhirun <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Fu, Qi <[email protected]>
Subject: Re: [PATCH v2] graph: fix graph model check in core binding

Quoted 8 lines
Quoted 4 lines · Zhirun Yan

Fix graph model check in core binding with graph. And rte_graph_clone() need to use valid params rather than NULL pointer. Update release notes for new mcore dispatch model.

Please add Fixes:

Ok.

Quoted 8 lines
Quoted 7 lines
---
 app/test/test_graph.c                  | 15 ++++++++++++---
 doc/guides/rel_notes/release_23_07.rst | 12 ++++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 25 insertions(+), 4 deletions(-)
Quoted 7 lines

doc/guides/rel_notes/release_23_07.rst New Features · line 191

Quoted 4 lines
doc/guides/rel_notes/release_23_07.rst +4 -0
+* **Added mcore dispatch model in rte_graph library.**
+
+  * Added set, get and validate model APIs to enhance graph framework
+    to chose different walk models.

Adding one line for what is "mcore dispatch model" will be good.

Got it. Will add in next version.

Quoted 4 lines

doc/guides/rel_notes/release_23_07.rst New Features · line 193

Quoted 2 lines
doc/guides/rel_notes/release_23_07.rst +2 -0
+  * Added clone graph, bind graph with lcore and affinity node with
+    lcore APIs to support mcore dispatch model.

I think, Above, statement, you can remove.

Yes. Thanks.

Quoted 15 lines
Quoted 5 lines

+
* **Added PDCP Library.**

Added an experimental library to provide PDCP UL and DL processing of

packets.

Quoted 9 lines
doc/guides/rel_notes/release_23_07.rst +5 -0
@@ -200,6 +207,11 @@ New Features
 
   Enhanced the GRO library to support TCP packets over IPv6 network.
 
+* **Update l3fwd-graph sample application.**
+
+  Added a new cmdline option ``--model`` which can be used to chose
+ RTC or mcore dispatch model.
+
author
#4 lore raw

PATCH v3 1/1 graph: fix graph model check in core binding

In reply to Zhirun Yan

Fix graph model check in core binding with graph. And rte_graph_clone() need to use valid params rather than NULL pointer. Update release notes for new mcore dispatch model.

Fixes ecb22a294980 ("graph: introduce graph bind unbind API")
Fixes 67e2303cd823 ("test/graph: add functional tests for mcore dispatch model")
---
 app/test/test_graph.c                  | 15 ++++++++++++---
 doc/guides/rel_notes/release_23_07.rst | 11 +++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)
app/test/test_graph.c +12 -3
index 8609c0b3a4..8983363c8e 100644
@@ -702,6 +702,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 	unsigned int worker_lcore = RTE_MAX_LCORE;
 	rte_node_t nid = RTE_NODE_ID_INVALID;
 	char node_name[64] = "test_node00";
+	struct rte_graph_param graph_conf;
 	struct rte_node *node;
 	int ret = 0;
 
@@ -711,7 +712,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 		printf("Set node %s affinity to lcore %u\n", node_name, worker_lcore);
 
 	nid = rte_node_from_name(node_name);
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", &graph_conf);
 	node = rte_graph_node_get(cloned_graph_id, nid);
 
 	if (node->dispatch.lcore_id != worker_lcore) {
@@ -729,11 +730,18 @@ test_graph_model_mcore_dispatch_core_bind_unbind(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
 	unsigned int worker_lcore = RTE_MAX_LCORE;
+	struct rte_graph_param graph_conf;
 	struct rte_graph *graph;
 	int ret = 0;
 
 	worker_lcore = rte_get_next_lcore(worker_lcore, true, 1);
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", &graph_conf);
+
+	ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
+	if (ret != 0) {
+		printf("Set graph mcore dispatch model failed\n");
+		ret = -1;
+	}
 
 	ret = rte_graph_model_mcore_dispatch_core_bind(cloned_graph_id, worker_lcore);
 	if (ret != 0) {
@@ -765,10 +773,11 @@ static int
 test_graph_worker_model_set_get(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
+	struct rte_graph_param graph_conf;
 	struct rte_graph *graph;
 	int ret = 0;
 
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", &graph_conf);
 	ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
 	if (ret != 0) {
 		printf("Set graph mcore dispatch model failed\n");
doc/guides/rel_notes/release_23_07.rst +11 -0
index 4459144140..8c62ebf690 100644
@@ -185,6 +185,12 @@ New Features
 
   * Added SM2 algorithm support in asymmetric crypto operations.
 
+* **Added mcore dispatch model in rte_graph library.**
+
+  * Added set, get and validate model APIs to enhance graph framework
+    to chose different walk models.
+  * Added mcore dispatch model to support cross-core dispatching mechanism.
+
 * **Added PDCP Library.**
 
   Added an experimental library to provide PDCP UL and DL processing of packets.
@@ -200,6 +206,11 @@ New Features
 
   Enhanced the GRO library to support TCP packets over IPv6 network.
 
+* **Update l3fwd-graph sample application.**
+
+  Added a new cmdline option ``--model`` which can be used to chose
+  RTC or mcore dispatch model.
+
 
 Removed Items
 -------------
lib/graph/graph.c +1 -1
index 0c28d925bc..26f0968a97 100644
@@ -287,7 +287,7 @@ rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore)
 		if (graph->id == id)
 			break;
 
-	if (graph->graph->model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+	if (graph->graph->model != RTE_GRAPH_MODEL_MCORE_DISPATCH)
 		goto fail;
 
 	graph->lcore_id = lcore;
Signature · 1 line
2.37.2
#5 lore raw
Quoted 2 lines · Zhirun Yan

Fix graph model check in core binding with graph. And rte_graph_clone()

Two fixes, Lets have two patches. Also tell what is fixed and how it is fixed.

Quoted 18 lines

need to use valid params rather than NULL pointer. Update release notes for new mcore dispatch model.

Fixes ecb22a294980 ("graph: introduce graph bind unbind API")
Fixes 67e2303cd823 ("test/graph: add functional tests for mcore dispatch model")
---
 app/test/test_graph.c                  | 15 ++++++++++++---
 doc/guides/rel_notes/release_23_07.rst | 11 +++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)
app/test/test_graph.c +0 -0
index 8609c0b3a4..8983363c8e 100644

app/test/test_graph.c test_graph_model_mcore_dispatch_node_lcore_affinity_set(void) · line 705

Quoted 4 lines
app/test/test_graph.c +1 -0
@@ -702,6 +702,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
        unsigned int worker_lcore = RTE_MAX_LCORE;
        rte_node_t nid = RTE_NODE_ID_INVALID;
        char node_name[64] = "test_node00";
+       struct rte_graph_param graph_conf;

Initialize with zero or defaults, aka add = { 0 }

#6 lore raw
Quoted 10 lines

-----Original Message-----
From: Jerin Jacob <[email protected]>
Sent: Friday, July 7, 2023 6:17 PM
To: Yan, Zhirun <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; [email protected]; Fu, Qi <[email protected]>
Subject: Re: [PATCH v3] graph: fix graph model check in core binding

Quoted 6 lines
Quoted 3 lines · Zhirun Yan

Fix graph model check in core binding with graph. And rte_graph_clone()

Two fixes, Lets have two patches. Also tell what is fixed and how it is fixed.

Ok, will do in next version.

Quoted 22 lines

app/test/test_graph.c

Quoted 21 lines

need to use valid params rather than NULL pointer. Update release notes for new mcore dispatch model.

Fixes ecb22a294980 ("graph: introduce graph bind unbind API")
Fixes 67e2303cd823 ("test/graph: add functional tests for mcore

dispatch model")

---
 app/test/test_graph.c                  | 15 ++++++++++++---
 doc/guides/rel_notes/release_23_07.rst | 11 +++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 24 insertions(+), 4 deletions(-)
app/test/test_graph.c index renamed from app/test/test_graph.c +0 -0

8609c0b3a4..8983363c8e 100644

app/test/test_graph.c +0 -0
@@ -702,6 +702,7 @@

test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)

Quoted 6 lines

app/test/test_graph.c test_graph_model_mcore_dispatch_node_lcore_affinity_set(void) · line 705

Quoted 4 lines
app/test/test_graph.c +1 -0
        unsigned int worker_lcore = RTE_MAX_LCORE;
        rte_node_t nid = RTE_NODE_ID_INVALID;
        char node_name[64] = "test_node00";
+       struct rte_graph_param graph_conf;

Initialize with zero or defaults, aka add = { 0 }

Got it, thanks.

author
#7 lore raw

v4 cover fix graph issues

In reply to Zhirun Yan

Fix graph clone issue in functional test.
Correct graph model check in graph core binding.
Update release note for mcore dispatch model.

Zhirun Yan (2):
graph: fix graph functional tests with valid params
graph: fix graph model check in core binding

 app/test/test_graph.c                  | 17 +++++++++++++----
 doc/guides/rel_notes/release_23_07.rst | 10 ++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 24 insertions(+), 5 deletions(-)
Signature · 1 line
2.37.2
author
#8 lore raw

PATCH v4 1/2 graph: fix graph functional tests with valid params

rte_graph_clone() should use valid param rather than NULL pointer, cause it needs the param for alloc work queue memory for mcore dispatch model in graph_sched_wq_create().

Fixes 67e2303cd823 ("test/graph: add functional tests for mcore dispatch model")
---
 app/test/test_graph.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
app/test/test_graph.c +7 -4
index 8609c0b3a4..47f5ab8395 100644
@@ -665,7 +665,7 @@ test_graph_clone(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
 	rte_graph_t main_graph_id = RTE_GRAPH_ID_INVALID;
-	struct rte_graph_param graph_conf;
+	struct rte_graph_param graph_conf = {0};
 	int ret = 0;
 
 	main_graph_id = rte_graph_from_name("worker0");
@@ -700,6 +700,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
 	unsigned int worker_lcore = RTE_MAX_LCORE;
+	struct rte_graph_param graph_conf = {0};
 	rte_node_t nid = RTE_NODE_ID_INVALID;
 	char node_name[64] = "test_node00";
 	struct rte_node *node;
@@ -711,7 +712,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 		printf("Set node %s affinity to lcore %u\n", node_name, worker_lcore);
 
 	nid = rte_node_from_name(node_name);
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", &graph_conf);
 	node = rte_graph_node_get(cloned_graph_id, nid);
 
 	if (node->dispatch.lcore_id != worker_lcore) {
@@ -729,11 +730,12 @@ test_graph_model_mcore_dispatch_core_bind_unbind(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
 	unsigned int worker_lcore = RTE_MAX_LCORE;
+	struct rte_graph_param graph_conf = {0};
 	struct rte_graph *graph;
 	int ret = 0;
 
 	worker_lcore = rte_get_next_lcore(worker_lcore, true, 1);
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", &graph_conf);
 
 	ret = rte_graph_model_mcore_dispatch_core_bind(cloned_graph_id, worker_lcore);
 	if (ret != 0) {
@@ -765,10 +767,11 @@ static int
 test_graph_worker_model_set_get(void)
 {
 	rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
+	struct rte_graph_param graph_conf = {0};
 	struct rte_graph *graph;
 	int ret = 0;
 
-	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", NULL);
+	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", &graph_conf);
 	ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
 	if (ret != 0) {
 		printf("Set graph mcore dispatch model failed\n");
Signature · 1 line
2.37.2
Acked-by on v4 1/2
#9 lore raw

Re: [PATCH v4 1/2] graph: fix graph functional tests with valid params

Quoted 2 lines · Zhirun Yan

rte_graph_clone() should use valid param rather than NULL pointer, cause it

rte_graph_clone() should use a valid param rather than NULL pointer as

Quoted 6 lines

needs the param for alloc work queue memory for mcore dispatch model in graph_sched_wq_create().

Fixes 67e2303cd823 ("test/graph: add functional tests for mcore dispatch model")

With above change:

Quoted 64 lines
---
 app/test/test_graph.c | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)
app/test/test_graph.c +7 -5
index 8609c0b3a4..47f5ab8395 100644
@@ -665,7 +665,7 @@ test_graph_clone(void)
 {
        rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
        rte_graph_t main_graph_id = RTE_GRAPH_ID_INVALID;
-       struct rte_graph_param graph_conf;
+       struct rte_graph_param graph_conf = {0};
        int ret = 0;
 
        main_graph_id = rte_graph_from_name("worker0");
@@ -700,6 +700,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
 {
        rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
        unsigned int worker_lcore = RTE_MAX_LCORE;
+       struct rte_graph_param graph_conf = {0};
        rte_node_t nid = RTE_NODE_ID_INVALID;
        char node_name[64] = "test_node00";
        struct rte_node *node;
@@ -711,7 +712,7 @@ test_graph_model_mcore_dispatch_node_lcore_affinity_set(void)
                printf("Set node %s affinity to lcore %u\n", node_name, worker_lcore);
 
        nid = rte_node_from_name(node_name);
-       cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", NULL);
+       cloned_graph_id = rte_graph_clone(graph_id, "cloned-test1", &graph_conf);
        node = rte_graph_node_get(cloned_graph_id, nid);
 
        if (node->dispatch.lcore_id != worker_lcore) {
@@ -729,11 +730,12 @@ test_graph_model_mcore_dispatch_core_bind_unbind(void)
 {
        rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
        unsigned int worker_lcore = RTE_MAX_LCORE;
+       struct rte_graph_param graph_conf = {0};
        struct rte_graph *graph;
        int ret = 0;
 
        worker_lcore = rte_get_next_lcore(worker_lcore, true, 1);
-       cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", NULL);
+       cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", &graph_conf);
 
        ret = rte_graph_model_mcore_dispatch_core_bind(cloned_graph_id, worker_lcore);
        if (ret != 0) {
@@ -765,10 +767,11 @@ static int
 test_graph_worker_model_set_get(void)
 {
        rte_graph_t cloned_graph_id = RTE_GRAPH_ID_INVALID;
+       struct rte_graph_param graph_conf = {0};
        struct rte_graph *graph;
        int ret = 0;
 
-       cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", NULL);
+       cloned_graph_id = rte_graph_clone(graph_id, "cloned-test3", &graph_conf);
        ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
        if (ret != 0) {
                printf("Set graph mcore dispatch model failed\n");
--

2.37.2

author
#10 lore raw

PATCH v4 2/2 graph: fix graph model check in core binding

In reply to Zhirun Yan

This function is used for mcore dispatch model only, correct the check to make sure it is the expected model. And specific the model by rte_graph_worker_model_set() before call it in test. Update release notes for new mcore dispatch model.

Fixes ecb22a294980 ("graph: introduce graph bind unbind API")
---
 app/test/test_graph.c                  |  6 ++++++
 doc/guides/rel_notes/release_23_07.rst | 10 ++++++++++
 lib/graph/graph.c                      |  2 +-
 3 files changed, 17 insertions(+), 1 deletion(-)
app/test/test_graph.c +6 -0
index 47f5ab8395..af90ac07ec 100644
@@ -737,6 +737,12 @@ test_graph_model_mcore_dispatch_core_bind_unbind(void)
 	worker_lcore = rte_get_next_lcore(worker_lcore, true, 1);
 	cloned_graph_id = rte_graph_clone(graph_id, "cloned-test2", &graph_conf);
 
+	ret = rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH);
+	if (ret != 0) {
+		printf("Set graph mcore dispatch model failed\n");
+		ret = -1;
+	}
+
 	ret = rte_graph_model_mcore_dispatch_core_bind(cloned_graph_id, worker_lcore);
 	if (ret != 0) {
 		printf("bind graph %d to lcore %u failed\n", graph_id, worker_lcore);
doc/guides/rel_notes/release_23_07.rst +10 -0
index dcfd692425..7f1c2e66d5 100644
@@ -185,6 +185,12 @@ New Features
 
   * Added SM2 algorithm support in asymmetric crypto operations.
 
+* **Added mcore dispatch model in rte_graph library.**
+
+  * Added set, get and validate model APIs to enhance graph framework
+    to chose different walk models.
+  * Added mcore dispatch model to support cross-core dispatching mechanism.
+
 * **Added PDCP Library.**
 
   Added an experimental library to provide PDCP UL and DL processing of packets.
@@ -206,6 +212,10 @@ New Features
 
   See the :doc:`../tools/dmaperf` for more details.
 
+* **Update l3fwd-graph sample application.**
+
+  Added a new cmdline option ``--model`` which can be used to chose
+  RTC or mcore dispatch model.
 
 Removed Items
 -------------
lib/graph/graph.c +1 -1
index 0c28d925bc..26f0968a97 100644
@@ -287,7 +287,7 @@ rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore)
 		if (graph->id == id)
 			break;
 
-	if (graph->graph->model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+	if (graph->graph->model != RTE_GRAPH_MODEL_MCORE_DISPATCH)
 		goto fail;
 
 	graph->lcore_id = lcore;
Signature · 1 line
2.37.2
Acked-by on v4 2/2
#11 lore raw
Quoted 5 lines · Zhirun Yan

This function is used for mcore dispatch model only, correct the check to make sure it is the expected model. And specific the model by rte_graph_worker_model_set() before call it in test. Update release notes for new mcore dispatch model.

Fix missing worker model section by invoking rte_graph_worker_model_set(RTE_GRAPH_MODEL_MCORE_DISPATCH) in test_graph_model_mcore_dispatch_core_bind_unbind() routine.

Also, Updated missing release notes for new mcore dispatch model addition and sample l3fwd-graph update.

With above change,

#12 lore raw

Re: [PATCH v4 0/2] fix graph issues

In reply to Zhirun Yan

10/07/2023 09:15, Zhirun Yan:

Quoted 8 lines

Fix graph clone issue in functional test.
Correct graph model check in graph core binding.
Update release note for mcore dispatch model.

Zhirun Yan (2):
graph: fix graph functional tests with valid params
graph: fix graph model check in core binding

Applied with Jerin suggestions and few more minor fixes.