diff --git a/0080-net-bonding-promote-experimental-API-stable.patch b/0080-net-bonding-promote-experimental-API-stable.patch new file mode 100644 index 0000000000000000000000000000000000000000..83432a23225423f3cb5a53133f51d7ca65f49f88 --- /dev/null +++ b/0080-net-bonding-promote-experimental-API-stable.patch @@ -0,0 +1,118 @@ +From 19da63ccfc7e83f06e1bb14d830d4e0de99b13cf Mon Sep 17 00:00:00 2001 +From: Lukas Sismis +Date: Wed, 30 Oct 2024 16:42:54 +0100 +Subject: net/bonding: promote experimental API stable + +Remove rte_experimental macros from the stable functions +as they have been part of the stable API since 23.11. + +Signed-off-by: Lukas Sismis +Acked-by: Huisong Li +Acked-by: Stephen Hemminger +--- + .mailmap | 1 + + drivers/net/bonding/rte_eth_bond.h | 4 ---- + drivers/net/bonding/rte_eth_bond_8023ad.h | 1 - + drivers/net/bonding/version.map | 15 +++++---------- + 4 files changed, 6 insertions(+), 15 deletions(-) + +diff --git a/.mailmap b/.mailmap +index ab0742a..5d39263 100644 +--- a/.mailmap ++++ b/.mailmap +@@ -816,6 +816,7 @@ Louis Luo + Louis Peens + Luca Boccassi + Luc Pelletier ++Lukas Sismis + Lukasz Bartosik + Lukasz Czapnik + Lukasz Gosiewski +diff --git a/drivers/net/bonding/rte_eth_bond.h b/drivers/net/bonding/rte_eth_bond.h +index f10165f..53cbba0 100644 +--- a/drivers/net/bonding/rte_eth_bond.h ++++ b/drivers/net/bonding/rte_eth_bond.h +@@ -125,7 +125,6 @@ rte_eth_bond_free(const char *name); + * @return + * 0 on success, negative value otherwise + */ +-__rte_experimental + int + rte_eth_bond_member_add(uint16_t bonding_port_id, uint16_t member_port_id); + +@@ -138,7 +137,6 @@ rte_eth_bond_member_add(uint16_t bonding_port_id, uint16_t member_port_id); + * @return + * 0 on success, negative value otherwise + */ +-__rte_experimental + int + rte_eth_bond_member_remove(uint16_t bonding_port_id, uint16_t member_port_id); + +@@ -199,7 +197,6 @@ rte_eth_bond_primary_get(uint16_t bonding_port_id); + * Number of members associated with bonding device on success, + * negative value otherwise + */ +-__rte_experimental + int + rte_eth_bond_members_get(uint16_t bonding_port_id, uint16_t members[], + uint16_t len); +@@ -216,7 +213,6 @@ rte_eth_bond_members_get(uint16_t bonding_port_id, uint16_t members[], + * Number of active members associated with bonding device on success, + * negative value otherwise + */ +-__rte_experimental + int + rte_eth_bond_active_members_get(uint16_t bonding_port_id, uint16_t members[], + uint16_t len); +diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h +index 4c280c7..6d0ea1b 100644 +--- a/drivers/net/bonding/rte_eth_bond_8023ad.h ++++ b/drivers/net/bonding/rte_eth_bond_8023ad.h +@@ -193,7 +193,6 @@ rte_eth_bond_8023ad_setup(uint16_t port_id, + * -EINVAL if conf is NULL or member id is invalid (not a member of given + * bonding device or is not inactive). + */ +-__rte_experimental + int + rte_eth_bond_8023ad_member_info(uint16_t port_id, uint16_t member_id, + struct rte_eth_bond_8023ad_member_info *conf); +diff --git a/drivers/net/bonding/version.map b/drivers/net/bonding/version.map +index d790d28..0bfcb90 100644 +--- a/drivers/net/bonding/version.map ++++ b/drivers/net/bonding/version.map +@@ -11,13 +11,18 @@ DPDK_24 { + rte_eth_bond_8023ad_ext_distrib; + rte_eth_bond_8023ad_ext_distrib_get; + rte_eth_bond_8023ad_ext_slowtx; ++ rte_eth_bond_8023ad_member_info; + rte_eth_bond_8023ad_setup; ++ rte_eth_bond_active_members_get; + rte_eth_bond_create; + rte_eth_bond_free; + rte_eth_bond_link_monitoring_set; + rte_eth_bond_link_monitoring_get; + rte_eth_bond_mac_address_reset; + rte_eth_bond_mac_address_set; ++ rte_eth_bond_member_add; ++ rte_eth_bond_member_remove; ++ rte_eth_bond_members_get; + rte_eth_bond_mode_get; + rte_eth_bond_mode_set; + rte_eth_bond_primary_get; +@@ -27,13 +32,3 @@ DPDK_24 { + + local: *; + }; +- +-EXPERIMENTAL { +- # added in 23.11 +- global: +- rte_eth_bond_8023ad_member_info; +- rte_eth_bond_active_members_get; +- rte_eth_bond_member_add; +- rte_eth_bond_member_remove; +- rte_eth_bond_members_get; +-}; +-- +2.20.1 + diff --git a/dpdk.spec b/dpdk.spec index 9c837d32fb9970ea25da98ba032c1f0badb75612..1d055c2682c9aa4480469d3d404486c5d1ae998d 100644 --- a/dpdk.spec +++ b/dpdk.spec @@ -11,7 +11,7 @@ Name: dpdk Version: 23.11 -Release: 29 +Release: 30 URL: http://dpdk.org Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz @@ -109,6 +109,7 @@ Patch9077: 0077-config-arm-adapt-RTE_MAX_LCORE-to-640.patch Patch1078: 0078-dpdk-add-sw_64-support.patch Patch6079: 0079-net-xsc-add-xsc-PMD.patch +Patch6080: 0080-net-bonding-promote-experimental-API-stable.patch BuildRequires: meson @@ -314,6 +315,9 @@ fi /usr/sbin/depmod %changelog +* Fri Mar 28 2025 zhangmengxuan - 23.11-30 +- Sync patch from upstreaming: net/bonding: promote experimental API stable. + * Fri Mar 14 2025 qianrong - 23.11-29 - add xsc PMD