[RFC PATCH 1/4] ethdev: add support to provide link type
Add support to provide link type as part of link status
if available from ethdev driver. Link type such as Fibre,
Twisted-Pair etc is generally available information in PMD or
lower layer software and is a useful information for DPDK
applications. Similar info is also available via ethtool
for Linux kernel netdevs.
Signed-off-by: Nithin Dabilpuram
---
lib/ethdev/ethdev_trace.h| 7 +
lib/ethdev/ethdev_trace_points.c | 3 +++
lib/ethdev/rte_ethdev.c | 44 ++--
lib/ethdev/rte_ethdev.h | 28
lib/ethdev/version.map | 1 +
5 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/lib/ethdev/ethdev_trace.h b/lib/ethdev/ethdev_trace.h
index c65b78590a..a060e2de03 100644
--- a/lib/ethdev/ethdev_trace.h
+++ b/lib/ethdev/ethdev_trace.h
@@ -2110,6 +2110,13 @@ RTE_TRACE_POINT_FP(
rte_trace_point_emit_string(ret);
)
+RTE_TRACE_POINT_FP(
+ rte_eth_trace_link_type_to_str,
+ RTE_TRACE_POINT_ARGS(uint8_t link_type, const char *ret),
+ rte_trace_point_emit_u8(link_type);
+ rte_trace_point_emit_string(ret);
+);
+
/* Called in loop in examples/bond and examples/ethtool */
RTE_TRACE_POINT_FP(
rte_eth_trace_macaddr_get,
diff --git a/lib/ethdev/ethdev_trace_points.c b/lib/ethdev/ethdev_trace_points.c
index cb99cf91fc..e6dee5f668 100644
--- a/lib/ethdev/ethdev_trace_points.c
+++ b/lib/ethdev/ethdev_trace_points.c
@@ -199,6 +199,9 @@ RTE_TRACE_POINT_REGISTER(rte_eth_trace_link_speed_to_str,
RTE_TRACE_POINT_REGISTER(rte_eth_trace_link_to_str,
lib.ethdev.link_to_str)
+RTE_TRACE_POINT_REGISTER(rte_eth_trace_link_type_to_str,
+ lib.ethdev.link_type_to_str)
+
RTE_TRACE_POINT_REGISTER(rte_eth_trace_stats_get,
lib.ethdev.stats_get)
diff --git a/lib/ethdev/rte_ethdev.c b/lib/ethdev/rte_ethdev.c
index 85798d0ebc..9e993199f5 100644
--- a/lib/ethdev/rte_ethdev.c
+++ b/lib/ethdev/rte_ethdev.c
@@ -3221,18 +3221,58 @@ rte_eth_link_to_str(char *str, size_t len, const struct
rte_eth_link *eth_link)
if (eth_link->link_status == RTE_ETH_LINK_DOWN)
ret = snprintf(str, len, "Link down");
else
- ret = snprintf(str, len, "Link up at %s %s %s",
+ ret = snprintf(str, len, "Link up at %s %s %s %s",
rte_eth_link_speed_to_str(eth_link->link_speed),
(eth_link->link_duplex == RTE_ETH_LINK_FULL_DUPLEX) ?
"FDX" : "HDX",
(eth_link->link_autoneg == RTE_ETH_LINK_AUTONEG) ?
- "Autoneg" : "Fixed");
+ "Autoneg" : "Fixed",
+ rte_eth_link_type_to_str(eth_link->link_type));
rte_eth_trace_link_to_str(len, eth_link, str, ret);
return ret;
}
+const char *
+rte_eth_link_type_to_str(uint8_t link_type)
+{
+ const char *ret;
+
+ switch (link_type) {
+ case RTE_ETH_LINK_TYPE_NONE:
+ ret = "None";
+ break;
+ case RTE_ETH_LINK_TYPE_TP:
+ ret = "Twisted Pair";
+ break;
+ case RTE_ETH_LINK_TYPE_AUI:
+ ret = "AUI";
+ break;
+ case RTE_ETH_LINK_TYPE_MII:
+ ret = "MII";
+ break;
+ case RTE_ETH_LINK_TYPE_FIBRE:
+ ret = "Fibre";
+ break;
+ case RTE_ETH_LINK_TYPE_BNC:
+ ret = "BNC";
+ break;
+ case RTE_ETH_LINK_TYPE_DA:
+ ret = "Direct Attach Copper";
+ break;
+ case RTE_ETH_LINK_TYPE_OTHER:
+ ret = "Other";
+ break;
+ default:
+ ret = "Invalid";
+ }
+
+ rte_eth_trace_link_type_to_str(link_type, ret);
+
+ return ret;
+}
+
int
rte_eth_stats_get(uint16_t port_id, struct rte_eth_stats *stats)
{
diff --git a/lib/ethdev/rte_ethdev.h b/lib/ethdev/rte_ethdev.h
index ea7f8c4a1a..ccbb657fb9 100644
--- a/lib/ethdev/rte_ethdev.h
+++ b/lib/ethdev/rte_ethdev.h
@@ -329,6 +329,19 @@ struct rte_eth_stats {
#define RTE_ETH_SPEED_NUM_UNKNOWN UINT32_MAX /**< Unknown */
/**@}*/
+/**@{@name PORT type
+ * Ethernet port type
+ */
+#define RTE_ETH_LINK_TYPE_NONE 0x00 /**< Not defined */
+#define RTE_ETH_LINK_TYPE_TP0x01 /**< Twisted Pair */
+#define RTE_ETH_LINK_TYPE_AUI 0x02 /**< Attachment Unit Interface */
+#define RTE_ETH_LINK_TYPE_MII 0x03 /**< Media Independent Interface */
+#define RTE_ETH_LINK_TYPE_FIBRE 0x04 /**< Fibre */
+#define RTE_ETH_LINK_TYPE_BNC 0x05 /**< BNC */
+#define RTE_ETH_LINK_TYPE_DA0x06 /**< Direct Attach copper */
+#define RTE_ETH_LINK_TYPE_OTHER 0x1F /**< Other type */
+/**@}*/
+
/**
* A structure used to retrieve link-level information of an Ethernet port.
*/
@@ -341,6 +354,7 @@ struct rte_eth_link {
uint16_t link_duplex : 1; /**<
RTE_ETH_LINK_[HALF/FULL]_DUPLEX */
uint16_t link_a
RE: [EXTERNAL] [PATCH] trace: fix out of bounds write in __rte_trace_mem_get
> Offset should be aligned first before checking if there is free space for
> another
> write.
>
> Bugzilla ID: 1665
> Fixes: ebaee6409702 ("trace: simplify trace point headers")
>
> Signed-off-by: Oleksandr Nahnybida
> ---
> lib/eal/include/rte_trace_point.h | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> --
> 2.49.0
Acked-by: Sunil Kumar Kori
RE: [PATCH] examples/flow_filtering: fix make clean
> -Original Message- > From: Tanzeel Ahmed > Sent: Saturday, 29 March 2025 22:54 > To: Ori Kam > Cc: dev@dpdk.org; Tanzeel Ahmed > Subject: [PATCH] examples/flow_filtering: fix make clean > > External email: Use caution opening links or attachments > > > make clean is unable to delete build directory because *.o files are not > removed. > > The other way to fix this would be to add all the c files into SRCS-y. > > Signed-off-by: Tanzeel Ahmed > --- > examples/flow_filtering/Makefile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/examples/flow_filtering/Makefile > b/examples/flow_filtering/Makefile > index 9998ed10b5..653e3319a2 100644 > --- a/examples/flow_filtering/Makefile > +++ b/examples/flow_filtering/Makefile > @@ -50,5 +50,5 @@ build: > > .PHONY: clean > clean: > - rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared > + rm -f build/$(APP) build/$(APP)-static build/$(APP)-shared > + build/*.o > test -d build && rmdir -p build || true > -- > 2.25.1 I checked and looks good on my side
[RFC PATCH 4/4] net/cnxk: report link type along with link status
Provide link type along with link status get.
Signed-off-by: Nithin Dabilpuram
---
drivers/net/cnxk/cnxk_ethdev.c | 21 -
drivers/net/cnxk/cnxk_ethdev.h | 1 +
drivers/net/cnxk/cnxk_link.c | 10 +++---
3 files changed, 28 insertions(+), 4 deletions(-)
diff --git a/drivers/net/cnxk/cnxk_ethdev.c b/drivers/net/cnxk/cnxk_ethdev.c
index 4dba4968d5..9dc442fa6d 100644
--- a/drivers/net/cnxk/cnxk_ethdev.c
+++ b/drivers/net/cnxk/cnxk_ethdev.c
@@ -6,7 +6,7 @@
#include
#include
-const uint32_t cnxk_mac_modes[CGX_MODE_MAX + 1] = {
+static const uint32_t cnxk_mac_modes[CGX_MODE_MAX + 1] = {
[CGX_MODE_SGMII] = RTE_ETH_LINK_SPEED_1G,
[CGX_MODE_1000_BASEX] = RTE_ETH_LINK_SPEED_1G,
[CGX_MODE_QSGMII] = RTE_ETH_LINK_SPEED_1G,
@@ -60,6 +60,17 @@ const uint32_t cnxk_mac_modes[CGX_MODE_MAX + 1] = {
[ETH_MODE_10G_QXGMII_BIT] = RTE_ETH_LINK_SPEED_10G,
};
+static const uint8_t cnxk_port_type[] = {
+ [CGX_PORT_TP] = RTE_ETH_LINK_TYPE_TP,
+ [CGX_PORT_AUI] = RTE_ETH_LINK_TYPE_AUI,
+ [CGX_PORT_MII] = RTE_ETH_LINK_TYPE_MII,
+ [CGX_PORT_FIBRE] = RTE_ETH_LINK_TYPE_FIBRE,
+ [CGX_PORT_BNC] = RTE_ETH_LINK_TYPE_BNC,
+ [CGX_PORT_DA] = RTE_ETH_LINK_TYPE_DA,
+ [CGX_PORT_NONE] = RTE_ETH_LINK_TYPE_NONE,
+ [CGX_PORT_OTHER] = RTE_ETH_LINK_TYPE_OTHER,
+};
+
cnxk_ethdev_rx_offload_cb_t cnxk_ethdev_rx_offload_cb;
#define CNXK_NIX_CQ_INL_CLAMP_MAX (64UL * 1024UL)
@@ -95,6 +106,7 @@ static inline uint32_t
nix_get_speed_capa(struct cnxk_eth_dev *dev)
{
struct roc_nix_mac_fwdata fwdata;
+ struct rte_eth_link link;
uint32_t speed_capa;
uint8_t mode;
int rc;
@@ -114,6 +126,12 @@ nix_get_speed_capa(struct cnxk_eth_dev *dev)
if (fwdata.supported_link_modes & BIT_ULL(mode))
speed_capa |= cnxk_mac_modes[mode];
}
+ dev->link_type = cnxk_port_type[(uint8_t)fwdata.port_type];
+
+ /* Set link type at init */
+ memset(&link, 0, sizeof(link));
+ link.link_type = dev->link_type;
+ rte_eth_linkstatus_set(dev->eth_dev, &link);
}
return speed_capa;
@@ -1757,6 +1775,7 @@ cnxk_nix_dev_stop(struct rte_eth_dev *eth_dev)
/* Bring down link status internally */
memset(&link, 0, sizeof(link));
+ link.link_type = dev->link_type;
rte_eth_linkstatus_set(eth_dev, &link);
return 0;
diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h
index daf80be51b..5f8df43d42 100644
--- a/drivers/net/cnxk/cnxk_ethdev.h
+++ b/drivers/net/cnxk/cnxk_ethdev.h
@@ -370,6 +370,7 @@ struct cnxk_eth_dev {
uint64_t rx_offload_capa;
uint64_t tx_offload_capa;
uint32_t speed_capa;
+ uint8_t link_type;
/* Configured Rx and Tx offloads */
uint64_t rx_offloads;
uint64_t tx_offloads;
diff --git a/drivers/net/cnxk/cnxk_link.c b/drivers/net/cnxk/cnxk_link.c
index 903b44de2c..38970eddd6 100644
--- a/drivers/net/cnxk/cnxk_link.c
+++ b/drivers/net/cnxk/cnxk_link.c
@@ -47,14 +47,16 @@ static void
nix_link_status_print(struct rte_eth_dev *eth_dev, struct rte_eth_link *link)
{
if (link && link->link_status)
- plt_info("Port %d: Link Up - speed %u Mbps - %s",
+ plt_info("Port %d: Link Up - speed %u Mbps - %s - %s",
(int)(eth_dev->data->port_id),
(uint32_t)link->link_speed,
link->link_duplex == RTE_ETH_LINK_FULL_DUPLEX
? "full-duplex"
-: "half-duplex");
+: "half-duplex",
+rte_eth_link_type_to_str(link->link_type));
else
- plt_info("Port %d: Link Down", (int)(eth_dev->data->port_id));
+ plt_info("Port %d: Link Down - %s",
(int)(eth_dev->data->port_id),
+rte_eth_link_type_to_str(link->link_type));
}
void
@@ -103,6 +105,7 @@ cnxk_eth_dev_link_status_cb(struct roc_nix *nix, struct
roc_nix_link_info *link)
eth_link.link_speed = link->speed;
eth_link.link_autoneg = RTE_ETH_LINK_AUTONEG;
eth_link.link_duplex = link->full_duplex;
+ eth_link.link_type = dev->link_type;
/* Print link info */
nix_link_status_print(eth_dev, ð_link);
@@ -142,6 +145,7 @@ cnxk_nix_link_update(struct rte_eth_dev *eth_dev, int
wait_to_complete)
link.link_autoneg = RTE_ETH_LINK_AUTONEG;
if (info.full_duplex)
link.link_duplex = info.full_duplex;
+ link.link_type = dev->link_type;
}
return rte_eth_linkstatus_set(eth_dev, &link);
--
2.34.1
[RFC PATCH 2/4] common/cnxk: support to get speed cap from fwdata
Speed capability currently is updating as
all speeds capable. Get it from CGX fw data
supported link modes instead.
Signed-off-by: Nithin Dabilpuram
---
drivers/common/cnxk/hw/nix.h | 54 ++
drivers/common/cnxk/roc_mbox.h | 24 +++---
drivers/common/cnxk/roc_nix.h | 8 +++-
drivers/common/cnxk/roc_nix_mac.c | 28
drivers/common/cnxk/roc_nix_priv.h | 2 +
drivers/common/cnxk/version.map| 1 +
drivers/net/cnxk/cnxk_ethdev.c | 72 --
7 files changed, 180 insertions(+), 9 deletions(-)
diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h
index d16fa3b3ec..de989153ff 100644
--- a/drivers/common/cnxk/hw/nix.h
+++ b/drivers/common/cnxk/hw/nix.h
@@ -2681,4 +2681,58 @@ struct nix_lso_format {
*/
#define NIX_CHAN_CPT_X2P_MASK (0x7ffull)
+/* CGX modes defined by firmware */
+enum cgx_mode {
+ CGX_MODE_SGMII,
+ CGX_MODE_1000_BASEX,
+ CGX_MODE_QSGMII,
+ CGX_MODE_10G_C2C,
+ CGX_MODE_10G_C2M,
+ CGX_MODE_10G_KR,
+ CGX_MODE_20G_C2C,
+ CGX_MODE_25G_C2C,
+ CGX_MODE_25G_C2M,
+ CGX_MODE_25G_2_C2C,
+ CGX_MODE_25G_CR,
+ CGX_MODE_25G_KR,
+ CGX_MODE_40G_C2C,
+ CGX_MODE_40G_C2M,
+ CGX_MODE_40G_CR4,
+ CGX_MODE_40G_KR4,
+ CGX_MODE_40GAUI_C2C,
+ CGX_MODE_50G_C2C,
+ CGX_MODE_50G_C2M,
+ CGX_MODE_50G_4_C2C,
+ CGX_MODE_50G_CR,
+ CGX_MODE_50G_KR,
+ CGX_MODE_80GAUI_C2C,
+ CGX_MODE_100G_C2C,
+ CGX_MODE_100G_C2M,
+ CGX_MODE_100G_CR4,
+ CGX_MODE_100G_KR4,
+ CGX_MODE_LAUI_2_C2C_BIT,
+ CGX_MODE_LAUI_2_C2M_BIT,
+ CGX_MODE_50GBASE_CR2_C_BIT,
+ CGX_MODE_50GBASE_KR2_C_BIT, /* = 30 */
+ CGX_MODE_100GAUI_2_C2C_BIT,
+ CGX_MODE_100GAUI_2_C2M_BIT,
+ CGX_MODE_100GBASE_CR2_BIT,
+ CGX_MODE_100GBASE_KR2_BIT,
+ CGX_MODE_SFI_1G_BIT,
+ CGX_MODE_25GBASE_CR_C_BIT,
+ CGX_MODE_25GBASE_KR_C_BIT,
+ ETH_MODE_SGMII_10M_BIT,
+ ETH_MODE_SGMII_100M_BIT, /* = 39 */
+ ETH_MODE_2500_BASEX_BIT = 42, /* Mode group 1 */
+ ETH_MODE_5000_BASEX_BIT,
+ ETH_MODE_O_USGMII_BIT,
+ ETH_MODE_Q_USGMII_BIT,
+ ETH_MODE_2_5G_USXGMII_BIT,
+ ETH_MODE_5G_USXGMII_BIT,
+ ETH_MODE_10G_SXGMII_BIT,
+ ETH_MODE_10G_DXGMII_BIT,
+ ETH_MODE_10G_QXGMII_BIT,
+ CGX_MODE_MAX /* = 51 */
+};
+
#endif /* __NIX_HW_H__ */
diff --git a/drivers/common/cnxk/roc_mbox.h b/drivers/common/cnxk/roc_mbox.h
index a82d120d1d..9038ca8fcf 100644
--- a/drivers/common/cnxk/roc_mbox.h
+++ b/drivers/common/cnxk/roc_mbox.h
@@ -755,8 +755,17 @@ enum fec_type {
};
struct phy_s {
- uint64_t __io can_change_mod_type : 1;
- uint64_t __io mod_type : 1;
+ struct {
+ uint64_t __io can_change_mod_type:1;
+ uint64_t __io mod_type:1;
+ uint64_t __io has_fec_stats:1;
+ } misc;
+ struct fec_stats_s {
+ uint32_t __io rsfec_corr_cws;
+ uint32_t __io rsfec_uncorr_cws;
+ uint32_t __io brfec_corr_blks;
+ uint32_t __io brfec_uncorr_blks;
+ } fec_stats;
};
struct cgx_lmac_fwdata_s {
@@ -764,13 +773,18 @@ struct cgx_lmac_fwdata_s {
uint64_t __io supported_fec;
uint64_t __io supported_an;
uint64_t __io supported_link_modes;
- /* Only applicable if AN is supported */
+ /* only applicable if AN is supported */
uint64_t __io advertised_fec;
- uint64_t __io advertised_link_modes;
+ uint64_t __io advertised_link_modes_own : 1; /* CGX_CMD_OWN */
+ uint64_t __io advertised_link_modes : 63;
/* Only applicable if SFP/QSFP slot is present */
struct sfp_eeprom_s sfp_eeprom;
struct phy_s phy;
-#define LMAC_FWDATA_RESERVED_MEM 1023
+ uint32_t __io lmac_type;
+ uint32_t __io portm_idx;
+ uint64_t __io mgmt_port : 1;
+ uint64_t __io advertised_an : 1;
+#define LMAC_FWDATA_RESERVED_MEM 1019
uint64_t __io reserved[LMAC_FWDATA_RESERVED_MEM];
};
diff --git a/drivers/common/cnxk/roc_nix.h b/drivers/common/cnxk/roc_nix.h
index a1bd14ffc4..c438a4447c 100644
--- a/drivers/common/cnxk/roc_nix.h
+++ b/drivers/common/cnxk/roc_nix.h
@@ -413,6 +413,11 @@ struct roc_nix_link_info {
uint64_t port : 8;
};
+struct roc_nix_mac_fwdata {
+ uint64_t advertised_link_modes;
+ uint64_t supported_link_modes;
+};
+
/** Maximum name length for extended statistics counters */
#define ROC_NIX_XSTATS_NAME_SIZE 64
@@ -493,7 +498,7 @@ struct roc_nix {
bool reass_ena;
TAILQ_ENTRY(roc_nix) next;
-#define ROC_NIX_MEM_SZ (6 * 1112)
+#define ROC_NIX_MEM_SZ (6 * 1200)
uint8_t reserved[ROC_NIX_MEM_SZ] __plt_cache_aligned;
} __plt_cache_aligned;
@@ -856,6 +861,7 @@ void __roc_api
roc_nix_mac_link_info_get_cb_unregister(struct roc_nix *roc_nix);
int __roc_api roc_nix_q_err_c
Re: [PATCH] trace: fix out of bounds write in __rte_trace_mem_get
On Wed, Apr 2, 2025 at 11:35 AM Oleksandr Nahnybida
wrote:
>
> Offset should be aligned first before checking if there is free space for
> another write.
>
> Bugzilla ID: 1665
> Fixes: ebaee6409702 ("trace: simplify trace point headers")
This commit ebaee6409702 ("trace: simplify trace point headers") just
moved code around.
I think the bug was present since the first implementation, so:
Fixes: 032a7e5499a0 ("trace: implement provider payload")
--
David Marchand
Re: [PATCH v7 5/8] build: mark exported symbols
for DPAA/FSLMC changes Acked-by: Hemant Agrawal
Re: [PATCH v7 2/8] drivers: remove incorrect exported symbols
On 03-04-2025 22:28, David Marchand wrote:
Declaring inline helpers in version.map is unnecessary.
There is no exported symbol and this will probably be treated as an
error by MSVC linker.
rte_dpaa2_dev_type is an enum token.
roc_se_ctx_swap has no implementation (leftover from a previous rework)
and can be removed.
The commit message comments are not matching with the changes in the patch?
Signed-off-by: David Marchand
---
drivers/bus/dpaa/version.map| 1 -
drivers/bus/fslmc/version.map | 2 --
drivers/common/cnxk/roc_se.h| 1 -
drivers/common/cnxk/version.map | 2 --
4 files changed, 6 deletions(-)
diff --git a/drivers/bus/dpaa/version.map b/drivers/bus/dpaa/version.map
index a17d57632e..8f09b72757 100644
--- a/drivers/bus/dpaa/version.map
+++ b/drivers/bus/dpaa/version.map
@@ -18,7 +18,6 @@ INTERNAL {
dpaa_update_link_speed;
dpaa_intr_disable;
dpaa_intr_enable;
- dpaa_seqn;
dpaa_svr_family;
dpaa_update_link_status;
fman_dealloc_bufs_mask_hi;
diff --git a/drivers/bus/fslmc/version.map b/drivers/bus/fslmc/version.map
index 2c36895285..ba3c7f36e3 100644
--- a/drivers/bus/fslmc/version.map
+++ b/drivers/bus/fslmc/version.map
@@ -22,7 +22,6 @@ INTERNAL {
dpaa2_get_mcp_ptr;
dpaa2_io_portal;
dpaa2_seqn_dynfield_offset;
- dpaa2_seqn;
dpaa2_svr_family;
dpbp_disable;
dpbp_enable;
@@ -108,7 +107,6 @@ INTERNAL {
qbman_swp_push_set;
qbman_swp_release;
rte_dpaa2_alloc_dpci_dev;
- rte_dpaa2_dev_type;
rte_dpaa2_free_dpci_dev;
rte_dpaa2_intr_disable;
rte_dpaa2_intr_enable;
diff --git a/drivers/common/cnxk/roc_se.h b/drivers/common/cnxk/roc_se.h
index ede8d69c0e..f2c4056169 100644
--- a/drivers/common/cnxk/roc_se.h
+++ b/drivers/common/cnxk/roc_se.h
@@ -405,7 +405,6 @@ int __roc_api roc_se_auth_key_set(struct roc_se_ctx
*se_ctx, roc_se_auth_type ty
int __roc_api roc_se_ciph_key_set(struct roc_se_ctx *se_ctx,
roc_se_cipher_type type,
const uint8_t *key, uint16_t key_len);
-void __roc_api roc_se_ctx_swap(struct roc_se_ctx *se_ctx);
void __roc_api roc_se_ctx_init(struct roc_se_ctx *se_ctx);
void __roc_api roc_se_hmac_opad_ipad_gen(roc_se_auth_type auth_type, const uint8_t *key,
diff --git a/drivers/common/cnxk/version.map b/drivers/common/cnxk/version.map
index cdbfc1d39a..7f40dcced2 100644
--- a/drivers/common/cnxk/version.map
+++ b/drivers/common/cnxk/version.map
@@ -164,7 +164,6 @@ INTERNAL {
roc_mcs_custom_tag_cfg_get;
roc_mcs_dev_init;
roc_mcs_dev_fini;
- roc_mcs_dev_get;
roc_mcs_event_cb_register;
roc_mcs_event_cb_unregister;
roc_mcs_flowid_entry_enable;
@@ -546,7 +545,6 @@ INTERNAL {
roc_tim_lf_enable;
roc_tim_lf_free;
roc_tim_lf_interval;
- roc_se_ctx_swap;
roc_ree_af_reg_read;
roc_ree_af_reg_write;
roc_ree_config_lf;
[DPDK/ethdev Bug 1690] Calling rte_eth_dev_get_module_info() and rte_eth_dev_get_module_eeprom() for MLX ConnectX-6 spawn errors when transceiver not inserted
https://bugs.dpdk.org/show_bug.cgi?id=1690
Bug ID: 1690
Summary: Calling rte_eth_dev_get_module_info() and
rte_eth_dev_get_module_eeprom() for MLX ConnectX-6
spawn errors when transceiver not inserted
Product: DPDK
Version: unspecified
Hardware: All
OS: Linux
Status: UNCONFIRMED
Severity: normal
Priority: Normal
Component: ethdev
Assignee: dev@dpdk.org
Reporter: yo...@cgstowernetworks.com
Target Milestone: ---
For Mellanox 'MT2892 Family [ConnectX-6 Dx] 101d'
Calling the dpdk-testpmd's "show port 0 module_eeprom" results in an error when
a transceiver isn't inserted.
The error is spawned from the mlx source:
drivers/net/mlx5/linux/mlx5_ethdev_os.c
In two places:
```
int mlx5_get_module_info(...)
{
...
ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
if (ret) {
DRV_LOG(DEBUG, "port %u ioctl(SIOCETHTOOL) failed: %s",
dev->data->port_id, strerror(rte_errno));
return ret;
}
...
}
```
And
```
int mlx5_get_module_eeprom(...)
{
...
ret = mlx5_ifreq(dev, SIOCETHTOOL, &ifr);
if (ret)
DRV_LOG(WARNING, "port %u ioctl(SIOCETHTOOL) failed: %s",
dev->data->port_id, strerror(rte_errno));
...
}
```
dpdk-testpmd shows:
```
testpmd> show port 0 module_eeprom
mlx5_net: port 0 ioctl(SIOCETHTOOL) failed: Input/output error //
< this error.
device is removed
```
When trying to use these functions in my own application, as dpdk-testpmd does:
rte_eth_dev_get_module_info() and rte_eth_dev_get_module_eeprom() this error
log gets printed as well.
An expected result would be to check out the return value and print these
errors if required by the caller.
For my scenario, I would like a silence fail in case there's no transceiver.
I've tried to overcome this by asking first if a device "exists" using
rte_eth_dev_is_removed() and rte_eth_dev_is_valid_port() but they don't reflect
the transceiver state.
A possible solution would be to print these errors in DEBUG
Please advice,
Thanks.
--
You are receiving this mail because:
You are the assignee for the bug.
[PATCH v7 0/8] Symbol versioning and export rework
So far, each DPDK library (or driver) exposing symbols in an ABI had to maintain a version.map and use some macros for symbol versioning, specially crafted with the GNU linker in mind. This series proposes to rework the whole principle, and instead rely on marking the symbol exports in the source code itself, then let it to the build framework to produce a version script adapted to the linker in use (think GNU linker vs MSVC linker). This greatly simplifies versioning symbols: a developer does not need to know anything about version.map, or that a versioned symbol must be renamed with _v26, annotated with __vsym, exported in a header etc... Checking symbol maps becomes unnecessary since generated by the build framework. Updating to a new ABI is just a matter of bumping the value in ABI_VERSION. -- David Marchand Changes since v6: - used argparse in python scripts, - renamed eal_symbol_exports.h as eal_export.h, - renamed some base symbols export files, Changes since v5: - fixed Windows symbol exports for net/mlx5, Changes since RFC v4: - rebased on main, now that Bruce series is merged, - the export macros header has been moved to lib/eal/common/ and its inclusion is now mandatory (rather than an implicit -include), - reordered patches: symbol versioning is touched last and merged in the export header (replacing the legacy rte_function_versioning.h), Changes since RFC v3: - fixed/simplified documentation, - rebased on top of Bruce series for common handling of AVX sources, Changes since RFC v2: - updated RTE_VERSION_SYMBOL() (and friends) so that only the fonction signature is enclosed in the macro, - dropped invalid exports for some dead symbols or inline helpers, - updated documentation and tooling, - converted the whole tree (via a local script of mine), David Marchand (8): lib: remove incorrect exported symbols drivers: remove incorrect exported symbols buildtools: display symbols version from map build: generate symbol maps build: mark exported symbols build: use dynamically generated version maps build: remove static version maps eal: rework function versioning macros .github/workflows/build.yml | 1 - MAINTAINERS | 9 +- buildtools/check-symbols.sh | 33 +- buildtools/gen-version-map.py | 133 buildtools/map-list-symbol.sh | 15 +- buildtools/map_to_win.py | 41 -- buildtools/meson.build| 2 +- devtools/check-spdx-tag.sh| 2 +- devtools/check-symbol-change.py | 108 devtools/check-symbol-change.sh | 186 -- devtools/check-symbol-maps.sh | 115 devtools/checkpatches.sh | 6 +- devtools/update-abi.sh| 46 -- devtools/update_version_map_abi.py| 210 --- doc/api/doxy-api-index.md | 1 - doc/guides/contributing/abi_policy.rst| 21 +- doc/guides/contributing/abi_versioning.rst| 415 +++-- doc/guides/contributing/coding_style.rst | 7 - .../contributing/img/patch_cheatsheet.svg | 303 + doc/guides/contributing/patches.rst | 6 +- doc/guides/rel_notes/release_25_07.rst| 2 + drivers/baseband/acc/rte_acc100_pmd.c | 2 + drivers/baseband/acc/version.map | 10 - .../fpga_5gnr_fec/rte_fpga_5gnr_fec.c | 2 + drivers/baseband/fpga_5gnr_fec/version.map| 11 - drivers/baseband/fpga_lte_fec/fpga_lte_fec.c | 2 + drivers/baseband/fpga_lte_fec/version.map | 10 - drivers/bus/auxiliary/auxiliary_common.c | 3 + drivers/bus/auxiliary/version.map | 8 - drivers/bus/cdx/cdx.c | 5 + drivers/bus/cdx/cdx_vfio.c| 5 + drivers/bus/cdx/version.map | 14 - drivers/bus/dpaa/dpaa_bus.c | 10 + drivers/bus/dpaa/dpaa_bus_base_symbols.c | 100 +++ drivers/bus/dpaa/meson.build | 1 + drivers/bus/dpaa/version.map | 109 drivers/bus/fslmc/fslmc_bus.c | 5 + drivers/bus/fslmc/fslmc_vfio.c| 13 + drivers/bus/fslmc/mc/dpbp.c | 8 + drivers/bus/fslmc/mc/dpci.c | 5 + drivers/bus/fslmc/mc/dpcon.c | 8 + drivers/bus/fslmc/mc/dpdmai.c | 10 + drivers/bus/fslmc/mc/dpio.c | 15 + drivers/bus/fslmc/mc/dpmng.c | 4 + drivers/bus/fslmc/mc/mc_sys.c | 2 + drivers/bus/fslmc/portal/dpaa2_hw_dpbp.c | 4 + drivers/bus/fslmc/portal/dpaa2_hw_dpci.c | 3 + drivers/bus/fslmc/portal/dpaa2_hw_dpio.c | 12 + drivers/bus/fslmc/qbman/qbman_debug.c | 4 + drivers/bus/fslmc/qbman/qbman_portal.c| 43 ++ drivers/bus/fslmc/version.map
[PATCH v7 1/8] lib: remove incorrect exported symbols
Declaring inline helpers in version.map is unnecessary.
There is no exported symbol and this will probably be treated as an
error by MSVC linker.
eal_log_journal has no implementation and can be removed.
Signed-off-by: David Marchand
---
lib/eventdev/version.map | 12
lib/graph/version.map| 17 -
lib/ipsec/version.map| 4
lib/log/log_internal.h | 3 ---
lib/log/version.map | 1 -
lib/pdcp/version.map | 4
lib/regexdev/version.map | 2 --
lib/vhost/version.map| 1 -
8 files changed, 44 deletions(-)
diff --git a/lib/eventdev/version.map b/lib/eventdev/version.map
index 44687255cb..bff08d6a62 100644
--- a/lib/eventdev/version.map
+++ b/lib/eventdev/version.map
@@ -102,9 +102,6 @@ DPDK_25 {
rte_event_timer_adapter_stats_get;
rte_event_timer_adapter_stats_reset;
rte_event_timer_adapter_stop;
- rte_event_timer_arm_burst;
- rte_event_timer_arm_tmo_tick_burst;
- rte_event_timer_cancel_burst;
rte_event_vector_pool_create;
local: *;
@@ -149,9 +146,7 @@ EXPERIMENTAL {
__rte_eventdev_trace_port_profile_switch;
# added in 24.11
- rte_event_port_preschedule_modify;
__rte_eventdev_trace_port_preschedule_modify;
- rte_event_port_preschedule;
__rte_eventdev_trace_port_preschedule;
# added in 25.03
@@ -166,14 +161,7 @@ INTERNAL {
event_dev_probing_finish;
rte_event_logtype;
rte_event_pmd_allocate;
- rte_event_pmd_get_named_dev;
- rte_event_pmd_is_valid_dev;
- rte_event_pmd_pci_probe;
- rte_event_pmd_pci_probe_named;
- rte_event_pmd_pci_remove;
rte_event_pmd_release;
rte_event_pmd_selftest_seqn_dynfield_offset;
- rte_event_pmd_vdev_init;
- rte_event_pmd_vdev_uninit;
rte_eventdevs;
};
diff --git a/lib/graph/version.map b/lib/graph/version.map
index 44fadc00fd..d03d44434d 100644
--- a/lib/graph/version.map
+++ b/lib/graph/version.map
@@ -27,9 +27,7 @@ DPDK_25 {
rte_graph_node_get;
rte_graph_node_get_by_name;
rte_graph_obj_dump;
- rte_graph_walk;
rte_graph_worker_model_get;
- rte_graph_worker_model_no_check_get;
rte_graph_worker_model_set;
rte_node_clone;
rte_node_dump;
@@ -37,25 +35,10 @@ DPDK_25 {
rte_node_edge_get;
rte_node_edge_shrink;
rte_node_edge_update;
- rte_node_enqueue;
- rte_node_enqueue_next;
- rte_node_enqueue_x1;
- rte_node_enqueue_x2;
- rte_node_enqueue_x4;
rte_node_from_name;
rte_node_id_to_name;
rte_node_list_dump;
rte_node_max_count;
- rte_node_next_stream_get;
- rte_node_next_stream_move;
- rte_node_next_stream_put;
local: *;
};
-
-EXPERIMENTAL {
- global:
-
- # added in 24.11
- rte_node_xstat_increment;
-};
diff --git a/lib/ipsec/version.map b/lib/ipsec/version.map
index 308f9d2e0d..47e3df5bb6 100644
--- a/lib/ipsec/version.map
+++ b/lib/ipsec/version.map
@@ -1,9 +1,6 @@
DPDK_25 {
global:
- rte_ipsec_pkt_crypto_group;
- rte_ipsec_pkt_crypto_prepare;
- rte_ipsec_pkt_process;
rte_ipsec_sa_fini;
rte_ipsec_sa_init;
rte_ipsec_sa_size;
@@ -14,7 +11,6 @@ DPDK_25 {
rte_ipsec_sad_destroy;
rte_ipsec_sad_find_existing;
rte_ipsec_sad_lookup;
- rte_ipsec_ses_from_crypto;
rte_ipsec_session_prepare;
rte_ipsec_telemetry_sa_add;
rte_ipsec_telemetry_sa_del;
diff --git a/lib/log/log_internal.h b/lib/log/log_internal.h
index bba7041ea3..525e1397fd 100644
--- a/lib/log/log_internal.h
+++ b/lib/log/log_internal.h
@@ -29,9 +29,6 @@ int eal_log_save_pattern(const char *pattern, uint32_t level);
__rte_internal
int eal_log_syslog(const char *name);
-__rte_internal
-int eal_log_journal(const char *opt);
-
/*
* Convert log level to string.
*/
diff --git a/lib/log/version.map b/lib/log/version.map
index 09d8a4289b..603be493b3 100644
--- a/lib/log/version.map
+++ b/lib/log/version.map
@@ -27,7 +27,6 @@ INTERNAL {
eal_log_color;
eal_log_init;
- eal_log_journal; # WINDOWS_NO_EXPORT
eal_log_level2str;
eal_log_save_pattern;
eal_log_save_regexp;
diff --git a/lib/pdcp/version.map b/lib/pdcp/version.map
index 9c02303c45..72b2d4729b 100644
--- a/lib/pdcp/version.map
+++ b/lib/pdcp/version.map
@@ -3,13 +3,9 @@ EXPERIMENTAL {
# added in 23.07
rte_pdcp_control_pdu_create;
- rte_pdcp_en_from_cop;
rte_pdcp_entity_establish;
rte_pdcp_entity_release;
rte_pdcp_entity_suspend;
- rte_pdcp_pkt_post_process;
- rte_pdcp_pkt_pre_process;
- rte_pdcp_pkt_crypto_group;
rte_pdcp_t_reordering_expiry_handle;
local: *;
diff --git a/lib/regexdev/version.map b/lib/regexdev/version.map
index 4c0435180c..713a800ca4 100644
--- a/lib/regexdev/version.map
+
[PATCH v7 4/8] build: generate symbol maps
Rather than maintain a file in parallel of the code, symbols to be
exported can be marked with a token RTE_EXPORT_*SYMBOL.
>From those marks, the build framework generates map files only for
symbols actually compiled (which means that the WINDOWS_NO_EXPORT hack
becomes unnecessary).
The build framework directly creates a map file in the format that the
linker expects (rather than converting from GNU linker to MSVC linker).
Empty maps are allowed again as a replacement for drivers/version.map.
The symbol check is updated to only support the new format.
Signed-off-by: David Marchand
---
Changes since v6:
- rewrote parameter parsing for python scripts,
- fixed most pylint complaints,
- dropped TODO comment in symbol check,
- renamed header to eal_export.h,
- updated macros definition,
Changes since RFC v4:
- fixed MSVC export map (a msvc->mslinker update was missing),
- fixed join() error (with older meson? I don't see this on Fedora),
- explicit inclusion of header is now required,
- header has been renamed and moved to lib/eal/common/,
- because lib/log does not depend on EAL, added explicit
include_directories,
- symbol versioning update has been moved later in the series,
so updated gen-version-map.py accordingly,
- fixed bug when checking symbol removal,
Changes since RFC v3:
- polished python,
- fixed doc updates not belonging to this patch,
- renamed map files,
- changed msvc->mslinker as link mode,
- added parsing of AVX sources,
Changes since RFC v2:
- because of MSVC limitations wrt macro passed via cmdline,
used an internal header for defining RTE_EXPORT_* macros,
- updated documentation and tooling,
---
MAINTAINERS| 2 +
buildtools/gen-version-map.py | 134
buildtools/map-list-symbol.sh | 10 +-
buildtools/meson.build | 1 +
devtools/check-symbol-change.py| 108 ++
devtools/check-symbol-maps.sh | 14 --
devtools/checkpatches.sh | 2 +-
doc/guides/contributing/abi_versioning.rst | 227 ++---
drivers/meson.build| 98 +
drivers/version.map| 3 -
lib/eal/common/eal_export.h| 16 ++
lib/meson.build| 96 ++---
12 files changed, 415 insertions(+), 296 deletions(-)
create mode 100755 buildtools/gen-version-map.py
create mode 100755 devtools/check-symbol-change.py
delete mode 100644 drivers/version.map
create mode 100644 lib/eal/common/eal_export.h
diff --git a/MAINTAINERS b/MAINTAINERS
index 4b01103f8e..42ea07854b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -95,6 +95,7 @@ F: devtools/check-maintainers.sh
F: devtools/check-forbidden-tokens.awk
F: devtools/check-git-log.sh
F: devtools/check-spdx-tag.sh
+F: devtools/check-symbol-change.py
F: devtools/check-symbol-change.sh
F: devtools/check-symbol-maps.sh
F: devtools/checkpatches.sh
@@ -127,6 +128,7 @@ F: config/
F: buildtools/check-symbols.sh
F: buildtools/chkincs/
F: buildtools/call-sphinx-build.py
+F: buildtools/gen-version-map.py
F: buildtools/get-cpu-count.py
F: buildtools/get-numa-count.py
F: buildtools/list-dir-globs.py
diff --git a/buildtools/gen-version-map.py b/buildtools/gen-version-map.py
new file mode 100755
index 00..c5ea10def0
--- /dev/null
+++ b/buildtools/gen-version-map.py
@@ -0,0 +1,134 @@
+#!/usr/bin/env python3
+# SPDX-License-Identifier: BSD-3-Clause
+# Copyright (c) 2025 Red Hat, Inc.
+
+"""Generate a version map file used by GNU or MSVC linker."""
+
+import argparse
+import re
+
+# From eal_export.h
+export_exp_sym_regexp = re.compile(
+r"^RTE_EXPORT_EXPERIMENTAL_SYMBOL\(([^,]+), ([0-9]+.[0-9]+)\)"
+)
+export_int_sym_regexp = re.compile(r"^RTE_EXPORT_INTERNAL_SYMBOL\(([^)]+)\)")
+export_sym_regexp = re.compile(r"^RTE_EXPORT_SYMBOL\(([^)]+)\)")
+# From rte_function_versioning.h
+ver_sym_regexp = re.compile(r"^VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+)\)")
+ver_exp_sym_regexp = re.compile(r"^VERSION_SYMBOL_EXPERIMENTAL\([^,]+,
([^,]+)\)")
+default_sym_regexp = re.compile(r"^BIND_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+)\)")
+
+parser = argparse.ArgumentParser(
+description=__doc__,
+formatter_class=argparse.RawDescriptionHelpFormatter,
+)
+parser.add_argument(
+"--linker", choices=["gnu", "mingw", "mslinker", ], required=True,
help="Linker type"
+)
+parser.add_argument(
+"--abi-version",
+required=True,
+type=argparse.FileType("r", encoding="utf-8"),
+help="ABI version file",
+)
+parser.add_argument(
+"--output",
+required=True,
+type=argparse.FileType("w", encoding="utf-8"),
+help="Output file",
+)
+parser.add_argument(
+"--source",
+nargs="+",
+required=True,
+type=argparse.FileType("r", encoding="utf-8"),
+help="Input source to parse",
+)
+args = parser.parse_args()
+
+ABI_MAJOR = re.match("([0-9]+).[0-9]", args.abi_version.readline()).group(1)
+ABI = f"DP
Re: [PATCH v12 00/10] replace use of term sanity check
Hi Stephen, I was testing Grout on one of our baremetal servers today while DTS was running at the same time (this was an accident - I thought I had it marked offline in our CI system). Unfortunately as a result DTS conflicted with Grout which was using the same mellanox card, and a false fail was reported for this testsuite. I will trigger a rerun and the false failure will be overwritten within a couple hours. Thanks for your patience. On Wed, Apr 2, 2025 at 7:24 PM Stephen Hemminger wrote: > Remove use of expression sanity check across DPDK drivers > and documentation. > > The term sanity-check is on the Tier 2 word list from the Inclusive > Naming project. >https://inclusivenaming.org/word-lists/tier-2/sanity-check/ > > Rationale > This term might be derogatory to neurodiverse people. > Jargon, such as “sanity test”, is difficult to translate and is > difficult > to understand by readers whose first language is not English. > > v12 - rebase on 25.07 > mark old mbuf API functions as deprecated > > Stephen Hemminger (10): > mbuf: replace term sanity check > net/avp: replace use of rte_mbuf_sanity_check > net/sfc: replace use of rte_mbuf_sanity_check > examples: remove term sanity > eal: replace use of sanity check in comments and messages > test: replace use word sanity > dts: replace use of sanity check in comment > doc: remove sanity > lib: replace use of sanity check in comments and > drivers: remove use of term sanity check > > app/test/test_bitmap.c| 4 +- > app/test/test_bpf.c | 6 +- > app/test/test_common.c| 2 +- > app/test/test_cryptodev.c | 2 +- > app/test/test_distributor.c | 46 +-- > app/test/test_eal_flags.c | 20 ++--- > app/test/test_hash.c | 2 +- > app/test/test_interrupts.c| 9 ++- > app/test/test_link_bonding_mode4.c| 2 +- > app/test/test_mbuf.c | 30 +++ > app/test/test_rawdev.c| 2 +- > app/test/test_timer.c | 10 +-- > doc/guides/gpus/cuda.rst | 2 +- > doc/guides/prog_guide/mbuf_lib.rst| 4 +- > doc/guides/rel_notes/deprecation.rst | 3 + > .../sample_app_ug/eventdev_pipeline.rst | 2 +- > doc/guides/tools/testbbdev.rst| 8 +- > drivers/bus/fslmc/qbman/qbman_sys_decl.h | 2 +- > drivers/common/cnxk/roc_nix_tm_ops.c | 2 +- > drivers/common/cnxk/roc_npa.c | 6 +- > drivers/common/dpaax/caamflib/desc.h | 2 +- > drivers/common/mlx5/linux/mlx5_common_os.c| 2 +- > drivers/common/sfc_efx/base/ef10_nvram.c | 4 +- > drivers/common/sfc_efx/base/efx_rx.c | 2 +- > drivers/crypto/bcmfs/hw/bcmfs4_rm.c | 6 +- > drivers/crypto/bcmfs/hw/bcmfs5_rm.c | 6 +- > drivers/dma/idxd/idxd_pci.c | 2 +- > drivers/event/opdl/opdl_evdev.c | 2 +- > drivers/event/opdl/opdl_evdev_init.c | 2 +- > drivers/net/ark/ark_ethdev.c | 8 +- > drivers/net/ark/ark_ethdev_rx.c | 2 +- > drivers/net/avp/avp_ethdev.c | 18 ++--- > drivers/net/bnx2x/bnx2x.c | 2 +- > drivers/net/bnx2x/bnx2x_stats.c | 8 +- > drivers/net/bnx2x/ecore_sp.c | 2 +- > drivers/net/bnx2x/elink.c | 4 +- > drivers/net/bnxt/bnxt_hwrm.c | 2 +- > drivers/net/bnxt/hsi_struct_def_dpdk.h| 2 +- > drivers/net/bonding/rte_eth_bond_8023ad.c | 2 +- > drivers/net/cnxk/cnxk_ethdev.c| 4 +- > drivers/net/cxgbe/cxgbe_ethdev.c | 10 +-- > drivers/net/cxgbe/cxgbevf_main.c | 4 +- > drivers/net/intel/fm10k/fm10k_ethdev.c| 2 +- > drivers/net/intel/fm10k/fm10k_rxtx.c | 2 +- > drivers/net/intel/ixgbe/ixgbe_fdir.c | 2 +- > drivers/net/intel/ixgbe/ixgbe_ipsec.c | 2 +- > drivers/net/intel/ixgbe/ixgbe_rxtx.c | 2 +- > drivers/net/mlx4/mlx4.c | 2 +- > drivers/net/mlx4/mlx4_flow.c | 6 +- > drivers/net/mlx5/mlx5_flow_dv.c | 2 +- > drivers/net/mlx5/mlx5_flow_hw.c | 6 +- > drivers/net/mlx5/mlx5_rxq.c | 2 +- > drivers/net/mlx5/mlx5_rxtx_vec.h | 2 +- > drivers/net/mvpp2/mrvl_qos.c | 2 +- > drivers/net/nfp/flower/nfp_flower_flow.c | 2 +- > drivers/net/nfp/nfp_net_flow.c| 2 +- > drivers/net/ntnic/nthw/nthw_rac.c | 2 +- > drivers/net/qede/qede_rxtx.c | 6 +- > drivers/net/ring/rte_eth_ring.c | 7 +- > drivers/net/sfc/sfc_dp_rx.h | 2 +- > drivers/net/sfc/sfc_ef100_rx.c
[PATCH v7 6/8] build: use dynamically generated version maps
Switch to dynamically generated version maps.
As the map files get generated, tooling around checking, converting,
updating etc.. static version maps can be removed.
Signed-off-by: David Marchand
Acked-by: Aaron Conole
---
.github/workflows/build.yml | 1 -
MAINTAINERS | 7 -
buildtools/check-symbols.sh | 33 +-
buildtools/map-list-symbol.sh | 7 +-
buildtools/map_to_win.py | 41 ---
buildtools/meson.build| 1 -
devtools/check-symbol-change.sh | 186 ---
devtools/check-symbol-maps.sh | 101 --
devtools/checkpatches.sh | 4 +-
devtools/update-abi.sh| 46 ---
devtools/update_version_map_abi.py| 210
doc/guides/contributing/abi_policy.rst| 21 +-
doc/guides/contributing/coding_style.rst | 7 -
.../contributing/img/patch_cheatsheet.svg | 303 --
doc/guides/contributing/patches.rst | 6 +-
drivers/meson.build | 78 ++---
lib/meson.build | 77 ++---
17 files changed, 193 insertions(+), 936 deletions(-)
delete mode 100644 buildtools/map_to_win.py
delete mode 100755 devtools/check-symbol-change.sh
delete mode 100755 devtools/check-symbol-maps.sh
delete mode 100755 devtools/update-abi.sh
delete mode 100755 devtools/update_version_map_abi.py
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 0cc4d12b0b..7a6b679fe5 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -31,7 +31,6 @@ jobs:
failed=
devtools/check-doc-vs-code.sh upstream/${{ env.REF_GIT_BRANCH }} ||
failed=true
devtools/check-meson.py || failed=true
-devtools/check-symbol-maps.sh || failed=true
[ -z "$failed" ]
ubuntu-vm-builds:
name: ${{ join(matrix.config.*, '-') }}
diff --git a/MAINTAINERS b/MAINTAINERS
index 42ea07854b..480972ef1e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -88,7 +88,6 @@ M: Thomas Monjalon
F: MAINTAINERS
F: devtools/build-dict.sh
F: devtools/check-abi.sh
-F: devtools/check-abi-version.sh
F: devtools/check-doc-vs-code.sh
F: devtools/check-dup-includes.sh
F: devtools/check-maintainers.sh
@@ -96,17 +95,13 @@ F: devtools/check-forbidden-tokens.awk
F: devtools/check-git-log.sh
F: devtools/check-spdx-tag.sh
F: devtools/check-symbol-change.py
-F: devtools/check-symbol-change.sh
-F: devtools/check-symbol-maps.sh
F: devtools/checkpatches.sh
F: devtools/get-maintainer.sh
F: devtools/git-log-fixes.sh
F: devtools/load-devel-config
F: devtools/parse-flow-support.sh
F: devtools/process-iwyu.py
-F: devtools/update-abi.sh
F: devtools/update-patches.py
-F: devtools/update_version_map_abi.py
F: devtools/libabigail.abignore
F: devtools/words-case.txt
F: license/
@@ -166,7 +161,6 @@ M: Tyler Retzlaff
F: lib/eal/common/
F: lib/eal/unix/
F: lib/eal/include/
-F: lib/eal/version.map
F: doc/guides/prog_guide/env_abstraction_layer.rst
F: app/test/test_alarm.c
F: app/test/test_atomic.c
@@ -396,7 +390,6 @@ Windows support
M: Dmitry Kozlyuk
M: Tyler Retzlaff
F: lib/eal/windows/
-F: buildtools/map_to_win.py
F: doc/guides/windows_gsg/
Windows memory allocation
diff --git a/buildtools/check-symbols.sh b/buildtools/check-symbols.sh
index b8ac24391e..0d6745ec14 100755
--- a/buildtools/check-symbols.sh
+++ b/buildtools/check-symbols.sh
@@ -7,29 +7,12 @@ OBJFILE=$2
ROOTDIR=$(readlink -f $(dirname $(readlink -f $0))/..)
LIST_SYMBOL=$ROOTDIR/buildtools/map-list-symbol.sh
-CHECK_SYMBOL_MAPS=$ROOTDIR/devtools/check-symbol-maps.sh
-
-# added check for "make -C test/" usage
-if [ ! -e $MAPFILE ] || [ ! -f $OBJFILE ]
-then
- exit 0
-fi
-
-if [ -d $MAPFILE ]
-then
- exit 0
-fi
-
DUMPFILE=$(mktemp -t dpdk.${0##*/}.objdump.XX)
trap 'rm -f "$DUMPFILE"' EXIT
objdump -t $OBJFILE >$DUMPFILE
ret=0
-if ! $CHECK_SYMBOL_MAPS $MAPFILE; then
- ret=1
-fi
-
for SYM in `$LIST_SYMBOL -S EXPERIMENTAL $MAPFILE |cut -d ' ' -f 3`
do
if grep -q "\.text.*[[:space:]]$SYM$" $DUMPFILE &&
@@ -37,8 +20,7 @@ do
$LIST_SYMBOL -s $SYM $MAPFILE | grep -q EXPERIMENTAL
then
cat >&2 <<- END_OF_MESSAGE
- $SYM is not flagged as experimental
- but is listed in version map
+ $SYM is not flagged as experimental but is exported as an
experimental symbol
Please add __rte_experimental to the definition of $SYM
END_OF_MESSAGE
ret=1
@@ -53,9 +35,8 @@ for SYM in `awk '{
do
$LIST_SYMBOL -S EXPERIMENTAL -s $SYM -q $MAPFILE || {
cat >&2 <<- END_OF_MESSAGE
- $SYM is flagged as experimental
- but is not listed in version map
- Please add $SYM to the version map
+ $SYM i
[PATCH v7 3/8] buildtools: display symbols version from map
Display the version when a symbol was introduced.
This is needed for scripting the conversion from static to dynamically
generated version maps.
It is also useful when listing experimental symbols.
Signed-off-by: David Marchand
---
buildtools/map-list-symbol.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/buildtools/map-list-symbol.sh b/buildtools/map-list-symbol.sh
index 43f276c05f..eb98451d8e 100755
--- a/buildtools/map-list-symbol.sh
+++ b/buildtools/map-list-symbol.sh
@@ -73,7 +73,7 @@ for file in $@; do
if ("'$symbol'" == "all" || $1 == "'$symbol'") {
ret = 0;
if ("'$quiet'" == "") {
- print "'$file' "current_section" "$1;
+ print "'$file' "current_section" "$1"
"current_version;
}
if ("'$symbol'" != "all") {
exit 0;
--
2.49.0
[PATCH v7 8/8] eal: rework function versioning macros
For versioning symbols:
- MSVC uses pragmas on the symbol,
- GNU linker uses special asm directives,
To accommodate both GNU linker and MSVC linker, introduce new macros for
exporting and versioning symbols that will surround the whole function.
This has the advantage of hiding all the ugly details in the macros.
Now versioning a symbol is just a call to a single macro:
- RTE_VERSION_SYMBOL (resp. RTE_VERSION_EXPERIMENTAL_SYMBOL), for
keeping an old implementation code under a versioned function (resp.
experimental function),
- RTE_DEFAULT_SYMBOL, for declaring the new default versioned function,
and handling the static link special case, instead of
BIND_DEFAULT_SYMBOL + MAP_STATIC_SYMBOL,
Those macros replaces the legacy ones from rte_function_versioning.h
that were previously publicly exported.
It is important to note that, for now, function versioning is
implemented for GCC and CLANG only.
No warning will be generated for MSVC builds.
Update lib/net accordingly.
Signed-off-by: David Marchand
---
Changes since v6:
- updated macros description in header,
- updated commitlog,
Changes since RFC v4:
- moved new macros to eal_symbol_exports.h and simply dropped legacy
macros/header,
- added release notes update,
Changes since RFC v3:
- fixed documentation and simplified examples,
Changes since RFC v1:
- renamed and prefixed macros,
- reindented in prevision of second patch,
---
buildtools/gen-version-map.py | 15 +-
doc/api/doxy-api-index.md | 1 -
doc/guides/contributing/abi_versioning.rst | 192 ++---
doc/guides/rel_notes/release_25_07.rst | 2 +
lib/eal/common/eal_export.h| 63 +++
lib/eal/include/rte_function_versioning.h | 99 ---
lib/net/net_crc.h | 15 --
lib/net/rte_net_crc.c | 29 +---
8 files changed, 128 insertions(+), 288 deletions(-)
delete mode 100644 lib/eal/include/rte_function_versioning.h
diff --git a/buildtools/gen-version-map.py b/buildtools/gen-version-map.py
index c5ea10def0..57e08a8c0f 100755
--- a/buildtools/gen-version-map.py
+++ b/buildtools/gen-version-map.py
@@ -13,10 +13,9 @@
)
export_int_sym_regexp = re.compile(r"^RTE_EXPORT_INTERNAL_SYMBOL\(([^)]+)\)")
export_sym_regexp = re.compile(r"^RTE_EXPORT_SYMBOL\(([^)]+)\)")
-# From rte_function_versioning.h
-ver_sym_regexp = re.compile(r"^VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+)\)")
-ver_exp_sym_regexp = re.compile(r"^VERSION_SYMBOL_EXPERIMENTAL\([^,]+,
([^,]+)\)")
-default_sym_regexp = re.compile(r"^BIND_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+)\)")
+ver_sym_regexp = re.compile(r"^RTE_VERSION_SYMBOL\(([^,]+), [^,]+, ([^,]+),")
+ver_exp_sym_regexp = re.compile(r"^RTE_VERSION_EXPERIMENTAL_SYMBOL\([^,]+,
([^,]+),")
+default_sym_regexp = re.compile(r"^RTE_DEFAULT_SYMBOL\(([^,]+), [^,]+,
([^,]+),")
parser = argparse.ArgumentParser(
description=__doc__,
@@ -68,16 +67,16 @@
node = ABI
symbol = export_sym_regexp.match(ln).group(1)
elif ver_sym_regexp.match(ln):
-abi = ver_sym_regexp.match(ln).group(2)
+abi = ver_sym_regexp.match(ln).group(1)
node = f"DPDK_{abi}"
-symbol = ver_sym_regexp.match(ln).group(1)
+symbol = ver_sym_regexp.match(ln).group(2)
elif ver_exp_sym_regexp.match(ln):
node = "EXPERIMENTAL"
symbol = ver_exp_sym_regexp.match(ln).group(1)
elif default_sym_regexp.match(ln):
-abi = default_sym_regexp.match(ln).group(2)
+abi = default_sym_regexp.match(ln).group(1)
node = f"DPDK_{abi}"
-symbol = default_sym_regexp.match(ln).group(1)
+symbol = default_sym_regexp.match(ln).group(2)
if not symbol:
continue
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index b2fc24b3e4..5c425a2cb9 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -248,7 +248,6 @@ The public API headers are grouped by topics:
[EAL config](@ref rte_eal.h),
[common](@ref rte_common.h),
[experimental APIs](@ref rte_compat.h),
- [ABI versioning](@ref rte_function_versioning.h),
[version](@ref rte_version.h)
- **tests**:
diff --git a/doc/guides/contributing/abi_versioning.rst
b/doc/guides/contributing/abi_versioning.rst
index b6b6bf64d7..2fa2b15edc 100644
--- a/doc/guides/contributing/abi_versioning.rst
+++ b/doc/guides/contributing/abi_versioning.rst
@@ -132,32 +132,25 @@ functionality or behavior. When that occurs, it is may be
required to allow for
backward compatibility for a time with older binaries that are dynamically
linked to the DPDK.
-To support backward compatibility the ``rte_function_versioning.h``
+To support backward compatibility the ``eal_export.h``
header file provides macros to use when updating exported functions. These
macros allow multiple versions of a symbol to exist in a shared
library so that old
Re: [PATCH v6 4/8] build: generate symbol maps
On Wed, Apr 2, 2025 at 10:06 AM Thomas Monjalon wrote: > > 28/03/2025 11:52, David Marchand: > > --- /dev/null > > +++ b/lib/eal/common/eal_symbol_exports.h > > @@ -0,0 +1,16 @@ > > +/* SPDX-License-Identifier: BSD-3-Clause > > + * Copyright (c) 2025 Red Hat, Inc. > > + */ > > + > > +#ifndef EAL_SYMBOL_EXPORTS_H > > +#define EAL_SYMBOL_EXPORTS_H > > + > > +/* Internal macros for exporting symbols, used by the build system. > > + * For RTE_EXPORT_EXPERIMENTAL_SYMBOL, ver indicates the > > + * version this symbol was introduced in. > > + */ > > +#define RTE_EXPORT_EXPERIMENTAL_SYMBOL(a, ver) > > +#define RTE_EXPORT_INTERNAL_SYMBOL(a) > > +#define RTE_EXPORT_SYMBOL(a) > > + > > +#endif /* EAL_SYMBOL_EXPORTS_H */ > > Another thought, there is no specific reason to have a "s" > at the end of this filename. > > eal_symbol_export.h looks better to me. > Or simply eal_export.h ? I don't think there is other notions that will be about "exporting", so implicit eal_export.h looks ok. -- David Marchand
[PATCH] drivers: remove __rte_used from functions for compatibility with MSVC
With gcc, the macro __rte_used translates to __attribute__((used)).
MSVC has something to the same effect, but harder to use and with some
limitations (one being that it cannot be used with "static"). Therefore,
it makes sense to avoid __rte_used in some cases.
The functions modified in this patch don't really need to use __rte_used.
Instead, these functions can be involved in same ifdefs used in the
callers. That way, they are only defined when needed (when
someone is actually calling the function). Doing so makes the code
compatible with MSVC and avoids compiler warnings about functions being
defined but not used.
Signed-off-by: Andre Muezerie
---
drivers/net/cnxk/cn10k_rx_select.c | 6 +-
drivers/net/cnxk/cn10k_tx_select.c | 6 --
drivers/net/cnxk/cn20k_rx_select.c | 6 +-
drivers/net/cnxk/cn20k_tx_select.c | 6 --
drivers/net/cnxk/cn9k_rx_select.c | 6 --
drivers/net/cnxk/cn9k_tx_select.c | 6 --
6 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/drivers/net/cnxk/cn10k_rx_select.c
b/drivers/net/cnxk/cn10k_rx_select.c
index fe1f0dda73..658a434d75 100644
--- a/drivers/net/cnxk/cn10k_rx_select.c
+++ b/drivers/net/cnxk/cn10k_rx_select.c
@@ -5,7 +5,9 @@
#include "cn10k_ethdev.h"
#include "cn10k_rx.h"
-static __rte_used void
+#if defined(RTE_ARCH_ARM64)
+#if !defined(CNXK_DIS_TMPLT_FUNC)
+static void
pick_rx_func(struct rte_eth_dev *eth_dev,
const eth_rx_burst_t rx_burst[NIX_RX_OFFLOAD_MAX])
{
@@ -21,6 +23,8 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
rte_atomic_thread_fence(rte_memory_order_release);
}
+#endif
+#endif
static uint16_t __rte_noinline __rte_hot __rte_unused
cn10k_nix_flush_rx(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)
diff --git a/drivers/net/cnxk/cn10k_tx_select.c
b/drivers/net/cnxk/cn10k_tx_select.c
index 56fddac5a0..b9a17b8bc2 100644
--- a/drivers/net/cnxk/cn10k_tx_select.c
+++ b/drivers/net/cnxk/cn10k_tx_select.c
@@ -5,7 +5,9 @@
#include "cn10k_ethdev.h"
#include "cn10k_tx.h"
-static __rte_used inline void
+#if defined(RTE_ARCH_ARM64)
+#if !defined(CNXK_DIS_TMPLT_FUNC)
+static inline void
pick_tx_func(struct rte_eth_dev *eth_dev,
const eth_tx_burst_t tx_burst[NIX_TX_OFFLOAD_MAX])
{
@@ -19,8 +21,8 @@ pick_tx_func(struct rte_eth_dev *eth_dev,
rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst =
eth_dev->tx_pkt_burst;
}
+#endif
-#if defined(RTE_ARCH_ARM64)
static int
cn10k_nix_tx_queue_count(void *tx_queue)
{
diff --git a/drivers/net/cnxk/cn20k_rx_select.c
b/drivers/net/cnxk/cn20k_rx_select.c
index 25c79434cd..df12befc20 100644
--- a/drivers/net/cnxk/cn20k_rx_select.c
+++ b/drivers/net/cnxk/cn20k_rx_select.c
@@ -5,7 +5,9 @@
#include "cn20k_ethdev.h"
#include "cn20k_rx.h"
-static __rte_used void
+#if defined(RTE_ARCH_ARM64)
+#if !defined(CNXK_DIS_TMPLT_FUNC)
+static void
pick_rx_func(struct rte_eth_dev *eth_dev, const eth_rx_burst_t
rx_burst[NIX_RX_OFFLOAD_MAX])
{
struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
@@ -18,6 +20,8 @@ pick_rx_func(struct rte_eth_dev *eth_dev, const
eth_rx_burst_t rx_burst[NIX_RX_O
rte_atomic_thread_fence(rte_memory_order_release);
}
+#endif
+#endif
static uint16_t __rte_noinline __rte_hot __rte_unused
cn20k_nix_flush_rx(void *rx_queue, struct rte_mbuf **rx_pkts, uint16_t pkts)
diff --git a/drivers/net/cnxk/cn20k_tx_select.c
b/drivers/net/cnxk/cn20k_tx_select.c
index fb62b54a5f..d0c97a6c19 100644
--- a/drivers/net/cnxk/cn20k_tx_select.c
+++ b/drivers/net/cnxk/cn20k_tx_select.c
@@ -5,7 +5,9 @@
#include "cn20k_ethdev.h"
#include "cn20k_tx.h"
-static __rte_used inline void
+#if defined(RTE_ARCH_ARM64)
+#if !defined(CNXK_DIS_TMPLT_FUNC)
+static inline void
pick_tx_func(struct rte_eth_dev *eth_dev, const eth_tx_burst_t
tx_burst[NIX_TX_OFFLOAD_MAX])
{
struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev);
@@ -16,8 +18,8 @@ pick_tx_func(struct rte_eth_dev *eth_dev, const
eth_tx_burst_t tx_burst[NIX_TX_O
if (eth_dev->data->dev_started)
rte_eth_fp_ops[eth_dev->data->port_id].tx_pkt_burst =
eth_dev->tx_pkt_burst;
}
+#endif
-#if defined(RTE_ARCH_ARM64)
static int
cn20k_nix_tx_queue_count(void *tx_queue)
{
diff --git a/drivers/net/cnxk/cn9k_rx_select.c
b/drivers/net/cnxk/cn9k_rx_select.c
index 0d4031ddeb..8cddc88e5d 100644
--- a/drivers/net/cnxk/cn9k_rx_select.c
+++ b/drivers/net/cnxk/cn9k_rx_select.c
@@ -5,7 +5,9 @@
#include "cn9k_ethdev.h"
#include "cn9k_rx.h"
-static __rte_used void
+#if defined(RTE_ARCH_ARM64)
+#if !defined(CNXK_DIS_TMPLT_FUNC)
+static void
pick_rx_func(struct rte_eth_dev *eth_dev,
const eth_rx_burst_t rx_burst[NIX_RX_OFFLOAD_MAX])
{
@@ -19,8 +21,8 @@ pick_rx_func(struct rte_eth_dev *eth_dev,
rte_eth_fp_ops[eth_dev->data->port_id].rx_pkt_burst =
eth_dev->rx_pkt_burst;
}
+#endif
-#if defined(RTE_ARCH_ARM64)
static void
cn9k_eth_set_rx_tmplt_func(struc
Re: [PATCH v3 2/3] eal: fix unckeck pipe
On 2025/4/2 22:45, Morten Brørup wrote:
>> From: Dengdui Huang [mailto:huangdeng...@huawei.com]
>> Sent: Wednesday, 2 April 2025 14.25
>>
>> The communication pipe may be unavailable, for example,
>> when the lcore role is ROLE_OFF or ROLE_NON_EAL.
>> So check whether the pipe is available before using it.
>>
>> Fixes: a95d70547c57 ("eal: factorize lcore main loop")
>> Cc: sta...@dpdk.org
>>
>> Signed-off-by: Dengdui Huang
>> ---
>> lib/eal/unix/eal_unix_thread.c | 3 +++
>> lib/eal/windows/eal_thread.c | 3 +++
>> 2 files changed, 6 insertions(+)
>>
>> diff --git a/lib/eal/unix/eal_unix_thread.c
>> b/lib/eal/unix/eal_unix_thread.c
>> index ef6cbff0ee..103571cabf 100644
>> --- a/lib/eal/unix/eal_unix_thread.c
>> +++ b/lib/eal/unix/eal_unix_thread.c
>> @@ -17,6 +17,9 @@ eal_thread_wake_worker(unsigned int worker_id)
>> char c = 0;
>> int n;
>>
>> +if (m2w == 0 || w2m == 0)
>> +return -EINVAL;
>> +
>> do {
>> n = write(m2w, &c, 1);
>> } while (n == 0 || (n < 0 && errno == EINTR));
>> diff --git a/lib/eal/windows/eal_thread.c
>> b/lib/eal/windows/eal_thread.c
>> index 9e3df200b9..82bb974868 100644
>> --- a/lib/eal/windows/eal_thread.c
>> +++ b/lib/eal/windows/eal_thread.c
>> @@ -24,6 +24,9 @@ eal_thread_wake_worker(unsigned int worker_id)
>> char c = 0;
>> int n;
>>
>> +if (m2w == 0 || w2m == 0)
>> +return -EINVAL;
>> +
>> do {
>> n = _write(m2w, &c, 1);
>> } while (n == 0 || (n < 0 && errno == EINTR));
>> --
>> 2.33.0
>
> This internal function eal_thread_wake_worker() is only called from
> rte_eal_remote_launch().
> It would be better to check the lcore role there.
>
Is it better to check lcore roles in rte_eal_remote_launch() instead?
Only Role_RTE and Role_SERVICE lcore can be woken up through
rte_eal_remote_launch().
> References:
> https://elixir.bootlin.com/dpdk/v25.03-rc2/A/ident/eal_thread_wake_worker
> https://elixir.bootlin.com/dpdk/v25.03-rc2/source/lib/eal/common/eal_common_launch.c#L52
>
> Furthermore, in theory, file descriptor 0 is a valid file descriptor; if
> "stdin" has been closed, a newly opened file (or pipe) may be assigned file
> descriptor 0.
>
>
[PATCH v2 1/2] node: add global node mbuf dynfield
This patch defines rte_node specific dynamic field structure
(rte_node_mbuf_dynfield_t)
rte_node_mbuf_dynfield_t structure holds two types of fields
- Persistent data fields which are preserved across graph walk.
Currently size of persistent data fields is zero.
- Overloadable data fields which are used by any two adjacent nodes.
Same fields can be repurposed by any other adjacent nodes
This dynfield can be also be used by out-of-tree nodes.
Signed-off-by: Nitin Saxena
---
doc/api/doxy-api-index.md | 3 +-
doc/guides/rel_notes/release_25_07.rst | 6 ++
lib/node/meson.build | 2 +
lib/node/node_mbuf_dynfield.c | 46 +
lib/node/rte_node_mbuf_dynfield.h | 130 +
lib/node/version.map | 3 +
6 files changed, 189 insertions(+), 1 deletion(-)
create mode 100644 lib/node/node_mbuf_dynfield.c
create mode 100644 lib/node/rte_node_mbuf_dynfield.h
diff --git a/doc/api/doxy-api-index.md b/doc/api/doxy-api-index.md
index b2fc24b3e4..6b93b3cd97 100644
--- a/doc/api/doxy-api-index.md
+++ b/doc/api/doxy-api-index.md
@@ -219,7 +219,8 @@ The public API headers are grouped by topics:
[ip4_node](@ref rte_node_ip4_api.h),
[ip6_node](@ref rte_node_ip6_api.h),
[udp4_input_node](@ref rte_node_udp4_input_api.h)
-
+ * graph_nodes_mbuf:
+[node_mbuf_dynfield](@ref rte_node_mbuf_dynfield.h)
- **basic**:
[bitops](@ref rte_bitops.h),
[approx fraction](@ref rte_approx.h),
diff --git a/doc/guides/rel_notes/release_25_07.rst
b/doc/guides/rel_notes/release_25_07.rst
index cd1025aac0..72d5d88ff3 100644
--- a/doc/guides/rel_notes/release_25_07.rst
+++ b/doc/guides/rel_notes/release_25_07.rst
@@ -55,6 +55,12 @@ New Features
Also, make sure to start the actual text at the margin.
===
+* **Added rte_node specific global mbuf dynamic field.**
+
+ Instead each node registering mbuf dynamic field for its own purpose, a
+ global structure is added which can be used/overloaded by all nodes
+ (including out-of-tree nodes). This minimizes footprint of node specific mbuf
+ dynamic field.
Removed Items
-
diff --git a/lib/node/meson.build b/lib/node/meson.build
index 0bed97a96c..4330d0450b 100644
--- a/lib/node/meson.build
+++ b/lib/node/meson.build
@@ -8,6 +8,7 @@ if is_windows
endif
sources = files(
+'node_mbuf_dynfield.c',
'ethdev_ctrl.c',
'ethdev_rx.c',
'ethdev_tx.c',
@@ -30,6 +31,7 @@ headers = files(
'rte_node_ip4_api.h',
'rte_node_ip6_api.h',
'rte_node_udp4_input_api.h',
+'rte_node_mbuf_dynfield.h'
)
# Strict-aliasing rules are violated by uint8_t[] to context size casts.
diff --git a/lib/node/node_mbuf_dynfield.c b/lib/node/node_mbuf_dynfield.c
new file mode 100644
index 00..1163c1e991
--- /dev/null
+++ b/lib/node/node_mbuf_dynfield.c
@@ -0,0 +1,46 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+#include
+#include
+#include
+#include
+#include
+
+#define NODE_MBUF_DYNFIELD_MEMZONE_NAME "__rte_node_mbuf_dynfield"
+
+struct node_mbuf_dynfield_mz {
+ int dynfield_offset;
+};
+
+static const struct rte_mbuf_dynfield node_mbuf_dynfield_desc = {
+ .name = "rte_node_mbuf_dynfield",
+ .size = sizeof(rte_node_mbuf_dynfield_t),
+ .align = alignof(rte_node_mbuf_dynfield_t),
+};
+
+int node_mbuf_dynfield_offset = -1;
+
+int rte_node_mbuf_dynfield_register(void)
+{
+ int dyn_offset;
+
+ RTE_BUILD_BUG_ON(sizeof(rte_node_mbuf_dynfield_t) <
RTE_NODE_MBUF_DYNFIELD_SIZE);
+ RTE_BUILD_BUG_ON(sizeof(rte_node_mbuf_overload_fields_t) <
+RTE_NODE_MBUF_OVERLOADABLE_FIELDS_SIZE);
+
+ if (node_mbuf_dynfield_offset == -1) {
+ dyn_offset =
rte_mbuf_dynfield_register(&node_mbuf_dynfield_desc);
+ if (dyn_offset < 0) {
+ node_err("node_mbuf_dyn", "rte_mbuf_dynfield_register
failed");
+ return -1;
+ }
+ node_mbuf_dynfield_offset = dyn_offset;
+
+ node_dbg("node_mbuf_dyn", "node mbuf dynfield size %zu at
offset: %d",
+ sizeof(rte_node_mbuf_dynfield_t),
node_mbuf_dynfield_offset);
+ } else {
+ dyn_offset = node_mbuf_dynfield_offset;
+ }
+ return dyn_offset;
+}
diff --git a/lib/node/rte_node_mbuf_dynfield.h
b/lib/node/rte_node_mbuf_dynfield.h
new file mode 100644
index 00..794251b1f1
--- /dev/null
+++ b/lib/node/rte_node_mbuf_dynfield.h
@@ -0,0 +1,130 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2025 Marvell International Ltd.
+ */
+
+#ifndef _RTE_GRAPH_MBUF_DYNFIELD_H_
+#define _RTE_GRAPH_MBUF_DYNFIELD_H_
+
+#include
+
+/**
+ * @file: rte_node_mbuf_dynfield.h
+ *
+ * Defines rte_node specific mbuf dynamic field region
[rte_node_mbuf_dynfield_t] which
[PATCH v2 2/2] node: use node mbuf dynfield in ip4 nodes
- Used global node mbuf in ip[4|6]_lookup/rewrite nodes
- Redefine node_mbuf_priv1() to rte_node_mbuf_overload_fields_get()
Signed-off-by: Nitin Saxena
---
lib/node/ip4_lookup.c | 14 ---
lib/node/ip4_rewrite.c| 15 +---
lib/node/ip6_lookup.c | 15 +---
lib/node/ip6_rewrite.c| 14 ---
lib/node/node_private.h | 40 +++
lib/node/rte_node_mbuf_dynfield.h | 9 +++
6 files changed, 34 insertions(+), 73 deletions(-)
diff --git a/lib/node/ip4_lookup.c b/lib/node/ip4_lookup.c
index 0b474cd2bc..7e9d21a9c9 100644
--- a/lib/node/ip4_lookup.c
+++ b/lib/node/ip4_lookup.c
@@ -31,8 +31,6 @@ struct ip4_lookup_node_ctx {
int mbuf_priv1_off;
};
-int node_mbuf_priv1_dynfield_offset = -1;
-
static struct ip4_lookup_node_main ip4_lookup_nm;
#define IP4_LOOKUP_NODE_LPM(ctx) \
@@ -180,17 +178,15 @@ ip4_lookup_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
uint16_t socket, lcore_id;
static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip4_lookup_node_ctx) > RTE_NODE_CTX_SZ);
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
if (!init_once) {
- node_mbuf_priv1_dynfield_offset = rte_mbuf_dynfield_register(
- &node_mbuf_priv1_dynfield_desc);
- if (node_mbuf_priv1_dynfield_offset < 0)
- return -rte_errno;
-
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
@@ -208,7 +204,7 @@ ip4_lookup_node_init(const struct rte_graph *graph, struct
rte_node *node)
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
IP4_LOOKUP_NODE_LPM(node->ctx) = ip4_lookup_nm.lpm_tbl[graph->socket];
- IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
+ IP4_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
#if defined(__ARM_NEON) || defined(RTE_ARCH_X86)
if (rte_vect_get_max_simd_bitwidth() >= RTE_VECT_SIMD_128)
diff --git a/lib/node/ip4_rewrite.c b/lib/node/ip4_rewrite.c
index 34a920df5e..b05decc1a3 100644
--- a/lib/node/ip4_rewrite.c
+++ b/lib/node/ip4_rewrite.c
@@ -258,19 +258,16 @@ ip4_rewrite_node_process(struct rte_graph *graph, struct
rte_node *node,
static int
ip4_rewrite_node_init(const struct rte_graph *graph, struct rte_node *node)
{
- static bool init_once;
+ int dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip4_rewrite_node_ctx) > RTE_NODE_CTX_SZ);
- if (!init_once) {
- node_mbuf_priv1_dynfield_offset = rte_mbuf_dynfield_register(
- &node_mbuf_priv1_dynfield_desc);
- if (node_mbuf_priv1_dynfield_offset < 0)
- return -rte_errno;
- init_once = true;
- }
- IP4_REWRITE_NODE_PRIV1_OFF(node->ctx) = node_mbuf_priv1_dynfield_offset;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
+
+ IP4_REWRITE_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip4_rewrite", "Initialized ip4_rewrite node initialized");
diff --git a/lib/node/ip6_lookup.c b/lib/node/ip6_lookup.c
index f378d2d064..c140aa9cf3 100644
--- a/lib/node/ip6_lookup.c
+++ b/lib/node/ip6_lookup.c
@@ -316,18 +316,16 @@ ip6_lookup_node_init(const struct rte_graph *graph,
struct rte_node *node)
{
uint16_t socket, lcore_id;
static uint8_t init_once;
- int rc;
+ int rc, dyn;
RTE_SET_USED(graph);
RTE_BUILD_BUG_ON(sizeof(struct ip6_lookup_node_ctx) > RTE_NODE_CTX_SZ);
- if (!init_once) {
- node_mbuf_priv1_dynfield_offset =
- rte_mbuf_dynfield_register(
- &node_mbuf_priv1_dynfield_desc);
- if (node_mbuf_priv1_dynfield_offset < 0)
- return -rte_errno;
+ dyn = rte_node_mbuf_dynfield_register();
+ if (dyn < 0)
+ return -rte_errno;
+ if (!init_once) {
/* Setup LPM tables for all sockets */
RTE_LCORE_FOREACH(lcore_id)
{
@@ -345,8 +343,7 @@ ip6_lookup_node_init(const struct rte_graph *graph, struct
rte_node *node)
/* Update socket's LPM and mbuf dyn priv1 offset in node ctx */
IP6_LOOKUP_NODE_LPM(node->ctx) = ip6_lookup_nm.lpm_tbl[graph->socket];
- IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) =
- node_mbuf_priv1_dynfield_offset;
+ IP6_LOOKUP_NODE_PRIV1_OFF(node->ctx) = dyn;
node_dbg("ip6_lookup", "Initialized ip6_lookup node");
diff --git a/lib/node/ip6_rewrite.c b/lib/node/ip6_rewrite.c
index 198d8d8820..b9e223ab3a 100644
--- a/lib/node/ip6_rewrite.c
+++ b/lib/node/ip6_rewrite.
Re: [PATCH] maintainers: update for hns3
在 2025/4/2 16:47, Jie Hai 写道: I am moving on to other things and dengdui is going to take over the role of hns3 maintainer. Update the MAINTAINERS accordingly. Signed-off-by: Jie Hai Thanks for your contributions to hns3. Acked-by: Huisong Li --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MAINTAINERS b/MAINTAINERS index 4b01103f8e83..bcc9fdaf0c92 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -765,7 +765,7 @@ F: doc/guides/nics/gve.rst F: doc/guides/nics/features/gve.ini Hisilicon hns3 -M: Jie Hai +M: Dengdui Huang F: drivers/net/hns3/ F: doc/guides/nics/hns3.rst F: doc/guides/nics/features/hns3.ini
Re: [PATCH v12 07/10] dts: replace use of sanity check in comment
Reviewed-by: Luca Vizzarro I'm happy with the change. The original intention of the comment was to make sure that non-involved ports were still being allowed, and that there were no side effects. The comment change somewhat becomes redundant as it's repeating the subsequent message. So if it were to stay as proposed, I guess it'd drop it altogether.
RE: 22.11.8 patches review and test
> -Original Message- > From: luca.bocca...@gmail.com > Sent: Wednesday, March 26, 2025 7:51 PM > To: sta...@dpdk.org > Cc: dev@dpdk.org; Ali Alnubani ; David Christensen > ; Hemant Agrawal ; > Stokes, Ian ; Jerin Jacob ; > Mcnamara, John ; Kevin Traynor > ; Luca Boccassi ; Pei Zhang > ; Raslan Darawsheh ; Thomas > Monjalon ; Yanghang Liu > Subject: 22.11.8 patches review and test > > Hi all, > > Here is a list of patches targeted for stable release 22.11.8. > > The planned date for the final release is 2025/04/10. > > Please help with testing and validation of your use cases and report any > issues/results with reply-all to this mail. For the final release the fixes > and > reported validations will be added to the release notes. > > A release candidate tarball can be found at: > > https://dpdk.org/browse/dpdk-stable/tag/?id=v22.11.8-rc1 > > These patches are located at branch 22.11 of dpdk-stable repo: > https://dpdk.org/browse/dpdk-stable/ > > Thanks. > > Luca Boccassi > > --- Update the test status for Intel part. dpdk22.11.8-rc1 all validation test done. no new issue is found. # Basic Intel(R) NIC testing * Build & CFLAG compile: cover the build test combination with latest GCC/Clang version and the popular OS revision such as Ubuntu24.04, Ubuntu24.10, Fedora41, RHEL10, RHEL9.4, FreeBSD14.2, SUSE15, AzureLinux3.0, OpenAnolis8.9 etc. - All test done. No new dpdk issue is found. * PF(i40e, ixgbe, igc): test scenarios including RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. - All test done. No new dpdk issue is found. * VF(i40e, ixgbe): test scenarios including VF-RTE_FLOW/TSO/Jumboframe/checksum offload/VLAN/VXLAN, etc. - All test done. No new dpdk issue is found. * PF/VF(ice): test scenarios including Switch features/Package Management/Flow Director/Advanced Tx/Advanced RSS/ACL/DCF/Flexible Descriptor, etc. - All test done. No new dpdk issue is found. * Intel NIC single core/NIC performance: test scenarios including PF/VF single core performance test, etc. - All test done. No new dpdk issue is found. * IPsec: test scenarios including ipsec/ipsec-gw/ipsec library basic test - QAT&SW/FIB library, etc. - All test done. No new dpdk issue is found. # Basic cryptodev and virtio testing * Virtio: both function and performance test are covered. Such as PVP/Virtio_loopback/virtio-user loopback/virtio-net VM2VM perf testing/VMAWARE ESXI 8.0, etc. - All test done. No new dpdk issue is found. * Cryptodev: *Function test: test scenarios including Cryptodev API testing/CompressDev ISA-L/QAT/ZLIB PMD Testing/FIPS, etc. - All test done. No new dpdk issue is found. *Performance test: test scenarios including Thoughput Performance/Cryptodev Latency, etc. - All test done. No new dpdk issue is found. Regards, Xu, HailinFW sync
Re: [PATCH 2/2] dts: update dpdk-devbind script regex
Reviewed-by: Luca Vizzarro
Re: [PATCH 1/2] dts: include smoke tests in tests config
Hi Patrick,
this looks good, easy and quick fix. I am afraid that you can't append
to an `Iterable` type though. I've also confirmed this with mypy:
Unsupported left operand type for + ("Iterable[TestSuiteConfig]")
I guess the easiest fix is to just change the argument type to `list`
from `Iterable`.
Best,
Luca
Re: [PATCH 1/2] dts: include smoke tests in tests config
Thanks Luca for the info - there is also 1 other fix needed. I'll send a v2.
On Thu, Apr 3, 2025 at 9:45 AM Luca Vizzarro wrote:
> Hi Patrick,
>
> this looks good, easy and quick fix. I am afraid that you can't append
> to an `Iterable` type though. I've also confirmed this with mypy:
>
>Unsupported left operand type for + ("Iterable[TestSuiteConfig]")
>
> I guess the easiest fix is to just change the argument type to `list`
> from `Iterable`.
>
> Best,
> Luca
>
>
ConnectX-7 performance anomaly
Hello, while benchmarking the Nvidia ConnectX-7 400Gbe NIC, I encountered some interesting behavior: when processing short packets (72 B), the maximum packet rate I can achieve is 230 Mpps. However, when I increase the packet size to 512 B briefly and then bring the packet size down to 72 B again, the maximum throughput is now 260 Mpps and seems to stabilize at that value. According to the Nvidia performance report (https://fast.dpdk.org/doc/perf/DPDK_24_07_NVIDIA_NIC_performance_report.pdf), the maximum achievable packet rate of ConnectX-7 NICs is 266 Mpps and that is what I am trying to reproduce. I have observed this behavior with dpdk-l3fwd as well as with my own DPDK application. My setup is as follows: CPU: AMD EPYC 9554P 64-Core Processor Application commandline: sudo dpdk_example_l3fwd -a:05:00.0 -l0-32 --main-lcore=32 -- -p0x1 --config "(0,0,0),(0,1,1),(0,2,2),(0,3,3),(0,4,4),(0,5,5),(0,6,6),(0,7,7),(0,8,8),(0,9,9),(0,10,10),(0,11,11),(0,12,12),(0,13,13),(0,14,14),(0,15,15),(0,16,16),(0,17,17),(0,18,18),(0,19,19),(0,20,20),(0,21,21),(0,22,22),(0,23,23),(0,24,24),(0,25,25),(0,26,26),(0,27,27),(0,28,28),(0,29,29),(0,30,30),(0,31,31)" --eth-dest=0,00:10:94:00:00:02 Generator: Spirent 400G generator Would anyone be able to share some insight as to what might be happening here? Kamil Vojanec CESNET z.s.p.o. smime.p7s Description: S/MIME Cryptographic Signature
[PATCH v6 1/4] net/intel: align Tx queue struct field names
Align the Tx queue struct field names in idpf and
cpfl driver with the common Tx queue struct.
Signed-off-by: Shaiq Wani
---
drivers/net/intel/cpfl/cpfl_rxtx.c| 40 -
drivers/net/intel/cpfl/cpfl_rxtx_vec_common.h | 4 +-
drivers/net/intel/idpf/idpf_common_rxtx.c | 72
drivers/net/intel/idpf/idpf_common_rxtx.h | 21 ++---
.../net/intel/idpf/idpf_common_rxtx_avx2.c| 44 +-
.../net/intel/idpf/idpf_common_rxtx_avx512.c | 84 +--
drivers/net/intel/idpf/idpf_common_virtchnl.c | 6 +-
drivers/net/intel/idpf/idpf_rxtx.c| 24 +++---
drivers/net/intel/idpf/idpf_rxtx_vec_common.h | 4 +-
9 files changed, 150 insertions(+), 149 deletions(-)
diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.c
b/drivers/net/intel/cpfl/cpfl_rxtx.c
index 47351ca102..8eed8f16d5 100644
--- a/drivers/net/intel/cpfl/cpfl_rxtx.c
+++ b/drivers/net/intel/cpfl/cpfl_rxtx.c
@@ -249,7 +249,7 @@ cpfl_rx_split_bufq_setup(struct rte_eth_dev *dev, struct
idpf_rx_queue *rxq,
idpf_qc_split_rx_bufq_reset(bufq);
bufq->qrx_tail = hw->hw_addr + (vport->chunks_info.rx_buf_qtail_start +
queue_idx * vport->chunks_info.rx_buf_qtail_spacing);
- bufq->ops = &def_rxq_ops;
+ bufq->idpf_ops = &def_rxq_ops;
bufq->q_set = true;
if (bufq_id == IDPF_RX_SPLIT_BUFQ1_ID) {
@@ -310,7 +310,7 @@ cpfl_rx_queue_release(void *rxq)
}
/* Single queue */
- q->ops->release_mbufs(q);
+ q->idpf_ops->release_mbufs(q);
rte_free(q->sw_ring);
rte_memzone_free(q->mz);
rte_free(cpfl_rxq);
@@ -332,7 +332,7 @@ cpfl_tx_queue_release(void *txq)
rte_free(q->complq);
}
- q->ops->release_mbufs(q);
+ q->idpf_ops->release_mbufs(q);
rte_free(q->sw_ring);
rte_memzone_free(q->mz);
rte_free(cpfl_txq);
@@ -426,7 +426,7 @@ cpfl_rx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
idpf_qc_single_rx_queue_reset(rxq);
rxq->qrx_tail = hw->hw_addr +
(vport->chunks_info.rx_qtail_start +
queue_idx *
vport->chunks_info.rx_qtail_spacing);
- rxq->ops = &def_rxq_ops;
+ rxq->idpf_ops = &def_rxq_ops;
} else {
idpf_qc_split_rx_descq_reset(rxq);
@@ -501,7 +501,7 @@ cpfl_tx_complq_setup(struct rte_eth_dev *dev, struct
idpf_tx_queue *txq,
ret = -ENOMEM;
goto err_mz_reserve;
}
- cq->tx_ring_phys_addr = mz->iova;
+ cq->tx_ring_dma = mz->iova;
cq->compl_ring = mz->addr;
cq->mz = mz;
idpf_qc_split_tx_complq_reset(cq);
@@ -565,8 +565,8 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
is_splitq = !!(vport->txq_model == VIRTCHNL2_QUEUE_MODEL_SPLIT);
txq->nb_tx_desc = nb_desc;
- txq->rs_thresh = tx_rs_thresh;
- txq->free_thresh = tx_free_thresh;
+ txq->tx_rs_thresh = tx_rs_thresh;
+ txq->tx_free_thresh = tx_free_thresh;
txq->queue_id = vport->chunks_info.tx_start_qid + queue_idx;
txq->port_id = dev->data->port_id;
txq->offloads = cpfl_tx_offload_convert(offloads);
@@ -585,7 +585,7 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
ret = -ENOMEM;
goto err_mz_reserve;
}
- txq->tx_ring_phys_addr = mz->iova;
+ txq->tx_ring_dma = mz->iova;
txq->mz = mz;
txq->sw_ring = rte_zmalloc_socket("cpfl tx sw ring",
@@ -598,7 +598,7 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
}
if (!is_splitq) {
- txq->tx_ring = mz->addr;
+ txq->idpf_tx_ring = mz->addr;
idpf_qc_single_tx_queue_reset(txq);
} else {
txq->desc_ring = mz->addr;
@@ -613,7 +613,7 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
txq->qtx_tail = hw->hw_addr + (vport->chunks_info.tx_qtail_start +
queue_idx * vport->chunks_info.tx_qtail_spacing);
- txq->ops = &def_txq_ops;
+ txq->idpf_ops = &def_txq_ops;
cpfl_vport->nb_data_txq++;
txq->q_set = true;
dev->data->tx_queues[queue_idx] = cpfl_txq;
@@ -663,7 +663,7 @@ cpfl_rx_hairpin_bufq_setup(struct rte_eth_dev *dev, struct
idpf_rx_queue *bufq,
bufq->rx_buf_len = CPFL_P2P_MBUF_SIZE - RTE_PKTMBUF_HEADROOM;
bufq->q_set = true;
- bufq->ops = &def_rxq_ops;
+ bufq->idpf_ops = &def_rxq_ops;
return 0;
}
@@ -860,7 +860,7 @@ cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_idx,
goto err_txq_mz_rsv;
}
- txq->tx_ring_phys_addr = mz->iova;
+ txq->tx_ring_dma = mz->iova;
txq->desc_ring = mz->addr;
txq->mz = mz;
@@ -868,7 +868,7 @@ cpfl_tx_hairpin_queue_setup(struct rte_eth_dev *dev,
uint16_t queue_i
[PATCH v6 2/4] net/intel: use common Tx entry structure
Used the common Tx entry structure and common Tx mbuf ring replenish fn
in place of idpf-specific structure and function.
The vector driver code paths (AVX2, AVX512) use the smaller SW
ring structure.
Signed-off-by: Shaiq Wani
---
drivers/net/intel/cpfl/cpfl_rxtx.c| 2 +-
drivers/net/intel/idpf/idpf_common_rxtx.c | 16 +--
drivers/net/intel/idpf/idpf_common_rxtx.h | 13 ++---
.../net/intel/idpf/idpf_common_rxtx_avx2.c| 21 --
.../net/intel/idpf/idpf_common_rxtx_avx512.c | 28 ++-
drivers/net/intel/idpf/idpf_ethdev.c | 1 +
drivers/net/intel/idpf/idpf_rxtx.c| 2 +-
drivers/net/intel/idpf/idpf_rxtx.h| 1 +
drivers/net/intel/idpf/idpf_rxtx_vec_common.h | 1 +
9 files changed, 30 insertions(+), 55 deletions(-)
diff --git a/drivers/net/intel/cpfl/cpfl_rxtx.c
b/drivers/net/intel/cpfl/cpfl_rxtx.c
index 8eed8f16d5..6b7e7c5087 100644
--- a/drivers/net/intel/cpfl/cpfl_rxtx.c
+++ b/drivers/net/intel/cpfl/cpfl_rxtx.c
@@ -589,7 +589,7 @@ cpfl_tx_queue_setup(struct rte_eth_dev *dev, uint16_t
queue_idx,
txq->mz = mz;
txq->sw_ring = rte_zmalloc_socket("cpfl tx sw ring",
- sizeof(struct idpf_tx_entry) * len,
+ sizeof(struct ci_tx_entry) * len,
RTE_CACHE_LINE_SIZE, socket_id);
if (txq->sw_ring == NULL) {
PMD_INIT_LOG(ERR, "Failed to allocate memory for SW TX ring");
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.c
b/drivers/net/intel/idpf/idpf_common_rxtx.c
index df16aa3f06..4086714ae1 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx.c
@@ -210,7 +210,7 @@ idpf_qc_single_rx_queue_reset(struct idpf_rx_queue *rxq)
void
idpf_qc_split_tx_descq_reset(struct idpf_tx_queue *txq)
{
- struct idpf_tx_entry *txe;
+ struct ci_tx_entry *txe;
uint32_t i, size;
uint16_t prev;
@@ -266,7 +266,7 @@ idpf_qc_split_tx_complq_reset(struct idpf_tx_queue *cq)
void
idpf_qc_single_tx_queue_reset(struct idpf_tx_queue *txq)
{
- struct idpf_tx_entry *txe;
+ struct ci_tx_entry *txe;
uint32_t i, size;
uint16_t prev;
@@ -755,7 +755,7 @@ idpf_split_tx_free(struct idpf_tx_queue *cq)
volatile struct idpf_splitq_tx_compl_desc *compl_ring = cq->compl_ring;
volatile struct idpf_splitq_tx_compl_desc *txd;
uint16_t next = cq->tx_tail;
- struct idpf_tx_entry *txe;
+ struct ci_tx_entry *txe;
struct idpf_tx_queue *txq;
uint16_t gen, qid, q_head;
uint16_t nb_desc_clean;
@@ -863,9 +863,9 @@ idpf_dp_splitq_xmit_pkts(void *tx_queue, struct rte_mbuf
**tx_pkts,
struct idpf_tx_queue *txq = (struct idpf_tx_queue *)tx_queue;
volatile struct idpf_flex_tx_sched_desc *txr;
volatile struct idpf_flex_tx_sched_desc *txd;
- struct idpf_tx_entry *sw_ring;
+ struct ci_tx_entry *sw_ring;
union idpf_tx_offload tx_offload = {0};
- struct idpf_tx_entry *txe, *txn;
+ struct ci_tx_entry *txe, *txn;
uint16_t nb_used, tx_id, sw_id;
struct rte_mbuf *tx_pkt;
uint16_t nb_to_clean;
@@ -1305,7 +1305,7 @@ static inline int
idpf_xmit_cleanup(struct idpf_tx_queue *txq)
{
uint16_t last_desc_cleaned = txq->last_desc_cleaned;
- struct idpf_tx_entry *sw_ring = txq->sw_ring;
+ struct ci_tx_entry *sw_ring = txq->sw_ring;
uint16_t nb_tx_desc = txq->nb_tx_desc;
uint16_t desc_to_clean_to;
uint16_t nb_tx_to_clean;
@@ -1349,8 +1349,8 @@ idpf_dp_singleq_xmit_pkts(void *tx_queue, struct rte_mbuf
**tx_pkts,
volatile struct idpf_base_tx_desc *txd;
volatile struct idpf_base_tx_desc *txr;
union idpf_tx_offload tx_offload = {0};
- struct idpf_tx_entry *txe, *txn;
- struct idpf_tx_entry *sw_ring;
+ struct ci_tx_entry *txe, *txn;
+ struct ci_tx_entry *sw_ring;
struct idpf_tx_queue *txq;
struct rte_mbuf *tx_pkt;
struct rte_mbuf *m_seg;
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx.h
b/drivers/net/intel/idpf/idpf_common_rxtx.h
index 84c05cfaac..30f9e9398d 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx.h
+++ b/drivers/net/intel/idpf/idpf_common_rxtx.h
@@ -10,6 +10,7 @@
#include
#include "idpf_common_device.h"
+#include "../common/tx.h"
#define IDPF_RX_MAX_BURST 32
@@ -148,12 +149,6 @@ struct idpf_rx_queue {
uint32_t hw_register_set;
};
-struct idpf_tx_entry {
- struct rte_mbuf *mbuf;
- uint16_t next_id;
- uint16_t last_id;
-};
-
/* Structure associated with each TX queue. */
struct idpf_tx_queue {
const struct rte_memzone *mz; /* memzone for Tx ring */
@@ -163,7 +158,7 @@ struct idpf_tx_queue {
struct idpf_splitq_tx_compl_desc *compl_ring;
};
rte_iova_t tx_ring_
[PATCH v6 4/4] net/idpf: use common Tx free fn in idpf
Switch the idpf driver to use the common Tx free function for
AVX2 and AVX512
Signed-off-by: Shaiq Wani
---
.../net/intel/idpf/idpf_common_rxtx_avx2.c| 61 +
.../net/intel/idpf/idpf_common_rxtx_avx512.c | 230 +-
drivers/net/intel/idpf/idpf_rxtx_vec_common.h | 8 +
3 files changed, 16 insertions(+), 283 deletions(-)
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
index 83797ce13e..1d4712b973 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx2.c
@@ -6,6 +6,7 @@
#include "idpf_common_rxtx.h"
#include "idpf_common_device.h"
+#include "idpf_rxtx_vec_common.h"
static __rte_always_inline void
idpf_singleq_rx_rearm(struct idpf_rx_queue *rxq)
@@ -479,64 +480,6 @@ idpf_dp_singleq_recv_pkts_avx2(void *rx_queue, struct
rte_mbuf **rx_pkts, uint16
return _idpf_singleq_recv_raw_pkts_vec_avx2(rx_queue, rx_pkts, nb_pkts);
}
-static __rte_always_inline int
-idpf_singleq_tx_free_bufs_vec(struct ci_tx_queue *txq)
-{
- struct ci_tx_entry *txep;
- uint32_t n;
- uint32_t i;
- int nb_free = 0;
- struct rte_mbuf *m;
- struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) *
txq->tx_rs_thresh);
-
- /* check DD bits on threshold descriptor */
- if ((txq->idpf_tx_ring[txq->tx_next_dd].qw1 &
- rte_cpu_to_le_64(IDPF_TXD_QW1_DTYPE_M)) !=
- rte_cpu_to_le_64(IDPF_TX_DESC_DTYPE_DESC_DONE))
- return 0;
-
- n = txq->tx_rs_thresh;
-
-/* first buffer to free from S/W ring is at index
- * tx_next_dd - (tx_rs_thresh-1)
- */
- txep = &txq->sw_ring[txq->tx_next_dd - (n - 1)];
- m = rte_pktmbuf_prefree_seg(txep[0].mbuf);
- if (likely(m)) {
- free[0] = m;
- nb_free = 1;
- for (i = 1; i < n; i++) {
- m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
- if (likely(m)) {
- if (likely(m->pool == free[0]->pool)) {
- free[nb_free++] = m;
- } else {
- rte_mempool_put_bulk(free[0]->pool,
-(void *)free,
-nb_free);
- free[0] = m;
- nb_free = 1;
- }
- }
- }
- rte_mempool_put_bulk(free[0]->pool, (void **)free, nb_free);
- } else {
- for (i = 1; i < n; i++) {
- m = rte_pktmbuf_prefree_seg(txep[i].mbuf);
- if (m)
- rte_mempool_put(m->pool, m);
- }
- }
-
- /* buffers were freed, update counters */
- txq->nb_tx_free = (uint16_t)(txq->nb_tx_free + txq->tx_rs_thresh);
- txq->tx_next_dd = (uint16_t)(txq->tx_next_dd + txq->tx_rs_thresh);
- if (txq->tx_next_dd >= txq->nb_tx_desc)
- txq->tx_next_dd = (uint16_t)(txq->tx_rs_thresh - 1);
-
- return txq->tx_rs_thresh;
-}
-
static inline void
idpf_singleq_vtx1(volatile struct idpf_base_tx_desc *txdp,
struct rte_mbuf *pkt, uint64_t flags)
@@ -621,7 +564,7 @@ idpf_singleq_xmit_fixed_burst_vec_avx2(void *tx_queue,
struct rte_mbuf **tx_pkts
nb_pkts = RTE_MIN(nb_pkts, txq->tx_rs_thresh);
if (txq->nb_tx_free < txq->tx_free_thresh)
- idpf_singleq_tx_free_bufs_vec(txq);
+ ci_tx_free_bufs_vec(txq, idpf_tx_desc_done, false);
nb_commit = nb_pkts = (uint16_t)RTE_MIN(txq->nb_tx_free, nb_pkts);
if (unlikely(nb_pkts == 0))
diff --git a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
index 715be52046..752f254fe3 100644
--- a/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
+++ b/drivers/net/intel/idpf/idpf_common_rxtx_avx512.c
@@ -5,6 +5,7 @@
#include
#include "idpf_common_device.h"
#include "idpf_common_rxtx.h"
+#include "idpf_rxtx_vec_common.h"
#define IDPF_DESCS_PER_LOOP_AVX 8
#define PKTLEN_SHIFT 10
@@ -995,122 +996,6 @@ idpf_dp_splitq_recv_pkts_avx512(void *rx_queue, struct
rte_mbuf **rx_pkts,
nb_pkts);
}
-static __rte_always_inline int
-idpf_tx_singleq_free_bufs_avx512(struct ci_tx_queue *txq)
-{
- struct ci_tx_entry_vec *txep;
- uint32_t n;
- uint32_t i;
- int nb_free = 0;
- struct rte_mbuf *m;
- struct rte_mbuf **free = alloca(sizeof(struct rte_mbuf *) *
txq->tx_rs_thresh);
-
- /* check DD bits on threshold descriptor */
- if ((txq->idpf_tx_ring[txq->tx_next_dd].qw1 &
- rte_cpu_to_le_64(IDPF_TXD_QW1_DTYPE_M)
[PATCH 1/2] vhost: fix cipher data length
This patch fixes cipher data length, in the event of algorithm
chaining. When enqueuing crypto op to vhost backend
cipher.data.length is set correctly which is in
virtqueue_crypto_sym_pkt_header_arrange(). This field is computed
and assigned wrongly instead of using passed value. This is
rectified and using correct cipher data length in vhost crypto.
Fixes: 3bb595ecd682 ("vhost/crypto: add request handler")
Signed-off-by: Rajesh Mudimadugula
---
lib/vhost/vhost_crypto.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/lib/vhost/vhost_crypto.c b/lib/vhost/vhost_crypto.c
index 3c6c5dc114..ddcd93738b 100644
--- a/lib/vhost/vhost_crypto.c
+++ b/lib/vhost/vhost_crypto.c
@@ -1358,8 +1358,7 @@ prepare_sym_chain_op(struct vhost_crypto *vcrypto, struct
rte_crypto_op *op,
op->sess_type = RTE_CRYPTO_OP_WITH_SESSION;
op->sym->cipher.data.offset = chain->para.cipher_start_src_offset;
- op->sym->cipher.data.length = chain->para.src_data_len -
- chain->para.cipher_start_src_offset;
+ op->sym->cipher.data.length = chain->para.len_to_cipher;
op->sym->auth.data.offset = chain->para.hash_start_src_offset;
op->sym->auth.data.length = chain->para.len_to_hash;
--
2.34.1
[PATCH 2/2] crypto/virtio: fix cipher data src length
In symmetric algorithm chaining, we need to consider both
cipher and auth data length for cipher source.
Fixes: 82adb12a1fce ("crypto/virtio: support burst enqueue/dequeue")
Signed-off-by: Rajesh Mudimadugula
---
drivers/crypto/virtio/virtio_rxtx.c | 20
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/drivers/crypto/virtio/virtio_rxtx.c
b/drivers/crypto/virtio/virtio_rxtx.c
index 0cc904485c..a7f1bd9753 100644
--- a/drivers/crypto/virtio/virtio_rxtx.c
+++ b/drivers/crypto/virtio/virtio_rxtx.c
@@ -243,8 +243,10 @@ virtqueue_crypto_sym_pkt_header_arrange(
req_data->u.sym_req.u.chain.para.aad_len = session->aad.length;
req_data->u.sym_req.u.chain.para.src_data_len =
- (sym_op->cipher.data.length +
- sym_op->cipher.data.offset);
+ RTE_MAX((sym_op->cipher.data.length +
+sym_op->cipher.data.offset),
+ (sym_op->auth.data.length +
+sym_op->auth.data.offset));
req_data->u.sym_req.u.chain.para.dst_data_len =
req_data->u.sym_req.u.chain.para.src_data_len;
req_data->u.sym_req.u.chain.para.cipher_start_src_offset =
@@ -298,6 +300,7 @@ virtqueue_crypto_sym_enqueue_xmit_split(
uint32_t hash_result_len = 0;
struct virtio_crypto_op_cookie *crypto_op_cookie;
struct virtio_crypto_alg_chain_session_para *para;
+ uint32_t src_len;
if (unlikely(sym_op->m_src->nb_segs != 1))
return -EMSGSIZE;
@@ -371,21 +374,22 @@ virtqueue_crypto_sym_enqueue_xmit_split(
desc[idx++].flags = VRING_DESC_F_NEXT;
}
+ src_len = RTE_MAX((sym_op->cipher.data.offset +
+ sym_op->cipher.data.length),
+ (sym_op->auth.data.length +
+ sym_op->auth.data.offset));
/* indirect vring: src data */
desc[idx].addr = rte_pktmbuf_iova_offset(sym_op->m_src, 0);
- desc[idx].len = (sym_op->cipher.data.offset
- + sym_op->cipher.data.length);
+ desc[idx].len = src_len;
desc[idx++].flags = VRING_DESC_F_NEXT;
/* indirect vring: dst data */
if (sym_op->m_dst) {
desc[idx].addr = rte_pktmbuf_iova_offset(sym_op->m_dst, 0);
- desc[idx].len = (sym_op->cipher.data.offset
- + sym_op->cipher.data.length);
+ desc[idx].len = src_len;
} else {
desc[idx].addr = rte_pktmbuf_iova_offset(sym_op->m_src, 0);
- desc[idx].len = (sym_op->cipher.data.offset
- + sym_op->cipher.data.length);
+ desc[idx].len = src_len;
}
desc[idx++].flags = VRING_DESC_F_WRITE | VRING_DESC_F_NEXT;
--
2.34.1
Re: [PATCH] dts: add Scapy asynchronous sniffer
On Tue, Mar 18, 2025 at 1:41 PM Luca Vizzarro wrote:
>
> +def _sniff(self, recv_port: Port):
> +"""Sniff packets and use events and queue to communicate with the
> main thread.
> +
> +Raises:
> +InteractiveSSHSessionDeadError: If the SSH connection has
> been unexpectedly interrupted.
> +"""
> +ready_prompt = "Ready."
> +self.send_command(
> +"sniff("
> +f'iface="{recv_port.logical_name}", quiet=True, store=False, '
> +"prn=lambda p: bytes_base64(p.build()).decode(), "
> +f'started_callback=lambda: print("{ready_prompt}")'
> +")",
> +prompt=ready_prompt,
> +)
> +self._ssh_channel.settimeout(1)
>
Not a big deal at all and I don't know what the "standard" is, but is there
any reason why this number isn't higher? Like 10? I guess the point of the
timeout is to protect against hanging, versus protect against slow
operations (regardless of what the source of that slowness may be).
>
> --
> 2.43.0
>
>
Reviewed-by: Patrick Robb
[PATCH] net/ice: enlarge limits to 64 bits (ice_stats_get)
There are various counters/stats coming from ice_stats_get that appear
to only use 32 or 40 bits and once it hits that limit it "overflows"
and resets. This was causing large spikes (sudden 2^42 increase from
one second to the next) in values of ibytes and obytes, while causing
sudden drops in opackets and ipackets (as they "overflow" and reset).
The sudden spike in bytes is due to the packets count being multiplied
by 4 (crc bytes) and subtracted from the byte count. E.g. One second
the packet count could be just under the 40 bit limit, subtracting a
very large number from the byte count and then in the next second hit
the limit, "overflow" and reset subtracting a very small number, thus
causing the byte counts to appear as if there was a large increase in a
single second.
This patch fixes the issue by enlarging the limitations of any counters
or stats used by ice_stats_get to 64 bits, following the pattern of a
previous patch -
https://mails.dpdk.org/archives/stable/2020-July/023940.html
Signed-off-by: LukeSeewald
---
drivers/net/intel/ice/ice_ethdev.c | 103 +
drivers/net/intel/ice/ice_ethdev.h | 44 ++--
2 files changed, 115 insertions(+), 32 deletions(-)
diff --git a/drivers/net/intel/ice/ice_ethdev.c
b/drivers/net/intel/ice/ice_ethdev.c
index 21d3795954..012b78a469 100644
--- a/drivers/net/intel/ice/ice_ethdev.c
+++ b/drivers/net/intel/ice/ice_ethdev.c
@@ -6061,6 +6061,37 @@ ice_stat_update_40(struct ice_hw *hw,
*stat &= ICE_40_BIT_MASK;
}
+/**
+ * There are various counters that are bubbled up in uint64 values but do not
make use of all
+ * 64 bits, most commonly using only 32 or 40 bits. This function handles the
"overflow" when
+ * these counters hit their 32 or 40 bit limit to enlarge that limitation to
64 bits.
+
+ * @offset_loaded: refers to whether this function has been called before and
old_value is known to
+ * have a value, i.e. its possible that value has overflowed past its original
limitation
+ * @value_bit_limitation: refers to the number of bits the given value uses
before overflowing
+ * @value: is the current value with its original limitation (i.e. 32 or 40
bits)
+ * @old_value: is expected to be the previous value of the given value with
the overflow accounted
+ * for (i.e. the full 64 bit previous value)
+ *
+ * This function will appropriately update both value and old_value,
accounting for overflow
+ */
+static void
+ice_handle_overflow(bool offset_loaded,
+ uint8_t value_bit_limitation,
+ uint64_t *value,
+ uint64_t *old_value)
+{
+ uint64_t low_bit_mask = RTE_LEN2MASK(value_bit_limitation, uint64_t);
+ uint64_t high_bit_mask = ~low_bit_mask;
+
+ if (offset_loaded) {
+ if ((*old_value & low_bit_mask) > *value)
+ *value += (uint64_t)1 << value_bit_limitation;
+ *value += *old_value & high_bit_mask;
+ }
+ *old_value = *value;
+}
+
/* Get all the statistics of a VSI */
static void
ice_update_vsi_stats(struct ice_vsi *vsi)
@@ -6082,13 +6113,16 @@ ice_update_vsi_stats(struct ice_vsi *vsi)
ice_stat_update_40(hw, GLV_BPRCH(idx), GLV_BPRCL(idx),
vsi->offset_loaded, &oes->rx_broadcast,
&nes->rx_broadcast);
- /* enlarge the limitation when rx_bytes overflowed */
- if (vsi->offset_loaded) {
- if (ICE_RXTX_BYTES_LOW(vsi->old_rx_bytes) > nes->rx_bytes)
- nes->rx_bytes += (uint64_t)1 << ICE_40_BIT_WIDTH;
- nes->rx_bytes += ICE_RXTX_BYTES_HIGH(vsi->old_rx_bytes);
- }
- vsi->old_rx_bytes = nes->rx_bytes;
+
+ ice_handle_overflow(vsi->offset_loaded, ICE_40_BIT_WIDTH,
+ &nes->rx_unicast,
&vsi->old_get_stats_fields.rx_unicast);
+ ice_handle_overflow(vsi->offset_loaded, ICE_40_BIT_WIDTH,
+ &nes->rx_multicast,
&vsi->old_get_stats_fields.rx_multicast);
+ ice_handle_overflow(vsi->offset_loaded, ICE_40_BIT_WIDTH,
+ &nes->rx_broadcast,
&vsi->old_get_stats_fields.rx_broadcast);
+ ice_handle_overflow(vsi->offset_loaded, ICE_40_BIT_WIDTH,
+ &nes->rx_bytes, &vsi->old_get_stats_fields.rx_bytes);
+
/* exclude CRC bytes */
nes->rx_bytes -= (nes->rx_unicast + nes->rx_multicast +
nes->rx_broadcast) * RTE_ETHER_CRC_LEN;
@@ -6115,13 +6149,14 @@ ice_update_vsi_stats(struct ice_vsi *vsi)
/* GLV_TDPC not supported */
ice_stat_update_32(hw, GLV_TEPC(idx), vsi->offset_loaded,
&oes->tx_errors, &nes->tx_errors);
- /* enlarge the limitation when tx_bytes overflowed */
- if (vsi->offset_loaded) {
- if (ICE_RXTX_BYTES_LOW(vsi->old_tx_bytes) > nes->tx_bytes)
- nes->tx_bytes += (uint64_t)1 << ICE_40_BIT_WIDTH;
- ne
