[dpdk-dev] [PATCH] sort symbols map

[dpdk-dev] [PATCH] sort symbols map

[David Marchand]

Fixed with ./devtools/update-abi.sh $(cat ABI_VERSION)

Fixes: e73a7ab22422 ("net/softnic: promote manage API")
Fixes: 8f532a34c4f2 ("fib: promote API to stable")
Fixes: 4aeb92396b85 ("rib: promote API to stable")

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
I added "./devtools/update-abi.sh $(cat ABI_VERSION)" to my checks.

I should have caught it when merging fib and rib patches...
But my eyes (or more likely brain) stopped at net/softnic bits.

What do you think?
Should I wait a bit more and send a global patch to catch any missed
sorting just before rc1?

In the meantime, if you merge .map updates, try to remember to run the
command above.

Thanks.
---
 drivers/net/softnic/version.map |  2 +-
 lib/fib/version.map             | 21 ++++++++++-----------
 lib/rib/version.map             | 33 ++++++++++++++++-----------------
 3 files changed, 27 insertions(+), 29 deletions(-)

diff --git a/drivers/net/softnic/version.map b/drivers/net/softnic/version.map
index cd5afcf155..01e1514276 100644
--- a/drivers/net/softnic/version.map
+++ b/drivers/net/softnic/version.map
@@ -1,8 +1,8 @@
 DPDK_22 {
 	global:
 
-	rte_pmd_softnic_run;
 	rte_pmd_softnic_manage;
+	rte_pmd_softnic_run;
 
 	local: *;
 };
diff --git a/lib/fib/version.map b/lib/fib/version.map
index af76add2b9..b23fa42b9b 100644
--- a/lib/fib/version.map
+++ b/lib/fib/version.map
@@ -1,25 +1,24 @@
 DPDK_22 {
 	global:
 
-	rte_fib_add;
-	rte_fib_create;
-	rte_fib_delete;
-	rte_fib_find_existing;
-	rte_fib_free;
-	rte_fib_lookup_bulk;
-	rte_fib_get_dp;
-	rte_fib_get_rib;
-	rte_fib_select_lookup;
-
 	rte_fib6_add;
 	rte_fib6_create;
 	rte_fib6_delete;
 	rte_fib6_find_existing;
 	rte_fib6_free;
-	rte_fib6_lookup_bulk;
 	rte_fib6_get_dp;
 	rte_fib6_get_rib;
+	rte_fib6_lookup_bulk;
 	rte_fib6_select_lookup;
+	rte_fib_add;
+	rte_fib_create;
+	rte_fib_delete;
+	rte_fib_find_existing;
+	rte_fib_free;
+	rte_fib_get_dp;
+	rte_fib_get_rib;
+	rte_fib_lookup_bulk;
+	rte_fib_select_lookup;
 
 	local: *;
 };
