[PATCH V3 02/21] net/softnic: remove flow support
Remove the Ethernet device flow API support.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build|1 -
drivers/net/softnic/rte_eth_softnic.c |9 -
drivers/net/softnic/rte_eth_softnic_cli.c | 81 -
drivers/net/softnic/rte_eth_softnic_flow.c | 2293
4 files changed, 2384 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_flow.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index e2dbd6166e..4ebe60921c 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -13,7 +13,6 @@ sources = files(
'rte_eth_softnic_action.c',
'rte_eth_softnic_cli.c',
'rte_eth_softnic_cryptodev.c',
-'rte_eth_softnic_flow.c',
'rte_eth_softnic_link.c',
'rte_eth_softnic_mempool.c',
'rte_eth_softnic_meter.c',
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index ae3e8b3bcd..8e361adbad 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -215,14 +215,6 @@ pmd_link_update(struct rte_eth_dev *dev __rte_unused,
return 0;
}
-static int
-pmd_flow_ops_get(struct rte_eth_dev *dev __rte_unused,
-const struct rte_flow_ops **ops)
-{
- *ops = &pmd_flow_ops;
- return 0;
-}
-
static int
pmd_mtr_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
{
@@ -240,7 +232,6 @@ static const struct eth_dev_ops pmd_ops = {
.dev_infos_get = pmd_dev_infos_get,
.rx_queue_setup = pmd_rx_queue_setup,
.tx_queue_setup = pmd_tx_queue_setup,
- .flow_ops_get = pmd_flow_ops_get,
.mtr_ops_get = pmd_mtr_ops_get,
};
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 7556e50831..671f96cf77 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -4731,81 +4731,6 @@ cmd_softnic_thread_pipeline_disable(struct pmd_internals
*softnic,
}
}
-/**
- * flowapi map
- * group
- * ingress | egress
- * pipeline
- * table
- */
-static void
-cmd_softnic_flowapi_map(struct pmd_internals *softnic,
- char **tokens,
- uint32_t n_tokens,
- char *out,
- size_t out_size)
-{
- char *pipeline_name;
- uint32_t group_id, table_id;
- int ingress, status;
-
- if (n_tokens != 9) {
- snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
- return;
- }
-
- if (strcmp(tokens[1], "map") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "map");
- return;
- }
-
- if (strcmp(tokens[2], "group") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "group");
- return;
- }
-
- if (softnic_parser_read_uint32(&group_id, tokens[3]) != 0) {
- snprintf(out, out_size, MSG_ARG_INVALID, "group_id");
- return;
- }
-
- if (strcmp(tokens[4], "ingress") == 0) {
- ingress = 1;
- } else if (strcmp(tokens[4], "egress") == 0) {
- ingress = 0;
- } else {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "ingress | egress");
- return;
- }
-
- if (strcmp(tokens[5], "pipeline") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pipeline");
- return;
- }
-
- pipeline_name = tokens[6];
-
- if (strcmp(tokens[7], "table") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "table");
- return;
- }
-
- if (softnic_parser_read_uint32(&table_id, tokens[8]) != 0) {
- snprintf(out, out_size, MSG_ARG_INVALID, "table_id");
- return;
- }
-
- status = flow_attr_map_set(softnic,
- group_id,
- ingress,
- pipeline_name,
- table_id);
- if (status) {
- snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
- return;
- }
-}
-
void
softnic_cli_process(char *in, char *out, size_t out_size, void *arg)
{
@@ -5063,12 +4988,6 @@ softnic_cli_process(char *in, char *out, size_t
out_size, void *arg)
}
}
- if (strcmp(tokens[0], "flowapi") == 0) {
- cmd_softnic_flowapi_map(softnic, tokens, n_tokens, out,
- out_size);
- return;
- }
-
snprintf(out, out_size, MSG_CMD_UNKNOWN, tokens[0]);
}
diff --git a/drivers/net/softnic/rte_eth_softnic_flow.c
b/drivers/net/softnic/rte_eth_softnic_flow.c
deleted file mode 100644
index ad96288e7e..00
--- a/drivers/net/softnic/rte_eth_softnic_flow.c
+++ /dev/null
@@ -1,2293 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
[PATCH V3 03/21] net/softnic: remove the meter support
Remove the Ethernet device meter API support.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build | 1 -
drivers/net/softnic/rte_eth_softnic.c | 16 -
.../net/softnic/rte_eth_softnic_internals.h | 117 ---
drivers/net/softnic/rte_eth_softnic_meter.c | 945 --
.../net/softnic/rte_eth_softnic_pipeline.c| 12 -
5 files changed, 1091 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_meter.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index 4ebe60921c..d466dc7700 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -15,7 +15,6 @@ sources = files(
'rte_eth_softnic_cryptodev.c',
'rte_eth_softnic_link.c',
'rte_eth_softnic_mempool.c',
-'rte_eth_softnic_meter.c',
'rte_eth_softnic_pipeline.c',
'rte_eth_softnic_swq.c',
'rte_eth_softnic_tap.c',
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index 8e361adbad..a7136bb0c0 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -13,7 +13,6 @@
#include
#include
#include
-#include
#include "rte_eth_softnic.h"
#include "rte_eth_softnic_internals.h"
@@ -168,8 +167,6 @@ pmd_dev_stop(struct rte_eth_dev *dev)
softnic_softnic_swq_free_keep_rxq_txq(p);
softnic_mempool_free(p);
- softnic_mtr_free(p);
-
return 0;
}
@@ -191,8 +188,6 @@ pmd_free(struct pmd_internals *p)
softnic_swq_free(p);
softnic_mempool_free(p);
- softnic_mtr_free(p);
-
rte_free(p);
}
@@ -215,14 +210,6 @@ pmd_link_update(struct rte_eth_dev *dev __rte_unused,
return 0;
}
-static int
-pmd_mtr_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
-{
- *(const struct rte_mtr_ops **)arg = &pmd_mtr_ops;
-
- return 0;
-}
-
static const struct eth_dev_ops pmd_ops = {
.dev_configure = pmd_dev_configure,
.dev_start = pmd_dev_start,
@@ -232,7 +219,6 @@ static const struct eth_dev_ops pmd_ops = {
.dev_infos_get = pmd_dev_infos_get,
.rx_queue_setup = pmd_rx_queue_setup,
.tx_queue_setup = pmd_tx_queue_setup,
- .mtr_ops_get = pmd_mtr_ops_get,
};
static uint16_t
@@ -274,8 +260,6 @@ pmd_init(struct pmd_params *params)
memcpy(&p->params, params, sizeof(p->params));
/* Resources */
- softnic_mtr_init(p);
-
softnic_mempool_init(p);
softnic_swq_init(p);
softnic_link_init(p);
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index 4cc98b7aad..d578cb1f25 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -19,8 +19,6 @@
#include
#include
-#include
-#include
#include "rte_eth_softnic.h"
#include "conn.h"
@@ -40,68 +38,6 @@ struct pmd_params {
int sc; /**< Service cores. */
};
-/**
- * Ethdev Flow API
- */
-struct rte_flow;
-
-TAILQ_HEAD(flow_list, rte_flow);
-
-struct flow_attr_map {
- char pipeline_name[NAME_SIZE];
- uint32_t table_id;
- int valid;
-};
-
-#ifndef SOFTNIC_FLOW_MAX_GROUPS
-#define SOFTNIC_FLOW_MAX_GROUPS64
-#endif
-
-struct flow_internals {
- struct flow_attr_map ingress_map[SOFTNIC_FLOW_MAX_GROUPS];
- struct flow_attr_map egress_map[SOFTNIC_FLOW_MAX_GROUPS];
-};
-
-/**
- * Meter
- */
-
-/* MTR meter profile */
-struct softnic_mtr_meter_profile {
- TAILQ_ENTRY(softnic_mtr_meter_profile) node;
- uint32_t meter_profile_id;
- struct rte_mtr_meter_profile params;
- uint32_t n_users;
-};
-
-TAILQ_HEAD(softnic_mtr_meter_profile_list, softnic_mtr_meter_profile);
-
-/* MTR meter policy */
-struct softnic_mtr_meter_policy {
- TAILQ_ENTRY(softnic_mtr_meter_policy) node;
- uint32_t meter_policy_id;
- enum rte_table_action_policer policer[RTE_COLORS];
- uint32_t n_users;
-};
-
-TAILQ_HEAD(softnic_mtr_meter_policy_list, softnic_mtr_meter_policy);
-
-/* MTR meter object */
-struct softnic_mtr {
- TAILQ_ENTRY(softnic_mtr) node;
- uint32_t mtr_id;
- struct rte_mtr_params params;
- struct rte_flow *flow;
-};
-
-TAILQ_HEAD(softnic_mtr_list, softnic_mtr);
-
-struct mtr_internals {
- struct softnic_mtr_meter_profile_list meter_profiles;
- struct softnic_mtr_meter_policy_list meter_policies;
- struct softnic_mtr_list mtrs;
-};
-
/**
* MEMPOOL
*/
@@ -383,7 +319,6 @@ struct softnic_table {
struct softnic_table_params params;
struct softnic_table_action_profile *ap;
struct rte_table_action *a;
- struct flow_list flows;
struct rte_table_action_dscp_table dscp_table;
struct softnic_table_meter_profile_list meter_profiles;
};
@@ -481,9 +416,6 @@ struct pmd_internals {
[PATCH V3 01/21] net/softnic: remove the traffic manager support
Remove the Ethernet device traffic manager API support.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build |3 +-
drivers/net/softnic/rte_eth_softnic.c | 170 -
drivers/net/softnic/rte_eth_softnic.h | 10 -
drivers/net/softnic/rte_eth_softnic_cli.c | 1328 --
.../net/softnic/rte_eth_softnic_internals.h | 176 -
.../net/softnic/rte_eth_softnic_pipeline.c| 31 -
drivers/net/softnic/rte_eth_softnic_tm.c | 3645 -
7 files changed, 1 insertion(+), 5362 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_tm.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index aff5fb3bf2..e2dbd6166e 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -21,6 +21,5 @@ sources = files(
'rte_eth_softnic_swq.c',
'rte_eth_softnic_tap.c',
'rte_eth_softnic_thread.c',
-'rte_eth_softnic_tm.c',
)
-deps += ['pipeline', 'port', 'table', 'sched', 'cryptodev']
+deps += ['pipeline', 'port', 'table', 'cryptodev']
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index 8c098cad5b..ae3e8b3bcd 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -13,7 +13,6 @@
#include
#include
#include
-#include
#include
#include "rte_eth_softnic.h"
@@ -23,20 +22,6 @@
#define PMD_PARAM_CONN_PORT"conn_port"
#define PMD_PARAM_CPU_ID "cpu_id"
#define PMD_PARAM_SC "sc"
-#define PMD_PARAM_TM_N_QUEUES "tm_n_queues"
-#define PMD_PARAM_TM_QSIZE0"tm_qsize0"
-#define PMD_PARAM_TM_QSIZE1"tm_qsize1"
-#define PMD_PARAM_TM_QSIZE2"tm_qsize2"
-#define PMD_PARAM_TM_QSIZE3"tm_qsize3"
-#define PMD_PARAM_TM_QSIZE4"tm_qsize4"
-#define PMD_PARAM_TM_QSIZE5"tm_qsize5"
-#define PMD_PARAM_TM_QSIZE6"tm_qsize6"
-#define PMD_PARAM_TM_QSIZE7"tm_qsize7"
-#define PMD_PARAM_TM_QSIZE8"tm_qsize8"
-#define PMD_PARAM_TM_QSIZE9"tm_qsize9"
-#define PMD_PARAM_TM_QSIZE10 "tm_qsize10"
-#define PMD_PARAM_TM_QSIZE11 "tm_qsize11"
-#define PMD_PARAM_TM_QSIZE12 "tm_qsize12"
static const char * const pmd_valid_args[] = {
@@ -44,20 +29,6 @@ static const char * const pmd_valid_args[] = {
PMD_PARAM_CONN_PORT,
PMD_PARAM_CPU_ID,
PMD_PARAM_SC,
- PMD_PARAM_TM_N_QUEUES,
- PMD_PARAM_TM_QSIZE0,
- PMD_PARAM_TM_QSIZE1,
- PMD_PARAM_TM_QSIZE2,
- PMD_PARAM_TM_QSIZE3,
- PMD_PARAM_TM_QSIZE4,
- PMD_PARAM_TM_QSIZE5,
- PMD_PARAM_TM_QSIZE6,
- PMD_PARAM_TM_QSIZE7,
- PMD_PARAM_TM_QSIZE8,
- PMD_PARAM_TM_QSIZE9,
- PMD_PARAM_TM_QSIZE10,
- PMD_PARAM_TM_QSIZE11,
- PMD_PARAM_TM_QSIZE12,
NULL
};
@@ -193,12 +164,10 @@ pmd_dev_stop(struct rte_eth_dev *dev)
softnic_table_action_profile_free(p);
softnic_port_in_action_profile_free(p);
softnic_tap_free(p);
- softnic_tmgr_free(p);
softnic_link_free(p);
softnic_softnic_swq_free_keep_rxq_txq(p);
softnic_mempool_free(p);
- tm_hierarchy_free(p);
softnic_mtr_free(p);
return 0;
@@ -218,12 +187,10 @@ pmd_free(struct pmd_internals *p)
softnic_table_action_profile_free(p);
softnic_port_in_action_profile_free(p);
softnic_tap_free(p);
- softnic_tmgr_free(p);
softnic_link_free(p);
softnic_swq_free(p);
softnic_mempool_free(p);
- tm_hierarchy_free(p);
softnic_mtr_free(p);
rte_free(p);
@@ -256,14 +223,6 @@ pmd_flow_ops_get(struct rte_eth_dev *dev __rte_unused,
return 0;
}
-static int
-pmd_tm_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
-{
- *(const struct rte_tm_ops **)arg = &pmd_tm_ops;
-
- return 0;
-}
-
static int
pmd_mtr_ops_get(struct rte_eth_dev *dev __rte_unused, void *arg)
{
@@ -282,7 +241,6 @@ static const struct eth_dev_ops pmd_ops = {
.rx_queue_setup = pmd_rx_queue_setup,
.tx_queue_setup = pmd_tx_queue_setup,
.flow_ops_get = pmd_flow_ops_get,
- .tm_ops_get = pmd_tm_ops_get,
.mtr_ops_get = pmd_mtr_ops_get,
};
@@ -325,13 +283,11 @@ pmd_init(struct pmd_params *params)
memcpy(&p->params, params, sizeof(p->params));
/* Resources */
- tm_hierarchy_init(p);
softnic_mtr_init(p);
softnic_mempool_init(p);
softnic_swq_init(p);
[PATCH V3 04/21] net/softnic: remove cryptodev support
Remove the cryptographic device API support.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build | 3 +-
drivers/net/softnic/rte_eth_softnic.c | 1 -
drivers/net/softnic/rte_eth_softnic_cli.c | 171 --
.../net/softnic/rte_eth_softnic_cryptodev.c | 168 -
.../net/softnic/rte_eth_softnic_internals.h | 54 --
.../net/softnic/rte_eth_softnic_pipeline.c| 54 --
6 files changed, 1 insertion(+), 450 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_cryptodev.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index d466dc7700..b3d235841d 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -12,7 +12,6 @@ sources = files(
'rte_eth_softnic.c',
'rte_eth_softnic_action.c',
'rte_eth_softnic_cli.c',
-'rte_eth_softnic_cryptodev.c',
'rte_eth_softnic_link.c',
'rte_eth_softnic_mempool.c',
'rte_eth_softnic_pipeline.c',
@@ -20,4 +19,4 @@ sources = files(
'rte_eth_softnic_tap.c',
'rte_eth_softnic_thread.c',
)
-deps += ['pipeline', 'port', 'table', 'cryptodev']
+deps += ['pipeline', 'port', 'table']
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index a7136bb0c0..1ea5989223 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -264,7 +264,6 @@ pmd_init(struct pmd_params *params)
softnic_swq_init(p);
softnic_link_init(p);
softnic_tap_init(p);
- softnic_cryptodev_init(p);
softnic_port_in_action_profile_init(p);
softnic_table_action_profile_init(p);
softnic_pipeline_init(p);
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 671f96cf77..bca0b176d6 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -213,80 +213,6 @@ cmd_tap(struct pmd_internals *softnic,
}
}
-/**
- * cryptodev dev | dev_id
- * queue max_sessions
- **/
-
-static void
-cmd_cryptodev(struct pmd_internals *softnic,
- char **tokens,
- uint32_t n_tokens,
- char *out,
- size_t out_size)
-{
- struct softnic_cryptodev_params params;
- char *name;
-
- memset(¶ms, 0, sizeof(params));
- if (n_tokens != 9) {
- snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
- return;
- }
-
- name = tokens[1];
-
- if (strcmp(tokens[2], "dev") == 0)
- params.dev_name = tokens[3];
- else if (strcmp(tokens[2], "dev_id") == 0) {
- if (softnic_parser_read_uint32(¶ms.dev_id, tokens[3]) < 0) {
- snprintf(out, out_size, MSG_ARG_INVALID,
- "dev_id");
- return;
- }
- } else {
- snprintf(out, out_size, MSG_ARG_INVALID,
- "cryptodev");
- return;
- }
-
- if (strcmp(tokens[4], "queue")) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND,
- "4");
- return;
- }
-
- if (softnic_parser_read_uint32(¶ms.n_queues, tokens[5]) < 0) {
- snprintf(out, out_size, MSG_ARG_INVALID,
- "q");
- return;
- }
-
- if (softnic_parser_read_uint32(¶ms.queue_size, tokens[6]) < 0) {
- snprintf(out, out_size, MSG_ARG_INVALID,
- "queue_size");
- return;
- }
-
- if (strcmp(tokens[7], "max_sessions")) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND,
- "4");
- return;
- }
-
- if (softnic_parser_read_uint32(¶ms.session_pool_size, tokens[8])
- < 0) {
- snprintf(out, out_size, MSG_ARG_INVALID,
- "q");
- return;
- }
-
- if (softnic_cryptodev_create(softnic, name, ¶ms) == NULL) {
- snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
- return;
- }
-}
-
/**
* port in action profile
* [filter match | mismatch offset mask key
port ]
@@ -879,41 +805,6 @@ cmd_table_action_profile(struct pmd_internals *softnic,
t0 += 1;
} /* decap */
- if (t0 < n_tokens && (strcmp(tokens[t0], "sym_crypto") == 0)) {
- struct softnic_cryptodev *cryptodev;
-
- if (n_tokens < t0 + 5 ||
- strcmp(tokens[t0 + 1], "dev") ||
- strcmp(tokens[t0 + 3], "offset")) {
- snprintf(out, out_size, MSG_ARG_MISMATCH,
- "table action profile sym_crypto");
- return;
-
[PATCH V3 05/21] net/softnic: remove tap support
Remove the TUN/TAP device support. The TUN/TAP devices are still
supported as virtual Ethernet devices through the TAP Poll Mode
Driver.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build | 1 -
drivers/net/softnic/rte_eth_softnic.c | 3 -
drivers/net/softnic/rte_eth_softnic_cli.c | 76 ---
.../net/softnic/rte_eth_softnic_internals.h | 36 --
.../net/softnic/rte_eth_softnic_pipeline.c| 44 ---
drivers/net/softnic/rte_eth_softnic_tap.c | 118 --
6 files changed, 278 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_tap.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index b3d235841d..91f1f3220f 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -16,7 +16,6 @@ sources = files(
'rte_eth_softnic_mempool.c',
'rte_eth_softnic_pipeline.c',
'rte_eth_softnic_swq.c',
-'rte_eth_softnic_tap.c',
'rte_eth_softnic_thread.c',
)
deps += ['pipeline', 'port', 'table']
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index 1ea5989223..eb97ae7185 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -162,7 +162,6 @@ pmd_dev_stop(struct rte_eth_dev *dev)
softnic_pipeline_free(p);
softnic_table_action_profile_free(p);
softnic_port_in_action_profile_free(p);
- softnic_tap_free(p);
softnic_link_free(p);
softnic_softnic_swq_free_keep_rxq_txq(p);
softnic_mempool_free(p);
@@ -183,7 +182,6 @@ pmd_free(struct pmd_internals *p)
softnic_pipeline_free(p);
softnic_table_action_profile_free(p);
softnic_port_in_action_profile_free(p);
- softnic_tap_free(p);
softnic_link_free(p);
softnic_swq_free(p);
softnic_mempool_free(p);
@@ -263,7 +261,6 @@ pmd_init(struct pmd_params *params)
softnic_mempool_init(p);
softnic_swq_init(p);
softnic_link_init(p);
- softnic_tap_init(p);
softnic_port_in_action_profile_init(p);
softnic_table_action_profile_init(p);
softnic_pipeline_init(p);
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index bca0b176d6..501ef08c4c 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -186,33 +186,6 @@ cmd_swq(struct pmd_internals *softnic,
}
}
-/**
- * tap
- */
-static void
-cmd_tap(struct pmd_internals *softnic,
- char **tokens,
- uint32_t n_tokens,
- char *out,
- size_t out_size)
-{
- char *name;
- struct softnic_tap *tap;
-
- if (n_tokens != 2) {
- snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
- return;
- }
-
- name = tokens[1];
-
- tap = softnic_tap_create(softnic, name);
- if (tap == NULL) {
- snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
- return;
- }
-}
-
/**
* port in action profile
* [filter match | mismatch offset mask key
port ]
@@ -874,7 +847,6 @@ cmd_pipeline(struct pmd_internals *softnic,
* bsz
* link rxq
* | swq
- * | tap mempool mtu
* | source mempool file bpp
* [action ]
* [disabled]
@@ -957,38 +929,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
strlcpy(p.dev_name, tokens[t0 + 1], sizeof(p.dev_name));
t0 += 2;
- } else if (strcmp(tokens[t0], "tap") == 0) {
- if (n_tokens < t0 + 6) {
- snprintf(out, out_size, MSG_ARG_MISMATCH,
- "pipeline port in tap");
- return;
- }
-
- p.type = PORT_IN_TAP;
-
- strlcpy(p.dev_name, tokens[t0 + 1], sizeof(p.dev_name));
-
- if (strcmp(tokens[t0 + 2], "mempool") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND,
- "mempool");
- return;
- }
-
- p.tap.mempool_name = tokens[t0 + 3];
-
- if (strcmp(tokens[t0 + 4], "mtu") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND,
- "mtu");
- return;
- }
-
- if (softnic_parser_read_uint32(&p.tap.mtu,
- tokens[t0 + 5]) != 0) {
- snprintf(out, out_size, MSG_ARG_INVALID, "mtu");
- return;
- }
-
- t0 += 6;
} else if (strcmp(tokens[t0], "source") == 0) {
if (n_tokens < t0 + 6) {
snprintf(out, out_size, MSG_ARG_MISMATCH,
@@ -1074,7 +1014,6 @@ cmd_pipeline_port_in(struct pmd_internals *softnic,
* bsz
* li
[PATCH V3 07/21] net/softnic: replace the legacy pipeline with the SWX pipeline
Replace the legacy pipeline support with support for the SWX pipeline.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build |1 -
drivers/net/softnic/rte_eth_softnic.c |6 -
drivers/net/softnic/rte_eth_softnic_action.c | 423 ---
drivers/net/softnic/rte_eth_softnic_cli.c | 16 +-
.../net/softnic/rte_eth_softnic_internals.h | 502 +---
.../net/softnic/rte_eth_softnic_pipeline.c| 988 +--
drivers/net/softnic/rte_eth_softnic_thread.c | 2594 +
7 files changed, 216 insertions(+), 4314 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_action.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index 91f1f3220f..f0cfc6dc17 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -10,7 +10,6 @@ sources = files(
'conn.c',
'parser.c',
'rte_eth_softnic.c',
-'rte_eth_softnic_action.c',
'rte_eth_softnic_cli.c',
'rte_eth_softnic_link.c',
'rte_eth_softnic_mempool.c',
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index eb97ae7185..a940952c7a 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -160,8 +160,6 @@ pmd_dev_stop(struct rte_eth_dev *dev)
/* Firmware */
softnic_pipeline_disable_all(p);
softnic_pipeline_free(p);
- softnic_table_action_profile_free(p);
- softnic_port_in_action_profile_free(p);
softnic_link_free(p);
softnic_softnic_swq_free_keep_rxq_txq(p);
softnic_mempool_free(p);
@@ -180,8 +178,6 @@ pmd_free(struct pmd_internals *p)
softnic_thread_free(p);
softnic_pipeline_free(p);
- softnic_table_action_profile_free(p);
- softnic_port_in_action_profile_free(p);
softnic_link_free(p);
softnic_swq_free(p);
softnic_mempool_free(p);
@@ -261,8 +257,6 @@ pmd_init(struct pmd_params *params)
softnic_mempool_init(p);
softnic_swq_init(p);
softnic_link_init(p);
- softnic_port_in_action_profile_init(p);
- softnic_table_action_profile_init(p);
softnic_pipeline_init(p);
status = softnic_thread_init(p);
diff --git a/drivers/net/softnic/rte_eth_softnic_action.c
b/drivers/net/softnic/rte_eth_softnic_action.c
deleted file mode 100644
index 33be9552a6..00
--- a/drivers/net/softnic/rte_eth_softnic_action.c
+++ /dev/null
@@ -1,423 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2010-2018 Intel Corporation
- */
-
-#include
-#include
-#include
-
-#include
-#include
-
-#include "rte_eth_softnic_internals.h"
-
-/**
- * Input port
- */
-int
-softnic_port_in_action_profile_init(struct pmd_internals *p)
-{
- TAILQ_INIT(&p->port_in_action_profile_list);
-
- return 0;
-}
-
-void
-softnic_port_in_action_profile_free(struct pmd_internals *p)
-{
- for ( ; ; ) {
- struct softnic_port_in_action_profile *profile;
-
- profile = TAILQ_FIRST(&p->port_in_action_profile_list);
- if (profile == NULL)
- break;
-
- TAILQ_REMOVE(&p->port_in_action_profile_list, profile, node);
- free(profile);
- }
-}
-
-struct softnic_port_in_action_profile *
-softnic_port_in_action_profile_find(struct pmd_internals *p,
- const char *name)
-{
- struct softnic_port_in_action_profile *profile;
-
- if (name == NULL)
- return NULL;
-
- TAILQ_FOREACH(profile, &p->port_in_action_profile_list, node)
- if (strcmp(profile->name, name) == 0)
- return profile;
-
- return NULL;
-}
-
-struct softnic_port_in_action_profile *
-softnic_port_in_action_profile_create(struct pmd_internals *p,
- const char *name,
- struct softnic_port_in_action_profile_params *params)
-{
- struct softnic_port_in_action_profile *profile;
- struct rte_port_in_action_profile *ap;
- int status;
-
- /* Check input params */
- if (name == NULL ||
- softnic_port_in_action_profile_find(p, name) ||
- params == NULL)
- return NULL;
-
- if ((params->action_mask & (1LLU << RTE_PORT_IN_ACTION_LB)) &&
- params->lb.f_hash == NULL) {
- switch (params->lb.key_size) {
- case 8:
- params->lb.f_hash = rte_table_hash_crc_key8;
- break;
-
- case 16:
- params->lb.f_hash = rte_table_hash_crc_key16;
- break;
-
- case 24:
- params->lb.f_hash = rte_table_hash_crc_key24;
- break;
-
- case 32:
- params->lb.f_hash = rte_table_hash_crc_key32;
- break;
-
-
[PATCH V3 06/21] net/softnic: remove the legacy pipeline CLI commands
Remove the legacy pipeline CLI commands.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 4527 -
1 file changed, 4527 deletions(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 501ef08c4c..abe275ec83 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -10,7 +10,6 @@
#include
#include
#include
-#include
#include "rte_eth_softnic_internals.h"
#include "parser.h"
@@ -186,4227 +185,6 @@ cmd_swq(struct pmd_internals *softnic,
}
}
-/**
- * port in action profile
- * [filter match | mismatch offset mask key
port ]
- * [balance offset mask port ...
]
- */
-static void
-cmd_port_in_action_profile(struct pmd_internals *softnic,
- char **tokens,
- uint32_t n_tokens,
- char *out,
- size_t out_size)
-{
- struct softnic_port_in_action_profile_params p;
- struct softnic_port_in_action_profile *ap;
- char *name;
- uint32_t t0;
-
- memset(&p, 0, sizeof(p));
-
- if (n_tokens < 5) {
- snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
- return;
- }
-
- if (strcmp(tokens[1], "in") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "in");
- return;
- }
-
- if (strcmp(tokens[2], "action") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "action");
- return;
- }
-
- if (strcmp(tokens[3], "profile") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "profile");
- return;
- }
-
- name = tokens[4];
-
- t0 = 5;
-
- if (t0 < n_tokens &&
- (strcmp(tokens[t0], "filter") == 0)) {
- uint32_t size;
-
- if (n_tokens < t0 + 10) {
- snprintf(out, out_size, MSG_ARG_MISMATCH, "port in
action profile filter");
- return;
- }
-
- if (strcmp(tokens[t0 + 1], "match") == 0) {
- p.fltr.filter_on_match = 1;
- } else if (strcmp(tokens[t0 + 1], "mismatch") == 0) {
- p.fltr.filter_on_match = 0;
- } else {
- snprintf(out, out_size, MSG_ARG_INVALID, "match or
mismatch");
- return;
- }
-
- if (strcmp(tokens[t0 + 2], "offset") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "offset");
- return;
- }
-
- if (softnic_parser_read_uint32(&p.fltr.key_offset,
- tokens[t0 + 3]) != 0) {
- snprintf(out, out_size, MSG_ARG_INVALID, "key_offset");
- return;
- }
-
- if (strcmp(tokens[t0 + 4], "mask") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "mask");
- return;
- }
-
- size = RTE_PORT_IN_ACTION_FLTR_KEY_SIZE;
- if ((softnic_parse_hex_string(tokens[t0 + 5],
- p.fltr.key_mask, &size) != 0) ||
- size != RTE_PORT_IN_ACTION_FLTR_KEY_SIZE) {
- snprintf(out, out_size, MSG_ARG_INVALID, "key_mask");
- return;
- }
-
- if (strcmp(tokens[t0 + 6], "key") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "key");
- return;
- }
-
- size = RTE_PORT_IN_ACTION_FLTR_KEY_SIZE;
- if ((softnic_parse_hex_string(tokens[t0 + 7],
- p.fltr.key, &size) != 0) ||
- size != RTE_PORT_IN_ACTION_FLTR_KEY_SIZE) {
- snprintf(out, out_size, MSG_ARG_INVALID, "key_value");
- return;
- }
-
- if (strcmp(tokens[t0 + 8], "port") != 0) {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
- return;
- }
-
- if (softnic_parser_read_uint32(&p.fltr.port_id,
- tokens[t0 + 9]) != 0) {
- snprintf(out, out_size, MSG_ARG_INVALID, "port_id");
- return;
- }
-
- p.action_mask |= 1LLU << RTE_PORT_IN_ACTION_FLTR;
- t0 += 10;
- } /* filter */
-
- if (t0 < n_tokens &&
- (strcmp(tokens[t0], "balance") == 0)) {
- uint32_t i;
-
- if (n_tokens < t0 + 22) {
- snprintf(out, out_size, MSG_ARG_MISMATCH,
- "port in action profile balance");
- return;
- }
-
- if (strcmp(tokens[t0 + 1], "offset") != 0) {
-
[PATCH V3 08/21] net/softnic: remove the list of Ethernet devices
The list of Ethernet devices within this driver is redundant, as the
DPDK global list of Ethernet devices can be used instead.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build | 1 -
drivers/net/softnic/rte_eth_softnic.c | 3 -
drivers/net/softnic/rte_eth_softnic_cli.c | 49 -
.../net/softnic/rte_eth_softnic_internals.h | 37 ---
drivers/net/softnic/rte_eth_softnic_link.c| 101 --
5 files changed, 191 deletions(-)
delete mode 100644 drivers/net/softnic/rte_eth_softnic_link.c
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index f0cfc6dc17..0ffe26d671 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -11,7 +11,6 @@ sources = files(
'parser.c',
'rte_eth_softnic.c',
'rte_eth_softnic_cli.c',
-'rte_eth_softnic_link.c',
'rte_eth_softnic_mempool.c',
'rte_eth_softnic_pipeline.c',
'rte_eth_softnic_swq.c',
diff --git a/drivers/net/softnic/rte_eth_softnic.c
b/drivers/net/softnic/rte_eth_softnic.c
index a940952c7a..b1f4edd629 100644
--- a/drivers/net/softnic/rte_eth_softnic.c
+++ b/drivers/net/softnic/rte_eth_softnic.c
@@ -160,7 +160,6 @@ pmd_dev_stop(struct rte_eth_dev *dev)
/* Firmware */
softnic_pipeline_disable_all(p);
softnic_pipeline_free(p);
- softnic_link_free(p);
softnic_softnic_swq_free_keep_rxq_txq(p);
softnic_mempool_free(p);
@@ -178,7 +177,6 @@ pmd_free(struct pmd_internals *p)
softnic_thread_free(p);
softnic_pipeline_free(p);
- softnic_link_free(p);
softnic_swq_free(p);
softnic_mempool_free(p);
@@ -256,7 +254,6 @@ pmd_init(struct pmd_params *params)
/* Resources */
softnic_mempool_init(p);
softnic_swq_init(p);
- softnic_link_init(p);
softnic_pipeline_init(p);
status = softnic_thread_init(p);
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 2b00b65c6c..ec9ac133b9 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -102,50 +102,6 @@ cmd_mempool(struct pmd_internals *softnic,
}
}
-/**
- * link
- *dev | port
- */
-static void
-cmd_link(struct pmd_internals *softnic,
- char **tokens,
- uint32_t n_tokens,
- char *out,
- size_t out_size)
-{
- struct softnic_link_params p;
- struct softnic_link *link;
- char *name;
-
- memset(&p, 0, sizeof(p));
-
- if (n_tokens != 4) {
- snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
- return;
- }
- name = tokens[1];
-
- if (strcmp(tokens[2], "dev") == 0) {
- p.dev_name = tokens[3];
- } else if (strcmp(tokens[2], "port") == 0) {
- p.dev_name = NULL;
-
- if (softnic_parser_read_uint16(&p.port_id, tokens[3]) != 0) {
- snprintf(out, out_size, MSG_ARG_INVALID, "port_id");
- return;
- }
- } else {
- snprintf(out, out_size, MSG_ARG_NOT_FOUND, "dev or port");
- return;
- }
-
- link = softnic_link_create(softnic, name, &p);
- if (link == NULL) {
- snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
- return;
- }
-}
-
/**
* swq
* size
@@ -309,11 +265,6 @@ softnic_cli_process(char *in, char *out, size_t out_size,
void *arg)
return;
}
- if (strcmp(tokens[0], "link") == 0) {
- cmd_link(softnic, tokens, n_tokens, out, out_size);
- return;
- }
-
if (strcmp(tokens[0], "swq") == 0) {
cmd_swq(softnic, tokens, n_tokens, out, out_size);
return;
diff --git a/drivers/net/softnic/rte_eth_softnic_internals.h
b/drivers/net/softnic/rte_eth_softnic_internals.h
index d817883a39..a1c2309589 100644
--- a/drivers/net/softnic/rte_eth_softnic_internals.h
+++ b/drivers/net/softnic/rte_eth_softnic_internals.h
@@ -70,24 +70,6 @@ struct softnic_swq {
TAILQ_HEAD(softnic_swq_list, softnic_swq);
-/**
- * LINK
- */
-struct softnic_link_params {
- const char *dev_name;
- uint16_t port_id; /**< Valid only when *dev_name* is NULL. */
-};
-
-struct softnic_link {
- TAILQ_ENTRY(softnic_link) node;
- char name[NAME_SIZE];
- uint16_t port_id;
- uint32_t n_rxq;
- uint32_t n_txq;
-};
-
-TAILQ_HEAD(softnic_link_list, softnic_link);
-
/**
* Pipeline
*/
@@ -162,7 +144,6 @@ struct pmd_internals {
struct softnic_conn *conn;
struct softnic_mempool_list mempool_list;
struct softnic_swq_list swq_list;
- struct softnic_link_list link_list;
struct pipeline_list pipeline_list;
struct softnic_thread thread[RTE_MAX_LCORE];
[PATCH V3 12/21] net/softnic: add pipeline build CLI command
Add CLI command for pipeline build.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 66 +++
1 file changed, 66 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 08cca7a8e4..cf71aa7b96 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -365,6 +365,67 @@ cmd_softnic_pipeline_libbuild(struct pmd_internals
*softnic __rte_unused,
free(buffer);
}
+/**
+ * pipeline build lib io numa
+ */
+static void
+cmd_softnic_pipeline_build(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p = NULL;
+ char *pipeline_name, *lib_file_name, *iospec_file_name;
+ uint32_t numa_node = 0;
+
+ /* Parsing. */
+ if (n_tokens != 9) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+
+ if (strcmp(tokens[2], "build")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "build");
+ return;
+ }
+
+ if (strcmp(tokens[3], "lib")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "lib");
+ return;
+ }
+
+ lib_file_name = tokens[4];
+
+ if (strcmp(tokens[5], "io")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "io");
+ return;
+ }
+
+ iospec_file_name = tokens[6];
+
+ if (strcmp(tokens[7], "numa")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "numa");
+ return;
+ }
+
+ if (parser_read_uint32(&numa_node, tokens[8])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "numa_node");
+ return;
+ }
+
+ /* Pipeline create. */
+ p = softnic_pipeline_create(softnic,
+ pipeline_name,
+ lib_file_name,
+ iospec_file_name,
+ (int)numa_node);
+ if (!p)
+ snprintf(out, out_size, "Pipeline creation failed.\n");
+}
+
/**
* thread pipeline enable [ period
]
*/
@@ -504,6 +565,11 @@ softnic_cli_process(char *in, char *out, size_t out_size,
void *arg)
cmd_softnic_pipeline_libbuild(softnic, tokens,
n_tokens, out, out_size);
return;
}
+
+ if (n_tokens >= 3 && !strcmp(tokens[2], "build")) {
+ cmd_softnic_pipeline_build(softnic, tokens, n_tokens,
out, out_size);
+ return;
+ }
}
if (strcmp(tokens[0], "thread") == 0) {
--
2.34.1
[PATCH V3 10/21] net/softnic: add pipeline code generation CLI command
Add CLI command for pipeline code generation.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 57 ++-
1 file changed, 56 insertions(+), 1 deletion(-)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 9de17fba8f..f2c2721d55 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -180,7 +180,55 @@ cmd_swq(struct pmd_internals *softnic,
}
/**
- * thread pipeline enable
+ * pipeline codegen
+ */
+static void
+cmd_softnic_pipeline_codegen(struct pmd_internals *softnic __rte_unused,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ FILE *spec_file = NULL;
+ FILE *code_file = NULL;
+ uint32_t err_line;
+ const char *err_msg;
+ int status;
+
+ if (n_tokens != 4) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ spec_file = fopen(tokens[2], "r");
+ if (!spec_file) {
+ snprintf(out, out_size, "Cannot open file %s.\n", tokens[2]);
+ return;
+ }
+
+ code_file = fopen(tokens[3], "w");
+ if (!code_file) {
+ snprintf(out, out_size, "Cannot open file %s.\n", tokens[3]);
+ return;
+ }
+
+ status = rte_swx_pipeline_codegen(spec_file,
+ code_file,
+ &err_line,
+ &err_msg);
+
+ fclose(spec_file);
+ fclose(code_file);
+
+ if (status) {
+ snprintf(out, out_size, "Error %d at line %u: %s\n.",
+ status, err_line, err_msg);
+ return;
+ }
+}
+
+/**
+ * thread pipeline enable [ period
]
*/
static void
cmd_softnic_thread_pipeline_enable(struct pmd_internals *softnic,
@@ -308,6 +356,13 @@ softnic_cli_process(char *in, char *out, size_t out_size,
void *arg)
return;
}
+ if (!strcmp(tokens[0], "pipeline")) {
+ if (n_tokens >= 2 && !strcmp(tokens[1], "codegen")) {
+ cmd_softnic_pipeline_codegen(softnic, tokens, n_tokens,
out, out_size);
+ return;
+ }
+ }
+
if (strcmp(tokens[0], "thread") == 0) {
if (n_tokens >= 5 &&
(strcmp(tokens[4], "enable") == 0)) {
--
2.34.1
[PATCH V3 09/21] net/softnic: remove unused text parsing functions
Remove the text parsing functions that are not used.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/meson.build | 1 -
drivers/net/softnic/parser.c | 523 --
drivers/net/softnic/parser.h | 68 ---
drivers/net/softnic/rte_eth_softnic_cli.c | 54 ++-
4 files changed, 46 insertions(+), 600 deletions(-)
delete mode 100644 drivers/net/softnic/parser.c
delete mode 100644 drivers/net/softnic/parser.h
diff --git a/drivers/net/softnic/meson.build b/drivers/net/softnic/meson.build
index 0ffe26d671..5dfbd16c77 100644
--- a/drivers/net/softnic/meson.build
+++ b/drivers/net/softnic/meson.build
@@ -8,7 +8,6 @@ endif
headers = files('rte_eth_softnic.h')
sources = files(
'conn.c',
-'parser.c',
'rte_eth_softnic.c',
'rte_eth_softnic_cli.c',
'rte_eth_softnic_mempool.c',
diff --git a/drivers/net/softnic/parser.c b/drivers/net/softnic/parser.c
deleted file mode 100644
index ebcb10268a..00
--- a/drivers/net/softnic/parser.c
+++ /dev/null
@@ -1,523 +0,0 @@
-/* SPDX-License-Identifier: BSD-3-Clause
- * Copyright(c) 2016 Intel Corporation.
- * Copyright (c) 2009, Olivier MATZ
- * All rights reserved.
- */
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include
-
-#include "parser.h"
-
-static uint32_t
-get_hex_val(char c)
-{
- switch (c) {
- case '0': case '1': case '2': case '3': case '4': case '5':
- case '6': case '7': case '8': case '9':
- return c - '0';
- case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
- return c - 'A' + 10;
- case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
- return c - 'a' + 10;
- default:
- return 0;
- }
-}
-
-int
-softnic_parser_read_arg_bool(const char *p)
-{
- p = skip_white_spaces(p);
- int result = -EINVAL;
-
- if (((p[0] == 'y') && (p[1] == 'e') && (p[2] == 's')) ||
- ((p[0] == 'Y') && (p[1] == 'E') && (p[2] == 'S'))) {
- p += 3;
- result = 1;
- }
-
- if (((p[0] == 'o') && (p[1] == 'n')) ||
- ((p[0] == 'O') && (p[1] == 'N'))) {
- p += 2;
- result = 1;
- }
-
- if (((p[0] == 'n') && (p[1] == 'o')) ||
- ((p[0] == 'N') && (p[1] == 'O'))) {
- p += 2;
- result = 0;
- }
-
- if (((p[0] == 'o') && (p[1] == 'f') && (p[2] == 'f')) ||
- ((p[0] == 'O') && (p[1] == 'F') && (p[2] == 'F'))) {
- p += 3;
- result = 0;
- }
-
- p = skip_white_spaces(p);
-
- if (p[0] != '\0')
- return -EINVAL;
-
- return result;
-}
-
-int
-softnic_parser_read_int32(int32_t *value, const char *p)
-{
- char *next;
- int32_t val;
-
- p = skip_white_spaces(p);
- if (!isdigit(*p))
- return -EINVAL;
-
- val = strtol(p, &next, 10);
- if (p == next)
- return -EINVAL;
-
- *value = val;
- return 0;
-}
-
-int
-softnic_parser_read_uint64(uint64_t *value, const char *p)
-{
- char *next;
- uint64_t val;
-
- p = skip_white_spaces(p);
- if (!isdigit(*p))
- return -EINVAL;
-
- val = strtoul(p, &next, 10);
- if (p == next)
- return -EINVAL;
-
- p = next;
- switch (*p) {
- case 'T':
- val *= 1024ULL;
- /* fall through */
- case 'G':
- val *= 1024ULL;
- /* fall through */
- case 'M':
- val *= 1024ULL;
- /* fall through */
- case 'k':
- case 'K':
- val *= 1024ULL;
- p++;
- break;
- }
-
- p = skip_white_spaces(p);
- if (*p != '\0')
- return -EINVAL;
-
- *value = val;
- return 0;
-}
-
-int
-softnic_parser_read_uint64_hex(uint64_t *value, const char *p)
-{
- char *next;
- uint64_t val;
-
- p = skip_white_spaces(p);
-
- val = strtoul(p, &next, 16);
- if (p == next)
- return -EINVAL;
-
- p = skip_white_spaces(next);
- if (*p != '\0')
- return -EINVAL;
-
- *value = val;
- return 0;
-}
-
-int
-softnic_parser_read_uint32(uint32_t *value, const char *p)
-{
- uint64_t val = 0;
- int ret = softnic_parser_read_uint64(&val, p);
-
- if (ret < 0)
- return ret;
-
- if (val > UINT32_MAX)
- return -ERANGE;
-
- *value = val;
- return 0;
-}
-
-int
-softnic_parser_read_uint32_hex(uint32_t *value, const char *p)
-{
- uint64_t val = 0;
- int ret = softnic_parser_read_uint64_hex(&val, p);
-
- if (ret < 0)
- return ret;
-
-
[PATCH V3 11/21] net/softnic: add pipeline library build CLI command
Add CLI command for pipeline shared library build.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 143 ++
1 file changed, 143 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index f2c2721d55..08cca7a8e4 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -6,6 +6,7 @@
#include
#include
#include
+#include
#include
#include
@@ -17,6 +18,10 @@
#define CMD_MAX_TOKENS 256
#endif
+#ifndef MAX_LINE_SIZE
+#define MAX_LINE_SIZE 2048
+#endif
+
#define MSG_OUT_OF_MEMORY "Not enough memory.\n"
#define MSG_CMD_UNKNOWN "Unknown command \"%s\".\n"
#define MSG_CMD_UNIMPLEM"Command \"%s\" not implemented.\n"
@@ -227,6 +232,139 @@ cmd_softnic_pipeline_codegen(struct pmd_internals
*softnic __rte_unused,
}
}
+/**
+ * pipeline libbuild
+ */
+static void
+cmd_softnic_pipeline_libbuild(struct pmd_internals *softnic __rte_unused,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ char *code_file, *lib_file, *obj_file = NULL, *log_file = NULL;
+ char *install_dir, *cwd = NULL, *buffer = NULL;
+ size_t length;
+ int status = 0;
+
+ if (n_tokens != 4) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ goto free;
+ }
+
+ install_dir = getenv("RTE_INSTALL_DIR");
+ if (!install_dir) {
+ cwd = malloc(MAX_LINE_SIZE);
+ if (!cwd) {
+ snprintf(out, out_size, MSG_OUT_OF_MEMORY);
+ goto free;
+ }
+
+ install_dir = getcwd(cwd, MAX_LINE_SIZE);
+ if (!install_dir) {
+ snprintf(out, out_size, "Error: Path too long.\n");
+ goto free;
+ }
+ }
+
+ snprintf(out, out_size, "Using DPDK source code from \"%s\".\n",
install_dir);
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ code_file = tokens[2];
+ length = strnlen(code_file, MAX_LINE_SIZE);
+ if (length < 3 ||
+ code_file[length - 2] != '.' ||
+ code_file[length - 1] != 'c') {
+ snprintf(out, out_size, MSG_ARG_INVALID, "code_file");
+ goto free;
+ }
+
+ lib_file = tokens[3];
+ length = strnlen(lib_file, MAX_LINE_SIZE);
+ if (length < 4 ||
+ lib_file[length - 3] != '.' ||
+ lib_file[length - 2] != 's' ||
+ lib_file[length - 1] != 'o') {
+ snprintf(out, out_size, MSG_ARG_INVALID, "lib_file");
+ goto free;
+ }
+
+ obj_file = malloc(length);
+ log_file = malloc(length + 2);
+ if (!obj_file || !log_file) {
+ snprintf(out, out_size, MSG_OUT_OF_MEMORY);
+ goto free;
+ }
+
+ memcpy(obj_file, lib_file, length - 2);
+ obj_file[length - 2] = 'o';
+ obj_file[length - 1] = 0;
+
+ memcpy(log_file, lib_file, length - 2);
+ log_file[length - 2] = 'l';
+ log_file[length - 1] = 'o';
+ log_file[length] = 'g';
+ log_file[length + 1] = 0;
+
+ buffer = malloc(MAX_LINE_SIZE);
+ if (!buffer) {
+ snprintf(out, out_size, MSG_OUT_OF_MEMORY);
+ return;
+ }
+
+ snprintf(buffer,
+MAX_LINE_SIZE,
+"gcc -c -O3 -fpic -Wno-deprecated-declarations -o %s %s "
+"-I %s/lib/pipeline "
+"-I %s/lib/eal/include "
+"-I %s/lib/eal/x86/include "
+"-I %s/lib/eal/include/generic "
+"-I %s/lib/meter "
+"-I %s/lib/port "
+"-I %s/lib/table "
+"-I %s/lib/pipeline "
+"-I %s/config "
+"-I %s/build "
+"-I %s/lib/eal/linux/include "
+">%s 2>&1 "
+"&& "
+"gcc -shared %s -o %s "
+">>%s 2>&1",
+obj_file,
+code_file,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+install_dir,
+log_file,
+obj_file,
+lib_file,
+log_file);
+
+ status = system(buffer);
+ if (status) {
+ snprintf(out,
+out_size,
+"Library build failed, see file \"%s\" for details.\n",
+log_file);
+ goto free;
+ }
+
+free:
+ free(cwd);
+ free(obj_file);
+ fr
[PATCH V3 13/21] net/softnic: add pipeline table CLI commands
Add CLI commands for pipeline table entry management.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 370 ++
1 file changed, 370 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index cf71aa7b96..4443b62009 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -426,6 +426,354 @@ cmd_softnic_pipeline_build(struct pmd_internals *softnic,
snprintf(out, out_size, "Pipeline creation failed.\n");
}
+static void
+table_entry_free(struct rte_swx_table_entry *entry)
+{
+ if (!entry)
+ return;
+
+ free(entry->key);
+ free(entry->key_mask);
+ free(entry->action_data);
+ free(entry);
+}
+
+static int
+pipeline_table_entries_add(struct rte_swx_ctl_pipeline *p,
+ const char *table_name,
+ FILE *file,
+ uint32_t *file_line_number)
+{
+ char *line = NULL;
+ uint32_t line_id = 0;
+ int status = 0;
+
+ /* Buffer allocation. */
+ line = malloc(MAX_LINE_SIZE);
+ if (!line)
+ return -ENOMEM;
+
+ /* File read. */
+ for (line_id = 1; ; line_id++) {
+ struct rte_swx_table_entry *entry;
+ int is_blank_or_comment;
+
+ if (fgets(line, MAX_LINE_SIZE, file) == NULL)
+ break;
+
+ entry = rte_swx_ctl_pipeline_table_entry_read(p,
+ table_name,
+ line,
+
&is_blank_or_comment);
+ if (!entry) {
+ if (is_blank_or_comment)
+ continue;
+
+ status = -EINVAL;
+ goto error;
+ }
+
+ status = rte_swx_ctl_pipeline_table_entry_add(p,
+ table_name,
+ entry);
+ table_entry_free(entry);
+ if (status)
+ goto error;
+ }
+
+error:
+ free(line);
+ *file_line_number = line_id;
+ return status;
+}
+
+/**
+ * pipeline table add
+ */
+static void
+cmd_softnic_pipeline_table_add(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ char *pipeline_name, *table_name, *file_name;
+ FILE *file = NULL;
+ uint32_t file_line_number = 0;
+ int status;
+
+ if (n_tokens != 6) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ table_name = tokens[3];
+
+ file_name = tokens[5];
+ file = fopen(file_name, "r");
+ if (!file) {
+ snprintf(out, out_size, "Cannot open file %s.\n", file_name);
+ return;
+ }
+
+ status = pipeline_table_entries_add(p->ctl,
+ table_name,
+ file,
+ &file_line_number);
+ if (status)
+ snprintf(out, out_size, "Invalid entry in file %s at line %u\n",
+file_name,
+file_line_number);
+
+ fclose(file);
+}
+
+static int
+pipeline_table_entries_delete(struct rte_swx_ctl_pipeline *p,
+ const char *table_name,
+ FILE *file,
+ uint32_t *file_line_number)
+{
+ char *line = NULL;
+ uint32_t line_id = 0;
+ int status = 0;
+
+ /* Buffer allocation. */
+ line = malloc(MAX_LINE_SIZE);
+ if (!line)
+ return -ENOMEM;
+
+ /* File read. */
+ for (line_id = 1; ; line_id++) {
+ struct rte_swx_table_entry *entry;
+ int is_blank_or_comment;
+
+ if (fgets(line, MAX_LINE_SIZE, file) == NULL)
+ break;
+
+ entry = rte_swx_ctl_pipeline_table_entry_read(p,
+ table_name,
+ line,
+
&is_blank_or_comment);
+ if (!entry) {
+ if (is_blank_or_comment)
+ continue;
+
+
[PATCH V3 15/21] net/softnic: add pipeline learner table CLI commands
Add CLI command for managing the learner table default entry.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 106 ++
1 file changed, 106 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 1e92e251aa..4b7d001033 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1245,6 +1245,104 @@ cmd_softnic_pipeline_selector_show(struct pmd_internals
*softnic,
fclose(file);
}
+static int
+pipeline_learner_default_entry_add(struct rte_swx_ctl_pipeline *p,
+ const char *learner_name,
+ FILE *file,
+ uint32_t *file_line_number)
+{
+ char *line = NULL;
+ uint32_t line_id = 0;
+ int status = 0;
+
+ /* Buffer allocation. */
+ line = malloc(MAX_LINE_SIZE);
+ if (!line)
+ return -ENOMEM;
+
+ /* File read. */
+ for (line_id = 1; ; line_id++) {
+ struct rte_swx_table_entry *entry;
+ int is_blank_or_comment;
+
+ if (fgets(line, MAX_LINE_SIZE, file) == NULL)
+ break;
+
+ entry = rte_swx_ctl_pipeline_learner_default_entry_read(p,
+
learner_name,
+ line,
+
&is_blank_or_comment);
+ if (!entry) {
+ if (is_blank_or_comment)
+ continue;
+
+ status = -EINVAL;
+ goto error;
+ }
+
+ status = rte_swx_ctl_pipeline_learner_default_entry_add(p,
+
learner_name,
+ entry);
+ table_entry_free(entry);
+ if (status)
+ goto error;
+ }
+
+error:
+ *file_line_number = line_id;
+ free(line);
+ return status;
+}
+
+/**
+ * pipeline learner default
+ */
+static void
+cmd_softnic_pipeline_learner_default(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ char *pipeline_name, *learner_name, *file_name;
+ FILE *file = NULL;
+ uint32_t file_line_number = 0;
+ int status;
+
+ if (n_tokens != 6) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ learner_name = tokens[3];
+
+ file_name = tokens[5];
+ file = fopen(file_name, "r");
+ if (!file) {
+ snprintf(out, out_size, "Cannot open file %s.\n", file_name);
+ return;
+ }
+
+ status = pipeline_learner_default_entry_add(p->ctl,
+ learner_name,
+ file,
+ &file_line_number);
+ if (status)
+ snprintf(out, out_size, "Invalid entry in file %s at line %u\n",
+file_name,
+file_line_number);
+
+ fclose(file);
+}
+
/**
* thread pipeline enable [ period
]
*/
@@ -1457,6 +1555,14 @@ softnic_cli_process(char *in, char *out, size_t
out_size, void *arg)
out, out_size);
return;
}
+
+ if (n_tokens >= 5 &&
+ !strcmp(tokens[2], "learner") &&
+ !strcmp(tokens[4], "default")) {
+ cmd_softnic_pipeline_learner_default(softnic, tokens,
n_tokens,
+ out, out_size);
+ return;
+ }
}
if (strcmp(tokens[0], "thread") == 0) {
--
2.34.1
[PATCH V3 17/21] net/softnic: add the pipeline register read/write CLI commands
Add CLI commands for pipeline registers read and write operations.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 127 ++
1 file changed, 127 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 7c25a502ec..b1f7460f47 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -34,6 +34,22 @@
#define MSG_FILE_NOT_ENOUGH "Not enough rules in file \"%s\".\n"
#define MSG_CMD_FAIL"Command \"%s\" failed.\n"
+static int
+parser_read_uint64(uint64_t *value, char *p)
+{
+ uint64_t val = 0;
+
+ if (!value || !p || !p[0])
+ return -EINVAL;
+
+ val = strtoull(p, &p, 0);
+ if (p[0])
+ return -EINVAL;
+
+ *value = val;
+ return 0;
+}
+
static int
parser_read_uint32(uint32_t *value, char *p)
{
@@ -1403,6 +1419,107 @@ cmd_softnic_pipeline_abort(struct pmd_internals
*softnic,
rte_swx_ctl_pipeline_abort(p->ctl);
}
+/**
+ * pipeline regrd
+ */
+static void
+cmd_softnic_pipeline_regrd(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ const char *pipeline_name, *name;
+ uint64_t value;
+ uint32_t idx;
+ int status;
+
+ if (n_tokens != 5) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "regrd")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "regrd");
+ return;
+ }
+
+ name = tokens[3];
+
+ if (parser_read_uint32(&idx, tokens[4])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "index");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_regarray_read(p->p, name, idx, &value);
+ if (status) {
+ snprintf(out, out_size, "Command failed.\n");
+ return;
+ }
+
+ snprintf(out, out_size, "0x%" PRIx64 "\n", value);
+}
+
+/**
+ * pipeline regwr
+ */
+static void
+cmd_softnic_pipeline_regwr(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ const char *pipeline_name, *name;
+ uint64_t value;
+ uint32_t idx;
+ int status;
+
+ if (n_tokens != 6) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "regwr")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "regwr");
+ return;
+ }
+
+ name = tokens[3];
+
+ if (parser_read_uint32(&idx, tokens[4])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "index");
+ return;
+ }
+
+ if (parser_read_uint64(&value, tokens[5])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "value");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_regarray_write(p->p, name, idx, value);
+ if (status) {
+ snprintf(out, out_size, "Command failed.\n");
+ return;
+ }
+}
+
/**
* thread pipeline enable [ period
]
*/
@@ -1633,6 +1750,16 @@ softnic_cli_process(char *in, char *out, size_t
out_size, void *arg)
cmd_softnic_pipeline_abort(softnic, tokens, n_tokens,
out, out_size);
return;
}
+
+ if (n_tokens >= 3 && !strcmp(tokens[2], "regrd")) {
+ cmd_softnic_pipeline_regrd(softnic, tokens, n_tokens,
out, out_size);
+ return;
+ }
+
+ if (n_tokens >= 3 && !strcmp(tokens[2], "regwr")) {
+ cmd_softnic_pipeline_regwr(softnic, tokens, n_tokens,
out, out_size);
+ return;
+ }
}
if (strcmp(tokens[0], "thread") == 0) {
--
2.34.1
[PATCH V3 14/21] net/softnic: add pipeline selector table CLI commands
Add CLI commands for selector tables group and member management.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 517 ++
1 file changed, 517 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 4443b62009..1e92e251aa 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -774,6 +774,477 @@ cmd_softnic_pipeline_table_show(struct pmd_internals
*softnic __rte_unused,
fclose(file);
}
+/**
+ * pipeline selector group add
+ */
+static void
+cmd_softnic_pipeline_selector_group_add(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ char *pipeline_name, *selector_name;
+ uint32_t group_id;
+ int status;
+
+ if (n_tokens != 6) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "selector") != 0) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "selector");
+ return;
+ }
+
+ selector_name = tokens[3];
+
+ if (strcmp(tokens[4], "group") ||
+ strcmp(tokens[5], "add")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "group add");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_selector_group_add(p->ctl,
+ selector_name,
+ &group_id);
+ if (status)
+ snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
+ else
+ snprintf(out, out_size, "Group ID: %u\n", group_id);
+}
+
+/**
+ * pipeline selector group delete
+ */
+static void
+cmd_softnic_pipeline_selector_group_delete(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ char *pipeline_name, *selector_name;
+ uint32_t group_id;
+ int status;
+
+ if (n_tokens != 7) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "selector") != 0) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "selector");
+ return;
+ }
+
+ selector_name = tokens[3];
+
+ if (strcmp(tokens[4], "group") ||
+ strcmp(tokens[5], "delete")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "group delete");
+ return;
+ }
+
+ if (parser_read_uint32(&group_id, tokens[6]) != 0) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "group_id");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_selector_group_delete(p->ctl,
+ selector_name,
+ group_id);
+ if (status)
+ snprintf(out, out_size, MSG_CMD_FAIL, tokens[0]);
+}
+
+#define GROUP_MEMBER_INFO_TOKENS_MAX 6
+
+static int
+token_is_comment(const char *token)
+{
+ if ((token[0] == '#') ||
+ (token[0] == ';') ||
+ ((token[0] == '/') && (token[1] == '/')))
+ return 1; /* TRUE. */
+
+ return 0; /* FALSE. */
+}
+
+static int
+pipeline_selector_group_member_read(const char *string,
+ uint32_t *group_id,
+ uint32_t *member_id,
+ uint32_t *weight,
+ int *is_blank_or_comment)
+{
+ char *token_array[GROUP_MEMBER_INFO_TOKENS_MAX], **tokens;
+ char *s0 = NULL, *s;
+ uint32_t n_tokens = 0, group_id_val = 0, member_id_val = 0, weight_val
= 0;
+ int blank_or_comment = 0;
+
+ /* Check input arguments. */
+ if (!string || !string[0])
+ goto error;
+
+ /* Memory allocation. */
+ s0 = strdup(string);
+ if (!s0)
+ goto error;
+
+ /* Parse the string into tokens. */
+ for (s = s0; ; ) {
+ char *token;
+
+ token = strtok_r(s, " \f\n\r\t\v", &s);
+ if (!token || token_is_comment(token))
+ break;
+
+ if (n_tokens >= GROUP_MEMBER_INFO_TOKENS_MAX)
+ goto error;
+
+ token_array[n_tokens] = token;
+ n_tokens++;
+ }
+
+ if (!n_tokens) {
+ blank_or_
[PATCH V3 16/21] net/softnic: add pipeline commit and abort CLI commands
Add CLI commands for pipeline table update commit and abort.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 70 +++
1 file changed, 70 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index 4b7d001033..7c25a502ec 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1343,6 +1343,66 @@ cmd_softnic_pipeline_learner_default(struct
pmd_internals *softnic,
fclose(file);
}
+/**
+ * pipeline commit
+ */
+static void
+cmd_softnic_pipeline_commit(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ char *pipeline_name;
+ int status;
+
+ if (n_tokens != 3) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_commit(p->ctl, 1);
+ if (status)
+ snprintf(out, out_size, "Commit failed. "
+ "Use \"commit\" to retry or \"abort\" to discard the
pending work.\n");
+}
+
+/**
+ * pipeline abort
+ */
+static void
+cmd_softnic_pipeline_abort(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ char *pipeline_name;
+
+ if (n_tokens != 3) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ pipeline_name = tokens[1];
+ p = softnic_pipeline_find(softnic, pipeline_name);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ rte_swx_ctl_pipeline_abort(p->ctl);
+}
+
/**
* thread pipeline enable [ period
]
*/
@@ -1563,6 +1623,16 @@ softnic_cli_process(char *in, char *out, size_t
out_size, void *arg)
out, out_size);
return;
}
+
+ if (n_tokens >= 3 && !strcmp(tokens[2], "commit")) {
+ cmd_softnic_pipeline_commit(softnic, tokens, n_tokens,
out, out_size);
+ return;
+ }
+
+ if (n_tokens >= 3 && !strcmp(tokens[2], "abort")) {
+ cmd_softnic_pipeline_abort(softnic, tokens, n_tokens,
out, out_size);
+ return;
+ }
}
if (strcmp(tokens[0], "thread") == 0) {
--
2.34.1
[PATCH V3 19/21] net/softnic: add pipeline statistics CLI command
Add CLI command for pipeline statistics counters query.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 204 ++
1 file changed, 204 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index bbbf3babda..da530614db 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1909,6 +1909,206 @@ cmd_softnic_pipeline_meter_stats(struct pmd_internals
*softnic,
}
}
+/**
+ * pipeline stats
+ */
+static void
+cmd_softnic_pipeline_stats(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct rte_swx_ctl_pipeline_info info;
+ struct pipeline *p;
+ uint32_t i;
+ int status;
+
+ if (n_tokens != 3) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ p = softnic_pipeline_find(softnic, tokens[1]);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "stats")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "stats");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_info_get(p->p, &info);
+ if (status) {
+ snprintf(out, out_size, "Pipeline info get error.");
+ return;
+ }
+
+ snprintf(out, out_size, "Input ports:\n");
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ for (i = 0; i < info.n_ports_in; i++) {
+ struct rte_swx_port_in_stats stats;
+
+ rte_swx_ctl_pipeline_port_in_stats_read(p->p, i, &stats);
+
+ snprintf(out, out_size, "\tPort %u:"
+ " packets %" PRIu64
+ " bytes %" PRIu64
+ " empty %" PRIu64 "\n",
+ i, stats.n_pkts, stats.n_bytes, stats.n_empty);
+ out_size -= strlen(out);
+ out += strlen(out);
+ }
+
+ snprintf(out, out_size, "\nOutput ports:\n");
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ for (i = 0; i < info.n_ports_out; i++) {
+ struct rte_swx_port_out_stats stats;
+
+ rte_swx_ctl_pipeline_port_out_stats_read(p->p, i, &stats);
+
+ if (i != info.n_ports_out - 1)
+ snprintf(out, out_size, "\tPort %u:", i);
+ else
+ snprintf(out, out_size, "\tDROP:");
+
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ snprintf(out,
+ out_size,
+ " packets %" PRIu64
+ " bytes %" PRIu64
+ " clone %" PRIu64
+ " clonerr %" PRIu64 "\n",
+ stats.n_pkts,
+ stats.n_bytes,
+ stats.n_pkts_clone,
+ stats.n_pkts_clone_err);
+
+ out_size -= strlen(out);
+ out += strlen(out);
+ }
+
+ snprintf(out, out_size, "\nTables:\n");
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ for (i = 0; i < info.n_tables; i++) {
+ struct rte_swx_ctl_table_info table_info;
+ uint64_t n_pkts_action[info.n_actions];
+ struct rte_swx_table_stats stats = {
+ .n_pkts_hit = 0,
+ .n_pkts_miss = 0,
+ .n_pkts_action = n_pkts_action,
+ };
+ uint32_t j;
+
+ status = rte_swx_ctl_table_info_get(p->p, i, &table_info);
+ if (status) {
+ snprintf(out, out_size, "Table info get error.");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_table_stats_read(p->p,
table_info.name, &stats);
+ if (status) {
+ snprintf(out, out_size, "Table stats read error.");
+ return;
+ }
+
+ snprintf(out, out_size, "\tTable %s:\n"
+ "\t\tHit (packets): %" PRIu64 "\n"
+ "\t\tMiss (packets): %" PRIu64 "\n",
+ table_info.name,
+ stats.n_pkts_hit,
+ stats.n_pkts_miss);
+ out_size -= strlen(out);
+ out += strlen(out);
+
+ for (j = 0; j < info.n_actions; j++) {
+ struct rte_swx_ctl_action_info action_info;
+
+ status = rte_swx_ctl_action_info_get(p->p, j,
&action_info);
+ if (status) {
+ snprintf(out, out_size, "Action info get
error.");
+
[PATCH V3 20/21] net/softnic: add pipeline mirroring CLI command
Add CLI command for pipeline mirroring configuration.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 96 +++
1 file changed, 96 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index da530614db..e1ff100c9a 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -2109,6 +2109,94 @@ cmd_softnic_pipeline_stats(struct pmd_internals *softnic,
}
}
+/**
+ * pipeline mirror session port clone
fast | slow
+ * truncate
+ */
+static void
+cmd_softnic_pipeline_mirror_session(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct rte_swx_pipeline_mirroring_session_params params;
+ struct pipeline *p;
+ uint32_t session_id = 0;
+ int status;
+
+ if (n_tokens != 11) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ if (strcmp(tokens[0], "pipeline")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pipeline");
+ return;
+ }
+
+ p = softnic_pipeline_find(softnic, tokens[1]);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "mirror")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "mirror");
+ return;
+ }
+
+ if (strcmp(tokens[3], "session")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "session");
+ return;
+ }
+
+ if (parser_read_uint32(&session_id, tokens[4])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "session_id");
+ return;
+ }
+
+ if (strcmp(tokens[5], "port")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "port");
+ return;
+ }
+
+ if (parser_read_uint32(¶ms.port_id, tokens[6])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "port_id");
+ return;
+ }
+
+ if (strcmp(tokens[7], "clone")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "clone");
+ return;
+ }
+
+ if (!strcmp(tokens[8], "fast")) {
+ params.fast_clone = 1;
+ } else if (!strcmp(tokens[8], "slow")) {
+ params.fast_clone = 0;
+ } else {
+ snprintf(out, out_size, MSG_ARG_INVALID, "clone");
+ return;
+ }
+
+ if (strcmp(tokens[9], "truncate")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "truncate");
+ return;
+ }
+
+ if (parser_read_uint32(¶ms.truncation_length, tokens[10])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "truncation_length");
+ return;
+ }
+
+ status = rte_swx_ctl_pipeline_mirroring_session_set(p->p, session_id,
¶ms);
+ if (status) {
+ snprintf(out, out_size, "Command failed!\n");
+ return;
+ }
+}
+
/**
* thread pipeline enable [ period
]
*/
@@ -2387,6 +2475,14 @@ softnic_cli_process(char *in, char *out, size_t
out_size, void *arg)
cmd_softnic_pipeline_stats(softnic, tokens, n_tokens,
out, out_size);
return;
}
+
+ if (n_tokens >= 4 &&
+ !strcmp(tokens[2], "mirror") &&
+ !strcmp(tokens[3], "session")) {
+ cmd_softnic_pipeline_mirror_session(softnic, tokens,
n_tokens,
+ out, out_size);
+ return;
+ }
}
if (strcmp(tokens[0], "thread") == 0) {
--
2.34.1
[PATCH V3 18/21] net/softnic: add the pipeline meter CLI commands
Add CLI commands for pipeline meter configuration.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/rte_eth_softnic_cli.c | 423 ++
1 file changed, 423 insertions(+)
diff --git a/drivers/net/softnic/rte_eth_softnic_cli.c
b/drivers/net/softnic/rte_eth_softnic_cli.c
index b1f7460f47..bbbf3babda 100644
--- a/drivers/net/softnic/rte_eth_softnic_cli.c
+++ b/drivers/net/softnic/rte_eth_softnic_cli.c
@@ -1520,6 +1520,395 @@ cmd_softnic_pipeline_regwr(struct pmd_internals
*softnic,
}
}
+/**
+ * pipeline meter profile add cir pir
cbs pbs
+ */
+static void
+cmd_softnic_pipeline_meter_profile_add(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct rte_meter_trtcm_params params;
+ struct pipeline *p;
+ const char *profile_name;
+ int status;
+
+ if (n_tokens != 14) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ p = softnic_pipeline_find(softnic, tokens[1]);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "meter")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "meter");
+ return;
+ }
+
+ if (strcmp(tokens[3], "profile")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "profile");
+ return;
+ }
+
+ profile_name = tokens[4];
+
+ if (strcmp(tokens[5], "add")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "add");
+ return;
+ }
+
+ if (strcmp(tokens[6], "cir")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cir");
+ return;
+ }
+
+ if (parser_read_uint64(¶ms.cir, tokens[7])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "cir");
+ return;
+ }
+
+ if (strcmp(tokens[8], "pir")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pir");
+ return;
+ }
+
+ if (parser_read_uint64(¶ms.pir, tokens[9])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pir");
+ return;
+ }
+
+ if (strcmp(tokens[10], "cbs")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "cbs");
+ return;
+ }
+
+ if (parser_read_uint64(¶ms.cbs, tokens[11])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "cbs");
+ return;
+ }
+
+ if (strcmp(tokens[12], "pbs")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "pbs");
+ return;
+ }
+
+ if (parser_read_uint64(¶ms.pbs, tokens[13])) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pbs");
+ return;
+ }
+
+ status = rte_swx_ctl_meter_profile_add(p->p, profile_name, ¶ms);
+ if (status) {
+ snprintf(out, out_size, "Command failed.\n");
+ return;
+ }
+}
+
+/**
+ * pipeline meter profile delete
+ */
+static void
+cmd_softnic_pipeline_meter_profile_delete(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ const char *profile_name;
+ int status;
+
+ if (n_tokens != 6) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ p = softnic_pipeline_find(softnic, tokens[1]);
+ if (!p) {
+ snprintf(out, out_size, MSG_ARG_INVALID, "pipeline_name");
+ return;
+ }
+
+ if (strcmp(tokens[2], "meter")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "meter");
+ return;
+ }
+
+ if (strcmp(tokens[3], "profile")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "profile");
+ return;
+ }
+
+ profile_name = tokens[4];
+
+ if (strcmp(tokens[5], "delete")) {
+ snprintf(out, out_size, MSG_ARG_NOT_FOUND, "delete");
+ return;
+ }
+
+ status = rte_swx_ctl_meter_profile_delete(p->p, profile_name);
+ if (status) {
+ snprintf(out, out_size, "Command failed.\n");
+ return;
+ }
+}
+
+/**
+ * pipeline meter from to
reset
+ */
+static void
+cmd_softnic_pipeline_meter_reset(struct pmd_internals *softnic,
+ char **tokens,
+ uint32_t n_tokens,
+ char *out,
+ size_t out_size)
+{
+ struct pipeline *p;
+ const char *name;
+ uint32_t idx0 = 0, idx1 = 0;
+
+ if (n_tokens != 9) {
+ snprintf(out, out_size, MSG_ARG_MISMATCH, tokens[0]);
+ return;
+ }
+
+ p = softnic_pipeline_find(softnic, tokens[1]);
+ if (!p) {
+ snprintf(out, out_size, M
[PATCH V3 21/21] net/softnic: update the default device program
Update the default device program.
Signed-off-by: Cristian Dumitrescu
Signed-off-by: Yogesh Jangra
---
drivers/net/softnic/firmware.cli | 51 --
drivers/net/softnic/firmware.spec | 19 +++
drivers/net/softnic/firmware_rx.io | 30 ++
drivers/net/softnic/firmware_tx.io | 30 ++
4 files changed, 114 insertions(+), 16 deletions(-)
create mode 100644 drivers/net/softnic/firmware.spec
create mode 100644 drivers/net/softnic/firmware_rx.io
create mode 100644 drivers/net/softnic/firmware_tx.io
diff --git a/drivers/net/softnic/firmware.cli b/drivers/net/softnic/firmware.cli
index 300cf6e33f..7d2c1aad21 100644
--- a/drivers/net/softnic/firmware.cli
+++ b/drivers/net/softnic/firmware.cli
@@ -1,21 +1,40 @@
; SPDX-License-Identifier: BSD-3-Clause
-; Copyright(c) 2018 Intel Corporation
+; Copyright(c) 2022 Intel Corporation
-link LINK dev :02:00.0
+# Example command line for the DPDK test-pmd application. Out of the 3
application cores (see the
+# -c argument), core 0 is running the control thread doing
configuration and CLI, core 1
+# is running the forwarding thread, and core 2 is setup as service core (see
the -s
+# argument) for the purpose of running the Soft NIC device:
+#
+# ./build/app/dpdk-testpmd -c 7 -s 4 --vdev
'net_softnic0,firmware=./drivers/net/softnic/firmware.cli,cpu_id=0,conn_port=8086'
-- -i
+#
+# Commands from within the DPDK test-pmd application:
+#
+# testpmd> set portlist
+# testpmd> show config fwd
+# testpmd> start
+#
+# To setup the CLI prompt to the Soft NIC device, the DPDK test-pmd
application needs to be modified
+# to call the rte_pmd_softnic_manage() function. Once the Soft NIC device is
started, the command to
+# get the CLI prompt is:
+#
+# telnet 0.0.0.0 8086
-pipeline RX period 10 offset_port_id 0
-pipeline RX port in bsz 32 link LINK rxq 0
-pipeline RX port out bsz 32 swq RXQ0
-pipeline RX table match stub
-pipeline RX port in 0 table 0
-pipeline RX table 0 rule add match default action fwd port 0
+;
+; Pipeline code generation & shared object library build.
+;
+pipeline codegen ./drivers/net/softnic/firmware.spec /tmp/firmware.c
+pipeline libbuild /tmp/firmware.c /tmp/firmware.so
-pipeline TX period 10 offset_port_id 0
-pipeline TX port in bsz 32 swq TXQ0
-pipeline TX port out bsz 32 link LINK txq 0
-pipeline TX table match stub
-pipeline TX port in 0 table 0
-pipeline TX table 0 rule add match default action fwd port 0
+;
+; List of pipelines.
+;
+pipeline RX build lib /tmp/firmware.so io ./drivers/net/softnic/firmware_rx.io
numa 0
+pipeline TX build lib /tmp/firmware.so io ./drivers/net/softnic/firmware_tx.io
numa 0
-thread 1 pipeline RX enable
-thread 1 pipeline TX enable
+;
+; Pipelines-to-threads mapping. For the Soft NIC devices, the pipelines can be
mapped to any of the
+; application service cores (see the -s argument):
+;
+thread 2 pipeline RX enable
+thread 2 pipeline TX enable
diff --git a/drivers/net/softnic/firmware.spec
b/drivers/net/softnic/firmware.spec
new file mode 100644
index 00..106caae735
--- /dev/null
+++ b/drivers/net/softnic/firmware.spec
@@ -0,0 +1,19 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2022 Intel Corporation
+
+//
+// Meta-data.
+//
+struct metadata_t {
+ bit<32> port
+}
+
+metadata instanceof metadata_t
+
+//
+// Pipeline.
+//
+apply {
+ rx m.port
+ tx m.port
+}
diff --git a/drivers/net/softnic/firmware_rx.io
b/drivers/net/softnic/firmware_rx.io
new file mode 100644
index 00..9baa4612b1
--- /dev/null
+++ b/drivers/net/softnic/firmware_rx.io
@@ -0,0 +1,30 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2022 Intel Corporation
+
+;
+; Pipeline input ports.
+;
+; Syntax:
+;
+;port in ethdev rxq bsz
+;port in ring bsz
+;port in source mempool file loop
packets
+;port in fd mtu mempool
bsz
+;
+; Note: Customize the parameters below to match your setup.
+;
+port in 0 ethdev :18:00.0 rxq 0 bsz 32
+
+;
+; Pipeline output ports.
+;
+; Syntax:
+;
+;port out ethdev txq bsz
+;port out ring bsz
+;port out sink file | none
+;port out fd bsz
+;
+; Note: Customize the parameters below to match your setup.
+;
+port out 0 ring RXQ0 bsz 32
diff --git a/drivers/net/softnic/firmware_tx.io
b/drivers/net/softnic/firmware_tx.io
new file mode 100644
index 00..4c4608b105
--- /dev/null
+++ b/drivers/net/softnic/firmware_tx.io
@@ -0,0 +1,30 @@
+; SPDX-License-Identifier: BSD-3-Clause
+; Copyright(c) 2022 Intel Corporation
+
+;
+; Pipeline input ports.
+;
+; Syntax:
+;
+;port in ethdev rxq bsz
+;port in ring bsz
+;port in source mempool file loop
packets
+;port in fd mtu mempool
bsz
+;
+; Note: Customize the parameters below to match your setup.
+;
+port in 0 ring TXQ0 bsz 32
+
+;
+; Pipeline output ports.
+;
+; Syntax:
+;
+;port out ethdev txq bsz
+;port out ring
[PATCH v4 0/3] Add lcore poll busyness telemetry
Currently, there is no way to measure lcore polling busyness in a passive way, without any modifications to the application. This patchset adds a new EAL API that will be able to passively track core polling busyness. As part of the set, new telemetry endpoints are added to read the generate metrics. --- v4: * Fix doc build * Rename timestamp macro to RTE_LCORE_TELEMETRY_TIMESTAMP * Make enable/disable read and write atomic * Change rte_lcore_poll_busyness_enabled_set() param to bool * Move mem alloc from enable/disable to init/cleanup * Other minor fixes v3: * Fix missing renaming to poll busyness * Fix clang compilation * Fix arm compilation v2: * Use rte_get_tsc_hz() to adjust the telemetry period * Rename to reflect polling busyness vs general busyness * Fix segfault when calling telemetry timestamp from an unregistered non-EAL thread. * Minor cleanup Anatoly Burakov (2): eal: add lcore poll busyness telemetry eal: add cpuset lcore telemetry entries Kevin Laatz (1): doc: add howto guide for lcore poll busyness config/meson.build | 1 + config/rte_config.h | 1 + doc/guides/howto/index.rst | 1 + doc/guides/howto/lcore_poll_busyness.rst| 92 ++ lib/bbdev/rte_bbdev.h | 17 +- lib/compressdev/rte_compressdev.c | 2 + lib/cryptodev/rte_cryptodev.h | 2 + lib/distributor/rte_distributor.c | 21 +- lib/distributor/rte_distributor_single.c| 14 +- lib/dmadev/rte_dmadev.h | 15 +- lib/eal/common/eal_common_lcore_telemetry.c | 346 lib/eal/common/meson.build | 1 + lib/eal/include/rte_lcore.h | 90 + lib/eal/linux/eal.c | 3 + lib/eal/meson.build | 3 + lib/eal/version.map | 8 + lib/ethdev/rte_ethdev.h | 2 + lib/eventdev/rte_eventdev.h | 10 +- lib/rawdev/rte_rawdev.c | 6 +- lib/regexdev/rte_regexdev.h | 5 +- lib/ring/rte_ring_elem_pvt.h| 1 + meson_options.txt | 2 + 22 files changed, 619 insertions(+), 24 deletions(-) create mode 100644 doc/guides/howto/lcore_poll_busyness.rst create mode 100644 lib/eal/common/eal_common_lcore_telemetry.c -- 2.31.1
[PATCH v4 1/3] eal: add lcore poll busyness telemetry
From: Anatoly Burakov
Currently, there is no way to measure lcore poll busyness in a passive way,
without any modifications to the application. This patch adds a new EAL API
that will be able to passively track core polling busyness.
The poll busyness is calculated by relying on the fact that most DPDK API's
will poll for work (packets, completions, eventdev events, etc). Empty
polls can be counted as "idle", while non-empty polls can be counted as
busy. To measure lcore poll busyness, we simply call the telemetry
timestamping function with the number of polls a particular code section
has processed, and count the number of cycles we've spent processing empty
bursts. The more empty bursts we encounter, the less cycles we spend in
"busy" state, and the less core poll busyness will be reported.
In order for all of the above to work without modifications to the
application, the library code needs to be instrumented with calls to the
lcore telemetry busyness timestamping function. The following parts of DPDK
are instrumented with lcore poll busyness timestamping calls:
- All major driver API's:
- ethdev
- cryptodev
- compressdev
- regexdev
- bbdev
- rawdev
- eventdev
- dmadev
- Some additional libraries:
- ring
- distributor
To avoid performance impact from having lcore telemetry support, a global
variable is exported by EAL, and a call to timestamping function is wrapped
into a macro, so that whenever telemetry is disabled, it only takes one
additional branch and no function calls are performed. It is disabled at
compile time by default.
This patch also adds a telemetry endpoint to report lcore poll busyness, as
well as telemetry endpoints to enable/disable lcore telemetry. A
documentation entry has been added to the howto guides to explain the usage
of the new telemetry endpoints and API.
Signed-off-by: Kevin Laatz
Signed-off-by: Conor Walsh
Signed-off-by: David Hunt
Signed-off-by: Anatoly Burakov
---
v4:
* Fix doc build
* Rename timestamp macro to RTE_LCORE_TELEMETRY_TIMESTAMP
* Make enable/disable read and write atomic
* Change rte_lcore_poll_busyness_enabled_set() param to bool
* Move mem alloc from enable/disable to init/cleanup
* Other minor fixes
v3:
* Fix missed renaming to poll busyness
* Fix clang compilation
* Fix arm compilation
v2:
* Use rte_get_tsc_hz() to adjust the telemetry period
* Rename to reflect polling busyness vs general busyness
* Fix segfault when calling telemetry timestamp from an unregistered
non-EAL thread.
* Minor cleanup
---
config/meson.build | 1 +
config/rte_config.h | 1 +
lib/bbdev/rte_bbdev.h | 17 +-
lib/compressdev/rte_compressdev.c | 2 +
lib/cryptodev/rte_cryptodev.h | 2 +
lib/distributor/rte_distributor.c | 21 +-
lib/distributor/rte_distributor_single.c| 14 +-
lib/dmadev/rte_dmadev.h | 15 +-
lib/eal/common/eal_common_lcore_telemetry.c | 299
lib/eal/common/meson.build | 1 +
lib/eal/include/rte_lcore.h | 90 ++
lib/eal/linux/eal.c | 3 +
lib/eal/meson.build | 3 +
lib/eal/version.map | 8 +
lib/ethdev/rte_ethdev.h | 2 +
lib/eventdev/rte_eventdev.h | 10 +-
lib/rawdev/rte_rawdev.c | 6 +-
lib/regexdev/rte_regexdev.h | 5 +-
lib/ring/rte_ring_elem_pvt.h| 1 +
meson_options.txt | 2 +
20 files changed, 479 insertions(+), 24 deletions(-)
create mode 100644 lib/eal/common/eal_common_lcore_telemetry.c
diff --git a/config/meson.build b/config/meson.build
index 7f7b6c92fd..d5954a059c 100644
--- a/config/meson.build
+++ b/config/meson.build
@@ -297,6 +297,7 @@ endforeach
dpdk_conf.set('RTE_MAX_ETHPORTS', get_option('max_ethports'))
dpdk_conf.set('RTE_LIBEAL_USE_HPET', get_option('use_hpet'))
dpdk_conf.set('RTE_ENABLE_TRACE_FP', get_option('enable_trace_fp'))
+dpdk_conf.set('RTE_LCORE_POLL_BUSYNESS',
get_option('enable_lcore_poll_busyness'))
# values which have defaults which may be overridden
dpdk_conf.set('RTE_MAX_VFIO_GROUPS', 64)
dpdk_conf.set('RTE_DRIVER_MEMPOOL_BUCKET_SIZE_KB', 64)
diff --git a/config/rte_config.h b/config/rte_config.h
index 46549cb062..498702c9c7 100644
--- a/config/rte_config.h
+++ b/config/rte_config.h
@@ -39,6 +39,7 @@
#define RTE_LOG_DP_LEVEL RTE_LOG_INFO
#define RTE_BACKTRACE 1
#define RTE_MAX_VFIO_CONTAINERS 64
+#define RTE_LCORE_POLL_BUSYNESS_PERIOD_MS 2
/* bsd module defines */
#define RTE_CONTIGMEM_MAX_NUM_BUFS 64
diff --git a/lib/bbdev/rte_bbdev.h b/lib/bbdev/rte_bbdev.h
index b88c88167e..d6a98d3f11 100644
--- a/lib/bbdev/rte_bbdev.h
+++ b/lib/bbdev/rte_bbdev.h
@@ -28,6 +28,7 @@ extern "C" {
#include
#include
+#include
#include "rte_bbdev_op.h"
@@ -
[PATCH v4 2/3] eal: add cpuset lcore telemetry entries
From: Anatoly Burakov
Expose per-lcore cpuset information to telemetry.
Signed-off-by: Anatoly Burakov
---
lib/eal/common/eal_common_lcore_telemetry.c | 47 +
1 file changed, 47 insertions(+)
diff --git a/lib/eal/common/eal_common_lcore_telemetry.c
b/lib/eal/common/eal_common_lcore_telemetry.c
index 540ac5eba0..976a615d4e 100644
--- a/lib/eal/common/eal_common_lcore_telemetry.c
+++ b/lib/eal/common/eal_common_lcore_telemetry.c
@@ -19,6 +19,8 @@ rte_atomic32_t __rte_lcore_telemetry_enabled;
#ifdef RTE_LCORE_POLL_BUSYNESS
+#include "eal_private.h"
+
struct lcore_telemetry {
int poll_busyness;
/**< Calculated poll busyness (gets set/returned by the API) */
@@ -247,6 +249,48 @@ lcore_handle_poll_busyness(const char *cmd __rte_unused,
return 0;
}
+static int
+lcore_handle_cpuset(const char *cmd __rte_unused,
+ const char *params __rte_unused,
+ struct rte_tel_data *d)
+{
+ char corenum[64];
+ int i;
+
+ rte_tel_data_start_dict(d);
+
+ RTE_LCORE_FOREACH(i) {
+ const struct lcore_config *cfg = &lcore_config[i];
+ const rte_cpuset_t *cpuset = &cfg->cpuset;
+ struct rte_tel_data *ld;
+ unsigned int cpu;
+
+ if (!rte_lcore_is_enabled(i))
+ continue;
+
+ /* create an array of integers */
+ ld = rte_tel_data_alloc();
+ if (ld == NULL)
+ return -ENOMEM;
+ rte_tel_data_start_array(ld, RTE_TEL_INT_VAL);
+
+ /* add cpu ID's from cpuset to the array */
+ for (cpu = 0; cpu < CPU_SETSIZE; cpu++) {
+ if (!CPU_ISSET(cpu, cpuset))
+ continue;
+ rte_tel_data_add_array_int(ld, cpu);
+ }
+
+ /* add array to the per-lcore container */
+ snprintf(corenum, sizeof(corenum), "%d", i);
+
+ /* tell telemetry library to free this array automatically */
+ rte_tel_data_add_dict_container(d, corenum, ld, 0);
+ }
+
+ return 0;
+}
+
void
rte_lcore_telemetry_free(void)
{
@@ -274,6 +318,9 @@ RTE_INIT(lcore_init_telemetry)
rte_telemetry_register_cmd("/eal/lcore/poll_busyness_disable",
lcore_poll_busyness_disable,
"disable lcore poll busyness measurement");
+
+ rte_telemetry_register_cmd("/eal/lcore/cpuset", lcore_handle_cpuset,
+ "list physical core affinity for each
lcore");
}
#else
--
2.31.1
[PATCH v4 3/3] doc: add howto guide for lcore poll busyness
Add a new section to the howto guides for using the new lcore poll
busyness telemetry endpoints and describe general usage.
Signed-off-by: Kevin Laatz
---
v4:
* Include note on perf impact when the feature is enabled
* Add doc to toctree
* Updates to incorporate changes made earlier in the patchset
v3:
* Update naming to poll busyness
---
doc/guides/howto/index.rst | 1 +
doc/guides/howto/lcore_poll_busyness.rst | 92
2 files changed, 93 insertions(+)
create mode 100644 doc/guides/howto/lcore_poll_busyness.rst
diff --git a/doc/guides/howto/index.rst b/doc/guides/howto/index.rst
index bf6337d021..0a9060c1d3 100644
--- a/doc/guides/howto/index.rst
+++ b/doc/guides/howto/index.rst
@@ -21,3 +21,4 @@ HowTo Guides
debug_troubleshoot
openwrt
avx512
+lcore_poll_busyness
diff --git a/doc/guides/howto/lcore_poll_busyness.rst
b/doc/guides/howto/lcore_poll_busyness.rst
new file mode 100644
index 00..ebbbd4c44e
--- /dev/null
+++ b/doc/guides/howto/lcore_poll_busyness.rst
@@ -0,0 +1,92 @@
+.. SPDX-License-Identifier: BSD-3-Clause
+Copyright(c) 2022 Intel Corporation.
+
+Lcore Poll Busyness Telemetry
+=
+
+The lcore poll busyness telemetry provides a built-in, generic method of
gathering
+lcore utilization metrics for running applications. These metrics are exposed
+via a new telemetry endpoint.
+
+Since most DPDK APIs polling based, the poll busyness is calculated based on
+APIs receiving 'work' (packets, completions, events, etc). Empty polls are
+considered as idle, while non-empty polls are considered busy. Using the amount
+of cycles spent processing empty polls, the busyness can be calculated and
recorded.
+
+Application Specified Busyness
+--
+
+Improved accuracy of the reported busyness may need more contextual awareness
+from the application. For example, an application may make a number of calls to
+rx_burst before processing packets. If the last burst was an "empty poll", then
+the processing time of the packets would be falsely considered as "idle", since
+the last burst was empty. The application should track if any of the polls
+contained "work" to do and should mark the 'bulk' as "busy" cycles before
+proceeding to the processesing. This type of awareness is only available within
+the application.
+
+Applications can be modified to incorporate the extra contextual awareness in
+order to improve the reported busyness by marking areas of code as "busy" or
+"idle" appropriately. This can be done by inserting the timestamping macro::
+
+RTE_LCORE_POLL_BUSYNESS_TIMESTAMP(0)/* to mark section as idle */
+RTE_LCORE_POLL_BUSYNESS_TIMESTAMP(32) /* where 32 is nb_pkts to mark
section as busy (non-zero is busy) */
+
+All cycles since the last state change (idle to busy, or vice versa) will be
+counted towards the current state's counter.
+
+Consuming the Telemetry
+---
+
+The telemetry gathered for lcore poll busyness can be read from the
`telemetry.py`
+script via the new `/eal/lcore/poll_busyness` endpoint::
+
+$ ./usertools/dpdk-telemetry.py
+--> /eal/lcore/poll_busyness
+{"/eal/lcore/poll_busyness": {"12": -1, "13": 85, "14": 84}}
+
+* Cores not collecting poll busyness will report "-1". E.g. control cores or
inactive cores.
+* All enabled cores will report their poll busyness in the range 0-100.
+
+Enabling and Disabling Lcore Poll Busyness Telemetry
+
+
+By default, the lcore poll busyness telemetry is disabled at compile time. In
+order to allow DPDK to gather this metric, the ``enable_lcore_poll_busyness``
+meson option must be set to ``true``.
+
+.. note::
+Enabling lcore poll busyness telemetry may impact performance due to the
+additional timestamping, potentially per poll depending on the application.
+
+At compile time
+^^^
+
+Support can be enabled/disabled at compile time via the meson option.
+It is disabled by default.::
+
+$ meson configure -Denable_lcore_poll_busyness=true #enable
+
+$ meson configure -Denable_lcore_poll_busyness=false#disable
+
+At run time
+^^^
+
+Support can also be enabled/disabled during runtime (if the meson option is
+enabled at compile time). Disabling at runtime comes at the cost of an
additional
+branch, however no additional function calls are performed.
+
+To enable/disable support at runtime, a call can be made to the appropriately
+telemetry endpoint.
+
+Disable::
+
+$ ./usertools/dpdk-telemetry.py
+--> /eal/lcore/poll_busyness_disable
+{"/eal/lcore/poll_busyness_disable": {"poll_busyness_enabled": 0}}
+
+Enable::
+
+$ ./usertools/dpdk-telemetry.py
+--> /eal/lcore/poll_busyness_enable
+{"/eal/lcore/poll_busyness_enable": {"poll_busyness_enabled": 1}}
--
2.31.1
Re: [PATCH] net/ring: add umonitor callback
On Wed, Aug 03, 2022 at 03:28:45PM +0100, Herakliusz Lipiec wrote:
> Currently ring pmd does not support ``rte_power_monitor`` api.
> This patch adds support by adding umonitor callback that is called
> whenever we enter sleep state and need to check if it is time to wake
> up.
>
> Signed-off-by: Herakliusz Lipiec
> ---
Code looks ok to me, but I think the commit log and title needs to remove
references to umonitor. The generic API in DPDK is just called "monitor".
With such rewording.
Acked-by: Bruce Richardson
> drivers/net/ring/rte_eth_ring.c | 23 +++
> 1 file changed, 23 insertions(+)
>
> diff --git a/drivers/net/ring/rte_eth_ring.c b/drivers/net/ring/rte_eth_ring.c
> index cfb81da5fe..1bb6b196cb 100644
> --- a/drivers/net/ring/rte_eth_ring.c
> +++ b/drivers/net/ring/rte_eth_ring.c
> @@ -284,6 +284,28 @@ eth_dev_close(struct rte_eth_dev *dev)
> return ret;
> }
>
> +static int ring_monitor_callback(const uint64_t value,
> + const uint64_t arg[RTE_POWER_MONITOR_OPAQUE_SZ])
> +{
> + /* Check if the head pointer has changed */
> + return value != arg[0];
> +}
> +
> +static int
> +eth_get_monitor_addr(void* rx_queue, struct rte_power_monitor_cond *pmc)
> +{
> + struct rte_ring *rng = ((struct ring_queue*) rx_queue)->rng;
> +
> + /* Monitor ring head since if head moves
> + * there are packets to transmit
> + * */
> + pmc->addr = &rng->prod.head;
> + pmc->size = sizeof(rng->prod.head);
> + pmc->opaque[0] = rng->prod.head;
> + pmc->fn = ring_monitor_callback;
> + return 0;
> +}
> +
> static const struct eth_dev_ops ops = {
> .dev_close = eth_dev_close,
> .dev_start = eth_dev_start,
> @@ -303,6 +325,7 @@ static const struct eth_dev_ops ops = {
> .promiscuous_disable = eth_promiscuous_disable,
> .allmulticast_enable = eth_allmulticast_enable,
> .allmulticast_disable = eth_allmulticast_disable,
> + .get_monitor_addr = eth_get_monitor_addr,
> };
>
> static int
> --
> 2.36.1
>
[PATCH v2 0/4] support protocol based buffer split
Protocol type based buffer split consists of splitting a received packet into several separate segments based on the packet content. It is useful in some scenarios, such as GPU acceleration. The splitting will help to enable true zero copy and hence improve the performance significantly. This patchset aims to support protocol header split based on current buffer split. When Rx queue is configured with RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT offload and corresponding protocol, packets received will be directly split into different mempools. Change log: v2: Add mbuf dump to the driver's buffer split path. Add buffer split to the driver feature list. Remove unsupported header protocols from the driver. Yuan Wang (4): ethdev: introduce protocol header API ethdev: introduce protocol hdr based buffer split app/testpmd: add rxhdrs commands and parameters net/ice: support buffer split in Rx path app/test-pmd/cmdline.c | 123 +- app/test-pmd/config.c | 70 app/test-pmd/parameters.c | 16 +- app/test-pmd/testpmd.c | 2 + app/test-pmd/testpmd.h | 6 + doc/guides/nics/features/ice.ini | 1 + doc/guides/rel_notes/release_22_11.rst | 14 ++ drivers/net/ice/ice_ethdev.c | 30 +++- drivers/net/ice/ice_rxtx.c | 220 + drivers/net/ice/ice_rxtx.h | 16 ++ drivers/net/ice/ice_rxtx_vec_common.h | 3 + lib/ethdev/ethdev_driver.h | 15 ++ lib/ethdev/rte_ethdev.c| 88 -- lib/ethdev/rte_ethdev.h| 41 - lib/ethdev/version.map | 3 + 15 files changed, 600 insertions(+), 48 deletions(-) -- 2.25.1
[PATCH v2 1/4] ethdev: introduce protocol header API
Add a new ethdev API to retrieve supported protocol headers
of a PMD, which helps to configure protocol header based buffer split.
Signed-off-by: Yuan Wang
Signed-off-by: Xuan Ding
Signed-off-by: Wenxuan Wu
---
doc/guides/rel_notes/release_22_11.rst | 5
lib/ethdev/ethdev_driver.h | 15
lib/ethdev/rte_ethdev.c| 33 ++
lib/ethdev/rte_ethdev.h| 24 +++
lib/ethdev/version.map | 3 +++
5 files changed, 80 insertions(+)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index 8c021cf050..4d90514a9a 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -55,6 +55,11 @@ New Features
Also, make sure to start the actual text at the margin.
===
+* **Added new ethdev API for PMD to get buffer split supported protocol
types.**
+
+ Added ``rte_eth_buffer_split_get_supported_hdr_ptypes()``, to get supported
+ header protocols of a PMD to split.
+
Removed Items
-
diff --git a/lib/ethdev/ethdev_driver.h b/lib/ethdev/ethdev_driver.h
index 5101868ea7..f64ceb9907 100644
--- a/lib/ethdev/ethdev_driver.h
+++ b/lib/ethdev/ethdev_driver.h
@@ -1054,6 +1054,18 @@ typedef int (*eth_ip_reassembly_conf_get_t)(struct
rte_eth_dev *dev,
typedef int (*eth_ip_reassembly_conf_set_t)(struct rte_eth_dev *dev,
const struct rte_eth_ip_reassembly_params *conf);
+/**
+ * @internal
+ * Get supported header protocols of a PMD to split.
+ *
+ * @param dev
+ * Ethdev handle of port.
+ *
+ * @return
+ * An array pointer to store supported protocol headers.
+ */
+typedef const uint32_t *(*eth_buffer_split_supported_hdr_ptypes_get_t)(struct
rte_eth_dev *dev);
+
/**
* @internal
* Dump private info from device to a file.
@@ -1301,6 +1313,9 @@ struct eth_dev_ops {
/** Set IP reassembly configuration */
eth_ip_reassembly_conf_set_t ip_reassembly_conf_set;
+ /** Get supported header ptypes to split */
+ eth_buffer_split_supported_hdr_ptypes_get_t
buffer_split_supported_hdr_ptypes_get;
+
/** Dump private info from device */
eth_dev_priv_dump_t eth_dev_priv_dump;
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 1979dc0850..093c577add 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -5917,6 +5917,39 @@ rte_eth_dev_priv_dump(uint16_t port_id, FILE *file)
return eth_err(port_id, (*dev->dev_ops->eth_dev_priv_dump)(dev, file));
}
+int
+rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t
*ptypes, int num)
+{
+ int i, j;
+ struct rte_eth_dev *dev;
+ const uint32_t *all_types;
+
+ RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
+ dev = &rte_eth_devices[port_id];
+
+ if (ptypes == NULL && num > 0) {
+ RTE_ETHDEV_LOG(ERR,
+ "Cannot get ethdev port %u supported header protocol
types to NULL "
+ "when array size is non zero\n",
+ port_id);
+ return -EINVAL;
+ }
+
+
RTE_FUNC_PTR_OR_ERR_RET(*dev->dev_ops->buffer_split_supported_hdr_ptypes_get,
-ENOTSUP);
+ all_types = (*dev->dev_ops->buffer_split_supported_hdr_ptypes_get)(dev);
+
+ if (!all_types)
+ return 0;
+
+ for (i = 0, j = 0; all_types[i] != RTE_PTYPE_UNKNOWN; ++i) {
+ if (j < num)
+ ptypes[j] = all_types[i];
+ j++;
+ }
+
+ return j;
+}
+
RTE_LOG_REGISTER_DEFAULT(rte_eth_dev_logtype, INFO);
RTE_INIT(ethdev_init_telemetry)
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index de9e970d4d..c58c908c3a 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -6206,6 +6206,30 @@ rte_eth_tx_buffer(uint16_t port_id, uint16_t queue_id,
return rte_eth_tx_buffer_flush(port_id, queue_id, buffer);
}
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice
+ *
+ * Get supported header protocols to split on Rx.
+ *
+ * @param port_id
+ * The port identifier of the device.
+ * @param[out] ptypes
+ * An array pointer to store supported protocol headers, allocated by caller.
+ * These ptypes are composed with RTE_PTYPE_*.
+ * @param num
+ * Size of the array pointed by param ptypes.
+ * @return
+ * - (>=0) Number of supported ptypes. If the number of types exceeds num,
+ * only num entries will be filled into the ptypes array, but the
full
+ * count of supported ptypes will be returned.
+ * - (-ENOTSUP) if header protocol is not supported by device.
+ * - (-ENODEV) if *port_id* invalid.
+ * - (-EINVAL) if bad parameter.
+ */
+__rte_experimental
+int rte_eth_buffer_split_get_supported_hdr_ptypes(uint16_t port_id, uint32_t
*ptypes, int num);
+
#ifdef __
[PATCH v2 2/4] ethdev: introduce protocol hdr based buffer split
Currently, Rx buffer split supports length based split. With Rx queue
offload RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT enabled and Rx packet segment
configured, PMD will be able to split the received packets into
multiple segments.
However, length based buffer split is not suitable for NICs that do split
based on protocol headers. Given an arbitrarily variable length in Rx
packet segment, it is almost impossible to pass a fixed protocol header to
driver. Besides, the existence of tunneling results in the composition of
a packet is various, which makes the situation even worse.
This patch extends current buffer split to support protocol header based
buffer split. A new proto_hdr field is introduced in the reserved field
of rte_eth_rxseg_split structure to specify protocol header. The proto_hdr
field defines the split position of packet, splitting will always happens
after the protocol header defined in the Rx packet segment. When Rx queue
offload RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT is enabled and corresponding
protocol header is configured, driver will split the ingress packets into
multiple segments.
struct rte_eth_rxseg_split {
struct rte_mempool *mp; /* memory pools to allocate segment from */
uint16_t length; /* segment maximal data length,
configures split point */
uint16_t offset; /* data offset from beginning
of mbuf data buffer */
uint32_t proto_hdr; /* supported ptype of a specific pmd,
configures split point.
It should be defined by RTE_PTYPE_*
*/
};
If protocol header split can be supported by a PMD. The
rte_eth_buffer_split_get_supported_hdr_ptypes function can
be use to obtain a list of these protocol headers.
For example, let's suppose we configured the Rx queue with the
following segments:
seg0 - pool0, proto_hdr0=RTE_PTYPE_L3_IPV4, off0=2B
seg1 - pool1, proto_hdr1=RTE_PTYPE_L4_UDP, off1=128B
seg2 - pool2, off1=0B
The packet consists of MAC_IPV4_UDP_PAYLOAD will be split like
following:
seg0 - ipv4 header @ RTE_PKTMBUF_HEADROOM + 2 in mbuf from pool0
seg1 - udp header @ 128 in mbuf from pool1
seg2 - payload @ 0 in mbuf from pool2
Note: NIC will only do split when the packets exactly match all the
protocol headers in the segments. For example, if ARP packets received
with above config, the NIC won't do split for ARP packets since
it does not contains ipv4 header and udp header.
Now buffer split can be configured in two modes. For length based
buffer split, the mp, length, offset field in Rx packet segment should
be configured, while the proto_hdr field will be ignored.
For protocol header based buffer split, the mp, offset, proto_hdr field
in Rx packet segment should be configured, while the length field will
be ignored.
The split limitations imposed by underlying driver is reported in the
rte_eth_dev_info->rx_seg_capa field. The memory attributes for the split
parts may differ either, dpdk memory and external memory, respectively.
Signed-off-by: Yuan Wang
Signed-off-by: Xuan Ding
Signed-off-by: Wenxuan Wu
---
doc/guides/rel_notes/release_22_11.rst | 5 +++
lib/ethdev/rte_ethdev.c| 55 --
lib/ethdev/rte_ethdev.h| 17 +++-
3 files changed, 65 insertions(+), 12 deletions(-)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index 4d90514a9a..f3b58c7895 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -60,6 +60,11 @@ New Features
Added ``rte_eth_buffer_split_get_supported_hdr_ptypes()``, to get supported
header protocols of a PMD to split.
+* **Added protocol header based buffer split.**
+ Ethdev: The ``reserved`` field in the ``rte_eth_rxseg_split`` structure is
+ replaced with ``proto_hdr`` to support protocol header based buffer split.
+ User can choose length or protocol header to configure buffer split
+ according to NIC's capability.
Removed Items
-
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 093c577add..dfceb723ee 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -1635,9 +1635,10 @@ rte_eth_dev_is_removed(uint16_t port_id)
}
static int
-rte_eth_rx_queue_check_split(const struct rte_eth_rxseg_split *rx_seg,
-uint16_t n_seg, uint32_t *mbp_buf_size,
-const struct rte_eth_dev_info *dev_info)
+rte_eth_rx_queue_check_split(uint16_t port_id,
+ const struct rte_eth_rxseg_split *rx_seg,
+ uint16_t n_seg, uint32_t *mbp_buf_size,
+ const struct rte_eth_dev_info *dev_info)
{
const struct rte_eth_rxseg_capa *seg_capa = &dev_info->rx_seg_capa;
struct rte_mempool *mp_first;
@@ -1660,6 +1661,7 @@ rte_eth_rx_queue_ch
[PATCH v2 3/4] app/testpmd: add rxhdrs commands and parameters
Add command line parameter:
--rxhdrs=mac,[ipv4,udp]
Set the protocol_hdr of segments to scatter packets on receiving if
split feature is engaged. And the queues with BUFFER_SPLIT flag.
Add interactive mode command:
testpmd>set rxhdrs mac,ipv4,tcp,udp,sctp
(protocol sequence should be valid)
The protocol split feature is off by default. To enable protocol split,
you need:
1. Start testpmd with multiple mempools. E.g. --mbuf-size=2048,2048
2. Configure Rx queue with rx_offload buffer split on.
3. Set the protocol type of buffer split. E.g. set rxhdrs mac,ipv4
(default protocols of testpmd : mac|icmp|ipv4|ipv6|tcp|udp|
sctp|inner_mac|inner_ipv4|inner_ipv6|
inner_tcp|inner_udp|inner_sctp)
Above protocols can be configured in testpmd. But the configuration can
only be applied when it is supported by specific pmd.
Signed-off-by: Yuan Wang
Signed-off-by: Xuan Ding
Signed-off-by: Wenxuan Wu
---
app/test-pmd/cmdline.c| 123 +-
app/test-pmd/config.c | 70 ++
app/test-pmd/parameters.c | 16 -
app/test-pmd/testpmd.c| 2 +
app/test-pmd/testpmd.h| 6 ++
5 files changed, 213 insertions(+), 4 deletions(-)
diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c
index b4fe9dfb17..f00b7bc6a4 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -183,7 +183,7 @@ static void cmd_help_long_parsed(void *parsed_result,
"show (rxq|txq) info (port_id) (queue_id)\n"
"Display information for configured RX/TX
queue.\n\n"
- "show config (rxtx|cores|fwd|rxoffs|rxpkts|txpkts)\n"
+ "show config
(rxtx|cores|fwd|rxoffs|rxpkts|rxhdrs|txpkts)\n"
"Display the given configuration.\n\n"
"read rxd (port_id) (queue_id) (rxd_id)\n"
@@ -307,6 +307,14 @@ static void cmd_help_long_parsed(void *parsed_result,
" Affects only the queues configured with split"
" offloads.\n\n"
+ "set rxhdrs (mac[,ipv4])*\n"
+ " Set the protocol hdr of each segment to scatter"
+ " packets on receiving if split feature is engaged."
+ " Affects only the queues configured with split"
+ " offloads.\n\n"
+ " Supported proto header:
mac|ipv4|ipv6|tcp|udp|sctp|"
+
"inner_mac|inner_ipv4|inner_ipv6|inner_tcp|inner_udp|inner_sctp\n"
+
"set txpkts (x[,y]*)\n"
"Set the length of each segment of TXONLY"
" and optionally CSUM packets.\n\n"
@@ -3456,6 +3464,68 @@ static cmdline_parse_inst_t cmd_stop = {
},
};
+static unsigned int
+get_ptype(char *value)
+{
+ uint32_t protocol;
+
+ if (!strcmp(value, "mac"))
+ protocol = RTE_PTYPE_L2_ETHER;
+ else if (!strcmp(value, "ipv4"))
+ protocol = RTE_PTYPE_L3_IPV4;
+ else if (!strcmp(value, "ipv6"))
+ protocol = RTE_PTYPE_L3_IPV6;
+ else if (!strcmp(value, "tcp"))
+ protocol = RTE_PTYPE_L4_TCP;
+ else if (!strcmp(value, "udp"))
+ protocol = RTE_PTYPE_L4_UDP;
+ else if (!strcmp(value, "sctp"))
+ protocol = RTE_PTYPE_L4_SCTP;
+ else if (!strcmp(value, "inner_mac"))
+ protocol = RTE_PTYPE_INNER_L2_ETHER;
+ else if (!strcmp(value, "inner_ipv4"))
+ protocol = RTE_PTYPE_INNER_L3_IPV4;
+ else if (!strcmp(value, "inner_ipv6"))
+ protocol = RTE_PTYPE_INNER_L3_IPV6;
+ else if (!strcmp(value, "inner_tcp"))
+ protocol = RTE_PTYPE_INNER_L4_TCP;
+ else if (!strcmp(value, "inner_udp"))
+ protocol = RTE_PTYPE_INNER_L4_UDP;
+ else if (!strcmp(value, "inner_sctp"))
+ protocol = RTE_PTYPE_INNER_L4_SCTP;
+ else {
+ fprintf(stderr, "Unsupported protocol: %s\n", value);
+ protocol = RTE_PTYPE_UNKNOWN;
+ }
+
+ return protocol;
+}
+/* *** SET RXHDRSLIST *** */
+
+unsigned int
+parse_hdrs_list(const char *str, const char *item_name, unsigned int max_items,
+ unsigned int *parsed_items, int
check_hdrs_sequence)
+{
+ unsigned int nb_item;
+ char *cur;
+ char *tmp;
+
+ nb_item = 0;
+ char *str2 = strdup(str);
+ cur = strtok_r(str2, ",", &tmp);
+ while (cur != NULL) {
+ parsed_items[nb_item] = get_ptype(cur);
+ cur = strtok_r(NULL, ",", &tmp);
+ nb_item++;
+ }
+ if (nb_item > max_items)
+ fprintf(stderr, "Number of %s = %u > %u (maximum items)\n",
+ item_name, nb_item + 1, max_items);
+ free(str2);
[PATCH v2 4/4] net/ice: support buffer split in Rx path
This patch adds support for protocol based buffer split in normal Rx
data paths. When the Rx queue is configured with specific protocol type,
packets received will be directly split into protocol header and
payload parts limitation of ice pmd. And the two parts will be
put into different mempools.
Currently, protocol based buffer split is not supported in vectorized
paths.
A new api ice_buffer_split_supported_hdr_ptypes_get() has been
introduced, it will return the supported header protocols of ice PMD
to app for splitting.
Signed-off-by: Yuan Wang
Signed-off-by: Xuan Ding
Signed-off-by: Wenxuan Wu
Reviewed-by: Qi Zhang
---
doc/guides/nics/features/ice.ini | 1 +
doc/guides/rel_notes/release_22_11.rst | 4 +
drivers/net/ice/ice_ethdev.c | 30 +++-
drivers/net/ice/ice_rxtx.c | 220 +
drivers/net/ice/ice_rxtx.h | 16 ++
drivers/net/ice/ice_rxtx_vec_common.h | 3 +
6 files changed, 242 insertions(+), 32 deletions(-)
diff --git a/doc/guides/nics/features/ice.ini b/doc/guides/nics/features/ice.ini
index 7861790a51..bf978ab7f5 100644
--- a/doc/guides/nics/features/ice.ini
+++ b/doc/guides/nics/features/ice.ini
@@ -7,6 +7,7 @@
; is selected.
;
[Features]
+Buffer split = P
Speed capabilities = Y
Link status = Y
Link status event= Y
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index f3b58c7895..99af35714d 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -66,6 +66,10 @@ New Features
User can choose length or protocol header to configure buffer split
according to NIC's capability.
+* **Updated Intel ice driver.**
+
+ Added protocol based buffer split support in scalar path.
+
Removed Items
-
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index b2300790ae..3e140439ff 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -169,6 +169,7 @@ static int ice_timesync_read_time(struct rte_eth_dev *dev,
static int ice_timesync_write_time(struct rte_eth_dev *dev,
const struct timespec *timestamp);
static int ice_timesync_disable(struct rte_eth_dev *dev);
+static const uint32_t *ice_buffer_split_supported_hdr_ptypes_get(struct
rte_eth_dev *dev);
static const struct rte_pci_id pci_id_ice_map[] = {
{ RTE_PCI_DEVICE(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E823L_BACKPLANE) },
@@ -280,6 +281,7 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
.timesync_write_time = ice_timesync_write_time,
.timesync_disable = ice_timesync_disable,
.tm_ops_get = ice_tm_ops_get,
+ .buffer_split_supported_hdr_ptypes_get =
ice_buffer_split_supported_hdr_ptypes_get,
};
/* store statistics names and its offset in stats structure */
@@ -3749,7 +3751,8 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
RTE_ETH_RX_OFFLOAD_OUTER_IPV4_CKSUM |
RTE_ETH_RX_OFFLOAD_VLAN_EXTEND |
RTE_ETH_RX_OFFLOAD_RSS_HASH |
- RTE_ETH_RX_OFFLOAD_TIMESTAMP;
+ RTE_ETH_RX_OFFLOAD_TIMESTAMP |
+ RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT;
dev_info->tx_offload_capa |=
RTE_ETH_TX_OFFLOAD_QINQ_INSERT |
RTE_ETH_TX_OFFLOAD_IPV4_CKSUM |
@@ -3761,7 +3764,7 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->flow_type_rss_offloads |= ICE_RSS_OFFLOAD_ALL;
}
- dev_info->rx_queue_offload_capa = 0;
+ dev_info->rx_queue_offload_capa = RTE_ETH_RX_OFFLOAD_BUFFER_SPLIT;
dev_info->tx_queue_offload_capa = RTE_ETH_TX_OFFLOAD_MBUF_FAST_FREE;
dev_info->reta_size = pf->hash_lut_size;
@@ -3830,6 +3833,11 @@ ice_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
dev_info->default_rxportconf.ring_size = ICE_BUF_SIZE_MIN;
dev_info->default_txportconf.ring_size = ICE_BUF_SIZE_MIN;
+ dev_info->rx_seg_capa.max_nseg = ICE_RX_MAX_NSEG;
+ dev_info->rx_seg_capa.multi_pools = 1;
+ dev_info->rx_seg_capa.offset_allowed = 0;
+ dev_info->rx_seg_capa.offset_align_log2 = 0;
+
return 0;
}
@@ -5886,6 +5894,24 @@ ice_timesync_disable(struct rte_eth_dev *dev)
return 0;
}
+static const uint32_t *
+ice_buffer_split_supported_hdr_ptypes_get(struct rte_eth_dev *dev __rte_unused)
+{
+/* Buffer split protocol header capability. */
+ static const uint32_t ptypes[] = {
+ RTE_PTYPE_L2_ETHER,
+ RTE_PTYPE_INNER_L2_ETHER,
+ RTE_PTYPE_INNER_L3_IPV4,
+ RTE_PTYPE_INNER_L3_IPV6,
+ RTE_PTYPE_INNER_L4_TCP,
+ RTE_PTYPE_INNER_L4_UDP,
+ RTE_PTYPE_INNER_
Re: [PATCH v2 1/4] net/axgbe: fix scattered Rx
On 9/1/2022 1:49 PM, Bhagyada Modali wrote:
Error check needs to be done only for last segment of Jumbo packet.
Freed first_seg and reset eop to 0 in error case
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
v2:
* removed the extra paranthesis
* initialised the variables
* updated the commit logs
Patchset looks good to me, only stable tag (Cc: sta...@dpdk.org) is
missing which can be added while merging.
Will wait maintainer ack to proceed.
Re: [PATCH] examples: compilation fix for GCC-12
On Thu, 1 Sep 2022 13:53:43 +0530
Amit Prakash Shukla wrote:
> diff --git a/examples/common/neon/port_group.h
> b/examples/common/neon/port_group.h
> index 82c6ed6d73..97da604583 100644
> --- a/examples/common/neon/port_group.h
> +++ b/examples/common/neon/port_group.h
> @@ -24,7 +24,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp,
> uint16x8_t dp1,
> union {
> uint16_t u16[FWDSTEP + 1];
> uint64_t u64;
> - } *pnum = (void *)pn;
> + } __attribute__((__packed__)) *pnum = (void *)pn;
Use __rte_packed instead of direct attribute
Re: [PATCH v2 01/10] net/gve: introduce GVE PMD base code
On 8/29/2022 9:41 AM, Junfeng Guo wrote: The following base code is based on Google Virtual Ethernet (gve) driver v1.3.0 under MIT license. - gve_adminq.c - gve_adminq.h - gve_desc.h - gve_desc_dqo.h - gve_register.h The original code is in: https://github.com/GoogleCloudPlatform/compute-virtual-ethernet-linux/\ tree/v1.3.0/google/gve Signed-off-by: Xiaoyun Li Signed-off-by: Haiyue Wang Signed-off-by: Junfeng Guo --- drivers/net/gve/gve_adminq.c | 925 + drivers/net/gve/gve_adminq.h | 381 ++ drivers/net/gve/gve_desc.h | 137 + drivers/net/gve/gve_desc_dqo.h | 254 + drivers/net/gve/gve_register.h | 28 + 5 files changed, 1725 insertions(+) create mode 100644 drivers/net/gve/gve_adminq.c create mode 100644 drivers/net/gve/gve_adminq.h create mode 100644 drivers/net/gve/gve_desc.h create mode 100644 drivers/net/gve/gve_desc_dqo.h create mode 100644 drivers/net/gve/gve_register.h diff --git a/drivers/net/gve/gve_adminq.c b/drivers/net/gve/gve_adminq.c new file mode 100644 index 00..8a724f12c6 --- /dev/null +++ b/drivers/net/gve/gve_adminq.c @@ -0,0 +1,925 @@ +/* SPDX-License-Identifier: MIT + * Google Virtual Ethernet (gve) driver + * Version: 1.3.0 + * Copyright (C) 2015-2022 Google, Inc. + * Copyright(C) 2022 Intel Corporation + */ + Can you please get approval for the MIT license from techboard, as Stephen highlighted in previous version?
Re: [PATCH v2 00/10] introduce GVE PMD
On 8/29/2022 9:41 AM, Junfeng Guo wrote: Introduce a new PMD for Google Virtual Ethernet (GVE). This patch set requires an exception for MIT license for GVE base code. And the base code includes the following files: - gve_adminq.c - gve_adminq.h - gve_desc.h - gve_desc_dqo.h - gve_register.h It's based on GVE kernel driver v1.3.0 and the original code is in https://github.com/GoogleCloudPlatform/compute-virtual-ethernet-linux/tree/v1.3.0 v2: fix some CI check error. Junfeng Guo (10): net/gve: introduce GVE PMD base code net/gve: add logs and OS specific implementation net/gve: support device initialization net/gve: add link update support net/gve: add MTU set support net/gve: add queue operations net/gve: add Rx/Tx support net/gve: add support to get dev info and configure dev net/gve: add stats support doc: update documentation Please check build error reported by CI: https://patches.dpdk.org/project/dpdk/patch/20220829084127.934183-11-junfeng@intel.com/ I am also getting various build errors, even not able to reach patch by patch build stage where I expect some issues, can you please verify patch by patch build in next version?
Re: [PATCH v2 10/10] doc: update documentation
On 8/29/2022 9:41 AM, Junfeng Guo wrote: CAUTION: This message has originated from an External Source. Please use proper judgment and caution when opening attachments, clicking links, or responding to this email. Update documentation of GVE PMD and release note. Signed-off-by: Xiaoyun Li Signed-off-by: Junfeng Guo --- MAINTAINERS| 6 +++ doc/guides/nics/features/gve.ini | 18 +++ doc/guides/nics/gve.rst| 65 ++ doc/guides/rel_notes/release_22_11.rst | 4 ++ 4 files changed, 93 insertions(+) create mode 100644 doc/guides/nics/features/gve.ini create mode 100644 doc/guides/nics/gve.rst Need to update index file (doc/guides/nics/index.rst) to make new gve.rst file visible. Did you test build and viewing the documentation? diff --git a/MAINTAINERS b/MAINTAINERS index 32ffdd1a61..474f41f0de 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -697,6 +697,12 @@ F: drivers/net/enic/ F: doc/guides/nics/enic.rst F: doc/guides/nics/features/enic.ini +Google Virtual Ethernet +M: Junfeng Guo +F: drivers/net/gve/ +F: doc/guides/nics/gve.rst +F: doc/guides/nics/features/gve.ini + Hisilicon hns3 M: Dongdong Liu M: Yisen Zhuang diff --git a/doc/guides/nics/features/gve.ini b/doc/guides/nics/features/gve.ini new file mode 100644 index 00..180408aa80 --- /dev/null +++ b/doc/guides/nics/features/gve.ini @@ -0,0 +1,18 @@ +; +; Supported features of the Google Virtual Ethernet 'gve' poll mode driver. +; +; Refer to default.ini for the full list of available PMD features. +; +[Features] +Speed capabilities = Y +Link status = Y +MTU update = Y +TSO = Y +RSS hash = Y +L4 checksum offload = Y +Basic stats = Y +Stats per queue = Y +Linux= Y +x86-32 = Y +x86-64 = Y +Usage doc= Y Can you please add this patch as first patch with infrastructure files (like meson files, .map file etc..) and later update the .ini with each patch, as a patch introduces a feature update .ini to add that feature. diff --git a/doc/guides/nics/gve.rst b/doc/guides/nics/gve.rst new file mode 100644 index 00..20cda5031b --- /dev/null +++ b/doc/guides/nics/gve.rst @@ -0,0 +1,65 @@ +.. SPDX-License-Identifier: BSD-3-Clause +Copyright(C) 2022 Intel Corporation. + +GVE poll mode driver +=== + +The GVE PMD (**librte_net_gve**) provides poll mode driver support for +Google Virtual Ethernet device. + Can you please provide some references for the device? Official product link etc... +The base code is under MIT license and based on GVE kernel driver v1.3.0. +GVE base code files are: + +- gve_adminq.h +- gve_adminq.c +- gve_desc.h +- gve_desc_dqo.h +- gve_register.h + Instead of listing these files in the documentation, what do you think to place under a 'base' folder (drivers/net/gve/base/*) which will clarify that these are base code files. +Please refer to https://github.com/GoogleCloudPlatform/compute-virtual-ethernet-linux/tree/v1.3.0/google/gve +to find the original base code. + +GVE has 3 queue formats: + +- GQI_QPL - GQI with queue page list +- GQI_RDA - GQI with raw DMA addressing +- DQO_RDA - DQO with raw DMA addressing + +GQI_QPL queue format is queue page list mode. Driver needs to allocate +memory and register this memory as a Queue Page List (QPL) in hardware +(Google Hypervisor/GVE Backend) first. Each queue has its own QPL. +Then Tx needs to copy packets to QPL memory and put this packet's offset +in the QPL memory into hardware descriptors so that hardware can get the +packets data. And Rx needs to read descriptors of offset in QPL to get +QPL address and copy packets from the address to get real packets data. + +GQI_RDA queue format works like usual NICs that driver can put packets' +physical address into hardware descriptors. + +DQO_RDA queue format has submission and completion queue pair for each +Tx/Rx queue. And similar as GQI_RDA, driver can put packets' physical +address into hardware descriptors. + +Please refer to https://www.kernel.org/doc/html/latest/networking/device_drivers/ethernet/google/gve.html +to get more information about GVE queue formats. + +Features and Limitations + + +In this release, the GVE PMD provides the basic functionality of packet +reception and transmission. +Supported features of the GVE PMD are: + +- Multiple queues for TX and RX +- Receiver Side Scaling (RSS) +- TSO offload +- Port hardware statistics +- Link state information +- TX multi-segments (Scatter TX) +- Tx UDP/TCP/SCTP Checksum + Same comment as .ini file above. Let's build the features list gradually as code adds them, instead of adding it as batch at the end.
Re: [PATCH v2 02/10] net/gve: add logs and OS specific implementation
On 8/29/2022 9:41 AM, Junfeng Guo wrote: Add GVE PMD logs. Add some MACRO definitions and memory operations which are specific for DPDK. Signed-off-by: Haiyue Wang Signed-off-by: Xiaoyun Li Signed-off-by: Junfeng Guo <...> diff --git a/drivers/net/gve/gve_logs.h b/drivers/net/gve/gve_logs.h new file mode 100644 index 00..a050253f59 --- /dev/null +++ b/drivers/net/gve/gve_logs.h @@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(C) 2022 Intel Corporation + */ + +#ifndef _GVE_LOGS_H_ +#define _GVE_LOGS_H_ + +extern int gve_logtype_init; +extern int gve_logtype_driver; + +#define PMD_INIT_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, gve_logtype_init, "%s(): " fmt "\n", \ + __func__, ##args) + +#define PMD_DRV_LOG_RAW(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, gve_logtype_driver, "%s(): " fmt, \ + __func__, ## args) + > +#define PMD_DRV_LOG(level, fmt, args...) \ + PMD_DRV_LOG_RAW(level, fmt "\n", ## args) + Why 'PMD_DRV_LOG_RAW' is needed, why not directly use 'PMD_DRV_LOG'? Do you really need two different log types? How do you differentiate 'init' & 'driver' types? As far as I can see there is mixed usage of them.
Re: [PATCH v2 03/10] net/gve: support device initialization
On 8/29/2022 9:41 AM, Junfeng Guo wrote:
Support device init and the fowllowing devops:
- dev_configure
- dev_start
- dev_stop
- dev_close
Signed-off-by: Haiyue Wang
Signed-off-by: Xiaoyun Li
Signed-off-by: Junfeng Guo
---
drivers/net/gve/gve.h| 249 +++
drivers/net/gve/gve_adminq.c | 1 +
drivers/net/gve/gve_ethdev.c | 375 +++
drivers/net/gve/meson.build | 13 ++
drivers/net/gve/version.map | 3 +
drivers/net/meson.build | 1 +
6 files changed, 642 insertions(+)
create mode 100644 drivers/net/gve/gve.h
create mode 100644 drivers/net/gve/gve_ethdev.c
create mode 100644 drivers/net/gve/meson.build
create mode 100644 drivers/net/gve/version.map
diff --git a/drivers/net/gve/gve.h b/drivers/net/gve/gve.h
new file mode 100644
index 00..704c88983c
--- /dev/null
+++ b/drivers/net/gve/gve.h
@@ -0,0 +1,249 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2022 Intel Corporation
+ */
+
+#ifndef _GVE_H_
+#define _GVE_H_
+
+#include
+#include
+#include
+
+#include "gve_desc.h"
+
+#ifndef GOOGLE_VENDOR_ID
+#define GOOGLE_VENDOR_ID 0x1ae0
+#endif
+
+#define GVE_DEV_ID 0x0042
+
+#define GVE_REG_BAR0
+#define GVE_DB_BAR 2
+
+/* 1 for management, 1 for rx, 1 for tx */
+#define GVE_MIN_MSIX 3
+
+/* PTYPEs are always 10 bits. */
+#define GVE_NUM_PTYPES 1024
+
+/* A list of pages registered with the device during setup and used by a queue
+ * as buffers
+ */
+struct gve_queue_page_list {
+ uint32_t id; /* unique id */
+ uint32_t num_entries;
+ dma_addr_t *page_buses; /* the dma addrs of the pages */
+ const struct rte_memzone *mz;
+};
+
+/* A TX desc ring entry */
+union gve_tx_desc {
+ struct gve_tx_pkt_desc pkt; /* first desc for a packet */
+ struct gve_tx_seg_desc seg; /* subsequent descs for a packet */
+};
+
+struct gve_tx_queue {
+ volatile union gve_tx_desc *tx_desc_ring;
+ const struct rte_memzone *mz;
+ uint64_t tx_ring_phys_addr;
+
+ uint16_t nb_tx_desc;
+
+ /* Only valid for DQO_QPL queue format */
+ struct gve_queue_page_list *qpl;
+
+ uint16_t port_id;
+ uint16_t queue_id;
+
+ uint16_t ntfy_id;
+ volatile rte_be32_t *ntfy_addr;
+
+ struct gve_priv *hw;
+ const struct rte_memzone *qres_mz;
+ struct gve_queue_resources *qres;
+
+ /* Only valid for DQO_RDA queue format */
+ struct gve_tx_queue *complq;
+};
+
+struct gve_rx_queue {
+ volatile struct gve_rx_desc *rx_desc_ring;
+ volatile union gve_rx_data_slot *rx_data_ring;
+ const struct rte_memzone *mz;
+ const struct rte_memzone *data_mz;
+ uint64_t rx_ring_phys_addr;
+
+ uint16_t nb_rx_desc;
+
+ volatile rte_be32_t *ntfy_addr;
+
+ /* only valid for GQI_QPL queue format */
+ struct gve_queue_page_list *qpl;
+
+ struct gve_priv *hw;
+ const struct rte_memzone *qres_mz;
+ struct gve_queue_resources *qres;
+
+ uint16_t port_id;
+ uint16_t queue_id;
+ uint16_t ntfy_id;
+ uint16_t rx_buf_len;
+
+ /* Only valid for DQO_RDA queue format */
+ struct gve_rx_queue *bufq;
+};
+
+struct gve_irq_db {
+ rte_be32_t id;
+} cacheline_aligned;
+
+struct gve_ptype {
+ uint8_t l3_type; /* `gve_l3_type` in gve_adminq.h */
+ uint8_t l4_type; /* `gve_l4_type` in gve_adminq.h */
+};
+
+struct gve_ptype_lut {
+ struct gve_ptype ptypes[GVE_NUM_PTYPES];
+};
+
+enum gve_queue_format {
+ GVE_QUEUE_FORMAT_UNSPECIFIED = 0x0, /* default unspecified */
+ GVE_GQI_RDA_FORMAT = 0x1, /* GQI Raw Addressing */
+ GVE_GQI_QPL_FORMAT = 0x2, /* GQI Queue Page List */
+ GVE_DQO_RDA_FORMAT = 0x3, /* DQO Raw Addressing */
+};
+
Shouldn't these queue format information be part of 'base' file? Both
for licensing issues also to cover the case it is updated in the google
repo.
But if some dpdk related information is required, what do you think to
split this file as one for base folder, other for dpdk?
+struct gve_priv {
+ struct gve_irq_db *irq_dbs; /* array of num_ntfy_blks */
+ const struct rte_memzone *irq_dbs_mz;
+ uint32_t mgmt_msix_idx;
+ rte_be32_t *cnt_array; /* array of num_event_counters */
+ const struct rte_memzone *cnt_array_mz;
+
+ uint16_t num_event_counters;
+ uint16_t tx_desc_cnt; /* txq size */
+ uint16_t rx_desc_cnt; /* rxq size */
+ uint16_t tx_pages_per_qpl; /* tx buffer length */
+ uint16_t rx_data_slot_cnt; /* rx buffer length */
+
+ /* Only valid for DQO_RDA queue format */
+ uint16_t tx_compq_size; /* tx completion queue size */
+ uint16_t rx_bufq_size; /* rx buff queue size */
+
+ uint64_t max_registered_pages;
+ uint64_t num_registered_pages; /* num pages registered with NIC */
+ uint16_t default_num_que
Re: [PATCH v2 03/10] net/gve: support device initialization
On 8/29/2022 9:41 AM, Junfeng Guo wrote:
diff --git a/drivers/net/gve/version.map b/drivers/net/gve/version.map
new file mode 100644
index 00..c2e0723b4c
--- /dev/null
+++ b/drivers/net/gve/version.map
@@ -0,0 +1,3 @@
+DPDK_22 {
+ local: *;
+};
It should be 'DPDK_23' now.
@Bruce, @David, @Thomas, @Andrew,
This is one of the common errors as far as I can see, and many times the
.map is just empty and required because of the build process.
Can we add a build system magic to let libraries/drivers use a common
template for the .map file, unless library/driver needs something special?
This prevents this trivial error also reduces overhead for the
'yy.mm-rc0' commit.
Re: [PATCH v2 04/10] net/gve: add link update support
On 8/29/2022 9:41 AM, Junfeng Guo wrote:
Support dev_ops link_update.
Signed-off-by: Xiaoyun Li
Signed-off-by: Junfeng Guo
---
drivers/net/gve/gve_ethdev.c | 30 ++
1 file changed, 30 insertions(+)
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index f10f273f7d..435115c047 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -37,10 +37,39 @@ gve_dev_configure(__rte_unused struct rte_eth_dev *dev)
return 0;
}
+static int
+gve_link_update(struct rte_eth_dev *dev, __rte_unused int wait_to_complete)
+{
+ struct gve_priv *priv = dev->data->dev_private;
+ struct rte_eth_link link;
+ int err;
+
+ memset(&link, 0, sizeof(link));
+ link.link_duplex = RTE_ETH_LINK_FULL_DUPLEX;
+ link.link_autoneg = RTE_ETH_LINK_AUTONEG;
+
+ if (!dev->data->dev_started) {
+ link.link_status = RTE_ETH_LINK_DOWN;
+ link.link_speed = RTE_ETH_SPEED_NUM_NONE;
+ } else {
+ link.link_status = RTE_ETH_LINK_UP;
+ PMD_INIT_LOG(DEBUG, "Get link status from hw");
+ err = gve_adminq_report_link_speed(priv);
As far as I can see the API is calling an adminq command, is this
command blocking until link is up? If so is there a non blocking version
to utilize 'wait_to_complete', instead of ignoring it?
Also what will happen if 'start()' dev_ops called but cable is not
plugged in at all, won't this set link status still to "UP"?
Re: [PATCH v2 08/10] net/gve: add support to get dev info and configure dev
On 8/29/2022 9:41 AM, Junfeng Guo wrote:
Add dev_ops dev_infos_get.
Complete dev_configure with RX offloads configuration.
Signed-off-by: Xiaoyun Li
Signed-off-by: Junfeng Guo
---
drivers/net/gve/gve.h| 3 ++
drivers/net/gve/gve_ethdev.c | 61
2 files changed, 64 insertions(+)
diff --git a/drivers/net/gve/gve.h b/drivers/net/gve/gve.h
index 7f4d0e37f3..004e0a75ca 100644
--- a/drivers/net/gve/gve.h
+++ b/drivers/net/gve/gve.h
@@ -27,6 +27,9 @@
#define GVE_DEFAULT_TX_FREE_THRESH 256
#define GVE_TX_MAX_FREE_SZ 512
+#define GVE_MIN_BUF_SIZE 1024
+#define GVE_MAX_RX_PKTLEN 65535
+
/* PTYPEs are always 10 bits. */
#define GVE_NUM_PTYPES 1024
diff --git a/drivers/net/gve/gve_ethdev.c b/drivers/net/gve/gve_ethdev.c
index 5ebe2c30ea..6bc7bf4519 100644
--- a/drivers/net/gve/gve_ethdev.c
+++ b/drivers/net/gve/gve_ethdev.c
@@ -96,6 +96,14 @@ gve_free_qpls(struct gve_priv *priv)
static int
gve_dev_configure(__rte_unused struct rte_eth_dev *dev)
{
+ struct gve_priv *priv = dev->data->dev_private;
+
+ if (dev->data->dev_conf.rxmode.mq_mode & RTE_ETH_MQ_RX_RSS_FLAG)
+ dev->data->dev_conf.rxmode.offloads |=
RTE_ETH_RX_OFFLOAD_RSS_HASH;
+
+ if (dev->data->dev_conf.rxmode.offloads & RTE_ETH_RX_OFFLOAD_TCP_LRO)
+ priv->enable_lsc = 1;
What is the relation between LRO and LSC? Is it a typo?
And does driver support LSC at all? Or any interrupt?
+
return 0;
}
@@ -266,6 +274,58 @@ gve_dev_close(struct rte_eth_dev *dev)
return err;
}
+static int
+gve_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info)
+{
+ struct gve_priv *priv = dev->data->dev_private;
+
+ dev_info->device = dev->device;
+ dev_info->max_mac_addrs = 1;
+ dev_info->max_rx_queues = priv->max_nb_rxq;
+ dev_info->max_tx_queues = priv->max_nb_txq;
+ dev_info->min_rx_bufsize = GVE_MIN_BUF_SIZE;
+ dev_info->max_rx_pktlen = GVE_MAX_RX_PKTLEN;
+
Can you please provide 'max_mtu' & 'min_mtu' values too?
Re: [PATCH v2 09/10] net/gve: add stats support
On 8/29/2022 9:41 AM, Junfeng Guo wrote:
Update stats add support of dev_ops stats_get/reset.
Signed-off-by: Xiaoyun Li
Signed-off-by: Junfeng Guo
---
drivers/net/gve/gve.h| 10 ++
drivers/net/gve/gve_ethdev.c | 69
drivers/net/gve/gve_rx.c | 15 ++--
drivers/net/gve/gve_tx.c | 12 +++
4 files changed, 104 insertions(+), 2 deletions(-)
diff --git a/drivers/net/gve/gve.h b/drivers/net/gve/gve.h
index 004e0a75ca..e256a2bec2 100644
--- a/drivers/net/gve/gve.h
+++ b/drivers/net/gve/gve.h
@@ -91,6 +91,10 @@ struct gve_tx_queue {
struct gve_queue_page_list *qpl;
struct gve_tx_iovec *iov_ring;
+ /* Stats */
+ uint64_t packets;
+ uint64_t bytes;
+
Can't you get stats for 'errors' in Tx path?
Re: [PATCH v2 01/10] net/gve: introduce GVE PMD base code
On Thu, 1 Sep 2022 18:19:22 +0100 Ferruh Yigit wrote: > > > > diff --git a/drivers/net/gve/gve_adminq.c b/drivers/net/gve/gve_adminq.c > > new file mode 100644 > > index 00..8a724f12c6 > > --- /dev/null > > +++ b/drivers/net/gve/gve_adminq.c > > @@ -0,0 +1,925 @@ > > +/* SPDX-License-Identifier: MIT > > + * Google Virtual Ethernet (gve) driver > > + * Version: 1.3.0 > > + * Copyright (C) 2015-2022 Google, Inc. > > + * Copyright(C) 2022 Intel Corporation > > + */ > > + > > Can you please get approval for the MIT license from techboard, as > Stephen highlighted in previous version? I would prefer that it be BSD or dual licensed. Although MIT and BSD-3 licenses are compatible, this is not something techboard can decide it requires a statement from a knowledgeable open source lawyer (Intel or LF). Please fix the license to BSD and save lots of trouble.
RE: [PATCH v3] dma/cnxk: add support for CN10K DMA engine
> -Original Message-
> From: Radha Mohan Chintakuntla
> Sent: Friday, August 5, 2022 12:30 PM
> To: dev@dpdk.org
> Cc: tho...@monjalon.net; Radha Chintakuntla ; Nithin
> Kumar Dabilpuram ; Kiran Kumar Kokkilagadda
> ; Sunil Kumar Kori ; Satha
> Koteswara Rao Kottidi ; Veerasenareddy Burru
>
> Subject: [PATCH v3] dma/cnxk: add support for CN10K DMA engine
>
> Added support for CN10K SoC DMA engine to dmadev.
>
> Signed-off-by: Radha Mohan Chintakuntla
> Reviewed-by: Jerin Jacob Kollanukkaran
> ---
> Changes from v2:
> - Added missing files required in the patch
>
> Changes from v1:
> - Removed gerrit changeID
>
> drivers/common/cnxk/hw/dpi.h | 16 +-
> drivers/common/cnxk/roc_dpi_priv.h | 2 +-
> drivers/dma/cnxk/cnxk_dmadev.c | 248 +
> drivers/dma/cnxk/cnxk_dmadev.h | 2 +-
> 4 files changed, 225 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/common/cnxk/hw/dpi.h b/drivers/common/cnxk/hw/dpi.h
> index 2da123228f..a34713dde6 100644
> --- a/drivers/common/cnxk/hw/dpi.h
> +++ b/drivers/common/cnxk/hw/dpi.h
> @@ -61,7 +61,7 @@
> */
> union dpi_instr_hdr_s {
> uint64_t u[4];
> - struct dpi_dma_instr_hdr_s_s {
> + struct dpi_cn9k_instr_hdr_s_s {
> uint64_t tag : 32;
> uint64_t tt : 2;
> uint64_t grp : 10;
> @@ -93,17 +93,9 @@ union dpi_instr_hdr_s {
> /* Word 2 - End */
> uint64_t reserved_192_255 : 64;
> /* Word 3 - End */
> - } s;
> -};
> + } cn9k;
>
> -/**
> - * Structure dpi_cn10k_instr_hdr_s for CN10K
> - *
> - * DPI DMA Instruction Header Format
> - */
> -union dpi_cn10k_instr_hdr_s {
> - uint64_t u[4];
> - struct dpi_cn10k_dma_instr_hdr_s_s {
> + struct dpi_cn10k_instr_hdr_s_s {
> uint64_t nfst : 4;
> uint64_t reserved_4_5 : 2;
> uint64_t nlst : 4;
> @@ -135,7 +127,7 @@ union dpi_cn10k_instr_hdr_s {
> /* Word 2 - End */
> uint64_t reserved_192_255 : 64;
> /* Word 3 - End */
> - } s;
> + } cn10k;
> };
>
> #endif /*__DEV_DPI_HW_H__*/
> diff --git a/drivers/common/cnxk/roc_dpi_priv.h
> b/drivers/common/cnxk/roc_dpi_priv.h
> index 92953fbcfc..1fa1a715d3 100644
> --- a/drivers/common/cnxk/roc_dpi_priv.h
> +++ b/drivers/common/cnxk/roc_dpi_priv.h
> @@ -23,7 +23,7 @@ typedef union dpi_mbox_msg_t {
> uint64_t u[2];
> struct dpi_mbox_message_s {
> /* VF ID to configure */
> - uint64_t vfid : 4;
> + uint64_t vfid : 8;
> /* Command code */
> uint64_t cmd : 4;
> /* Command buffer size in 8-byte words */ diff --git
> a/drivers/dma/cnxk/cnxk_dmadev.c b/drivers/dma/cnxk/cnxk_dmadev.c index
> 2824c1b44f..a67bcba9d4 100644
> --- a/drivers/dma/cnxk/cnxk_dmadev.c
> +++ b/drivers/dma/cnxk/cnxk_dmadev.c
> @@ -70,31 +70,31 @@ cnxk_dmadev_vchan_setup(struct rte_dma_dev *dev,
> uint16_t vchan,
> RTE_SET_USED(vchan);
> RTE_SET_USED(conf_sz);
>
> - header->s.pt = DPI_HDR_PT_ZBW_CA;
> + header->cn9k.pt = DPI_HDR_PT_ZBW_CA;
>
> switch (conf->direction) {
> case RTE_DMA_DIR_DEV_TO_MEM:
> - header->s.xtype = DPI_XTYPE_INBOUND;
> - header->s.lport = conf->src_port.pcie.coreid;
> - header->s.fport = 0;
> - header->s.pvfe = 1;
> + header->cn9k.xtype = DPI_XTYPE_INBOUND;
> + header->cn9k.lport = conf->src_port.pcie.coreid;
> + header->cn9k.fport = 0;
> + header->cn9k.pvfe = 1;
> break;
> case RTE_DMA_DIR_MEM_TO_DEV:
> - header->s.xtype = DPI_XTYPE_OUTBOUND;
> - header->s.lport = 0;
> - header->s.fport = conf->dst_port.pcie.coreid;
> - header->s.pvfe = 1;
> + header->cn9k.xtype = DPI_XTYPE_OUTBOUND;
> + header->cn9k.lport = 0;
> + header->cn9k.fport = conf->dst_port.pcie.coreid;
> + header->cn9k.pvfe = 1;
> break;
> case RTE_DMA_DIR_MEM_TO_MEM:
> - header->s.xtype = DPI_XTYPE_INTERNAL_ONLY;
> - header->s.lport = 0;
> - header->s.fport = 0;
> - header->s.pvfe = 0;
> + header->cn9k.xtype = DPI_XTYPE_INTERNAL_ONLY;
> + header->cn9k.lport = 0;
> + header->cn9k.fport = 0;
> + header->cn9k.pvfe = 0;
> break;
> case RTE_DMA_DIR_DEV_TO_DEV:
> - header->s.xtype = DPI_XTYPE_EXTERNAL_ONLY;
> - header->s.lport = conf->src_port.pcie.coreid;
> - header->s.fport = conf->dst_port.pcie.coreid;
> + header->cn9k.xtype = DPI_XTYPE_EXTERNAL_ONLY;
> + header->cn9k.lport = conf->src_port.pcie.coreid;
> + header->cn9k.fport = conf->dst_port.pcie.coreid;
> };
>
> for (i = 0; i < conf->nb_desc; i++) {
> @@ -103,6 +103,63 @@ cnxk
RE: [PATCH v1 00/10] baseband/acc200
Hi Tom, > -Original Message- > From: Tom Rix > Sent: Thursday, September 1, 2022 6:49 AM > To: Chautru, Nicolas ; Maxime Coquelin > ; dev@dpdk.org; tho...@monjalon.net; > gak...@marvell.com; hemant.agra...@nxp.com; Vargas, Hernan > > Cc: m...@ashroe.eu; Richardson, Bruce ; > david.march...@redhat.com; step...@networkplumber.org > Subject: Re: [PATCH v1 00/10] baseband/acc200 > > > On 8/31/22 6:26 PM, Chautru, Nicolas wrote: > > Hi Tom, > > > >> -Original Message- > >> From: Tom Rix > >> Sent: Wednesday, August 31, 2022 5:28 PM > >> To: Chautru, Nicolas ; Maxime Coquelin > >> ; dev@dpdk.org; > tho...@monjalon.net; > >> gak...@marvell.com; hemant.agra...@nxp.com; Vargas, Hernan > >> > >> Cc: m...@ashroe.eu; Richardson, Bruce ; > >> david.march...@redhat.com; step...@networkplumber.org > >> Subject: Re: [PATCH v1 00/10] baseband/acc200 > >> > >> > >> On 8/31/22 3:37 PM, Chautru, Nicolas wrote: > >>> Hi Thomas, Tom, > >>> > -Original Message- > From: Tom Rix > Sent: Wednesday, August 31, 2022 12:26 PM > To: Chautru, Nicolas ; Maxime Coquelin > ; dev@dpdk.org; > tho...@monjalon.net; > gak...@marvell.com; hemant.agra...@nxp.com; Vargas, Hernan > > Cc: m...@ashroe.eu; Richardson, Bruce ; > david.march...@redhat.com; step...@networkplumber.org > Subject: Re: [PATCH v1 00/10] baseband/acc200 > > > On 8/30/22 12:45 PM, Chautru, Nicolas wrote: > > Hi Maxime, > > > >> -Original Message- > >> From: Maxime Coquelin > >> Sent: Tuesday, August 30, 2022 12:45 AM > >> To: Chautru, Nicolas ; dev@dpdk.org; > >> tho...@monjalon.net; gak...@marvell.com; > hemant.agra...@nxp.com; > >> t...@redhat.com; Vargas, Hernan > >> Cc: m...@ashroe.eu; Richardson, Bruce > >> ; david.march...@redhat.com; > >> step...@networkplumber.org > >> Subject: Re: [PATCH v1 00/10] baseband/acc200 > >> > >> Hi Nicolas, > >> > >> On 7/12/22 15:48, Maxime Coquelin wrote: > >>> Hi Nicolas, Hernan, > >>> > >>> (Adding Hernan in the recipients list) > >>> > >>> On 7/8/22 02:01, Nicolas Chautru wrote: > This is targeting 22.11 and includes the PMD for the integrated > accelerator on Intel Xeon SPR-EEC. > There is a dependency on that parallel serie still in-flight > which extends the bbdev api > https://patches.dpdk.org/project/dpdk/list/?series=23894 > > I will be offline for a few weeks for the summer break but > Hernan will cover for me during that time if required. > > Thanks > Nic > > Nicolas Chautru (10): > baseband/acc200: introduce PMD for ACC200 > baseband/acc200: add HW register definitions > baseband/acc200: add info get function > baseband/acc200: add queue configuration > baseband/acc200: add LDPC processing functions > baseband/acc200: add LTE processing functions > baseband/acc200: add support for FFT operations > baseband/acc200: support interrupt > baseband/acc200: add device status and vf2pf comms > baseband/acc200: add PF configure companion function > > MAINTAINERS | 3 + > app/test-bbdev/meson.build | 3 + > app/test-bbdev/test_bbdev_perf.c | 76 + > doc/guides/bbdevs/acc200.rst | 244 ++ > doc/guides/bbdevs/index.rst | 1 + > drivers/baseband/acc200/acc200_pf_enum.h | 468 +++ > drivers/baseband/acc200/acc200_pmd.h | 690 > drivers/baseband/acc200/acc200_vf_enum.h | 89 + > drivers/baseband/acc200/meson.build | 8 + > drivers/baseband/acc200/rte_acc200_cfg.h | 115 + > drivers/baseband/acc200/rte_acc200_pmd.c | 5403 > ++ > drivers/baseband/acc200/version.map | 10 + > drivers/baseband/meson.build | 1 + > 13 files changed, 7111 insertions(+) > create mode 100644 doc/guides/bbdevs/acc200.rst > create mode 100644 > drivers/baseband/acc200/acc200_pf_enum.h > create mode 100644 drivers/baseband/acc200/acc200_pmd.h > create mode 100644 > drivers/baseband/acc200/acc200_vf_enum.h > create mode 100644 drivers/baseband/acc200/meson.build > create mode 100644 > drivers/baseband/acc200/rte_acc200_cfg.h > create mode 100644 > drivers/baseband/acc200/rte_acc200_pmd.c > create mode 100644 drivers/baseband/acc200/version.map > > >>> Comparing ACC200 & ACC100 header files, I understand ACC200 is > >>> an evolution of the
Re: [PATCH v2 01/10] net/gve: introduce GVE PMD base code
01/09/2022 20:23, Stephen Hemminger: > On Thu, 1 Sep 2022 18:19:22 +0100 > Ferruh Yigit wrote: > > > > > > > diff --git a/drivers/net/gve/gve_adminq.c b/drivers/net/gve/gve_adminq.c > > > new file mode 100644 > > > index 00..8a724f12c6 > > > --- /dev/null > > > +++ b/drivers/net/gve/gve_adminq.c > > > @@ -0,0 +1,925 @@ > > > +/* SPDX-License-Identifier: MIT > > > + * Google Virtual Ethernet (gve) driver > > > + * Version: 1.3.0 > > > + * Copyright (C) 2015-2022 Google, Inc. > > > + * Copyright(C) 2022 Intel Corporation > > > + */ > > > + > > > > Can you please get approval for the MIT license from techboard, as > > Stephen highlighted in previous version? > > > I would prefer that it be BSD or dual licensed. > Although MIT and BSD-3 licenses are compatible, this is not something > techboard can decide > it requires a statement from a knowledgeable open source lawyer (Intel or LF). > > Please fix the license to BSD and save lots of trouble. +1 to change to BSD to avoid trouble.
[PATCH 1/2] net/ice: add nic blinking support
From: Markus Theil
Signed-off-by: Markus Theil
---
drivers/net/ice/ice_ethdev.c | 22 ++
1 file changed, 22 insertions(+)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index fc889420c7..f5820d6ccb 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -90,6 +90,8 @@ static int ice_link_update(struct rte_eth_dev *dev,
int wait_to_complete);
static int ice_dev_set_link_up(struct rte_eth_dev *dev);
static int ice_dev_set_link_down(struct rte_eth_dev *dev);
+static int ice_dev_led_on(struct rte_eth_dev *dev);
+static int ice_dev_led_off(struct rte_eth_dev *dev);
static int ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
static int ice_vlan_offload_set(struct rte_eth_dev *dev, int mask);
@@ -215,6 +217,8 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
.dev_reset= ice_dev_reset,
.dev_set_link_up = ice_dev_set_link_up,
.dev_set_link_down= ice_dev_set_link_down,
+ .dev_led_on = ice_dev_led_on,
+ .dev_led_off = ice_dev_led_off,
.rx_queue_start = ice_rx_queue_start,
.rx_queue_stop= ice_rx_queue_stop,
.tx_queue_start = ice_tx_queue_start,
@@ -4074,6 +4078,24 @@ ice_dev_set_link_down(struct rte_eth_dev *dev)
return ice_force_phys_link_state(hw, false);
}
+static int
+ice_dev_led_on(struct rte_eth_dev *dev)
+{
+ struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ int status = ice_aq_set_port_id_led(hw->port_info, false, NULL);
+
+ return status == ICE_SUCCESS ? 0 : -ENOTSUP;
+}
+
+static int
+ice_dev_led_off(struct rte_eth_dev *dev)
+{
+ struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ int status = ice_aq_set_port_id_led(hw->port_info, true, NULL);
+
+ return status == ICE_SUCCESS ? 0 : -ENOTSUP;
+}
+
static int
ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu __rte_unused)
{
--
2.37.3
[PATCH 2/2] net/ice: add basic flow ctrl support for enable/disable/get
From: Markus Theil
Signed-off-by: Markus Theil
---
drivers/net/ice/ice_ethdev.c | 108 +++
1 file changed, 108 insertions(+)
diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index f5820d6ccb..ad93ec8155 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -92,6 +92,10 @@ static int ice_dev_set_link_up(struct rte_eth_dev *dev);
static int ice_dev_set_link_down(struct rte_eth_dev *dev);
static int ice_dev_led_on(struct rte_eth_dev *dev);
static int ice_dev_led_off(struct rte_eth_dev *dev);
+static int ice_dev_flow_ctrl_get(struct rte_eth_dev *dev,
+struct rte_eth_fc_conf *fc_conf);
+static int ice_dev_flow_ctrl_set(struct rte_eth_dev *dev,
+struct rte_eth_fc_conf *fc_conf);
static int ice_mtu_set(struct rte_eth_dev *dev, uint16_t mtu);
static int ice_vlan_offload_set(struct rte_eth_dev *dev, int mask);
@@ -219,6 +223,8 @@ static const struct eth_dev_ops ice_eth_dev_ops = {
.dev_set_link_down= ice_dev_set_link_down,
.dev_led_on = ice_dev_led_on,
.dev_led_off = ice_dev_led_off,
+ .flow_ctrl_get= ice_dev_flow_ctrl_get,
+ .flow_ctrl_set= ice_dev_flow_ctrl_set,
.rx_queue_start = ice_rx_queue_start,
.rx_queue_stop= ice_rx_queue_stop,
.tx_queue_start = ice_tx_queue_start,
@@ -4096,6 +4102,108 @@ ice_dev_led_off(struct rte_eth_dev *dev)
return status == ICE_SUCCESS ? 0 : -ENOTSUP;
}
+static int
+ice_dev_flow_ctrl_get(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+ struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ice_aqc_get_phy_caps_data *pcaps;
+ int tx_pause, rx_pause;
+ int status;
+
+ pcaps = (struct ice_aqc_get_phy_caps_data *)
+ ice_malloc(hw, sizeof(*pcaps));
+ if (!pcaps)
+ return -ENOMEM;
+
+ status = ice_aq_get_phy_caps(hw->port_info, false,
+ ICE_AQC_REPORT_ACTIVE_CFG, pcaps, NULL);
+ if(status)
+ goto out;
+
+ fc_conf->autoneg = ice_is_phy_caps_an_enabled(pcaps);
+ tx_pause = !!(pcaps->caps & ICE_AQC_PHY_EN_TX_LINK_PAUSE);
+ rx_pause = !!(pcaps->caps & ICE_AQC_PHY_EN_RX_LINK_PAUSE);
+
+ if (rx_pause && tx_pause)
+ fc_conf->mode = RTE_ETH_FC_FULL;
+ else if (rx_pause)
+ fc_conf->mode = RTE_ETH_FC_RX_PAUSE;
+ else if (tx_pause)
+ fc_conf->mode = RTE_ETH_FC_TX_PAUSE;
+ else
+ fc_conf->mode = RTE_ETH_FC_NONE;
+
+out:
+ ice_free(hw, pcaps);
+ return status;
+}
+
+static int
+ice_dev_flow_ctrl_set(struct rte_eth_dev *dev, struct rte_eth_fc_conf *fc_conf)
+{
+ struct ice_hw *hw = ICE_DEV_PRIVATE_TO_HW(dev->data->dev_private);
+ struct ice_port_info *pi = hw->port_info;
+ struct ice_link_status *ls = &pi->phy.link_info;
+ bool link_up = !!(ls->link_info & ICE_AQ_LINK_UP);
+ struct ice_aqc_get_phy_caps_data *pcaps;
+ u8 aq_failures;
+ int status;
+
+ pcaps = (struct ice_aqc_get_phy_caps_data *)
+ ice_malloc(hw, sizeof(*pcaps));
+ if (!pcaps)
+ return -ENOMEM;
+
+ status = ice_aq_get_phy_caps(hw->port_info, false,
+ ICE_AQC_REPORT_ACTIVE_CFG, pcaps, NULL);
+ if(status) {
+ status = -EIO;
+ goto out;
+ }
+ if(fc_conf->autoneg != ice_is_phy_caps_an_enabled(pcaps)) {
+ status = -ENOTSUP;
+ goto out;
+ }
+
+ switch(fc_conf->mode) {
+ case RTE_ETH_FC_FULL:
+ pi->fc.req_mode = ICE_FC_FULL;
+ break;
+ case RTE_ETH_FC_RX_PAUSE:
+ pi->fc.req_mode = ICE_FC_RX_PAUSE;
+ break;
+ case RTE_ETH_FC_TX_PAUSE:
+ pi->fc.req_mode = ICE_FC_TX_PAUSE;
+ break;
+ case RTE_ETH_FC_NONE:
+ pi->fc.req_mode = ICE_FC_NONE;
+ break;
+ }
+
+ status = ice_set_fc(pi, &aq_failures, link_up);
+
+ if (aq_failures & ICE_SET_FC_AQ_FAIL_GET) {
+ PMD_DRV_LOG(ERR,
+ "port %d fc set failed on get, err %d aq status
%i\n",
+ dev->data->port_id, status,
hw->adminq.sq_last_status);
+ status = -EIO;
+ } else if (aq_failures & ICE_SET_FC_AQ_FAIL_SET) {
+ PMD_DRV_LOG(ERR,
+ "port %d fc set failed on set, err %d aq status
%i\n",
+ dev->data->port_id, status,
hw->adminq.sq_last_status);
+ status = -EIO;
+ } else if (aq_failures & ICE_SET_FC_AQ_FAIL_U
Re: [PATCH v7 00/12] preparation for the rte_flow offload of nfp PMD
Hi all,
A gentle ping on this series.
We have a lot of things in the pipeline that depends on this work and
would be nice if we had the base patches in-tree.
On 2022-08-12 18:22:18 +0800, Chaoyong He wrote:
> This is the first patch series to add the support of rte_flow offload for
> nfp PMD, includes:
> Add the support of flower firmware
> Add the support of representor port
> Add the flower service infrastructure
> Add the cmsg interactive channels between pmd and fw
>
> * Changes since v6
> - Fix the compile error
>
> * Changes since v5
> - Compare integer with 0 explicitly
> - Change helper macro to function
> - Implement the dummy functions
> - Remove some unnecessary logics
>
> * Changes since v4
> - Remove the unneeded '__rte_unused' attribute
> - Fixup a potential memory leak problem
>
> * Changes since v3
> - Add the 'Depends-on' tag
>
> * Changes since v2
> - Remove the use of rte_panic()
>
> * Changes since v1
> - Fix the compile error
>
> Depends-on: series-23707 ("Add support of NFP3800 chip and firmware with
> NFDk")
>
> Chaoyong He (12):
> net/nfp: move app specific attributes to own struct
> net/nfp: simplify initialization and remove dead code
> net/nfp: move app specific init logic to own function
> net/nfp: add initial flower firmware support
> net/nfp: add flower PF setup and mempool init logic
> net/nfp: add flower PF related routines
> net/nfp: add flower ctrl VNIC related logics
> net/nfp: move common rxtx function for flower use
> net/nfp: add flower ctrl VNIC rxtx logic
> net/nfp: add flower representor framework
> net/nfp: move rxtx function to header file
> net/nfp: add flower PF rxtx logic
>
> drivers/net/nfp/flower/nfp_flower.c | 1340
> +++
> drivers/net/nfp/flower/nfp_flower.h | 71 ++
> drivers/net/nfp/flower/nfp_flower_cmsg.c| 186
> drivers/net/nfp/flower/nfp_flower_cmsg.h| 173 +++
> drivers/net/nfp/flower/nfp_flower_ctrl.c| 252 +
> drivers/net/nfp/flower/nfp_flower_ctrl.h| 13 +
> drivers/net/nfp/flower/nfp_flower_ovs_compat.h | 37 +
> drivers/net/nfp/flower/nfp_flower_representor.c | 602 ++
> drivers/net/nfp/flower/nfp_flower_representor.h | 39 +
> drivers/net/nfp/meson.build |4 +
> drivers/net/nfp/nfp_common.c|2 +-
> drivers/net/nfp/nfp_common.h| 51 +-
> drivers/net/nfp/nfp_cpp_bridge.c| 88 +-
> drivers/net/nfp/nfp_cpp_bridge.h|6 +-
> drivers/net/nfp/nfp_ethdev.c| 357 +++---
> drivers/net/nfp/nfp_ethdev_vf.c |2 +-
> drivers/net/nfp/nfp_rxtx.c | 123 +--
> drivers/net/nfp/nfp_rxtx.h | 121 ++
> drivers/net/nfp/nfpcore/nfp_cpp_pcie_ops.c | 31 +-
> 19 files changed, 3214 insertions(+), 284 deletions(-)
> create mode 100644 drivers/net/nfp/flower/nfp_flower.c
> create mode 100644 drivers/net/nfp/flower/nfp_flower.h
> create mode 100644 drivers/net/nfp/flower/nfp_flower_cmsg.c
> create mode 100644 drivers/net/nfp/flower/nfp_flower_cmsg.h
> create mode 100644 drivers/net/nfp/flower/nfp_flower_ctrl.c
> create mode 100644 drivers/net/nfp/flower/nfp_flower_ctrl.h
> create mode 100644 drivers/net/nfp/flower/nfp_flower_ovs_compat.h
> create mode 100644 drivers/net/nfp/flower/nfp_flower_representor.c
> create mode 100644 drivers/net/nfp/flower/nfp_flower_representor.h
>
> --
> 1.8.3.1
>
--
Kind Regards,
Niklas Söderlund
[PATCH 0/9] Wangxun fixes and supports
Fix some bugs, remove unused logic, support new features. Jiawen Wu (9): net/txgbe: fix IPv6 rule in flow director net/txgbe: fix OEM customized LED net/txgbe: remove semaphore between SW/FW net/txgbe: rename some extended statistic net/ngbe: rename some extended statistic net/ngbe: remove semaphore between SW/FW net/ngbe: fix max frame size net/ngbe: fix YT PHY mixed mode occasionally failing link net/ngbe: support to set link down/up doc/guides/rel_notes/release_22_11.rst | 4 +++ drivers/net/ngbe/base/ngbe_eeprom.c| 32 - drivers/net/ngbe/base/ngbe_phy.c | 1 + drivers/net/ngbe/base/ngbe_phy_rtl.c | 13 +++ drivers/net/ngbe/base/ngbe_phy_rtl.h | 2 ++ drivers/net/ngbe/base/ngbe_phy_yt.c| 9 + drivers/net/ngbe/base/ngbe_regs.h | 2 +- drivers/net/ngbe/base/ngbe_type.h | 7 ++-- drivers/net/ngbe/ngbe_ethdev.c | 48 +++--- drivers/net/txgbe/base/txgbe_eeprom.c | 32 - drivers/net/txgbe/base/txgbe_mng.c | 4 +-- drivers/net/txgbe/base/txgbe_type.h| 4 +-- drivers/net/txgbe/txgbe_ethdev.c | 11 +++--- drivers/net/txgbe/txgbe_flow.c | 33 ++ 14 files changed, 105 insertions(+), 97 deletions(-) -- 2.27.0
[PATCH 2/9] net/txgbe: fix OEM customized LED
Fix to read the correct mailbox register.
Fixes: f45834fd5c6a ("net/txgbe: support OEM customized LED")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/base/txgbe_mng.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/txgbe/base/txgbe_mng.c
b/drivers/net/txgbe/base/txgbe_mng.c
index 07bbfe8142..df7145094f 100644
--- a/drivers/net/txgbe/base/txgbe_mng.c
+++ b/drivers/net/txgbe/base/txgbe_mng.c
@@ -284,7 +284,7 @@ s32 txgbe_close_notify(struct txgbe_hw *hw)
if (status)
return status;
- tmp = rd32(hw, TXGBE_MNGSWSYNC);
+ tmp = rd32a(hw, TXGBE_MNGMBX, 1);
if (tmp == TXGBE_CHECKSUM_CAP_ST_PASS)
status = 0;
else
@@ -314,7 +314,7 @@ s32 txgbe_open_notify(struct txgbe_hw *hw)
if (status)
return status;
- tmp = rd32(hw, TXGBE_MNGSWSYNC);
+ tmp = rd32a(hw, TXGBE_MNGMBX, 1);
if (tmp == TXGBE_CHECKSUM_CAP_ST_PASS)
status = 0;
else
--
2.27.0
[PATCH 1/9] net/txgbe: fix IPv6 rule in flow director
Convert the correct packet type and flow type, to fix IPv6 rule in FDIR.
Fixes: b973ee26747a ("net/txgbe: parse flow director filter")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/txgbe_flow.c | 33 ++---
1 file changed, 26 insertions(+), 7 deletions(-)
diff --git a/drivers/net/txgbe/txgbe_flow.c b/drivers/net/txgbe/txgbe_flow.c
index d0093c0163..07d0337095 100644
--- a/drivers/net/txgbe/txgbe_flow.c
+++ b/drivers/net/txgbe/txgbe_flow.c
@@ -1583,9 +1583,7 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev
__rte_unused,
* value. So, we need not do anything for the not provided fields later.
*/
memset(rule, 0, sizeof(struct txgbe_fdir_rule));
- memset(&rule->mask, 0xFF, sizeof(struct txgbe_hw_fdir_mask));
- rule->mask.vlan_tci_mask = 0;
- rule->mask.flex_bytes_mask = 0;
+ memset(&rule->mask, 0, sizeof(struct txgbe_hw_fdir_mask));
/**
* The first not void item should be
@@ -1867,7 +1865,10 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev
__rte_unused,
* as we must have a flow type.
*/
rule->input.flow_type |= TXGBE_ATR_L4TYPE_TCP;
- ptype = txgbe_ptype_table[TXGBE_PT_IPV4_TCP];
+ if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6)
+ ptype = txgbe_ptype_table[TXGBE_PT_IPV6_TCP];
+ else
+ ptype = txgbe_ptype_table[TXGBE_PT_IPV4_TCP];
/*Not supported last point for range*/
if (item->last) {
rte_flow_error_set(error, EINVAL,
@@ -1931,7 +1932,10 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev
__rte_unused,
* as we must have a flow type.
*/
rule->input.flow_type |= TXGBE_ATR_L4TYPE_UDP;
- ptype = txgbe_ptype_table[TXGBE_PT_IPV4_UDP];
+ if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6)
+ ptype = txgbe_ptype_table[TXGBE_PT_IPV6_UDP];
+ else
+ ptype = txgbe_ptype_table[TXGBE_PT_IPV4_UDP];
/*Not supported last point for range*/
if (item->last) {
rte_flow_error_set(error, EINVAL,
@@ -1990,7 +1994,10 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev
__rte_unused,
* as we must have a flow type.
*/
rule->input.flow_type |= TXGBE_ATR_L4TYPE_SCTP;
- ptype = txgbe_ptype_table[TXGBE_PT_IPV4_SCTP];
+ if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6)
+ ptype = txgbe_ptype_table[TXGBE_PT_IPV6_SCTP];
+ else
+ ptype = txgbe_ptype_table[TXGBE_PT_IPV4_SCTP];
/*Not supported last point for range*/
if (item->last) {
rte_flow_error_set(error, EINVAL,
@@ -2141,6 +2148,16 @@ txgbe_parse_fdir_filter_normal(struct rte_eth_dev *dev
__rte_unused,
rule->input.pkt_type = cpu_to_be16(txgbe_encode_ptype(ptype));
+ if (rule->input.flow_type & TXGBE_ATR_FLOW_TYPE_IPV6) {
+ if (rule->input.flow_type & TXGBE_ATR_L4TYPE_MASK)
+ rule->input.pkt_type &= 0x;
+ else
+ rule->input.pkt_type &= 0xF8FF;
+
+ rule->input.flow_type &= TXGBE_ATR_L3TYPE_MASK |
+ TXGBE_ATR_L4TYPE_MASK;
+ }
+
return txgbe_parse_fdir_act_attr(attr, actions, rule, error);
}
@@ -2827,8 +2844,10 @@ txgbe_flow_create(struct rte_eth_dev *dev,
ret = memcmp(&fdir_info->mask,
&fdir_rule.mask,
sizeof(struct txgbe_hw_fdir_mask));
- if (ret)
+ if (ret) {
+ PMD_DRV_LOG(ERR, "only support one
global mask");
goto out;
+ }
if (fdir_info->flex_bytes_offset !=
fdir_rule.flex_bytes_offset)
--
2.27.0
[PATCH 3/9] net/txgbe: remove semaphore between SW/FW
Since firmware does not use the semaphore between software and firmware.
Remove useless unilateral semaphore setting.
Fixes: 35c90ecccfd4 ("net/txgbe: add EEPROM functions")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/base/txgbe_eeprom.c | 32 ---
1 file changed, 32 deletions(-)
diff --git a/drivers/net/txgbe/base/txgbe_eeprom.c
b/drivers/net/txgbe/base/txgbe_eeprom.c
index 4ed6bd6728..aeeae06dfc 100644
--- a/drivers/net/txgbe/base/txgbe_eeprom.c
+++ b/drivers/net/txgbe/base/txgbe_eeprom.c
@@ -111,37 +111,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)
status = 0;
}
- /* Now get the semaphore between SW/FW through the SWESMBI bit */
- if (status == 0) {
- for (i = 0; i < timeout; i++) {
- /* Set the SW EEPROM semaphore bit to request access */
- wr32m(hw, TXGBE_MNGSWSYNC,
- TXGBE_MNGSWSYNC_REQ, TXGBE_MNGSWSYNC_REQ);
-
- /*
-* If we set the bit successfully then we got the
-* semaphore.
-*/
- swsm = rd32(hw, TXGBE_MNGSWSYNC);
- if (swsm & TXGBE_MNGSWSYNC_REQ)
- break;
-
- usec_delay(50);
- }
-
- /*
-* Release semaphores and return error if SW EEPROM semaphore
-* was not granted because we don't have access to the EEPROM
-*/
- if (i >= timeout) {
- DEBUGOUT("SWESMBI Software EEPROM semaphore not
granted.");
- txgbe_release_eeprom_semaphore(hw);
- status = TXGBE_ERR_EEPROM;
- }
- } else {
- DEBUGOUT("Software semaphore SMBI between device drivers not
granted.");
- }
-
return status;
}
@@ -153,7 +122,6 @@ s32 txgbe_get_eeprom_semaphore(struct txgbe_hw *hw)
**/
void txgbe_release_eeprom_semaphore(struct txgbe_hw *hw)
{
- wr32m(hw, TXGBE_MNGSWSYNC, TXGBE_MNGSWSYNC_REQ, 0);
wr32m(hw, TXGBE_SWSEM, TXGBE_SWSEM_PF, 0);
txgbe_flush(hw);
}
--
2.27.0
[PATCH 4/9] net/txgbe: rename some extended statistic
Rename rx_oversize_errors to rx_oversize_cnt since it depends on giant
packet size limit instead of MTU, by hardware design.
Rename rx_drop_packets to rx_rdb_drop to indicate the drop location.
And add rx_dma_drop to extended statistics.
Fixes: 91fe49c87d76 ("net/txgbe: support device xstats")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/txgbe/base/txgbe_type.h | 4 ++--
drivers/net/txgbe/txgbe_ethdev.c| 11 ++-
2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/net/txgbe/base/txgbe_type.h
b/drivers/net/txgbe/base/txgbe_type.h
index 343279127f..c3486b472f 100644
--- a/drivers/net/txgbe/base/txgbe_type.h
+++ b/drivers/net/txgbe/base/txgbe_type.h
@@ -356,9 +356,9 @@ struct txgbe_hw_stats {
u64 tx_management_packets;
u64 rx_management_dropped;
u64 rx_dma_drop;
- u64 rx_drop_packets;
/* Basic Error */
+ u64 rx_rdb_drop;
u64 rx_crc_errors;
u64 rx_illegal_byte_errors;
u64 rx_error_bytes;
@@ -366,7 +366,7 @@ struct txgbe_hw_stats {
u64 rx_length_errors;
u64 rx_undersize_errors;
u64 rx_fragment_errors;
- u64 rx_oversize_errors;
+ u64 rx_oversize_cnt;
u64 rx_jabber_errors;
u64 rx_l3_l4_xsum_error;
u64 mac_local_errors;
diff --git a/drivers/net/txgbe/txgbe_ethdev.c b/drivers/net/txgbe/txgbe_ethdev.c
index 9dc9948219..1c1d959ab5 100644
--- a/drivers/net/txgbe/txgbe_ethdev.c
+++ b/drivers/net/txgbe/txgbe_ethdev.c
@@ -183,8 +183,10 @@ static const struct rte_txgbe_xstats_name_off
rte_txgbe_stats_strings[] = {
HW_XSTAT(rx_management_packets),
HW_XSTAT(tx_management_packets),
HW_XSTAT(rx_management_dropped),
+ HW_XSTAT(rx_dma_drop),
/* Basic Error */
+ HW_XSTAT(rx_rdb_drop),
HW_XSTAT(rx_crc_errors),
HW_XSTAT(rx_illegal_byte_errors),
HW_XSTAT(rx_error_bytes),
@@ -192,7 +194,7 @@ static const struct rte_txgbe_xstats_name_off
rte_txgbe_stats_strings[] = {
HW_XSTAT(rx_length_errors),
HW_XSTAT(rx_undersize_errors),
HW_XSTAT(rx_fragment_errors),
- HW_XSTAT(rx_oversize_errors),
+ HW_XSTAT(rx_oversize_cnt),
HW_XSTAT(rx_jabber_errors),
HW_XSTAT(rx_l3_l4_xsum_error),
HW_XSTAT(mac_local_errors),
@@ -2157,7 +2159,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw,
hw_stats->rx_bytes += rd64(hw, TXGBE_DMARXOCTL);
hw_stats->tx_bytes += rd64(hw, TXGBE_DMATXOCTL);
hw_stats->rx_dma_drop += rd32(hw, TXGBE_DMARXDROP);
- hw_stats->rx_drop_packets += rd32(hw, TXGBE_PBRXDROP);
+ hw_stats->rx_rdb_drop += rd32(hw, TXGBE_PBRXDROP);
/* MAC Stats */
hw_stats->rx_crc_errors += rd64(hw, TXGBE_MACRXERRCRCL);
@@ -2189,7 +2191,7 @@ txgbe_read_stats_registers(struct txgbe_hw *hw,
rd64(hw, TXGBE_MACTX1024TOMAXL);
hw_stats->rx_undersize_errors += rd64(hw, TXGBE_MACRXERRLENL);
- hw_stats->rx_oversize_errors += rd32(hw, TXGBE_MACRXOVERSIZE);
+ hw_stats->rx_oversize_cnt += rd32(hw, TXGBE_MACRXOVERSIZE);
hw_stats->rx_jabber_errors += rd32(hw, TXGBE_MACRXJABBER);
/* MNG Stats */
@@ -2311,8 +2313,7 @@ txgbe_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
hw_stats->rx_mac_short_packet_dropped +
hw_stats->rx_length_errors +
hw_stats->rx_undersize_errors +
- hw_stats->rx_oversize_errors +
- hw_stats->rx_drop_packets +
+ hw_stats->rx_rdb_drop +
hw_stats->rx_illegal_byte_errors +
hw_stats->rx_error_bytes +
hw_stats->rx_fragment_errors +
--
2.27.0
[PATCH 5/9] net/ngbe: rename some extended statistic
Rename rx_oversize_errors to rx_oversize_cnt since it depends on giant
packet size limit instead of MTU, by hardware design.
Rename rx_drop_packets and tx_drop_packets to rx_dma_drop and tx_dma_drop
to indicate the drop location.
And add tx_dma_drop to extended statistics.
Fixes: 8b433d04adc9 ("net/ngbe: support device xstats")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/base/ngbe_type.h | 5 ++---
drivers/net/ngbe/ngbe_ethdev.c| 10 +-
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 4a6c273f1e..73111f7950 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -142,9 +142,8 @@ struct ngbe_hw_stats {
u64 mng_bmc2host_packets;
u64 mng_host2bmc_packets;
/* Basix RxTx */
- u64 rx_drop_packets;
- u64 tx_drop_packets;
u64 rx_dma_drop;
+ u64 tx_dma_drop;
u64 tx_secdrp_packets;
u64 rx_packets;
u64 tx_packets;
@@ -170,7 +169,7 @@ struct ngbe_hw_stats {
u64 rx_length_errors;
u64 rx_undersize_errors;
u64 rx_fragment_errors;
- u64 rx_oversize_errors;
+ u64 rx_oversize_cnt;
u64 rx_jabber_errors;
u64 rx_l3_l4_xsum_error;
u64 mac_local_errors;
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 86c28099c4..df32bf64ff 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -165,6 +165,7 @@ static const struct rte_ngbe_xstats_name_off
rte_ngbe_stats_strings[] = {
HW_XSTAT(tx_management_packets),
HW_XSTAT(rx_management_dropped),
HW_XSTAT(rx_dma_drop),
+ HW_XSTAT(tx_dma_drop),
HW_XSTAT(tx_secdrp_packets),
/* Basic Error */
@@ -175,7 +176,7 @@ static const struct rte_ngbe_xstats_name_off
rte_ngbe_stats_strings[] = {
HW_XSTAT(rx_length_errors),
HW_XSTAT(rx_undersize_errors),
HW_XSTAT(rx_fragment_errors),
- HW_XSTAT(rx_oversize_errors),
+ HW_XSTAT(rx_oversize_cnt),
HW_XSTAT(rx_jabber_errors),
HW_XSTAT(rx_l3_l4_xsum_error),
HW_XSTAT(mac_local_errors),
@@ -1374,9 +1375,8 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
hw_stats->rx_xoff_packets += rd32(hw, NGBE_PBRXLNKXOFF);
/* DMA Stats */
- hw_stats->rx_drop_packets += rd32(hw, NGBE_DMARXDROP);
- hw_stats->tx_drop_packets += rd32(hw, NGBE_DMATXDROP);
hw_stats->rx_dma_drop += rd32(hw, NGBE_DMARXDROP);
+ hw_stats->tx_dma_drop += rd32(hw, NGBE_DMATXDROP);
hw_stats->tx_secdrp_packets += rd32(hw, NGBE_DMATXSECDROP);
hw_stats->rx_packets += rd32(hw, NGBE_DMARXPKT);
hw_stats->tx_packets += rd32(hw, NGBE_DMATXPKT);
@@ -1413,7 +1413,7 @@ ngbe_read_stats_registers(struct ngbe_hw *hw,
rd64(hw, NGBE_MACTX1024TOMAXL);
hw_stats->rx_undersize_errors += rd64(hw, NGBE_MACRXERRLENL);
- hw_stats->rx_oversize_errors += rd32(hw, NGBE_MACRXOVERSIZE);
+ hw_stats->rx_oversize_cnt += rd32(hw, NGBE_MACRXOVERSIZE);
hw_stats->rx_jabber_errors += rd32(hw, NGBE_MACRXJABBER);
/* MNG Stats */
@@ -1512,7 +1512,7 @@ ngbe_dev_stats_get(struct rte_eth_dev *dev, struct
rte_eth_stats *stats)
hw_stats->rx_mac_short_packet_dropped +
hw_stats->rx_length_errors +
hw_stats->rx_undersize_errors +
- hw_stats->rx_oversize_errors +
+ hw_stats->rdb_drp_cnt +
hw_stats->rx_illegal_byte_errors +
hw_stats->rx_error_bytes +
hw_stats->rx_fragment_errors;
--
2.27.0
[PATCH 6/9] net/ngbe: remove semaphore between SW/FW
Since firmware does not use the semaphore between software and firmware.
Remove useless unilateral semaphore setting.
Fixes: f501a195bded ("net/ngbe: initialize and validate EEPROM")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/base/ngbe_eeprom.c | 32 -
1 file changed, 32 deletions(-)
diff --git a/drivers/net/ngbe/base/ngbe_eeprom.c
b/drivers/net/ngbe/base/ngbe_eeprom.c
index 6375ee9b29..104501fa7a 100644
--- a/drivers/net/ngbe/base/ngbe_eeprom.c
+++ b/drivers/net/ngbe/base/ngbe_eeprom.c
@@ -105,37 +105,6 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
status = 0;
}
- /* Now get the semaphore between SW/FW through the SWESMBI bit */
- if (status == 0) {
- for (i = 0; i < timeout; i++) {
- /* Set the SW EEPROM semaphore bit to request access */
- wr32m(hw, NGBE_MNGSWSYNC,
- NGBE_MNGSWSYNC_REQ, NGBE_MNGSWSYNC_REQ);
-
- /*
-* If we set the bit successfully then we got the
-* semaphore.
-*/
- swsm = rd32(hw, NGBE_MNGSWSYNC);
- if (swsm & NGBE_MNGSWSYNC_REQ)
- break;
-
- usec_delay(50);
- }
-
- /*
-* Release semaphores and return error if SW EEPROM semaphore
-* was not granted because we don't have access to the EEPROM
-*/
- if (i >= timeout) {
- DEBUGOUT("SWESMBI Software EEPROM semaphore not
granted.");
- ngbe_release_eeprom_semaphore(hw);
- status = NGBE_ERR_EEPROM;
- }
- } else {
- DEBUGOUT("Software semaphore SMBI between device drivers not
granted.");
- }
-
return status;
}
@@ -147,7 +116,6 @@ s32 ngbe_get_eeprom_semaphore(struct ngbe_hw *hw)
**/
void ngbe_release_eeprom_semaphore(struct ngbe_hw *hw)
{
- wr32m(hw, NGBE_MNGSWSYNC, NGBE_MNGSWSYNC_REQ, 0);
wr32m(hw, NGBE_SWSEM, NGBE_SWSEM_PF, 0);
ngbe_flush(hw);
}
--
2.27.0
[PATCH 7/9] net/ngbe: fix max frame size
Remain the same max frame size after the device restarts.
Fixes: 07baabb6a51a ("net/ngbe: support MTU set")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/base/ngbe_regs.h | 2 +-
drivers/net/ngbe/base/ngbe_type.h | 2 +-
drivers/net/ngbe/ngbe_ethdev.c| 10 +++---
3 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/drivers/net/ngbe/base/ngbe_regs.h
b/drivers/net/ngbe/base/ngbe_regs.h
index 640e385990..c0e79a2ba7 100644
--- a/drivers/net/ngbe/base/ngbe_regs.h
+++ b/drivers/net/ngbe/base/ngbe_regs.h
@@ -525,7 +525,7 @@ enum ngbe_5tuple_protocol {
#define NGBE_PSRCTL_LBENA MS(18, 0x1)
#define NGBE_FRMSZ0x015020
#define NGBE_FRMSZ_MAX_MASK MS(0, 0x)
-#define NGBE_FRMSZ_MAX(v) LS(v, 0, 0x)
+#define NGBE_FRMSZ_MAX(v) LS((v) + 4, 0, 0x)
#define NGBE_VLANCTL 0x015088
#define NGBE_VLANCTL_TPID_MASK MS(0, 0x)
#define NGBE_VLANCTL_TPID(v)LS(v, 0, 0x)
diff --git a/drivers/net/ngbe/base/ngbe_type.h
b/drivers/net/ngbe/base/ngbe_type.h
index 73111f7950..aa5c41146c 100644
--- a/drivers/net/ngbe/base/ngbe_type.h
+++ b/drivers/net/ngbe/base/ngbe_type.h
@@ -9,7 +9,7 @@
#define NGBE_LINK_UP_TIME 90 /* 9.0 Seconds */
#define NGBE_FRAME_SIZE_MAX (9728) /* Maximum frame size, +FCS */
-#define NGBE_FRAME_SIZE_DFT (1522) /* Default frame size, +FCS */
+#define NGBE_FRAME_SIZE_DFT (1518) /* Default frame size, +FCS */
#define NGBE_NUM_POOL (32)
#define NGBE_PBRXSIZE_MAX 0x0008 /* 512KB Packet Buffer */
#define NGBE_PBTXSIZE_MAX 0x5000 /* 20KB Packet Buffer */
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index df32bf64ff..1090ba9a11 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -2473,7 +2473,7 @@ static int
ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
{
struct ngbe_hw *hw = ngbe_dev_hw(dev);
- uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN + 4;
+ uint32_t frame_size = mtu + RTE_ETHER_HDR_LEN + RTE_ETHER_CRC_LEN;
struct rte_eth_dev_data *dev_data = dev->data;
/* If device is started, refuse mtu that requires the support of
@@ -2486,12 +2486,8 @@ ngbe_dev_mtu_set(struct rte_eth_dev *dev, uint16_t mtu)
return -EINVAL;
}
- if (hw->mode)
- wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK,
- NGBE_FRAME_SIZE_MAX);
- else
- wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK,
- NGBE_FRMSZ_MAX(frame_size));
+ wr32m(hw, NGBE_FRMSZ, NGBE_FRMSZ_MAX_MASK,
+ NGBE_FRMSZ_MAX(frame_size));
return 0;
}
--
2.27.0
[PATCH 8/9] net/ngbe: fix YT PHY mixed mode occasionally failing link
Add to read link status register of UTP mode, to ensure link status of
mixed mode, for YT PHY.
Fixes: 1c44384fce76 ("net/ngbe: support custom PHY interfaces")
Cc: sta...@dpdk.org
Signed-off-by: Jiawen Wu
---
drivers/net/ngbe/base/ngbe_phy_yt.c | 9 +
1 file changed, 9 insertions(+)
diff --git a/drivers/net/ngbe/base/ngbe_phy_yt.c
b/drivers/net/ngbe/base/ngbe_phy_yt.c
index 562a0dede5..c88946f7c3 100644
--- a/drivers/net/ngbe/base/ngbe_phy_yt.c
+++ b/drivers/net/ngbe/base/ngbe_phy_yt.c
@@ -463,7 +463,16 @@ s32 ngbe_check_phy_link_yt(struct ngbe_hw *hw,
if (phy_link) {
*link_up = true;
+ } else {
+ status = ngbe_read_phy_reg_mdi(hw, YT_SPST, 0, &phy_data);
+ phy_link = phy_data & YT_SPST_LINK;
+ phy_speed = phy_data & YT_SPST_SPEED_MASK;
+
+ if (phy_link)
+ *link_up = true;
+ }
+ if (*link_up) {
if (phy_speed == YT_SPST_SPEED_1000M)
*speed = NGBE_LINK_SPEED_1GB_FULL;
else if (phy_speed == YT_SPST_SPEED_100M)
--
2.27.0
[PATCH 9/9] net/ngbe: support to set link down/up
Add support to set device link down/up.
Signed-off-by: Jiawen Wu
---
doc/guides/rel_notes/release_22_11.rst | 4
drivers/net/ngbe/base/ngbe_phy.c | 1 +
drivers/net/ngbe/base/ngbe_phy_rtl.c | 13
drivers/net/ngbe/base/ngbe_phy_rtl.h | 2 ++
drivers/net/ngbe/ngbe_ethdev.c | 28 ++
5 files changed, 48 insertions(+)
diff --git a/doc/guides/rel_notes/release_22_11.rst
b/doc/guides/rel_notes/release_22_11.rst
index 8c021cf050..843501c7c2 100644
--- a/doc/guides/rel_notes/release_22_11.rst
+++ b/doc/guides/rel_notes/release_22_11.rst
@@ -84,6 +84,10 @@ API Changes
Also, make sure to start the actual text at the margin.
===
+* **Updated Wangxun ngbe driver.**
+
+ * Added support to set device link down/up.
+
ABI Changes
---
diff --git a/drivers/net/ngbe/base/ngbe_phy.c b/drivers/net/ngbe/base/ngbe_phy.c
index 06562b594f..acff7bfebf 100644
--- a/drivers/net/ngbe/base/ngbe_phy.c
+++ b/drivers/net/ngbe/base/ngbe_phy.c
@@ -400,6 +400,7 @@ s32 ngbe_init_phy(struct ngbe_hw *hw)
hw->phy.init_hw = ngbe_init_phy_rtl;
hw->phy.check_link = ngbe_check_phy_link_rtl;
hw->phy.setup_link = ngbe_setup_phy_link_rtl;
+ hw->phy.set_phy_power = ngbe_set_phy_power_rtl;
hw->phy.get_adv_pause = ngbe_get_phy_advertised_pause_rtl;
hw->phy.get_lp_adv_pause = ngbe_get_phy_lp_advertised_pause_rtl;
hw->phy.set_pause_adv = ngbe_set_phy_pause_adv_rtl;
diff --git a/drivers/net/ngbe/base/ngbe_phy_rtl.c
b/drivers/net/ngbe/base/ngbe_phy_rtl.c
index 33c5e79e87..9b323624ec 100644
--- a/drivers/net/ngbe/base/ngbe_phy_rtl.c
+++ b/drivers/net/ngbe/base/ngbe_phy_rtl.c
@@ -393,3 +393,16 @@ s32 ngbe_check_phy_link_rtl(struct ngbe_hw *hw, u32
*speed, bool *link_up)
return status;
}
+s32 ngbe_set_phy_power_rtl(struct ngbe_hw *hw, bool on)
+{
+ u16 value = 0;
+
+ hw->phy.read_reg(hw, RTL_BMCR, 0, &value);
+ if (on)
+ value &= ~RTL_BMCR_PWDN;
+ else
+ value |= RTL_BMCR_PWDN;
+ hw->phy.write_reg(hw, RTL_BMCR, 0, value);
+
+ return 0;
+}
diff --git a/drivers/net/ngbe/base/ngbe_phy_rtl.h
b/drivers/net/ngbe/base/ngbe_phy_rtl.h
index d717a1915c..b2fbc4f74d 100644
--- a/drivers/net/ngbe/base/ngbe_phy_rtl.h
+++ b/drivers/net/ngbe/base/ngbe_phy_rtl.h
@@ -15,6 +15,7 @@
#define RTL_BMCR_RESET MS16(15, 0x1)
#define RTL_BMCR_SPEED_SELECT0MS16(13, 0x1)
#define RTL_BMCR_ANE MS16(12, 0x1)
+#define RTL_BMCR_PWDNMS16(11, 0x1)
#define RTL_BMCR_RESTART_AN MS16(9, 0x1)
#define RTL_BMCR_DUPLEX MS16(8, 0x1)
#define RTL_BMCR_SPEED_SELECT1 MS16(6, 0x1)
@@ -88,5 +89,6 @@ s32 ngbe_get_phy_lp_advertised_pause_rtl(struct ngbe_hw *hw,
u8 *pause_bit);
s32 ngbe_set_phy_pause_adv_rtl(struct ngbe_hw *hw, u16 pause_bit);
s32 ngbe_check_phy_link_rtl(struct ngbe_hw *hw,
u32 *speed, bool *link_up);
+s32 ngbe_set_phy_power_rtl(struct ngbe_hw *hw, bool on);
#endif /* _NGBE_PHY_RTL_H_ */
diff --git a/drivers/net/ngbe/ngbe_ethdev.c b/drivers/net/ngbe/ngbe_ethdev.c
index 1090ba9a11..afdb3ad41f 100644
--- a/drivers/net/ngbe/ngbe_ethdev.c
+++ b/drivers/net/ngbe/ngbe_ethdev.c
@@ -1219,6 +1219,32 @@ ngbe_dev_stop(struct rte_eth_dev *dev)
return 0;
}
+/*
+ * Set device link up: power on.
+ */
+static int
+ngbe_dev_set_link_up(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ hw->phy.set_phy_power(hw, true);
+
+ return 0;
+}
+
+/*
+ * Set device link down: power off.
+ */
+static int
+ngbe_dev_set_link_down(struct rte_eth_dev *dev)
+{
+ struct ngbe_hw *hw = ngbe_dev_hw(dev);
+
+ hw->phy.set_phy_power(hw, false);
+
+ return 0;
+}
+
/*
* Reset and stop device.
*/
@@ -3030,6 +3056,8 @@ static const struct eth_dev_ops ngbe_eth_dev_ops = {
.dev_infos_get = ngbe_dev_info_get,
.dev_start = ngbe_dev_start,
.dev_stop = ngbe_dev_stop,
+ .dev_set_link_up= ngbe_dev_set_link_up,
+ .dev_set_link_down = ngbe_dev_set_link_down,
.dev_close = ngbe_dev_close,
.dev_reset = ngbe_dev_reset,
.promiscuous_enable = ngbe_dev_promiscuous_enable,
--
2.27.0
RE: [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ
> -Original Message-
> From: Kevin Liu
> Sent: Thursday, September 1, 2022 6:06 PM
> To: dev@dpdk.org
> Cc: Zhang, Yuying ; Xing, Beilei
> ; Yang, SteveX ; Liu, KevinX
>
> Subject: [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ
>
> QinQ enable, when enable strip function, it is wrong to strip inner VLAN of
> double VLAN package. The correct action is outer VLAN is stripped. So, need
> to configure 'outer_vlan_flags' to update vsi.
>
This commit message don't explain why we need to change the inner vlan strip to
outer vlan.
We should align with kernel driver's new behavior.
And from my point of view, we have no need to add too many new functions for
this fix.
Can you work out another simple design?
> When enable QinQ strip function, need to set 'port_vlan_flags' to configure
> inner VLAN strip.
>
> Signed-off-by: Kevin Liu
> ---
> doc/guides/nics/i40e.rst | 2 -
> drivers/net/i40e/i40e_ethdev.c | 170 +++--
> drivers/net/i40e/i40e_ethdev.h | 4 +
> 3 files changed, 164 insertions(+), 12 deletions(-)
>
> diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index
> 15b796e67a..ffcb2a2220 100644
> --- a/doc/guides/nics/i40e.rst
> +++ b/doc/guides/nics/i40e.rst
> @@ -982,8 +982,6 @@ Vlan related Features miss when FW >= 8.4 If FW
> version >= 8.4, there'll be some Vlan related issues:
>
> #. TCI input set for QinQ is invalid.
> -#. Fail to configure TPID for QinQ.
> -#. Fail to strip outer Vlan.
>
> Example of getting best performance with l3fwd example
> --
> diff --git a/drivers/net/i40e/i40e_ethdev.c b/drivers/net/i40e/i40e_ethdev.c
> index 27cfda6ff8..0c3009ebfa 100644
> --- a/drivers/net/i40e/i40e_ethdev.c
> +++ b/drivers/net/i40e/i40e_ethdev.c
> @@ -52,6 +52,8 @@
> #define I40E_VSI_TSR_QINQ_STRIP 0x4010
> #define I40E_VSI_TSR(_i) (0x00050800 + ((_i) * 4))
>
> +#define I40E_OVLAN_EMOD_SHIFT(x) ((x) <<
> I40E_AQ_VSI_OVLAN_EMOD_SHIFT)
> +
> /* Maximun number of capability elements */
> #define I40E_MAX_CAP_ELE_NUM 128
>
> @@ -4011,10 +4013,15 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev,
> int mask)
>
> if (mask & RTE_ETH_VLAN_STRIP_MASK) {
> /* Enable or disable VLAN stripping */
> - if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
> - i40e_vsi_config_vlan_stripping(vsi, TRUE);
> - else
> + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
> {
> + if (rxmode->offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)
> + i40e_vsi_config_vlan_stripping_v1(vsi, TRUE);
> + else
> + i40e_vsi_config_vlan_stripping(vsi, TRUE);
> + } else {
> i40e_vsi_config_vlan_stripping(vsi, FALSE);
> + i40e_vsi_config_vlan_stripping_v1(vsi, FALSE);
> + }
> }
>
> if (mask & RTE_ETH_VLAN_EXTEND_MASK) { @@ -4068,6 +4075,10
> @@ i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> if (rxmode->offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_EXTEND) {
> if (pf->fw8_3gt) {
> i40e_vsi_config_qinq(vsi, TRUE);
> + if (rxmode->offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
> + i40e_vsi_config_vlan_stripping(vsi,
> FALSE);
> + i40e_vsi_config_vlan_stripping_v1(vsi,
> TRUE);
> + }
> } else {
> i40e_vsi_config_double_vlan(vsi, TRUE);
> /* Set global registers with default ethertype.
> */ @@ -4077,10 +4088,15 @@ i40e_vlan_offload_set(struct rte_eth_dev
> *dev, int mask)
>
> RTE_ETHER_TYPE_VLAN);
> }
> } else {
> - if (pf->fw8_3gt)
> + if (pf->fw8_3gt) {
> i40e_vsi_config_qinq(vsi, FALSE);
> - else
> + if (rxmode->offloads &
> RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
> + i40e_vsi_config_vlan_stripping_v1(vsi,
> FALSE);
> + i40e_vsi_config_vlan_stripping(vsi,
> TRUE);
> + }
> + } else {
> i40e_vsi_config_double_vlan(vsi, FALSE);
> + }
> }
> /*restore mac/vlan filters of all ports*/
> for (j = 0; j < port_num; j++) {
> @@ -4096,10 +4112,17 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev,
> int mask)
>
> if (mask & RTE_ETH_QINQ_STRIP_MASK) {
> /* Enable or disable outer VLAN stripping */
> - if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_QINQ_STRIP)
> - i40e_vsi
Re: [PATCH] drivers/raw/skeleton: fix typecasting in skeleton_rawdev_enqueue_bufs()
Hi Thomas, Can you please have a look and update the status? On Wed, Jul 6, 2022 at 11:33 AM Usman Tanveer wrote: > In function "skeleton_rawdev_enqueue_bugs", variable "context" is being > typecasted to (int*), and then assigned to a "uint16_t" type variable > "q_id". As the value is a "uint16_t", (int*) is replaced by (uint16_t*). > > Signed-off-by: Usman Tanveer > --- > drivers/raw/skeleton/skeleton_rawdev.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/raw/skeleton/skeleton_rawdev.c > b/drivers/raw/skeleton/skeleton_rawdev.c > index 16ecae3d92..3f4da88747 100644 > --- a/drivers/raw/skeleton/skeleton_rawdev.c > +++ b/drivers/raw/skeleton/skeleton_rawdev.c > @@ -421,7 +421,7 @@ static int skeleton_rawdev_enqueue_bufs(struct > rte_rawdev *dev, > * help in complex implementation which require more information > than > * just an integer - for example, a queue-pair. > */ > - q_id = *((int *)context); > + q_id = *((uint16_t *)context); > > for (i = 0; i < count; i++) > queue_buf[q_id].bufs[i] = buffers[i]->buf_addr; > -- > 2.25.1 > >
Re: [PATCH v2] examples/distributor: update dynamic configuration
Hi David,
I applied the changes as new version (v3), Thank you
On 01.09.2022 13:58, Hunt, David wrote:
Hi Ömer,
On 28/06/2022 20:54, omer.yamac at ceng.metu.edu.tr (Abdullah Ömer
Yamaç) wrote:
In this patch,
* It is possible to switch the running mode of the distributor
using the command line argument.
* With "-c" parameter, you can run RX and Distributor
on the same core.
* Without "-c" parameter, you can run RX and Distributor
on the different core.
* Syntax error of the single RX and distributor core is fixed.
I believe this particular fix is already merged and back-ported to
stable. No need to include this line in the commit message.
* Consecutive termination of the lcores fixed.
The termination order was wrong, and you couldn't terminate the
application while traffic was capturing. The current order is
RX -> Distributor -> TX -> Workers
* When "-c" parameter is active, the wasted distributor core is
also deactivated in the main function.
Fixes: 4a7f40c0ff9a ("examples/distributor: add dedicated core")
Cc: stable at dpdk.org
This is a feature change, not a fix, so I don't believe you need the
"Fixes" line or the "Cc: stable" line.
Signed-off-by: Abdullah ?mer Yama?
I've tested this with the "-c" option, works well. Traffic coming into
the app is distributed among the core. With -c added to the command
line parameters, I have an extra worker core, as expected. Looks good
to me.
With the above suggested changes to the commit message:
Reviewed-by: David Hunt
RE: [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ
> -Original Message-
> From: Yang, Qiming
> Sent: Friday, September 2, 2022 11:29 AM
> To: Liu, KevinX ; dev@dpdk.org
> Cc: Zhang, Yuying ; Xing, Beilei
> ; Yang, SteveX ; Liu, KevinX
>
> Subject: RE: [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ
>
>
>
> > -Original Message-
> > From: Kevin Liu
> > Sent: Thursday, September 1, 2022 6:06 PM
> > To: dev@dpdk.org
> > Cc: Zhang, Yuying ; Xing, Beilei
> > ; Yang, SteveX ; Liu,
> > KevinX
> > Subject: [PATCH] net/i40e: fix incorrect VLAN stripping for QinQ
> >
> > QinQ enable, when enable strip function, it is wrong to strip inner
> > VLAN of double VLAN package. The correct action is outer VLAN is
> > stripped. So, need to configure 'outer_vlan_flags' to update vsi.
> >
>
> This commit message don't explain why we need to change the inner vlan strip
> to outer vlan.
> We should align with kernel driver's new behavior.
> And from my point of view, we have no need to add too many new functions for
> this fix.
> Can you work out another simple design?
Thanks for your suggestion. I'll rework it.
>
> > When enable QinQ strip function, need to set 'port_vlan_flags' to
> > configure inner VLAN strip.
> >
> > Signed-off-by: Kevin Liu
> > ---
> > doc/guides/nics/i40e.rst | 2 -
> > drivers/net/i40e/i40e_ethdev.c | 170 +++--
> > drivers/net/i40e/i40e_ethdev.h | 4 +
> > 3 files changed, 164 insertions(+), 12 deletions(-)
> >
> > diff --git a/doc/guides/nics/i40e.rst b/doc/guides/nics/i40e.rst index
> > 15b796e67a..ffcb2a2220 100644
> > --- a/doc/guides/nics/i40e.rst
> > +++ b/doc/guides/nics/i40e.rst
> > @@ -982,8 +982,6 @@ Vlan related Features miss when FW >= 8.4 If FW
> > version >= 8.4, there'll be some Vlan related issues:
> >
> > #. TCI input set for QinQ is invalid.
> > -#. Fail to configure TPID for QinQ.
> > -#. Fail to strip outer Vlan.
> >
> > Example of getting best performance with l3fwd example
> > --
> > diff --git a/drivers/net/i40e/i40e_ethdev.c
> > b/drivers/net/i40e/i40e_ethdev.c index 27cfda6ff8..0c3009ebfa 100644
> > --- a/drivers/net/i40e/i40e_ethdev.c
> > +++ b/drivers/net/i40e/i40e_ethdev.c
> > @@ -52,6 +52,8 @@
> > #define I40E_VSI_TSR_QINQ_STRIP0x4010
> > #define I40E_VSI_TSR(_i) (0x00050800 + ((_i) * 4))
> >
> > +#define I40E_OVLAN_EMOD_SHIFT(x) ((x) <<
> > I40E_AQ_VSI_OVLAN_EMOD_SHIFT)
> > +
> > /* Maximun number of capability elements */
> > #define I40E_MAX_CAP_ELE_NUM 128
> >
> > @@ -4011,10 +4013,15 @@ i40e_vlan_offload_set(struct rte_eth_dev *dev,
> > int mask)
> >
> > if (mask & RTE_ETH_VLAN_STRIP_MASK) {
> > /* Enable or disable VLAN stripping */
> > - if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
> > - i40e_vsi_config_vlan_stripping(vsi, TRUE);
> > - else
> > + if (rxmode->offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
> > {
> > + if (rxmode->offloads &
> > RTE_ETH_RX_OFFLOAD_VLAN_EXTEND)
> > + i40e_vsi_config_vlan_stripping_v1(vsi, TRUE);
> > + else
> > + i40e_vsi_config_vlan_stripping(vsi, TRUE);
> > + } else {
> > i40e_vsi_config_vlan_stripping(vsi, FALSE);
> > + i40e_vsi_config_vlan_stripping_v1(vsi, FALSE);
> > + }
> > }
> >
> > if (mask & RTE_ETH_VLAN_EXTEND_MASK) { @@ -4068,6 +4075,10
> @@
> > i40e_vlan_offload_set(struct rte_eth_dev *dev, int mask)
> > if (rxmode->offloads &
> > RTE_ETH_RX_OFFLOAD_VLAN_EXTEND) {
> > if (pf->fw8_3gt) {
> > i40e_vsi_config_qinq(vsi, TRUE);
> > + if (rxmode->offloads &
> > RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
> > + i40e_vsi_config_vlan_stripping(vsi,
> > FALSE);
> > + i40e_vsi_config_vlan_stripping_v1(vsi,
> > TRUE);
> > + }
> > } else {
> > i40e_vsi_config_double_vlan(vsi, TRUE);
> > /* Set global registers with default ethertype.
> > */ @@ -4077,10 +4088,15 @@ i40e_vlan_offload_set(struct rte_eth_dev
> > *dev, int mask)
> >
> > RTE_ETHER_TYPE_VLAN);
> > }
> > } else {
> > - if (pf->fw8_3gt)
> > + if (pf->fw8_3gt) {
> > i40e_vsi_config_qinq(vsi, FALSE);
> > - else
> > + if (rxmode->offloads &
> > RTE_ETH_RX_OFFLOAD_VLAN_STRIP) {
> > + i40e_vsi_config_vlan_stripping_v1(vsi,
> > FALSE);
> > + i40e_vsi_config_vlan_stripping(vsi,
> > TRUE);
> > + }
> > + } else {
> > i40e_vsi_config_double_vlan(vsi,
[Bug 1072] hugetlbfs file descriptor not closed after memery created
https://bugs.dpdk.org/show_bug.cgi?id=1072 Bug ID: 1072 Summary: hugetlbfs file descriptor not closed after memery created Product: DPDK Version: 21.11 Hardware: All OS: Linux Status: UNCONFIRMED Severity: normal Priority: Normal Component: core Assignee: dev@dpdk.org Reporter: 779198...@qq.com Target Milestone: --- -- You are receiving this mail because: You are the assignee for the bug.
RE: [PATCH] net/pcap: reduce time for stopping device
Hi, Ferruh
> > >>> The pcap file will be synchronized to the disk when stopping the device.
> > >>> It takes a long time if the file is large that would cause the
> > >>> 'detach sync request' timeout when the device is closed under
> > >>> multi-process scenario.
> > >>>
> > >>> This commit fixes the issue by performing synchronization in Tx
> > >>> path
> > >>>
> > >>> Fixes: 4c173302c307 ("pcap: add new driver")
> > >>> Cc: sta...@dpdk.org
> > >>>
> > >>> Signed-off-by: Yiding Zhou
> > >>> ---
> > >>>drivers/net/pcap/pcap_ethdev.c | 18 --
> > >>>1 file changed, 16 insertions(+), 2 deletions(-)
> > >>>
> > >>> diff --git a/drivers/net/pcap/pcap_ethdev.c
> > >>> b/drivers/net/pcap/pcap_ethdev.c index ec29fd6bc5..52eafa5674
> > >>> 100644
> > >>> --- a/drivers/net/pcap/pcap_ethdev.c
> > >>> +++ b/drivers/net/pcap/pcap_ethdev.c
> > >>> @@ -3,7 +3,7 @@
> > >>> * Copyright(c) 2014 6WIND S.A.
> > >>> * All rights reserved.
> > >>> */
> > >>> -
> > >>> +#include
> > >>>#include
> > >>>
> > >>>#include
> > >>> @@ -38,6 +38,8 @@
> > >>>
> > >>>#define RTE_PMD_PCAP_MAX_QUEUES 16
> > >>>
> > >>> +#define ETH_PCAP_SYNC_THRESHOLD 0x2000
> > >>> +
> >
> > I guess this is 512MB, can you please comment this.
> > Is there any specific reason to select this value, or is it arbitrary?
> >
> >
>
> 512M is arbitrary, because there is no API to get the disk cache size
> associated
> with a specific file.
> I will test the performance impact of different values.
>
> > >>>static char errbuf[PCAP_ERRBUF_SIZE];
> > >>>static struct timespec start_time;
> > >>>static uint64_t start_cycles;
> > >>> @@ -47,6 +49,8 @@ static uint8_t iface_idx;
> > >>>static uint64_t timestamp_rx_dynflag;
> > >>>static int timestamp_dynfield_offset = -1;
> > >>>
> > >>> +RTE_DEFINE_PER_LCORE(uint64_t, _pcap_cached_bytes);
> > >>> +
> > >>>struct queue_stat {
> > >>> volatile unsigned long pkts;
> > >>> volatile unsigned long bytes;
> > >>> @@ -144,6 +148,16 @@ static struct rte_eth_link pmd_link = {
> > >>>
> > >>>RTE_LOG_REGISTER_DEFAULT(eth_pcap_logtype, NOTICE);
> > >>>
> > >>> +static inline void
> > >>> +pcap_dumper_data_sync(pcap_dumper_t *dumper, uint32_t bytes) {
> >
> > 'pcap_' is the namespace for the libpcap, can you select another
> > prefix, like 'eth_pcap_' as many driver functions does.
> >
> > >>> + RTE_PER_LCORE(_pcap_cached_bytes) += bytes;
> > >>> + if (unlikely(RTE_PER_LCORE(_pcap_cached_bytes) >
> > >> ETH_PCAP_SYNC_THRESHOLD)) {
> > >>> + if (!fdatasync(fileno(pcap_dump_file(dumper
> > >>> + RTE_PER_LCORE(_pcap_cached_bytes) = 0;
> > >>> + }
> > >>> +}
> > >>> +
> >
> > pcap supports multiple queue, and each queue creates a new pcap dumper
> > and single core/thread can be used for this multiple dumpers. In that
> > case I think above per lcore variable logic doesn't work.
> >
> > And instead of having a global value, what do you think to add a
> > variable to 'struct pcap_tx_queue' for this purpose?
> >
>
> Thanks for the comments, I will follow this.
>
> > >>>static struct queue_missed_stat*
> > >>>queue_missed_stat_update(struct rte_eth_dev *dev, unsigned int qid)
> > >>>{
> > >>> @@ -421,7 +435,7 @@ eth_pcap_tx_dumper(void *queue, struct
> > >>> rte_mbuf
> > >> **bufs, uint16_t nb_pkts)
> > >>> * process stops and to make sure the pcap file is actually
> > >>> written,
> > >>> * we flush the pcap dumper within each burst.
> > >>> */
> > >>> - pcap_dump_flush(dumper);
> > >>> + pcap_dumper_data_sync(dumper, tx_bytes);
> > >>
> > >> 'pcap_dump_flush()' should be doing the same thing, to write buffer
> > >> to file, isn't it working?
> > >>
> > >> Can you check the return value of the 'pcap_dump_flush()' API, I
> > >> wonder if it keeps failing, for some reason?
> > >>
> > >
> > > 'pcap_dump_flush()' returns 0 each time without error, it calls
> > > 'fflush()' to
> > flush userspace buffers to kernel buffers, not disk. 'fdatasync()' to
> > ensure data is written to disk.
> > >
> >
> > 'pcap_dump_flush()' API documentation says "flushes the output buffer
> > to the ``savefile,''", but as you said it uses 'fflush()' internally,
> > so there is a chance that data is not written to the disk.
> >
> > In this case, won't need to keep both, first flush and later
> > fsync/fdatasync?
> >
>
> I draw a diagram to describe it more clearly
>
> fwrite fclose/fflush
> fclose/fdatasync
> ->| libc buffer |> |disk cache in RAM
> |->
> |disk|
> | 4096 Bytes | | size is determined by
> OS |
> | |
>
> When the libc buffer is full, the system will automatically sync it to the
> disk
> cache.
> It is easily full as it's only 4096 B size. so there is no
RE: [EXT] [PATCH] test/crypto: fix the bug of wrong debug messages
Thank you for your reference!
I hope this email finds you well!
Best wishes,
Sunyang
-Original Message-
From: Akhil Goyal
Sent: Sunday, August 28, 16:58 PM
To: Sunyang Wu ; dev@dpdk.org
Cc: roy.fan.zh...@intel.com; sta...@dpdk.org
Subject: RE: [EXT] [PATCH] test/crypto: fix the bug of wrong debug messages
> When the queue_ops_rsa_enc_dec function is called, the plaintext will
> be printed twice instead of both plaintext and ciphertext. When the
> create_aead_operation function is called, the contents of iv and aad
> will be printed incorrectly. This patch fixes the issues above.
>
> Fixes: 77a217a19bb7 ("test/crypto: add AES-CCM tests")
>5ae36995f10f ("test/crypto: move RSA enqueue/
> dequeue into functions")
> Cc: sta...@dpdk.org
>
> Signed-off-by: Sunyang Wu
> Reviewed-by: Joey Xing
> Reviewed-by: Qingmin Liu
> Reviewed-by: Lei Cai
Acked-by: Akhil Goyal
Applied to dpdk-next-crypto
Thanks.
Re: [PATCH v2 1/1] app/testpmd: add command line argument 'nic-to-pmd-rx-metadata'
On 8/2/2022 11:21 PM, Hanumanth Pothula wrote: Presently, rx metadata is sent to PMD by default, leading to a performance drop as processing for the same in rx path takes extra cycles. Hence, introducing command line argument, 'nic-to-pmd-rx-metadata' to control passing rx metadata to PMD. By default it’s disabled. Signed-off-by: Hanumanth Pothula Acked-by: Aman Singh v2: - taken cared alignment issues - renamed command line argument from rx-metadata to nic-to-pmd-rx-metadata - renamed variable name from rx-metadata to nic_to_pmd_rx_metadata ---
RE: [PATCH] IGC: Remove I225_I_PHY_ID checking
>-Original Message- >From: Zhang, Qi Z >Sent: Tuesday, 30 August, 2022 7:17 PM >To: IOTG DPDK Ref App ; dev@dpdk.org >Subject: RE: [PATCH] IGC: Remove I225_I_PHY_ID checking > -Original Message- > From: iotg.dpdk.ref@intel.com > Sent: Monday, August 29, 2022 4:15 PM > To: dev@dpdk.org > Subject: [PATCH] IGC: Remove I225_I_PHY_ID checking > > From: NSWE SWS DPDK Dev > > i225 devices have only one PHY vendor. There is unnecessary to check > _I_PHY_ID during the link establishment and auto-negotiation process, > the checking also caused devices like i225-IT failed. This patch is to > remove the mentioned unnecessary checking. > > Cc: sta...@dpdk.org > Signed-off-by: NSWE SWS DPDK Dev >Is this the expected author name? Yes, this is expected author name, the PDL email contain all developers working on the patch for better support and response. > --- > drivers/net/igc/base/igc_api.c | 1 + > drivers/net/igc/base/igc_hw.h | 1 + > drivers/net/igc/base/igc_i225.c | 15 ++- > drivers/net/igc/base/igc_phy.c | 6 ++ > drivers/net/igc/igc_ethdev.c| 1 + > 5 files changed, 7 insertions(+), 17 deletions(-) > > diff --git a/drivers/net/igc/base/igc_api.c > b/drivers/net/igc/base/igc_api.c index 9b791dc082..c9fc9ed4b0 100644 > --- a/drivers/net/igc/base/igc_api.c > +++ b/drivers/net/igc/base/igc_api.c > @@ -886,6 +886,7 @@ s32 igc_set_mac_type(struct igc_hw *hw) > case IGC_DEV_ID_I225_V: > case IGC_DEV_ID_I225_K: > case IGC_DEV_ID_I225_I: > + case IGC_DEV_ID_I225_IT: > case IGC_DEV_ID_I220_V: > case IGC_DEV_ID_I225_BLANK_NVM: > case IGC_DEV_ID_I226_K: > diff --git a/drivers/net/igc/base/igc_hw.h > b/drivers/net/igc/base/igc_hw.h index 707a1883b4..e919a11c02 100644 > --- a/drivers/net/igc/base/igc_hw.h > +++ b/drivers/net/igc/base/igc_hw.h > @@ -164,6 +164,7 @@ struct igc_hw; > #define IGC_DEV_ID_I225_V0x15F3 > #define IGC_DEV_ID_I225_K0x3100 > #define IGC_DEV_ID_I225_I0x15F8 > +#define IGC_DEV_ID_I225_IT 0x0D9F >The patch's commit log claims to remove something, but in code it also add >some new device ID, could you clarify why we need this or it should be in a >separate patch? The checking issue was firstly discovered because of i225-IT not working on our lab and escalated to DPDK team for support, as informed by DPDK team after the patch sent, that the i225-IT device ID has been patched in DPDK next release, we'll send out v2 patch soon with only removing redundance checking without i225-IT device ID.
[PATCH v2] IGC: Remove I225_I_PHY_ID checking
From: NSWE SWS DPDK Dev
i225 devices have only one PHY vendor. There is unnecessary to check
_I_PHY_ID during the link establishment and auto-negotiation process,
the checking also caused devices like i225-IT failed. This patch is to
remove the mentioned unnecessary checking.
Cc: sta...@dpdk.org
Signed-off-by: NSWE SWS DPDK Dev
---
drivers/net/igc/base/igc_i225.c | 15 ++-
drivers/net/igc/base/igc_phy.c | 6 ++
2 files changed, 4 insertions(+), 17 deletions(-)
diff --git a/drivers/net/igc/base/igc_i225.c b/drivers/net/igc/base/igc_i225.c
index 5f3d535490..af26602afb 100644
--- a/drivers/net/igc/base/igc_i225.c
+++ b/drivers/net/igc/base/igc_i225.c
@@ -173,19 +173,8 @@ static s32 igc_init_phy_params_i225(struct igc_hw *hw)
phy->ops.write_reg = igc_write_phy_reg_gpy;
ret_val = igc_get_phy_id(hw);
- /* Verify phy id and set remaining function pointers */
- switch (phy->id) {
- case I225_I_PHY_ID:
- case I226_LM_PHY_ID:
- phy->type = igc_phy_i225;
- phy->ops.set_d0_lplu_state = igc_set_d0_lplu_state_i225;
- phy->ops.set_d3_lplu_state = igc_set_d3_lplu_state_i225;
- /* TODO - complete with GPY PHY information */
- break;
- default:
- ret_val = -IGC_ERR_PHY;
- goto out;
- }
+phy->type = igc_phy_i225;
+
out:
return ret_val;
diff --git a/drivers/net/igc/base/igc_phy.c b/drivers/net/igc/base/igc_phy.c
index 43bbe69bca..2906bae21a 100644
--- a/drivers/net/igc/base/igc_phy.c
+++ b/drivers/net/igc/base/igc_phy.c
@@ -1474,8 +1474,7 @@ s32 igc_phy_setup_autoneg(struct igc_hw *hw)
return ret_val;
}
- if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
- hw->phy.id == I225_I_PHY_ID) {
+ if (phy->autoneg_mask & ADVERTISE_2500_FULL) {
/* Read the MULTI GBT AN Control Register - reg 7.32 */
ret_val = phy->ops.read_reg(hw, (STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) |
@@ -1615,8 +1614,7 @@ s32 igc_phy_setup_autoneg(struct igc_hw *hw)
ret_val = phy->ops.write_reg(hw, PHY_1000T_CTRL,
mii_1000t_ctrl_reg);
- if ((phy->autoneg_mask & ADVERTISE_2500_FULL) &&
- hw->phy.id == I225_I_PHY_ID)
+ if (phy->autoneg_mask & ADVERTISE_2500_FULL)
ret_val = phy->ops.write_reg(hw,
(STANDARD_AN_REG_MASK <<
MMD_DEVADDR_SHIFT) |
--
2.36.1
[PATCH 1/4] net/axgbe: fix scattered Rx function
Error check needs to be done only for last segment of Jumbo packet.
Freed first_seg and reset eop to 0 in error case
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 32 +++-
1 file changed, 19 insertions(+), 13 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index f38bb64fab..6909d3a852 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -381,19 +381,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
}
mbuf = rxq->sw_ring[idx];
- /* Check for any errors and free mbuf*/
- err = AXGMAC_GET_BITS_LE(desc->write.desc3,
-RX_NORMAL_DESC3, ES);
- error_status = 0;
- if (unlikely(err)) {
- error_status = desc->write.desc3 & AXGBE_ERR_STATUS;
- if ((error_status != AXGBE_L3_CSUM_ERR)
- && (error_status != AXGBE_L4_CSUM_ERR))
{
- rxq->errors++;
- rte_pktmbuf_free(mbuf);
- goto err_set;
- }
- }
rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *));
if (!AXGMAC_GET_BITS_LE(desc->write.desc3,
@@ -406,6 +393,25 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_NORMAL_DESC3, PL);
data_len = pkt_len - rxq->crc_len;
+ /* Check for any errors and free mbuf*/
+ err = AXGMAC_GET_BITS_LE(desc->write.desc3,
+ RX_NORMAL_DESC3, ES);
+ error_status = 0;
+ if (unlikely(err)) {
+ error_status = desc->write.desc3 &
+ AXGBE_ERR_STATUS;
+ if ((error_status != AXGBE_L3_CSUM_ERR) &&
+ (error_status !=
+AXGBE_L4_CSUM_ERR)) {
+ rxq->errors++;
+ rte_pktmbuf_free(mbuf);
+ rte_pktmbuf_free(first_seg);
+ first_seg = NULL;
+ eop = 0;
+ goto err_set;
+ }
+ }
+
}
if (first_seg != NULL) {
--
2.25.1
[PATCH 2/4] net/axgbe: fix scattered Rx function
Updated pkt_len and data_len in the last segment of the packet.
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 6909d3a852..3594421e08 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -391,8 +391,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
} else {
eop = 1;
pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3,
- RX_NORMAL_DESC3, PL);
- data_len = pkt_len - rxq->crc_len;
+ RX_NORMAL_DESC3, PL) - rxq->crc_len;
+ data_len = pkt_len % rxq->buf_size;
/* Check for any errors and free mbuf*/
err = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_NORMAL_DESC3, ES);
--
2.25.1
[PATCH 3/4] net/axgbe: fix scattered Rx function
Updating mbuf data_len, Pkt_len for each segment before chaining them
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 3594421e08..d3e9368b44 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -413,6 +413,10 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
}
}
+ /* Mbuf populate */
+ mbuf->data_off = RTE_PKTMBUF_HEADROOM;
+ mbuf->data_len = data_len;
+ mbuf->pkt_len = data_len;
if (first_seg != NULL) {
if (rte_pktmbuf_chain(first_seg, mbuf) != 0)
@@ -444,9 +448,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
mbuf->vlan_tci = 0;
}
}
- /* Mbuf populate */
- mbuf->data_off = RTE_PKTMBUF_HEADROOM;
- mbuf->data_len = data_len;
err_set:
rxq->cur++;
--
2.25.1
[PATCH 4/4] net/axgbe: fix scattered Rx function
Updated the RSS hash and CSUM checks with first_seg instead of mbufs.
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 41 +-
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index d3e9368b44..78a32db973 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -428,24 +428,27 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
/* Get the RSS hash */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
- mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
+ first_seg->hash.rss =
+ rte_le_to_cpu_32(desc->write.desc1);
etlt = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_NORMAL_DESC3, ETLT);
offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;
if (!err || !etlt) {
if (etlt == RX_CVLAN_TAG_PRESENT) {
- mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN;
- mbuf->vlan_tci =
+ first_seg->ol_flags |= RTE_MBUF_F_RX_VLAN;
+ first_seg->vlan_tci =
AXGMAC_GET_BITS_LE(desc->write.desc0,
RX_NORMAL_DESC0, OVT);
if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
- mbuf->ol_flags |=
RTE_MBUF_F_RX_VLAN_STRIPPED;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_VLAN_STRIPPED;
else
- mbuf->ol_flags &=
~RTE_MBUF_F_RX_VLAN_STRIPPED;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_VLAN_STRIPPED;
} else {
- mbuf->ol_flags &=
+ first_seg->ol_flags &=
~(RTE_MBUF_F_RX_VLAN |
RTE_MBUF_F_RX_VLAN_STRIPPED);
- mbuf->vlan_tci = 0;
+ first_seg->vlan_tci = 0;
}
}
@@ -469,18 +472,24 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
first_seg->port = rxq->port_id;
if (rxq->pdata->rx_csum_enable) {
- mbuf->ol_flags = 0;
- mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+ first_seg->ol_flags = 0;
+ first_seg->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
+ first_seg->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
if (unlikely(error_status == AXGBE_L3_CSUM_ERR)) {
- mbuf->ol_flags &= ~RTE_MBUF_F_RX_IP_CKSUM_GOOD;
- mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
- mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
- mbuf->ol_flags |=
RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_IP_CKSUM_GOOD;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_IP_CKSUM_BAD;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
} else if (unlikely(error_status
== AXGBE_L4_CSUM_ERR)) {
- mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_L4_CKSUM_BAD;
}
}
--
2.25.1
RE: [PATCH V2 0/6] pipeline: make the hash function configurable per table
> From: Stephen Hemminger [mailto:step...@networkplumber.org] > Sent: Wednesday, 31 August 2022 18.23 > Subject: Re: [PATCH V2 0/6] pipeline: make the hash function > configurable per table > > On Fri, 19 Aug 2022 19:52:19 + > Cristian Dumitrescu wrote: > > > Also, since this flexibility has some performance cost, this patch > set > > also introduces key comparison functions specialized for each key > size > > value. Since the key size is fixed for each table, the key comparison > > function can be selected at initialization as opposed to using a > > generic function that can handle any key size. This strategy result > in > > a performance improvement for the table lookup operation of around > 5%. > > I wonder if DPDK should start to adopt the Linux kernel optimizations > around indirect calls. For most all cases, the function pointer will be > a certain value and the cpu can do direct rather than indirect call. > > As in: > > if (likely(hash_func == crc32_hash)) > crc32_hash(x, y) > else > (*hash_func)(x, y) > > This was done in Linux kernel because of the overhead of the > Spectre/Meltdown > mitigation's, but could apply more generally in DPDK. +1 to that! Along the very same lines, I remember reading on LWN about the Linux kernel using some magic to avoid function pointers, or to install optimized functions: At locations in the code where multiple variants of a function could be used, the address of the correct/optimized function is written directly into those locations in the code at startup. I didn't read the article in depth back then, and I can't find it now. Perhaps you know what I'm referring to, Stephen? I wonder if that also might be relevant for DPDK.
[PATCH] regexdev: add maximum number of mbuf segments field
Allows application to query maximum number of mbuf segments that can
be chained together.
Signed-off-by: Gerry Gribbon
Acked-by: Ori Kam
---
drivers/regex/mlx5/mlx5_regex.h | 1 +
drivers/regex/mlx5/mlx5_regex_fastpath.c | 43
drivers/regex/mlx5/mlx5_rxp.c| 1 +
lib/regexdev/rte_regexdev.h | 2 ++
4 files changed, 47 insertions(+)
diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 89495301ac..98fe95b781 100644
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -94,4 +94,5 @@ uint16_t mlx5_regexdev_dequeue(struct rte_regexdev *dev,
uint16_t qp_id,
struct rte_regex_ops **ops, uint16_t nb_ops);
uint16_t mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
struct rte_regex_ops **ops, uint16_t nb_ops);
+uint16_t mlx5_regexdev_max_segs_get(void);
#endif /* MLX5_REGEX_H */
diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c
b/drivers/regex/mlx5/mlx5_regex_fastpath.c
index 9a2db7e43f..16f48627e5 100644
--- a/drivers/regex/mlx5/mlx5_regex_fastpath.c
+++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c
@@ -41,6 +41,39 @@
/* In WQE set mode, the pi should be quarter of the MLX5_REGEX_MAX_WQE_INDEX.
*/
#define MLX5_REGEX_UMR_QP_PI_IDX(pi, ops) \
(((pi) + (ops)) & (MLX5_REGEX_MAX_WQE_INDEX >> 2))
+#ifdef RTE_LIBRTE_MLX5_DEBUG
+#define MLX5_REGEX_DEBUG 0
+#endif
+#ifdef HAVE_MLX5_UMR_IMKEY
+static uint16_t max_nb_segs = MLX5_REGEX_MAX_KLM_NUM;
+#else
+static uint16_t max_nb_segs = 1;
+#endif
+
+uint16_t
+mlx5_regexdev_max_segs_get(void)
+{
+ return max_nb_segs;
+}
+
+#ifdef MLX5_REGEX_DEBUG
+static inline uint16_t
+validate_ops(struct rte_regex_ops **ops, uint16_t nb_ops)
+{
+ uint16_t nb_left = nb_ops;
+ struct rte_mbuf *mbuf;
+
+ while (nb_left--) {
+ mbuf = ops[nb_left]->mbuf;
+ if ((mbuf->pkt_len > MLX5_RXP_MAX_JOB_LENGTH) ||
+ (mbuf->nb_segs > max_nb_segs)) {
+ DRV_LOG(ERR, "Failed to validate regex ops");
+ return 1;
+ }
+ }
+ return 0;
+}
+#endif
static inline uint32_t
qp_size_get(struct mlx5_regex_hw_qp *qp)
@@ -375,6 +408,11 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev,
uint16_t qp_id,
struct mlx5_regex_hw_qp *qp_obj;
size_t hw_qpid, nb_left = nb_ops, nb_desc;
+#ifdef MLX5_REGEX_DEBUG
+ if (validate_ops(ops, nb_ops))
+ return 0;
+#endif
+
while ((hw_qpid = ffs(queue->free_qps))) {
hw_qpid--; /* ffs returns 1 for bit 0 */
qp_obj = &queue->qps[hw_qpid];
@@ -409,6 +447,11 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t
qp_id,
struct mlx5_regex_hw_qp *qp_obj;
size_t hw_qpid, job_id, i = 0;
+#ifdef MLX5_REGEX_DEBUG
+ if (validate_ops(ops, nb_ops))
+ return 0;
+#endif
+
while ((hw_qpid = ffs(queue->free_qps))) {
hw_qpid--; /* ffs returns 1 for bit 0 */
qp_obj = &queue->qps[hw_qpid];
diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index ed3af15e40..35a4cfb7ac 100644
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -45,6 +45,7 @@ mlx5_regex_info_get(struct rte_regexdev *dev __rte_unused,
RTE_REGEXDEV_CAPA_QUEUE_PAIR_OOS_F;
info->rule_flags = 0;
info->max_queue_pairs = UINT16_MAX;
+ info->max_num_mbuf_segs = mlx5_regexdev_max_segs_get();
return 0;
}
diff --git a/lib/regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
index 3bce8090f6..131d44f474 100644
--- a/lib/regexdev/rte_regexdev.h
+++ b/lib/regexdev/rte_regexdev.h
@@ -612,6 +612,8 @@ struct rte_regexdev_info {
/**< Maximum payload size for a pattern match request or scan.
* @see RTE_REGEXDEV_CFG_CROSS_BUFFER_SCAN_F
*/
+ uint16_t max_num_mbuf_segs;
+ /**< Maximum number of mbuf segments that can be chained together. */
uint32_t max_rules_per_group;
/**< Maximum rules supported per group by this device. */
uint16_t max_groups;
--
2.25.1
[PATCH] regexdev: add maximum number of mbuf segments field
Allows application to query maximum number of mbuf segments that can
be chained together.
Signed-off-by: Gerry Gribbon
Acked-by: Ori Kam
---
drivers/regex/mlx5/mlx5_regex.h | 1 +
drivers/regex/mlx5/mlx5_regex_fastpath.c | 43
drivers/regex/mlx5/mlx5_rxp.c| 1 +
lib/regexdev/rte_regexdev.h | 2 ++
4 files changed, 47 insertions(+)
diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 89495301ac..98fe95b781 100644
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -94,4 +94,5 @@ uint16_t mlx5_regexdev_dequeue(struct rte_regexdev *dev,
uint16_t qp_id,
struct rte_regex_ops **ops, uint16_t nb_ops);
uint16_t mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev, uint16_t qp_id,
struct rte_regex_ops **ops, uint16_t nb_ops);
+uint16_t mlx5_regexdev_max_segs_get(void);
#endif /* MLX5_REGEX_H */
diff --git a/drivers/regex/mlx5/mlx5_regex_fastpath.c
b/drivers/regex/mlx5/mlx5_regex_fastpath.c
index 9a2db7e43f..16f48627e5 100644
--- a/drivers/regex/mlx5/mlx5_regex_fastpath.c
+++ b/drivers/regex/mlx5/mlx5_regex_fastpath.c
@@ -41,6 +41,39 @@
/* In WQE set mode, the pi should be quarter of the MLX5_REGEX_MAX_WQE_INDEX.
*/
#define MLX5_REGEX_UMR_QP_PI_IDX(pi, ops) \
(((pi) + (ops)) & (MLX5_REGEX_MAX_WQE_INDEX >> 2))
+#ifdef RTE_LIBRTE_MLX5_DEBUG
+#define MLX5_REGEX_DEBUG 0
+#endif
+#ifdef HAVE_MLX5_UMR_IMKEY
+static uint16_t max_nb_segs = MLX5_REGEX_MAX_KLM_NUM;
+#else
+static uint16_t max_nb_segs = 1;
+#endif
+
+uint16_t
+mlx5_regexdev_max_segs_get(void)
+{
+ return max_nb_segs;
+}
+
+#ifdef MLX5_REGEX_DEBUG
+static inline uint16_t
+validate_ops(struct rte_regex_ops **ops, uint16_t nb_ops)
+{
+ uint16_t nb_left = nb_ops;
+ struct rte_mbuf *mbuf;
+
+ while (nb_left--) {
+ mbuf = ops[nb_left]->mbuf;
+ if ((mbuf->pkt_len > MLX5_RXP_MAX_JOB_LENGTH) ||
+ (mbuf->nb_segs > max_nb_segs)) {
+ DRV_LOG(ERR, "Failed to validate regex ops");
+ return 1;
+ }
+ }
+ return 0;
+}
+#endif
static inline uint32_t
qp_size_get(struct mlx5_regex_hw_qp *qp)
@@ -375,6 +408,11 @@ mlx5_regexdev_enqueue_gga(struct rte_regexdev *dev,
uint16_t qp_id,
struct mlx5_regex_hw_qp *qp_obj;
size_t hw_qpid, nb_left = nb_ops, nb_desc;
+#ifdef MLX5_REGEX_DEBUG
+ if (validate_ops(ops, nb_ops))
+ return 0;
+#endif
+
while ((hw_qpid = ffs(queue->free_qps))) {
hw_qpid--; /* ffs returns 1 for bit 0 */
qp_obj = &queue->qps[hw_qpid];
@@ -409,6 +447,11 @@ mlx5_regexdev_enqueue(struct rte_regexdev *dev, uint16_t
qp_id,
struct mlx5_regex_hw_qp *qp_obj;
size_t hw_qpid, job_id, i = 0;
+#ifdef MLX5_REGEX_DEBUG
+ if (validate_ops(ops, nb_ops))
+ return 0;
+#endif
+
while ((hw_qpid = ffs(queue->free_qps))) {
hw_qpid--; /* ffs returns 1 for bit 0 */
qp_obj = &queue->qps[hw_qpid];
diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index ed3af15e40..35a4cfb7ac 100644
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -45,6 +45,7 @@ mlx5_regex_info_get(struct rte_regexdev *dev __rte_unused,
RTE_REGEXDEV_CAPA_QUEUE_PAIR_OOS_F;
info->rule_flags = 0;
info->max_queue_pairs = UINT16_MAX;
+ info->max_num_mbuf_segs = mlx5_regexdev_max_segs_get();
return 0;
}
diff --git a/lib/regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
index 3bce8090f6..131d44f474 100644
--- a/lib/regexdev/rte_regexdev.h
+++ b/lib/regexdev/rte_regexdev.h
@@ -612,6 +612,8 @@ struct rte_regexdev_info {
/**< Maximum payload size for a pattern match request or scan.
* @see RTE_REGEXDEV_CFG_CROSS_BUFFER_SCAN_F
*/
+ uint16_t max_num_mbuf_segs;
+ /**< Maximum number of mbuf segments that can be chained together. */
uint32_t max_rules_per_group;
/**< Maximum rules supported per group by this device. */
uint16_t max_groups;
--
2.25.1
Optimizing for common burst sizes
Triggered by the discussion about the performance cost of function pointers [1], I want to share some thoughts about variables vs. constants: A lot of flexibility - some of it only required to support more or less exotic scenarios - has been sneaking into DPDK, and costing performance. Not only function pointers, but also variables, which might as well be build time constants. E.g.: When the i40e driver allocates a bulk of mbufs, the non-vector function allocates rxq->rx_free_thresh mbufs each time, but the optimized vector functions allocate RTE_I40E_RXQ_REARM_THRESH (#defined as 32) mbufs each time. Using a constant provides higher performance, because the compiler at build time knows the size of the mempool cache copy loop in the rte_mempool_do_generic_get() function, which gets inlined into the i40e driver. I suppose the non-vector variant having a variable is there to support latency-sensitive applications requiring very small bursts - but using a build time configurable constant would provide even higher performance (i.e. lower latency). We might be able to achieve some general performance improvements by agreeing on a few "extremely common" burst sizes, and giving them special treatment. It would not only improve performance, but might also reduce some complexity by using common standards in places where burst sizes today are implementation specific. They might also be helpful guidance for new DPDK application developers. These constants could be: RTE_BURST_MICRO --- The burst size for latency sensitive application. Default: 4 (?) RTE_BURST_SMALL --- A small, but still efficient burst; e.g. a cache line of pointers. Default: RTE_CACHE_LINE_SIZE / sizeof(void *) = 8 or 16 RTE_BURST_DEFAULT - The typical application burst size. Default: 32 RTE_BURST_HUGE -- A very large burst, but small enough to fit into a typical PMD egress queue. E.g. the mempool cache size, or half of it. Default: RTE_MEMPOOL_CACHE_MAX_SIZE = 512 (or half of it?) Note: This one might be too rare to deserve special treatment, but is included for the sake of discussion. Obviously, these should be build time configurable. [1] http://inbox.dpdk.org/dev/20220818114449.1408226-1-cristian.dumitre...@intel.com/T/#m679f356f097c89d3a542b7a0967069d6d0bc25e3 Med venlig hilsen / Kind regards, -Morten Brørup
Re: [PATCH] IGC: Remove I225_I_PHY_ID checking
On Thu, Sep 1, 2022 at 10:08 AM Mah, Yock Gen wrote: > > >-Original Message- > >From: Zhang, Qi Z > >Sent: Tuesday, 30 August, 2022 7:17 PM > >To: IOTG DPDK Ref App ; dev@dpdk.org > >Subject: RE: [PATCH] IGC: Remove I225_I_PHY_ID checking > > > -Original Message- > > From: iotg.dpdk.ref@intel.com > > Sent: Monday, August 29, 2022 4:15 PM > > To: dev@dpdk.org > > Subject: [PATCH] IGC: Remove I225_I_PHY_ID checking > > > > From: NSWE SWS DPDK Dev > > > > i225 devices have only one PHY vendor. There is unnecessary to check > > _I_PHY_ID during the link establishment and auto-negotiation process, > > the checking also caused devices like i225-IT failed. This patch is to > > remove the mentioned unnecessary checking. > > > > Cc: sta...@dpdk.org > > Signed-off-by: NSWE SWS DPDK Dev > > >Is this the expected author name? > Yes, this is expected author name, the PDL email contain all developers > working on the patch for better support and response. This is not acceptable. https://doc.dpdk.org/guides/contributing/patches.html#commit-messages-body It is clearly stated that: """ The signoff must be a real name and not an alias or nickname. More than one signoff is allowed. """ And all developers involved in the making of a patch must follow the Developer’s Certificate of Origin. https://www.kernel.org/doc/html/latest/process/submitting-patches.html#developer-s-certificate-of-origin-1-1 In its current form, this patch cannot be merged in the DPDK project. Besides, please register to the @dev mailing list. -- David Marchand
[PATCH] regexdev: add match mode command line parameter
Allows application to specify match mode to be used.
Signed-off-by: Gerry Gribbon
Acked-by: Ori Kam
---
app/test-regex/main.c| 38 ++--
doc/guides/tools/testregex.rst | 3 ++
drivers/regex/mlx5/mlx5_regex_fastpath.c | 8 +++--
3 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/app/test-regex/main.c b/app/test-regex/main.c
index 351c36a879..29e0bc391d 100644
--- a/app/test-regex/main.c
+++ b/app/test-regex/main.c
@@ -25,6 +25,7 @@
#define MBUF_CACHE_SIZE 256
#define MBUF_SIZE (1 << 8)
#define START_BURST_SIZE 32u
+#define MAX_MATCH_MODE 2
enum app_args {
ARG_HELP,
@@ -36,6 +37,7 @@ enum app_args {
ARG_NUM_OF_QPS,
ARG_NUM_OF_LCORES,
ARG_NUM_OF_MBUF_SEGS,
+ ARG_NUM_OF_MATCH_MODE,
};
struct job_ctx {
@@ -72,6 +74,7 @@ struct regex_conf {
long data_len;
long job_len;
uint32_t nb_segs;
+ uint32_t match_mode;
};
static void
@@ -85,14 +88,17 @@ usage(const char *prog_name)
" --nb_iter N: number of iteration to run\n"
" --nb_qps N: number of queues to use\n"
" --nb_lcores N: number of lcores to use\n"
- " --nb_segs N: number of mbuf segments\n",
+ " --nb_segs N: number of mbuf segments\n"
+ " --match_mode N: match mode: 0 - None (default),"
+ " 1 - Highest Priority, 2 - Stop On Any\n",
prog_name);
}
static void
args_parse(int argc, char **argv, char *rules_file, char *data_file,
uint32_t *nb_jobs, bool *perf_mode, uint32_t *nb_iterations,
- uint32_t *nb_qps, uint32_t *nb_lcores, uint32_t *nb_segs)
+ uint32_t *nb_qps, uint32_t *nb_lcores, uint32_t *nb_segs,
+ uint32_t *match_mode)
{
char **argvopt;
int opt;
@@ -116,6 +122,8 @@ args_parse(int argc, char **argv, char *rules_file, char
*data_file,
{ "nb_lcores", 1, 0, ARG_NUM_OF_LCORES},
/* Number of mbuf segments. */
{ "nb_segs", 1, 0, ARG_NUM_OF_MBUF_SEGS},
+ /* Match mode. */
+ { "match_mode", 1, 0, ARG_NUM_OF_MATCH_MODE},
/* End of options */
{ 0, 0, 0, 0 }
};
@@ -158,6 +166,12 @@ args_parse(int argc, char **argv, char *rules_file, char
*data_file,
case ARG_NUM_OF_MBUF_SEGS:
*nb_segs = atoi(optarg);
break;
+ case ARG_NUM_OF_MATCH_MODE:
+ *match_mode = atoi(optarg);
+ if (*match_mode > MAX_MATCH_MODE)
+ rte_exit(EXIT_FAILURE,
+"Invalid match mode value\n");
+ break;
case ARG_HELP:
usage(argv[0]);
break;
@@ -382,6 +396,7 @@ run_regex(void *args)
char *data_buf = rgxc->data_buf;
long data_len = rgxc->data_len;
long job_len = rgxc->job_len;
+ uint32_t match_mode = rgxc->match_mode;
long remainder;
long act_job_len = 0;
bool last_job = false;
@@ -506,6 +521,21 @@ run_regex(void *args)
jobs_ctx[i].mbuf = ops[i]->mbuf;
ops[i]->user_id = i;
ops[i]->group_id0 = 1;
+ switch (match_mode) {
+ case 0:
+ /* Nothing to set in req_flags */
+ break;
+ case 1:
+ ops[i]->req_flags |=
RTE_REGEX_OPS_REQ_MATCH_HIGH_PRIORITY_F;
+ break;
+ case 2:
+ ops[i]->req_flags |=
RTE_REGEX_OPS_REQ_STOP_ON_MATCH_F;
+ break;
+ default:
+ rte_exit(EXIT_FAILURE,
+"Invalid match mode value\n");
+ break;
+ }
pos += act_job_len;
actual_jobs++;
}
@@ -709,6 +739,7 @@ main(int argc, char **argv)
long data_len;
long job_len;
uint32_t nb_lcores = 1, nb_segs = 1;
+ uint32_t match_mode = 0;
struct regex_conf *rgxc;
uint32_t i;
struct qps_per_lcore *qps_per_lcore;
@@ -722,7 +753,7 @@ main(int argc, char **argv)
if (argc > 1)
args_parse(argc, argv, rules_file, data_file, &nb_jobs,
&perf_mode, &nb_iterations, &nb_qps,
- &nb_lcores, &nb_segs);
+ &nb_lcores, &nb_segs, &match_mode);
if (nb_qps == 0)
rte_exit(EXIT_FAILURE, "Number of QPs must be greater than
0\n");
@@ -763,6 +794,7 @@ main(int argc, char **argv)
[PATCH] examples: compilation fix for GCC-12
GCC-12 warns when a pointer of type union points to an array of same
defined size, as union internally gets paded with pad bytes.
../examples/common/neon/port_group.h:42:21: error: array subscript
'union [0]' is partly outside array bounds of
'uint16_t[5]' {aka 'short unsigned int[5]'}
[-Werror=array-bounds]
42 | pnum->u64 = gptbl[v].pnum;
| ^~
../examples/common/neon/port_group.h:21:23: note: object 'pn' of
size [0, 10]
21 | port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp, uint16x8_t dp1
| ~^~~
../examples/common/neon/port_group.h:43:21: error: array subscript
'union [0]' is partly outside array bounds of
'uint16_t[5]' {aka 'short unsigned int[5]'} [-Werror=array-bounds]
43 | pnum->u16[FWDSTEP] = 1;
| ^~
Fixes: bdfc3816fbfc ("examples: common packet group functionality")
Cc: sta...@dpdk.org
Signed-off-by: Amit Prakash Shukla
---
examples/common/neon/port_group.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/common/neon/port_group.h
b/examples/common/neon/port_group.h
index 82c6ed6d73..97da604583 100644
--- a/examples/common/neon/port_group.h
+++ b/examples/common/neon/port_group.h
@@ -24,7 +24,7 @@ port_groupx4(uint16_t pn[FWDSTEP + 1], uint16_t *lp,
uint16x8_t dp1,
union {
uint16_t u16[FWDSTEP + 1];
uint64_t u64;
- } *pnum = (void *)pn;
+ } __attribute__((__packed__)) *pnum = (void *)pn;
uint16x8_t mask = {1, 2, 4, 8, 0, 0, 0, 0};
int32_t v;
--
2.25.1
[PATCH] regex/mlx5: add support for combined rof file
Added support to allow parsing of a combined rof file to
locate compatible binary rof data for the Bluefield hardware
being run on.
Signed-off-by: Gerry Gribbon
Acked-by: Ori Kam
---
drivers/regex/mlx5/mlx5_regex.h | 4 +
drivers/regex/mlx5/mlx5_rxp.c | 148
drivers/regex/mlx5/mlx5_rxp.h | 4 +
3 files changed, 156 insertions(+)
diff --git a/drivers/regex/mlx5/mlx5_regex.h b/drivers/regex/mlx5/mlx5_regex.h
index 89495301ac..c8dfea4e94 100644
--- a/drivers/regex/mlx5/mlx5_regex.h
+++ b/drivers/regex/mlx5/mlx5_regex.h
@@ -74,6 +74,10 @@ int mlx5_regex_configure(struct rte_regexdev *dev,
const struct rte_regexdev_config *cfg);
int mlx5_regex_rules_db_import(struct rte_regexdev *dev,
const char *rule_db, uint32_t rule_db_len);
+int mlx5_regex_check_rof_version(uint32_t combined_rof_version);
+int mlx5_regex_parse_rules_db(struct mlx5_regex_priv *priv,
+ const char **rule_db, uint32_t *rule_db_len);
+int mlx5_regex_get_rxp_vers(uint32_t regexp_version, uint32_t
*target_rxp_vers);
/* mlx5_regex_devx.c */
int mlx5_devx_regex_rules_program(void *ctx, uint8_t engine, uint32_t rof_mkey,
diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index ed3af15e40..4cda8692e7 100644
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -26,6 +26,8 @@
#define MLX5_REGEX_RXP_ROF2_LINE_LEN 34
+const uint64_t combined_rof_tag = 0xff52544424a52475;
+
/* Private Declarations */
static int
rxp_create_mkey(struct mlx5_regex_priv *priv, void *ptr, size_t size,
@@ -88,6 +90,147 @@ rxp_destroy_mkey(struct mlx5_regex_mkey *mkey)
claim_zero(mlx5_glue->devx_umem_dereg(mkey->umem));
}
+int
+mlx5_regex_get_rxp_vers(uint32_t regexp_version, uint32_t *target_rxp_vers)
+{
+ int ret = 0;
+ switch (regexp_version) {
+ case MLX5_RXP_BF2_IDENTIFIER:
+ *target_rxp_vers = MLX5_RXP_BF2_ROF_VERSION_STRING;
+ break;
+ case MLX5_RXP_BF3_IDENTIFIER:
+ *target_rxp_vers = MLX5_RXP_BF3_ROF_VERSION_STRING;
+ break;
+ default:
+ DRV_LOG(ERR, "Unsupported rxp version: %u", regexp_version);
+ ret = -EINVAL;
+ break;
+ }
+ return ret;
+}
+
+int
+mlx5_regex_check_rof_version(uint32_t combined_rof_vers)
+{
+ int ret = 0;
+ /* Check if combined rof version is supported */
+ switch (combined_rof_vers) {
+ case 1:
+ break;
+ default:
+ DRV_LOG(ERR, "Unsupported combined rof version: %u",
+ combined_rof_vers);
+ ret = -EINVAL;
+ break;
+ }
+ return ret;
+}
+
+int
+mlx5_regex_parse_rules_db(struct mlx5_regex_priv *priv,
+ const char **rules_db, uint32_t *rules_db_len)
+{
+ int i = 0;
+ uint32_t j = 0;
+ int ret = 0;
+ bool combined_rof = true;
+ const char *rof_ptr = *rules_db;
+ uint32_t combined_rof_vers = 0;
+ uint32_t num_rof_blocks = 0;
+ uint32_t rxpc_vers = 0;
+ uint32_t target_rxp_vers = 0;
+ uint32_t byte_count = 0;
+ uint32_t rof_bytes_read = 0;
+ bool rof_binary_found = false;
+ struct mlx5_hca_attr *attr = &priv->cdev->config.hca_attr;
+
+ /* Need minimum of 8 bytes to process single or combined rof */
+ if (*rules_db_len < 8)
+ return -EINVAL;
+
+ for (i = 0; i < 8; i++) {
+ if ((char) *rof_ptr !=
+ (char)((combined_rof_tag >> (i * 8)) & 0xFF)) {
+ combined_rof = false;
+ break;
+ }
+ rof_ptr++;
+ }
+ rof_bytes_read += 8;
+
+ if (combined_rof == true) {
+ /* Need at least 24 bytes of header info: 16 byte combined */
+ /* rof header and 8 byte binary rof blob header. */
+ if (*rules_db_len < 24)
+ return -EINVAL;
+
+ /* Read the combined rof version and number of rof blocks */
+ for (i = 0; i < 4; i++) {
+ combined_rof_vers |= *rof_ptr << (i * 8);
+ rof_ptr++;
+ }
+
+ rof_bytes_read += 4;
+ ret = mlx5_regex_check_rof_version(combined_rof_vers);
+ if (ret < 0)
+ return ret;
+
+ for (i = 0; i < 4; i++) {
+ num_rof_blocks |= *rof_ptr << (i * 8);
+ rof_ptr++;
+ }
+ rof_bytes_read += 4;
+
+ if (num_rof_blocks == 0)
+ return -EINVAL;
+
+ /* Get the version of rxp we need the rof for */
+ ret = mlx5_regex_get_rxp_vers(attr->regexp_version,
&target_rxp_vers);
+ if (ret < 0)
+
[PATCH] regex/mlx5: add check for nb max matches
Added check so user gets error if they try to configure the
nb_max_matches value when using rte_regexdev_configure().
Signed-off-by: Gerry Gribbon
Acked-by: Ori Kam
---
drivers/regex/mlx5/mlx5_rxp.c | 5 +
1 file changed, 5 insertions(+)
diff --git a/drivers/regex/mlx5/mlx5_rxp.c b/drivers/regex/mlx5/mlx5_rxp.c
index ed3af15e40..47d32b7dd7 100644
--- a/drivers/regex/mlx5/mlx5_rxp.c
+++ b/drivers/regex/mlx5/mlx5_rxp.c
@@ -144,6 +144,11 @@ mlx5_regex_configure(struct rte_regexdev *dev,
if (priv->prog_mode == MLX5_RXP_MODE_NOT_DEFINED)
return -1;
+ if (cfg->nb_max_matches != MLX5_REGEX_MAX_MATCHES) {
+ DRV_LOG(ERR, "nb_max_matches is not configurable.");
+ rte_errno = EINVAL;
+ return -rte_errno;
+ }
priv->nb_queues = cfg->nb_queue_pairs;
dev->data->dev_conf.nb_queue_pairs = priv->nb_queues;
priv->qps = rte_zmalloc(NULL, sizeof(struct mlx5_regex_qp) *
--
2.25.1
[PATCH] regexdev: display response flags value
Allows application user to see response flags
Signed-off-by: Gerry Gribbon
Acked-by: Ori Kam
---
app/test-regex/main.c | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/test-regex/main.c b/app/test-regex/main.c
index 351c36a879..94b767e380 100644
--- a/app/test-regex/main.c
+++ b/app/test-regex/main.c
@@ -392,6 +392,7 @@ run_regex(void *args)
uint16_t qp_id;
uint16_t dev_id = 0;
uint8_t nb_matches;
+ uint16_t rsp_flags = 0;
struct rte_regexdev_match *match;
long pos;
unsigned long d_ind = 0;
@@ -585,8 +586,9 @@ run_regex(void *args)
/* Log results per job. */
for (d_ind = 0; d_ind < qp->total_dequeue; d_ind++) {
nb_matches = qp->ops[d_ind % actual_jobs]->nb_matches;
- printf("Job id %"PRIu64" number of matches = %d\n",
- qp->ops[d_ind]->user_id, nb_matches);
+ rsp_flags = qp->ops[d_ind % actual_jobs]->rsp_flags;
+ printf("Job id %"PRIu64" number of matches = %d, rsp
flags = 0x%x\n",
+ qp->ops[d_ind]->user_id, nb_matches,
rsp_flags);
qp->total_matches += nb_matches;
match = qp->ops[d_ind % actual_jobs]->matches;
for (i = 0; i < nb_matches; i++) {
--
2.25.1
[PATCH] net/mvneta: compilation fix for GCC-12
./drivers/net/mvneta/mvneta_rxtx.c:89:42:
error: 'mbufs' may be used uninitialized [-Werror=maybe-uninitialized]
89 | MVNETA_SET_COOKIE_HIGH_ADDR(mbufs[0]);
| ^
../drivers/net/mvneta/mvneta_rxtx.c:77:26: note: 'mbufs' declared here
77 | struct rte_mbuf *mbufs[MRVL_NETA_BUF_RELEASE_BURST_SIZE_MAX];
| ^
Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
Cc: sta...@dpdk.org
Signed-off-by: Amit Prakash Shukla
---
drivers/net/mvneta/mvneta_rxtx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c
index 6e4a7896b4..952e982275 100644
--- a/drivers/net/mvneta/mvneta_rxtx.c
+++ b/drivers/net/mvneta/mvneta_rxtx.c
@@ -79,6 +79,10 @@ mvneta_buffs_refill(struct mvneta_priv *priv, struct
mvneta_rxq *rxq, u16 *num)
int i, ret;
uint16_t nb_desc = *num;
+ /* To prevent GCC-12 warning. */
+ if (unlikely(nb_desc == 0))
+ return -1;
+
ret = rte_pktmbuf_alloc_bulk(rxq->mp, mbufs, nb_desc);
if (ret) {
MVNETA_LOG(ERR, "Failed to allocate %u mbufs.", nb_desc);
--
2.25.1
RE: [PATCH] net/mvneta: compilation fix for GCC-12
Acked-by: Liron Himi
-Original Message-
From: Amit Prakash Shukla
Sent: Thursday, 1 September 2022 11:31
To: Zyta Szpak ; Liron Himi
Cc: dev@dpdk.org; Jerin Jacob Kollanukkaran ;
sta...@dpdk.org; Amit Prakash Shukla
Subject: [PATCH] net/mvneta: compilation fix for GCC-12
./drivers/net/mvneta/mvneta_rxtx.c:89:42:
error: 'mbufs' may be used uninitialized [-Werror=maybe-uninitialized]
89 | MVNETA_SET_COOKIE_HIGH_ADDR(mbufs[0]);
| ^
../drivers/net/mvneta/mvneta_rxtx.c:77:26: note: 'mbufs' declared here
77 | struct rte_mbuf *mbufs[MRVL_NETA_BUF_RELEASE_BURST_SIZE_MAX];
| ^
Fixes: ce7ea764597e ("net/mvneta: support Rx/Tx")
Cc: sta...@dpdk.org
Signed-off-by: Amit Prakash Shukla
---
drivers/net/mvneta/mvneta_rxtx.c | 4
1 file changed, 4 insertions(+)
diff --git a/drivers/net/mvneta/mvneta_rxtx.c b/drivers/net/mvneta/mvneta_rxtx.c
index 6e4a7896b4..952e982275 100644
--- a/drivers/net/mvneta/mvneta_rxtx.c
+++ b/drivers/net/mvneta/mvneta_rxtx.c
@@ -79,6 +79,10 @@ mvneta_buffs_refill(struct mvneta_priv *priv, struct
mvneta_rxq *rxq, u16 *num)
int i, ret;
uint16_t nb_desc = *num;
+ /* To prevent GCC-12 warning. */
+ if (unlikely(nb_desc == 0))
+ return -1;
+
ret = rte_pktmbuf_alloc_bulk(rxq->mp, mbufs, nb_desc);
if (ret) {
MVNETA_LOG(ERR, "Failed to allocate %u mbufs.", nb_desc);
--
2.25.1
[PATCH] vhost: compilation fix for GCC-12
../lib/vhost/virtio_net.c:941:35: error:
'buf_vec[0].buf_len' may be used uninitialized
[-Werror=maybe-uninitialized]
941 | buf_len = buf_vec[vec_idx].buf_len;
| ^~~~
../lib/vhost/virtio_net.c: In function 'virtio_dev_rx_packed':
../lib/vhost/virtio_net.c:1285:27: note: 'buf_vec' declared here
1285 | struct buf_vector buf_vec[BUF_VECTOR_MAX];
| ^~~
cc1: all warnings being treated as errors
Fixes: 93520085efda ("vhost: add packed ring single enqueue")
Cc: sta...@dpdk.org
Signed-off-by: Amit Prakash Shukla
---
lib/vhost/virtio_net.c | 12
1 file changed, 12 insertions(+)
diff --git a/lib/vhost/virtio_net.c b/lib/vhost/virtio_net.c
index b3d954aab4..0220bc923c 100644
--- a/lib/vhost/virtio_net.c
+++ b/lib/vhost/virtio_net.c
@@ -1069,6 +1069,12 @@ vhost_enqueue_single_packed(struct virtio_net *dev,
else
max_tries = 1;
+ /* To avoid GCC-12 warning.
+* GCC-12 is not evaluating sizeof at compile time.
+*/
+ if (unlikely(size == 0))
+ return -1;
+
while (size > 0) {
/*
* if we tried all available ring items, and still
@@ -1574,6 +1580,12 @@ vhost_enqueue_async_packed(struct virtio_net *dev,
else
max_tries = 1;
+ /* To avoid GCC-12 warning.
+* GCC-12 is not evaluating sizeof at compile time.
+*/
+ if (unlikely(size == 0))
+ return -1;
+
while (size > 0) {
/*
* if we tried all available ring items, and still
--
2.25.1
DPDK Release Status Meeting 2022-09-01
Release status meeting minutes 2022-09-01 = Agenda: * Release Dates * Subtrees * Roadmaps * LTS * Defects * Opens Participants: * ARM * Debian/Microsoft * Intel * Marvell * Nvidia * Red Hat * Xilinx/AMD Release Dates - The following are the proposed current dates for 22.11: * V1 deadline: 24 August 2022 (previously 14 August) * RC1: 3 October 2022 (subject to discussion) * RC2: 23 October 2022 * RC3: 31 October 2022 * Release: 16 November 2022 Subtrees * next-net * New drivers in this release * Microsoft Azure Network Adapter (MANA) PMD * There are several RDMA implementation now. * Should we have RDMA bus driver? * Google Virtual Ethernet (GVE) * idpf (Infrastructure Data Path Function) PMD * net/qdma PMD * Work on removing deprecated flow API/code - needs acks from Intel * https://lore.kernel.org/all/20220812191827.3187441-1-ivan.ma...@oktetlabs.ru/ * Flow director clean-up merged * next-net-intel * No update * next-net-mlx * No update * next-net-brcm * No update * next-net-mrvl * Started merging patches * Reviews ongoing * next-eventdev * Started merging patches * Reviews ongoing * next-virtio * Around 30 patches in queue * Several vhost patches * next-crypto * 3-35 patches merged * Patches for BBDev - needs review * Adding crypto security and sessions rework * Additional FIPs validation patches in this release * main * New arch type: LoongArch * Proposed RC1 date (3 October) clashes with a national holiday in PRC (October 1st - ~October 7th). We may need to push RC1 to October 10th, but that is late, so this needs some consideration/discussion. * DPDK EU summit next week. Other - * DPDK Summit: https://events.linuxfoundation.org/dpdk-userspace-summit/ * Event Dates: Tuesday, September 6 - Thursday, September 8, 2022 * Schedule: https://events.linuxfoundation.org/dpdk-userspace-summit/program/schedule/ LTS --- Waiting for test results. Aiming for August 29th for all 3 LTSs. * 21.11.2 * Back porting in progress * 20.11.6 * Back porting in progress * 19.11.13 * Back porting in progress * Distros * v20.11 in Debian 11 * Ubuntu 22.04 contains 21.11 Defects --- * Bugzilla links, 'Bugs', added for hosted projects * https://www.dpdk.org/hosted-projects/ Opens - * None DPDK Release Status Meetings The DPDK Release Status Meeting is intended for DPDK Committers to discuss the status of the master tree and sub-trees, and for project managers to track progress or milestone dates. The meeting occurs on every Thursday at 9:30 UTC. on https://meet.jit.si/DPDK If you wish to attend just send an email to "John McNamara john.mcnam...@intel.com" for the invite.
[PATCH v2] net/iavf: enable inner and outer Tx checksum offload
Enable inner and outer Tx checksum offload for tunnel packet by configure
ol_flags.
Signed-off-by: Peng Zhang
---
v2: add outer udp cksum flag and remove unrelated code
---
drivers/net/iavf/iavf_ethdev.c | 1 +
drivers/net/iavf/iavf_rxtx.c | 48 --
drivers/net/iavf/iavf_rxtx.h | 9 ++-
3 files changed, 55 insertions(+), 3 deletions(-)
diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c
index 506fcff6e3..fa040766e5 100644
--- a/drivers/net/iavf/iavf_ethdev.c
+++ b/drivers/net/iavf/iavf_ethdev.c
@@ -1134,6 +1134,7 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct
rte_eth_dev_info *dev_info)
RTE_ETH_TX_OFFLOAD_TCP_CKSUM |
RTE_ETH_TX_OFFLOAD_SCTP_CKSUM |
RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM |
+ RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM |
RTE_ETH_TX_OFFLOAD_TCP_TSO |
RTE_ETH_TX_OFFLOAD_VXLAN_TNL_TSO |
RTE_ETH_TX_OFFLOAD_GRE_TNL_TSO |
diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c
index 3deabe1d7e..b784c5cc18 100644
--- a/drivers/net/iavf/iavf_rxtx.c
+++ b/drivers/net/iavf/iavf_rxtx.c
@@ -2334,7 +2334,8 @@ static inline uint16_t
iavf_calc_context_desc(uint64_t flags, uint8_t vlan_flag)
{
if (flags & (RTE_MBUF_F_TX_TCP_SEG | RTE_MBUF_F_TX_UDP_SEG |
- RTE_MBUF_F_TX_TUNNEL_MASK))
+ RTE_MBUF_F_TX_TUNNEL_MASK | RTE_MBUF_F_TX_OUTER_IP_CKSUM |
+ RTE_MBUF_F_TX_OUTER_UDP_CKSUM))
return 1;
if (flags & RTE_MBUF_F_TX_VLAN &&
vlan_flag & IAVF_TX_FLAGS_VLAN_TAG_LOC_L2TAG2)
@@ -2399,6 +2400,44 @@ iavf_fill_ctx_desc_tunnelling_field(volatile uint64_t
*qw0,
break;
}
+ /* L4TUNT: L4 Tunneling Type */
+ switch (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK) {
+ case RTE_MBUF_F_TX_TUNNEL_IPIP:
+ /* for non UDP / GRE tunneling, set to 00b */
+ break;
+ case RTE_MBUF_F_TX_TUNNEL_VXLAN:
+ case RTE_MBUF_F_TX_TUNNEL_GTP:
+ case RTE_MBUF_F_TX_TUNNEL_GENEVE:
+ eip_typ |= IAVF_TXD_CTX_UDP_TUNNELING;
+ break;
+ case RTE_MBUF_F_TX_TUNNEL_GRE:
+ eip_typ |= IAVF_TXD_CTX_GRE_TUNNELING;
+ break;
+ default:
+ PMD_TX_LOG(ERR, "Tunnel type not supported");
+ return;
+ }
+
+ /* L4TUNLEN: L4 Tunneling Length, in Words
+*
+* We depend on app to set rte_mbuf.l2_len correctly.
+* For IP in GRE it should be set to the length of the GRE
+* header;
+* For MAC in GRE or MAC in UDP it should be set to the length
+* of the GRE or UDP headers plus the inner MAC up to including
+* its last Ethertype.
+* If MPLS labels exists, it should include them as well.
+*/
+ eip_typ |= (m->l2_len >> 1) << IAVF_TXD_CTX_QW0_NATLEN_SHIFT;
+
+ /**
+* Calculate the tunneling UDP checksum.
+* Shall be set only if L4TUNT = 01b and EIPT is not zero
+*/
+ if (!(eip_typ & IAVF_TX_CTX_EXT_IP_NONE) &&
+ (eip_typ & IAVF_TXD_CTX_UDP_TUNNELING))
+ eip_typ |= IAVF_TXD_CTX_QW0_L4T_CS_MASK;
+
*qw0 = eip_typ << IAVF_TXD_CTX_QW0_TUN_PARAMS_EIPT_SHIFT |
eip_len << IAVF_TXD_CTX_QW0_TUN_PARAMS_EIPLEN_SHIFT |
eip_noinc << IAVF_TXD_CTX_QW0_TUN_PARAMS_EIP_NOINC_SHIFT;
@@ -2535,7 +2574,12 @@ iavf_build_data_desc_cmd_offset_fields(volatile uint64_t
*qw1,
}
/* Set MACLEN */
- offset |= (m->l2_len >> 1) << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;
+ if (m->ol_flags & RTE_MBUF_F_TX_TUNNEL_MASK)
+ offset |= (m->outer_l2_len >> 1)
+ << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;
+ else
+ offset |= (m->l2_len >> 1)
+ << IAVF_TX_DESC_LENGTH_MACLEN_SHIFT;
/* Enable L3 checksum offloading inner */
if (m->ol_flags & RTE_MBUF_F_TX_IP_CKSUM) {
diff --git a/drivers/net/iavf/iavf_rxtx.h b/drivers/net/iavf/iavf_rxtx.h
index 1695e43cd5..66e832713c 100644
--- a/drivers/net/iavf/iavf_rxtx.h
+++ b/drivers/net/iavf/iavf_rxtx.h
@@ -26,6 +26,8 @@
#define IAVF_TX_NO_VECTOR_FLAGS ( \
RTE_ETH_TX_OFFLOAD_MULTI_SEGS | \
RTE_ETH_TX_OFFLOAD_TCP_TSO | \
+ RTE_ETH_TX_OFFLOAD_OUTER_IPV4_CKSUM |\
+ RTE_ETH_TX_OFFLOAD_OUTER_UDP_CKSUM |\
RTE_ETH_TX_OFFLOAD_SECURITY)
#define IAVF_TX_VECTOR_OFFLOAD (\
@@ -56,7 +58,9 @@
#define IAVF_TX_CKSUM_OFFLOAD_MASK (\
RTE_MBUF_F_TX_IP_CKSUM | \
RTE_MBUF_F_TX_L4_MASK | \
- RTE_MBUF_F_TX_TCP_SEG)
+ RTE_MBUF_F_TX_TCP_SEG | \
+ RTE_MBUF_F_TX_OUTER_IP_CKSUM | \
+
[PATCH] test/cryptodev: ensure structs are updated in unison
The structs are directly indexed for generating standard vectors. Add asserts to make sure structs are not updated in isolation. Signed-off-by: Anoob Joseph --- app/test/test_cryptodev.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 78a9ee0b11..6306fb7281 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -873,6 +873,17 @@ pdcp_proto_testsuite_setup(void) RTE_CRYPTO_AUTH_ZUC_EIA3 }; + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_auth_key)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_bearer)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_crypto_key)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_data_in)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_data_in_len)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_data_out)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_data_sn_size)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_hfn)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_hfn_threshold)); + RTE_BUILD_BUG_ON(RTE_DIM(pdcp_test_params) != RTE_DIM(pdcp_test_packet_direction)); + rte_cryptodev_info_get(dev_id, &dev_info); if (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO) || -- 2.25.1
[PATCH v2] examples/fips_validation: add parsing for AES GMAC
Added functionality to parse algorithm for AES GMAC test
Signed-off-by: Brian Dooley
---
v2: add random internal iv generation
---
examples/fips_validation/fips_validation.c| 2 ++
examples/fips_validation/fips_validation.h| 1 +
.../fips_validation/fips_validation_gcm.c | 13 ++--
examples/fips_validation/main.c | 21 +++
4 files changed, 31 insertions(+), 6 deletions(-)
diff --git a/examples/fips_validation/fips_validation.c
b/examples/fips_validation/fips_validation.c
index 12b9b03f56..5c7ecce412 100644
--- a/examples/fips_validation/fips_validation.c
+++ b/examples/fips_validation/fips_validation.c
@@ -458,6 +458,8 @@ fips_test_parse_one_json_vector_set(void)
/* Vector sets contain the algorithm type, and nothing else we need. */
if (strstr(algo_str, "AES-GCM"))
info.algo = FIPS_TEST_ALGO_AES_GCM;
+ else if (strstr(algo_str, "AES-GMAC"))
+ info.algo = FIPS_TEST_ALGO_AES_GMAC;
else if (strstr(algo_str, "HMAC"))
info.algo = FIPS_TEST_ALGO_HMAC;
else if (strstr(algo_str, "CMAC"))
diff --git a/examples/fips_validation/fips_validation.h
b/examples/fips_validation/fips_validation.h
index 5c1abcbd91..24edab68da 100644
--- a/examples/fips_validation/fips_validation.h
+++ b/examples/fips_validation/fips_validation.h
@@ -36,6 +36,7 @@ enum fips_test_algorithms {
FIPS_TEST_ALGO_AES = 0,
FIPS_TEST_ALGO_AES_CBC,
FIPS_TEST_ALGO_AES_GCM,
+ FIPS_TEST_ALGO_AES_GMAC,
FIPS_TEST_ALGO_AES_CMAC,
FIPS_TEST_ALGO_AES_CCM,
FIPS_TEST_ALGO_AES_XTS,
diff --git a/examples/fips_validation/fips_validation_gcm.c
b/examples/fips_validation/fips_validation_gcm.c
index 6b3d158629..7e1bd77faf 100644
--- a/examples/fips_validation/fips_validation_gcm.c
+++ b/examples/fips_validation/fips_validation_gcm.c
@@ -291,13 +291,14 @@ parse_test_gcm_json_writeback(struct fips_val *val)
if (info.op == FIPS_TEST_ENC_AUTH_GEN) {
json_t *ct;
+ if (!info.interim_info.gcm_data.is_gmac) {
+ tmp_val.val = val->val;
+ tmp_val.len = vec.pt.len;
- tmp_val.val = val->val;
- tmp_val.len = vec.pt.len;
-
- writeback_hex_str("", info.one_line_text, &tmp_val);
- ct = json_string(info.one_line_text);
- json_object_set_new(json_info.json_write_case, CT_JSON_STR, ct);
+ writeback_hex_str("", info.one_line_text, &tmp_val);
+ ct = json_string(info.one_line_text);
+ json_object_set_new(json_info.json_write_case,
CT_JSON_STR, ct);
+ }
if (info.interim_info.gcm_data.gen_iv) {
json_t *iv;
diff --git a/examples/fips_validation/main.c b/examples/fips_validation/main.c
index 8bd5a66889..9118ca4d92 100644
--- a/examples/fips_validation/main.c
+++ b/examples/fips_validation/main.c
@@ -669,6 +669,21 @@ prepare_auth_op(void)
__rte_crypto_op_reset(env.op, RTE_CRYPTO_OP_TYPE_SYMMETRIC);
+ if (info.interim_info.gcm_data.gen_iv == 1) {
+ uint32_t i;
+
+ if (!vec.iv.val) {
+ vec.iv.val = rte_malloc(0, vec.iv.len, 0);
+ if (!vec.iv.val)
+ return -ENOMEM;
+ }
+
+ for (i = 0; i < vec.iv.len; i++) {
+ int random = rand();
+ vec.iv.val[i] = (uint8_t)random;
+ }
+ }
+
if (vec.iv.len) {
uint8_t *iv = rte_crypto_op_ctod_offset(env.op, uint8_t *,
IV_OFF);
@@ -1817,6 +1832,11 @@ init_test_ops(void)
else
test_ops.test = fips_generic_test;
break;
+ case FIPS_TEST_ALGO_AES_GMAC:
+ test_ops.prepare_op = prepare_auth_op;
+ test_ops.prepare_xform = prepare_gmac_xform;
+ test_ops.test = fips_generic_test;
+ break;
case FIPS_TEST_ALGO_AES_GCM:
test_ops.prepare_op = prepare_aead_op;
test_ops.prepare_xform = prepare_gcm_xform;
@@ -1994,6 +2014,7 @@ fips_test_one_test_group(void)
json_object_set_new(json_info.json_write_group, "tests", write_tests);
switch (info.algo) {
+ case FIPS_TEST_ALGO_AES_GMAC:
case FIPS_TEST_ALGO_AES_GCM:
ret = parse_test_gcm_json_init();
break;
--
2.25.1
Re: [PATCH v2] examples/distributor: update dynamic configuration
Hi Ömer,
On 28/06/2022 20:54, omer.yamac at ceng.metu.edu.tr (Abdullah Ömer
Yamaç) wrote:
In this patch,
* It is possible to switch the running mode of the distributor
using the command line argument.
* With "-c" parameter, you can run RX and Distributor
on the same core.
* Without "-c" parameter, you can run RX and Distributor
on the different core.
* Syntax error of the single RX and distributor core is fixed.
I believe this particular fix is already merged and back-ported to
stable. No need to include this line in the commit message.
* Consecutive termination of the lcores fixed.
The termination order was wrong, and you couldn't terminate the
application while traffic was capturing. The current order is
RX -> Distributor -> TX -> Workers
* When "-c" parameter is active, the wasted distributor core is
also deactivated in the main function.
Fixes: 4a7f40c0ff9a ("examples/distributor: add dedicated core")
Cc: stable at dpdk.org
This is a feature change, not a fix, so I don't believe you need the
"Fixes" line or the "Cc: stable" line.
Signed-off-by: Abdullah ?mer Yama?
I've tested this with the "-c" option, works well. Traffic coming into
the app is distributed among the core. With -c added to the command line
parameters, I have an extra worker core, as expected. Looks good to me.
With the above suggested changes to the commit message:
Reviewed-by: David Hunt
RE: [PATCH v2] net/iavf: enable inner and outer Tx checksum offload
> -Original Message- > From: Zhang, Peng1X > Sent: Thursday, September 1, 2022 5:33 PM > To: dev@dpdk.org > Cc: Yang, Qiming ; Zhang, Qi Z > ; Zhang, Peng1X > Subject: [PATCH v2] net/iavf: enable inner and outer Tx checksum offload > > Enable inner and outer Tx checksum offload for tunnel packet by configure > ol_flags. > Please also update the doc/guide/nices/feature/iavf.ini. I assume Inner l3/l4 checksum should be added.
[Bug 1073] The `rte_mempool_ops_table` is process unsafe
https://bugs.dpdk.org/show_bug.cgi?id=1073 Bug ID: 1073 Summary: The `rte_mempool_ops_table` is process unsafe Product: DPDK Version: 19.11 Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: Normal Component: core Assignee: dev@dpdk.org Reporter: wd...@foxmail.com Target Milestone: --- Created attachment 219 --> https://bugs.dpdk.org/attachment.cgi?id=219&action=edit GDB print value corresponding to the table（rte_mempool_ops_table）（myapp and dpdk-pdump） The `rte_mempool_ops_table` is process unsafe! When a process is started, the table (rte_mempool_ops_table) will be initialized with a macro (rte_mempool.h:MEMPOOL_REGISTER_OPS). However, different process initialization will cause inconsistent index values (ops_index) (such as myapp and dpdk pdump). After the initialization memory pool is created in the dpdk pdump process, mp->ops_index = 0, mp->ops_index=2 in myapp。 Different processes using the shared memory pool will be coredump -- You are receiving this mail because: You are the assignee for the bug.
[Bug 1074] rte_pktmbuf_pool_create doc reports RTE_SECONDARY as an error but it actually works in a secondary process
https://bugs.dpdk.org/show_bug.cgi?id=1074 Bug ID: 1074 Summary: rte_pktmbuf_pool_create doc reports RTE_SECONDARY as an error but it actually works in a secondary process Product: DPDK Version: 21.11 Hardware: All OS: All Status: UNCONFIRMED Severity: normal Priority: Normal Component: doc Assignee: dev@dpdk.org Reporter: a.dibacco...@gmail.com Target Milestone: --- Looking to the rte_pktmbuf_pool_create (https://doc.dpdk.org/api-21.11/rte__mbuf_8h.html#a593921f13307803b94bbb4e0932db962) I can see that RTE_SECONDARY is listed among the errors. I tried to use this function in a secondary and it seems to work fine. Is it possible that this error reported in the documentation is a leftover from previous versions? -- You are receiving this mail because: You are the assignee for the bug.
[Bug 1075] ixgbevf reset failure
https://bugs.dpdk.org/show_bug.cgi?id=1075 Bug ID: 1075 Summary: ixgbevf reset failure Product: DPDK Version: 21.11 Hardware: All OS: All Status: UNCONFIRMED Severity: major Priority: Normal Component: ethdev Assignee: dev@dpdk.org Reporter: a.dibacco...@gmail.com Target Milestone: --- -- You are receiving this mail because: You are the assignee for the bug.
[PATCH v2 1/4] net/axgbe: fix scattered Rx
Error check needs to be done only for last segment of Jumbo packet.
Freed first_seg and reset eop to 0 in error case
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
v2:
* removed the extra paranthesis
* initialised the variables
* updated the commit logs
---
drivers/net/axgbe/axgbe_rxtx.c | 35 +++---
1 file changed, 20 insertions(+), 15 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index f38bb64fab..89ed6fd74a 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -343,8 +343,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
uint64_t old_dirty = rxq->dirty;
struct rte_mbuf *first_seg = NULL;
struct rte_mbuf *mbuf, *tmbuf;
- unsigned int err, etlt;
- uint32_t error_status;
+ unsigned int err = 0, etlt;
+ uint32_t error_status = 0;
uint16_t idx, pidx, data_len = 0, pkt_len = 0;
uint64_t offloads;
@@ -381,19 +381,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
}
mbuf = rxq->sw_ring[idx];
- /* Check for any errors and free mbuf*/
- err = AXGMAC_GET_BITS_LE(desc->write.desc3,
-RX_NORMAL_DESC3, ES);
- error_status = 0;
- if (unlikely(err)) {
- error_status = desc->write.desc3 & AXGBE_ERR_STATUS;
- if ((error_status != AXGBE_L3_CSUM_ERR)
- && (error_status != AXGBE_L4_CSUM_ERR))
{
- rxq->errors++;
- rte_pktmbuf_free(mbuf);
- goto err_set;
- }
- }
rte_prefetch1(rte_pktmbuf_mtod(mbuf, void *));
if (!AXGMAC_GET_BITS_LE(desc->write.desc3,
@@ -406,6 +393,24 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_NORMAL_DESC3, PL);
data_len = pkt_len - rxq->crc_len;
+ /* Check for any errors and free mbuf*/
+ err = AXGMAC_GET_BITS_LE(desc->write.desc3,
+ RX_NORMAL_DESC3, ES);
+ error_status = 0;
+ if (unlikely(err)) {
+ error_status = desc->write.desc3 &
+ AXGBE_ERR_STATUS;
+ if (error_status != AXGBE_L3_CSUM_ERR &&
+ error_status !=
AXGBE_L4_CSUM_ERR) {
+ rxq->errors++;
+ rte_pktmbuf_free(mbuf);
+ rte_pktmbuf_free(first_seg);
+ first_seg = NULL;
+ eop = 0;
+ goto err_set;
+ }
+ }
+
}
if (first_seg != NULL) {
--
2.25.1
[PATCH v2 2/4] net/axgbe: fix mbuf lengths in scattered Rx
Updated pkt_len and data_len in the last segment of the packet.
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 89ed6fd74a..2c2554e900 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -391,8 +391,8 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
} else {
eop = 1;
pkt_len = AXGMAC_GET_BITS_LE(desc->write.desc3,
- RX_NORMAL_DESC3, PL);
- data_len = pkt_len - rxq->crc_len;
+ RX_NORMAL_DESC3, PL) - rxq->crc_len;
+ data_len = pkt_len % rxq->buf_size;
/* Check for any errors and free mbuf*/
err = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_NORMAL_DESC3, ES);
--
2.25.1
[PATCH v2 3/4] net/axgbe: fix length of each segment in scattered Rx
Updating mbuf data_len, Pkt_len for each segment before chaining them
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 2c2554e900..7c07fd90ef 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -412,6 +412,10 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
}
}
+ /* Mbuf populate */
+ mbuf->data_off = RTE_PKTMBUF_HEADROOM;
+ mbuf->data_len = data_len;
+ mbuf->pkt_len = data_len;
if (first_seg != NULL) {
if (rte_pktmbuf_chain(first_seg, mbuf) != 0)
@@ -443,9 +447,6 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
mbuf->vlan_tci = 0;
}
}
- /* Mbuf populate */
- mbuf->data_off = RTE_PKTMBUF_HEADROOM;
- mbuf->data_len = data_len;
err_set:
rxq->cur++;
--
2.25.1
[PATCH v2 4/4] net/axgbe: fix checksum and RSS in scattered Rx
Updated the RSS hash and CSUM checks with first_seg instead of mbufs.
Fixes: 965b3127d425 ("net/axgbe: support scattered Rx")
Signed-off-by: Bhagyada Modali
---
drivers/net/axgbe/axgbe_rxtx.c | 41 +-
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/drivers/net/axgbe/axgbe_rxtx.c b/drivers/net/axgbe/axgbe_rxtx.c
index 7c07fd90ef..2bad638f79 100644
--- a/drivers/net/axgbe/axgbe_rxtx.c
+++ b/drivers/net/axgbe/axgbe_rxtx.c
@@ -427,24 +427,27 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
/* Get the RSS hash */
if (AXGMAC_GET_BITS_LE(desc->write.desc3, RX_NORMAL_DESC3, RSV))
- mbuf->hash.rss = rte_le_to_cpu_32(desc->write.desc1);
+ first_seg->hash.rss =
+ rte_le_to_cpu_32(desc->write.desc1);
etlt = AXGMAC_GET_BITS_LE(desc->write.desc3,
RX_NORMAL_DESC3, ETLT);
offloads = rxq->pdata->eth_dev->data->dev_conf.rxmode.offloads;
if (!err || !etlt) {
if (etlt == RX_CVLAN_TAG_PRESENT) {
- mbuf->ol_flags |= RTE_MBUF_F_RX_VLAN;
- mbuf->vlan_tci =
+ first_seg->ol_flags |= RTE_MBUF_F_RX_VLAN;
+ first_seg->vlan_tci =
AXGMAC_GET_BITS_LE(desc->write.desc0,
RX_NORMAL_DESC0, OVT);
if (offloads & RTE_ETH_RX_OFFLOAD_VLAN_STRIP)
- mbuf->ol_flags |=
RTE_MBUF_F_RX_VLAN_STRIPPED;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_VLAN_STRIPPED;
else
- mbuf->ol_flags &=
~RTE_MBUF_F_RX_VLAN_STRIPPED;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_VLAN_STRIPPED;
} else {
- mbuf->ol_flags &=
+ first_seg->ol_flags &=
~(RTE_MBUF_F_RX_VLAN |
RTE_MBUF_F_RX_VLAN_STRIPPED);
- mbuf->vlan_tci = 0;
+ first_seg->vlan_tci = 0;
}
}
@@ -468,18 +471,24 @@ uint16_t eth_axgbe_recv_scattered_pkts(void *rx_queue,
first_seg->port = rxq->port_id;
if (rxq->pdata->rx_csum_enable) {
- mbuf->ol_flags = 0;
- mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+ first_seg->ol_flags = 0;
+ first_seg->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_GOOD;
+ first_seg->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_GOOD;
if (unlikely(error_status == AXGBE_L3_CSUM_ERR)) {
- mbuf->ol_flags &= ~RTE_MBUF_F_RX_IP_CKSUM_GOOD;
- mbuf->ol_flags |= RTE_MBUF_F_RX_IP_CKSUM_BAD;
- mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
- mbuf->ol_flags |=
RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_IP_CKSUM_GOOD;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_IP_CKSUM_BAD;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_L4_CKSUM_UNKNOWN;
} else if (unlikely(error_status
== AXGBE_L4_CSUM_ERR)) {
- mbuf->ol_flags &= ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
- mbuf->ol_flags |= RTE_MBUF_F_RX_L4_CKSUM_BAD;
+ first_seg->ol_flags &=
+ ~RTE_MBUF_F_RX_L4_CKSUM_GOOD;
+ first_seg->ol_flags |=
+ RTE_MBUF_F_RX_L4_CKSUM_BAD;
}
}
--
2.25.1
RE: [PATCH v2 00/70] ice base code update
> -Original Message- > From: Yang, Qiming > Sent: Monday, August 22, 2022 1:37 PM > To: Zhang, Qi Z > Cc: dev@dpdk.org > Subject: RE: [PATCH v2 00/70] ice base code update > > > > > -Original Message- > > From: Zhang, Qi Z > > Sent: Monday, August 15, 2022 3:31 PM > > To: Yang, Qiming > > Cc: dev@dpdk.org; Zhang, Qi Z > > Subject: [PATCH v2 00/70] ice base code update > > > > Update ice base code to 2022-Aug internal release. > > > > Summary: > > > > 1. Baseline support for L2TPv2 FDIR/RSS. > > 2. Refactor DDP module. > > 3. Support 56G PHY > > 4. Add GTP/GRE tunnel. > > 6. Clean code and fix bug > > 5. update copyright > > > > > > v2: > > - fix couple patchwork warnings. > > > > Qi Zhang (70): > > net/ice/base: add netlist helper functions > > net/ice/base: get NVM CSS Header length from the CSS Header > > net/ice/base: combine functions for VSI promisc > > net/ice/base: make function names more generic > > net/ice/base: fix incorrect division during E822 PTP init > > net/ice/base: added auto drop blocking packets functionality > > net/ice/base: fix 100M speed > > net/ice/base: support VXLAN and GRE for RSS > > net/ice/base: fix DSCP PFC TLV creation > > net/ice/base: complete the health status codes > > net/ice/base: explicitly name E822 HW-dependent functions > > net/ice/base: move code block > > net/ice/base: add PHY 56G destination address > > net/ice/base: add 56G PHY register definitions > > net/ice/base: implement 56G PHY access functions > > net/ice/base: implement 56G PHY setup functions > > net/ice/base: work around missing PTP caps > > net/ice/base: enable calling of ETH56G functions > > net/ice/base: fix PHY type 10G SFI C2C to media type mapping > > net/ice/base: refactor DDP code > > net/ice/base: add E822 generic PCI device ID > > net/ice/base: support double VLAN rules > > net/ice/base: report NVM version numbers on mismatch > > net/ice/base: create duplicate detection for ACL rules > > net/ice/base: fix incorrect function descriptions for parser > > net/ice/base: fix endian format > > net/ice/base: convert IO expander handle to u16 > > net/ice/base: convert array of u8 to bitmap > > net/ice/base: fix array overflow in add switch recipe code > > net/ice/base: fix bit finding range over ptype bitmap > > net/ice/base: move function to internal > > net/ice/base: change PHY/QUAD/ports definitions > > net/ice/base: add AQ command to config node attribute > > net/ice/base: fix null pointer dereference during > > net/ice/base: refine default VSI config > > net/ice/base: fix add mac rule > > net/ice/base: support Tx topo config > > net/ice/base: adjust the VSI/Aggregator layers > > net/ice/base: add data typecasting to match sizes > > net/ice/base: add helper function to check if device is E823 > > net/ice/base: add low latency Tx timestamp read > > net/ice/base: fix double VLAN error in promisc mode > > net/ice/base: move functions > > net/ice/base: complete support for Tx balancing > > net/ice/base: update definitions for AQ internal debug dump > > net/ice/base: update macros of L2TPv2 ptype value > > net/ice/base: refine header file include > > net/ice/base: ignore already exist error > > net/ice/base: clean up with no lookups > > net/ice/base: add support for Auto FEC with FEC disabled > > net/ice/base: update PHY type high max index > > net/ice/base: clean the main timer command register > > net/ice/base: add support for custom WPC and LGB NICs > > net/ice/base: add generic MAC with 3K signature segment > > net/ice/base: enable RSS support for L2TPv2 session ID > > net/ice/base: enable FDIR support for L2TPv2 > > net/ice/base: add GRE Tap tunnel type > > net/ice/base: fix wrong inputset of GTPoGRE packet > > net/ice/base: add unload flag for control queue shutdown > > net/ice/base: update comment for overloaded GCO bit > > net/ice/base: complete pending LLDP MIB > > net/ice/base: add function to parse DCBX config > > net/ice/base: handle default VSI lookup type > > net/ice/base: convert 1588 structs to use bitfields > > net/ice/base: remove unnecessary fields > > net/ice/base: add GTP tunnel > > net/ice/base: check for PTP HW lock more frequently > > net/ice/base: expose API for move sched element > > net/ice/base: couple code clean > > net/ice/base: update copyright > > > > drivers/net/ice/base/README |4 +- > > drivers/net/ice/base/ice_acl.c |2 +- > > drivers/net/ice/base/ice_acl.h |2 +- > > drivers/net/ice/base/ice_acl_ctrl.c | 36 +- > > drivers/net/ice/base/ice_adminq_cmd.h| 175 +- > > drivers/net/ice/base/ice_alloc.h |2 +- > > drivers/net/ice/base/ice_bitops.h|7 +- > > drivers/net/ice/base/ice_bst_tcam.c |8 +- > > drivers/net/ice/base/ice_bst_tcam.h |2 +- > > drivers/net/ice/base/ice_cgu_regs.h |2 +- > > dri
