Skip to contentSkip to conversation

lpm6, fib6, rib6, table: remove deprecated functions and macros

PATCH In review Robin Jarry 2 participants 4 messages Jul 24 – Jul 27

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 lpm6, fib6, rib6, table: remove deprecated functions and macros

These function were marked as deprecated in DPDK 24.11. Remove them completely.

---
 doc/guides/rel_notes/release_26_11.rst | 11 ++++
 lib/fib/rte_fib6.h                     |  4 --
 lib/lpm/rte_lpm6.h                     |  3 --
 lib/rib/rte_rib6.h                     | 73 --------------------------
 lib/table/rte_table_lpm_ipv6.h         |  2 -
 5 files changed, 11 insertions(+), 82 deletions(-)
doc/guides/rel_notes/release_26_11.rst +11 -0
index 938617ca7542..fb9cde591695 100644
@@ -68,6 +68,17 @@ Removed Items
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+* Deprecated functions removed:
+
+  - ``RTE_FIB6_IPV6_ADDR_SIZE``
+  - ``RTE_FIB6_MAXDEPTH``
+  - ``RTE_LPM6_IPV6_ADDR_SIZE``
+  - ``RTE_LPM6_MAX_DEPTH``
+  - ``RTE_LPM_IPV6_ADDR_SIZE``
+  - ``RTE_RIB6_IPV6_ADDR_SIZE``
+  - ``get_msk_part``
+  - ``rte_rib6_copy_addr``
+  - ``rte_rib6_is_equal``
 
 API Changes
 -----------
