[v4,08/29] graph: implement graph operation APIs
diff mbox series

Message ID 20200405085613.1336841-9-jerinj@marvell.com
State Superseded, archived
Delegated to: Thomas Monjalon
Headers show
Series
  • graph: introduce graph subsystem
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/checkpatch success coding style OK

Commit Message

Jerin Jacob Kollanukkaran April 5, 2020, 8:55 a.m. UTC
From: Jerin Jacob <jerinj@marvell.com>

Adding support for graph specific API implementation like
Graph lookup to get graph object, retrieving graph ID
From name and graph name from ID.

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
---
 lib/librte_graph/graph.c               | 131 +++++++++++++++++++++++++
 lib/librte_graph/rte_graph_version.map |   8 ++
 2 files changed, 139 insertions(+)

Comments

Andrzej Ostruszka April 8, 2020, 5:49 p.m. UTC | #1
On 4/5/20 10:55 AM, jerinj@marvell.com wrote:
> From: Jerin Jacob <jerinj@marvell.com>
> 
> Adding support for graph specific API implementation like
> Graph lookup to get graph object, retrieving graph ID
> From name and graph name from ID.
> 
> Signed-off-by: Jerin Jacob <jerinj@marvell.com>
> Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
> Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
> Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
> ---
>  lib/librte_graph/graph.c               | 131 +++++++++++++++++++++++++
>  lib/librte_graph/rte_graph_version.map |   8 ++
>  2 files changed, 139 insertions(+)
> 
> diff --git a/lib/librte_graph/graph.c b/lib/librte_graph/graph.c
> index dc373231e..7c6a7897d 100644
> --- a/lib/librte_graph/graph.c
> +++ b/lib/librte_graph/graph.c
> @@ -210,6 +210,54 @@ graph_node_fini(struct graph *graph)
>  						       graph_node->node->name));
>  }
>  
> +static struct rte_graph *
> +graph_mem_fixup_node_ctx(struct rte_graph *graph)

How is this function fixing context?  It only updates process pointer
never touching context.

> +{
> +	struct rte_node *node;
> +	struct node *node_db;
> +	rte_graph_off_t off;
> +	rte_node_t count;
> +	const char *name;
> +
> +	rte_graph_foreach_node(count, off, graph, node) {
> +		if (node->parent_id == RTE_NODE_ID_INVALID) /* Static node */
> +			name = node->name;
> +		else /* Cloned node */
> +			name = node->parent;
> +
> +		node_db = node_from_name(name);
> +		if (node_db == NULL)
> +			SET_ERR_JMP(ENOLINK, fail, "Node %s not found", name);
> +		node->process = node_db->process;
> +	}
> +
> +	return graph;
> +fail:
> +	return NULL;
> +}
> +
> +static struct rte_graph *
> +graph_mem_fixup_secondray(struct rte_graph *graph)

Typo here?

> +{
> +	if (graph == NULL || rte_eal_process_type() == RTE_PROC_PRIMARY)
> +		return graph;
> +
> +	return graph_mem_fixup_node_ctx(graph);
> +}
> +
> +struct rte_graph *
> +rte_graph_lookup(const char *name)
> +{
> +	const struct rte_memzone *mz;
> +	struct rte_graph *rc = NULL;
> +
> +	mz = rte_memzone_lookup(name);
> +	if (mz)
> +		rc = mz->addr;
> +
> +	return graph_mem_fixup_secondray(rc);
> +}
[...]

