diff mbox series

[2/2] devtools: use libabigail rule for mlx glue drivers

Message ID 20220301165404.18936-2-david.marchand@redhat.com (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers
Series [1/2] devtools: remove event/dlb exception in ABI check |

Checks

Context Check Description
ci/checkpatch warning coding style issues
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Functional success Functional Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-intel-Functional success Functional Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-abi-testing success Testing PASS

Commit Message

David Marchand March 1, 2022, 4:54 p.m. UTC 
  Convert the existing exception in the ABI script into a libabigail
suppression rule.

Note: file_name_regexp could be used to achive the same with versions of
libabigail < 1.7 but soname_regexp has been preferred here since it is
already used with a recent change on common/mlx5.

While at it, fix indent from a recent change.

Signed-off-by: David Marchand <david.marchand@redhat.com>
---
 devtools/check-abi.sh        | 7 -------
 devtools/libabigail.abignore | 8 ++++++--
 2 files changed, 6 insertions(+), 9 deletions(-)

Comments

Ray Kinsella March 2, 2022, 10:16 a.m. UTC | #1 
David Marchand <david.marchand@redhat.com> writes:

> Convert the existing exception in the ABI script into a libabigail
> suppression rule.
>
> Note: file_name_regexp could be used to achive the same with versions of
> libabigail < 1.7 but soname_regexp has been preferred here since it is
> already used with a recent change on common/mlx5.
>
> While at it, fix indent from a recent change.
>
> Signed-off-by: David Marchand <david.marchand@redhat.com>
> ---
>  devtools/check-abi.sh        | 7 -------
>  devtools/libabigail.abignore | 8 ++++++--
>  2 files changed, 6 insertions(+), 9 deletions(-)
>

Minor niggle that changes to the check-abi.sh script should have been in
the first patch?

Acked-by: Ray Kinsella <mdr@ashroe.eu>
Thomas Monjalon March 8, 2022, 2:04 p.m. UTC | #2 
02/03/2022 11:16, Ray Kinsella:
> 
> David Marchand <david.marchand@redhat.com> writes:
> 
> > Convert the existing exception in the ABI script into a libabigail
> > suppression rule.
> >
> > Note: file_name_regexp could be used to achive the same with versions of
> > libabigail < 1.7 but soname_regexp has been preferred here since it is
> > already used with a recent change on common/mlx5.
> >
> > While at it, fix indent from a recent change.
> >
> > Signed-off-by: David Marchand <david.marchand@redhat.com>
> > ---
> >  devtools/check-abi.sh        | 7 -------
> >  devtools/libabigail.abignore | 8 ++++++--
> >  2 files changed, 6 insertions(+), 9 deletions(-)
> >
> 
> Minor niggle that changes to the check-abi.sh script should have been in
> the first patch?

No, first patch is about DLB, second is mlx.

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

Series applied, thanks.
diff mbox series

Patch

diff --git a/devtools/check-abi.sh b/devtools/check-abi.sh
index 033f6252d0..64e148070d 100755
--- a/devtools/check-abi.sh
+++ b/devtools/check-abi.sh
@@ -37,13 +37,6 @@  fi
 error=
 for dump in $(find $refdir -name "*.dump"); do
 	name=$(basename $dump)
-	# skip glue drivers, example librte_pmd_mlx5_glue.dump
-	# We can't rely on a suppression rule for now:
-	# https://sourceware.org/bugzilla/show_bug.cgi?id=25480
-	if grep -qE "\<soname='[^']*_glue\.so\.[^']*'" $dump; then
-		echo "Skipped glue library $name."
-		continue
-	fi
 	if grep -qE "\<librte_*.*_octeontx2" $dump; then
 		echo "Skipped removed driver $name."
 		continue
diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index 301b3dacb8..9c921c47d4 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -12,10 +12,14 @@ 
 [suppress_variable]
         name_regexp = _pmd_info$
 
+; Ignore changes on soname for mlx glue internal drivers
+[suppress_file]
+        soname_regexp = ^librte_.*mlx.*glue\.
+
 ; Ignore fields inserted in place of reserved_opts of rte_security_ipsec_sa_options
 [suppress_type]
-       name = rte_security_ipsec_sa_options
-       has_data_member_inserted_between = {offset_of(reserved_opts), end}
+        name = rte_security_ipsec_sa_options
+        has_data_member_inserted_between = {offset_of(reserved_opts), end}
 
 ; Ignore changes to rte_crypto_asym_op, asymmetric crypto API is experimental
 [suppress_type]