lib/fib/rte_fib6.h +0 -4
index 4527328bf00d..890a155a533a 100644
@@ -25,10 +25,6 @@
 extern "C" {
 #endif
 
-#define RTE_FIB6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_FIB6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-/** Maximum depth value possible for IPv6 FIB. */
-#define RTE_FIB6_MAXDEPTH (RTE_DEPRECATED(RTE_FIB6_MAXDEPTH) RTE_IPV6_MAX_DEPTH)
-
 /* Maximum length of a FIB name. */
 #define RTE_FIB6_NAMESIZE	64
 
lib/lpm/rte_lpm6.h +0 -3
index 08b561861348..f7fd10e8a338 100644
@@ -18,9 +18,6 @@
 extern "C" {
 #endif
 
-
-#define RTE_LPM6_MAX_DEPTH (RTE_DEPRECATED(RTE_LPM6_MAX_DEPTH) RTE_IPV6_MAX_DEPTH)
-#define RTE_LPM6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_LPM6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
 /** Max number of characters in LPM name. */
 #define RTE_LPM6_NAMESIZE                 32
 
lib/rib/rte_rib6.h +0 -73

85 lines not on this page · raw message

lib/table/rte_table_lpm_ipv6.h +0 -2
index 3ea888360635..8687e2612480 100644
@@ -48,8 +48,6 @@
 extern "C" {
 #endif
 
-#define RTE_LPM_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_LPM_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-
 /** LPM table parameters */
 struct rte_table_lpm_ipv6_params {
 	/** Table name */
Signature · 1 line
2.55.0
#1 lore raw
Quoted 11 lines · Robin Jarry

These function were marked as deprecated in DPDK 24.11. Remove them completely.

---
 doc/guides/rel_notes/release_26_11.rst | 11 ++++
 lib/fib/rte_fib6.h                     |  4 --
 lib/lpm/rte_lpm6.h                     |  3 --
 lib/rib/rte_rib6.h                     | 73 --------------------------
 lib/table/rte_table_lpm_ipv6.h         |  2 -

Thanks for the quick patch.

rte_fib6.h, rte_lpm6.h and rte_table_lpm_ipv6.h don't need to include rte_common.h anymore.
It had been added when deprecating those macros/functions.

I think you missed RTE_IP_ICMP_ECHO_REPLY and RTE_IP_ICMP_ECHO_REQUEST, from 87bde5ae6873 ("net: add more ICMP types and codes").

Quoted 11 lines
 5 files changed, 11 insertions(+), 82 deletions(-)
doc/guides/rel_notes/release_26_11.rst +1 -0
index 938617ca7542..fb9cde591695 100644
@@ -68,6 +68,17 @@ Removed Items
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+* Deprecated functions removed:

doc/guides/rel_notes/release_26_11.rst Removed Items · line 81

Quoted 10 lines
doc/guides/rel_notes/release_26_11.rst +10 -0
+
+  - ``RTE_FIB6_IPV6_ADDR_SIZE``
+  - ``RTE_FIB6_MAXDEPTH``
+  - ``RTE_LPM6_IPV6_ADDR_SIZE``
+  - ``RTE_LPM6_MAX_DEPTH``
+  - ``RTE_LPM_IPV6_ADDR_SIZE``
+  - ``RTE_RIB6_IPV6_ADDR_SIZE``
+  - ``get_msk_part``
+  - ``rte_rib6_copy_addr``
+  - ``rte_rib6_is_equal``

Yes good thing to add a generic entry, we have other removals that will end up here.
I would sort those by libraries, as I intend to reuse this entry for PCI cleanup.

So something like:

@@ -68,6 +68,14 @@ Removed Items
Also, make sure to start the actual text at the margin.
=======================================================

+* Removed deprecated macros and functions:
+

+  * fib: ``RTE_FIB6_IPV6_ADDR_SIZE``, ``RTE_FIB6_MAXDEPTH``,
+  * lpm: ``RTE_LPM6_IPV6_ADDR_SIZE``, ``RTE_LPM6_MAX_DEPTH``,
+  * rib: ``RTE_RIB6_IPV6_ADDR_SIZE``, ``get_msk_part``,

``rte_rib6_copy_addr``,
+ ``rte_rib6_is_equal``
+ * table: ``RTE_LPM_IPV6_ADDR_SIZE``,
+

API Changes
-----------

Signature · 1 line
David Marchand
#2 lore raw

PATCH v2 1/1 fib, lpm, net, rib, table: remove deprecated functions and macros

In reply to Robin Jarry

These symbols were marked as deprecated in DPDK 24.11. Remove them completely.

---

Notes:
v2:

* Also remove RTE_IP_ICMP_ECHO_REPLY and RTE_IP_ICMP_ECHO_REQUEST.
* Restructure the release note entry to group symbols by library.
* Remove now unused rte_common.h includes.

 doc/guides/rel_notes/release_26_11.rst | 18 +++++++
 lib/fib/rte_fib6.h                     |  5 --
 lib/lpm/rte_lpm6.h                     |  4 --
 lib/net/rte_icmp.h                     |  4 --
 lib/rib/rte_rib6.h                     | 74 --------------------------
 lib/table/rte_table_lpm_ipv6.h         |  3 --
 6 files changed, 18 insertions(+), 90 deletions(-)
doc/guides/rel_notes/release_26_11.rst +18 -0
index 938617ca7542..b6aea129efc8 100644
@@ -68,6 +68,24 @@ Removed Items
    Also, make sure to start the actual text at the margin.
    =======================================================
 
+*  Deprecated symbols removed:
+
+   fib
+      - ``RTE_FIB6_IPV6_ADDR_SIZE``
+      - ``RTE_FIB6_MAXDEPTH``
+   lpm
+      - ``RTE_LPM6_IPV6_ADDR_SIZE``
+      - ``RTE_LPM6_MAX_DEPTH``
+   net
+      - ``RTE_IP_ICMP_ECHO_REPLY``
+      - ``RTE_IP_ICMP_ECHO_REQUEST``
+   rib
+      - ``RTE_RIB6_IPV6_ADDR_SIZE``
+      - ``get_msk_part``
+      - ``rte_rib6_copy_addr``
+      - ``rte_rib6_is_equal``
+   table
+      - ``RTE_LPM_IPV6_ADDR_SIZE``
 
 API Changes
 -----------
lib/fib/rte_fib6.h +0 -5
index 4527328bf00d..fcbd10de1597 100644
@@ -17,7 +17,6 @@
 
 #include <stdint.h>
 
-#include <rte_common.h>
 #include <rte_ip6.h>
 #include <rte_rcu_qsbr.h>
 
@@ -25,10 +24,6 @@
 extern "C" {
 #endif
 
-#define RTE_FIB6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_FIB6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-/** Maximum depth value possible for IPv6 FIB. */
-#define RTE_FIB6_MAXDEPTH (RTE_DEPRECATED(RTE_FIB6_MAXDEPTH) RTE_IPV6_MAX_DEPTH)
-
 /* Maximum length of a FIB name. */
 #define RTE_FIB6_NAMESIZE	64
 
lib/lpm/rte_lpm6.h +0 -4
index 08b561861348..c5928b9d88e2 100644
@@ -11,16 +11,12 @@
 
 #include <stdint.h>
 
-#include <rte_common.h>
 #include <rte_ip6.h>
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-
-#define RTE_LPM6_MAX_DEPTH (RTE_DEPRECATED(RTE_LPM6_MAX_DEPTH) RTE_IPV6_MAX_DEPTH)
-#define RTE_LPM6_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_LPM6_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
 /** Max number of characters in LPM name. */
 #define RTE_LPM6_NAMESIZE                 32
 
lib/net/rte_icmp.h +0 -4
index cca73b373368..a504c921deb8 100644
@@ -51,13 +51,9 @@ struct __rte_packed_begin rte_icmp_hdr {
 
 /* ICMP packet types */
 #define RTE_ICMP_TYPE_ECHO_REPLY 0
-#define RTE_IP_ICMP_ECHO_REPLY \
-	(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REPLY) RTE_ICMP_TYPE_ECHO_REPLY)
 #define RTE_ICMP_TYPE_DEST_UNREACHABLE 3
 #define RTE_ICMP_TYPE_REDIRECT 5
 #define RTE_ICMP_TYPE_ECHO_REQUEST 8
-#define RTE_IP_ICMP_ECHO_REQUEST \
-	(RTE_DEPRECATED(RTE_IP_ICMP_ECHO_REQUEST) RTE_ICMP_TYPE_ECHO_REQUEST)
 #define RTE_ICMP_TYPE_TTL_EXCEEDED 11
 #define RTE_ICMP_TYPE_PARAM_PROBLEM 12
 #define RTE_ICMP_TYPE_TIMESTAMP_REQUEST 13
lib/rib/rte_rib6.h +0 -74

92 lines not on this page · raw message

lib/table/rte_table_lpm_ipv6.h +0 -3
index 3ea888360635..a9fbc906f3a0 100644
@@ -39,7 +39,6 @@
 
 #include <stdint.h>
 
-#include <rte_common.h>
 #include <rte_ip6.h>
 
 #include "rte_table.h"
@@ -48,8 +47,6 @@
 extern "C" {
 #endif
 
-#define RTE_LPM_IPV6_ADDR_SIZE (RTE_DEPRECATED(RTE_LPM_IPV6_ADDR_SIZE) RTE_IPV6_ADDR_SIZE)
-
 /** LPM table parameters */
 struct rte_table_lpm_ipv6_params {
 	/** Table name */
Signature · 1 line
2.55.0