With regards
Andrzej Ostruszka
Jerin Jacob April 8, 2020, 7:18 p.m. UTC | #2
On Wed, Apr 8, 2020 at 11:19 PM Andrzej Ostruszka <amo@semihalf.com> wrote:
>
> On 4/5/20 10:55 AM, jerinj@marvell.com wrote:
> > From: Jerin Jacob <jerinj@marvell.com>
> >
> > Adding support for graph specific API implementation like
> > Graph lookup to get graph object, retrieving graph ID
> > From name and graph name from ID.
> >
> > Signed-off-by: Jerin Jacob <jerinj@marvell.com>
> > Signed-off-by: Kiran Kumar K <kirankumark@marvell.com>
> > Signed-off-by: Pavan Nikhilesh <pbhagavatula@marvell.com>
> > Signed-off-by: Nithin Dabilpuram <ndabilpuram@marvell.com>
> > ---
> >  lib/librte_graph/graph.c               | 131 +++++++++++++++++++++++++
> >  lib/librte_graph/rte_graph_version.map |   8 ++
> >  2 files changed, 139 insertions(+)
> >
> > diff --git a/lib/librte_graph/graph.c b/lib/librte_graph/graph.c
> > index dc373231e..7c6a7897d 100644
> > --- a/lib/librte_graph/graph.c
> > +++ b/lib/librte_graph/graph.c
> > @@ -210,6 +210,54 @@ graph_node_fini(struct graph *graph)
> >                                                      graph_node->node->name));
> >  }
> >
> > +static struct rte_graph *
> > +graph_mem_fixup_node_ctx(struct rte_graph *graph)
>
> How is this function fixing context?  It only updates process pointer
> never touching context.

In the multiprocess model,

# The primary process( using rte_graph_create() API), it will create
the graph object
in hugepage memory
# Secondary process calls rte_graph_lookup() to get the graph object, created
by the primary process. Internally it uses rte_memzone_lookup() to get
the hugepage memory
populated by the primary process.
# The ONLY data that need to be updated in the secondary process context is the
process() function pointer. graph_mem_fixup_node_ctx(), do name-based
lookup with
node name and replace with function pointer in secondary process context.

>
> > +{
> > +     struct rte_node *node;
> > +     struct node *node_db;
> > +     rte_graph_off_t off;
> > +     rte_node_t count;
> > +     const char *name;
> > +
> > +     rte_graph_foreach_node(count, off, graph, node) {
> > +             if (node->parent_id == RTE_NODE_ID_INVALID) /* Static node */
> > +                     name = node->name;
> > +             else /* Cloned node */
> > +                     name = node->parent;
> > +
> > +             node_db = node_from_name(name);
> > +             if (node_db == NULL)
> > +                     SET_ERR_JMP(ENOLINK, fail, "Node %s not found", name);
> > +             node->process = node_db->process;
> > +     }
> > +
> > +     return graph;
> > +fail:
> > +     return NULL;
> > +}
> > +
> > +static struct rte_graph *
> > +graph_mem_fixup_secondray(struct rte_graph *graph)
>
> Typo here?

I will fix it v5.

Patch
diff mbox series

diff --git a/lib/librte_graph/graph.c b/lib/librte_graph/graph.c
index dc373231e..7c6a7897d 100644
--- a/lib/librte_graph/graph.c
+++ b/lib/librte_graph/graph.c
@@ -210,6 +210,54 @@  graph_node_fini(struct graph *graph)
 						       graph_node->node->name));
 }
 
+static struct rte_graph *
+graph_mem_fixup_node_ctx(struct rte_graph *graph)
+{
+	struct rte_node *node;
+	struct node *node_db;
+	rte_graph_off_t off;
+	rte_node_t count;
+	const char *name;
+
+	rte_graph_foreach_node(count, off, graph, node) {
+		if (node->parent_id == RTE_NODE_ID_INVALID) /* Static node */
+			name = node->name;
+		else /* Cloned node */
+			name = node->parent;
+
+		node_db = node_from_name(name);
+		if (node_db == NULL)
+			SET_ERR_JMP(ENOLINK, fail, "Node %s not found", name);
+		node->process = node_db->process;
+	}
+
+	return graph;
+fail:
+	return NULL;
+}
+
+static struct rte_graph *
+graph_mem_fixup_secondray(struct rte_graph *graph)
+{
+	if (graph == NULL || rte_eal_process_type() == RTE_PROC_PRIMARY)
+		return graph;
+
+	return graph_mem_fixup_node_ctx(graph);
+}
+
+struct rte_graph *
+rte_graph_lookup(const char *name)
+{
+	const struct rte_memzone *mz;
+	struct rte_graph *rc = NULL;
+
+	mz = rte_memzone_lookup(name);
+	if (mz)
+		rc = mz->addr;
+
+	return graph_mem_fixup_secondray(rc);
+}
+
 rte_graph_t
 rte_graph_create(const char *name, struct rte_graph_param *prm)
 {
@@ -341,6 +389,76 @@  rte_graph_destroy(const char *graph_name)
 	return rc;
 }
 
