[PATCH 1/2] net/bonding: add error hint for invald args
When invalid args exsit, application exits with no error hint.
Adding a log message here will help users to know the reson.
Signed-off-by: Wan Junjie
---
drivers/net/bonding/rte_eth_bond_pmd.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index bfa931098e..aa6519f83c 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -3439,8 +3439,10 @@ bond_probe(struct rte_vdev_device *dev)
kvlist = rte_kvargs_parse(rte_vdev_device_args(dev),
pmd_bond_init_valid_arguments);
- if (kvlist == NULL)
+ if (kvlist == NULL) {
+ RTE_BOND_LOG(ERR, "Invalid args in %s",
rte_vdev_device_args(dev));
return -1;
+ }
/* Parse link bonding mode */
if (rte_kvargs_count(kvlist, PMD_BOND_MODE_KVARG) == 1) {
--
2.33.0
[PATCH 2/2] net/bonding: fix slaves initilizing on mtu setting
When initializing a bonding device with all slaves in vdev string,
which means bonding device initilizes slaves, instead of initializing
slaves before creating the bonding device, it will fail to call
set_mtu api for the bonding device.
Fixes:b26bee1 ("ethdev: forbid MTU set before device configure")
Signed-off-by: Wan Junjie
---
app/test/test_link_bonding.c | 4 +++
app/test/test_link_bonding_rssconf.c | 4 +++
drivers/net/bonding/eth_bond_private.h | 4 +++
drivers/net/bonding/rte_eth_bond_api.c | 6
drivers/net/bonding/rte_eth_bond_pmd.c | 43 ++
5 files changed, 55 insertions(+), 6 deletions(-)
diff --git a/app/test/test_link_bonding.c b/app/test/test_link_bonding.c
index dc6fc46b9c..12c50ef393 100644
--- a/app/test/test_link_bonding.c
+++ b/app/test/test_link_bonding.c
@@ -181,6 +181,10 @@ configure_ethdev(uint16_t port_id, uint8_t start, uint8_t
en_isr)
test_params->nb_tx_q, &default_pmd_conf),
"rte_eth_dev_configure for port %d failed", port_id);
+ int ret = rte_eth_dev_set_mtu(port_id, 1550);
+ RTE_TEST_ASSERT(ret == 0 || ret == -ENOTSUP,
+ "rte_eth_dev_set_mtu for port %d failed", port_id);
+
for (q_id = 0; q_id < test_params->nb_rx_q; q_id++)
TEST_ASSERT_SUCCESS(rte_eth_rx_queue_setup(port_id, q_id,
RX_RING_SIZE,
rte_eth_dev_socket_id(port_id),
&rx_conf_default,
diff --git a/app/test/test_link_bonding_rssconf.c
b/app/test/test_link_bonding_rssconf.c
index f9eae93973..7228965ced 100644
--- a/app/test/test_link_bonding_rssconf.c
+++ b/app/test/test_link_bonding_rssconf.c
@@ -128,6 +128,10 @@ configure_ethdev(uint16_t port_id, struct rte_eth_conf
*eth_conf,
RXTX_QUEUE_COUNT, eth_conf) == 0, "Failed to configure
device %u",
port_id);
+ int ret = rte_eth_dev_set_mtu(port_id, 1550);
+ RTE_TEST_ASSERT(ret == 0 || ret == -ENOTSUP,
+ "rte_eth_dev_set_mtu for port %d failed", port_id);
+
for (rxq = 0; rxq < RXTX_QUEUE_COUNT; rxq++) {
TEST_ASSERT(rte_eth_rx_queue_setup(port_id, rxq, RXTX_RING_SIZE,
rte_eth_dev_socket_id(port_id), NULL,
diff --git a/drivers/net/bonding/eth_bond_private.h
b/drivers/net/bonding/eth_bond_private.h
index 156335c425..8222e3cd38 100644
--- a/drivers/net/bonding/eth_bond_private.h
+++ b/drivers/net/bonding/eth_bond_private.h
@@ -246,6 +246,10 @@ int
slave_configure(struct rte_eth_dev *bonded_eth_dev,
struct rte_eth_dev *slave_eth_dev);
+int
+slave_start(struct rte_eth_dev *bonded_eth_dev,
+ struct rte_eth_dev *slave_eth_dev);
+
void
slave_remove(struct bond_dev_private *internals,
struct rte_eth_dev *slave_eth_dev);
diff --git a/drivers/net/bonding/rte_eth_bond_api.c
b/drivers/net/bonding/rte_eth_bond_api.c
index b78867b125..4ac191c468 100644
--- a/drivers/net/bonding/rte_eth_bond_api.c
+++ b/drivers/net/bonding/rte_eth_bond_api.c
@@ -566,6 +566,12 @@ __eth_bond_slave_add_lock_free(uint16_t bonded_port_id,
uint16_t slave_port_id)
slave_port_id);
return -1;
}
+ if (slave_start(bonded_eth_dev, slave_eth_dev) != 0) {
+ internals->slave_count--;
+ RTE_BOND_LOG(ERR, "rte_bond_slaves_start: port=%d",
+ slave_port_id);
+ return -1;
+ }
}
/* Update all slave devices MACs */
diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c
b/drivers/net/bonding/rte_eth_bond_pmd.c
index aa6519f83c..c31b723071 100644
--- a/drivers/net/bonding/rte_eth_bond_pmd.c
+++ b/drivers/net/bonding/rte_eth_bond_pmd.c
@@ -1678,14 +1678,10 @@ int
slave_configure(struct rte_eth_dev *bonded_eth_dev,
struct rte_eth_dev *slave_eth_dev)
{
- struct bond_rx_queue *bd_rx_q;
- struct bond_tx_queue *bd_tx_q;
uint16_t nb_rx_queues;
uint16_t nb_tx_queues;
int errval;
- uint16_t q_id;
- struct rte_flow_error flow_error;
struct bond_dev_private *internals = bonded_eth_dev->data->dev_private;
@@ -1758,6 +1754,19 @@ slave_configure(struct rte_eth_dev *bonded_eth_dev,
slave_eth_dev->data->port_id, errval);
return errval;
}
+ return 0;
+}
+
+int
+slave_start(struct rte_eth_dev *bonded_eth_dev,
+ struct rte_eth_dev *slave_eth_dev)
+{
+ int errval = 0;
+ struct bond_rx_queue *bd_rx_q;
+ struct bond_tx_queue *bd_tx_q;
+ uint16_t q_id;
+ struct rte_flow_error flow_error;
+ struct bond_dev_private *internals = bonded_eth_dev->data->dev_private;
/* Setup Rx Queues */
for (q_id = 0; q_id < bonded_eth_dev->data->nb_rx_queues; q_id
[PATCH 0/4] net/mlx5: support send scheduling for ConnextX-7
Since the ConnectX-6DX the send scheduling capability is provided. An application can register the dynamic field and dynamic flags in mbuf for timestamp and specify the desired moment of time the packet should sent. The send scheduling feature over ConnectX-6DX uses the complicated infrastructure with reference Clock Queue and inter-queue synchronizing operations. Since ConnectX-7 the new wait descriptor format is introduced where the timestamp can be promoted to hardware directly. The patchset adds support for this new hardware option in PMD. Signed-off-by: Viacheslav Ovsiienko Viacheslav Ovsiienko (4): common/mlx5: add send on time capability check net/mlx5: configure Tx queue with send on time offload net/mlx5: add wait on time support in Tx datapath doc: update send scheduling mlx5 feature description doc/guides/nics/mlx5.rst | 5 ++ doc/guides/rel_notes/release_22_03.rst | 6 +++ drivers/common/mlx5/mlx5_devx_cmds.c | 1 + drivers/common/mlx5/mlx5_devx_cmds.h | 1 + drivers/common/mlx5/mlx5_prm.h | 27 +- drivers/net/mlx5/linux/mlx5_verbs.c| 4 ++ drivers/net/mlx5/mlx5.h| 3 ++ drivers/net/mlx5/mlx5_devx.c | 2 + drivers/net/mlx5/mlx5_tx.h | 75 +++--- drivers/net/mlx5/mlx5_txq.c| 16 +- 10 files changed, 129 insertions(+), 11 deletions(-) -- 2.18.1
[PATCH 1/4] common/mlx5: add send on time capability check
The patch provides check for send scheduling on time hardware capability.
With this capability enabled hardware is able to handle Wait WQEs
with directly specified timestamp values. No Clock Queue is needed
anymore to handle send scheduling.
Signed-off-by: Viacheslav Ovsiienko
---
drivers/common/mlx5/mlx5_devx_cmds.c | 1 +
drivers/common/mlx5/mlx5_devx_cmds.h | 1 +
drivers/common/mlx5/mlx5_prm.h | 27 ++-
3 files changed, 28 insertions(+), 1 deletion(-)
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.c
b/drivers/common/mlx5/mlx5_devx_cmds.c
index 2e807a0829..fb55ef96ea 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.c
+++ b/drivers/common/mlx5/mlx5_devx_cmds.c
@@ -962,6 +962,7 @@ mlx5_devx_cmd_query_hca_attr(void *ctx,
MLX5_GET(cmd_hca_cap, hcattr, umr_indirect_mkey_disabled);
attr->umr_modify_entity_size_disabled =
MLX5_GET(cmd_hca_cap, hcattr, umr_modify_entity_size_disabled);
+ attr->wait_on_time = MLX5_GET(cmd_hca_cap, hcattr, wait_on_time);
attr->crypto = MLX5_GET(cmd_hca_cap, hcattr, crypto);
if (attr->crypto)
attr->aes_xts = MLX5_GET(cmd_hca_cap, hcattr, aes_xts);
diff --git a/drivers/common/mlx5/mlx5_devx_cmds.h
b/drivers/common/mlx5/mlx5_devx_cmds.h
index 37821b493e..909d91adae 100644
--- a/drivers/common/mlx5/mlx5_devx_cmds.h
+++ b/drivers/common/mlx5/mlx5_devx_cmds.h
@@ -201,6 +201,7 @@ struct mlx5_hca_attr {
uint32_t scatter_fcs_w_decap_disable:1;
uint32_t flow_hit_aso:1; /* General obj type FLOW_HIT_ASO supported. */
uint32_t roce:1;
+ uint32_t wait_on_time:1;
uint32_t rq_ts_format:2;
uint32_t sq_ts_format:2;
uint32_t steering_format_version:4;
diff --git a/drivers/common/mlx5/mlx5_prm.h b/drivers/common/mlx5/mlx5_prm.h
index 495b63191a..4ce302b478 100644
--- a/drivers/common/mlx5/mlx5_prm.h
+++ b/drivers/common/mlx5/mlx5_prm.h
@@ -133,6 +133,19 @@
#define MLX5_OPCODE_WAIT 0x0fu
#endif
+#define MLX5_OPC_MOD_WAIT_CQ_PI 0u
+#define MLX5_OPC_MOD_WAIT_DATA 1u
+#define MLX5_OPC_MOD_WAIT_TIME 2u
+
+
+#define MLX5_WAIT_COND_INVERT 0x10u
+#define MLX5_WAIT_COND_ALWAYS_TRUE 0u
+#define MLX5_WAIT_COND_EQUAL 1u
+#define MLX5_WAIT_COND_BIGGER 2u
+#define MLX5_WAIT_COND_SMALLER 3u
+#define MLX5_WAIT_COND_CYCLIC_BIGGER 4u
+#define MLX5_WAIT_COND_CYCLIC_SMALLER 5u
+
#ifndef HAVE_MLX5_OPCODE_ACCESS_ASO
#define MLX5_OPCODE_ACCESS_ASO 0x2du
#endif
@@ -348,6 +361,15 @@ struct mlx5_wqe_qseg {
uint32_t qpn_cqn;
} __rte_packed;
+struct mlx5_wqe_wseg {
+ uint32_t operation;
+ uint32_t lkey;
+ uint32_t va_high;
+ uint32_t va_low;
+ uint64_t value;
+ uint64_t mask;
+} __rte_packed;
+
/* The title WQEBB, header of WQE. */
struct mlx5_wqe {
union {
@@ -1659,7 +1681,10 @@ struct mlx5_ifc_cmd_hca_cap_bits {
u8 num_vhca_ports[0x8];
u8 reserved_at_618[0x6];
u8 sw_owner_id[0x1];
- u8 reserved_at_61f[0x129];
+ u8 reserved_at_61f[0x6C];
+ u8 wait_on_data[0x1];
+ u8 wait_on_time[0x1];
+ u8 reserved_at_68d[0xBB];
u8 dma_mmo_qp[0x1];
u8 regexp_mmo_qp[0x1];
u8 compress_mmo_qp[0x1];
--
2.18.1
[PATCH 2/4] net/mlx5: configure Tx queue with send on time offload
The wait on time configuration flag is copied to the Tx queue
structure due to performance considerations. Timestamp
mask is preparted and stored in queue structure as well.
Signed-off-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/linux/mlx5_verbs.c | 2 ++
drivers/net/mlx5/mlx5.h | 3 +++
drivers/net/mlx5/mlx5_devx.c| 2 ++
drivers/net/mlx5/mlx5_tx.h | 3 +++
drivers/net/mlx5/mlx5_txq.c | 11 ++-
5 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c
b/drivers/net/mlx5/linux/mlx5_verbs.c
index 2b6eef44a7..80dd0bb6c1 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -1036,6 +1036,8 @@ mlx5_txq_ibv_obj_new(struct rte_eth_dev *dev, uint16_t
idx)
txq_data->wqe_pi = 0;
txq_data->wqe_comp = 0;
txq_data->wqe_thres = txq_data->wqe_s / MLX5_TX_COMP_THRESH_INLINE_DIV;
+ txq_data->wait_on_time = !!(!priv->config.tx_pp &&
+priv->config.hca_attr.wait_on_time);
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
/*
* If using DevX need to query and store TIS transport domain value.
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 737ad6895c..3983d3aa50 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -341,6 +341,9 @@ struct mlx5_lb_ctx {
#define MLX5_CNT_ARRAY_IDX(pool, cnt) \
((int)(((uint8_t *)(cnt) - (uint8_t *)((pool) + 1)) / \
MLX5_CNT_LEN(pool)))
+#define MLX5_TS_MASK_SECS 8ull
+/* timestamp wrapping in seconds, must be power of 2. */
+
/*
* The pool index and offset of counter in the pool array makes up the
* counter index. In case the counter is from pool 0 and offset 0, it
diff --git a/drivers/net/mlx5/mlx5_devx.c b/drivers/net/mlx5/mlx5_devx.c
index 91243f684f..c6994e4a75 100644
--- a/drivers/net/mlx5/mlx5_devx.c
+++ b/drivers/net/mlx5/mlx5_devx.c
@@ -1327,6 +1327,8 @@ mlx5_txq_devx_obj_new(struct rte_eth_dev *dev, uint16_t
idx)
txq_data->qp_num_8s = txq_obj->sq_obj.sq->id << 8;
txq_data->db_heu = sh->cdev->config.dbnc == MLX5_TXDB_HEURISTIC;
txq_data->db_nc = sh->tx_uar.dbnc;
+ txq_data->wait_on_time = !!(!priv->config.tx_pp &&
+priv->config.hca_attr.wait_on_time);
/* Change Send Queue state to Ready-to-Send. */
ret = mlx5_txq_devx_modify(txq_obj, MLX5_TXQ_MOD_RST2RDY, 0);
if (ret) {
diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h
index c4b8271f6f..b50deb8b67 100644
--- a/drivers/net/mlx5/mlx5_tx.h
+++ b/drivers/net/mlx5/mlx5_tx.h
@@ -138,6 +138,8 @@ struct mlx5_txq_data {
uint16_t vlan_en:1; /* VLAN insertion in WQE is supported. */
uint16_t db_nc:1; /* Doorbell mapped to non-cached region. */
uint16_t db_heu:1; /* Doorbell heuristic write barrier. */
+ uint16_t rt_timestamp:1; /* Realtime timestamp format. */
+ uint16_t wait_on_time:1; /* WQE with timestamp is supported. */
uint16_t fast_free:1; /* mbuf fast free on Tx is enabled. */
uint16_t inlen_send; /* Ordinary send data inline size. */
uint16_t inlen_empw; /* eMPW max packet size to inline. */
@@ -157,6 +159,7 @@ struct mlx5_txq_data {
volatile uint32_t *cq_db; /* Completion queue doorbell. */
uint16_t port_id; /* Port ID of device. */
uint16_t idx; /* Queue index. */
+ uint64_t rt_timemask; /* Scheduling timestamp mask. */
uint64_t ts_mask; /* Timestamp flag dynamic mask. */
int32_t ts_offset; /* Timestamp field dynamic offset. */
struct mlx5_dev_ctx_shared *sh; /* Shared context. */
diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c
index 4e0bf7af9c..3585546628 100644
--- a/drivers/net/mlx5/mlx5_txq.c
+++ b/drivers/net/mlx5/mlx5_txq.c
@@ -108,7 +108,7 @@ mlx5_get_tx_port_offloads(struct rte_eth_dev *dev)
RTE_ETH_TX_OFFLOAD_TCP_CKSUM);
if (config->tso)
offloads |= RTE_ETH_TX_OFFLOAD_TCP_TSO;
- if (config->tx_pp)
+ if (config->tx_pp || config->hca_attr.wait_on_time)
offloads |= RTE_ETH_TX_OFFLOAD_SEND_ON_TIMESTAMP;
if (config->swp) {
if (config->swp & MLX5_SW_PARSING_CSUM_CAP)
@@ -1290,7 +1290,14 @@ mlx5_txq_dynf_timestamp_set(struct rte_eth_dev *dev)
int off, nbit;
unsigned int i;
uint64_t mask = 0;
+ uint64_t ts_mask;
+ if (priv->config.rt_timestamp || !priv->config.hca_attr.dev_freq_khz)
+ ts_mask = MLX5_TS_MASK_SECS << 32;
+ else
+ ts_mask = rte_align64pow2(MLX5_TS_MASK_SECS * 1000ull *
+ priv->config.hca_attr.dev_freq_khz);
+ ts_mask = rte_cpu_to_be_64(ts_mask - 1ull);
nbit = rte_mbuf_dynflag_lookup
(RTE_MBUF_DYNFLAG_TX_TIMESTAMP_NAME, NULL);
off = rte_mbuf_dynfield_lookup
[PATCH 3/4] net/mlx5: add wait on time support in Tx datapath
The hardware since ConnectX-7 supports waiting on
specified moment of time with new introduced wait
descriptor. A timestamp can be directrly placed
into descriptor and pushed to sending queue.
Once hardware encounter the wait descriptor the
queue operation is suspended till specified moment
of time. This patch update the Tx datapath to handle
this new hardware wait capability.
Signed-off-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/linux/mlx5_verbs.c | 4 +-
drivers/net/mlx5/mlx5_tx.h | 72 +
drivers/net/mlx5/mlx5_txq.c | 7 ++-
3 files changed, 72 insertions(+), 11 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c
b/drivers/net/mlx5/linux/mlx5_verbs.c
index 80dd0bb6c1..5f821c4645 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -1037,7 +1037,9 @@ mlx5_txq_ibv_obj_new(struct rte_eth_dev *dev, uint16_t
idx)
txq_data->wqe_comp = 0;
txq_data->wqe_thres = txq_data->wqe_s / MLX5_TX_COMP_THRESH_INLINE_DIV;
txq_data->wait_on_time = !!(!priv->config.tx_pp &&
-priv->config.hca_attr.wait_on_time);
+priv->config.hca_attr.wait_on_time &&
+txq_data->offloads &
+DEV_TX_OFFLOAD_SEND_ON_TIMESTAMP);
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
/*
* If using DevX need to query and store TIS transport domain value.
diff --git a/drivers/net/mlx5/mlx5_tx.h b/drivers/net/mlx5/mlx5_tx.h
index b50deb8b67..0adc3f4839 100644
--- a/drivers/net/mlx5/mlx5_tx.h
+++ b/drivers/net/mlx5/mlx5_tx.h
@@ -780,7 +780,7 @@ mlx5_tx_cseg_init(struct mlx5_txq_data *__rte_restrict txq,
* compile time and may be used for optimization.
*/
static __rte_always_inline void
-mlx5_tx_wseg_init(struct mlx5_txq_data *restrict txq,
+mlx5_tx_qseg_init(struct mlx5_txq_data *restrict txq,
struct mlx5_txq_local *restrict loc __rte_unused,
struct mlx5_wqe *restrict wqe,
unsigned int wci,
@@ -795,6 +795,43 @@ mlx5_tx_wseg_init(struct mlx5_txq_data *restrict txq,
qs->reserved1 = RTE_BE32(0);
}
+/**
+ * Build the Wait on Time Segment with specified timestamp value.
+ *
+ * @param txq
+ * Pointer to TX queue structure.
+ * @param loc
+ * Pointer to burst routine local context.
+ * @param wqe
+ * Pointer to WQE to fill with built Control Segment.
+ * @param ts
+ * Timesatmp value to wait.
+ * @param olx
+ * Configured Tx offloads mask. It is fully defined at
+ * compile time and may be used for optimization.
+ */
+static __rte_always_inline void
+mlx5_tx_wseg_init(struct mlx5_txq_data *restrict txq,
+ struct mlx5_txq_local *restrict loc __rte_unused,
+ struct mlx5_wqe *restrict wqe,
+ uint64_t ts,
+ unsigned int olx __rte_unused)
+{
+ struct mlx5_wqe_wseg *ws;
+
+ ws = RTE_PTR_ADD(wqe, MLX5_WSEG_SIZE);
+ ws->operation = rte_cpu_to_be_32(MLX5_WAIT_COND_CYCLIC_BIGGER);
+ ws->lkey = RTE_BE32(0);
+ ws->va_high = RTE_BE32(0);
+ ws->va_low = RTE_BE32(0);
+ if (txq->rt_timestamp) {
+ ts = ts % (uint64_t)NS_PER_S
+ | (ts / (uint64_t)NS_PER_S) << 32;
+ }
+ ws->value = rte_cpu_to_be_64(ts);
+ ws->mask = txq->rt_timemask;
+}
+
/**
* Build the Ethernet Segment without inlined data.
* Supports Software Parser, Checksums and VLAN insertion Tx offload features.
@@ -1626,9 +1663,9 @@ mlx5_tx_schedule_send(struct mlx5_txq_data *restrict txq,
{
if (MLX5_TXOFF_CONFIG(TXPP) &&
loc->mbuf->ol_flags & txq->ts_mask) {
+ struct mlx5_dev_ctx_shared *sh;
struct mlx5_wqe *wqe;
uint64_t ts;
- int32_t wci;
/*
* Estimate the required space quickly and roughly.
@@ -1640,13 +1677,32 @@ mlx5_tx_schedule_send(struct mlx5_txq_data *restrict
txq,
return MLX5_TXCMP_CODE_EXIT;
/* Convert the timestamp into completion to wait. */
ts = *RTE_MBUF_DYNFIELD(loc->mbuf, txq->ts_offset, uint64_t *);
- wci = mlx5_txpp_convert_tx_ts(txq->sh, ts);
- if (unlikely(wci < 0))
- return MLX5_TXCMP_CODE_SINGLE;
- /* Build the WAIT WQE with specified completion. */
wqe = txq->wqes + (txq->wqe_ci & txq->wqe_m);
- mlx5_tx_cseg_init(txq, loc, wqe, 2, MLX5_OPCODE_WAIT, olx);
- mlx5_tx_wseg_init(txq, loc, wqe, wci, olx);
+ sh = txq->sh;
+ if (txq->wait_on_time) {
+ /* The wait on time capability should be used. */
+ ts -= sh->txpp.skew;
+ mlx5_tx_cseg_init(txq, loc, wqe,
+ 1 + sizeof(struct mlx5_wqe_wseg)
[PATCH 4/4] doc: update send scheduling mlx5 feature description
Updated: - send scheduling feature description for mlx5 - release notes Signed-off-by: Viacheslav Ovsiienko --- doc/guides/nics/mlx5.rst | 5 + doc/guides/rel_notes/release_22_03.rst | 6 ++ 2 files changed, 11 insertions(+) diff --git a/doc/guides/nics/mlx5.rst b/doc/guides/nics/mlx5.rst index c3cc0c0f41..6494f4ae39 100644 --- a/doc/guides/nics/mlx5.rst +++ b/doc/guides/nics/mlx5.rst @@ -934,6 +934,11 @@ Driver options By default (if the ``tx_pp`` is not specified) send scheduling on timestamps feature is disabled. + Starting since ConnectX-7 the capability to schedule traffic directly + on timestamp specified in descriptor is provided, no extra objects are + needed anymore and scheduling capability is advertised and handled + regardless tx_pp parameter presence. + - ``tx_skew`` parameter [int] The parameter adjusts the send packet scheduling on timestamps and represents diff --git a/doc/guides/rel_notes/release_22_03.rst b/doc/guides/rel_notes/release_22_03.rst index ff3095d742..268f2827e2 100644 --- a/doc/guides/rel_notes/release_22_03.rst +++ b/doc/guides/rel_notes/release_22_03.rst @@ -109,6 +109,12 @@ New Features * Added rte_flow support for matching GENEVE packets. * Added rte_flow support for matching eCPRI packets. +* **Updated Mellanox mlx5 driver.** + + Updated the Mellanox mlx5 driver with new features and improvements, including: + + * Support ConnectX-7 capability to schedule traffic sending on timestamp + * **Updated Wangxun ngbe driver.** * Added support for devices of custom PHY interfaces. -- 2.18.1
[PATCH 1/2] net/mlx5: fix invalid entry in shared RXQs list
The mlx5_rxq_new function creates control structure and if it from
shared group, it is inserted into the shared RXQs list.
After that, there are some validations which in case they fail, RxQ
control object is released.
In these cases, invalid pointer to the object still in the list, and
access it may cause a crash.
Move the list insertion to the end of the function where the RxQ control
object is surely valid.
Fixes: 09c2555303be ("net/mlx5: support shared Rx queue")
Cc: sta...@dpdk.org
Signed-off-by: Michael Baum
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_rxq.c | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index 580d7ae868..fe72cf49d3 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -1719,12 +1719,6 @@ mlx5_rxq_new(struct rte_eth_dev *dev, struct
mlx5_rxq_priv *rxq,
return NULL;
}
LIST_INIT(&tmpl->owners);
- if (conf->share_group > 0) {
- tmpl->rxq.shared = 1;
- tmpl->share_group = conf->share_group;
- tmpl->share_qid = conf->share_qid;
- LIST_INSERT_HEAD(&priv->sh->shared_rxqs, tmpl, share_entry);
- }
rxq->ctrl = tmpl;
LIST_INSERT_HEAD(&tmpl->owners, rxq, owner_entry);
MLX5_ASSERT(n_seg && n_seg <= MLX5_MAX_RXQ_NSEG);
@@ -1933,6 +1927,12 @@ mlx5_rxq_new(struct rte_eth_dev *dev, struct
mlx5_rxq_priv *rxq,
tmpl->rxq.mprq_bufs =
(struct mlx5_mprq_buf *(*)[desc])(*tmpl->rxq.elts + desc_n);
tmpl->rxq.idx = idx;
+ if (conf->share_group > 0) {
+ tmpl->rxq.shared = 1;
+ tmpl->share_group = conf->share_group;
+ tmpl->share_qid = conf->share_qid;
+ LIST_INSERT_HEAD(&priv->sh->shared_rxqs, tmpl, share_entry);
+ }
LIST_INSERT_HEAD(&priv->rxqsctrl, tmpl, next);
return tmpl;
error:
--
2.25.1
[PATCH 0/2] fix shared RxQ creation
Fix error flow in RxQ creation and optimize it. Michael Baum (2): net/mlx5: fix invalid entry in shared RXQs list net/mlx5: optimize RxQ creation drivers/net/mlx5/mlx5_rx.h | 3 +-- drivers/net/mlx5/mlx5_rxq.c | 40 - 2 files changed, 18 insertions(+), 25 deletions(-) -- 2.25.1
[PATCH 2/2] net/mlx5: optimize RxQ creation
Recently shared RxQ has been introduced. All shared Rx queues with same
group and queue ID share the same rxq_ctrl, but each one has
mlx5_rxq_priv structure.
The mlx5_rx_queue_setup generates a new rxq_priv structure, and looks
for a rxq_ctrl structure to refer to. If there is already a compatible
rxq_ctrl structure it refers it, otherwise it calls the mlx5_rxq_new
function that generates a new one.
This patch makes mlx5_rxq_new function "standalone", it generates a
rxq_ctrl structure regardless to specific rxq_priv structure. All
operations on the rxq_ctrl structure that depend on the new rxq_priv
structure are performed in the mlx5_rx_queue_setup function, at the same
place for either a new rxq_ctrl structure or an existing rxq_ctrl
structure.
Signed-off-by: Michael Baum
Acked-by: Viacheslav Ovsiienko
---
drivers/net/mlx5/mlx5_rx.h | 3 +--
drivers/net/mlx5/mlx5_rxq.c | 28 +++-
2 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/drivers/net/mlx5/mlx5_rx.h b/drivers/net/mlx5/mlx5_rx.h
index 7e417819f7..38335fd744 100644
--- a/drivers/net/mlx5/mlx5_rx.h
+++ b/drivers/net/mlx5/mlx5_rx.h
@@ -204,8 +204,7 @@ void mlx5_rx_intr_vec_disable(struct rte_eth_dev *dev);
int mlx5_rx_intr_enable(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int mlx5_rx_intr_disable(struct rte_eth_dev *dev, uint16_t rx_queue_id);
int mlx5_rxq_obj_verify(struct rte_eth_dev *dev);
-struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev,
- struct mlx5_rxq_priv *rxq,
+struct mlx5_rxq_ctrl *mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx,
uint16_t desc, unsigned int socket,
const struct rte_eth_rxconf *conf,
const struct rte_eth_rxseg_split *rx_seg,
diff --git a/drivers/net/mlx5/mlx5_rxq.c b/drivers/net/mlx5/mlx5_rxq.c
index fe72cf49d3..eaa48487cc 100644
--- a/drivers/net/mlx5/mlx5_rxq.c
+++ b/drivers/net/mlx5/mlx5_rxq.c
@@ -910,25 +910,23 @@ mlx5_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
idx, uint16_t desc,
rte_errno = ENOMEM;
return -rte_errno;
}
- rxq->priv = priv;
- rxq->idx = idx;
- (*priv->rxq_privs)[idx] = rxq;
- if (rxq_ctrl != NULL) {
- /* Join owner list. */
- LIST_INSERT_HEAD(&rxq_ctrl->owners, rxq, owner_entry);
- rxq->ctrl = rxq_ctrl;
- } else {
- rxq_ctrl = mlx5_rxq_new(dev, rxq, desc, socket, conf, rx_seg,
+ if (rxq_ctrl == NULL) {
+ rxq_ctrl = mlx5_rxq_new(dev, idx, desc, socket, conf, rx_seg,
n_seg);
if (rxq_ctrl == NULL) {
DRV_LOG(ERR, "port %u unable to allocate rx queue index
%u",
dev->data->port_id, idx);
mlx5_free(rxq);
- (*priv->rxq_privs)[idx] = NULL;
rte_errno = ENOMEM;
return -rte_errno;
}
}
+ rxq->priv = priv;
+ rxq->idx = idx;
+ (*priv->rxq_privs)[idx] = rxq;
+ /* Join owner list. */
+ LIST_INSERT_HEAD(&rxq_ctrl->owners, rxq, owner_entry);
+ rxq->ctrl = rxq_ctrl;
mlx5_rxq_ref(dev, idx);
DRV_LOG(DEBUG, "port %u adding Rx queue %u to list",
dev->data->port_id, idx);
@@ -1660,8 +1658,8 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t idx,
uint16_t desc,
*
* @param dev
* Pointer to Ethernet device.
- * @param rxq
- * RX queue private data.
+ * @param idx
+ * RX queue index.
* @param desc
* Number of descriptors to configure in queue.
* @param socket
@@ -1671,12 +1669,10 @@ mlx5_mprq_prepare(struct rte_eth_dev *dev, uint16_t
idx, uint16_t desc,
* A DPDK queue object on success, NULL otherwise and rte_errno is set.
*/
struct mlx5_rxq_ctrl *
-mlx5_rxq_new(struct rte_eth_dev *dev, struct mlx5_rxq_priv *rxq,
-uint16_t desc,
+mlx5_rxq_new(struct rte_eth_dev *dev, uint16_t idx, uint16_t desc,
unsigned int socket, const struct rte_eth_rxconf *conf,
const struct rte_eth_rxseg_split *rx_seg, uint16_t n_seg)
{
- uint16_t idx = rxq->idx;
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_rxq_ctrl *tmpl;
unsigned int mb_len = rte_pktmbuf_data_room_size(rx_seg[0].mp);
@@ -1719,8 +1715,6 @@ mlx5_rxq_new(struct rte_eth_dev *dev, struct
mlx5_rxq_priv *rxq,
return NULL;
}
LIST_INIT(&tmpl->owners);
- rxq->ctrl = tmpl;
- LIST_INSERT_HEAD(&tmpl->owners, rxq, owner_entry);
MLX5_ASSERT(n_seg && n_seg <= MLX5_MAX_RXQ_NSEG);
/*
* Save the original segment configuration in the shared queue
--
2.25.1
[PATCH v8 2/2] net/cnxk: support priority flow control
From: Sunil Kumar Kori
Patch implements priority flow control support for CNXK platforms.
Signed-off-by: Sunil Kumar Kori
---
v1..v2:
- fix application restart issue.
v2..v3:
- fix pause quanta configuration for cn10k.
- fix review comments.
v3..v4:
- fix PFC configuration with other type of TM tree
i.e. default, user and rate limit tree.
v4..v5:
- rebase on top of tree.
v5..v6:
- fix review comments
v6..v7:
- use correct FC mode flags
v7..v8:
- rebase on top of 22.03-rc1
drivers/net/cnxk/cnxk_ethdev.c | 30 +
drivers/net/cnxk/cnxk_ethdev.h | 20 +++
drivers/net/cnxk/cnxk_ethdev_ops.c | 187 +++--
3 files changed, 228 insertions(+), 9 deletions(-)
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 27751a6956..37ae0939d7 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -1251,6 +1251,8 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
goto cq_fini;
}
+ /* Initialize TC to SQ mapping as invalid */
+ memset(dev->pfc_tc_sq_map, 0xFF, sizeof(dev->pfc_tc_sq_map));
/*
* Restore queue config when reconfigure followed by
* reconfigure and no queue configure invoked from application case.
@@ -1539,6 +1541,10 @@ struct eth_dev_ops cnxk_eth_dev_ops = {
.tx_burst_mode_get = cnxk_nix_tx_burst_mode_get,
.flow_ctrl_get = cnxk_nix_flow_ctrl_get,
.flow_ctrl_set = cnxk_nix_flow_ctrl_set,
+ .priority_flow_ctrl_queue_config =
+ cnxk_nix_priority_flow_ctrl_queue_config,
+ .priority_flow_ctrl_queue_info_get =
+ cnxk_nix_priority_flow_ctrl_queue_info_get,
.dev_set_link_up = cnxk_nix_set_link_up,
.dev_set_link_down = cnxk_nix_set_link_down,
.get_module_info = cnxk_nix_get_module_info,
@@ -1718,6 +1724,8 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool
reset)
{
struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
const struct eth_dev_ops *dev_ops = eth_dev->dev_ops;
+ struct rte_eth_pfc_queue_conf pfc_conf = {0};
+ struct rte_eth_fc_conf fc_conf = {0};
struct roc_nix *nix = &dev->nix;
int rc, i;
@@ -1733,6 +1741,28 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool
reset)
roc_nix_npc_rx_ena_dis(nix, false);
+ /* Restore 802.3 Flow control configuration */
+ fc_conf.mode = RTE_ETH_FC_NONE;
+ rc = cnxk_nix_flow_ctrl_set(eth_dev, &fc_conf);
+
+ pfc_conf.mode = RTE_ETH_FC_NONE;
+ for (i = 0; i < CNXK_NIX_PFC_CHAN_COUNT; i++) {
+ if (dev->pfc_tc_sq_map[i] != 0x) {
+ pfc_conf.rx_pause.tx_qid = dev->pfc_tc_sq_map[i];
+ pfc_conf.rx_pause.tc = i;
+ pfc_conf.tx_pause.rx_qid = i;
+ pfc_conf.tx_pause.tc = i;
+ rc = cnxk_nix_priority_flow_ctrl_queue_config(eth_dev,
+ &pfc_conf);
+ if (rc)
+ plt_err("Failed to reset PFC. error code(%d)",
+ rc);
+ }
+ }
+
+ fc_conf.mode = RTE_ETH_FC_FULL;
+ rc = cnxk_nix_flow_ctrl_set(eth_dev, &fc_conf);
+
/* Disable and free rte_meter entries */
nix_meter_fini(dev);
diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index fadc8aaf45..d0dfa7cb70 100644
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -137,12 +137,24 @@
/* SPI will be in 20 bits of tag */
#define CNXK_ETHDEV_SPI_TAG_MASK 0xFUL
+#define CNXK_NIX_PFC_CHAN_COUNT 16
+
struct cnxk_fc_cfg {
enum rte_eth_fc_mode mode;
uint8_t rx_pause;
uint8_t tx_pause;
};
+struct cnxk_pfc_cfg {
+ struct cnxk_fc_cfg fc_cfg;
+ uint16_t class_en;
+ uint16_t pause_time;
+ uint8_t rx_tc;
+ uint8_t rx_qid;
+ uint8_t tx_tc;
+ uint8_t tx_qid;
+};
+
struct cnxk_eth_qconf {
union {
struct rte_eth_txconf tx;
@@ -372,6 +384,8 @@ struct cnxk_eth_dev {
struct cnxk_eth_qconf *rx_qconf;
/* Flow control configuration */
+ uint16_t pfc_tc_sq_map[CNXK_NIX_PFC_CHAN_COUNT];
+ struct cnxk_pfc_cfg pfc_cfg;
struct cnxk_fc_cfg fc_cfg;
/* PTP Counters */
@@ -473,6 +487,10 @@ int cnxk_nix_flow_ctrl_set(struct rte_eth_dev *eth_dev,
struct rte_eth_fc_conf *fc_conf);
int cnxk_nix_flow_ctrl_get(struct rte_eth_dev *eth_dev,
struct rte_eth_fc_conf *fc_conf);
+int cnxk_nix_priority_flow_ctrl_queue_config(struct rte_eth_dev *eth_dev,
+struct rte_eth_pfc_queue_conf
*pfc_conf);
+int cnxk_nix_priority_flow_ctrl_queue_info_get(struct rte_eth_dev *eth_dev,
+
[PATCH v8 1/2] common/cnxk: support priority flow ctrl config API
From: Sunil Kumar Kori
CNXK platforms support priority flow control(802.1qbb) to pause
respective traffic per class on that link.
Patch adds RoC interface to configure priority flow control on MAC
block i.e. CGX on cn9k and RPM on cn10k.
Signed-off-by: Sunil Kumar Kori
---
v1..v2:
- fix RoC API naming convention.
v2..v3:
- fix pause quanta configuration for cn10k.
- remove unnecessary code
v3..v4:
- fix PFC configuration with other type of TM tree
i.e. default, user and rate limit tree.
v4..v5:
- rebase on top of tree
- fix review comments
- fix initialization error for LBK devices
v5..v6:
- fix review comments
v6..v7:
- no change
v7..v8:
- rebase on top of 22.03-rc1
drivers/common/cnxk/roc_mbox.h | 19 ++-
drivers/common/cnxk/roc_nix.h| 21
drivers/common/cnxk/roc_nix_fc.c | 95 +--
drivers/common/cnxk/roc_nix_priv.h | 6 +-
drivers/common/cnxk/roc_nix_tm.c | 171 ++-
drivers/common/cnxk/roc_nix_tm_ops.c | 14 ++-
drivers/common/cnxk/version.map | 4 +
7 files changed, 310 insertions(+), 20 deletions(-)
diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index 8967858914..b608f58357 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -95,6 +95,8 @@ struct mbox_msghdr {
msg_rsp) \
M(CGX_STATS_RST, 0x21A, cgx_stats_rst, msg_req, msg_rsp) \
M(RPM_STATS, 0x21C, rpm_stats, msg_req, rpm_stats_rsp) \
+ M(CGX_PRIO_FLOW_CTRL_CFG, 0x21F, cgx_prio_flow_ctrl_cfg, cgx_pfc_cfg, \
+ cgx_pfc_rsp) \
/* NPA mbox IDs (range 0x400 - 0x5FF) */ \
M(NPA_LF_ALLOC, 0x400, npa_lf_alloc, npa_lf_alloc_req, \
npa_lf_alloc_rsp)\
@@ -551,6 +553,19 @@ struct cgx_pause_frm_cfg {
uint8_t __io tx_pause;
};
+struct cgx_pfc_cfg {
+ struct mbox_msghdr hdr;
+ uint8_t __io rx_pause;
+ uint8_t __io tx_pause;
+ uint16_t __io pfc_en; /* bitmap indicating enabled traffic classes */
+};
+
+struct cgx_pfc_rsp {
+ struct mbox_msghdr hdr;
+ uint8_t __io rx_pause;
+ uint8_t __io tx_pause;
+};
+
struct sfp_eeprom_s {
#define SFP_EEPROM_SIZE 256
uint16_t __io sff_id;
@@ -1125,7 +1140,9 @@ struct nix_bp_cfg_req {
/* PF can be mapped to either CGX or LBK interface,
* so maximum 64 channels are possible.
*/
-#define NIX_MAX_CHAN 64
+#define NIX_MAX_CHAN64
+#define NIX_CGX_MAX_CHAN 16
+#define NIX_LBK_MAX_CHAN 1
struct nix_bp_cfg_rsp {
struct mbox_msghdr hdr;
/* Channel and bpid mapping */
diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h
index 755212c8f9..680a34cdcd 100644
--- a/drivers/common/cnxk/roc_nix.h
+++ b/drivers/common/cnxk/roc_nix.h
@@ -165,16 +165,27 @@ struct roc_nix_fc_cfg {
struct {
uint32_t rq;
+ uint16_t tc;
uint16_t cq_drop;
bool enable;
} cq_cfg;
struct {
+ uint32_t sq;
+ uint16_t tc;
bool enable;
} tm_cfg;
};
};
+struct roc_nix_pfc_cfg {
+ enum roc_nix_fc_mode mode;
+ /* For SET, tc must be [0, 15].
+* For GET, TC will represent bitmap
+*/
+ uint16_t tc;
+};
+
struct roc_nix_eeprom_info {
#define ROC_NIX_EEPROM_SIZE 256
uint16_t sff_id;
@@ -478,6 +489,7 @@ void __roc_api roc_nix_unregister_cq_irqs(struct roc_nix
*roc_nix);
enum roc_nix_tm_tree {
ROC_NIX_TM_DEFAULT = 0,
ROC_NIX_TM_RLIMIT,
+ ROC_NIX_TM_PFC,
ROC_NIX_TM_USER,
ROC_NIX_TM_TREE_MAX,
};
@@ -624,6 +636,7 @@ roc_nix_tm_shaper_default_red_algo(struct roc_nix_tm_node
*node,
int __roc_api roc_nix_tm_lvl_cnt_get(struct roc_nix *roc_nix);
int __roc_api roc_nix_tm_lvl_have_link_access(struct roc_nix *roc_nix, int
lvl);
int __roc_api roc_nix_tm_prepare_rate_limited_tree(struct roc_nix *roc_nix);
+int __roc_api roc_nix_tm_pfc_prepare_tree(struct roc_nix *roc_nix);
bool __roc_api roc_nix_tm_is_user_hierarchy_enabled(struct roc_nix *nix);
int __roc_api roc_nix_tm_tree_type_get(struct roc_nix *nix);
@@ -739,6 +752,14 @@ int __roc_api roc_nix_fc_config_get(struct roc_nix
*roc_nix,
int __roc_api roc_nix_fc_mode_set(struct roc_nix *roc_nix,
enum roc_nix_fc_mode mode);
+int __roc_api roc_nix_pfc_mode_set(struct roc_nix *roc_nix,
+ struct roc_nix_pfc_cfg *pfc_cfg);
+
+int __roc_api roc_nix_pfc_mode_get(struct roc_nix *roc_nix,
+ struct roc_nix_pfc_cfg *pfc_cfg);
+
+uint16_t __roc_api roc_n
out of tree driver builds broken with C++
while the driver api is "internal" we agreed some time ago that drivers could be built external to the dpdk tree. by enabling the meson setup option -Denable_driver_sdk=true. it was agreed that the driver api was internal and would attract no binary compatibility support which was fine. this change has now imposed a further restriction that out of tree drivers have to be authored in C only as non-C++ compatible code will invariably leak into the internal structures. you won't allow us to build C++ drivers in the dpdk tree and it seems now you are preventing building of C++ drivers outside of the tree too. could we please re-evaluate this. thanks. commit 7a335720575507f55b723b1e10bfea7daeba1386 Author: Thomas Monjalon Date: Wed Sep 15 18:46:35 2021 +0200 lib: remove C++ include guard from private headers The private headers are compiled internally with a C compiler. Thus extern "C" declaration is useless in such files. Signed-off-by: Thomas Monjalon
Re: out of tree driver builds broken with C++
14/02/2022 10:13, Tyler Retzlaff: > while the driver api is "internal" we agreed some time ago that drivers > could be built external to the dpdk tree. by enabling the meson setup > option -Denable_driver_sdk=true. > > it was agreed that the driver api was internal and would attract no > binary compatibility support which was fine. this change has now > imposed a further restriction that out of tree drivers have to be > authored in C only as non-C++ compatible code will invariably leak into > the internal structures. > > you won't allow us to build C++ drivers in the dpdk tree and it seems > now you are preventing building of C++ drivers outside of the tree too. That's the problem of non-written assumptions, they are unknown or forgotten. Did we agree to support out-of-tree drivers in C++? We really need to make things clear and written in documentation. > could we please re-evaluate this. Yes we can re-evaluate. What is the list of impacted files? > commit 7a335720575507f55b723b1e10bfea7daeba1386 > Author: Thomas Monjalon > Date: Wed Sep 15 18:46:35 2021 +0200 > > lib: remove C++ include guard from private headers > > The private headers are compiled internally with a C compiler. > Thus extern "C" declaration is useless in such files. > > Signed-off-by: Thomas Monjalon
Re: [PATCH v4 1/3] event/cnxk: store and reuse workslot status
On Thu, Feb 10, 2022 at 6:51 PM wrote:
>
> From: Pavan Nikhilesh
>
> Store and reuse workslot status for TT, GRP and HEAD status
> instead of reading from GWC as reading from GWC imposes
> additional latency.
>
> Signed-off-by: Pavan Nikhilesh
Series Acked-by: Jerin Jacob
Series Applied to dpdk-next-net-eventdev/for-main. Thanks
> ---
> Depends-on: 21590
>
> v4 Changes:
> - Update commit title for 3/3
>
> v3 Changes:
> - Split and rebase patches.
>
> v2 Changes:
> - Rebase.
> - Fix incorrect use of RoC API
>
> drivers/common/cnxk/roc_sso.h | 14 --
> drivers/event/cnxk/cn10k_worker.h | 16 +---
> drivers/event/cnxk/cn9k_worker.h | 6 +++---
> drivers/event/cnxk/cnxk_eventdev.h | 2 ++
> drivers/event/cnxk/cnxk_worker.h | 11 +++
> drivers/net/cnxk/cn10k_tx.h| 12 ++--
> 6 files changed, 35 insertions(+), 26 deletions(-)
>
> diff --git a/drivers/common/cnxk/roc_sso.h b/drivers/common/cnxk/roc_sso.h
> index 27d49c6c68..ab7cee1c60 100644
> --- a/drivers/common/cnxk/roc_sso.h
> +++ b/drivers/common/cnxk/roc_sso.h
> @@ -54,12 +54,13 @@ struct roc_sso {
> uint8_t reserved[ROC_SSO_MEM_SZ] __plt_cache_aligned;
> } __plt_cache_aligned;
>
> -static __plt_always_inline void
> -roc_sso_hws_head_wait(uintptr_t tag_op)
> +static __plt_always_inline uint64_t
> +roc_sso_hws_head_wait(uintptr_t base)
> {
> -#ifdef RTE_ARCH_ARM64
> + uintptr_t tag_op = base + SSOW_LF_GWS_TAG;
> uint64_t tag;
>
> +#if defined(__aarch64__)
> asm volatile(PLT_CPU_FEATURE_PREAMBLE
> " ldr %[tag], [%[tag_op]] \n"
> " tbnz %[tag], 35, done%= \n"
> @@ -71,10 +72,11 @@ roc_sso_hws_head_wait(uintptr_t tag_op)
> : [tag] "=&r"(tag)
> : [tag_op] "r"(tag_op));
> #else
> - /* Wait for the SWTAG/SWTAG_FULL operation */
> - while (!(plt_read64(tag_op) & BIT_ULL(35)))
> - ;
> + do {
> + tag = plt_read64(tag_op);
> + } while (!(tag & BIT_ULL(35)));
> #endif
> + return tag;
> }
>
> /* SSO device initialization */
> diff --git a/drivers/event/cnxk/cn10k_worker.h
> b/drivers/event/cnxk/cn10k_worker.h
> index ff08b2d974..ada230ea1d 100644
> --- a/drivers/event/cnxk/cn10k_worker.h
> +++ b/drivers/event/cnxk/cn10k_worker.h
> @@ -40,8 +40,7 @@ cn10k_sso_hws_fwd_swtag(struct cn10k_sso_hws *ws, const
> struct rte_event *ev)
> {
> const uint32_t tag = (uint32_t)ev->event;
> const uint8_t new_tt = ev->sched_type;
> - const uint8_t cur_tt =
> - CNXK_TT_FROM_TAG(plt_read64(ws->base + SSOW_LF_GWS_WQE0));
> + const uint8_t cur_tt = CNXK_TT_FROM_TAG(ws->gw_rdata);
>
> /* CNXK model
> * cur_tt/new_tt SSO_TT_ORDERED SSO_TT_ATOMIC SSO_TT_UNTAGGED
> @@ -81,7 +80,7 @@ cn10k_sso_hws_forward_event(struct cn10k_sso_hws *ws,
> const uint8_t grp = ev->queue_id;
>
> /* Group hasn't changed, Use SWTAG to forward the event */
> - if (CNXK_GRP_FROM_TAG(plt_read64(ws->base + SSOW_LF_GWS_WQE0)) == grp)
> + if (CNXK_GRP_FROM_TAG(ws->gw_rdata) == grp)
> cn10k_sso_hws_fwd_swtag(ws, ev);
> else
> /*
> @@ -211,6 +210,7 @@ cn10k_sso_hws_get_work(struct cn10k_sso_hws *ws, struct
> rte_event *ev,
> } while (gw.u64[0] & BIT_ULL(63));
> mbuf = (uint64_t)((char *)gw.u64[1] - sizeof(struct rte_mbuf));
> #endif
> + ws->gw_rdata = gw.u64[0];
> gw.u64[0] = (gw.u64[0] & (0x3ull << 32)) << 6 |
> (gw.u64[0] & (0x3FFull << 36)) << 4 |
> (gw.u64[0] & 0x);
> @@ -405,7 +405,8 @@ NIX_RX_FASTPATH_MODES
> RTE_SET_USED(timeout_ticks);
> \
> if (ws->swtag_req) {
> \
> ws->swtag_req = 0;
> \
> - cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_WQE0);
> \
> + ws->gw_rdata = cnxk_sso_hws_swtag_wait(
> \
> + ws->base + SSOW_LF_GWS_WQE0);
> \
> return 1;
> \
> }
> \
> return cn10k_sso_hws_get_work(ws, ev, flags, ws->lookup_mem);
> \
> @@ -424,7 +425,8 @@ NIX_RX_FASTPATH_MODES
> uint64_t iter;
> \
> if (ws->swtag_req) {
> \
> ws->swtag_req = 0;
> \
> - cnxk_sso_hws_swtag_wait(ws->base + SSOW_LF_GWS_WQE0);
> \
> + ws->gw_rdata = cnxk_sso_hws_swtag_wait(
> \
>
RE: [PATCH v4 1/7] eal: fix header build with C++
> Subject: [PATCH v4 1/7] eal: fix header build with C++
>
> C++ files could not include some headers because:
>
> * "new" is a keyword in C++, so can't be a variable name
> * there is no automatic casting to/from void *
>
> Fixes: 184104fc6121 ("ticketlock: introduce fair ticket based locking")
> Fixes: 032a7e5499a0 ("trace: implement provider payload")
> Cc: joyce.k...@arm.com
> Cc: jer...@marvell.com
> Cc: sta...@dpdk.org
>
> Signed-off-by: Bruce Richardson
Acked-by: Joyce Kong
> ---
> lib/eal/include/generic/rte_ticketlock.h | 14 +++---
> lib/eal/include/rte_trace_point.h| 2 +-
> 2 files changed, 8 insertions(+), 8 deletions(-)
>
> diff --git a/lib/eal/include/generic/rte_ticketlock.h
> b/lib/eal/include/generic/rte_ticketlock.h
> index c1b8808f51..693c67b517 100644
> --- a/lib/eal/include/generic/rte_ticketlock.h
> +++ b/lib/eal/include/generic/rte_ticketlock.h
> @@ -91,13 +91,13 @@ rte_ticketlock_unlock(rte_ticketlock_t *tl) static
> inline int rte_ticketlock_trylock(rte_ticketlock_t *tl) {
> - rte_ticketlock_t old, new;
> - old.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED);
> - new.tickets = old.tickets;
> - new.s.next++;
> - if (old.s.next == old.s.current) {
> - if (__atomic_compare_exchange_n(&tl->tickets, &old.tickets,
> - new.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
> + rte_ticketlock_t oldl, newl;
> + oldl.tickets = __atomic_load_n(&tl->tickets, __ATOMIC_RELAXED);
> + newl.tickets = oldl.tickets;
> + newl.s.next++;
> + if (oldl.s.next == oldl.s.current) {
> + if (__atomic_compare_exchange_n(&tl->tickets, &oldl.tickets,
> + newl.tickets, 0, __ATOMIC_ACQUIRE, __ATOMIC_RELAXED))
> return 1;
> }
>
> diff --git a/lib/eal/include/rte_trace_point.h
> b/lib/eal/include/rte_trace_point.h
> index e226f073f7..0f8700974f 100644
> --- a/lib/eal/include/rte_trace_point.h
> +++ b/lib/eal/include/rte_trace_point.h
> @@ -370,7 +370,7 @@ do { \
> do { \
> if (unlikely(in == NULL)) \
> return; \
> - rte_strscpy(mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX); \
> + rte_strscpy((char *)mem, in, __RTE_TRACE_EMIT_STRING_LEN_MAX);
> \
> mem = RTE_PTR_ADD(mem, __RTE_TRACE_EMIT_STRING_LEN_MAX);
> \ } while (0)
>
> --
> 2.32.0
IMPORTANT NOTICE: The contents of this email and any attachments are
confidential and may also be privileged. If you are not the intended recipient,
please notify the sender immediately and do not disclose the contents to any
other person, use it for any purpose, or store or copy the information in any
medium. Thank you.
[PATCH v2 01/20] net/mlx5: fix wrong check sibling device config mismatch
The MLX5 net driver supports "probe again". In probing again, it
creates a new ethdev under an existing infiniband device context.
Sibling devices sharing infiniband device context should have compatible
configurations, so some of the devargs given in the probe again, the
ones that are mainly relevant to the sharing device context are sent to
the mlx5_dev_check_sibling_config function which makes sure that they
compatible its siblings.
However, the arguments are adjusted according to the capability of the
device, and the function compares the arguments of the probe again
before the adjustment with the arguments of the siblings after the
adjustment. A user who sends the same values to all siblings may fail in
this comparison if he requested something that the device does not
support and adjusted.
This patch moves the call to the mlx5_dev_check_sibling_config function
after the relevant adjustments.
Fixes: 92d5dd483450 ("net/mlx5: check sibling device configurations mismatch")
Fixes: 2d241515ebaf ("net/mlx5: add devarg for extensive metadata support")
Cc: sta...@dpdk.org
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 41 --
drivers/net/mlx5/windows/mlx5_os.c | 28
2 files changed, 39 insertions(+), 30 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index bbe05bb837..e157795b63 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1241,6 +1241,28 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
/* Override some values set by hardware configuration. */
mlx5_args(config, dpdk_dev->devargs);
+ /* Update final values for devargs before check sibling config. */
+#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
+ if (config->dv_flow_en) {
+ DRV_LOG(WARNING, "DV flow is not supported.");
+ config->dv_flow_en = 0;
+ }
+#endif
+#ifdef HAVE_MLX5DV_DR_ESWITCH
+ if (!(sh->cdev->config.hca_attr.eswitch_manager && config->dv_flow_en &&
+ (switch_info->representor || switch_info->master)))
+ config->dv_esw_en = 0;
+#else
+ config->dv_esw_en = 0;
+#endif
+ if (!priv->config.dv_esw_en &&
+ priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
+ DRV_LOG(WARNING,
+ "Metadata mode %u is not supported (no E-Switch).",
+ priv->config.dv_xmeta_en);
+ priv->config.dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
+ }
+ /* Check sibling device configurations. */
err = mlx5_dev_check_sibling_config(priv, config, dpdk_dev);
if (err)
goto error;
@@ -1251,12 +1273,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
#if !defined(HAVE_IBV_DEVICE_COUNTERS_SET_V42) && \
!defined(HAVE_IBV_DEVICE_COUNTERS_SET_V45)
DRV_LOG(DEBUG, "counters are not supported");
-#endif
-#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
- if (config->dv_flow_en) {
- DRV_LOG(WARNING, "DV flow is not supported");
- config->dv_flow_en = 0;
- }
#endif
config->ind_table_max_size =
sh->device_attr.max_rwq_indirection_table_size;
@@ -1652,13 +1668,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
* Verbs context returned by ibv_open_device().
*/
mlx5_link_update(eth_dev, 0);
-#ifdef HAVE_MLX5DV_DR_ESWITCH
- if (!(config->hca_attr.eswitch_manager && config->dv_flow_en &&
- (switch_info->representor || switch_info->master)))
- config->dv_esw_en = 0;
-#else
- config->dv_esw_en = 0;
-#endif
/* Detect minimal data bytes to inline. */
mlx5_set_min_inline(spawn, config);
/* Store device configuration on private structure. */
@@ -1725,12 +1734,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
err = -err;
goto error;
}
- if (!priv->config.dv_esw_en &&
- priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
- DRV_LOG(WARNING, "metadata mode %u is not supported "
-"(no E-Switch)", priv->config.dv_xmeta_en);
- priv->config.dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
- }
mlx5_set_metadata_mask(eth_dev);
if (priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY &&
!priv->sh->dv_regc0_mask) {
diff --git a/drivers/net/mlx5/windows/mlx5_os.c
b/drivers/net/mlx5/windows/mlx5_os.c
index 7f3532426f..3db33cd0cf 100644
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -439,6 +439,21 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
/* Override some values set by hardware configuration. */
mlx5_args(config, dpdk_dev->devargs);
+ /* Update final values for devargs before check sibling config. *
[PATCH v2 02/20] net/mlx5: fix ineffective metadata argument adjustment
In "dv_xmeta_en" devarg there is an option of dv_xmeta_en=3 which
engages tunnel offload mode. In E-Switch configuration, that mode
implicitly activates dv_xmeta_en=1.
The update according to E-switch support is done immediately after the
first parsing of the devargs, but there is another adjustment later.
This patch moves the adjustment after the second parsing.
Fixes: 4ec6360de37d ("net/mlx5: implement tunnel offload")
Cc: sta...@dpdk.org
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index e157795b63..69d3e1e3ad 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -977,10 +977,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
strerror(rte_errno));
goto error;
}
- if (config->dv_miss_info) {
- if (switch_info->master || switch_info->representor)
- config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
- }
sh = mlx5_alloc_shared_dev_ctx(spawn, config);
if (!sh)
return NULL;
@@ -1242,6 +1238,10 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
/* Override some values set by hardware configuration. */
mlx5_args(config, dpdk_dev->devargs);
/* Update final values for devargs before check sibling config. */
+ if (config->dv_miss_info) {
+ if (switch_info->master || switch_info->representor)
+ config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
+ }
#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
if (config->dv_flow_en) {
DRV_LOG(WARNING, "DV flow is not supported.");
--
2.25.1
[PATCH v2 03/20] net/mlx5: fix wrong place of ASO CT object release
The ASO connection tracking structure is initialized once for sharing
device context.
Its release takes place in the close function which is called for each
ethdev individually. i.e. when there is more than one ethdev under the
same sharing device context, it will be destroyed when one of them is
closed. If the other wants to use it later, it may cause it to crash.
In addition, the creation of this structure is performed in the spawn
function. if one of the creations of the objects following it fails, it
is supposed to be destroyed but this does not happen.
This patch moves its release to the sharing device context free function
and thus solves both problems.
Fixes: 0af8a2298a42 ("net/mlx5: release connection tracking management")
Fixes: ee9e5fad03eb ("net/mlx5: initialize connection tracking management")
Cc: sta...@dpdk.org
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/mlx5.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 5571e90677..cde8d022cd 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1321,6 +1321,8 @@ mlx5_free_shared_dev_ctx(struct mlx5_dev_ctx_shared *sh)
* Only primary process handles async device events.
**/
mlx5_flow_counters_mng_close(sh);
+ if (sh->ct_mng)
+ mlx5_flow_aso_ct_mng_close(sh);
if (sh->aso_age_mng) {
mlx5_flow_aso_age_mng_close(sh);
sh->aso_age_mng = NULL;
@@ -1594,8 +1596,6 @@ mlx5_dev_close(struct rte_eth_dev *dev)
if (priv->mreg_cp_tbl)
mlx5_hlist_destroy(priv->mreg_cp_tbl);
mlx5_mprq_free_mp(dev);
- if (priv->sh->ct_mng)
- mlx5_flow_aso_ct_mng_close(priv->sh);
mlx5_os_free_shared_dr(priv);
if (priv->rss_conf.rss_key != NULL)
mlx5_free(priv->rss_conf.rss_key);
--
2.25.1
[PATCH v2 05/20] net/mlx5: remove declaration duplications
In mlx5_ethdev.c file are implemented those 4 functions: - mlx5_dev_infos_get - mlx5_fw_version_get - mlx5_dev_set_mtu - mlx5_hairpin_cap_get In mlx5.h file they are declared twice. First time under mlx5.c file and second time under mlx5_ethdev.c file. This patch removes the redundant declaration. Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5.h | 11 ++- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h index 737ad6895c..823a943978 100644 --- a/drivers/net/mlx5/mlx5.h +++ b/drivers/net/mlx5/mlx5.h @@ -1532,11 +1532,6 @@ void mlx5_set_metadata_mask(struct rte_eth_dev *dev); int mlx5_dev_check_sibling_config(struct mlx5_priv *priv, struct mlx5_dev_config *config, struct rte_device *dpdk_dev); -int mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info); -int mlx5_fw_version_get(struct rte_eth_dev *dev, char *fw_ver, size_t fw_size); -int mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu); -int mlx5_hairpin_cap_get(struct rte_eth_dev *dev, -struct rte_eth_hairpin_cap *cap); bool mlx5_flex_parser_ecpri_exist(struct rte_eth_dev *dev); int mlx5_flex_parser_ecpri_alloc(struct rte_eth_dev *dev); int mlx5_flow_aso_age_mng_init(struct mlx5_dev_ctx_shared *sh); @@ -1556,10 +1551,8 @@ int mlx5_representor_info_get(struct rte_eth_dev *dev, (((repr_id) >> 12) & 3) uint16_t mlx5_representor_id_encode(const struct mlx5_switch_info *info, enum rte_eth_representor_type hpf_type); -int mlx5_fw_version_get(struct rte_eth_dev *dev, char *fw_ver, - size_t fw_size); -int mlx5_dev_infos_get(struct rte_eth_dev *dev, - struct rte_eth_dev_info *info); +int mlx5_dev_infos_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *info); +int mlx5_fw_version_get(struct rte_eth_dev *dev, char *fw_ver, size_t fw_size); const uint32_t *mlx5_dev_supported_ptypes_get(struct rte_eth_dev *dev); int mlx5_dev_set_mtu(struct rte_eth_dev *dev, uint16_t mtu); int mlx5_hairpin_cap_get(struct rte_eth_dev *dev, -- 2.25.1
[PATCH v2 06/20] net/mlx5: remove checking devargs duplication
The device arguments are parsed and updated twice during spawning. First
time before creating the share device context, and again later after
updating a default value to one of the arguments.
This patch consolidates them into one parsing and updates the default
values before it.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 73 +-
drivers/net/mlx5/mlx5.c| 23 +-
drivers/net/mlx5/mlx5.h| 2 +-
drivers/net/mlx5/windows/mlx5_os.c | 49
4 files changed, 65 insertions(+), 82 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index faab310b11..191da1bee9 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -968,22 +968,45 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mlx5_dev_close(eth_dev);
return NULL;
}
- /*
-* Some parameters ("tx_db_nc" in particularly) are needed in
-* advance to create dv/verbs device context. We proceed the
-* devargs here to get ones, and later proceed devargs again
-* to override some hardware settings.
-*/
+ /* Process parameters. */
err = mlx5_args(config, dpdk_dev->devargs);
if (err) {
- err = rte_errno;
DRV_LOG(ERR, "failed to process device arguments: %s",
strerror(rte_errno));
- goto error;
+ return NULL;
}
sh = mlx5_alloc_shared_dev_ctx(spawn, config);
if (!sh)
return NULL;
+ /* Update final values for devargs before check sibling config. */
+ if (config->dv_miss_info) {
+ if (switch_info->master || switch_info->representor)
+ config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
+ }
+#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
+ if (config->dv_flow_en) {
+ DRV_LOG(WARNING, "DV flow is not supported.");
+ config->dv_flow_en = 0;
+ }
+#endif
+#ifdef HAVE_MLX5DV_DR_ESWITCH
+ if (!(sh->cdev->config.hca_attr.eswitch_manager && config->dv_flow_en &&
+ (switch_info->representor || switch_info->master)))
+ config->dv_esw_en = 0;
+#else
+ config->dv_esw_en = 0;
+#endif
+ if (!config->dv_esw_en &&
+ config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
+ DRV_LOG(WARNING,
+ "Metadata mode %u is not supported (no E-Switch).",
+ config->dv_xmeta_en);
+ config->dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
+ }
+ /* Check sibling device configurations. */
+ err = mlx5_dev_check_sibling_config(sh, config, dpdk_dev);
+ if (err)
+ goto error;
#ifdef HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR
config->dest_tir = 1;
#endif
@@ -1049,8 +1072,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mprq_caps.max_single_wqe_log_num_of_strides;
}
#endif
- /* Rx CQE compression is enabled by default. */
- config->cqe_comp = 1;
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS) {
config->tunnel_en = dv_attr.tunnel_offloads_caps &
@@ -1239,37 +1260,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(DEBUG, "dev_port-%u new domain_id=%u\n",
priv->dev_port, priv->domain_id);
}
- /* Override some values set by hardware configuration. */
- mlx5_args(config, dpdk_dev->devargs);
- /* Update final values for devargs before check sibling config. */
- if (config->dv_miss_info) {
- if (switch_info->master || switch_info->representor)
- config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
- }
-#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
- if (config->dv_flow_en) {
- DRV_LOG(WARNING, "DV flow is not supported.");
- config->dv_flow_en = 0;
- }
-#endif
-#ifdef HAVE_MLX5DV_DR_ESWITCH
- if (!(sh->cdev->config.hca_attr.eswitch_manager && config->dv_flow_en &&
- (switch_info->representor || switch_info->master)))
- config->dv_esw_en = 0;
-#else
- config->dv_esw_en = 0;
-#endif
- if (!priv->config.dv_esw_en &&
- priv->config.dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
- DRV_LOG(WARNING,
- "Metadata mode %u is not supported (no E-Switch).",
- priv->config.dv_xmeta_en);
- priv->config.dv_xmeta_en = MLX5_XMETA_MODE_LEGACY;
- }
- /* Check sibling device configurations. */
- err = mlx5_dev_check_sibling_config(priv, config, dpdk_dev);
- if (err)
- goto error;
config->hw_csum = !!(sh->device_at
[PATCH v2 07/20] net/mlx5: remove HCA attr structure duplication
The HCA attribute structure is field of net configure structure.
It is also field of common configure structure.
There is no need for this duplication, because there is a reference to
the common structure from within the net structures.
This patch removes it from net configure structure and uses the common
config structure instead.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 95 ++
drivers/net/mlx5/mlx5.c| 14 +++--
drivers/net/mlx5/mlx5.h| 1 -
drivers/net/mlx5/mlx5_devx.c | 8 ++-
drivers/net/mlx5/mlx5_ethdev.c | 2 +-
drivers/net/mlx5/mlx5_flow.c | 16 ++---
drivers/net/mlx5/mlx5_flow_dv.c| 13 ++--
drivers/net/mlx5/mlx5_flow_flex.c | 4 +-
drivers/net/mlx5/mlx5_flow_meter.c | 4 +-
drivers/net/mlx5/mlx5_rxq.c| 4 +-
drivers/net/mlx5/mlx5_trigger.c| 12 ++--
drivers/net/mlx5/mlx5_txpp.c | 2 +-
drivers/net/mlx5/windows/mlx5_os.c | 25
13 files changed, 100 insertions(+), 100 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 191da1bee9..b3ee1f7dc4 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -675,6 +675,7 @@ mlx5_flow_counter_mode_config(struct rte_eth_dev *dev
__rte_unused)
#ifdef HAVE_IBV_FLOW_DV_SUPPORT
struct mlx5_priv *priv = dev->data->dev_private;
struct mlx5_dev_ctx_shared *sh = priv->sh;
+ struct mlx5_hca_attr *hca_attr = &sh->cdev->config.hca_attr;
bool fallback;
#ifndef HAVE_IBV_DEVX_ASYNC
@@ -682,16 +683,16 @@ mlx5_flow_counter_mode_config(struct rte_eth_dev *dev
__rte_unused)
#else
fallback = false;
if (!sh->devx || !priv->config.dv_flow_en ||
- !priv->config.hca_attr.flow_counters_dump ||
- !(priv->config.hca_attr.flow_counter_bulk_alloc_bitmap & 0x4) ||
+ !hca_attr->flow_counters_dump ||
+ !(hca_attr->flow_counter_bulk_alloc_bitmap & 0x4) ||
(mlx5_flow_dv_discover_counter_offset_support(dev) == -ENOTSUP))
fallback = true;
#endif
if (fallback)
DRV_LOG(INFO, "Use fall-back DV counter management. Flow "
"counter dump:%d, bulk_alloc_bitmap:0x%hhx.",
- priv->config.hca_attr.flow_counters_dump,
- priv->config.hca_attr.flow_counter_bulk_alloc_bitmap);
+ hca_attr->flow_counters_dump,
+ hca_attr->flow_counter_bulk_alloc_bitmap);
/* Initialize fallback mode only on the port initializes sh. */
if (sh->refcnt == 1)
sh->cmng.counter_fallback = fallback;
@@ -875,6 +876,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
{
const struct mlx5_switch_info *switch_info = &spawn->info;
struct mlx5_dev_ctx_shared *sh = NULL;
+ struct mlx5_hca_attr *hca_attr = &spawn->cdev->config.hca_attr;
struct ibv_port_attr port_attr = { .state = IBV_PORT_NOP };
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
struct rte_eth_dev *eth_dev = NULL;
@@ -990,7 +992,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
#endif
#ifdef HAVE_MLX5DV_DR_ESWITCH
- if (!(sh->cdev->config.hca_attr.eswitch_manager && config->dv_flow_en &&
+ if (!(hca_attr->eswitch_manager && config->dv_flow_en &&
(switch_info->representor || switch_info->master)))
config->dv_esw_en = 0;
#else
@@ -1315,14 +1317,12 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
config->mps == MLX5_MPW ? "legacy " : "",
config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
if (sh->devx) {
- config->hca_attr = sh->cdev->config.hca_attr;
- sh->steering_format_version =
- config->hca_attr.steering_format_version;
+ sh->steering_format_version = hca_attr->steering_format_version;
/* Check for LRO support. */
- if (config->dest_tir && config->hca_attr.lro_cap &&
+ if (config->dest_tir && hca_attr->lro_cap &&
config->dv_flow_en) {
/* TBD check tunnel lro caps. */
- config->lro.supported = config->hca_attr.lro_cap;
+ config->lro.supported = hca_attr->lro_cap;
DRV_LOG(DEBUG, "Device supports LRO");
/*
* If LRO timeout is not configured by application,
@@ -1330,21 +1330,19 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
*/
if (!config->lro.timeout)
config->lro.timeout =
- config->hca_attr.lro_timer_supported_periods[0];
+ hca_attr->lro_timer_supported_periods[0];
DRV_LOG(DEBUG, "
[PATCH v2 08/20] net/mlx5: remove DevX flag duplication
The sharing device context structure has a field named "devx" which
indicates if DevX is supported.
The common configure stracture has also field named "devx" with the same
meaning.
There is no need for this duplication, because there is a reference to
the common structure from within the sharing device context structure.
This patch removes it from sharing device context structure and uses the
common config structure instead.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c| 16
drivers/net/mlx5/linux/mlx5_verbs.c | 4 ++--
drivers/net/mlx5/mlx5.c | 3 +--
drivers/net/mlx5/mlx5.h | 1 -
drivers/net/mlx5/mlx5_ethdev.c | 3 ++-
drivers/net/mlx5/mlx5_flow.c| 2 +-
drivers/net/mlx5/mlx5_flow_dv.c | 23 ---
drivers/net/mlx5/mlx5_trigger.c | 2 +-
drivers/net/mlx5/windows/mlx5_os.c | 6 +++---
9 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index b3ee1f7dc4..7ca10ae9d0 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -682,7 +682,7 @@ mlx5_flow_counter_mode_config(struct rte_eth_dev *dev
__rte_unused)
fallback = true;
#else
fallback = false;
- if (!sh->devx || !priv->config.dv_flow_en ||
+ if (!sh->cdev->config.devx || !priv->config.dv_flow_en ||
!hca_attr->flow_counters_dump ||
!(hca_attr->flow_counter_bulk_alloc_bitmap & 0x4) ||
(mlx5_flow_dv_discover_counter_offset_support(dev) == -ENOTSUP))
@@ -1316,7 +1316,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
config->mps == MLX5_MPW_ENHANCED ? "enhanced " :
config->mps == MLX5_MPW ? "legacy " : "",
config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
- if (sh->devx) {
+ if (sh->cdev->config.devx) {
sh->steering_format_version = hca_attr->steering_format_version;
/* Check for LRO support. */
if (config->dest_tir && hca_attr->lro_cap &&
@@ -1434,13 +1434,13 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
config->cqe_comp = 0;
}
if (config->cqe_comp_fmt == MLX5_CQE_RESP_FORMAT_FTAG_STRIDX &&
- (!sh->devx || !hca_attr->mini_cqe_resp_flow_tag)) {
+ (!sh->cdev->config.devx || !hca_attr->mini_cqe_resp_flow_tag)) {
DRV_LOG(WARNING, "Flow Tag CQE compression"
" format isn't supported.");
config->cqe_comp = 0;
}
if (config->cqe_comp_fmt == MLX5_CQE_RESP_FORMAT_L34H_STRIDX &&
- (!sh->devx || !hca_attr->mini_cqe_resp_l3_l4_tag)) {
+ (!sh->cdev->config.devx || !hca_attr->mini_cqe_resp_l3_l4_tag)) {
DRV_LOG(WARNING, "L3/L4 Header CQE compression"
" format isn't supported.");
config->cqe_comp = 0;
@@ -1463,7 +1463,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
hca_attr->log_max_static_sq_wq);
DRV_LOG(DEBUG, "WQE rate PP mode is %ssupported",
hca_attr->qos.wqe_rate_pp ? "" : "not ");
- if (!sh->devx) {
+ if (!sh->cdev->config.devx) {
DRV_LOG(ERR, "DevX is required for packet pacing");
err = ENODEV;
goto error;
@@ -1519,7 +1519,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->dev_port);
}
}
- if (sh->devx) {
+ if (sh->cdev->config.devx) {
uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
err = hca_attr->access_register_user ?
@@ -1676,7 +1676,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
if (mlx5_flex_item_port_init(eth_dev) < 0)
goto error;
}
- if (sh->devx && config->dv_flow_en && config->dest_tir) {
+ if (sh->cdev->config.devx && config->dv_flow_en && config->dest_tir) {
priv->obj_ops = devx_obj_ops;
mlx5_queue_counter_id_prepare(eth_dev);
priv->obj_ops.lb_dummy_queue_create =
@@ -2735,7 +2735,7 @@ mlx5_os_dev_shared_handler_install(struct
mlx5_dev_ctx_shared *sh)
rte_intr_fd_set(sh->intr_handle, -1);
}
}
- if (sh->devx) {
+ if (sh->cdev->config.devx) {
#ifdef HAVE_IBV_DEVX_ASYNC
sh->intr_handle_devx =
rte_intr_instance_alloc(RTE_INTR_INSTANCE_F_SHARED);
diff --git a/drivers/net/mlx5/linux/mlx5_verbs.c
b/drivers/net/mlx5/linux/mlx5_verbs.c
index 2b6eef44a7..722017efa4 100644
--- a/drivers/net/mlx5/linux/mlx5_verbs.c
+++ b/drivers/net/mlx5/linux/mlx5_verbs.c
@@ -998,7 +998,7 @@ mlx5_txq_ibv_obj_new(struct rte_eth_dev *dev, uint16_t idx)
qp.comp_mask
[PATCH v2 09/20] net/mlx5: remove Verbs query device duplication
The sharing device context structure has a field named "device_attr"
which s filled by mlx5_os_get_dev_attr() function.
The spawn function calls mlx5_os_get_dev_attr() again and save it to
local variable identical to "device_attr" field.
There is no need for this duplication, because there is a reference to
the sharing device context structure from spawn function.
This patch removes the local "device_attr" from spawn function, and uses
the context's field instead.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 63 ++
drivers/net/mlx5/windows/mlx5_os.c | 6 +--
2 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 7ca10ae9d0..2616668149 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -171,6 +171,15 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
device_attr->tso_supported_qpts = attr_ex.tso_caps.supported_qpts;
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
+#ifdef HAVE_IBV_MLX5_MOD_SWP
+ dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_SWP;
+#endif
+#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
+ dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS;
+#endif
+#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
+ dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_STRIDING_RQ;
+#endif
err = mlx5_glue->dv_query_device(ctx, &dv_attr);
if (err) {
rte_errno = errno;
@@ -183,6 +192,7 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
device_attr->sw_parsing_offloads =
dv_attr.sw_parsing_caps.sw_parsing_offloads;
#endif
+#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
device_attr->min_single_stride_log_num_of_bytes =
dv_attr.striding_rq_caps.min_single_stride_log_num_of_bytes;
device_attr->max_single_stride_log_num_of_bytes =
@@ -193,6 +203,7 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
dv_attr.striding_rq_caps.max_single_wqe_log_num_of_strides;
device_attr->stride_supported_qpts =
dv_attr.striding_rq_caps.supported_qpts;
+#endif
#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
device_attr->tunnel_offloads_caps = dv_attr.tunnel_offloads_caps;
#endif
@@ -878,7 +889,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
struct mlx5_dev_ctx_shared *sh = NULL;
struct mlx5_hca_attr *hca_attr = &spawn->cdev->config.hca_attr;
struct ibv_port_attr port_attr = { .state = IBV_PORT_NOP };
- struct mlx5dv_context dv_attr = { .comp_mask = 0 };
struct rte_eth_dev *eth_dev = NULL;
struct mlx5_priv *priv = NULL;
int err = 0;
@@ -1011,23 +1021,13 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
goto error;
#ifdef HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR
config->dest_tir = 1;
-#endif
-#ifdef HAVE_IBV_MLX5_MOD_SWP
- dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_SWP;
#endif
/*
* Multi-packet send is supported by ConnectX-4 Lx PF as well
* as all ConnectX-5 devices.
*/
-#ifdef HAVE_IBV_DEVICE_TUNNEL_SUPPORT
- dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_TUNNEL_OFFLOADS;
-#endif
-#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
- dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_STRIDING_RQ;
-#endif
- mlx5_glue->dv_query_device(sh->cdev->ctx, &dv_attr);
- if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
- if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
+ if (sh->device_attr.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
+ if (sh->device_attr.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
DRV_LOG(DEBUG, "enhanced MPW is supported");
mps = MLX5_MPW_ENHANCED;
} else {
@@ -1039,44 +1039,41 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mps = MLX5_MPW_DISABLED;
}
#ifdef HAVE_IBV_MLX5_MOD_SWP
- if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
- swp = dv_attr.sw_parsing_caps.sw_parsing_offloads;
+ if (sh->device_attr.comp_mask & MLX5DV_CONTEXT_MASK_SWP)
+ swp = sh->device_attr.sw_parsing_offloads;
DRV_LOG(DEBUG, "SWP support: %u", swp);
#endif
config->swp = swp & (MLX5_SW_PARSING_CAP | MLX5_SW_PARSING_CSUM_CAP |
MLX5_SW_PARSING_TSO_CAP);
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
- if (dv_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
- struct mlx5dv_striding_rq_caps mprq_caps =
- dv_attr.striding_rq_caps;
-
+ if (sh->device_attr.comp_mask & MLX5DV_CONTEXT_MASK_STRIDING_RQ) {
DRV_LOG(DEBUG, "\tmin_single_stride_log_num_of_bytes: %d",
- mprq_caps.min_single_stride_log_num_of_bytes);
+ sh->device_attr.min_single_stride_log_num_of_bytes);
DRV_LOG(DEBUG,
[PATCH v2 11/20] net/mlx5: share realtime timestamp configure
The realtime timestamp configure work for Linux as same as Windows.
This patch removes it to the function implemented in the folder shared
between the operating systems, removing the duplication.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 23 ++-
drivers/net/mlx5/mlx5.c| 37 ++
drivers/net/mlx5/mlx5.h| 3 +++
drivers/net/mlx5/windows/mlx5_os.c | 22 +-
4 files changed, 43 insertions(+), 42 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index d1bf89922e..bee055772b 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -1516,27 +1516,8 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
priv->dev_port);
}
}
- if (sh->cdev->config.devx) {
- uint32_t reg[MLX5_ST_SZ_DW(register_mtutc)];
-
- err = hca_attr->access_register_user ?
- mlx5_devx_cmd_register_read
- (sh->cdev->ctx, MLX5_REGISTER_ID_MTUTC, 0,
- reg, MLX5_ST_SZ_DW(register_mtutc)) : ENOTSUP;
- if (!err) {
- uint32_t ts_mode;
-
- /* MTUTC register is read successfully. */
- ts_mode = MLX5_GET(register_mtutc, reg,
- time_stamp_mode);
- if (ts_mode == MLX5_MTUTC_TIMESTAMP_MODE_REAL_TIME)
- config->rt_timestamp = 1;
- } else {
- /* Kernel does not support register reading. */
- if (hca_attr->dev_freq_khz == (NS_PER_S / MS_PER_S))
- config->rt_timestamp = 1;
- }
- }
+ if (sh->cdev->config.devx)
+ mlx5_rt_timestamp_config(sh, config, hca_attr);
/*
* If HW has bug working with tunnel packet decapsulation and
* scatter FCS, and decapsulation is needed, clear the hw_fcs_strip
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 34b3f3f137..4884198509 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1129,6 +1129,43 @@ mlx5_setup_tis(struct mlx5_dev_ctx_shared *sh)
return 0;
}
+/**
+ * Configure realtime timestamp format.
+ *
+ * @param sh
+ * Pointer to mlx5_dev_ctx_shared object.
+ * @param config
+ * Device configuration parameters.
+ * @param hca_attr
+ * Pointer to DevX HCA capabilities structure.
+ */
+void
+mlx5_rt_timestamp_config(struct mlx5_dev_ctx_shared *sh,
+struct mlx5_dev_config *config,
+struct mlx5_hca_attr *hca_attr)
+{
+ uint32_t dw_cnt = MLX5_ST_SZ_DW(register_mtutc);
+ uint32_t reg[dw_cnt];
+ int ret = ENOTSUP;
+
+ if (hca_attr->access_register_user)
+ ret = mlx5_devx_cmd_register_read(sh->cdev->ctx,
+ MLX5_REGISTER_ID_MTUTC, 0,
+ reg, dw_cnt);
+ if (!ret) {
+ uint32_t ts_mode;
+
+ /* MTUTC register is read successfully. */
+ ts_mode = MLX5_GET(register_mtutc, reg, time_stamp_mode);
+ if (ts_mode == MLX5_MTUTC_TIMESTAMP_MODE_REAL_TIME)
+ config->rt_timestamp = 1;
+ } else {
+ /* Kernel does not support register reading. */
+ if (hca_attr->dev_freq_khz == (NS_PER_S / MS_PER_S))
+ config->rt_timestamp = 1;
+ }
+}
+
/**
* Allocate shared device context. If there is multiport device the
* master and representors will share this context, if there is single
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 6bc7a34f60..0f90d757e9 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1517,6 +1517,9 @@ void mlx5_age_event_prepare(struct mlx5_dev_ctx_shared
*sh);
port_id < RTE_MAX_ETHPORTS; \
port_id = mlx5_eth_find_next(port_id + 1, dev))
int mlx5_args(struct mlx5_dev_config *config, struct rte_devargs *devargs);
+void mlx5_rt_timestamp_config(struct mlx5_dev_ctx_shared *sh,
+ struct mlx5_dev_config *config,
+ struct mlx5_hca_attr *hca_attr);
struct mlx5_dev_ctx_shared *
mlx5_alloc_shared_dev_ctx(const struct mlx5_dev_spawn_data *spawn,
const struct mlx5_dev_config *config);
diff --git a/drivers/net/mlx5/windows/mlx5_os.c
b/drivers/net/mlx5/windows/mlx5_os.c
index cca99f3eea..cf0819e013 100644
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_os.c
@@ -483,27 +483,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(DEBUG, "VLAN stripping is %ssupported",
[PATCH v2 10/20] common/mlx5: share VF checking function
The check if device is VF work for Linux as same as Windows.
This patch removes it to the function implemented in the folder shared
between the operating systems, removing the duplication.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/common/mlx5/mlx5_common.h | 15 +++
drivers/common/mlx5/mlx5_common_pci.c | 18 ++
drivers/common/mlx5/version.map | 1 +
drivers/net/mlx5/linux/mlx5_os.c | 18 +-
drivers/net/mlx5/windows/mlx5_os.c| 16 +---
5 files changed, 36 insertions(+), 32 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.h
b/drivers/common/mlx5/mlx5_common.h
index e8809844af..80f59c81fb 100644
--- a/drivers/common/mlx5/mlx5_common.h
+++ b/drivers/common/mlx5/mlx5_common.h
@@ -8,6 +8,7 @@
#include
#include
+#include
#include
#include
#include
@@ -487,6 +488,20 @@ __rte_internal
bool
mlx5_dev_is_pci(const struct rte_device *dev);
+/**
+ * Test PCI device is a VF device.
+ *
+ * @param pci_dev
+ * Pointer to PCI device.
+ *
+ * @return
+ * - True on PCI device is a VF device.
+ * - False otherwise.
+ */
+__rte_internal
+bool
+mlx5_dev_is_vf_pci(struct rte_pci_device *pci_dev);
+
__rte_internal
int
mlx5_dev_mempool_subscribe(struct mlx5_common_device *cdev);
diff --git a/drivers/common/mlx5/mlx5_common_pci.c
b/drivers/common/mlx5/mlx5_common_pci.c
index 458630351c..66626953f1 100644
--- a/drivers/common/mlx5/mlx5_common_pci.c
+++ b/drivers/common/mlx5/mlx5_common_pci.c
@@ -107,6 +107,24 @@ mlx5_dev_is_pci(const struct rte_device *dev)
return strcmp(dev->bus->name, "pci") == 0;
}
+bool
+mlx5_dev_is_vf_pci(struct rte_pci_device *pci_dev)
+{
+ switch (pci_dev->id.device_id) {
+ case PCI_DEVICE_ID_MELLANOX_CONNECTX4VF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTX6VF:
+ case PCI_DEVICE_ID_MELLANOX_CONNECTXVF:
+ return true;
+ default:
+ break;
+ }
+ return false;
+}
+
bool
mlx5_dev_pci_match(const struct mlx5_class_driver *drv,
const struct rte_device *dev)
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index 462b7cea5e..59ab434631 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -13,6 +13,7 @@ INTERNAL {
mlx5_common_verbs_dereg_mr; # WINDOWS_NO_EXPORT
mlx5_dev_is_pci;
+ mlx5_dev_is_vf_pci;
mlx5_dev_mempool_unregister;
mlx5_dev_mempool_subscribe;
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 2616668149..d1bf89922e 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -2100,7 +2100,6 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
struct rte_pci_device *pci_dev = RTE_DEV_TO_PCI(cdev->dev);
struct mlx5_dev_spawn_data *list = NULL;
struct mlx5_dev_config dev_config;
- unsigned int dev_config_vf;
struct rte_eth_devargs eth_da = *req_eth_da;
struct rte_pci_addr owner_pci = pci_dev->addr; /* Owner PF. */
struct mlx5_bond_info bond_info;
@@ -2421,21 +2420,6 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
* (i.e. master first, then representors from lowest to highest ID).
*/
qsort(list, ns, sizeof(*list), mlx5_dev_spawn_data_cmp);
- /* Device specific configuration. */
- switch (pci_dev->id.device_id) {
- case PCI_DEVICE_ID_MELLANOX_CONNECTX4VF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX4LXVF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX5VF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX5EXVF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX5BFVF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTX6VF:
- case PCI_DEVICE_ID_MELLANOX_CONNECTXVF:
- dev_config_vf = 1;
- break;
- default:
- dev_config_vf = 0;
- break;
- }
if (eth_da.type != RTE_ETH_REPRESENTOR_NONE) {
/* Set devargs default values. */
if (eth_da.nb_mh_controllers == 0) {
@@ -2459,7 +2443,7 @@ mlx5_os_pci_probe_pf(struct mlx5_common_device *cdev,
/* Default configuration. */
mlx5_os_config_default(&dev_config, &cdev->config);
- dev_config.vf = dev_config_vf;
+ dev_config.vf = mlx5_dev_is_vf_pci(pci_dev);
list[i].eth_dev = mlx5_dev_spawn(cdev->dev, &list[i],
&dev_config, ð_da);
if (!list[i].eth_dev) {
diff --git a/drivers/net/mlx5/windows/mlx5_os.c
b/drivers/net/mlx5/windows/mlx5_os.c
index 9d25dcfa40..cca99f3eea 100644
--- a/drivers/net/mlx5/windows/mlx5_os.c
+++ b/drivers/net/mlx5/windows/mlx5_o
[PATCH v2 12/20] net/mlx5: share counter config function
The mlx5_flow_counter_mode_config function exists for both Linux and
Windows with the same name and content.
This patch moves its implementation to the folder shared between the
operating systems, removing the duplication.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 40 --
drivers/net/mlx5/mlx5.c| 40 ++
drivers/net/mlx5/mlx5.h| 1 +
drivers/net/mlx5/windows/mlx5_os.c | 40 --
4 files changed, 41 insertions(+), 80 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index bee055772b..1ff2b8dc22 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -673,46 +673,6 @@ mlx5_init_once(void)
return ret;
}
-/**
- * DV flow counter mode detect and config.
- *
- * @param dev
- * Pointer to rte_eth_dev structure.
- *
- */
-static void
-mlx5_flow_counter_mode_config(struct rte_eth_dev *dev __rte_unused)
-{
-#ifdef HAVE_IBV_FLOW_DV_SUPPORT
- struct mlx5_priv *priv = dev->data->dev_private;
- struct mlx5_dev_ctx_shared *sh = priv->sh;
- struct mlx5_hca_attr *hca_attr = &sh->cdev->config.hca_attr;
- bool fallback;
-
-#ifndef HAVE_IBV_DEVX_ASYNC
- fallback = true;
-#else
- fallback = false;
- if (!sh->cdev->config.devx || !priv->config.dv_flow_en ||
- !hca_attr->flow_counters_dump ||
- !(hca_attr->flow_counter_bulk_alloc_bitmap & 0x4) ||
- (mlx5_flow_dv_discover_counter_offset_support(dev) == -ENOTSUP))
- fallback = true;
-#endif
- if (fallback)
- DRV_LOG(INFO, "Use fall-back DV counter management. Flow "
- "counter dump:%d, bulk_alloc_bitmap:0x%hhx.",
- hca_attr->flow_counters_dump,
- hca_attr->flow_counter_bulk_alloc_bitmap);
- /* Initialize fallback mode only on the port initializes sh. */
- if (sh->refcnt == 1)
- sh->cmng.counter_fallback = fallback;
- else if (fallback != sh->cmng.counter_fallback)
- DRV_LOG(WARNING, "Port %d in sh has different fallback mode "
- "with others:%d.", PORT_ID(priv), fallback);
-#endif
-}
-
/**
* DR flow drop action support detect.
*
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 4884198509..531916f3a5 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -513,6 +513,46 @@ mlx5_flow_aging_init(struct mlx5_dev_ctx_shared *sh)
}
}
+/**
+ * DV flow counter mode detect and config.
+ *
+ * @param dev
+ * Pointer to rte_eth_dev structure.
+ *
+ */
+void
+mlx5_flow_counter_mode_config(struct rte_eth_dev *dev __rte_unused)
+{
+#ifdef HAVE_IBV_FLOW_DV_SUPPORT
+ struct mlx5_priv *priv = dev->data->dev_private;
+ struct mlx5_dev_ctx_shared *sh = priv->sh;
+ struct mlx5_hca_attr *hca_attr = &sh->cdev->config.hca_attr;
+ bool fallback;
+
+#ifndef HAVE_IBV_DEVX_ASYNC
+ fallback = true;
+#else
+ fallback = false;
+ if (!sh->cdev->config.devx || !priv->config.dv_flow_en ||
+ !hca_attr->flow_counters_dump ||
+ !(hca_attr->flow_counter_bulk_alloc_bitmap & 0x4) ||
+ (mlx5_flow_dv_discover_counter_offset_support(dev) == -ENOTSUP))
+ fallback = true;
+#endif
+ if (fallback)
+ DRV_LOG(INFO, "Use fall-back DV counter management. Flow "
+ "counter dump:%d, bulk_alloc_bitmap:0x%hhx.",
+ hca_attr->flow_counters_dump,
+ hca_attr->flow_counter_bulk_alloc_bitmap);
+ /* Initialize fallback mode only on the port initializes sh. */
+ if (sh->refcnt == 1)
+ sh->cmng.counter_fallback = fallback;
+ else if (fallback != sh->cmng.counter_fallback)
+ DRV_LOG(WARNING, "Port %d in sh has different fallback mode "
+ "with others:%d.", PORT_ID(priv), fallback);
+#endif
+}
+
/**
* Initialize the counters management structure.
*
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 0f90d757e9..d69b6a357b 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1535,6 +1535,7 @@ int mlx5_dev_check_sibling_config(struct
mlx5_dev_ctx_shared *sh,
struct rte_device *dpdk_dev);
bool mlx5_flex_parser_ecpri_exist(struct rte_eth_dev *dev);
int mlx5_flex_parser_ecpri_alloc(struct rte_eth_dev *dev);
+void mlx5_flow_counter_mode_config(struct rte_eth_dev *dev);
int mlx5_flow_aso_age_mng_init(struct mlx5_dev_ctx_shared *sh);
int mlx5_aso_flow_mtrs_mng_init(struct mlx5_dev_ctx_shared *sh);
int mlx5_flow_aso_ct_mng_init(struct mlx5_dev_ctx_shared *sh);
diff --git a/drivers/net/mlx5/windows/mlx5_os.c
b/drivers/net/mlx5/windows/mlx5_os.c
index cf0819e013..e509c34083 100644
--- a/drivers/net/mlx5/windows
[PATCH v2 13/20] net/mlx5: add E-switch mode flag
This patch adds in SH structure a flag which indicates whether is
E-Switch mode.
When configure "dv_esw_en" from devargs, it is enabled only when is
E-switch mode. So, since dv_esw_en has been configure, it is enough to
check if "dv_esw_en" is valid.
This patch also removes E-Switch mode check when "dv_esw_en" is checked
too.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 14 +-
drivers/net/mlx5/mlx5.c | 1 +
drivers/net/mlx5/mlx5.h | 1 +
drivers/net/mlx5/mlx5_ethdev.c | 4 ++--
drivers/net/mlx5/mlx5_flow_dv.c | 12 +++-
drivers/net/mlx5/mlx5_trigger.c | 5 ++---
6 files changed, 14 insertions(+), 23 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 1ff2b8dc22..69ba2aaf88 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -951,10 +951,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
if (!sh)
return NULL;
/* Update final values for devargs before check sibling config. */
- if (config->dv_miss_info) {
- if (switch_info->master || switch_info->representor)
- config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
- }
#if !defined(HAVE_IBV_FLOW_DV_SUPPORT) || !defined(HAVE_MLX5DV_DR)
if (config->dv_flow_en) {
DRV_LOG(WARNING, "DV flow is not supported.");
@@ -962,12 +958,13 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
#endif
#ifdef HAVE_MLX5DV_DR_ESWITCH
- if (!(hca_attr->eswitch_manager && config->dv_flow_en &&
- (switch_info->representor || switch_info->master)))
+ if (!(hca_attr->eswitch_manager && config->dv_flow_en && sh->esw_mode))
config->dv_esw_en = 0;
#else
config->dv_esw_en = 0;
#endif
+ if (config->dv_miss_info && config->dv_esw_en)
+ config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
if (!config->dv_esw_en &&
config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
DRV_LOG(WARNING,
@@ -1133,7 +1130,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
* register to match on vport index. The engaged part of metadata
* register is defined by mask.
*/
- if (switch_info->representor || switch_info->master) {
+ if (sh->esw_mode) {
err = mlx5_glue->devx_port_query(sh->cdev->ctx,
spawn->phys_port,
&vport_info);
@@ -1164,8 +1161,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
}
if (vport_info.query_flags & MLX5_PORT_QUERY_VPORT) {
priv->vport_id = vport_info.vport_id;
- } else if (spawn->pf_bond >= 0 &&
- (switch_info->representor || switch_info->master)) {
+ } else if (spawn->pf_bond >= 0 && sh->esw_mode) {
DRV_LOG(ERR,
"Cannot deduce vport index for port %d on bonding
device %s",
spawn->phys_port, spawn->phys_dev_name);
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index 531916f3a5..b26632d249 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1259,6 +1259,7 @@ mlx5_alloc_shared_dev_ctx(const struct
mlx5_dev_spawn_data *spawn,
pthread_mutex_init(&sh->txpp.mutex, NULL);
sh->numa_node = spawn->cdev->dev->numa_node;
sh->cdev = spawn->cdev;
+ sh->esw_mode = !!(spawn->info.master || spawn->info.representor);
if (spawn->bond_info)
sh->bond = *spawn->bond_info;
err = mlx5_os_get_dev_attr(sh->cdev, &sh->device_attr);
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index d69b6a357b..a713e61572 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1146,6 +1146,7 @@ struct mlx5_flex_item {
struct mlx5_dev_ctx_shared {
LIST_ENTRY(mlx5_dev_ctx_shared) next;
uint32_t refcnt;
+ uint32_t esw_mode:1; /* Whether is E-Switch mode. */
uint32_t flow_hit_aso_en:1; /* Flow Hit ASO is supported. */
uint32_t steering_format_version:4;
/* Indicates the device steering logic format. */
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 801c467bba..06d5acb75f 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -672,7 +672,7 @@ mlx5_port_to_eswitch_info(uint16_t port, bool valid)
}
dev = &rte_eth_devices[port];
priv = dev->data->dev_private;
- if (!(priv->representor || priv->master)) {
+ if (!priv->sh->esw_mode) {
rte_errno = EINVAL;
return NULL;
}
@@ -699,7 +699,7 @@ mlx5_dev_to_eswitch_info(struct rte_eth_dev *dev)
struct mlx5_priv *priv;
priv = dev->data->dev_private;
- if (!(priv->representor || priv->master)) {
+ if (!priv->sh->esw_mode) {
[PATCH v2 14/20] net/mlx5: rearrange device attribute structure
Rearrange the mlx5_os_get_dev_attr() function in such a way that it
first executes the queries and only then updates the fields.
In addition, it changed its name in preparation for expanding its
operations to configure the capabilities inside it.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c| 124 +---
drivers/net/mlx5/linux/mlx5_verbs.c | 5 +-
drivers/net/mlx5/mlx5.c | 4 +-
drivers/net/mlx5/mlx5.h | 56 ++---
drivers/net/mlx5/mlx5_devx.c| 2 +-
drivers/net/mlx5/mlx5_ethdev.c | 5 +-
drivers/net/mlx5/mlx5_trigger.c | 8 +-
drivers/net/mlx5/mlx5_txq.c | 18 ++--
drivers/net/mlx5/windows/mlx5_os.c | 67 ++-
9 files changed, 128 insertions(+), 161 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 69ba2aaf88..f0aa0f4164 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -131,46 +131,25 @@ mlx5_os_set_nonblock_channel_fd(int fd)
* with out parameter of type 'struct ibv_device_attr_ex *'. Then fill in mlx5
* device attributes from the glue out parameter.
*
- * @param cdev
- * Pointer to mlx5 device.
- *
- * @param device_attr
- * Pointer to mlx5 device attributes.
+ * @param sh
+ * Pointer to shared device context.
*
* @return
* 0 on success, a negative errno value otherwise and rte_errno is set.
*/
int
-mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
-struct mlx5_dev_attr *device_attr)
+mlx5_os_capabilities_prepare(struct mlx5_dev_ctx_shared *sh)
{
int err;
- struct ibv_context *ctx = cdev->ctx;
- struct ibv_device_attr_ex attr_ex;
+ struct ibv_context *ctx = sh->cdev->ctx;
+ struct ibv_device_attr_ex attr_ex = { .comp_mask = 0 };
+ struct mlx5dv_context dv_attr = { .comp_mask = 0 };
- memset(device_attr, 0, sizeof(*device_attr));
err = mlx5_glue->query_device_ex(ctx, NULL, &attr_ex);
if (err) {
rte_errno = errno;
return -rte_errno;
}
- device_attr->device_cap_flags_ex = attr_ex.device_cap_flags_ex;
- device_attr->max_qp_wr = attr_ex.orig_attr.max_qp_wr;
- device_attr->max_sge = attr_ex.orig_attr.max_sge;
- device_attr->max_cq = attr_ex.orig_attr.max_cq;
- device_attr->max_cqe = attr_ex.orig_attr.max_cqe;
- device_attr->max_mr = attr_ex.orig_attr.max_mr;
- device_attr->max_pd = attr_ex.orig_attr.max_pd;
- device_attr->max_qp = attr_ex.orig_attr.max_qp;
- device_attr->max_srq = attr_ex.orig_attr.max_srq;
- device_attr->max_srq_wr = attr_ex.orig_attr.max_srq_wr;
- device_attr->raw_packet_caps = attr_ex.raw_packet_caps;
- device_attr->max_rwq_indirection_table_size =
- attr_ex.rss_caps.max_rwq_indirection_table_size;
- device_attr->max_tso = attr_ex.tso_caps.max_tso;
- device_attr->tso_supported_qpts = attr_ex.tso_caps.supported_qpts;
-
- struct mlx5dv_context dv_attr = { .comp_mask = 0 };
#ifdef HAVE_IBV_MLX5_MOD_SWP
dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_SWP;
#endif
@@ -185,31 +164,40 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
rte_errno = errno;
return -rte_errno;
}
-
- device_attr->flags = dv_attr.flags;
- device_attr->comp_mask = dv_attr.comp_mask;
+ memset(&sh->dev_cap, 0, sizeof(struct mlx5_dev_cap));
+ sh->dev_cap.device_cap_flags_ex = attr_ex.device_cap_flags_ex;
+ sh->dev_cap.max_qp_wr = attr_ex.orig_attr.max_qp_wr;
+ sh->dev_cap.max_sge = attr_ex.orig_attr.max_sge;
+ sh->dev_cap.max_cq = attr_ex.orig_attr.max_cq;
+ sh->dev_cap.max_qp = attr_ex.orig_attr.max_qp;
+ sh->dev_cap.raw_packet_caps = attr_ex.raw_packet_caps;
+ sh->dev_cap.max_rwq_indirection_table_size =
+ attr_ex.rss_caps.max_rwq_indirection_table_size;
+ sh->dev_cap.max_tso = attr_ex.tso_caps.max_tso;
+ sh->dev_cap.tso_supported_qpts = attr_ex.tso_caps.supported_qpts;
+ strlcpy(sh->dev_cap.fw_ver, attr_ex.orig_attr.fw_ver,
+ sizeof(sh->dev_cap.fw_ver));
+ sh->dev_cap.flags = dv_attr.flags;
+ sh->dev_cap.comp_mask = dv_attr.comp_mask;
#ifdef HAVE_IBV_MLX5_MOD_SWP
- device_attr->sw_parsing_offloads =
+ sh->dev_cap.sw_parsing_offloads =
dv_attr.sw_parsing_caps.sw_parsing_offloads;
#endif
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
- device_attr->min_single_stride_log_num_of_bytes =
+ sh->dev_cap.min_single_stride_log_num_of_bytes =
dv_attr.striding_rq_caps.min_single_stride_log_num_of_bytes;
- device_attr->max_single_stride_log_num_of_bytes =
+ sh->dev_cap.max_single_stride_log_num_of_bytes =
dv_attr.striding_rq_caps.max_single_stride_log_num_of_bytes;
- device_attr->min_single_wqe_l
[PATCH v2 17/20] net/mlx5: using function to detect operation by DevX
Add inline function indicating whether HW objects operations can be
created by DevX. It makes the code more readable.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 6 ++
drivers/net/mlx5/mlx5.h | 24
drivers/net/mlx5/mlx5_ethdev.c | 3 +--
drivers/net/mlx5/mlx5_trigger.c | 3 +--
4 files changed, 28 insertions(+), 8 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 7ee76d54bd..c1eda00899 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -370,8 +370,7 @@ mlx5_os_capabilities_prepare(struct mlx5_dev_ctx_shared *sh)
sh->dev_cap.txpp_en = 0;
#endif
/* Check for LRO support. */
- if (sh->dev_cap.dest_tir && sh->dev_cap.dv_flow_en &&
- hca_attr->lro_cap) {
+ if (mlx5_devx_obj_ops_en(sh) && hca_attr->lro_cap) {
/* TBD check tunnel lro caps. */
sh->dev_cap.lro_supported = 1;
DRV_LOG(DEBUG, "Device supports LRO.");
@@ -1550,8 +1549,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
if (mlx5_flex_item_port_init(eth_dev) < 0)
goto error;
}
- if (sh->cdev->config.devx && sh->config.dv_flow_en &&
- sh->dev_cap.dest_tir) {
+ if (mlx5_devx_obj_ops_en(sh)) {
priv->obj_ops = devx_obj_ops;
mlx5_queue_counter_id_prepare(eth_dev);
priv->obj_ops.lb_dummy_queue_create =
diff --git a/drivers/net/mlx5/mlx5.h b/drivers/net/mlx5/mlx5.h
index 5ca48ef68f..46fa5131a7 100644
--- a/drivers/net/mlx5/mlx5.h
+++ b/drivers/net/mlx5/mlx5.h
@@ -1496,6 +1496,30 @@ enum dr_dump_rec_type {
DR_DUMP_REC_TYPE_PMD_COUNTER = 4430,
};
+/**
+ * Indicates whether HW objects operations can be created by DevX.
+ *
+ * This function is used for both:
+ * Before creation - deciding whether to create HW objects operations by DevX.
+ * After creation - indicator if HW objects operations were created by DevX.
+ *
+ * @param sh
+ * Pointer to shared device context.
+ *
+ * @return
+ * True if HW objects were created by DevX, False otherwise.
+ */
+static inline bool
+mlx5_devx_obj_ops_en(struct mlx5_dev_ctx_shared *sh)
+{
+ /*
+* When advanced DR API is available and DV flow is supported and
+* DevX is supported, HW objects operations are created by DevX.
+*/
+ return (sh->cdev->config.devx && sh->config.dv_flow_en &&
+ sh->dev_cap.dest_tir);
+}
+
/* mlx5.c */
int mlx5_getenv_int(const char *);
diff --git a/drivers/net/mlx5/mlx5_ethdev.c b/drivers/net/mlx5/mlx5_ethdev.c
index 9e478db8df..d637dee98d 100644
--- a/drivers/net/mlx5/mlx5_ethdev.c
+++ b/drivers/net/mlx5/mlx5_ethdev.c
@@ -721,8 +721,7 @@ mlx5_hairpin_cap_get(struct rte_eth_dev *dev, struct
rte_eth_hairpin_cap *cap)
{
struct mlx5_priv *priv = dev->data->dev_private;
- if (!priv->sh->cdev->config.devx || !priv->sh->dev_cap.dest_tir ||
- !priv->sh->config.dv_flow_en) {
+ if (!mlx5_devx_obj_ops_en(priv->sh)) {
rte_errno = ENOTSUP;
return -rte_errno;
}
diff --git a/drivers/net/mlx5/mlx5_trigger.c b/drivers/net/mlx5/mlx5_trigger.c
index a67a6af728..74c3bc8a13 100644
--- a/drivers/net/mlx5/mlx5_trigger.c
+++ b/drivers/net/mlx5/mlx5_trigger.c
@@ -1104,8 +1104,7 @@ mlx5_dev_start(struct rte_eth_dev *dev)
dev->data->port_id, strerror(rte_errno));
goto error;
}
- if ((priv->sh->cdev->config.devx && priv->sh->config.dv_flow_en &&
-priv->sh->dev_cap.dest_tir) &&
+ if (mlx5_devx_obj_ops_en(priv->sh) &&
priv->obj_ops.lb_dummy_queue_create) {
ret = priv->obj_ops.lb_dummy_queue_create(dev);
if (ret)
--
2.25.1
[PATCH v2 16/20] net/mlx5: add share device context config structure
Add configuration structure for shared device context. This structure
contains all configurations coming from devargs which oriented to
device. It is a field of shared device context (SH) structure, and is
updated once in mlx5_alloc_shared_dev_ctx() function.
This structure cannot be changed when probing again, so add function to
prevent it. The mlx5_probe_again_args_validate() function creates a
temporary IB context configure structure according to new devargs
attached in probing again, then checks the match between the temporary
structure and the existing IB context configure structure.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 95 ++
drivers/net/mlx5/mlx5.c| 453 +
drivers/net/mlx5/mlx5.h| 43 +--
drivers/net/mlx5/mlx5_ethdev.c | 3 +-
drivers/net/mlx5/mlx5_flow.c | 30 +-
drivers/net/mlx5/mlx5_flow.h | 2 +-
drivers/net/mlx5/mlx5_flow_dv.c| 45 +--
drivers/net/mlx5/mlx5_flow_meter.c | 10 +-
drivers/net/mlx5/mlx5_rxq.c| 7 +-
drivers/net/mlx5/mlx5_trigger.c| 10 +-
drivers/net/mlx5/mlx5_txpp.c | 12 +-
drivers/net/mlx5/mlx5_txq.c| 2 +-
drivers/net/mlx5/windows/mlx5_os.c | 35 +--
13 files changed, 457 insertions(+), 290 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 5d2c9b9c8b..7ee76d54bd 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -436,7 +436,7 @@ __mlx5_discovery_misc5_cap(struct mlx5_priv *priv)
dv_attr.priority = 3;
#ifdef HAVE_MLX5DV_DR_ESWITCH
void *misc2_m;
- if (priv->config.dv_esw_en) {
+ if (priv->sh->config.dv_esw_en) {
/* FDB enabled reg_c_0 */
dv_attr.match_criteria_enable |=
(1 << MLX5_MATCH_CRITERIA_ENABLE_MISC2_BIT);
@@ -557,7 +557,7 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
}
sh->tx_domain = domain;
#ifdef HAVE_MLX5DV_DR_ESWITCH
- if (priv->config.dv_esw_en) {
+ if (sh->config.dv_esw_en) {
domain = mlx5_glue->dr_create_domain(sh->cdev->ctx,
MLX5DV_DR_DOMAIN_TYPE_FDB);
if (!domain) {
@@ -579,20 +579,20 @@ mlx5_alloc_shared_dr(struct mlx5_priv *priv)
goto error;
}
#endif
- if (!sh->tunnel_hub && priv->config.dv_miss_info)
+ if (!sh->tunnel_hub && sh->config.dv_miss_info)
err = mlx5_alloc_tunnel_hub(sh);
if (err) {
DRV_LOG(ERR, "mlx5_alloc_tunnel_hub failed err=%d", err);
goto error;
}
- if (priv->config.reclaim_mode == MLX5_RCM_AGGR) {
+ if (sh->config.reclaim_mode == MLX5_RCM_AGGR) {
mlx5_glue->dr_reclaim_domain_memory(sh->rx_domain, 1);
mlx5_glue->dr_reclaim_domain_memory(sh->tx_domain, 1);
if (sh->fdb_domain)
mlx5_glue->dr_reclaim_domain_memory(sh->fdb_domain, 1);
}
sh->pop_vlan_action = mlx5_glue->dr_create_flow_action_pop_vlan();
- if (!priv->config.allow_duplicate_pattern) {
+ if (!sh->config.allow_duplicate_pattern) {
#ifndef HAVE_MLX5_DR_ALLOW_DUPLICATE
DRV_LOG(WARNING, "Disallow duplicate pattern is not supported -
maybe old rdma-core version?");
#endif
@@ -859,7 +859,7 @@ mlx5_flow_drop_action_config(struct rte_eth_dev *dev
__rte_unused)
#ifdef HAVE_MLX5DV_DR
struct mlx5_priv *priv = dev->data->dev_private;
- if (!priv->config.dv_flow_en || !priv->sh->dr_drop_action)
+ if (!priv->sh->config.dv_flow_en || !priv->sh->dr_drop_action)
return;
/**
* DR supports drop action placeholder when it is supported;
@@ -1115,31 +1115,9 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
strerror(rte_errno));
return NULL;
}
- sh = mlx5_alloc_shared_dev_ctx(spawn, config);
+ sh = mlx5_alloc_shared_dev_ctx(spawn);
if (!sh)
return NULL;
- /* Update final values for devargs before check sibling config. */
- if (config->dv_flow_en && !sh->dev_cap.dv_flow_en) {
- DRV_LOG(WARNING, "DV flow is not supported.");
- config->dv_flow_en = 0;
- }
- if (config->dv_esw_en && !sh->dev_cap.dv_esw_en) {
- DRV_LOG(WARNING, "E-Switch DV flow is not supported.");
- config->dv_esw_en = 0;
- }
- if (config->dv_miss_info && config->dv_esw_en)
- config->dv_xmeta_en = MLX5_XMETA_MODE_META16;
- if (!config->dv_esw_en &&
- config->dv_xmeta_en != MLX5_XMETA_MODE_LEGACY) {
- DRV_LOG(WARNING,
- "Metadata mode %u is not supported (no E-Switch).",
- config->dv_xmeta_en);
- config->dv_xmeta_en = MLX5_XM
[PATCH v2 00/20] mlx5: refactor devargs management
v2: rebase + fix coverity issue. These patches rearrange the management of the devargs on two different levels. The first splits the net driver's devargs into two categories, device-dependent devargs and port-dependent devargs. Arguments that depend on the device are updated once in the creation of the shared device context structure, and do not change even if the user has sent new devargs in the probe again. In contrast, the arguments that depend on the port are updated separately for each port. The second layer deals with the parsing of devargs in the common driver. The common driver once parses the devargs into a dictionary, then sends it to all the drivers that will use it during the their probing. Each driver updates within dictionary which keys it has used, then the common driver checks the updated dictionary and reports about unknown devargs. Michael Baum (20): net/mlx5: fix wrong check sibling device config mismatch net/mlx5: fix ineffective metadata argument adjustment net/mlx5: fix wrong place of ASO CT object release net/mlx5: fix inconsistency errno update in SH creation net/mlx5: remove declaration duplications net/mlx5: remove checking devargs duplication net/mlx5: remove HCA attr structure duplication net/mlx5: remove DevX flag duplication net/mlx5: remove Verbs query device duplication common/mlx5: share VF checking function net/mlx5: share realtime timestamp configure net/mlx5: share counter config function net/mlx5: add E-switch mode flag net/mlx5: rearrange device attribute structure net/mlx5: concentrate all device configurations net/mlx5: add share device context config structure net/mlx5: using function to detect operation by DevX net/mlx5: separate per port configuration common/mlx5: add check for common devargs in probing again common/mlx5: refactor devargs management drivers/common/mlx5/mlx5_common.c | 345 +++-- drivers/common/mlx5/mlx5_common.h | 51 +- drivers/common/mlx5/mlx5_common_pci.c | 18 + drivers/common/mlx5/version.map | 3 + drivers/compress/mlx5/mlx5_compress.c | 38 +- drivers/crypto/mlx5/mlx5_crypto.c | 39 +- drivers/net/mlx5/linux/mlx5_flow_os.c | 3 +- drivers/net/mlx5/linux/mlx5_os.c| 887 +--- drivers/net/mlx5/linux/mlx5_verbs.c | 9 +- drivers/net/mlx5/linux/mlx5_vlan_os.c | 3 +- drivers/net/mlx5/mlx5.c | 872 +-- drivers/net/mlx5/mlx5.h | 216 +++--- drivers/net/mlx5/mlx5_devx.c| 19 +- drivers/net/mlx5/mlx5_ethdev.c | 31 +- drivers/net/mlx5/mlx5_flow.c| 50 +- drivers/net/mlx5/mlx5_flow.h| 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 93 ++- drivers/net/mlx5/mlx5_flow_flex.c | 4 +- drivers/net/mlx5/mlx5_flow_meter.c | 14 +- drivers/net/mlx5/mlx5_rxmode.c | 8 +- drivers/net/mlx5/mlx5_rxq.c | 49 +- drivers/net/mlx5/mlx5_trigger.c | 35 +- drivers/net/mlx5/mlx5_tx.c | 2 +- drivers/net/mlx5/mlx5_txpp.c| 14 +- drivers/net/mlx5/mlx5_txq.c | 62 +- drivers/net/mlx5/mlx5_vlan.c| 4 +- drivers/net/mlx5/windows/mlx5_flow_os.c | 2 +- drivers/net/mlx5/windows/mlx5_os.c | 342 +++-- drivers/regex/mlx5/mlx5_regex.c | 3 +- drivers/vdpa/mlx5/mlx5_vdpa.c | 32 +- 30 files changed, 1842 insertions(+), 1408 deletions(-) -- 2.25.1
[PATCH v2 19/20] common/mlx5: add check for common devargs in probing again
MLX5 common driver supports probing again in two scenarios:
- Add new driver under existing device. common probe function gets
it in devargs, then calls the requested driver's probe function
(regardless of the driver's own support in probing again) with the
existing device as parameter.
- Transfer the probing again support of the drivers themselves
(currently only net). In this scenario, the existing device is sent
as a parameter to the existing driver's probe too.
In both cases it gets a new set of arguments that do not necessarily
match the configured arguments in the existing device.
Some of the arguments belong to the configuration of the existing
device, so they can't be updated in the probing again. On the other
hand, there are arguments that belong to a specific driver or specific
port and might get a new value in the probing again.
The user might generate any argument he wants in probing again, but when
he generates arguments belonging to the common device configuration, it
does not affect.
This patch adds an explicit check for the devargs belonging to the
common device configuration. If there is no match to the existing
configuration, it returns an error.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/common/mlx5/mlx5_common.c | 100 ++
1 file changed, 100 insertions(+)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index 47a541f5ef..f74d27e74d 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -613,6 +613,86 @@ mlx5_common_dev_create(struct rte_device *eal_dev,
uint32_t classes)
return cdev;
}
+/**
+ * Validate common devargs when probing again.
+ *
+ * When common device probing again, it cannot change its configurations.
+ * If user ask non compatible configurations in devargs, it is error.
+ * This function checks the match between:
+ * - Common device configurations requested by probe again devargs.
+ * - Existing common device configurations.
+ *
+ * @param cdev
+ * Pointer to mlx5 device structure.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_common_probe_again_args_validate(struct mlx5_common_device *cdev)
+{
+ struct mlx5_common_dev_config *config;
+ int ret;
+
+ /* Secondary process should not handle devargs. */
+ if (rte_eal_process_type() != RTE_PROC_PRIMARY)
+ return 0;
+ /* Probe again doesn't have to generate devargs. */
+ if (cdev->dev->devargs == NULL)
+ return 0;
+ config = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
+sizeof(struct mlx5_common_dev_config),
+RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
+ if (config == NULL) {
+ rte_errno = -ENOMEM;
+ return -rte_errno;
+ }
+ /*
+* Creates a temporary common configure structure according to new
+* devargs attached in probing again.
+*/
+ ret = mlx5_common_config_get(cdev->dev->devargs, config);
+ if (ret) {
+ DRV_LOG(ERR, "Failed to process device configure: %s",
+ strerror(rte_errno));
+ mlx5_free(config);
+ return ret;
+ }
+ /*
+* Checks the match between the temporary structure and the existing
+* common device structure.
+*/
+ if (cdev->config.mr_ext_memseg_en ^ config->mr_ext_memseg_en) {
+ DRV_LOG(ERR, "\"mr_ext_memseg_en\" "
+ "configuration mismatch for device %s.",
+ cdev->dev->name);
+ goto error;
+ }
+ if (cdev->config.mr_mempool_reg_en ^ config->mr_mempool_reg_en) {
+ DRV_LOG(ERR, "\"mr_mempool_reg_en\" "
+ "configuration mismatch for device %s.",
+ cdev->dev->name);
+ goto error;
+ }
+ if (cdev->config.sys_mem_en ^ config->sys_mem_en) {
+ DRV_LOG(ERR,
+ "\"sys_mem_en\" configuration mismatch for device %s.",
+ cdev->dev->name);
+ goto error;
+ }
+ if (cdev->config.dbnc ^ config->dbnc) {
+ DRV_LOG(ERR, "\"dbnc\" configuration mismatch for device %s.",
+ cdev->dev->name);
+ goto error;
+ }
+ mlx5_free(config);
+ return 0;
+error:
+ mlx5_free(config);
+ rte_errno = EINVAL;
+ return -rte_errno;
+}
+
static int
drivers_remove(struct mlx5_common_device *cdev, uint32_t enabled_classes)
{
@@ -699,12 +779,32 @@ mlx5_common_dev_probe(struct rte_device *eal_dev)
if (classes == 0)
/* Default to net class. */
classes = MLX5_CLASS_ETH;
+ /*
+* MLX5 common driver supports probing again in two scenarios:
+* - Add new
[PATCH v2 20/20] common/mlx5: refactor devargs management
Improve the devargs handling in two aspects:
- Parse the devargs string only once.
- Return error and report for unknown keys.
The common driver parses once the devargs string into a dictionary, then
provides it to all the drivers' probe. Each driver updates within it
which keys it has used, then common driver receives the updated
dictionary and reports about unknown devargs.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/common/mlx5/mlx5_common.c | 255 +-
drivers/common/mlx5/mlx5_common.h | 36 +++-
drivers/common/mlx5/version.map | 2 +
drivers/compress/mlx5/mlx5_compress.c | 38 ++--
drivers/crypto/mlx5/mlx5_crypto.c | 39 ++--
drivers/net/mlx5/linux/mlx5_os.c | 47 +++--
drivers/net/mlx5/mlx5.c | 212 ++---
drivers/net/mlx5/mlx5.h | 14 +-
drivers/net/mlx5/windows/mlx5_os.c| 18 +-
drivers/regex/mlx5/mlx5_regex.c | 3 +-
drivers/vdpa/mlx5/mlx5_vdpa.c | 32 ++--
11 files changed, 498 insertions(+), 198 deletions(-)
diff --git a/drivers/common/mlx5/mlx5_common.c
b/drivers/common/mlx5/mlx5_common.c
index f74d27e74d..96906d3f39 100644
--- a/drivers/common/mlx5/mlx5_common.c
+++ b/drivers/common/mlx5/mlx5_common.c
@@ -21,6 +21,24 @@
uint8_t haswell_broadwell_cpu;
+/* Driver type key for new device global syntax. */
+#define MLX5_DRIVER_KEY "driver"
+
+/* Enable extending memsegs when creating a MR. */
+#define MLX5_MR_EXT_MEMSEG_EN "mr_ext_memseg_en"
+
+/* Device parameter to configure implicit registration of mempool memory. */
+#define MLX5_MR_MEMPOOL_REG_EN "mr_mempool_reg_en"
+
+/* The default memory allocator used in PMD. */
+#define MLX5_SYS_MEM_EN "sys_mem_en"
+
+/*
+ * Device parameter to force doorbell register mapping
+ * to non-cahed region eliminating the extra write memory barrier.
+ */
+#define MLX5_TX_DB_NC "tx_db_nc"
+
/* In case this is an x86_64 intel processor to check if
* we should use relaxed ordering.
*/
@@ -92,6 +110,122 @@ driver_get(uint32_t class)
return NULL;
}
+int
+mlx5_kvargs_process(struct mlx5_kvargs_ctrl *mkvlist, const char *const keys[],
+ arg_handler_t handler, void *opaque_arg)
+{
+ const struct rte_kvargs_pair *pair;
+ uint32_t i, j;
+
+ MLX5_ASSERT(mkvlist && mkvlist->kvlist);
+ /* Process parameters. */
+ for (i = 0; i < mkvlist->kvlist->count; i++) {
+ pair = &mkvlist->kvlist->pairs[i];
+ for (j = 0; keys[j] != NULL; ++j) {
+ if (strcmp(pair->key, keys[j]) != 0)
+ continue;
+ if ((*handler)(pair->key, pair->value, opaque_arg) < 0)
+ return -1;
+ mkvlist->is_used[i] = true;
+ break;
+ }
+ }
+ return 0;
+}
+
+/**
+ * Prepare a mlx5 kvargs control.
+ *
+ * @param[out] mkvlist
+ * Pointer to mlx5 kvargs control.
+ * @param[in] devargs
+ * The input string containing the key/value associations.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static int
+mlx5_kvargs_prepare(struct mlx5_kvargs_ctrl *mkvlist,
+ const struct rte_devargs *devargs)
+{
+ struct rte_kvargs *kvlist;
+ uint32_t i;
+
+ if (devargs == NULL)
+ return 0;
+ kvlist = rte_kvargs_parse(devargs->args, NULL);
+ if (kvlist == NULL) {
+ rte_errno = EINVAL;
+ return -rte_errno;
+ }
+ /*
+* rte_kvargs_parse enable key without value, in mlx5 PMDs we disable
+* this syntax.
+*/
+ for (i = 0; i < kvlist->count; i++) {
+ const struct rte_kvargs_pair *pair = &kvlist->pairs[i];
+ if (pair->value == NULL || *(pair->value) == '\0') {
+ DRV_LOG(ERR, "Key %s is missing value.", pair->key);
+ rte_kvargs_free(kvlist);
+ rte_errno = EINVAL;
+ return -rte_errno;
+ }
+ }
+ /* Makes sure all devargs used array is false. */
+ memset(mkvlist, 0, sizeof(*mkvlist));
+ mkvlist->kvlist = kvlist;
+ DRV_LOG(DEBUG, "Parse successfully %u devargs.",
+ mkvlist->kvlist->count);
+ return 0;
+}
+
+/**
+ * Release a mlx5 kvargs control.
+ *
+ * @param[out] mkvlist
+ * Pointer to mlx5 kvargs control.
+ */
+static void
+mlx5_kvargs_release(struct mlx5_kvargs_ctrl *mkvlist)
+{
+ if (mkvlist == NULL)
+ return;
+ rte_kvargs_free(mkvlist->kvlist);
+ memset(mkvlist, 0, sizeof(*mkvlist));
+}
+
+/**
+ * Validate device arguments list.
+ * It report about the first unknown parameter.
+ *
+ * @param[in] mkvlist
+ * Pointer to mlx5 kvargs control.
+ *
+ * @return
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
+ */
+static in
[PATCH v2 04/20] net/mlx5: fix inconsistency errno update in SH creation
The mlx5_alloc_shared_dev_ctx() function has a local variable named
"err" which contains the errno value in case of failure.
When functions called by this function are failed, this variable is
updated with their return value (that should be a positive errno value).
However, some functions doesn't update errno value by themselves or
return negative errno value. If one of them fails, the "err" variable
contains negative value what cause to assertion failure.
This patch updates all functions uses by mlx5_alloc_shared_dev_ctx()
function to update rte_errno and take this value instead of "err" value.
Fixes: 5dfa003db53f ("common/mlx5: fix post doorbell barrier")
Fixes: 5d55a494f4e6 ("net/mlx5: split multi-thread flow handling per OS")
Cc: sta...@dpdk.org
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_flow_os.c | 3 ++-
drivers/net/mlx5/linux/mlx5_os.c| 16 ++--
drivers/net/mlx5/mlx5.c | 24 +++-
drivers/net/mlx5/windows/mlx5_flow_os.c | 2 +-
drivers/net/mlx5/windows/mlx5_os.c | 24
5 files changed, 36 insertions(+), 33 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_flow_os.c
b/drivers/net/mlx5/linux/mlx5_flow_os.c
index 893f00b824..a5956c255a 100644
--- a/drivers/net/mlx5/linux/mlx5_flow_os.c
+++ b/drivers/net/mlx5/linux/mlx5_flow_os.c
@@ -14,7 +14,8 @@ mlx5_flow_os_init_workspace_once(void)
{
if (rte_thread_key_create(&key_workspace, flow_release_workspace)) {
DRV_LOG(ERR, "Can't create flow workspace data thread key.");
- return -ENOMEM;
+ rte_errno = ENOMEM;
+ return -rte_errno;
}
return 0;
}
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index 69d3e1e3ad..faab310b11 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -138,7 +138,7 @@ mlx5_os_set_nonblock_channel_fd(int fd)
* Pointer to mlx5 device attributes.
*
* @return
- * 0 on success, non zero error number otherwise
+ * 0 on success, a negative errno value otherwise and rte_errno is set.
*/
int
mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
@@ -150,8 +150,10 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
memset(device_attr, 0, sizeof(*device_attr));
err = mlx5_glue->query_device_ex(ctx, NULL, &attr_ex);
- if (err)
- return err;
+ if (err) {
+ rte_errno = errno;
+ return -rte_errno;
+ }
device_attr->device_cap_flags_ex = attr_ex.device_cap_flags_ex;
device_attr->max_qp_wr = attr_ex.orig_attr.max_qp_wr;
device_attr->max_sge = attr_ex.orig_attr.max_sge;
@@ -170,8 +172,10 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
err = mlx5_glue->dv_query_device(ctx, &dv_attr);
- if (err)
- return err;
+ if (err) {
+ rte_errno = errno;
+ return -rte_errno;
+ }
device_attr->flags = dv_attr.flags;
device_attr->comp_mask = dv_attr.comp_mask;
@@ -195,7 +199,7 @@ mlx5_os_get_dev_attr(struct mlx5_common_device *cdev,
strlcpy(device_attr->fw_ver, attr_ex.orig_attr.fw_ver,
sizeof(device_attr->fw_ver));
- return err;
+ return 0;
}
/**
diff --git a/drivers/net/mlx5/mlx5.c b/drivers/net/mlx5/mlx5.c
index cde8d022cd..0e154b88ed 100644
--- a/drivers/net/mlx5/mlx5.c
+++ b/drivers/net/mlx5/mlx5.c
@@ -1172,12 +1172,11 @@ mlx5_alloc_shared_dev_ctx(const struct
mlx5_dev_spawn_data *spawn,
MLX5_ASSERT(spawn->max_port);
sh = mlx5_malloc(MLX5_MEM_ZERO | MLX5_MEM_RTE,
sizeof(struct mlx5_dev_ctx_shared) +
-spawn->max_port *
-sizeof(struct mlx5_dev_shared_port),
+spawn->max_port * sizeof(struct mlx5_dev_shared_port),
RTE_CACHE_LINE_SIZE, SOCKET_ID_ANY);
if (!sh) {
- DRV_LOG(ERR, "shared context allocation failure");
- rte_errno = ENOMEM;
+ DRV_LOG(ERR, "Shared context allocation failure.");
+ rte_errno = ENOMEM;
goto exit;
}
pthread_mutex_init(&sh->txpp.mutex, NULL);
@@ -1199,9 +1198,8 @@ mlx5_alloc_shared_dev_ctx(const struct
mlx5_dev_spawn_data *spawn,
strncpy(sh->ibdev_path, mlx5_os_get_ctx_device_path(sh->cdev->ctx),
sizeof(sh->ibdev_path) - 1);
/*
-* Setting port_id to max unallowed value means
-* there is no interrupt subhandler installed for
-* the given port index i.
+* Setting port_id to max unallowed value means there is no interrupt
+* subhandler installed for the given port index i.
*/
for (i = 0; i < sh->max_port; i++) {
sh->
[PATCH v2 15/20] net/mlx5: concentrate all device configurations
Move all device configure to be performed by mlx5_os_cap_config()
function instead of the spawn function.
In addition move all relevant fields from mlx5_dev_config structure to
mlx5_dev_cap.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 497 +-
drivers/net/mlx5/linux/mlx5_vlan_os.c | 3 +-
drivers/net/mlx5/mlx5.c | 11 +-
drivers/net/mlx5/mlx5.h | 78 ++--
drivers/net/mlx5/mlx5_devx.c | 6 +-
drivers/net/mlx5/mlx5_ethdev.c| 12 +-
drivers/net/mlx5/mlx5_flow.c | 4 +-
drivers/net/mlx5/mlx5_rxmode.c| 8 +-
drivers/net/mlx5/mlx5_rxq.c | 34 +-
drivers/net/mlx5/mlx5_trigger.c | 5 +-
drivers/net/mlx5/mlx5_txq.c | 36 +-
drivers/net/mlx5/mlx5_vlan.c | 4 +-
drivers/net/mlx5/windows/mlx5_os.c| 101 +++---
13 files changed, 380 insertions(+), 419 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index f0aa0f4164..5d2c9b9c8b 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -141,11 +141,12 @@ int
mlx5_os_capabilities_prepare(struct mlx5_dev_ctx_shared *sh)
{
int err;
- struct ibv_context *ctx = sh->cdev->ctx;
+ struct mlx5_common_device *cdev = sh->cdev;
+ struct mlx5_hca_attr *hca_attr = &cdev->config.hca_attr;
struct ibv_device_attr_ex attr_ex = { .comp_mask = 0 };
struct mlx5dv_context dv_attr = { .comp_mask = 0 };
- err = mlx5_glue->query_device_ex(ctx, NULL, &attr_ex);
+ err = mlx5_glue->query_device_ex(cdev->ctx, NULL, &attr_ex);
if (err) {
rte_errno = errno;
return -rte_errno;
@@ -159,45 +160,229 @@ mlx5_os_capabilities_prepare(struct mlx5_dev_ctx_shared
*sh)
#ifdef HAVE_IBV_DEVICE_STRIDING_RQ_SUPPORT
dv_attr.comp_mask |= MLX5DV_CONTEXT_MASK_STRIDING_RQ;
#endif
- err = mlx5_glue->dv_query_device(ctx, &dv_attr);
+ err = mlx5_glue->dv_query_device(cdev->ctx, &dv_attr);
if (err) {
rte_errno = errno;
return -rte_errno;
}
memset(&sh->dev_cap, 0, sizeof(struct mlx5_dev_cap));
- sh->dev_cap.device_cap_flags_ex = attr_ex.device_cap_flags_ex;
+ if (mlx5_dev_is_pci(cdev->dev))
+ sh->dev_cap.vf = mlx5_dev_is_vf_pci(RTE_DEV_TO_PCI(cdev->dev));
+ else
+ sh->dev_cap.sf = 1;
sh->dev_cap.max_qp_wr = attr_ex.orig_attr.max_qp_wr;
sh->dev_cap.max_sge = attr_ex.orig_attr.max_sge;
sh->dev_cap.max_cq = attr_ex.orig_attr.max_cq;
sh->dev_cap.max_qp = attr_ex.orig_attr.max_qp;
- sh->dev_cap.raw_packet_caps = attr_ex.raw_packet_caps;
- sh->dev_cap.max_rwq_indirection_table_size =
- attr_ex.rss_caps.max_rwq_indirection_table_size;
- sh->dev_cap.max_tso = attr_ex.tso_caps.max_tso;
- sh->dev_cap.tso_supported_qpts = attr_ex.tso_caps.supported_qpts;
+#ifdef HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR
+ sh->dev_cap.dest_tir = 1;
+#endif
+#if defined(HAVE_IBV_FLOW_DV_SUPPORT) && defined(HAVE_MLX5DV_DR)
+ DRV_LOG(DEBUG, "DV flow is supported.");
+ sh->dev_cap.dv_flow_en = 1;
+#endif
+#ifdef HAVE_MLX5DV_DR_ESWITCH
+ if (hca_attr->eswitch_manager && sh->dev_cap.dv_flow_en && sh->esw_mode)
+ sh->dev_cap.dv_esw_en = 1;
+#endif
+ /*
+* Multi-packet send is supported by ConnectX-4 Lx PF as well
+* as all ConnectX-5 devices.
+*/
+ if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_MPW_ALLOWED) {
+ if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_ENHANCED_MPW) {
+ DRV_LOG(DEBUG, "Enhanced MPW is supported.");
+ sh->dev_cap.mps = MLX5_MPW_ENHANCED;
+ } else {
+ DRV_LOG(DEBUG, "MPW is supported.");
+ sh->dev_cap.mps = MLX5_MPW;
+ }
+ } else {
+ DRV_LOG(DEBUG, "MPW isn't supported.");
+ sh->dev_cap.mps = MLX5_MPW_DISABLED;
+ }
+#if (RTE_CACHE_LINE_SIZE == 128)
+ if (dv_attr.flags & MLX5DV_CONTEXT_FLAGS_CQE_128B_COMP)
+ sh->dev_cap.cqe_comp = 1;
+ DRV_LOG(DEBUG, "Rx CQE 128B compression is %ssupported.",
+ sh->dev_cap.cqe_comp ? "" : "not ");
+#else
+ sh->dev_cap.cqe_comp = 1;
+#endif
+#ifdef HAVE_IBV_DEVICE_MPLS_SUPPORT
+ sh->dev_cap.mpls_en =
+ ((dv_attr.tunnel_offloads_caps &
+ MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_CW_MPLS_OVER_GRE) &&
+(dv_attr.tunnel_offloads_caps &
+ MLX5DV_RAW_PACKET_CAP_TUNNELED_OFFLOAD_CW_MPLS_OVER_UDP));
+ DRV_LOG(DEBUG, "MPLS over GRE/UDP tunnel offloading is %ssupported.",
+ sh->dev_cap.mpls_en ? "" : "not ");
+#else
+ DRV_LOG(WARNING,
+ "MPLS over GRE/UDP tunnel offloading disabled due to old
OFE
[PATCH v2 18/20] net/mlx5: separate per port configuration
Add configuration structure for port (ethdev). This structure contains
all configurations coming from devargs which oriented to port. It is a
field of mlx5_priv structure, and is updated in spawn function for each
port.
Signed-off-by: Michael Baum
Acked-by: Matan Azrad
---
drivers/net/mlx5/linux/mlx5_os.c | 121 ++--
drivers/net/mlx5/mlx5.c| 178 -
drivers/net/mlx5/mlx5.h| 21 ++--
drivers/net/mlx5/mlx5_devx.c | 3 +-
drivers/net/mlx5/mlx5_ethdev.c | 7 +-
drivers/net/mlx5/mlx5_rxq.c| 4 +-
drivers/net/mlx5/mlx5_tx.c | 2 +-
drivers/net/mlx5/mlx5_txq.c| 6 +-
drivers/net/mlx5/windows/mlx5_os.c | 55 ++---
9 files changed, 188 insertions(+), 209 deletions(-)
diff --git a/drivers/net/mlx5/linux/mlx5_os.c b/drivers/net/mlx5/linux/mlx5_os.c
index c1eda00899..fa1af06f7d 100644
--- a/drivers/net/mlx5/linux/mlx5_os.c
+++ b/drivers/net/mlx5/linux/mlx5_os.c
@@ -999,8 +999,6 @@ mlx5_representor_match(struct mlx5_dev_spawn_data *spawn,
* Backing DPDK device.
* @param spawn
* Verbs device parameters (name, port, switch_info) to spawn.
- * @param config
- * Device configuration parameters.
* @param eth_da
* Device arguments.
*
@@ -1014,12 +1012,10 @@ mlx5_representor_match(struct mlx5_dev_spawn_data
*spawn,
static struct rte_eth_dev *
mlx5_dev_spawn(struct rte_device *dpdk_dev,
struct mlx5_dev_spawn_data *spawn,
- struct mlx5_dev_config *config,
struct rte_eth_devargs *eth_da)
{
const struct mlx5_switch_info *switch_info = &spawn->info;
struct mlx5_dev_ctx_shared *sh = NULL;
- struct mlx5_hca_attr *hca_attr = &spawn->cdev->config.hca_attr;
struct ibv_port_attr port_attr = { .state = IBV_PORT_NOP };
struct rte_eth_dev *eth_dev = NULL;
struct mlx5_priv *priv = NULL;
@@ -1029,7 +1025,7 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
int own_domain_id = 0;
uint16_t port_id;
struct mlx5_port_info vport_info = { .query_flags = 0 };
- int nl_rdma = -1;
+ int nl_rdma;
int i;
/* Determine if this port representor is supposed to be spawned. */
@@ -1107,13 +1103,6 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
mlx5_dev_close(eth_dev);
return NULL;
}
- /* Process parameters. */
- err = mlx5_args(config, dpdk_dev->devargs);
- if (err) {
- DRV_LOG(ERR, "failed to process device arguments: %s",
- strerror(rte_errno));
- return NULL;
- }
sh = mlx5_alloc_shared_dev_ctx(spawn);
if (!sh)
return NULL;
@@ -1269,41 +1258,10 @@ mlx5_dev_spawn(struct rte_device *dpdk_dev,
DRV_LOG(DEBUG, "dev_port-%u new domain_id=%u\n",
priv->dev_port, priv->domain_id);
}
- if (config->hw_padding && !sh->dev_cap.hw_padding) {
- DRV_LOG(DEBUG, "Rx end alignment padding isn't supported");
- config->hw_padding = 0;
- } else if (config->hw_padding) {
- DRV_LOG(DEBUG, "Rx end alignment padding is enabled");
- }
- /*
-* MPW is disabled by default, while the Enhanced MPW is enabled
-* by default.
-*/
- if (config->mps == MLX5_ARG_UNSET)
- config->mps = (sh->dev_cap.mps == MLX5_MPW_ENHANCED) ?
- MLX5_MPW_ENHANCED : MLX5_MPW_DISABLED;
- else
- config->mps = config->mps ? sh->dev_cap.mps : MLX5_MPW_DISABLED;
- DRV_LOG(INFO, "%sMPS is %s",
- config->mps == MLX5_MPW_ENHANCED ? "enhanced " :
- config->mps == MLX5_MPW ? "legacy " : "",
- config->mps != MLX5_MPW_DISABLED ? "enabled" : "disabled");
if (sh->cdev->config.devx) {
+ struct mlx5_hca_attr *hca_attr = &sh->cdev->config.hca_attr;
+
sh->steering_format_version = hca_attr->steering_format_version;
- /* LRO is supported only when DV flow enabled. */
- if (sh->dev_cap.lro_supported && sh->config.dv_flow_en)
- sh->dev_cap.lro_supported = 0;
- if (sh->dev_cap.lro_supported) {
- /*
-* If LRO timeout is not configured by application,
-* use the minimal supported value.
-*/
- if (!config->lro_timeout)
- config->lro_timeout =
- hca_attr->lro_timer_supported_periods[0];
- DRV_LOG(DEBUG, "LRO session timeout set to %d usec",
- config->lro_timeout);
- }
#if defined(HAVE_MLX5DV_DR) && \
(defined(HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER) || \
defined(HAVE_MLX5_DR_CREATE_ACTION_ASO))
@@ -1395,39
Re: [PATCH v8 1/2] common/cnxk: support priority flow ctrl config API
sk...@marvell.com writes: > From: Sunil Kumar Kori > > CNXK platforms support priority flow control(802.1qbb) to pause > respective traffic per class on that link. > > Patch adds RoC interface to configure priority flow control on MAC > block i.e. CGX on cn9k and RPM on cn10k. > > Signed-off-by: Sunil Kumar Kori > --- > v1..v2: > - fix RoC API naming convention. > > v2..v3: > - fix pause quanta configuration for cn10k. > - remove unnecessary code > > v3..v4: > - fix PFC configuration with other type of TM tree >i.e. default, user and rate limit tree. > > v4..v5: > - rebase on top of tree > - fix review comments > - fix initialization error for LBK devices > > v5..v6: > - fix review comments > > v6..v7: > - no change > > v7..v8: > - rebase on top of 22.03-rc1 > > drivers/common/cnxk/roc_mbox.h | 19 ++- > drivers/common/cnxk/roc_nix.h| 21 > drivers/common/cnxk/roc_nix_fc.c | 95 +-- > drivers/common/cnxk/roc_nix_priv.h | 6 +- > drivers/common/cnxk/roc_nix_tm.c | 171 ++- > drivers/common/cnxk/roc_nix_tm_ops.c | 14 ++- > drivers/common/cnxk/version.map | 4 + > 7 files changed, 310 insertions(+), 20 deletions(-) Acked-by: Ray Kinsella -- Regards, Ray K
Re: [dpdk-dev] [PATCH v2] drivers: enable keep flow rule device capability for cnxk
psathe...@marvell.com writes: > From: Kiran Kumar K > > Adding changes to enable keep flow rule device capability. > With this change, flow rules will be kept across device restart. > > Signed-off-by: Kiran Kumar K > Reviewed-by: Satheesh Paul > --- > v2: > * Allow creating flow rule before device start. > > drivers/common/cnxk/roc_npc.c | 8 > drivers/common/cnxk/roc_npc.h | 2 ++ > drivers/common/cnxk/roc_npc_mcam.c | 20 > drivers/common/cnxk/roc_npc_priv.h | 1 + > drivers/common/cnxk/version.map| 1 + > drivers/net/cnxk/cnxk_ethdev.c | 15 +-- > drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++-- > 7 files changed, 47 insertions(+), 4 deletions(-) > Acked-by: Ray Kinsella -- Regards, Ray K
[PATCH v9 2/2] net/cnxk: support priority flow control
From: Sunil Kumar Kori
Patch implements priority flow control support for CNXK platforms.
Signed-off-by: Sunil Kumar Kori
---
v1..v2:
- fix application restart issue.
v2..v3:
- fix pause quanta configuration for cn10k.
- fix review comments.
v3..v4:
- fix PFC configuration with other type of TM tree
i.e. default, user and rate limit tree.
v4..v5:
- rebase on top of tree.
v5..v6:
- fix review comments
v6..v7:
- use correct FC mode flags
v7..v8:
- rebase on top of 22.03-rc1
v8..v9:
- update documentation and release notes
doc/guides/nics/cnxk.rst | 1 +
doc/guides/rel_notes/release_22_03.rst | 4 +
drivers/net/cnxk/cnxk_ethdev.c | 30
drivers/net/cnxk/cnxk_ethdev.h | 20 +++
drivers/net/cnxk/cnxk_ethdev_ops.c | 187 +++--
5 files changed, 233 insertions(+), 9 deletions(-)
diff --git a/doc/guides/nics/cnxk.rst b/doc/guides/nics/cnxk.rst
index 27a94204cb..c9467f5d2a 100644
--- a/doc/guides/nics/cnxk.rst
+++ b/doc/guides/nics/cnxk.rst
@@ -36,6 +36,7 @@ Features of the CNXK Ethdev PMD are:
- Support Rx interrupt
- Inline IPsec processing support
- Ingress meter support
+- Queue based priority flow control support
Prerequisites
-
diff --git a/doc/guides/rel_notes/release_22_03.rst
b/doc/guides/rel_notes/release_22_03.rst
index ff3095d742..479448fafc 100644
--- a/doc/guides/rel_notes/release_22_03.rst
+++ b/doc/guides/rel_notes/release_22_03.rst
@@ -136,6 +136,10 @@ New Features
* Added AES-CMAC support in CN9K & CN10K.
* Added ESN and anti-replay support in lookaside protocol (IPsec) for CN10K.
+* **Updated Marvell cnxk ethdev PMD.**
+
+ * Added queue based priority flow control support for CN9K & CN10K.
+
* **Added support for CPM2.0b devices to Intel QuickAssist Technology PMD.**
* CPM2.0b (4942) devices are now enabled for QAT crypto PMD.
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 27751a6956..37ae0939d7 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -1251,6 +1251,8 @@ cnxk_nix_configure(struct rte_eth_dev *eth_dev)
goto cq_fini;
}
+ /* Initialize TC to SQ mapping as invalid */
+ memset(dev->pfc_tc_sq_map, 0xFF, sizeof(dev->pfc_tc_sq_map));
/*
* Restore queue config when reconfigure followed by
* reconfigure and no queue configure invoked from application case.
@@ -1539,6 +1541,10 @@ struct eth_dev_ops cnxk_eth_dev_ops = {
.tx_burst_mode_get = cnxk_nix_tx_burst_mode_get,
.flow_ctrl_get = cnxk_nix_flow_ctrl_get,
.flow_ctrl_set = cnxk_nix_flow_ctrl_set,
+ .priority_flow_ctrl_queue_config =
+ cnxk_nix_priority_flow_ctrl_queue_config,
+ .priority_flow_ctrl_queue_info_get =
+ cnxk_nix_priority_flow_ctrl_queue_info_get,
.dev_set_link_up = cnxk_nix_set_link_up,
.dev_set_link_down = cnxk_nix_set_link_down,
.get_module_info = cnxk_nix_get_module_info,
@@ -1718,6 +1724,8 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool
reset)
{
struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
const struct eth_dev_ops *dev_ops = eth_dev->dev_ops;
+ struct rte_eth_pfc_queue_conf pfc_conf = {0};
+ struct rte_eth_fc_conf fc_conf = {0};
struct roc_nix *nix = &dev->nix;
int rc, i;
@@ -1733,6 +1741,28 @@ cnxk_eth_dev_uninit(struct rte_eth_dev *eth_dev, bool
reset)
roc_nix_npc_rx_ena_dis(nix, false);
+ /* Restore 802.3 Flow control configuration */
+ fc_conf.mode = RTE_ETH_FC_NONE;
+ rc = cnxk_nix_flow_ctrl_set(eth_dev, &fc_conf);
+
+ pfc_conf.mode = RTE_ETH_FC_NONE;
+ for (i = 0; i < CNXK_NIX_PFC_CHAN_COUNT; i++) {
+ if (dev->pfc_tc_sq_map[i] != 0x) {
+ pfc_conf.rx_pause.tx_qid = dev->pfc_tc_sq_map[i];
+ pfc_conf.rx_pause.tc = i;
+ pfc_conf.tx_pause.rx_qid = i;
+ pfc_conf.tx_pause.tc = i;
+ rc = cnxk_nix_priority_flow_ctrl_queue_config(eth_dev,
+ &pfc_conf);
+ if (rc)
+ plt_err("Failed to reset PFC. error code(%d)",
+ rc);
+ }
+ }
+
+ fc_conf.mode = RTE_ETH_FC_FULL;
+ rc = cnxk_nix_flow_ctrl_set(eth_dev, &fc_conf);
+
/* Disable and free rte_meter entries */
nix_meter_fini(dev);
diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index fadc8aaf45..d0dfa7cb70 100644
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -137,12 +137,24 @@
/* SPI will be in 20 bits of tag */
#define CNXK_ETHDEV_SPI_TAG_MASK 0xFUL
+#define CNXK_NIX_PFC_CHAN_COUNT 16
+
struct cnxk_fc_cfg {
enum rte_eth_fc_mode mode;
u
[PATCH v9 1/2] common/cnxk: support priority flow ctrl config API
From: Sunil Kumar Kori
CNXK platforms support priority flow control(802.1qbb) to pause
respective traffic per class on that link.
Patch adds RoC interface to configure priority flow control on MAC
block i.e. CGX on cn9k and RPM on cn10k.
Signed-off-by: Sunil Kumar Kori
---
v1..v2:
- fix RoC API naming convention.
v2..v3:
- fix pause quanta configuration for cn10k.
- remove unnecessary code
v3..v4:
- fix PFC configuration with other type of TM tree
i.e. default, user and rate limit tree.
v4..v5:
- rebase on top of tree
- fix review comments
- fix initialization error for LBK devices
v5..v6:
- fix review comments
v6..v7:
- no change
v7..v8:
- rebase on top of 22.03-rc1
v8..v9:
- no change
drivers/common/cnxk/roc_mbox.h | 19 ++-
drivers/common/cnxk/roc_nix.h| 21
drivers/common/cnxk/roc_nix_fc.c | 95 +--
drivers/common/cnxk/roc_nix_priv.h | 6 +-
drivers/common/cnxk/roc_nix_tm.c | 171 ++-
drivers/common/cnxk/roc_nix_tm_ops.c | 14 ++-
drivers/common/cnxk/version.map | 4 +
7 files changed, 310 insertions(+), 20 deletions(-)
diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index 8967858914..b608f58357 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -95,6 +95,8 @@ struct mbox_msghdr {
msg_rsp) \
M(CGX_STATS_RST, 0x21A, cgx_stats_rst, msg_req, msg_rsp) \
M(RPM_STATS, 0x21C, rpm_stats, msg_req, rpm_stats_rsp) \
+ M(CGX_PRIO_FLOW_CTRL_CFG, 0x21F, cgx_prio_flow_ctrl_cfg, cgx_pfc_cfg, \
+ cgx_pfc_rsp) \
/* NPA mbox IDs (range 0x400 - 0x5FF) */ \
M(NPA_LF_ALLOC, 0x400, npa_lf_alloc, npa_lf_alloc_req, \
npa_lf_alloc_rsp)\
@@ -551,6 +553,19 @@ struct cgx_pause_frm_cfg {
uint8_t __io tx_pause;
};
+struct cgx_pfc_cfg {
+ struct mbox_msghdr hdr;
+ uint8_t __io rx_pause;
+ uint8_t __io tx_pause;
+ uint16_t __io pfc_en; /* bitmap indicating enabled traffic classes */
+};
+
+struct cgx_pfc_rsp {
+ struct mbox_msghdr hdr;
+ uint8_t __io rx_pause;
+ uint8_t __io tx_pause;
+};
+
struct sfp_eeprom_s {
#define SFP_EEPROM_SIZE 256
uint16_t __io sff_id;
@@ -1125,7 +1140,9 @@ struct nix_bp_cfg_req {
/* PF can be mapped to either CGX or LBK interface,
* so maximum 64 channels are possible.
*/
-#define NIX_MAX_CHAN 64
+#define NIX_MAX_CHAN64
+#define NIX_CGX_MAX_CHAN 16
+#define NIX_LBK_MAX_CHAN 1
struct nix_bp_cfg_rsp {
struct mbox_msghdr hdr;
/* Channel and bpid mapping */
diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h
index 755212c8f9..680a34cdcd 100644
--- a/drivers/common/cnxk/roc_nix.h
+++ b/drivers/common/cnxk/roc_nix.h
@@ -165,16 +165,27 @@ struct roc_nix_fc_cfg {
struct {
uint32_t rq;
+ uint16_t tc;
uint16_t cq_drop;
bool enable;
} cq_cfg;
struct {
+ uint32_t sq;
+ uint16_t tc;
bool enable;
} tm_cfg;
};
};
+struct roc_nix_pfc_cfg {
+ enum roc_nix_fc_mode mode;
+ /* For SET, tc must be [0, 15].
+* For GET, TC will represent bitmap
+*/
+ uint16_t tc;
+};
+
struct roc_nix_eeprom_info {
#define ROC_NIX_EEPROM_SIZE 256
uint16_t sff_id;
@@ -478,6 +489,7 @@ void __roc_api roc_nix_unregister_cq_irqs(struct roc_nix
*roc_nix);
enum roc_nix_tm_tree {
ROC_NIX_TM_DEFAULT = 0,
ROC_NIX_TM_RLIMIT,
+ ROC_NIX_TM_PFC,
ROC_NIX_TM_USER,
ROC_NIX_TM_TREE_MAX,
};
@@ -624,6 +636,7 @@ roc_nix_tm_shaper_default_red_algo(struct roc_nix_tm_node
*node,
int __roc_api roc_nix_tm_lvl_cnt_get(struct roc_nix *roc_nix);
int __roc_api roc_nix_tm_lvl_have_link_access(struct roc_nix *roc_nix, int
lvl);
int __roc_api roc_nix_tm_prepare_rate_limited_tree(struct roc_nix *roc_nix);
+int __roc_api roc_nix_tm_pfc_prepare_tree(struct roc_nix *roc_nix);
bool __roc_api roc_nix_tm_is_user_hierarchy_enabled(struct roc_nix *nix);
int __roc_api roc_nix_tm_tree_type_get(struct roc_nix *nix);
@@ -739,6 +752,14 @@ int __roc_api roc_nix_fc_config_get(struct roc_nix
*roc_nix,
int __roc_api roc_nix_fc_mode_set(struct roc_nix *roc_nix,
enum roc_nix_fc_mode mode);
+int __roc_api roc_nix_pfc_mode_set(struct roc_nix *roc_nix,
+ struct roc_nix_pfc_cfg *pfc_cfg);
+
+int __roc_api roc_nix_pfc_mode_get(struct roc_nix *roc_nix,
+ struct roc_nix_pfc_cfg *pfc_cfg);
+
+ui
Re: [dpdk-dev] [PATCH v7 1/4] ethdev: support device reset and recovery events
Ray Kinsella writes:
> Thomas Monjalon writes:
>
>> 02/02/2022 12:44, Ray Kinsella:
>>> Ferruh Yigit writes:
>>> > On 1/28/2022 12:48 PM, Kalesh A P wrote:
>>> >> --- a/lib/ethdev/rte_ethdev.h
>>> >> +++ b/lib/ethdev/rte_ethdev.h
>>> >> @@ -3818,6 +3818,24 @@ enum rte_eth_event_type {
>>> >> RTE_ETH_EVENT_DESTROY, /**< port is released */
>>> >> RTE_ETH_EVENT_IPSEC,/**< IPsec offload related event */
>>> >> RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */
>>> >> +RTE_ETH_EVENT_ERR_RECOVERING,
>>> >> +/**< port recovering from an error
>>> >> + *
>>> >> + * PMD detected a FW reset or error condition.
>>> >> + * PMD will try to recover from the error.
>>> >> + * Data path may be quiesced and Control path
>>> >> operations
>>> >> + * may fail at this time.
>>> >> + */
>>> >> +RTE_ETH_EVENT_RECOVERED,
>>> >> +/**< port recovered from an error
>>> >> + *
>>> >> + * PMD has recovered from the error condition.
>>> >> + * Control path and Data path are up now.
>>> >> + * PMD re-configures the port to the state
>>> >> prior to the error.
>>> >> + * Since the device has undergone a reset, flow
>>> >> rules
>>> >> + * offloaded prior to reset may be lost and
>>> >> + * the application should recreate the rules
>>> >> again.
>>> >> + */
>>> >> RTE_ETH_EVENT_MAX /**< max value of this enum */
>>> >
>>> >
>>> > Also ABI check complains about 'RTE_ETH_EVENT_MAX' value check, cc'ed
>>> > more people
>>> > to evaluate if it is a false positive:
>>> >
>>> >
>>> > 1 function with some indirect sub-type change:
>>> > [C] 'function int rte_eth_dev_callback_register(uint16_t,
>>> > rte_eth_event_type, rte_eth_dev_cb_fn, void*)' at rte_ethdev.c:4637:1 has
>>> > some indirect sub-type changes:
>>> > parameter 3 of type 'typedef rte_eth_dev_cb_fn' has sub-type changes:
>>> > underlying type 'int (typedef uint16_t, enum rte_eth_event_type,
>>> > void*, void*)*' changed:
>>> > in pointed to type 'function type int (typedef uint16_t, enum
>>> > rte_eth_event_type, void*, void*)':
>>> > parameter 2 of type 'enum rte_eth_event_type' has sub-type
>>> > changes:
>>> > type size hasn't changed
>>> > 2 enumerator insertions:
>>> > 'rte_eth_event_type::RTE_ETH_EVENT_ERR_RECOVERING' value
>>> > '11'
>>> > 'rte_eth_event_type::RTE_ETH_EVENT_RECOVERED' value '12'
>>> > 1 enumerator change:
>>> > 'rte_eth_event_type::RTE_ETH_EVENT_MAX' from value '11' to
>>> > '13' at rte_ethdev.h:3807:1
>>>
>>> I don't immediately see the problem that this would cause.
>>> There are no array sizes etc dependent on the value of MAX for instance.
>>>
>>> Looks safe?
>>
>> We never know how this enum will be used by the application.
>> The max value may be used for the size of an event array.
>> It looks a real ABI issue unfortunately.
>
> Right - but we only really care about it when an array size based on MAX
> is likely to be passed to DPDK, which doesn't apply in this case.
>
> I noted that some Linux folks explicitly mark similar MAX values as not
> part of the ABI.
>
> /usr/include/linux/perf_event.h
> 37: PERF_TYPE_MAX, /* non-ABI */
> 60: PERF_COUNT_HW_MAX, /* non-ABI */
> 79: PERF_COUNT_HW_CACHE_MAX,/* non-ABI */
> 87: PERF_COUNT_HW_CACHE_OP_MAX, /* non-ABI */
> 94: PERF_COUNT_HW_CACHE_RESULT_MAX, /* non-ABI */
> 116:PERF_COUNT_SW_MAX, /* non-ABI */
> 149:PERF_SAMPLE_MAX = 1U << 24, /* non-ABI */
> 151:__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /*
> non-ABI; internal use */
> 189:PERF_SAMPLE_BRANCH_MAX_SHIFT/* non-ABI */
> 267:PERF_TXN_MAX= (1 << 8), /* non-ABI */
> 301:PERF_FORMAT_MAX = 1U << 4, /* non-ABI */
> 1067: PERF_RECORD_MAX,/* non-ABI */
> 1078: PERF_RECORD_KSYMBOL_TYPE_MAX/* non-ABI */
> 1087: PERF_BPF_EVENT_MAX, /* non-ABI */
>
>>
>> PS: I am not Cc'ed in this patchset,
>> so copying what I said on v6 (more than a year ago):
>> Please use the option --cc-cmd devtools/get-maintainer.sh
Any thoughts on similarly annotating all our _MAX enums in the same way?
We could also add a section in the ABI Policy to make it explicit _MAX
enum values are not part of the ABI - what do folks think?
--
Regards, Ray K
RE: [PATCH] pipeline: add check against loops
> -Original Message- > From: Thomas Monjalon > Sent: Sunday, February 13, 2022 7:49 PM > To: Suresh Narayane, Harshad ; > Dumitrescu, Cristian > Cc: dev@dpdk.org > Subject: Re: [PATCH] pipeline: add check against loops > > 01/12/2021 13:21, Cristian Dumitrescu: > > Detect when a jump instruction, either conditional or unconditional, > > is jumping to itself, thus creating a loop, which is not allowed in > > data plane code. > > > > Signed-off-by: Cristian Dumitrescu > > Signed-off-by: Harshad Narayane > > Applied, thanks. > > Thanks, Thomas. Regards, Cristian
Re: out of tree driver builds broken with C++
On Mon, Feb 14, 2022 at 10:22:08AM +0100, Thomas Monjalon wrote: > 14/02/2022 10:13, Tyler Retzlaff: > > while the driver api is "internal" we agreed some time ago that drivers > > could be built external to the dpdk tree. by enabling the meson setup > > option -Denable_driver_sdk=true. > > > > it was agreed that the driver api was internal and would attract no > > binary compatibility support which was fine. this change has now > > imposed a further restriction that out of tree drivers have to be > > authored in C only as non-C++ compatible code will invariably leak into > > the internal structures. > > > > you won't allow us to build C++ drivers in the dpdk tree and it seems > > now you are preventing building of C++ drivers outside of the tree too. > > That's the problem of non-written assumptions, they are unknown or forgotten. > Did we agree to support out-of-tree drivers in C++? > > We really need to make things clear and written in documentation. > > > could we please re-evaluate this. > > Yes we can re-evaluate. > What is the list of impacted files? > Hacking meson files a bit, the list of SDK header files is reported as below. /Bruce Message: SDK headers: Message: ethdev_driver.h Message: ethdev_pci.h Message: ethdev_vdev.h Message: cryptodev_pmd.h Message: eventdev_pmd.h Message: eventdev_pmd_pci.h Message: eventdev_pmd_vdev.h Message: eventdev_trace.h Message: event_timer_adapter_pmd.h Message: rte_dmadev_pmd.h Message: vdpa_driver.h
[PATCH v3] vdpa/sfc: make MCDI memzone name unique
From: Abhimanyu Saini
Buffer for MCDI channel is allocated using rte_memzone_reserve_aligned
with zone name 'mcdi'. Since multiple MCDI channels are needed to
support multiple VF(s) and rte_memzone_reserve_aligned expects unique
zone names, append PCI address to zone name to make it unique.
Signed-off-by: Abhimanyu Saini
---
v2:
- Formatting changes
v3:
- Formatting changes
drivers/vdpa/sfc/sfc_vdpa_hw.c | 15 ---
1 file changed, 12 insertions(+), 3 deletions(-)
diff --git a/drivers/vdpa/sfc/sfc_vdpa_hw.c b/drivers/vdpa/sfc/sfc_vdpa_hw.c
index fd1fee7..a7018b1 100644
--- a/drivers/vdpa/sfc/sfc_vdpa_hw.c
+++ b/drivers/vdpa/sfc/sfc_vdpa_hw.c
@@ -25,21 +25,30 @@
{
uint64_t mcdi_iova;
size_t mcdi_buff_size;
+ char mz_name[RTE_MEMZONE_NAMESIZE];
const struct rte_memzone *mz = NULL;
int numa_node = sva->pdev->device.numa_node;
int ret;
mcdi_buff_size = RTE_ALIGN_CEIL(len, PAGE_SIZE);
+ ret = snprintf(mz_name, RTE_MEMZONE_NAMESIZE, "%s_%s",
+ sva->pdev->name, name);
+ if (ret < 0 || ret >= RTE_MEMZONE_NAMESIZE) {
+ sfc_vdpa_err(sva, "%s_%s too long to fit in mz_name",
+sva->pdev->name, name);
+ return -EINVAL;
+ }
- sfc_vdpa_log_init(sva, "name=%s, len=%zu", name, len);
+ sfc_vdpa_log_init(sva, "name=%s, len=%zu", mz_name, len);
- mz = rte_memzone_reserve_aligned(name, mcdi_buff_size,
+ mz = rte_memzone_reserve_aligned(mz_name, mcdi_buff_size,
numa_node,
RTE_MEMZONE_IOVA_CONTIG,
PAGE_SIZE);
if (mz == NULL) {
sfc_vdpa_err(sva, "cannot reserve memory for %s: len=%#x: %s",
-name, (unsigned int)len, rte_strerror(rte_errno));
+mz_name, (unsigned int)len,
+rte_strerror(rte_errno));
return -ENOMEM;
}
--
1.8.3.1
RE: [PATCH v2 0/2] rte_dump_stack: improvements
> From: Stephen Hemminger [mailto:step...@networkplumber.org] > Sent: Saturday, 12 February 2022 19.45 > > This is update to earlier RFC. Add some more comments and changes > to have common code for Linux and FreeBSD > > Stephen Hemminger (2): > eal_debug: do not use malloc in rte_dump_stack > eal: common rte_dump_stack for both Linux and FreeBSD > > lib/eal/freebsd/eal_debug.c | 43 > lib/eal/freebsd/meson.build | 1 - > lib/eal/linux/eal_debug.c | 43 > lib/eal/linux/meson.build | 1 - > lib/eal/unix/eal_debug.c| 65 + > lib/eal/unix/meson.build| 5 +-- > 6 files changed, 68 insertions(+), 90 deletions(-) > delete mode 100644 lib/eal/freebsd/eal_debug.c > delete mode 100644 lib/eal/linux/eal_debug.c > create mode 100644 lib/eal/unix/eal_debug.c > > -- > 2.34.1 > The dladdr() man page mentions that linking with -ldl is required; I assume this is already part of the DPDK EAL build system? For the series, Acked-by: Morten Brørup
Re: [dpdk-dev] [PATCH v7 1/4] ethdev: support device reset and recovery events
14/02/2022 11:16, Ray Kinsella:
> Ray Kinsella writes:
> > Thomas Monjalon writes:
> >> 02/02/2022 12:44, Ray Kinsella:
> >>> Ferruh Yigit writes:
> >>> > On 1/28/2022 12:48 PM, Kalesh A P wrote:
> >>> >> --- a/lib/ethdev/rte_ethdev.h
> >>> >> +++ b/lib/ethdev/rte_ethdev.h
> >>> >> @@ -3818,6 +3818,24 @@ enum rte_eth_event_type {
> >>> >>RTE_ETH_EVENT_DESTROY, /**< port is released */
> >>> >>RTE_ETH_EVENT_IPSEC,/**< IPsec offload related event */
> >>> >>RTE_ETH_EVENT_FLOW_AGED,/**< New aged-out flows is detected */
> >>> >> + RTE_ETH_EVENT_ERR_RECOVERING,
> >>> >> + /**< port recovering from an error
> >>> >> + *
> >>> >> + * PMD detected a FW reset or error condition.
> >>> >> + * PMD will try to recover from the error.
> >>> >> + * Data path may be quiesced and Control path
> >>> >> operations
> >>> >> + * may fail at this time.
> >>> >> + */
> >>> >> + RTE_ETH_EVENT_RECOVERED,
> >>> >> + /**< port recovered from an error
> >>> >> + *
> >>> >> + * PMD has recovered from the error condition.
> >>> >> + * Control path and Data path are up now.
> >>> >> + * PMD re-configures the port to the state
> >>> >> prior to the error.
> >>> >> + * Since the device has undergone a reset, flow
> >>> >> rules
> >>> >> + * offloaded prior to reset may be lost and
> >>> >> + * the application should recreate the rules
> >>> >> again.
> >>> >> + */
> >>> >>RTE_ETH_EVENT_MAX /**< max value of this enum */
> >>> >
> >>> >
> >>> > Also ABI check complains about 'RTE_ETH_EVENT_MAX' value check, cc'ed
> >>> > more people
> >>> > to evaluate if it is a false positive:
> >>> >
> >>> >
> >>> > 1 function with some indirect sub-type change:
> >>> > [C] 'function int rte_eth_dev_callback_register(uint16_t,
> >>> > rte_eth_event_type, rte_eth_dev_cb_fn, void*)' at rte_ethdev.c:4637:1
> >>> > has some indirect sub-type changes:
> >>> > parameter 3 of type 'typedef rte_eth_dev_cb_fn' has sub-type
> >>> > changes:
> >>> > underlying type 'int (typedef uint16_t, enum rte_eth_event_type,
> >>> > void*, void*)*' changed:
> >>> > in pointed to type 'function type int (typedef uint16_t, enum
> >>> > rte_eth_event_type, void*, void*)':
> >>> > parameter 2 of type 'enum rte_eth_event_type' has sub-type
> >>> > changes:
> >>> > type size hasn't changed
> >>> > 2 enumerator insertions:
> >>> > 'rte_eth_event_type::RTE_ETH_EVENT_ERR_RECOVERING' value
> >>> > '11'
> >>> > 'rte_eth_event_type::RTE_ETH_EVENT_RECOVERED' value '12'
> >>> > 1 enumerator change:
> >>> > 'rte_eth_event_type::RTE_ETH_EVENT_MAX' from value '11'
> >>> > to '13' at rte_ethdev.h:3807:1
> >>>
> >>> I don't immediately see the problem that this would cause.
> >>> There are no array sizes etc dependent on the value of MAX for instance.
> >>>
> >>> Looks safe?
> >>
> >> We never know how this enum will be used by the application.
> >> The max value may be used for the size of an event array.
> >> It looks a real ABI issue unfortunately.
> >
> > Right - but we only really care about it when an array size based on MAX
> > is likely to be passed to DPDK, which doesn't apply in this case.
I don't completely agree.
A developer may assume an event will never exceed MAX value.
However, after an upgrade of DPDK without app rebuild,
a higher event value may be received in the app,
breaking the assumption.
Should we consider this case as an ABI breakage?
> > I noted that some Linux folks explicitly mark similar MAX values as not
> > part of the ABI.
> >
> > /usr/include/linux/perf_event.h
> > 37: PERF_TYPE_MAX, /* non-ABI */
> > 60: PERF_COUNT_HW_MAX, /* non-ABI */
> > 79: PERF_COUNT_HW_CACHE_MAX,/* non-ABI */
> > 87: PERF_COUNT_HW_CACHE_OP_MAX, /* non-ABI */
> > 94: PERF_COUNT_HW_CACHE_RESULT_MAX, /* non-ABI */
> > 116:PERF_COUNT_SW_MAX, /* non-ABI */
> > 149:PERF_SAMPLE_MAX = 1U << 24, /* non-ABI */
> > 151:__PERF_SAMPLE_CALLCHAIN_EARLY = 1ULL << 63, /*
> > non-ABI; internal use */
> > 189:PERF_SAMPLE_BRANCH_MAX_SHIFT/* non-ABI */
> > 267:PERF_TXN_MAX= (1 << 8), /* non-ABI */
> > 301:PERF_FORMAT_MAX = 1U << 4, /* non-ABI */
> > 1067: PERF_RECORD_MAX,/* non-ABI */
> > 1078: PERF_RECORD_KSYMBOL_TYPE_MAX/* non-ABI */
> > 1087: PERF_BPF_EVENT_MAX, /* non-ABI */
>
> Any thoughts on similarly annotating all our _MA
Re: out of tree driver builds broken with C++
14/02/2022 11:45, Bruce Richardson: > On Mon, Feb 14, 2022 at 10:22:08AM +0100, Thomas Monjalon wrote: > > 14/02/2022 10:13, Tyler Retzlaff: > > > while the driver api is "internal" we agreed some time ago that drivers > > > could be built external to the dpdk tree. by enabling the meson setup > > > option -Denable_driver_sdk=true. > > > > > > it was agreed that the driver api was internal and would attract no > > > binary compatibility support which was fine. this change has now > > > imposed a further restriction that out of tree drivers have to be > > > authored in C only as non-C++ compatible code will invariably leak into > > > the internal structures. > > > > > > you won't allow us to build C++ drivers in the dpdk tree and it seems > > > now you are preventing building of C++ drivers outside of the tree too. > > > > That's the problem of non-written assumptions, they are unknown or > > forgotten. > > Did we agree to support out-of-tree drivers in C++? > > > > We really need to make things clear and written in documentation. > > > > > could we please re-evaluate this. > > > > Yes we can re-evaluate. > > What is the list of impacted files? > > > Hacking meson files a bit, the list of SDK header files is reported as below. > > /Bruce > > Message: SDK headers: > Message: ethdev_driver.h > Message: ethdev_pci.h > Message: ethdev_vdev.h > Message: cryptodev_pmd.h > Message: eventdev_pmd.h > Message: eventdev_pmd_pci.h > Message: eventdev_pmd_vdev.h > Message: eventdev_trace.h > Message: event_timer_adapter_pmd.h > Message: rte_dmadev_pmd.h > Message: vdpa_driver.h I see no harm in supporting C++ include of these headers. Any objection? Could we have a test in chkincs for the SDK headers?
[PATCH 1/6] net/nfb: add missing libfdt dependency for build
From: Martin Spinler
The driver uses some FDT manipulation functions from libfdt.
Let the build system check for libfdt package.
Signed-off-by: Martin Spinler
---
drivers/net/nfb/meson.build | 6 ++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/nfb/meson.build b/drivers/net/nfb/meson.build
index bb5f66a09a..c080c06bf9 100644
--- a/drivers/net/nfb/meson.build
+++ b/drivers/net/nfb/meson.build
@@ -9,6 +9,12 @@ if is_windows
subdir_done()
endif
+if has_libfdt == 0
+build = false
+reason = 'missing dependency, "libfdt"'
+subdir_done()
+endif
+
dep = dependency('netcope-common', required: false, method: 'pkg-config')
reason = 'missing dependency, "libnfb"'
build = dep.found()
--
2.35.1
[PATCH 2/6] drivers/nfb: fix array indexes in deinit functions
From: Martin Spinler
The indexes in the for cycle were wrongly used and
the code accessed outside of the rxmac/txmac array.
Signed-off-by: Martin Spinler
---
drivers/net/nfb/nfb_ethdev.c | 14 --
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index 3c39937816..0b27fe78cc 100644
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -77,9 +77,10 @@ static void
nfb_nc_rxmac_deinit(struct nc_rxmac *rxmac[RTE_MAX_NC_RXMAC],
uint16_t max_rxmac)
{
- for (; max_rxmac > 0; --max_rxmac) {
- nc_rxmac_close(rxmac[max_rxmac]);
- rxmac[max_rxmac] = NULL;
+ uint16_t i;
+ for (i = 0; i < max_rxmac; i++) {
+ nc_rxmac_close(rxmac[i]);
+ rxmac[i] = NULL;
}
}
@@ -95,9 +96,10 @@ static void
nfb_nc_txmac_deinit(struct nc_txmac *txmac[RTE_MAX_NC_TXMAC],
uint16_t max_txmac)
{
- for (; max_txmac > 0; --max_txmac) {
- nc_txmac_close(txmac[max_txmac]);
- txmac[max_txmac] = NULL;
+ uint16_t i;
+ for (i = 0; i < max_txmac; i++) {
+ nc_txmac_close(txmac[i]);
+ txmac[i] = NULL;
}
}
--
2.35.1
[PATCH 3/6] drivers/nfb: do not report zero-sized TX burst
From: Martin Spinler
Zero-sized TX burst floods the log no more.
Signed-off-by: Martin Spinler
---
drivers/net/nfb/nfb_tx.h | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/drivers/net/nfb/nfb_tx.h b/drivers/net/nfb/nfb_tx.h
index d3cbe3e6b3..910020e9e9 100644
--- a/drivers/net/nfb/nfb_tx.h
+++ b/drivers/net/nfb/nfb_tx.h
@@ -136,7 +136,10 @@ nfb_eth_ndp_tx(void *queue,
struct ndp_packet packets[nb_pkts];
- if (unlikely(ndp->queue == NULL || nb_pkts == 0)) {
+ if (unlikely(nb_pkts == 0))
+ return 0;
+
+ if (unlikely(ndp->queue == NULL)) {
RTE_LOG(ERR, PMD, "TX invalid arguments!\n");
return 0;
}
--
2.35.1
[PATCH 4/6] drivers/nfb: use RTE_ETH_RX_OFFLOAD_TIMESTAMP flag
From: Martin Spinler
Rewrite the RX timestamp setup code to use standard offload flag.
Signed-off-by: Martin Spinler
---
drivers/net/nfb/nfb.h| 3 +-
drivers/net/nfb/nfb_ethdev.c | 19 -
drivers/net/nfb/nfb_rx.c | 53
drivers/net/nfb/nfb_rx.h | 7 +
4 files changed, 20 insertions(+), 62 deletions(-)
diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h
index 59d3ab4986..4de9006ac0 100644
--- a/drivers/net/nfb/nfb.h
+++ b/drivers/net/nfb/nfb.h
@@ -37,8 +37,7 @@
#define RTE_NFB_DRIVER_NAME net_nfb
/* Device arguments */
-#define TIMESTAMP_ARG "timestamp"
-static const char * const VALID_KEYS[] = {TIMESTAMP_ARG, NULL};
+static const char * const VALID_KEYS[] = {NULL};
struct pmd_internals {
uint16_t max_rxmac;
diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index 0b27fe78cc..53a98642b3 100644
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -183,6 +183,22 @@ nfb_eth_dev_stop(struct rte_eth_dev *dev)
static int
nfb_eth_dev_configure(struct rte_eth_dev *dev __rte_unused)
{
+ int ret;
+ struct pmd_internals *internals = dev->data->dev_private;
+ struct rte_eth_conf *dev_conf = &dev->data->dev_conf;
+
+ if (dev_conf->rxmode.offloads & RTE_ETH_RX_OFFLOAD_TIMESTAMP) {
+ ret = rte_mbuf_dyn_rx_timestamp_register
+ (&nfb_timestamp_dynfield_offset,
+ &nfb_timestamp_rx_dynflag);
+ if (ret != 0) {
+ RTE_LOG(ERR, PMD, "Cannot register Rx timestamp"
+ " field/flag %d\n", ret);
+ nfb_close(internals->nfb);
+ return -rte_errno;
+ }
+ }
+
return 0;
}
@@ -203,6 +219,8 @@ nfb_eth_dev_info(struct rte_eth_dev *dev,
dev_info->max_rx_queues = dev->data->nb_rx_queues;
dev_info->max_tx_queues = dev->data->nb_tx_queues;
dev_info->speed_capa = RTE_ETH_LINK_SPEED_100G;
+ dev_info->rx_offload_capa =
+ RTE_ETH_RX_OFFLOAD_TIMESTAMP;
return 0;
}
@@ -609,4 +627,3 @@ static struct rte_pci_driver nfb_eth_driver = {
RTE_PMD_REGISTER_PCI(RTE_NFB_DRIVER_NAME, nfb_eth_driver);
RTE_PMD_REGISTER_PCI_TABLE(RTE_NFB_DRIVER_NAME, nfb_pci_id_table);
RTE_PMD_REGISTER_KMOD_DEP(RTE_NFB_DRIVER_NAME, "* nfb");
-RTE_PMD_REGISTER_PARAM_STRING(RTE_NFB_DRIVER_NAME, TIMESTAMP_ARG "=<0|1>");
diff --git a/drivers/net/nfb/nfb_rx.c b/drivers/net/nfb/nfb_rx.c
index f76e2ba646..8a9b232305 100644
--- a/drivers/net/nfb/nfb_rx.c
+++ b/drivers/net/nfb/nfb_rx.c
@@ -12,56 +12,6 @@
uint64_t nfb_timestamp_rx_dynflag;
int nfb_timestamp_dynfield_offset = -1;
-static int
-timestamp_check_handler(__rte_unused const char *key,
- const char *value, __rte_unused void *opaque)
-{
- if (strcmp(value, "1"))
- return -1;
-
- return 0;
-}
-
-
-static int
-nfb_check_timestamp(struct rte_devargs *devargs)
-{
- struct rte_kvargs *kvlist;
- int ret;
-
- if (devargs == NULL)
- return 0;
-
- kvlist = rte_kvargs_parse(devargs->args, NULL);
- if (kvlist == NULL)
- return 0;
-
- if (!rte_kvargs_count(kvlist, TIMESTAMP_ARG)) {
- rte_kvargs_free(kvlist);
- return 0;
- }
- /* Timestamps are enabled when there is
-* key-value pair: enable_timestamp=1
-* TODO: timestamp should be enabled with RTE_ETH_RX_OFFLOAD_TIMESTAMP
-*/
- if (rte_kvargs_process(kvlist, TIMESTAMP_ARG,
- timestamp_check_handler, NULL) < 0) {
- rte_kvargs_free(kvlist);
- return 0;
- }
- rte_kvargs_free(kvlist);
-
- ret = rte_mbuf_dyn_rx_timestamp_register(
- &nfb_timestamp_dynfield_offset,
- &nfb_timestamp_rx_dynflag);
- if (ret != 0) {
- RTE_LOG(ERR, PMD, "Cannot register Rx timestamp field/flag\n");
- return -rte_errno;
- }
-
- return 1;
-}
-
int
nfb_eth_rx_queue_start(struct rte_eth_dev *dev, uint16_t rxq_id)
{
@@ -138,9 +88,6 @@ nfb_eth_rx_queue_setup(struct rte_eth_dev *dev,
else
rte_free(rxq);
- if (nfb_check_timestamp(dev->device->devargs) > 0)
- rxq->flags |= NFB_TIMESTAMP_FLAG;
-
return ret;
}
diff --git a/drivers/net/nfb/nfb_rx.h b/drivers/net/nfb/nfb_rx.h
index 638205d53c..b618682e13 100644
--- a/drivers/net/nfb/nfb_rx.h
+++ b/drivers/net/nfb/nfb_rx.h
@@ -14,8 +14,6 @@
#include
#include
-#define NFB_TIMESTAMP_FLAG (1 << 0)
-
extern uint64_t nfb_timestamp_rx_dynflag;
extern int nfb_timestamp_dynfield_offset;
@@ -145,7 +143,6 @@ nfb_eth_ndp_rx(void *queue,
uint16_t nb_pkts)
{
struct ndp_rx_queue *ndp = queue;
- uint8_t timestamping_enabled;
uint16_t packet_si
[PATCH 5/6] drivers/nfb: fix multicast/promiscuous mode switching
From: Martin Spinler
In the firmware, the promisc mode overrides the multicast mode.
So when the promisc mode is turned off, driver must check if the
multicast mode was active before and conditionally reactivate it.
Signed-off-by: Martin Spinler
---
drivers/net/nfb/nfb.h| 4
drivers/net/nfb/nfb_ethdev.c | 1 -
drivers/net/nfb/nfb_rxmode.c | 20
3 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/drivers/net/nfb/nfb.h b/drivers/net/nfb/nfb.h
index 4de9006ac0..7dc5bd29e4 100644
--- a/drivers/net/nfb/nfb.h
+++ b/drivers/net/nfb/nfb.h
@@ -47,10 +47,6 @@ struct pmd_internals {
char nfb_dev[PATH_MAX];
struct nfb_device *nfb;
- /* Place to remember if filter was promiscuous or filtering by table,
-* when disabling allmulticast
-*/
- enum nc_rxmac_mac_filter rx_filter_original;
};
#endif /* _NFB_H_ */
diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index 53a98642b3..5d503e131a 100644
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -534,7 +534,6 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)
data->promiscuous = nfb_eth_promiscuous_get(dev);
data->all_multicast = nfb_eth_allmulticast_get(dev);
- internals->rx_filter_original = data->promiscuous;
dev->data->dev_flags |= RTE_ETH_DEV_AUTOFILL_QUEUE_XSTATS;
diff --git a/drivers/net/nfb/nfb_rxmode.c b/drivers/net/nfb/nfb_rxmode.c
index 2d0b613d21..ca6e4d5578 100644
--- a/drivers/net/nfb/nfb_rxmode.c
+++ b/drivers/net/nfb/nfb_rxmode.c
@@ -14,8 +14,6 @@ nfb_eth_promiscuous_enable(struct rte_eth_dev *dev)
dev->data->dev_private;
uint16_t i;
- internals->rx_filter_original = RXMAC_MAC_FILTER_PROMISCUOUS;
-
for (i = 0; i < internals->max_rxmac; ++i) {
nc_rxmac_mac_filter_enable(internals->rxmac[i],
RXMAC_MAC_FILTER_PROMISCUOUS);
@@ -30,16 +28,13 @@ nfb_eth_promiscuous_disable(struct rte_eth_dev *dev)
struct pmd_internals *internals = (struct pmd_internals *)
dev->data->dev_private;
uint16_t i;
+ enum nc_rxmac_mac_filter filter = RXMAC_MAC_FILTER_TABLE_BCAST;
- internals->rx_filter_original = RXMAC_MAC_FILTER_TABLE;
-
- /* if promisc is not enabled, do nothing */
- if (!nfb_eth_promiscuous_get(dev))
- return 0;
+ if (dev->data->all_multicast)
+ filter = RXMAC_MAC_FILTER_TABLE_BCAST_MCAST;
for (i = 0; i < internals->max_rxmac; ++i) {
- nc_rxmac_mac_filter_enable(internals->rxmac[i],
- RXMAC_MAC_FILTER_TABLE);
+ nc_rxmac_mac_filter_enable(internals->rxmac[i], filter);
}
return 0;
@@ -67,6 +62,8 @@ nfb_eth_allmulticast_enable(struct rte_eth_dev *dev)
dev->data->dev_private;
uint16_t i;
+ if (dev->data->promiscuous)
+ return 0;
for (i = 0; i < internals->max_rxmac; ++i) {
nc_rxmac_mac_filter_enable(internals->rxmac[i],
RXMAC_MAC_FILTER_TABLE_BCAST_MCAST);
@@ -83,13 +80,12 @@ nfb_eth_allmulticast_disable(struct rte_eth_dev *dev)
uint16_t i;
- /* if multicast is not enabled do nothing */
- if (!nfb_eth_allmulticast_get(dev))
+ if (dev->data->promiscuous)
return 0;
for (i = 0; i < internals->max_rxmac; ++i) {
nc_rxmac_mac_filter_enable(internals->rxmac[i],
- internals->rx_filter_original);
+ RXMAC_MAC_FILTER_TABLE_BCAST);
}
return 0;
--
2.35.1
[PATCH 6/6] drivers/nfb: add support for more MAC addresses
From: Martin Spinler
Extend the eth_dev_ops by add/remove MAC address functions.
Signed-off-by: Martin Spinler
---
drivers/net/nfb/nfb_ethdev.c | 69 ++--
1 file changed, 58 insertions(+), 11 deletions(-)
diff --git a/drivers/net/nfb/nfb_ethdev.c b/drivers/net/nfb/nfb_ethdev.c
index 5d503e131a..7dec8e022e 100644
--- a/drivers/net/nfb/nfb_ethdev.c
+++ b/drivers/net/nfb/nfb_ethdev.c
@@ -214,7 +214,19 @@ static int
nfb_eth_dev_info(struct rte_eth_dev *dev,
struct rte_eth_dev_info *dev_info)
{
- dev_info->max_mac_addrs = 1;
+ uint16_t i;
+ uint32_t max_mac_addrs;
+ struct pmd_internals *internals = dev->data->dev_private;
+
+ dev_info->max_mac_addrs = (uint32_t)-1;
+ for (i = 0; i < internals->max_rxmac; i++) {
+ max_mac_addrs = nc_rxmac_mac_address_count(internals->rxmac[i]);
+ dev_info->max_mac_addrs = RTE_MIN(max_mac_addrs,
+ dev_info->max_mac_addrs);
+ }
+ if (internals->max_rxmac == 0)
+ dev_info->max_mac_addrs = 0;
+
dev_info->max_rx_pktlen = (uint32_t)-1;
dev_info->max_rx_queues = dev->data->nb_rx_queues;
dev_info->max_tx_queues = dev->data->nb_tx_queues;
@@ -376,6 +388,18 @@ nfb_eth_dev_set_link_down(struct rte_eth_dev *dev)
return 0;
}
+static uint64_t
+nfb_eth_mac_addr_conv(struct rte_ether_addr *mac_addr)
+{
+ int i;
+ uint64_t res = 0;
+ for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) {
+ res <<= 8;
+ res |= mac_addr->addr_bytes[i] & 0xFF;
+ }
+ return res;
+}
+
/**
* DPDK callback to set primary MAC address.
*
@@ -392,26 +416,47 @@ nfb_eth_mac_addr_set(struct rte_eth_dev *dev,
struct rte_ether_addr *mac_addr)
{
unsigned int i;
- uint64_t mac = 0;
+ uint64_t mac;
struct rte_eth_dev_data *data = dev->data;
struct pmd_internals *internals = (struct pmd_internals *)
data->dev_private;
- if (!rte_is_valid_assigned_ether_addr(mac_addr))
- return -EINVAL;
+ mac = nfb_eth_mac_addr_conv(mac_addr);
+ for (i = 0; i < internals->max_rxmac; ++i)
+ nc_rxmac_set_mac(internals->rxmac[i], 0, mac, 1);
- for (i = 0; i < RTE_ETHER_ADDR_LEN; i++) {
- mac <<= 8;
- mac |= mac_addr->addr_bytes[i] & 0xFF;
- }
+ return 0;
+}
+static int
+nfb_eth_mac_addr_add(struct rte_eth_dev *dev,
+ struct rte_ether_addr *mac_addr, uint32_t index, uint32_t pool
__rte_unused)
+{
+ unsigned int i;
+ uint64_t mac = 0;
+ struct rte_eth_dev_data *data = dev->data;
+ struct pmd_internals *internals = (struct pmd_internals *)
+ data->dev_private;
+
+ mac = nfb_eth_mac_addr_conv(mac_addr);
for (i = 0; i < internals->max_rxmac; ++i)
- nc_rxmac_set_mac(internals->rxmac[i], 0, mac, 1);
+ nc_rxmac_set_mac(internals->rxmac[i], index, mac, 1);
- rte_ether_addr_copy(mac_addr, data->mac_addrs);
return 0;
}
+static void
+nfb_eth_mac_addr_remove(struct rte_eth_dev *dev, uint32_t index)
+{
+ unsigned int i;
+ struct rte_eth_dev_data *data = dev->data;
+ struct pmd_internals *internals = (struct pmd_internals *)
+ data->dev_private;
+
+ for (i = 0; i < internals->max_rxmac; ++i)
+ nc_rxmac_set_mac(internals->rxmac[i], index, 0, 0);
+}
+
static const struct eth_dev_ops ops = {
.dev_start = nfb_eth_dev_start,
.dev_stop = nfb_eth_dev_stop,
@@ -436,6 +481,8 @@ static const struct eth_dev_ops ops = {
.stats_get = nfb_eth_stats_get,
.stats_reset = nfb_eth_stats_reset,
.mac_addr_set = nfb_eth_mac_addr_set,
+ .mac_addr_add = nfb_eth_mac_addr_add,
+ .mac_addr_remove = nfb_eth_mac_addr_remove,
};
/**
@@ -530,7 +577,7 @@ nfb_eth_dev_init(struct rte_eth_dev *dev)
eth_addr_init.addr_bytes[1] = eth_addr.addr_bytes[1];
eth_addr_init.addr_bytes[2] = eth_addr.addr_bytes[2];
- nfb_eth_mac_addr_set(dev, ð_addr_init);
+ rte_eth_dev_default_mac_addr_set(dev->data->port_id, ð_addr_init);
data->promiscuous = nfb_eth_promiscuous_get(dev);
data->all_multicast = nfb_eth_allmulticast_get(dev);
--
2.35.1
[PATCH v7 00/50] introduce IWYU
This patchset introduces the include-what-you-use script which removes unused header includes. IWYU GitHub: https://github.com/include-what-you-use/include-what-you-use Along with the script there are some patches which make a start on removing unneeded headers. V4: * Re-added removed headers that are now needed in order to fix build issues. * Removed other unused headers from other libraries V5: * Fix build issues for RHEL 7. * Squash commits for overlapping libraries. V6: * Fix some Windows build issues. * Fix some RHEL 8 build issues. V7: * Further RHEL 8 and FreeBSD build issues fixed. Sean Morrissey (50): devtools: script to remove unused headers includes telemetry: remove unneeded header includes ring: remove unneeded header includes kvargs: remove unneeded header includes eal: remove unneeded header includes vhost: remove unneeded header includes timer: remove unneeded header includes table: remove unneeded header includes stack: remove unneeded header includes security: remove unneeded header includes sched: remove unneeded header includes rib: remove unneeded header includes reorder: remove unneeded header includes regexdev: remove unneeded header includes rcu: remove unneeded header includes rawdev: remove unneeded header includes power: remove unneeded header includes port: remove unneeded header includes pipeline: remove unneeded header includes pdump: remove unneeded header includes pci: remove unneeded header includes pcapng: remove unneeded header includes node: remove unneeded header includes net: remove unneeded header includes metrics: remove unneeded header includes mempool: remove unneeded header includes member: remove unneeded header includes mbuf: remove unneeded header includes lpm: remove unneeded header includes latencystats: remove unneeded header includes kni: remove unneeded header includes jobstats: remove unneeded header includes ipsec: remove unneeded header includes ip_frag: remove unneeded header includes hash: remove unneeded header includes gro: remove unneeded header includes graph: remove unneeded header includes gpudev: remove unneeded header includes flow_classify: remove unneeded header includes fib: remove unneeded header includes eventdev: remove unneeded header includes efd: remove unneeded header includes dmadev: remove unneeded header includes distributor: remove unneeded header includes compressdev: remove unneeded header includes cmdline: remove unneeded header includes bpf: remove unneeded header includes bbdev: remove unneeded header includes cryptodev: remove unneeded header includes acl: remove unneeded header includes devtools/process_iwyu.py| 109 examples/vm_power_manager/guest_cli/main.c | 1 + lib/acl/rte_acl.c | 1 - lib/bbdev/rte_bbdev.c | 4 - lib/bbdev/rte_bbdev.h | 4 - lib/bpf/bpf.c | 4 - lib/bpf/bpf_exec.c | 6 -- lib/bpf/bpf_jit_x86.c | 5 - lib/bpf/bpf_load.c | 8 -- lib/bpf/bpf_pkt.c | 12 --- lib/bpf/bpf_validate.c | 3 - lib/cmdline/cmdline.c | 2 - lib/cmdline/cmdline_parse.c | 3 - lib/cmdline/cmdline_parse_portlist.c| 3 - lib/cmdline/cmdline_parse_string.c | 4 - lib/cmdline/cmdline_rdline.c| 2 - lib/cmdline/cmdline_vt100.c | 3 - lib/compressdev/rte_comp.c | 1 - lib/compressdev/rte_comp.h | 1 - lib/compressdev/rte_compressdev.c | 1 - lib/compressdev/rte_compressdev.h | 1 - lib/compressdev/rte_compressdev_pmd.h | 2 - lib/cryptodev/cryptodev_pmd.h | 4 - lib/cryptodev/rte_cryptodev.c | 11 -- lib/cryptodev/rte_cryptodev.h | 2 - lib/distributor/rte_distributor.c | 2 - lib/distributor/rte_distributor_match_sse.c | 2 - lib/distributor/rte_distributor_single.c| 2 - lib/dmadev/rte_dmadev.h | 1 - lib/eal/common/eal_common_dev.c | 5 - lib/eal/common/eal_common_devargs.c | 1 - lib/eal/common/eal_common_errno.c | 4 - lib/eal/common/eal_common_fbarray.c | 3 - lib/eal/common/eal_common_hexdump.c | 3 - lib/eal/common/eal_common_launch.c | 6 -- lib/eal/common/eal_common_lcore.c | 7 +- lib/eal/common/eal_common_log.c | 1 - lib/eal/common/eal_common_memalloc.c| 3 - lib/eal/common/eal_common_memory.c | 4 - lib/eal/common/eal_common_memzone.c | 4 - lib/eal/common/eal_common_options.c | 2 - lib/eal/common/eal_common_proc.c| 2 - lib/eal/common/eal_
[PATCH v7 01/50] devtools: script to remove unused headers includes
This script can be used for removing headers flagged for removal by the
include-what-you-use (IWYU) tool. The script has the ability to remove
headers from specified sub-directories or dpdk as a whole and tests the
build after each removal by calling meson compile.
example usages:
Remove headers flagged by iwyu_tool output file
$ ./devtools/process_iwyu.py iwyu.out -b build
Remove headers flagged by iwyu_tool output file from sub-directory
$ ./devtools/process_iwyu.py iwyu.out -b build -d lib/kvargs
Remove headers directly piped from the iwyu_tool
$ iwyu_tool -p build | ./devtools/process_iwyu.py - -b build
Signed-off-by: Sean Morrissey
Signed-off-by: Conor Fogarty
Reviewed-by: Bruce Richardson
---
devtools/process_iwyu.py | 109 +++
1 file changed, 109 insertions(+)
create mode 100755 devtools/process_iwyu.py
diff --git a/devtools/process_iwyu.py b/devtools/process_iwyu.py
new file mode 100755
index 00..50f3d4c5c7
--- /dev/null
+++ b/devtools/process_iwyu.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright(c) 2021 Intel Corporation
+#
+
+import argparse
+import fileinput
+import sys
+from os.path import abspath, relpath, join
+from pathlib import Path
+from mesonbuild import mesonmain
+
+
+def args_parse():
+"parse arguments and return the argument object back to main"
+parser = argparse.ArgumentParser(description="This script can be used to
remove includes which are not in use\n")
+parser.add_argument('-b', '--build_dir', type=str, default='build',
+help="The path to the build directory in which the
IWYU tool was used in.")
+parser.add_argument('-d', '--sub_dir', type=str, default='',
+help="The sub-directory to remove headers from.")
+parser.add_argument('file', type=Path,
+help="The path to the IWYU log file or output from
stdin.")
+
+return parser.parse_args()
+
+
+def run_meson(args):
+"Runs a meson command logging output to process.log"
+with open('process_iwyu.log', 'a') as sys.stdout:
+ret = mesonmain.run(args, abspath('meson'))
+sys.stdout = sys.__stdout__
+return ret
+
+
+def remove_includes(filepath, include, build_dir):
+"Attempts to remove include, if it fails then revert to original state"
+with open(filepath) as f:
+lines = f.readlines() # Read lines when file is opened
+
+with open(filepath, 'w') as f:
+for ln in lines: # Removes the include passed in
+if not ln.startswith(include):
+f.write(ln)
+
+# run test build -> call meson on the build folder, meson compile -C build
+ret = run_meson(['compile', '-C', build_dir])
+if (ret == 0): # Include is not needed -> build is successful
+print('SUCCESS')
+else:
+# failed, catch the error
+# return file to original state
+with open(filepath, 'w') as f:
+f.writelines(lines)
+print('FAILED')
+
+
+def get_build_config(builddir, condition):
+"returns contents of rte_build_config.h"
+with open(join(builddir, 'rte_build_config.h')) as f:
+return [ln for ln in f.readlines() if condition(ln)]
+
+
+def uses_libbsd(builddir):
+"return whether the build uses libbsd or not"
+return bool(get_build_config(builddir, lambda ln: 'RTE_USE_LIBBSD' in ln))
+
+
+def process(args):
+"process the iwyu output on a set of files"
+filepath = None
+build_dir = abspath(args.build_dir)
+directory = args.sub_dir
+
+print("Warning: The results of this script may include false positives
which are required for different systems",
+ file=sys.stderr)
+
+keep_str_fns = uses_libbsd(build_dir) # check for libbsd
+if keep_str_fns:
+print("Warning: libbsd is present, build will fail to detect incorrect
removal of rte_string_fns.h",
+ file=sys.stderr)
+# turn on werror
+run_meson(['configure', build_dir, '-Dwerror=true'])
+# Use stdin if no iwyu_tool out file given
+for line in fileinput.input(args.file):
+if 'should remove' in line:
+# If the file path in the iwyu_tool output is an absolute path it
+# means the file is outside of the dpdk directory, therefore
ignore it.
+# Also check to see if the file is within the specified sub
directory.
+filename = line.split()[0]
+if (filename != abspath(filename) and
+directory in filename):
+filepath = relpath(join(build_dir, filename))
+elif line.startswith('-') and filepath:
+include = '#include ' + line.split()[2]
+print(f"Remove {include} from {filepath} ... ", end='', flush=True)
+if keep_str_fns and '' in include:
+print('skipped')
+continue
+remove_includes(filepath, include, build_dir)
+else:
+
[PATCH v7 02/50] telemetry: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
Acked-by: Ciara Power
---
lib/telemetry/telemetry.c | 1 -
lib/telemetry/telemetry_data.h | 1 -
2 files changed, 2 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index e5ccfe47f7..c6fd03a5ab 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#endif /* !RTE_EXEC_ENV_WINDOWS */
/* we won't link against libbsd, so just always use DPDKs-specific strlcpy */
diff --git a/lib/telemetry/telemetry_data.h b/lib/telemetry/telemetry_data.h
index adb84a09f1..26aa28e72c 100644
--- a/lib/telemetry/telemetry_data.h
+++ b/lib/telemetry/telemetry_data.h
@@ -5,7 +5,6 @@
#ifndef _TELEMETRY_DATA_H_
#define _TELEMETRY_DATA_H_
-#include
#include "rte_telemetry.h"
enum tel_container_types {
--
2.25.1
[PATCH v7 03/50] ring: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ring/rte_ring.c | 9 - 1 file changed, 9 deletions(-) diff --git a/lib/ring/rte_ring.c b/lib/ring/rte_ring.c index f17bd966be..7945e5d9ed 100644 --- a/lib/ring/rte_ring.c +++ b/lib/ring/rte_ring.c @@ -8,7 +8,6 @@ */ #include -#include #include #include #include @@ -17,19 +16,11 @@ #include #include -#include #include #include -#include -#include #include -#include -#include -#include -#include #include #include -#include #include #include "rte_ring.h" -- 2.25.1
[PATCH v7 04/50] kvargs: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/kvargs/rte_kvargs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/kvargs/rte_kvargs.c b/lib/kvargs/rte_kvargs.c index 11f624ef14..c77bb82feb 100644 --- a/lib/kvargs/rte_kvargs.c +++ b/lib/kvargs/rte_kvargs.c @@ -8,7 +8,6 @@ #include #include -#include #include "rte_kvargs.h" -- 2.25.1
[PATCH v7 05/50] eal: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey Reviewed-by: Harry van Haaren Reviewed-by: Mattias Rönnblom Reviewed-by: David Christensen --- lib/eal/common/eal_common_dev.c| 5 - lib/eal/common/eal_common_devargs.c| 1 - lib/eal/common/eal_common_errno.c | 4 lib/eal/common/eal_common_fbarray.c| 3 --- lib/eal/common/eal_common_hexdump.c| 3 --- lib/eal/common/eal_common_launch.c | 6 -- lib/eal/common/eal_common_lcore.c | 7 +-- lib/eal/common/eal_common_log.c| 1 - lib/eal/common/eal_common_memalloc.c | 3 --- lib/eal/common/eal_common_memory.c | 4 lib/eal/common/eal_common_memzone.c| 4 lib/eal/common/eal_common_options.c| 2 -- lib/eal/common/eal_common_proc.c | 2 -- lib/eal/common/eal_common_string_fns.c | 2 -- lib/eal/common/eal_common_tailqs.c | 11 --- lib/eal/common/eal_common_thread.c | 3 --- lib/eal/common/eal_common_timer.c | 6 -- lib/eal/common/eal_common_trace.c | 1 - lib/eal/common/hotplug_mp.h| 1 - lib/eal/common/malloc_elem.c | 6 -- lib/eal/common/malloc_heap.c | 5 - lib/eal/common/malloc_mp.c | 1 - lib/eal/common/malloc_mp.h | 2 -- lib/eal/common/rte_malloc.c| 5 - lib/eal/common/rte_random.c| 3 --- lib/eal/common/rte_service.c | 6 -- lib/eal/include/rte_version.h | 2 -- lib/eal/linux/eal.c| 10 -- lib/eal/linux/eal_alarm.c | 7 --- lib/eal/linux/eal_cpuflags.c | 2 -- lib/eal/linux/eal_debug.c | 5 - lib/eal/linux/eal_dev.c| 4 lib/eal/linux/eal_hugepage_info.c | 7 --- lib/eal/linux/eal_interrupts.c | 8 lib/eal/linux/eal_lcore.c | 7 --- lib/eal/linux/eal_log.c| 11 +-- lib/eal/linux/eal_memalloc.c | 8 lib/eal/linux/eal_memory.c | 9 - lib/eal/linux/eal_thread.c | 6 -- lib/eal/linux/eal_timer.c | 15 --- lib/eal/linux/eal_vfio_mp_sync.c | 1 - lib/eal/unix/eal_file.c| 1 - lib/eal/unix/rte_thread.c | 1 - lib/eal/x86/rte_cycles.c | 1 - 44 files changed, 2 insertions(+), 200 deletions(-) diff --git a/lib/eal/common/eal_common_dev.c b/lib/eal/common/eal_common_dev.c index e1e9976d8d..c0ee4e442f 100644 --- a/lib/eal/common/eal_common_dev.c +++ b/lib/eal/common/eal_common_dev.c @@ -5,20 +5,15 @@ #include #include -#include #include -#include #include #include #include #include -#include #include -#include #include #include -#include #include #include "eal_private.h" diff --git a/lib/eal/common/eal_common_devargs.c b/lib/eal/common/eal_common_devargs.c index 8c7650cf6c..c3c3a9e6e4 100644 --- a/lib/eal/common/eal_common_devargs.c +++ b/lib/eal/common/eal_common_devargs.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include diff --git a/lib/eal/common/eal_common_errno.c b/lib/eal/common/eal_common_errno.c index f86802705a..1091065568 100644 --- a/lib/eal/common/eal_common_errno.c +++ b/lib/eal/common/eal_common_errno.c @@ -5,15 +5,11 @@ /* Use XSI-compliant portable version of strerror_r() */ #undef _GNU_SOURCE -#include #include #include -#include -#include #include #include -#include #ifdef RTE_EXEC_ENV_WINDOWS #define strerror_r(errnum, buf, buflen) strerror_s(buf, buflen, errnum) diff --git a/lib/eal/common/eal_common_fbarray.c b/lib/eal/common/eal_common_fbarray.c index 3a28a53247..f11f87979f 100644 --- a/lib/eal/common/eal_common_fbarray.c +++ b/lib/eal/common/eal_common_fbarray.c @@ -2,7 +2,6 @@ * Copyright(c) 2017-2018 Intel Corporation */ -#include #include #include #include @@ -14,9 +13,7 @@ #include #include #include -#include #include -#include #include "eal_filesystem.h" #include "eal_private.h" diff --git a/lib/eal/common/eal_common_hexdump.c b/lib/eal/common/eal_common_hexdump.c index 2d2179d411..63bbbdcf0a 100644 --- a/lib/eal/common/eal_common_hexdump.c +++ b/lib/eal/common/eal_common_hexdump.c @@ -1,10 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * Copyright(c) 2010-2014 Intel Corporation */ -#include #include -#include -#include #include #include diff --git a/lib/eal/common/eal_common_launch.c b/lib/eal/common/eal_common_launch.c index e95dadffb3..9f393b9bda 100644 --- a/lib/eal/common/eal_common_launch.c +++ b/lib/eal/common/eal_common_launch.c @@ -3,16 +3,10 @@ */ #include -#include -#include -#include #include -#include -#include #include #include -#include #include #include "eal_private.h" diff --git a/lib/eal/common/eal_common_lcore.c b/lib/eal/common/eal_common_lcore.c index
[PATCH v7 06/50] vhost: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/vhost/fd_man.c | 6 -- lib/vhost/fd_man.h | 1 - lib/vhost/socket.c | 1 - lib/vhost/vdpa.c | 1 - lib/vhost/vhost.c | 4 lib/vhost/vhost.h | 2 -- lib/vhost/vhost_user.c | 2 -- 7 files changed, 17 deletions(-) diff --git a/lib/vhost/fd_man.c b/lib/vhost/fd_man.c index 55d4856f9e..1876fada33 100644 --- a/lib/vhost/fd_man.c +++ b/lib/vhost/fd_man.c @@ -2,14 +2,8 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#include #include -#include -#include -#include -#include #include -#include #include #include diff --git a/lib/vhost/fd_man.h b/lib/vhost/fd_man.h index 3ab5cfdd60..6f4499bdfa 100644 --- a/lib/vhost/fd_man.h +++ b/lib/vhost/fd_man.h @@ -4,7 +4,6 @@ #ifndef _FD_MAN_H_ #define _FD_MAN_H_ -#include #include #include diff --git a/lib/vhost/socket.c b/lib/vhost/socket.c index 82963c1e6d..c22d84a2cb 100644 --- a/lib/vhost/socket.c +++ b/lib/vhost/socket.c @@ -8,7 +8,6 @@ #include #include #include -#include #include #include #include diff --git a/lib/vhost/vdpa.c b/lib/vhost/vdpa.c index 09ad5d866e..7c57b3f75b 100644 --- a/lib/vhost/vdpa.c +++ b/lib/vhost/vdpa.c @@ -8,7 +8,6 @@ * Device specific vhost lib */ -#include #include #include diff --git a/lib/vhost/vhost.c b/lib/vhost/vhost.c index 13a9bb9dd1..40703b882f 100644 --- a/lib/vhost/vhost.c +++ b/lib/vhost/vhost.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #ifdef RTE_LIBRTE_VHOST_NUMA @@ -13,13 +12,10 @@ #endif #include -#include #include -#include #include #include #include -#include #include "iotlb.h" #include "vhost.h" diff --git a/lib/vhost/vhost.h b/lib/vhost/vhost.h index 7085e0885c..819d361578 100644 --- a/lib/vhost/vhost.h +++ b/lib/vhost/vhost.h @@ -17,11 +17,9 @@ #include #include -#include #include #include "rte_vhost.h" -#include "rte_vdpa.h" #include "vdpa_driver.h" #include "rte_vhost_async.h" diff --git a/lib/vhost/vhost_user.c b/lib/vhost/vhost_user.c index 5eb1dd6812..f8c216c453 100644 --- a/lib/vhost/vhost_user.c +++ b/lib/vhost/vhost_user.c @@ -27,10 +27,8 @@ #include #include #include -#include #include #include -#include #ifdef RTE_LIBRTE_VHOST_NUMA #include #endif -- 2.25.1
[PATCH v7 07/50] timer: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey Acked-by: Erik Gabriel Carrillo --- lib/timer/rte_timer.c | 6 -- 1 file changed, 6 deletions(-) diff --git a/lib/timer/rte_timer.c b/lib/timer/rte_timer.c index 6d19ce469b..c51a393e5c 100644 --- a/lib/timer/rte_timer.c +++ b/lib/timer/rte_timer.c @@ -2,7 +2,6 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#include #include #include #include @@ -13,18 +12,13 @@ #include #include #include -#include #include -#include -#include #include #include #include #include #include #include -#include -#include #include "rte_timer.h" -- 2.25.1
[PATCH v7 08/50] table: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/table/rte_swx_table_em.c | 1 -
lib/table/rte_swx_table_em.h | 1 -
lib/table/rte_swx_table_learner.c | 1 -
lib/table/rte_swx_table_learner.h | 1 -
lib/table/rte_swx_table_selector.c | 1 -
lib/table/rte_swx_table_wm.c | 2 --
lib/table/rte_swx_table_wm.h | 1 -
lib/table/rte_table_acl.c | 3 ---
lib/table/rte_table_array.c| 2 --
lib/table/rte_table_hash_cuckoo.c | 2 --
lib/table/rte_table_hash_ext.c | 2 --
lib/table/rte_table_hash_key16.c | 2 --
lib/table/rte_table_hash_key32.c | 2 --
lib/table/rte_table_hash_key8.c| 2 --
lib/table/rte_table_hash_lru.c | 2 --
lib/table/rte_table_lpm.c | 2 --
lib/table/rte_table_lpm_ipv6.c | 3 ---
lib/table/rte_table_stub.c | 1 -
lib/table/rte_table_stub.h | 1 -
19 files changed, 32 deletions(-)
diff --git a/lib/table/rte_swx_table_em.c b/lib/table/rte_swx_table_em.c
index 03b28c4c9d..f783cfe282 100644
--- a/lib/table/rte_swx_table_em.c
+++ b/lib/table/rte_swx_table_em.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2020 Intel Corporation
*/
-#include
#include
#include
#include
diff --git a/lib/table/rte_swx_table_em.h b/lib/table/rte_swx_table_em.h
index 909ada483b..b7423dd060 100644
--- a/lib/table/rte_swx_table_em.h
+++ b/lib/table/rte_swx_table_em.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Exact Match Table
*/
-#include
#include
diff --git a/lib/table/rte_swx_table_learner.c
b/lib/table/rte_swx_table_learner.c
index c3c840ff06..15576c2aa3 100644
--- a/lib/table/rte_swx_table_learner.c
+++ b/lib/table/rte_swx_table_learner.c
@@ -1,7 +1,6 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2020 Intel Corporation
*/
-#include
#include
#include
#include
diff --git a/lib/table/rte_swx_table_learner.h
b/lib/table/rte_swx_table_learner.h
index d6ec733655..eb9d7689fd 100644
--- a/lib/table/rte_swx_table_learner.h
+++ b/lib/table/rte_swx_table_learner.h
@@ -22,7 +22,6 @@ extern "C" {
*/
#include
-#include
#include
diff --git a/lib/table/rte_swx_table_selector.c
b/lib/table/rte_swx_table_selector.c
index 541ebc2213..ad99f18453 100644
--- a/lib/table/rte_swx_table_selector.c
+++ b/lib/table/rte_swx_table_selector.c
@@ -7,7 +7,6 @@
#include
#include
-#include
#include "rte_swx_table_selector.h"
diff --git a/lib/table/rte_swx_table_wm.c b/lib/table/rte_swx_table_wm.c
index e260be1062..27a67b47bd 100644
--- a/lib/table/rte_swx_table_wm.c
+++ b/lib/table/rte_swx_table_wm.c
@@ -4,10 +4,8 @@
#include
#include
#include
-#include
#include
-#include
#include
#include
diff --git a/lib/table/rte_swx_table_wm.h b/lib/table/rte_swx_table_wm.h
index 9e228f971c..4fd52c0a17 100644
--- a/lib/table/rte_swx_table_wm.h
+++ b/lib/table/rte_swx_table_wm.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Wildcard Match Table
*/
-#include
#include
diff --git a/lib/table/rte_table_acl.c b/lib/table/rte_table_acl.c
index 14d54019f0..179a1da835 100644
--- a/lib/table/rte_table_acl.c
+++ b/lib/table/rte_table_acl.c
@@ -6,13 +6,10 @@
#include
#include
-#include
-#include
#include
#include
#include "rte_table_acl.h"
-#include
#ifdef RTE_TABLE_STATS_COLLECT
diff --git a/lib/table/rte_table_array.c b/lib/table/rte_table_array.c
index 8264c50c27..54a0c42f7d 100644
--- a/lib/table/rte_table_array.c
+++ b/lib/table/rte_table_array.c
@@ -6,8 +6,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_cuckoo.c
b/lib/table/rte_table_hash_cuckoo.c
index f024303330..c77eccf527 100644
--- a/lib/table/rte_table_hash_cuckoo.c
+++ b/lib/table/rte_table_hash_cuckoo.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_ext.c b/lib/table/rte_table_hash_ext.c
index 802a24fe0f..70ea84fa2e 100644
--- a/lib/table/rte_table_hash_ext.c
+++ b/lib/table/rte_table_hash_ext.c
@@ -6,8 +6,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_key16.c b/lib/table/rte_table_hash_key16.c
index c4384b114d..ea8195dc17 100644
--- a/lib/table/rte_table_hash_key16.c
+++ b/lib/table/rte_table_hash_key16.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_key32.c b/lib/table/rte_table_hash_key32.c
index 3e0031fe1e..87f83ce6f5 100644
--- a/lib/table/rte_table_hash_key32.c
+++ b/lib/table/rte_table_hash_key32.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/table/rte_table_hash_key8.c b/lib/table/rte_table_hash_key8.c
index 34e3ed1af9..7779a9d1a3 100644
--- a/lib/table/rte_table_hash_key8.c
+++ b/lib/table/rte_table_hash_key8.c
@@ -5,8 +5,6 @@
#include
#include
-#include
-#include
[PATCH v7 09/50] stack: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/stack/rte_stack.c | 2 --
lib/stack/rte_stack.h | 1 -
2 files changed, 3 deletions(-)
diff --git a/lib/stack/rte_stack.c b/lib/stack/rte_stack.c
index 56bf2c8d6d..1fabec2bfe 100644
--- a/lib/stack/rte_stack.c
+++ b/lib/stack/rte_stack.c
@@ -6,12 +6,10 @@
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include "rte_stack.h"
diff --git a/lib/stack/rte_stack.h b/lib/stack/rte_stack.h
index 321f4cec1a..91fc570767 100644
--- a/lib/stack/rte_stack.h
+++ b/lib/stack/rte_stack.h
@@ -19,7 +19,6 @@
extern "C" {
#endif
-#include
#include
#include
#include
--
2.25.1
[PATCH v7 10/50] security: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/security/rte_security.c | 2 --
lib/security/rte_security.h | 3 ---
2 files changed, 5 deletions(-)
diff --git a/lib/security/rte_security.c b/lib/security/rte_security.c
index 6e45a03fa0..4f5e4b4d49 100644
--- a/lib/security/rte_security.c
+++ b/lib/security/rte_security.c
@@ -5,10 +5,8 @@
*/
#include
-#include
#include
#include
-#include "rte_compat.h"
#include "rte_security.h"
#include "rte_security_driver.h"
diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h
index 1228b6c8b1..d54d993ccc 100644
--- a/lib/security/rte_security.h
+++ b/lib/security/rte_security.h
@@ -23,10 +23,7 @@ extern "C" {
#include
#include
#include
-#include
#include
-#include
-#include
/** IPSec protocol mode */
enum rte_security_ipsec_sa_mode {
--
2.25.1
[PATCH v7 11/50] sched: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/sched/rte_pie.c | 2 --
lib/sched/rte_red.h | 1 -
lib/sched/rte_sched.c | 1 -
lib/sched/rte_sched.h | 1 -
4 files changed, 5 deletions(-)
diff --git a/lib/sched/rte_pie.c b/lib/sched/rte_pie.c
index 934e9aee50..cdb7bab697 100644
--- a/lib/sched/rte_pie.c
+++ b/lib/sched/rte_pie.c
@@ -5,8 +5,6 @@
#include
#include "rte_pie.h"
-#include
-#include
#include
#ifdef __INTEL_COMPILER
diff --git a/lib/sched/rte_red.h b/lib/sched/rte_red.h
index f5843dab1b..80b43b6da0 100644
--- a/lib/sched/rte_red.h
+++ b/lib/sched/rte_red.h
@@ -18,7 +18,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
diff --git a/lib/sched/rte_sched.c b/lib/sched/rte_sched.c
index 62b3d2e315..e5c62e3d77 100644
--- a/lib/sched/rte_sched.c
+++ b/lib/sched/rte_sched.c
@@ -7,7 +7,6 @@
#include
#include
-#include
#include
#include
#include
diff --git a/lib/sched/rte_sched.h b/lib/sched/rte_sched.h
index 3c625ba169..5ece64e527 100644
--- a/lib/sched/rte_sched.h
+++ b/lib/sched/rte_sched.h
@@ -56,7 +56,6 @@ extern "C" {
*
*/
-#include
#include
#include
#include
--
2.25.1
[PATCH v7 12/50] rib: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/rib/rte_rib.c | 2 --
lib/rib/rte_rib.h | 1 -
lib/rib/rte_rib6.c | 2 --
lib/rib/rte_rib6.h | 1 -
4 files changed, 6 deletions(-)
diff --git a/lib/rib/rte_rib.c b/lib/rib/rte_rib.c
index 6c29e1c49a..cd9e823068 100644
--- a/lib/rib/rte_rib.c
+++ b/lib/rib/rte_rib.c
@@ -6,12 +6,10 @@
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/rib/rte_rib.h b/lib/rib/rte_rib.h
index bebb30f7d7..c18c4ca594 100644
--- a/lib/rib/rte_rib.h
+++ b/lib/rib/rte_rib.h
@@ -17,7 +17,6 @@
#include
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/rib/rte_rib6.c b/lib/rib/rte_rib6.c
index 70405113b4..042ac1f090 100644
--- a/lib/rib/rte_rib6.c
+++ b/lib/rib/rte_rib6.c
@@ -6,12 +6,10 @@
#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/rib/rte_rib6.h b/lib/rib/rte_rib6.h
index 6f532265c6..fa8e9bf732 100644
--- a/lib/rib/rte_rib6.h
+++ b/lib/rib/rte_rib6.h
@@ -15,7 +15,6 @@
*/
#include
-#include
#include
#ifdef __cplusplus
--
2.25.1
[PATCH v7 13/50] reorder: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/reorder/rte_reorder.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/reorder/rte_reorder.c b/lib/reorder/rte_reorder.c index 9445853b79..f40a48201f 100644 --- a/lib/reorder/rte_reorder.c +++ b/lib/reorder/rte_reorder.c @@ -2,7 +2,6 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#include #include #include -- 2.25.1
[PATCH v7 14/50] regexdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
Acked-by: Ori Kam
---
lib/regexdev/rte_regexdev.c | 2 --
lib/regexdev/rte_regexdev.h | 3 ---
2 files changed, 5 deletions(-)
diff --git a/lib/regexdev/rte_regexdev.c b/lib/regexdev/rte_regexdev.c
index 04ab713730..02a388bc5d 100644
--- a/lib/regexdev/rte_regexdev.c
+++ b/lib/regexdev/rte_regexdev.c
@@ -5,8 +5,6 @@
#include
-#include
-#include
#include
#include
diff --git a/lib/regexdev/rte_regexdev.h b/lib/regexdev/rte_regexdev.h
index 0bac46cda9..4ba67b0c25 100644
--- a/lib/regexdev/rte_regexdev.h
+++ b/lib/regexdev/rte_regexdev.h
@@ -199,11 +199,8 @@ extern "C" {
#endif
#include
-#include
#include
-#include
#include
-#include
#define RTE_REGEXDEV_NAME_MAX_LEN RTE_DEV_NAME_MAX_LEN
--
2.25.1
[PATCH v7 15/50] rcu: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/rcu/rte_rcu_qsbr.c | 4
lib/rcu/rte_rcu_qsbr.h | 4
2 files changed, 8 deletions(-)
diff --git a/lib/rcu/rte_rcu_qsbr.c b/lib/rcu/rte_rcu_qsbr.c
index 7510db2f81..17be93e830 100644
--- a/lib/rcu/rte_rcu_qsbr.c
+++ b/lib/rcu/rte_rcu_qsbr.c
@@ -13,10 +13,6 @@
#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
diff --git a/lib/rcu/rte_rcu_qsbr.h b/lib/rcu/rte_rcu_qsbr.h
index 62a420a785..d81bf5e8db 100644
--- a/lib/rcu/rte_rcu_qsbr.h
+++ b/lib/rcu/rte_rcu_qsbr.h
@@ -32,11 +32,7 @@ extern "C" {
#include
#include
#include
-#include
-#include
#include
-#include
-#include
#include
#include
#include
--
2.25.1
[PATCH v7 16/50] rawdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey Acked-by: Hemant Agrawal --- lib/rawdev/rte_rawdev.c | 14 -- 1 file changed, 14 deletions(-) diff --git a/lib/rawdev/rte_rawdev.c b/lib/rawdev/rte_rawdev.c index a6134e76ea..2f0a4f132e 100644 --- a/lib/rawdev/rte_rawdev.c +++ b/lib/rawdev/rte_rawdev.c @@ -6,29 +6,15 @@ #include #include #include -#include #include #include #include -#include -#include #include -#include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include #include #include "rte_rawdev.h" -- 2.25.1
[PATCH v7 17/50] power: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Also added rte_string_fns.h to example app vm_power_manager for users without libbsd. Signed-off-by: Sean Morrissey Acked-by: David Hunt --- examples/vm_power_manager/guest_cli/main.c | 1 + lib/power/guest_channel.c | 2 -- lib/power/power_acpi_cpufreq.c | 7 --- lib/power/power_acpi_cpufreq.h | 4 lib/power/power_common.h | 1 - lib/power/power_cppc_cpufreq.c | 1 - lib/power/power_cppc_cpufreq.h | 4 lib/power/power_kvm_vm.c | 1 - lib/power/power_kvm_vm.h | 4 lib/power/power_pstate_cpufreq.c | 6 -- lib/power/power_pstate_cpufreq.h | 4 lib/power/rte_power.c | 1 - lib/power/rte_power.h | 2 -- lib/power/rte_power_empty_poll.c | 2 -- 14 files changed, 1 insertion(+), 39 deletions(-) diff --git a/examples/vm_power_manager/guest_cli/main.c b/examples/vm_power_manager/guest_cli/main.c index b8fa65ef15..9da50020ac 100644 --- a/examples/vm_power_manager/guest_cli/main.c +++ b/examples/vm_power_manager/guest_cli/main.c @@ -13,6 +13,7 @@ #include #include #include +#include #include "vm_power_cli_guest.h" #include "parse.h" diff --git a/lib/power/guest_channel.c b/lib/power/guest_channel.c index 474dd92998..969a9e5aaa 100644 --- a/lib/power/guest_channel.c +++ b/lib/power/guest_channel.c @@ -4,9 +4,7 @@ #include #include -#include #include -#include #include #include #include diff --git a/lib/power/power_acpi_cpufreq.c b/lib/power/power_acpi_cpufreq.c index 402ed8c99b..6e57aca535 100644 --- a/lib/power/power_acpi_cpufreq.c +++ b/lib/power/power_acpi_cpufreq.c @@ -3,17 +3,10 @@ */ #include -#include -#include #include #include -#include -#include -#include -#include #include -#include #include #include "power_acpi_cpufreq.h" diff --git a/lib/power/power_acpi_cpufreq.h b/lib/power/power_acpi_cpufreq.h index 41675b9cd9..682fd9278c 100644 --- a/lib/power/power_acpi_cpufreq.h +++ b/lib/power/power_acpi_cpufreq.h @@ -10,10 +10,6 @@ * RTE Power Management via userspace ACPI cpufreq */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/power_common.h b/lib/power/power_common.h index 0b264edfa5..c1c7139276 100644 --- a/lib/power/power_common.h +++ b/lib/power/power_common.h @@ -5,7 +5,6 @@ #ifndef _POWER_COMMON_H_ #define _POWER_COMMON_H_ -#include #include diff --git a/lib/power/power_cppc_cpufreq.c b/lib/power/power_cppc_cpufreq.c index 25185a791c..ef06fbcd9e 100644 --- a/lib/power/power_cppc_cpufreq.c +++ b/lib/power/power_cppc_cpufreq.c @@ -4,7 +4,6 @@ */ #include -#include #include "power_cppc_cpufreq.h" #include "power_common.h" diff --git a/lib/power/power_cppc_cpufreq.h b/lib/power/power_cppc_cpufreq.h index 4e73c91b05..f4121b237e 100644 --- a/lib/power/power_cppc_cpufreq.h +++ b/lib/power/power_cppc_cpufreq.h @@ -11,10 +11,6 @@ * RTE Power Management via userspace CPPC cpufreq */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/power_kvm_vm.c b/lib/power/power_kvm_vm.c index ab7d4b8cee..6a8109d449 100644 --- a/lib/power/power_kvm_vm.c +++ b/lib/power/power_kvm_vm.c @@ -9,7 +9,6 @@ #include "rte_power_guest_channel.h" #include "guest_channel.h" #include "power_kvm_vm.h" -#include "power_common.h" #define FD_PATH "/dev/virtio-ports/virtio.serial.port.poweragent" diff --git a/lib/power/power_kvm_vm.h b/lib/power/power_kvm_vm.h index 9a309a300f..303fcc041b 100644 --- a/lib/power/power_kvm_vm.h +++ b/lib/power/power_kvm_vm.h @@ -10,10 +10,6 @@ * RTE Power Management KVM VM */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/power_pstate_cpufreq.c b/lib/power/power_pstate_cpufreq.c index 86f8a76e46..f4c36179ec 100644 --- a/lib/power/power_pstate_cpufreq.c +++ b/lib/power/power_pstate_cpufreq.c @@ -3,20 +3,14 @@ */ #include -#include -#include #include -#include #include #include -#include #include #include #include #include -#include -#include #include "power_pstate_cpufreq.h" #include "power_common.h" diff --git a/lib/power/power_pstate_cpufreq.h b/lib/power/power_pstate_cpufreq.h index 3260b32494..7bf64a518c 100644 --- a/lib/power/power_pstate_cpufreq.h +++ b/lib/power/power_pstate_cpufreq.h @@ -10,10 +10,6 @@ * RTE Power Management via Intel Pstate driver */ -#include -#include -#include -#include #include "rte_power.h" /** diff --git a/lib/power/rte_power.c b/lib/power/rte_power.c index 3cba56bac9..0a6614be77 100644 --- a/lib/power/rte_power.c +++ b/lib/power/rte_power.c @@ -10,7 +10,6 @@ #include "power_cppc_cpufreq.h" #include "power_kvm_vm.h" #include "power_pstate_cpufreq.h" -#include "power_common.h" enum power_management_
[PATCH v7 18/50] port: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/port/rte_port_fd.h | 1 -
lib/port/rte_port_frag.c| 2 --
lib/port/rte_port_frag.h| 1 -
lib/port/rte_port_kni.c | 1 -
lib/port/rte_port_kni.h | 1 -
lib/port/rte_port_ras.c | 1 -
lib/port/rte_port_ras.h | 1 -
lib/port/rte_port_ring.h| 1 -
lib/port/rte_port_sched.c | 1 -
lib/port/rte_port_source_sink.c | 1 -
lib/port/rte_swx_port_fd.c | 1 -
lib/port/rte_swx_port_fd.h | 1 -
lib/port/rte_swx_port_ring.h| 1 -
13 files changed, 14 deletions(-)
diff --git a/lib/port/rte_port_fd.h b/lib/port/rte_port_fd.h
index e7620ef522..c8cfd9765a 100644
--- a/lib/port/rte_port_fd.h
+++ b/lib/port/rte_port_fd.h
@@ -20,7 +20,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
/** fd_reader port parameters */
diff --git a/lib/port/rte_port_frag.c b/lib/port/rte_port_frag.c
index 8a803fda11..e1f1892176 100644
--- a/lib/port/rte_port_frag.c
+++ b/lib/port/rte_port_frag.c
@@ -3,9 +3,7 @@
*/
#include
-#include
#include
-#include
#include "rte_port_frag.h"
diff --git a/lib/port/rte_port_frag.h b/lib/port/rte_port_frag.h
index 74321e4c4c..07060297f6 100644
--- a/lib/port/rte_port_frag.h
+++ b/lib/port/rte_port_frag.h
@@ -29,7 +29,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_kni.c b/lib/port/rte_port_kni.c
index 7b370f980a..1c7a6cb200 100644
--- a/lib/port/rte_port_kni.c
+++ b/lib/port/rte_port_kni.c
@@ -4,7 +4,6 @@
*/
#include
-#include
#include
#include
diff --git a/lib/port/rte_port_kni.h b/lib/port/rte_port_kni.h
index 9d318af17e..35c6253806 100644
--- a/lib/port/rte_port_kni.h
+++ b/lib/port/rte_port_kni.h
@@ -21,7 +21,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_ras.c b/lib/port/rte_port_ras.c
index 8508814bb2..e5de57da42 100644
--- a/lib/port/rte_port_ras.c
+++ b/lib/port/rte_port_ras.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include
#include
diff --git a/lib/port/rte_port_ras.h b/lib/port/rte_port_ras.h
index fa5accdc71..ee1d8ae21e 100644
--- a/lib/port/rte_port_ras.h
+++ b/lib/port/rte_port_ras.h
@@ -30,7 +30,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_ring.h b/lib/port/rte_port_ring.h
index c4f34e22fe..ba609b3436 100644
--- a/lib/port/rte_port_ring.h
+++ b/lib/port/rte_port_ring.h
@@ -26,7 +26,6 @@ extern "C" {
#include
-#include
#include "rte_port.h"
diff --git a/lib/port/rte_port_sched.c b/lib/port/rte_port_sched.c
index 1209fc121b..8a7d815ef3 100644
--- a/lib/port/rte_port_sched.c
+++ b/lib/port/rte_port_sched.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include "rte_port_sched.h"
diff --git a/lib/port/rte_port_source_sink.c b/lib/port/rte_port_source_sink.c
index 68575c9833..4928a5f706 100644
--- a/lib/port/rte_port_source_sink.c
+++ b/lib/port/rte_port_source_sink.c
@@ -5,7 +5,6 @@
#include
#include
-#include
#include
#include
diff --git a/lib/port/rte_swx_port_fd.c b/lib/port/rte_swx_port_fd.c
index aa7315a15a..51bcd3bb7b 100644
--- a/lib/port/rte_swx_port_fd.c
+++ b/lib/port/rte_swx_port_fd.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include
#include "rte_swx_port_fd.h"
diff --git a/lib/port/rte_swx_port_fd.h b/lib/port/rte_swx_port_fd.h
index ecf3349f5f..c1a9200a4f 100644
--- a/lib/port/rte_swx_port_fd.h
+++ b/lib/port/rte_swx_port_fd.h
@@ -16,7 +16,6 @@ extern "C" {
***/
#include
-#include
#include "rte_swx_port.h"
diff --git a/lib/port/rte_swx_port_ring.h b/lib/port/rte_swx_port_ring.h
index 859981f277..dc0ef9247c 100644
--- a/lib/port/rte_swx_port_ring.h
+++ b/lib/port/rte_swx_port_ring.h
@@ -16,7 +16,6 @@ extern "C" {
#include
-#include
#include "rte_swx_port.h"
--
2.25.1
[PATCH v7 19/50] pipeline: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/pipeline/rte_pipeline.c | 4
lib/pipeline/rte_port_in_action.c| 2 --
lib/pipeline/rte_swx_ctl.h | 2 --
lib/pipeline/rte_swx_pipeline.c | 1 -
lib/pipeline/rte_swx_pipeline.h | 1 -
lib/pipeline/rte_swx_pipeline_spec.c | 1 -
lib/pipeline/rte_table_action.c | 2 --
7 files changed, 13 deletions(-)
diff --git a/lib/pipeline/rte_pipeline.c b/lib/pipeline/rte_pipeline.c
index f5f397d292..ff86c7cf96 100644
--- a/lib/pipeline/rte_pipeline.c
+++ b/lib/pipeline/rte_pipeline.c
@@ -6,10 +6,6 @@
#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/lib/pipeline/rte_port_in_action.c
b/lib/pipeline/rte_port_in_action.c
index e3b00df8d2..5818973250 100644
--- a/lib/pipeline/rte_port_in_action.c
+++ b/lib/pipeline/rte_port_in_action.c
@@ -6,9 +6,7 @@
#include
#include
-#include
#include
-#include
#include "rte_port_in_action.h"
diff --git a/lib/pipeline/rte_swx_ctl.h b/lib/pipeline/rte_swx_ctl.h
index 82e62e70a7..ed752ad5eb 100644
--- a/lib/pipeline/rte_swx_ctl.h
+++ b/lib/pipeline/rte_swx_ctl.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Pipeline Control
*/
-#include
#include
#include
@@ -22,7 +21,6 @@ extern "C" {
#include "rte_swx_port.h"
#include "rte_swx_table.h"
-#include "rte_swx_table_selector.h"
struct rte_swx_pipeline;
diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c
index 2145ca0a42..b39139edb8 100644
--- a/lib/pipeline/rte_swx_pipeline.c
+++ b/lib/pipeline/rte_swx_pipeline.c
@@ -4,7 +4,6 @@
#include
#include
#include
-#include
#include
#include "rte_swx_pipeline_internal.h"
diff --git a/lib/pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h
index 77141bd341..430e458335 100644
--- a/lib/pipeline/rte_swx_pipeline.h
+++ b/lib/pipeline/rte_swx_pipeline.h
@@ -13,7 +13,6 @@ extern "C" {
* RTE SWX Pipeline
*/
-#include
#include
#include
diff --git a/lib/pipeline/rte_swx_pipeline_spec.c
b/lib/pipeline/rte_swx_pipeline_spec.c
index 07a7580ac8..8165a046ea 100644
--- a/lib/pipeline/rte_swx_pipeline_spec.c
+++ b/lib/pipeline/rte_swx_pipeline_spec.c
@@ -8,7 +8,6 @@
#include
#include "rte_swx_pipeline.h"
-#include "rte_swx_ctl.h"
#define MAX_LINE_LENGTH RTE_SWX_INSTRUCTION_SIZE
#define MAX_TOKENS RTE_SWX_INSTRUCTION_TOKENS_MAX
diff --git a/lib/pipeline/rte_table_action.c b/lib/pipeline/rte_table_action.c
index ebab2444d3..b1310be565 100644
--- a/lib/pipeline/rte_table_action.c
+++ b/lib/pipeline/rte_table_action.c
@@ -11,12 +11,10 @@
#include
#include
#include
-#include
#include
#include
#include
#include
-#include
#include "rte_table_action.h"
--
2.25.1
[PATCH v7 20/50] pdump: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/pdump/rte_pdump.c | 1 - lib/pdump/rte_pdump.h | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib/pdump/rte_pdump.c b/lib/pdump/rte_pdump.c index af450695ec..b3a62df591 100644 --- a/lib/pdump/rte_pdump.c +++ b/lib/pdump/rte_pdump.c @@ -2,7 +2,6 @@ * Copyright(c) 2016-2018 Intel Corporation */ -#include #include #include #include diff --git a/lib/pdump/rte_pdump.h b/lib/pdump/rte_pdump.h index 6efa0274f2..41c4b7800b 100644 --- a/lib/pdump/rte_pdump.h +++ b/lib/pdump/rte_pdump.h @@ -13,8 +13,6 @@ */ #include -#include -#include #include #ifdef __cplusplus -- 2.25.1
[PATCH v7 21/50] pci: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/pci/rte_pci.c | 15 +--
lib/pci/rte_pci.h | 1 -
2 files changed, 1 insertion(+), 15 deletions(-)
diff --git a/lib/pci/rte_pci.c b/lib/pci/rte_pci.c
index c91be8b167..355772ff56 100644
--- a/lib/pci/rte_pci.c
+++ b/lib/pci/rte_pci.c
@@ -3,23 +3,10 @@
* Copyright 2013-2014 6WIND S.A.
*/
-#include
-#include
#include
#include
#include
-#include
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+
#include
#include "rte_pci.h"
diff --git a/lib/pci/rte_pci.h b/lib/pci/rte_pci.h
index 71cbd441c7..5088157e74 100644
--- a/lib/pci/rte_pci.h
+++ b/lib/pci/rte_pci.h
@@ -17,7 +17,6 @@ extern "C" {
#endif
#include
-#include
#include
#include
--
2.25.1
[PATCH v7 22/50] pcapng: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
Acked-by: Stephen Hemminger
---
lib/pcapng/rte_pcapng.c | 1 -
lib/pcapng/rte_pcapng.h | 2 --
2 files changed, 3 deletions(-)
diff --git a/lib/pcapng/rte_pcapng.c b/lib/pcapng/rte_pcapng.c
index 03edabe73e..5ae96a5bc9 100644
--- a/lib/pcapng/rte_pcapng.c
+++ b/lib/pcapng/rte_pcapng.c
@@ -8,7 +8,6 @@
#include
#include
#include
-#include
#include
#include
diff --git a/lib/pcapng/rte_pcapng.h b/lib/pcapng/rte_pcapng.h
index 8d3fbb1941..7d2697c647 100644
--- a/lib/pcapng/rte_pcapng.h
+++ b/lib/pcapng/rte_pcapng.h
@@ -26,9 +26,7 @@
#include
#include
#include
-#include
#include
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v7 23/50] node: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/node/ethdev_ctrl.c | 2 -- lib/node/ethdev_rx.c | 1 - lib/node/ethdev_tx.c | 1 - lib/node/ip4_lookup.c | 5 - lib/node/ip4_rewrite.c | 4 lib/node/pkt_cls.c | 4 lib/node/pkt_drop.c| 1 - 7 files changed, 18 deletions(-) diff --git a/lib/node/ethdev_ctrl.c b/lib/node/ethdev_ctrl.c index 13b8b705f0..5294607619 100644 --- a/lib/node/ethdev_ctrl.c +++ b/lib/node/ethdev_ctrl.c @@ -2,9 +2,7 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include #include -#include #include #include "rte_node_eth_api.h" diff --git a/lib/node/ethdev_rx.c b/lib/node/ethdev_rx.c index 4c23961505..a19237b42f 100644 --- a/lib/node/ethdev_rx.c +++ b/lib/node/ethdev_rx.c @@ -7,7 +7,6 @@ #include #include #include -#include #include "ethdev_rx_priv.h" #include "node_private.h" diff --git a/lib/node/ethdev_tx.c b/lib/node/ethdev_tx.c index 075149089f..7d2d72f823 100644 --- a/lib/node/ethdev_tx.c +++ b/lib/node/ethdev_tx.c @@ -6,7 +6,6 @@ #include #include #include -#include #include "ethdev_tx_priv.h" diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c index d083a725fc..8bce03d7db 100644 --- a/lib/node/ip4_lookup.c +++ b/lib/node/ip4_lookup.c @@ -5,17 +5,12 @@ #include #include -#include #include #include #include #include #include #include -#include -#include -#include -#include #include "rte_node_ip4_api.h" diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c index 99ecb457ff..34a920df5e 100644 --- a/lib/node/ip4_rewrite.c +++ b/lib/node/ip4_rewrite.c @@ -2,16 +2,12 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include #include #include #include #include #include #include -#include -#include -#include #include #include "rte_node_ip4_api.h" diff --git a/lib/node/pkt_cls.c b/lib/node/pkt_cls.c index b95454dd72..3e75f2cf78 100644 --- a/lib/node/pkt_cls.c +++ b/lib/node/pkt_cls.c @@ -2,10 +2,6 @@ * Copyright (C) 2020 Marvell. */ -#include -#include -#include -#include #include #include diff --git a/lib/node/pkt_drop.c b/lib/node/pkt_drop.c index c350013236..1ad7fccd28 100644 --- a/lib/node/pkt_drop.c +++ b/lib/node/pkt_drop.c @@ -2,7 +2,6 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include #include #include -- 2.25.1
[PATCH v7 24/50] net: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/net/net_crc_avx512.c | 3 ---
lib/net/net_crc_sse.c| 1 -
lib/net/rte_arp.c| 1 -
lib/net/rte_ether.h | 1 -
lib/net/rte_net.h| 1 -
lib/net/rte_net_crc.c| 2 --
6 files changed, 9 deletions(-)
diff --git a/lib/net/net_crc_avx512.c b/lib/net/net_crc_avx512.c
index 3740fe3c9d..f6a3ce9bcd 100644
--- a/lib/net/net_crc_avx512.c
+++ b/lib/net/net_crc_avx512.c
@@ -2,11 +2,8 @@
* Copyright(c) 2020 Intel Corporation
*/
-#include
#include
-#include
-#include
#include "net_crc.h"
diff --git a/lib/net/net_crc_sse.c b/lib/net/net_crc_sse.c
index 053b54b390..dd75845636 100644
--- a/lib/net/net_crc_sse.c
+++ b/lib/net/net_crc_sse.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include "net_crc.h"
diff --git a/lib/net/rte_arp.c b/lib/net/rte_arp.c
index 9f7eb6b375..22af519586 100644
--- a/lib/net/rte_arp.c
+++ b/lib/net/rte_arp.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#define RARP_PKT_SIZE 64
struct rte_mbuf *
diff --git a/lib/net/rte_ether.h b/lib/net/rte_ether.h
index 3d9852d9e2..bf8a55ba06 100644
--- a/lib/net/rte_ether.h
+++ b/lib/net/rte_ether.h
@@ -18,7 +18,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
diff --git a/lib/net/rte_net.h b/lib/net/rte_net.h
index 53a7f4d360..56611fc8f9 100644
--- a/lib/net/rte_net.h
+++ b/lib/net/rte_net.h
@@ -12,7 +12,6 @@ extern "C" {
#include
#include
#include
-#include
/**
* Structure containing header lengths associated to a packet, filled
diff --git a/lib/net/rte_net_crc.c b/lib/net/rte_net_crc.c
index d9a526ab7b..a685f9e7bb 100644
--- a/lib/net/rte_net_crc.c
+++ b/lib/net/rte_net_crc.c
@@ -3,13 +3,11 @@
*/
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
--
2.25.1
[PATCH v7 26/50] mempool: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/mempool/rte_mempool.c | 7 --- lib/mempool/rte_mempool.h | 4 2 files changed, 11 deletions(-) diff --git a/lib/mempool/rte_mempool.c b/lib/mempool/rte_mempool.c index c5a699b1d6..de59009baf 100644 --- a/lib/mempool/rte_mempool.c +++ b/lib/mempool/rte_mempool.c @@ -7,7 +7,6 @@ #include #include #include -#include #include #include #include @@ -19,16 +18,10 @@ #include #include #include -#include -#include #include #include -#include -#include -#include #include #include -#include #include #include #include diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 1e7a3c1527..5f9f9ead9b 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -34,17 +34,13 @@ */ #include -#include #include -#include #include #include #include -#include #include #include -#include #include #include #include -- 2.25.1
[PATCH v7 25/50] metrics: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/metrics/rte_metrics.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/metrics/rte_metrics.c b/lib/metrics/rte_metrics.c index e2a0fbeda8..0c7878e65f 100644 --- a/lib/metrics/rte_metrics.c +++ b/lib/metrics/rte_metrics.c @@ -3,13 +3,10 @@ */ #include -#include #include #include -#include #include -#include #include #include -- 2.25.1
[PATCH v7 27/50] member: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/member/rte_member.c | 2 --
lib/member/rte_member.h | 1 -
lib/member/rte_member_vbf.c | 1 -
3 files changed, 4 deletions(-)
diff --git a/lib/member/rte_member.c b/lib/member/rte_member.c
index 9dd55a5adf..7e1632e6b5 100644
--- a/lib/member/rte_member.c
+++ b/lib/member/rte_member.c
@@ -5,9 +5,7 @@
#include
#include
-#include
#include
-#include
#include
#include
#include
diff --git a/lib/member/rte_member.h b/lib/member/rte_member.h
index c0689e233e..567ee0c84b 100644
--- a/lib/member/rte_member.h
+++ b/lib/member/rte_member.h
@@ -52,7 +52,6 @@ extern "C" {
#include
#include
-#include
/** The set ID type that stored internally in hash table based set summary. */
typedef uint16_t member_set_t;
diff --git a/lib/member/rte_member_vbf.c b/lib/member/rte_member_vbf.c
index 8a232bae02..9df4620cff 100644
--- a/lib/member/rte_member_vbf.c
+++ b/lib/member/rte_member_vbf.c
@@ -6,7 +6,6 @@
#include
#include
-#include
#include
#include
--
2.25.1
[PATCH v7 28/50] mbuf: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/mbuf/rte_mbuf.c | 11 ---
lib/mbuf/rte_mbuf.h | 2 --
lib/mbuf/rte_mbuf_dyn.h | 2 --
lib/mbuf/rte_mbuf_pool_ops.c | 1 -
lib/mbuf/rte_mbuf_pool_ops.h | 1 -
5 files changed, 17 deletions(-)
diff --git a/lib/mbuf/rte_mbuf.c b/lib/mbuf/rte_mbuf.c
index 604d77bbda..87592faccb 100644
--- a/lib/mbuf/rte_mbuf.c
+++ b/lib/mbuf/rte_mbuf.c
@@ -5,28 +5,17 @@
#include
#include
-#include
#include
-#include
#include
#include
-#include
-#include
-#include
#include
#include
#include
-#include
-#include
-#include
-#include
-#include
#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/mbuf/rte_mbuf.h b/lib/mbuf/rte_mbuf.h
index dedf83c38d..9811e8c760 100644
--- a/lib/mbuf/rte_mbuf.h
+++ b/lib/mbuf/rte_mbuf.h
@@ -36,10 +36,8 @@
#include
#include
#include
-#include
#include
#include
-#include
#include
#include
diff --git a/lib/mbuf/rte_mbuf_dyn.h b/lib/mbuf/rte_mbuf_dyn.h
index 29abe8da53..ed8e57b350 100644
--- a/lib/mbuf/rte_mbuf_dyn.h
+++ b/lib/mbuf/rte_mbuf_dyn.h
@@ -68,9 +68,7 @@
#include
#include
-#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/mbuf/rte_mbuf_pool_ops.c b/lib/mbuf/rte_mbuf_pool_ops.c
index f0e87a1412..4c91f4ce85 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.c
+++ b/lib/mbuf/rte_mbuf_pool_ops.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include
#include
diff --git a/lib/mbuf/rte_mbuf_pool_ops.h b/lib/mbuf/rte_mbuf_pool_ops.h
index 7ed95a49a4..00cddb83ba 100644
--- a/lib/mbuf/rte_mbuf_pool_ops.h
+++ b/lib/mbuf/rte_mbuf_pool_ops.h
@@ -14,7 +14,6 @@
* the best mempool ops available.
*/
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v7 29/50] lpm: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/lpm/rte_lpm.c | 7 ---
lib/lpm/rte_lpm.h | 4
lib/lpm/rte_lpm6.c | 7 ---
lib/lpm/rte_lpm6.h | 1 -
4 files changed, 19 deletions(-)
diff --git a/lib/lpm/rte_lpm.c b/lib/lpm/rte_lpm.c
index 002811f4de..cdcd1b7f9e 100644
--- a/lib/lpm/rte_lpm.c
+++ b/lib/lpm/rte_lpm.c
@@ -6,22 +6,15 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
#include
-#include /* for definition of RTE_CACHE_LINE_SIZE */
#include
-#include
#include
-#include
#include
#include
-#include
-#include
#include
#include "rte_lpm.h"
diff --git a/lib/lpm/rte_lpm.h b/lib/lpm/rte_lpm.h
index 5eb14c1748..eb91960e81 100644
--- a/lib/lpm/rte_lpm.h
+++ b/lib/lpm/rte_lpm.h
@@ -12,13 +12,9 @@
*/
#include
-#include
#include
-#include
#include
#include
-#include
-#include
#include
#include
#include
diff --git a/lib/lpm/rte_lpm6.c b/lib/lpm/rte_lpm6.c
index 73768fc956..8d21aeddb8 100644
--- a/lib/lpm/rte_lpm6.c
+++ b/lib/lpm/rte_lpm6.c
@@ -4,23 +4,16 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
#include
-#include
#include
#include
-#include
#include
-#include
#include
#include
-#include
-#include
#include
#include
#include
diff --git a/lib/lpm/rte_lpm6.h b/lib/lpm/rte_lpm6.h
index f96f3372e5..9b07260d5a 100644
--- a/lib/lpm/rte_lpm6.h
+++ b/lib/lpm/rte_lpm6.h
@@ -10,7 +10,6 @@
*/
#include
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v7 30/50] latencystats: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/latencystats/rte_latencystats.c | 4 1 file changed, 4 deletions(-) diff --git a/lib/latencystats/rte_latencystats.c b/lib/latencystats/rte_latencystats.c index ab8db7a139..8985a377db 100644 --- a/lib/latencystats/rte_latencystats.c +++ b/lib/latencystats/rte_latencystats.c @@ -2,13 +2,9 @@ * Copyright(c) 2018 Intel Corporation */ -#include -#include -#include #include #include -#include #include #include #include -- 2.25.1
[PATCH v7 31/50] kni: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/kni/rte_kni.c | 2 -- lib/kni/rte_kni.h | 2 -- 2 files changed, 4 deletions(-) diff --git a/lib/kni/rte_kni.c b/lib/kni/rte_kni.c index fc8f0e7b5a..7971c56bb4 100644 --- a/lib/kni/rte_kni.c +++ b/lib/kni/rte_kni.c @@ -12,7 +12,6 @@ #include #include -#include #include #include #include @@ -20,7 +19,6 @@ #include #include #include -#include #include #include #include "rte_kni_fifo.h" diff --git a/lib/kni/rte_kni.h b/lib/kni/rte_kni.h index b0eaf46104..b85d3dd32b 100644 --- a/lib/kni/rte_kni.h +++ b/lib/kni/rte_kni.h @@ -18,8 +18,6 @@ */ #include -#include -#include #include #include -- 2.25.1
[PATCH v7 32/50] jobstats: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/jobstats/rte_jobstats.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/jobstats/rte_jobstats.c b/lib/jobstats/rte_jobstats.c index 9b8fde5d55..af565a14ea 100644 --- a/lib/jobstats/rte_jobstats.c +++ b/lib/jobstats/rte_jobstats.c @@ -7,10 +7,7 @@ #include #include -#include #include -#include -#include #include #include -- 2.25.1
[PATCH v7 33/50] ipsec: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ipsec/esp_inb.c | 1 - lib/ipsec/esp_outb.c | 1 - lib/ipsec/ipsec_sad.c | 1 - lib/ipsec/sa.c| 3 --- lib/ipsec/sa.h| 1 - 5 files changed, 7 deletions(-) diff --git a/lib/ipsec/esp_inb.c b/lib/ipsec/esp_inb.c index 636c850fa6..f159bf7460 100644 --- a/lib/ipsec/esp_inb.c +++ b/lib/ipsec/esp_inb.c @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/lib/ipsec/esp_outb.c b/lib/ipsec/esp_outb.c index 672e56aba0..6925bb9945 100644 --- a/lib/ipsec/esp_outb.c +++ b/lib/ipsec/esp_outb.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include diff --git a/lib/ipsec/ipsec_sad.c b/lib/ipsec/ipsec_sad.c index 531e1e323c..6f3860e3f5 100644 --- a/lib/ipsec/ipsec_sad.c +++ b/lib/ipsec/ipsec_sad.c @@ -10,7 +10,6 @@ #include #include #include -#include #include #include "rte_ipsec_sad.h" diff --git a/lib/ipsec/sa.c b/lib/ipsec/sa.c index cdb70af0cb..1b673b6a18 100644 --- a/lib/ipsec/sa.c +++ b/lib/ipsec/sa.c @@ -7,14 +7,11 @@ #include #include #include -#include #include "sa.h" #include "ipsec_sqn.h" #include "crypto.h" -#include "iph.h" #include "misc.h" -#include "pad.h" #define MBUF_MAX_L2_LENRTE_LEN2MASK(RTE_MBUF_L2_LEN_BITS, uint64_t) #define MBUF_MAX_L3_LENRTE_LEN2MASK(RTE_MBUF_L3_LEN_BITS, uint64_t) diff --git a/lib/ipsec/sa.h b/lib/ipsec/sa.h index 7503587b50..46f9a4df5b 100644 --- a/lib/ipsec/sa.h +++ b/lib/ipsec/sa.h @@ -5,7 +5,6 @@ #ifndef _SA_H_ #define _SA_H_ -#include #define IPSEC_MAX_HDR_SIZE 64 #define IPSEC_MAX_IV_SIZE 16 -- 2.25.1
[PATCH v7 34/50] ip_frag: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/ip_frag/rte_ip_frag_common.c | 1 - lib/ip_frag/rte_ipv4_fragmentation.c | 2 -- 2 files changed, 3 deletions(-) diff --git a/lib/ip_frag/rte_ip_frag_common.c b/lib/ip_frag/rte_ip_frag_common.c index 2c781a6d33..c1de2e81b6 100644 --- a/lib/ip_frag/rte_ip_frag_common.c +++ b/lib/ip_frag/rte_ip_frag_common.c @@ -5,7 +5,6 @@ #include #include -#include #include #include "ip_frag_common.h" diff --git a/lib/ip_frag/rte_ipv4_fragmentation.c b/lib/ip_frag/rte_ipv4_fragmentation.c index 2e7739d027..669682a0cf 100644 --- a/lib/ip_frag/rte_ipv4_fragmentation.c +++ b/lib/ip_frag/rte_ipv4_fragmentation.c @@ -6,8 +6,6 @@ #include #include -#include -#include #include #include "ip_frag_common.h" -- 2.25.1
[PATCH v7 35/50] hash: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/hash/rte_cuckoo_hash.c | 4
lib/hash/rte_fbk_hash.c| 6 --
lib/hash/rte_fbk_hash.h| 1 -
lib/hash/rte_thash.c | 1 -
lib/hash/rte_thash.h | 1 -
5 files changed, 13 deletions(-)
diff --git a/lib/hash/rte_cuckoo_hash.c b/lib/hash/rte_cuckoo_hash.c
index 1191dfd81a..490f94af4b 100644
--- a/lib/hash/rte_cuckoo_hash.c
+++ b/lib/hash/rte_cuckoo_hash.c
@@ -7,7 +7,6 @@
#include
#include
#include
-#include
#include
#include
@@ -16,14 +15,11 @@
#include
#include
#include
-#include
#include
-#include
#include
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/hash/rte_fbk_hash.c b/lib/hash/rte_fbk_hash.c
index 576e8e6662..538b23a403 100644
--- a/lib/hash/rte_fbk_hash.c
+++ b/lib/hash/rte_fbk_hash.c
@@ -4,22 +4,16 @@
#include
#include
-#include
#include
#include
#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
-#include
#include
-#include
#include
#include "rte_fbk_hash.h"
diff --git a/lib/hash/rte_fbk_hash.h b/lib/hash/rte_fbk_hash.h
index 9c3a61c1d6..b01126999b 100644
--- a/lib/hash/rte_fbk_hash.h
+++ b/lib/hash/rte_fbk_hash.h
@@ -24,7 +24,6 @@ extern "C" {
#include
-#include
#include
#include
diff --git a/lib/hash/rte_thash.c b/lib/hash/rte_thash.c
index 6847e36f4b..0249883b8d 100644
--- a/lib/hash/rte_thash.c
+++ b/lib/hash/rte_thash.c
@@ -9,7 +9,6 @@
#include
#include
#include
-#include
#include
#include
#include
diff --git a/lib/hash/rte_thash.h b/lib/hash/rte_thash.h
index c11ca0d5b8..451f64043a 100644
--- a/lib/hash/rte_thash.h
+++ b/lib/hash/rte_thash.h
@@ -21,7 +21,6 @@ extern "C" {
#include
#include
-#include
#include
#include
#include
--
2.25.1
[PATCH v7 36/50] gro: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/gro/gro_tcp4.c | 1 - lib/gro/gro_tcp4.h | 2 -- lib/gro/gro_udp4.c | 1 - lib/gro/gro_udp4.h | 2 -- lib/gro/gro_vxlan_tcp4.c | 1 - lib/gro/gro_vxlan_udp4.c | 1 - lib/gro/rte_gro.c| 1 - 7 files changed, 9 deletions(-) diff --git a/lib/gro/gro_tcp4.c b/lib/gro/gro_tcp4.c index aff22178e3..7498c66141 100644 --- a/lib/gro/gro_tcp4.c +++ b/lib/gro/gro_tcp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include "gro_tcp4.h" diff --git a/lib/gro/gro_tcp4.h b/lib/gro/gro_tcp4.h index bb875a5ef0..212f97a042 100644 --- a/lib/gro/gro_tcp4.h +++ b/lib/gro/gro_tcp4.h @@ -5,9 +5,7 @@ #ifndef _GRO_TCP4_H_ #define _GRO_TCP4_H_ -#include #include -#include #define INVALID_ARRAY_INDEX 0xUL #define GRO_TCP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) diff --git a/lib/gro/gro_udp4.c b/lib/gro/gro_udp4.c index e78dda7874..dd71135ada 100644 --- a/lib/gro/gro_udp4.c +++ b/lib/gro/gro_udp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include "gro_udp4.h" diff --git a/lib/gro/gro_udp4.h b/lib/gro/gro_udp4.h index d38b393f79..6467d7bc3b 100644 --- a/lib/gro/gro_udp4.h +++ b/lib/gro/gro_udp4.h @@ -6,8 +6,6 @@ #define _GRO_UDP4_H_ #include -#include -#include #define INVALID_ARRAY_INDEX 0xUL #define GRO_UDP4_TBL_MAX_ITEM_NUM (1024UL * 1024UL) diff --git a/lib/gro/gro_vxlan_tcp4.c b/lib/gro/gro_vxlan_tcp4.c index 2005899afe..3be4deb7c7 100644 --- a/lib/gro/gro_vxlan_tcp4.c +++ b/lib/gro/gro_vxlan_tcp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/lib/gro/gro_vxlan_udp4.c b/lib/gro/gro_vxlan_udp4.c index 4767c910bb..b78a7ae89e 100644 --- a/lib/gro/gro_vxlan_udp4.c +++ b/lib/gro/gro_vxlan_udp4.c @@ -4,7 +4,6 @@ #include #include -#include #include #include diff --git a/lib/gro/rte_gro.c b/lib/gro/rte_gro.c index 8ca4da67e9..6f7dd4d709 100644 --- a/lib/gro/rte_gro.c +++ b/lib/gro/rte_gro.c @@ -3,7 +3,6 @@ */ #include -#include #include #include -- 2.25.1
[PATCH v7 37/50] graph: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/graph/graph_debug.c| 2 -- lib/graph/graph_ops.c | 1 - lib/graph/graph_populate.c | 2 -- lib/graph/node.c | 1 - 4 files changed, 6 deletions(-) diff --git a/lib/graph/graph_debug.c b/lib/graph/graph_debug.c index f8aea16acb..b84412f5dd 100644 --- a/lib/graph/graph_debug.c +++ b/lib/graph/graph_debug.c @@ -2,8 +2,6 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include -#include #include "graph_private.h" diff --git a/lib/graph/graph_ops.c b/lib/graph/graph_ops.c index 3355953118..20db58d84e 100644 --- a/lib/graph/graph_ops.c +++ b/lib/graph/graph_ops.c @@ -5,7 +5,6 @@ #include #include -#include #include #include "graph_private.h" diff --git a/lib/graph/graph_populate.c b/lib/graph/graph_populate.c index 093512efab..102fd6c29b 100644 --- a/lib/graph/graph_populate.c +++ b/lib/graph/graph_populate.c @@ -2,8 +2,6 @@ * Copyright(C) 2020 Marvell International Ltd. */ -#include -#include #include #include diff --git a/lib/graph/node.c b/lib/graph/node.c index 86ec4316f9..79230035a2 100644 --- a/lib/graph/node.c +++ b/lib/graph/node.c @@ -8,7 +8,6 @@ #include #include -#include #include #include -- 2.25.1
[PATCH v7 38/50] gpudev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/gpudev/gpudev.c | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/gpudev/gpudev.c b/lib/gpudev/gpudev.c index 59e2169292..1083a3003e 100644 --- a/lib/gpudev/gpudev.c +++ b/lib/gpudev/gpudev.c @@ -4,7 +4,6 @@ #include #include -#include #include #include #include -- 2.25.1
[PATCH v7 39/50] flow_classify: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/flow_classify/rte_flow_classify.c | 3 ---
lib/flow_classify/rte_flow_classify.h | 4
lib/flow_classify/rte_flow_classify_parse.c | 1 -
lib/flow_classify/rte_flow_classify_parse.h | 1 -
4 files changed, 9 deletions(-)
diff --git a/lib/flow_classify/rte_flow_classify.c
b/lib/flow_classify/rte_flow_classify.c
index d3ba2ed227..e3667306e5 100644
--- a/lib/flow_classify/rte_flow_classify.c
+++ b/lib/flow_classify/rte_flow_classify.c
@@ -3,12 +3,9 @@
*/
#include
-#include
#include
#include "rte_flow_classify_parse.h"
-#include
#include
-#include
static uint32_t unique_id = 1;
diff --git a/lib/flow_classify/rte_flow_classify.h
b/lib/flow_classify/rte_flow_classify.h
index 82ea92b6a6..39512b6206 100644
--- a/lib/flow_classify/rte_flow_classify.h
+++ b/lib/flow_classify/rte_flow_classify.h
@@ -45,11 +45,7 @@
#include
#include
-#include
-#include
#include
-#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/flow_classify/rte_flow_classify_parse.c
b/lib/flow_classify/rte_flow_classify_parse.c
index 465330291f..345d129d35 100644
--- a/lib/flow_classify/rte_flow_classify_parse.c
+++ b/lib/flow_classify/rte_flow_classify_parse.c
@@ -4,7 +4,6 @@
#include
#include "rte_flow_classify_parse.h"
-#include
struct classify_valid_pattern {
enum rte_flow_item_type *items;
diff --git a/lib/flow_classify/rte_flow_classify_parse.h
b/lib/flow_classify/rte_flow_classify_parse.h
index 365a07bd6d..7943efc0d4 100644
--- a/lib/flow_classify/rte_flow_classify_parse.h
+++ b/lib/flow_classify/rte_flow_classify_parse.h
@@ -6,7 +6,6 @@
#define _RTE_FLOW_CLASSIFY_PARSE_H_
#include
-#include
#include
#include
--
2.25.1
[PATCH v7 40/50] fib: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/fib/dir24_8.c | 4
lib/fib/rte_fib.c | 2 --
lib/fib/rte_fib.h | 1 -
lib/fib/rte_fib6.c | 2 --
lib/fib/rte_fib6.h | 1 -
lib/fib/trie.c | 5 -
lib/fib/trie.h | 2 --
7 files changed, 17 deletions(-)
diff --git a/lib/fib/dir24_8.c b/lib/fib/dir24_8.c
index bb3bc9753b..a8ba4f64ca 100644
--- a/lib/fib/dir24_8.c
+++ b/lib/fib/dir24_8.c
@@ -4,15 +4,11 @@
*/
#include
-#include
#include
-#include
-#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/fib/rte_fib.c b/lib/fib/rte_fib.c
index 0cced97a77..8af4c40919 100644
--- a/lib/fib/rte_fib.c
+++ b/lib/fib/rte_fib.c
@@ -6,11 +6,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/fib/rte_fib.h b/lib/fib/rte_fib.h
index e592d3251a..90f28b7e11 100644
--- a/lib/fib/rte_fib.h
+++ b/lib/fib/rte_fib.h
@@ -17,7 +17,6 @@
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/fib/rte_fib6.c b/lib/fib/rte_fib6.c
index eebee297d6..4b8e22b142 100644
--- a/lib/fib/rte_fib6.c
+++ b/lib/fib/rte_fib6.c
@@ -6,11 +6,9 @@
#include
#include
-#include
#include
#include
#include
-#include
#include
#include
diff --git a/lib/fib/rte_fib6.h b/lib/fib/rte_fib6.h
index cb133719e1..62a425d9af 100644
--- a/lib/fib/rte_fib6.h
+++ b/lib/fib/rte_fib6.h
@@ -17,7 +17,6 @@
#include
-#include
#ifdef __cplusplus
extern "C" {
diff --git a/lib/fib/trie.c b/lib/fib/trie.c
index 044095bf03..3e780afdaf 100644
--- a/lib/fib/trie.c
+++ b/lib/fib/trie.c
@@ -4,16 +4,11 @@
*/
#include
-#include
#include
-#include
-#include
#include
#include
#include
-#include
-#include
#include
#include
diff --git a/lib/fib/trie.h b/lib/fib/trie.h
index 9fd15ae79f..3cf161ae25 100644
--- a/lib/fib/trie.h
+++ b/lib/fib/trie.h
@@ -10,8 +10,6 @@
* @file
* RTE IPv6 Longest Prefix Match (LPM)
*/
-#include
-#include
/* @internal Total number of tbl24 entries. */
#define TRIE_TBL24_NUM_ENT (1 << 24)
--
2.25.1
[PATCH v7 41/50] eventdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/eventdev/rte_event_ring.c | 6 --
lib/eventdev/rte_event_ring.h | 2 --
lib/eventdev/rte_event_timer_adapter.c | 5 -
lib/eventdev/rte_event_timer_adapter.h | 2 --
lib/eventdev/rte_eventdev.c| 11 ---
lib/eventdev/rte_eventdev.h| 2 --
6 files changed, 28 deletions(-)
diff --git a/lib/eventdev/rte_event_ring.c b/lib/eventdev/rte_event_ring.c
index d27e23901d..c070715148 100644
--- a/lib/eventdev/rte_event_ring.c
+++ b/lib/eventdev/rte_event_ring.c
@@ -3,13 +3,7 @@
* Copyright(c) 2019 Arm Limited
*/
-#include
-#include
-#include
-#include
-#include
-#include
#include "rte_event_ring.h"
int
diff --git a/lib/eventdev/rte_event_ring.h b/lib/eventdev/rte_event_ring.h
index c0861b0ec2..0a54f7fde2 100644
--- a/lib/eventdev/rte_event_ring.h
+++ b/lib/eventdev/rte_event_ring.h
@@ -17,8 +17,6 @@
#include
#include
-#include
-#include
#include
#include
#include "rte_eventdev.h"
diff --git a/lib/eventdev/rte_event_timer_adapter.c
b/lib/eventdev/rte_event_timer_adapter.c
index 9dad170b5a..7dc39386c9 100644
--- a/lib/eventdev/rte_event_timer_adapter.c
+++ b/lib/eventdev/rte_event_timer_adapter.c
@@ -6,19 +6,14 @@
#include
#include
#include
-#include
#include
-#include
-#include
#include
#include
-#include
#include
#include
#include
#include
-#include
#include "event_timer_adapter_pmd.h"
#include "eventdev_pmd.h"
diff --git a/lib/eventdev/rte_event_timer_adapter.h
b/lib/eventdev/rte_event_timer_adapter.h
index 1551741820..aefa322344 100644
--- a/lib/eventdev/rte_event_timer_adapter.h
+++ b/lib/eventdev/rte_event_timer_adapter.h
@@ -111,8 +111,6 @@
extern "C" {
#endif
-#include
-#include
#include "rte_eventdev.h"
#include "rte_eventdev_trace_fp.h"
diff --git a/lib/eventdev/rte_eventdev.c b/lib/eventdev/rte_eventdev.c
index 79b9ea3a02..1c1b66de88 100644
--- a/lib/eventdev/rte_eventdev.c
+++ b/lib/eventdev/rte_eventdev.c
@@ -6,26 +6,15 @@
#include
#include
#include
-#include
#include
#include
#include
-#include
-#include
#include
-#include
#include
-#include
#include
-#include
-#include
#include
#include
-#include
-#include
-#include
-#include
#include
#include
#include
diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h
index eef47d8acc..5738a8d9ea 100644
--- a/lib/eventdev/rte_eventdev.h
+++ b/lib/eventdev/rte_eventdev.h
@@ -211,10 +211,8 @@ extern "C" {
#endif
#include
-#include
#include
#include
-#include
#include
#include "rte_eventdev_trace_fp.h"
--
2.25.1
[PATCH v7 42/50] efd: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey --- lib/efd/rte_efd.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/efd/rte_efd.c b/lib/efd/rte_efd.c index 86ef46863c..560cd78961 100644 --- a/lib/efd/rte_efd.c +++ b/lib/efd/rte_efd.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include @@ -21,11 +20,9 @@ #include #include #include -#include #include "rte_efd.h" #if defined(RTE_ARCH_X86) -#include "rte_efd_x86.h" #elif defined(RTE_ARCH_ARM64) #include "rte_efd_arm64.h" #endif -- 2.25.1
[PATCH v7 43/50] dmadev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/dmadev/rte_dmadev.h | 1 -
1 file changed, 1 deletion(-)
diff --git a/lib/dmadev/rte_dmadev.h b/lib/dmadev/rte_dmadev.h
index 4abe79c536..ad9e7a0975 100644
--- a/lib/dmadev/rte_dmadev.h
+++ b/lib/dmadev/rte_dmadev.h
@@ -149,7 +149,6 @@
#include
#include
#include
-#include
#ifdef __cplusplus
extern "C" {
--
2.25.1
[PATCH v7 44/50] distributor: remove unneeded header includes
These header includes have been flagged by the iwyu_tool and removed. Signed-off-by: Sean Morrissey Acked-by: David Hunt --- lib/distributor/rte_distributor.c | 2 -- lib/distributor/rte_distributor_match_sse.c | 2 -- lib/distributor/rte_distributor_single.c| 2 -- 3 files changed, 6 deletions(-) diff --git a/lib/distributor/rte_distributor.c b/lib/distributor/rte_distributor.c index c210cf86bd..3035b7a999 100644 --- a/lib/distributor/rte_distributor.c +++ b/lib/distributor/rte_distributor.c @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -14,7 +13,6 @@ #include #include #include -#include #include "rte_distributor.h" #include "rte_distributor_single.h" diff --git a/lib/distributor/rte_distributor_match_sse.c b/lib/distributor/rte_distributor_match_sse.c index e3b3b79264..11d8819278 100644 --- a/lib/distributor/rte_distributor_match_sse.c +++ b/lib/distributor/rte_distributor_match_sse.c @@ -3,10 +3,8 @@ */ #include -#include "rte_distributor.h" #include "distributor_private.h" #include "smmintrin.h" -#include "nmmintrin.h" void diff --git a/lib/distributor/rte_distributor_single.c b/lib/distributor/rte_distributor_single.c index b653620688..de90aa8bb5 100644 --- a/lib/distributor/rte_distributor_single.c +++ b/lib/distributor/rte_distributor_single.c @@ -4,9 +4,7 @@ #include #include -#include #include -#include #include #include #include -- 2.25.1
[PATCH v7 45/50] compressdev: remove unneeded header includes
These header includes have been flagged by the iwyu_tool
and removed.
Signed-off-by: Sean Morrissey
---
lib/compressdev/rte_comp.c| 1 -
lib/compressdev/rte_comp.h| 1 -
lib/compressdev/rte_compressdev.c | 1 -
lib/compressdev/rte_compressdev.h | 1 -
lib/compressdev/rte_compressdev_pmd.h | 2 --
5 files changed, 6 deletions(-)
diff --git a/lib/compressdev/rte_comp.c b/lib/compressdev/rte_comp.c
index 3b0e46f96e..320c6dab92 100644
--- a/lib/compressdev/rte_comp.c
+++ b/lib/compressdev/rte_comp.c
@@ -3,7 +3,6 @@
*/
#include "rte_comp.h"
-#include "rte_compressdev.h"
#include "rte_compressdev_internal.h"
const char *
diff --git a/lib/compressdev/rte_comp.h b/lib/compressdev/rte_comp.h
index 95306c5d03..cdb55e5887 100644
--- a/lib/compressdev/rte_comp.h
+++ b/lib/compressdev/rte_comp.h
@@ -16,7 +16,6 @@
extern "C" {
#endif
-#include
#include
/**
diff --git a/lib/compressdev/rte_compressdev.c
b/lib/compressdev/rte_compressdev.c
index 2e9218af68..202ee694d8 100644
--- a/lib/compressdev/rte_compressdev.c
+++ b/lib/compressdev/rte_compressdev.c
@@ -3,7 +3,6 @@
*/
#include
-#include
#include
#include
diff --git a/lib/compressdev/rte_compressdev.h
b/lib/compressdev/rte_compressdev.h
index 2840c27c6c..aa865c4c03 100644
--- a/lib/compressdev/rte_compressdev.h
+++ b/lib/compressdev/rte_compressdev.h
@@ -21,7 +21,6 @@
extern "C" {
#endif
-#include
#include "rte_comp.h"
diff --git a/lib/compressdev/rte_compressdev_pmd.h
b/lib/compressdev/rte_compressdev_pmd.h
index f9a42d1f05..9fabc399c5 100644
--- a/lib/compressdev/rte_compressdev_pmd.h
+++ b/lib/compressdev/rte_compressdev_pmd.h
@@ -19,8 +19,6 @@ extern "C" {
#include
-#include
-#include
#include "rte_compressdev.h"
#include "rte_compressdev_internal.h"
--
2.25.1
