From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id D1C0142CA8;
Tue, 13 Jun 2023 12:24:26 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id C057842D43;
Tue, 13 Jun 2023 12:24:26 +0200 (CEST)
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
by mails.dpdk.org (Postfix) with ESMTP id 840A5427F2
for <dev@dpdk.org>; Tue, 13 Jun 2023 12:24:24 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1686651864; x=1718187864;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=z7g+FJRvryMqEjie9HFv3RgOudicqZCoX3cX2fjlvPk=;
b=ROhgq40jRy62l4mgsgNGP1qltzfdaYxzGFaYk2kVgpOuM4cQY8k77beA
TJyKzrPucS/77wpSNvGarYsWMbI/nxIAZT1nHFdDDu1hhhcdQBtOTq77b
4uvchg8ABAttP/AVlodaqk3kAlSx07E3ilcIRTU2b0KRF1Vadw5SeAhT7
jP7o2Gj4c5ylFcxL2MlBYgvItxSy7CvEd4G16cqY/8fKy5Lksu74jrBKI
INEWAmFEFuch8KjuGDUhx70L3GGs+/YMERW7t50LSOvycEaD/1i5iQjya
NzxHGjb+WYRlYB6e3DH+YH24PMk8t//D4djKyPG2J7KLqMU72bYZFcpsv g==;
X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="358289574"
X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="358289574"
Received: from orsmga008.jf.intel.com ([10.7.209.65])
by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
13 Jun 2023 03:21:31 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6600,9927,10739"; a="741375461"
X-IronPort-AV: E=Sophos;i="6.00,239,1681196400"; d="scan'208";a="741375461"
Received: from dpdk-zhirun-lmm.sh.intel.com ([10.67.119.94])
by orsmga008.jf.intel.com with ESMTP; 13 Jun 2023 03:21:28 -0700
From: Zhirun Yan <zhirun.yan@intel.com>
To: dev@dpdk.org, jerinj@marvell.com, kirankumark@marvell.com,
ndabilpuram@marvell.com, stephen@networkplumber.org,
pbhagavatula@marvell.com, jerinjacobk@gmail.com, david.marchand@redhat.com
Cc: cunming.liang@intel.com, haiyue.wang@intel.com,
mattias.ronnblom@ericsson.com, Zhirun Yan <zhirun.yan@intel.com>
Subject: [PATCH v13 06/16] graph: introduce graph bind unbind API
Date: Tue, 13 Jun 2023 18:13:54 +0800
Message-Id: <20230613101404.1787790-7-zhirun.yan@intel.com>
X-Mailer: git-send-email 2.37.2
In-Reply-To: <20230613101404.1787790-1-zhirun.yan@intel.com>
References: <20230609191245.252521-1-zhirun.yan@intel.com>
<20230613101404.1787790-1-zhirun.yan@intel.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Add lcore_id for graph to hold affinity core id where graph would run on.
Add bind/unbind API to set/unset graph affinity attribute. lcore_id will
be set as MAX by default, it means not enable this attribute.
Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Signed-off-by: Cunming Liang <cunming.liang@intel.com>
Signed-off-by: Zhirun Yan <zhirun.yan@intel.com>
Acked-by: Jerin Jacob <jerinj@marvell.com>
---
lib/graph/graph.c | 60 +++++++++++++++++++++++++++++++++++++++
lib/graph/graph_private.h | 2 ++
lib/graph/rte_graph.h | 22 ++++++++++++++
lib/graph/version.map | 3 +-
4 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 5582631b53..8d5bd8b9ae 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -260,6 +260,65 @@ graph_mem_fixup_secondary(struct rte_graph *graph)
return graph_mem_fixup_node_ctx(graph);
}
+static bool
+graph_src_node_avail(struct graph *graph)
+{
+ struct graph_node *graph_node;
+
+ STAILQ_FOREACH(graph_node, &graph->node_list, next)
+ if ((graph_node->node->flags & RTE_NODE_SOURCE_F) &&
+ (graph_node->node->lcore_id == RTE_MAX_LCORE ||
+ graph->lcore_id == graph_node->node->lcore_id))
+ return true;
+
+ return false;
+}
+
+int
+rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore)
+{
+ struct graph *graph;
+
+ GRAPH_ID_CHECK(id);
+ if (!rte_lcore_is_enabled(lcore))
+ SET_ERR_JMP(ENOLINK, fail, "lcore %d not enabled", lcore);
+
+ STAILQ_FOREACH(graph, &graph_list, next)
+ if (graph->id == id)
+ break;
+
+ if (graph->graph->model == RTE_GRAPH_MODEL_MCORE_DISPATCH)
+ goto fail;
+
+ graph->lcore_id = lcore;
+ graph->socket = rte_lcore_to_socket_id(lcore);
+
+ /* check the availability of source node */
+ if (!graph_src_node_avail(graph))
+ graph->graph->head = 0;
+
+ return 0;
+
+fail:
+ return -rte_errno;
+}
+
+void
+rte_graph_model_mcore_dispatch_core_unbind(rte_graph_t id)
+{
+ struct graph *graph;
+
+ GRAPH_ID_CHECK(id);
+ STAILQ_FOREACH(graph, &graph_list, next)
+ if (graph->id == id)
+ break;
+
+ graph->lcore_id = RTE_MAX_LCORE;
+
+fail:
+ return;
+}
+
struct rte_graph *
rte_graph_lookup(const char *name)
{
@@ -346,6 +405,7 @@ rte_graph_create(const char *name, struct rte_graph_param *prm)
graph->src_node_count = src_node_count;
graph->node_count = graph_nodes_count(graph);
graph->id = graph_id;
+ graph->lcore_id = RTE_MAX_LCORE;
graph->num_pkt_to_capture = prm->num_pkt_to_capture;
if (prm->pcap_filename)
rte_strscpy(graph->pcap_filename, prm->pcap_filename, RTE_GRAPH_PCAP_FILE_SZ);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index ea4409448d..6d2137c81b 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -100,6 +100,8 @@ struct graph {
/**< Circular buffer mask for wrap around. */
rte_graph_t id;
/**< Graph identifier. */
+ unsigned int lcore_id;
+ /**< Lcore identifier where the graph prefer to run on. Used for mcore dispatch model. */
size_t mem_sz;
/**< Memory size of the graph. */
int socket;
diff --git a/lib/graph/rte_graph.h b/lib/graph/rte_graph.h
index c9a77297fc..f70c694e77 100644
--- a/lib/graph/rte_graph.h
+++ b/lib/graph/rte_graph.h
@@ -285,6 +285,28 @@ char *rte_graph_id_to_name(rte_graph_t id);
__rte_experimental
int rte_graph_export(const char *name, FILE *f);
+/**
+ * Bind graph with specific lcore for mcore dispatch model.
+ *
+ * @param id
+ * Graph id to get the pointer of graph object
+ * @param lcore
+ * The lcore where the graph will run on
+ * @return
+ * 0 on success, error otherwise.
+ */
+__rte_experimental
+int rte_graph_model_mcore_dispatch_core_bind(rte_graph_t id, int lcore);
+
+/**
+ * Unbind graph with lcore for mcore dispatch model
+ *
+ * @param id
+ * Graph id to get the pointer of graph object
+ */
+__rte_experimental
+void rte_graph_model_mcore_dispatch_core_unbind(rte_graph_t id);
+
/**
* Get graph object from its name.
*
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 6ae19b0d6e..9a20dba5e7 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -15,6 +15,8 @@ EXPERIMENTAL {
rte_graph_list_dump;
rte_graph_max_count;
rte_graph_model_is_valid;
+ rte_graph_model_mcore_dispatch_core_bind;
+ rte_graph_model_mcore_dispatch_core_unbind;
rte_graph_model_mcore_dispatch_node_lcore_affinity_set;
rte_graph_node_get;
rte_graph_node_get_by_name;
@@ -24,7 +26,6 @@ EXPERIMENTAL {
rte_graph_worker_model_no_check_get;
rte_graph_worker_model_set;
-
rte_graph_cluster_stats_create;
rte_graph_cluster_stats_destroy;
rte_graph_cluster_stats_get;
--
2.37.2