+rte_graph_t
+rte_graph_from_name(const char *name)
+{
+	struct graph *graph;
+
+	STAILQ_FOREACH(graph, &graph_list, next)
+		if (strncmp(graph->name, name, RTE_GRAPH_NAMESIZE) == 0)
+			return graph->id;
+
+	return RTE_GRAPH_ID_INVALID;
+}
+
+char *
+rte_graph_id_to_name(rte_graph_t id)
+{
+	struct graph *graph;
+
+	GRAPH_ID_CHECK(id);
+	STAILQ_FOREACH(graph, &graph_list, next)
+		if (graph->id == id)
+			return graph->name;
+
+fail:
+	return NULL;
+}
+
+struct rte_node *
+rte_graph_node_get(rte_graph_t gid, uint32_t nid)
+{
+	struct rte_node *node;
+	struct graph *graph;
+	rte_graph_off_t off;
+	rte_node_t count;
+
+	GRAPH_ID_CHECK(gid);
+	STAILQ_FOREACH(graph, &graph_list, next)
+		if (graph->id == gid) {
+			rte_graph_foreach_node(count, off, graph->graph,
+						node) {
+				if (node->id == nid)
+					return node;
+			}
+			break;
+		}
+fail:
+	return NULL;
+}
+
+struct rte_node *
+rte_graph_node_get_by_name(const char *graph_name, const char *node_name)
+{
+	struct rte_node *node;
+	struct graph *graph;
+	rte_graph_off_t off;
+	rte_node_t count;
+
+	STAILQ_FOREACH(graph, &graph_list, next)
+		if (!strncmp(graph->name, graph_name, RTE_GRAPH_NAMESIZE)) {
+			rte_graph_foreach_node(count, off, graph->graph,
+						node) {
+				if (!strncmp(node->name, node_name,
+					     RTE_NODE_NAMESIZE))
+					return node;
+			}
+			break;
+		}
+
+	return NULL;
+}
+
 void __rte_noinline
 __rte_node_stream_alloc(struct rte_graph *graph, struct rte_node *node)
 {
@@ -355,3 +473,16 @@  __rte_node_stream_alloc(struct rte_graph *graph, struct rte_node *node)
 	node->size = size;
 	node->realloc_count++;
 }
+
+rte_graph_t
+rte_graph_max_count(void)
+{
+	return graph_id;
+}
+
+RTE_INIT(rte_graph_init_log)
+{
+	rte_graph_logtype = rte_log_register("lib.graph");
+	if (rte_graph_logtype >= 0)
+		rte_log_set_level(rte_graph_logtype, RTE_LOG_INFO);
+}
diff --git a/lib/librte_graph/rte_graph_version.map b/lib/librte_graph/rte_graph_version.map
index dcbd78c02..5a2b13293 100644
--- a/lib/librte_graph/rte_graph_version.map
+++ b/lib/librte_graph/rte_graph_version.map
@@ -6,6 +6,14 @@  EXPERIMENTAL {
 
 	rte_graph_create;
 	rte_graph_destroy;
+	rte_graph_from_name;
+	rte_graph_id_to_name;
+	rte_graph_lookup;
+	rte_graph_list_dump;
+	rte_graph_max_count;
+	rte_graph_node_get;
+	rte_graph_node_get_by_name;
+
 	rte_node_clone;
 	rte_node_dump;
 	rte_node_edge_count;