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 F009D4285E;
Wed, 29 Mar 2023 08:44:47 +0200 (CEST)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 173A642C54;
Wed, 29 Mar 2023 08:44:10 +0200 (CEST)
Received: from mga02.intel.com (mga02.intel.com [134.134.136.20])
by mails.dpdk.org (Postfix) with ESMTP id 6A53142D12
for <dev@dpdk.org>; Wed, 29 Mar 2023 08:44:07 +0200 (CEST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple;
d=intel.com; i=@intel.com; q=dns/txt; s=Intel;
t=1680072247; x=1711608247;
h=from:to:cc:subject:date:message-id:in-reply-to:
references:mime-version:content-transfer-encoding;
bh=i4bPHhLYEjnztA7cgmSSgSHPMH/gVksNCdgVwnohoaI=;
b=d99dzZ/pShTmw52yWSaxuCbYrV27gbqB1QhF6TQ84KRyqWyKq559/vNp
5I2zfux7duPeR9tKBPv/LZggtjZcUCWx8j61vtyLRdtfnfNfnXiJPmp/S
Io25hEZsooB9OQKKBrhEta2Gm+y/nOACNdn+lKtJhMUrwvjrqf43XwsR7
yJVD0BYIjeQUt0Bt6T9UeNjK74ckJbIFzWljWGIml82Q6UunM0P8lD7Yd
HZvz1P5PCa7H3dWpx7jGD77wjufjckjXPgUrOPZxYWuatpNp9ZWWUjFw1
0Od/N0lFXB5pLFNjQ1ruh0VUxcz1+k0eY80EjFPFVNASeoQqxis7/cVZo g==;
X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="329260480"
X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="329260480"
Received: from fmsmga002.fm.intel.com ([10.253.24.26])
by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
28 Mar 2023 23:44:06 -0700
X-ExtLoop1: 1
X-IronPort-AV: E=McAfee;i="6600,9927,10663"; a="795105000"
X-IronPort-AV: E=Sophos;i="5.98,300,1673942400"; d="scan'208";a="795105000"
Received: from dpdk-zhirun-lmm.sh.intel.com ([10.67.119.68])
by fmsmga002.fm.intel.com with ESMTP; 28 Mar 2023 23:44:05 -0700
From: Zhirun Yan <zhirun.yan@intel.com>
To: dev@dpdk.org, jerinj@marvell.com, kirankumark@marvell.com,
ndabilpuram@marvell.com
Cc: cunming.liang@intel.com, haiyue.wang@intel.com,
Zhirun Yan <zhirun.yan@intel.com>
Subject: [PATCH v3 08/15] graph: add struct for stream moving between cores
Date: Wed, 29 Mar 2023 15:43:33 +0900
Message-Id: <20230329064340.2550530-9-zhirun.yan@intel.com>
X-Mailer: git-send-email 2.37.2
In-Reply-To: <20230329064340.2550530-1-zhirun.yan@intel.com>
References: <20230324021622.1369006-1-zhirun.yan@intel.com>
<20230329064340.2550530-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 graph_sched_wq_node to hold graph scheduling workqueue
node.
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>
---
lib/graph/graph.c | 1 +
lib/graph/graph_populate.c | 1 +
lib/graph/graph_private.h | 12 ++++++++++++
lib/graph/rte_graph_worker_common.h | 21 +++++++++++++++++++++
4 files changed, 35 insertions(+)
diff --git a/lib/graph/graph.c b/lib/graph/graph.c
index 90eaad0378..dd3d69dbf7 100644
--- a/lib/graph/graph.c
+++ b/lib/graph/graph.c
@@ -284,6 +284,7 @@ rte_graph_model_dispatch_core_bind(rte_graph_t id, int lcore)
break;
graph->lcore_id = lcore;
+ graph->graph->lcore_id = graph->lcore_id;
graph->socket = rte_lcore_to_socket_id(lcore);
/* check the availability of source node */
diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c
index 2c0844ce92..7dcf1420c1 100644
--- a/lib/graph/graph_populate.c
+++ b/lib/graph/graph_populate.c
@@ -89,6 +89,7 @@ graph_nodes_populate(struct graph *_graph)
}
node->id = graph_node->node->id;
node->parent_id = pid;
+ node->lcore_id = graph_node->node->lcore_id;
nb_edges = graph_node->node->nb_edges;
node->nb_edges = nb_edges;
off += sizeof(struct rte_node);
diff --git a/lib/graph/graph_private.h b/lib/graph/graph_private.h
index d28a5af93e..b66b18ebbc 100644
--- a/lib/graph/graph_private.h
+++ b/lib/graph/graph_private.h
@@ -60,6 +60,18 @@ struct node {
char next_nodes[][RTE_NODE_NAMESIZE]; /**< Names of next nodes. */
};
+/**
+ * @internal
+ *
+ * Structure that holds the graph scheduling workqueue node stream.
+ * Used for mcore dispatch model.
+ */
+struct graph_sched_wq_node {
+ rte_graph_off_t node_off;
+ uint16_t nb_objs;
+ void *objs[RTE_GRAPH_BURST_SIZE];
+} __rte_cache_aligned;
+
/**
* @internal
*
diff --git a/lib/graph/rte_graph_worker_common.h b/lib/graph/rte_graph_worker_common.h
index 1526da6e2c..dc0a0b5554 100644
--- a/lib/graph/rte_graph_worker_common.h
+++ b/lib/graph/rte_graph_worker_common.h
@@ -30,6 +30,13 @@
extern "C" {
#endif
+/**
+ * @internal
+ *
+ * Singly-linked list head for graph schedule run-queue.
+ */
+SLIST_HEAD(rte_graph_rq_head, rte_graph);
+
/**
* @internal
*
@@ -41,6 +48,15 @@ struct rte_graph {
uint32_t cir_mask; /**< Circular buffer wrap around mask. */
rte_node_t nb_nodes; /**< Number of nodes in the graph. */
rte_graph_off_t *cir_start; /**< Pointer to circular buffer. */
+ /* Graph schedule */
+ struct rte_graph_rq_head *rq __rte_cache_aligned; /* The run-queue */
+ struct rte_graph_rq_head rq_head; /* The head for run-queue list */
+
+ SLIST_ENTRY(rte_graph) rq_next; /* The next for run-queue list */
+ unsigned int lcore_id; /**< The graph running Lcore. */
+ struct rte_ring *wq; /**< The work-queue for pending streams. */
+ struct rte_mempool *mp; /**< The mempool for scheduling streams. */
+ /* Graph schedule area */
rte_graph_off_t nodes_start; /**< Offset at which node memory starts. */
rte_graph_t id; /**< Graph identifier. */
int socket; /**< Socket ID where memory is allocated. */
@@ -74,6 +90,11 @@ struct rte_node {
/** Original process function when pcap is enabled. */
rte_node_process_t original_process;
+ RTE_STD_C11
+ union {
+ /* Fast schedule area for mcore dispatch model */
+ unsigned int lcore_id; /**< Node running lcore. */
+ };
/* Fast path area */
#define RTE_NODE_CTX_SZ 16
uint8_t ctx[RTE_NODE_CTX_SZ] __rte_cache_aligned; /**< Node Context. */
--
2.37.2