diff --git a/lib/rib/version.map b/lib/rib/version.map
index 6eb1252acb..f356fe8849 100644
--- a/lib/rib/version.map
+++ b/lib/rib/version.map
@@ -1,21 +1,6 @@
 DPDK_22 {
 	global:
 
-	rte_rib_create;
-	rte_rib_find_existing;
-	rte_rib_free;
-	rte_rib_get_depth;
-	rte_rib_get_ext;
-	rte_rib_get_ip;
-	rte_rib_get_nh;
-	rte_rib_get_nxt;
-	rte_rib_insert;
-	rte_rib_lookup;
-	rte_rib_lookup_parent;
-	rte_rib_lookup_exact;
-	rte_rib_set_nh;
-	rte_rib_remove;
-
 	rte_rib6_create;
 	rte_rib6_find_existing;
 	rte_rib6_free;
@@ -26,10 +11,24 @@ DPDK_22 {
 	rte_rib6_get_nxt;
 	rte_rib6_insert;
 	rte_rib6_lookup;
-	rte_rib6_lookup_parent;
 	rte_rib6_lookup_exact;
-	rte_rib6_set_nh;
+	rte_rib6_lookup_parent;
 	rte_rib6_remove;
+	rte_rib6_set_nh;
+	rte_rib_create;
+	rte_rib_find_existing;
+	rte_rib_free;
+	rte_rib_get_depth;
+	rte_rib_get_ext;
+	rte_rib_get_ip;
+	rte_rib_get_nh;
+	rte_rib_get_nxt;
+	rte_rib_insert;
+	rte_rib_lookup;
+	rte_rib_lookup_exact;
+	rte_rib_lookup_parent;
+	rte_rib_remove;
+	rte_rib_set_nh;
 
 	local: *;
 };
-- 
2.23.0

Re: [dpdk-dev] [PATCH] sort symbols map

[Kinsella, Ray]

On 05/10/2021 10:16, David Marchand wrote:
> Fixed with ./devtools/update-abi.sh $(cat ABI_VERSION)
> 
> Fixes: e73a7ab22422 ("net/softnic: promote manage API")
> Fixes: 8f532a34c4f2 ("fib: promote API to stable")
> Fixes: 4aeb92396b85 ("rib: promote API to stable")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> I added "./devtools/update-abi.sh $(cat ABI_VERSION)" to my checks.
> 
> I should have caught it when merging fib and rib patches...
> But my eyes (or more likely brain) stopped at net/softnic bits.
> 
> What do you think?
> Should I wait a bit more and send a global patch to catch any missed
> sorting just before rc1?
> 
> In the meantime, if you merge .map updates, try to remember to run the
> command above.
> 
> Thanks.
> ---
>  drivers/net/softnic/version.map |  2 +-
>  lib/fib/version.map             | 21 ++++++++++-----------
>  lib/rib/version.map             | 33 ++++++++++++++++-----------------
>  3 files changed, 27 insertions(+), 29 deletions(-)
> 

Something to add to the Symbol Bot also, maybe?

Acked-by: Ray Kinsella <mdr@ashroe.eu>

Re: [dpdk-dev] [PATCH] sort symbols map

[David Marchand]

On Tue, Oct 5, 2021 at 4:17 PM Kinsella, Ray <mdr@ashroe.eu> wrote:
> On 05/10/2021 10:16, David Marchand wrote:
> > Fixed with ./devtools/update-abi.sh $(cat ABI_VERSION)
> >
> > Fixes: e73a7ab22422 ("net/softnic: promote manage API")
> > Fixes: 8f532a34c4f2 ("fib: promote API to stable")
> > Fixes: 4aeb92396b85 ("rib: promote API to stable")
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> > I added "./devtools/update-abi.sh $(cat ABI_VERSION)" to my checks.
> >
> > I should have caught it when merging fib and rib patches...
> > But my eyes (or more likely brain) stopped at net/softnic bits.
> >
> > What do you think?
> > Should I wait a bit more and send a global patch to catch any missed
> > sorting just before rc1?
> >
> > In the meantime, if you merge .map updates, try to remember to run the
> > command above.
> >
> > Thanks.
> > ---
> >  drivers/net/softnic/version.map |  2 +-
> >  lib/fib/version.map             | 21 ++++++++++-----------
> >  lib/rib/version.map             | 33 ++++++++++++++++-----------------
> >  3 files changed, 27 insertions(+), 29 deletions(-)
> >
>
> Something to add to the Symbol Bot also, maybe?

The committed maps should have no issue in the first place.
The best place would probably be in checkpatches.sh so that developers
get the warning before even posting and so that maintainers fix the
issues before pushing.
But it requires checked out sources.


-- 
David Marchand

Re: [dpdk-dev] [PATCH] sort symbols map

[David Marchand]

On Tue, Oct 5, 2021 at 4:17 PM Kinsella, Ray <mdr@ashroe.eu> wrote:
> On 05/10/2021 10:16, David Marchand wrote:
> > Fixed with ./devtools/update-abi.sh $(cat ABI_VERSION)
> >
> > Fixes: e73a7ab22422 ("net/softnic: promote manage API")
> > Fixes: 8f532a34c4f2 ("fib: promote API to stable")
> > Fixes: 4aeb92396b85 ("rib: promote API to stable")
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> Acked-by: Ray Kinsella <mdr@ashroe.eu>

Applied, thanks.


-- 
David Marchand

Re: [dpdk-dev] [PATCH] sort symbols map

[Dumitrescu, Cristian]

> -----Original Message-----
> From: David Marchand <david.marchand@redhat.com>
> Sent: Tuesday, October 5, 2021 10:16 AM
> To: dev@dpdk.org
> Cc: thomas@monjalon.net; Yigit, Ferruh <ferruh.yigit@intel.com>; Ray
> Kinsella <mdr@ashroe.eu>; Singh, Jasvinder <jasvinder.singh@intel.com>;
> Dumitrescu, Cristian <cristian.dumitrescu@intel.com>; Medvedkin, Vladimir
> <vladimir.medvedkin@intel.com>; Walsh, Conor <conor.walsh@intel.com>;
> Stephen Hemminger <stephen@networkplumber.org>
> Subject: [PATCH] sort symbols map
> 
> Fixed with ./devtools/update-abi.sh $(cat ABI_VERSION)
> 
> Fixes: e73a7ab22422 ("net/softnic: promote manage API")
> Fixes: 8f532a34c4f2 ("fib: promote API to stable")
> Fixes: 4aeb92396b85 ("rib: promote API to stable")
> 
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
> I added "./devtools/update-abi.sh $(cat ABI_VERSION)" to my checks.
> 
> I should have caught it when merging fib and rib patches...
> But my eyes (or more likely brain) stopped at net/softnic bits.
> 
> What do you think?
> Should I wait a bit more and send a global patch to catch any missed
> sorting just before rc1?
> 
> In the meantime, if you merge .map updates, try to remember to run the
> command above.
> 
> Thanks.
> ---
>  drivers/net/softnic/version.map |  2 +-
>  lib/fib/version.map             | 21 ++++++++++-----------
>  lib/rib/version.map             | 33 ++++++++++++++++-----------------
>  3 files changed, 27 insertions(+), 29 deletions(-)
> 
> diff --git a/drivers/net/softnic/version.map

Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>