Star0
55
代码
代码
Issues27
Pull Requests13
项目讨论
Wiki
分析
Star0
55
已开启
net/bonding: promote experimental API stable #715
mengxuanzhang创建于 2025年3月31日
net/bonding: promote experimental API stable #715
已开启
mengxuanzhang创建于 2025年3月31日
从refs/pull/715/head合入到openEuler-25.03
共 2 个文件变更+123-1
A0080-net-bonding-promote-experimental-API-stable.patch+118-0
@@ -0,0 +1,118 @@
1+From 19da63ccfc7e83f06e1bb14d830d4e0de99b13cf Mon Sep 17 00:00:00 2001
2+From: Lukas Sismis <sismis@cesnet.cz>
3+Date: Wed, 30 Oct 2024 16:42:54 +0100
4+Subject: net/bonding: promote experimental API stable
5+ 
6+Remove rte_experimental macros from the stable functions
7+as they have been part of the stable API since 23.11.
8+ 
9+Signed-off-by: Lukas Sismis <sismis@cesnet.cz>
10+Acked-by: Huisong Li <lihuisong@huawei.com>
11+Acked-by: Stephen Hemminger <stephen@networkplumber.org>
12+---
13+ .mailmap | 1 +
14+ drivers/net/bonding/rte_eth_bond.h | 4 ----
15+ drivers/net/bonding/rte_eth_bond_8023ad.h | 1 -
16+ drivers/net/bonding/version.map | 15 +++++----------
17+ 4 files changed, 6 insertions(+), 15 deletions(-)
18+ 
19+diff --git a/.mailmap b/.mailmap
20+index ab0742a..5d39263 100644
21+--- a/.mailmap
22++++ b/.mailmap
23+@@ -816,6 +816,7 @@ Louis Luo <llouis@vmware.com>
24+ Louis Peens <louis.peens@corigine.com> <louis.peens@netronome.com>
25+ Luca Boccassi <luca.boccassi@microsoft.com> <bluca@debian.org> <luca.boccassi@gmail.com> <lboccass@brocade.com> <luca.boccassi@intl.att.com>
26+ Luc Pelletier <lucp.at.work@gmail.com>
27++Lukas Sismis <sismis@cesnet.cz>
28+ Lukasz Bartosik <lbartosik@marvell.com>
29+ Lukasz Czapnik <lukasz.czapnik@intel.com>
30+ Lukasz Gosiewski <lukaszx.gosiewski@intel.com>
31+diff --git a/drivers/net/bonding/rte_eth_bond.h b/drivers/net/bonding/rte_eth_bond.h
32+index f10165f..53cbba0 100644
33+--- a/drivers/net/bonding/rte_eth_bond.h
34++++ b/drivers/net/bonding/rte_eth_bond.h
35+@@ -125,7 +125,6 @@ rte_eth_bond_free(const char *name);
36+ * @return
37+ * 0 on success, negative value otherwise
38+ */
39+-__rte_experimental
40+ int
41+ rte_eth_bond_member_add(uint16_t bonding_port_id, uint16_t member_port_id);
42+
43+@@ -138,7 +137,6 @@ rte_eth_bond_member_add(uint16_t bonding_port_id, uint16_t member_port_id);
44+ * @return
45+ * 0 on success, negative value otherwise
46+ */
47+-__rte_experimental
48+ int
49+ rte_eth_bond_member_remove(uint16_t bonding_port_id, uint16_t member_port_id);
50+
51+@@ -199,7 +197,6 @@ rte_eth_bond_primary_get(uint16_t bonding_port_id);
52+ * Number of members associated with bonding device on success,
53+ * negative value otherwise
54+ */
55+-__rte_experimental
56+ int
57+ rte_eth_bond_members_get(uint16_t bonding_port_id, uint16_t members[],
58+ uint16_t len);
59+@@ -216,7 +213,6 @@ rte_eth_bond_members_get(uint16_t bonding_port_id, uint16_t members[],
60+ * Number of active members associated with bonding device on success,
61+ * negative value otherwise
62+ */
63+-__rte_experimental
64+ int
65+ rte_eth_bond_active_members_get(uint16_t bonding_port_id, uint16_t members[],
66+ uint16_t len);
67+diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.h b/drivers/net/bonding/rte_eth_bond_8023ad.h
68+index 4c280c7..6d0ea1b 100644
69+--- a/drivers/net/bonding/rte_eth_bond_8023ad.h
70++++ b/drivers/net/bonding/rte_eth_bond_8023ad.h
71+@@ -193,7 +193,6 @@ rte_eth_bond_8023ad_setup(uint16_t port_id,
72+ * -EINVAL if conf is NULL or member id is invalid (not a member of given
73+ * bonding device or is not inactive).
74+ */
75+-__rte_experimental
76+ int
77+ rte_eth_bond_8023ad_member_info(uint16_t port_id, uint16_t member_id,
78+ struct rte_eth_bond_8023ad_member_info *conf);
79+diff --git a/drivers/net/bonding/version.map b/drivers/net/bonding/version.map
80+index d790d28..0bfcb90 100644
81+--- a/drivers/net/bonding/version.map
82++++ b/drivers/net/bonding/version.map
83+@@ -11,13 +11,18 @@ DPDK_24 {
84+ rte_eth_bond_8023ad_ext_distrib;
85+ rte_eth_bond_8023ad_ext_distrib_get;
86+ rte_eth_bond_8023ad_ext_slowtx;
87++ rte_eth_bond_8023ad_member_info;
88+ rte_eth_bond_8023ad_setup;
89++ rte_eth_bond_active_members_get;
90+ rte_eth_bond_create;
91+ rte_eth_bond_free;
92+ rte_eth_bond_link_monitoring_set;
93+ rte_eth_bond_link_monitoring_get;
94+ rte_eth_bond_mac_address_reset;
95+ rte_eth_bond_mac_address_set;
96++ rte_eth_bond_member_add;
97++ rte_eth_bond_member_remove;
98++ rte_eth_bond_members_get;
99+ rte_eth_bond_mode_get;
100+ rte_eth_bond_mode_set;
101+ rte_eth_bond_primary_get;
102+@@ -27,13 +32,3 @@ DPDK_24 {
103+
104+ local: *;
105+ };
106+-
107+-EXPERIMENTAL {
108+- # added in 23.11
109+- global:
110+- rte_eth_bond_8023ad_member_info;
111+- rte_eth_bond_active_members_get;
112+- rte_eth_bond_member_add;
113+- rte_eth_bond_member_remove;
114+- rte_eth_bond_members_get;
115+-};
116+--
117+2.20.1
118+ 
Mdpdk.spec+5-1
@@ -11,7 +11,7 @@
11 11 
12Name: dpdk12Name: dpdk
13Version: 23.1113Version: 23.11
14-Release: 2914+Release: 30
15URL: http://dpdk.org15URL: http://dpdk.org
16Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz16Source: https://fast.dpdk.org/rel/dpdk-%{version}.tar.xz
17 17 
@@ -109,6 +109,7 @@ Patch9077: 0077-config-arm-adapt-RTE_MAX_LCORE-to-640.patch
109Patch1078: 0078-dpdk-add-sw_64-support.patch109Patch1078: 0078-dpdk-add-sw_64-support.patch
110 110 
111Patch6079: 0079-net-xsc-add-xsc-PMD.patch111Patch6079: 0079-net-xsc-add-xsc-PMD.patch
112+Patch6080: 0080-net-bonding-promote-experimental-API-stable.patch
112 113 
113 114 
114BuildRequires: meson115BuildRequires: meson
@@ -314,6 +315,9 @@ fi
314/usr/sbin/depmod315/usr/sbin/depmod
315 316 
316%changelog317%changelog
318+* Fri Mar 28 2025 zhangmengxuan <zhangmengxuan@kylinos.cn> - 23.11-30
319+- Sync patch from upstreaming: net/bonding: promote experimental API stable.
320+ 
317* Fri Mar 14 2025 qianrong <qianr@yunsilicon.com> - 23.11-29321* Fri Mar 14 2025 qianrong <qianr@yunsilicon.com> - 23.11-29
318- add xsc PMD322- add xsc PMD
319 323