patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Michael Baum <michaelba@nvidia.com>
Cc: Matan Azrad <matan@nvidia.com>, dpdk stable <stable@dpdk.org>
Subject: patch 'common/mlx5: consider local functions as internal' has been queued to stable release 21.11.1
Date: Thu, 10 Mar 2022 12:11:25 +0000	[thread overview]
Message-ID: <20220310121127.1324802-19-ktraynor@redhat.com> (raw)
In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com>

Hi,

FYI, your patch has been queued to stable release 21.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 03/14/22. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable

This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable/commit/89f14be5641f798f21fdfd3a7ab6bdfdcbd6bb7a

Thanks.

Kevin

---
From 89f14be5641f798f21fdfd3a7ab6bdfdcbd6bb7a Mon Sep 17 00:00:00 2001
From: Michael Baum <michaelba@nvidia.com>
Date: Fri, 25 Feb 2022 01:25:06 +0200
Subject: [PATCH] common/mlx5: consider local functions as internal

[ upstream commit c2e3059a10f2389b791d5d485fe71e666984c193 ]

The functions which are not explicitly marked as internal
were exported because the local catch-all rule was missing in the
version script.
After adding the missing rule, all local functions are hidden.
The function mlx5_get_device_guid is used in another library,
so it needs to be exported (as internal).

Because the local functions were exported as non-internal
in DPDK 21.11, any change in these functions would break the ABI.
An ABI exception is added for this library, considering that all
functions are either local or internal.

Signed-off-by: Michael Baum <michaelba@nvidia.com>
Acked-by: Matan Azrad <matan@nvidia.com>
---
 devtools/libabigail.abignore               | 4 ++++
 drivers/common/mlx5/linux/mlx5_common_os.h | 1 +
 drivers/common/mlx5/version.map            | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/devtools/libabigail.abignore b/devtools/libabigail.abignore
index e2724cb375..1bdf533228 100644
--- a/devtools/libabigail.abignore
+++ b/devtools/libabigail.abignore
@@ -16,2 +16,6 @@
 [suppress_file]
         soname_regexp = ^librte_regexdev\.
+
+; Ignore changes in common mlx5 driver, should be all internal
+[suppress_file]
+        soname_regexp = ^librte_common_mlx5\.
diff --git a/drivers/common/mlx5/linux/mlx5_common_os.h b/drivers/common/mlx5/linux/mlx5_common_os.h
index 2e4ac09bbf..a6190a34e6 100644
--- a/drivers/common/mlx5/linux/mlx5_common_os.h
+++ b/drivers/common/mlx5/linux/mlx5_common_os.h
@@ -302,4 +302,5 @@ mlx5_set_context_attr(struct rte_device *dev, struct ibv_context *ctx);
  *  >0 if success.
  */
+__rte_internal
 int
 mlx5_get_device_guid(const struct rte_pci_addr *dev, uint8_t *guid, size_t len);
diff --git a/drivers/common/mlx5/version.map b/drivers/common/mlx5/version.map
index 618c1bf27a..130d47ad8c 100644
--- a/drivers/common/mlx5/version.map
+++ b/drivers/common/mlx5/version.map
@@ -80,4 +80,5 @@ INTERNAL {
 	mlx5_free;
 
+	mlx5_get_device_guid; # WINDOWS_NO_EXPORT
 	mlx5_get_ifname_sysfs; # WINDOWS_NO_EXPORT
 	mlx5_get_pci_addr; # WINDOWS_NO_EXPORT
@@ -149,3 +150,5 @@ INTERNAL {
 	mlx5_mr_mempool2mr_bh;
 	mlx5_mr_mempool_populate_cache;
+
+	local: *;
 };
-- 
2.34.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-03-10 12:05:31.964834791 +0000
+++ 0026-common-mlx5-consider-local-functions-as-internal.patch	2022-03-10 12:05:31.323630914 +0000
@@ -1 +1 @@
-From c2e3059a10f2389b791d5d485fe71e666984c193 Mon Sep 17 00:00:00 2001
+From 89f14be5641f798f21fdfd3a7ab6bdfdcbd6bb7a Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit c2e3059a10f2389b791d5d485fe71e666984c193 ]
+
@@ -27 +29 @@
-index ef0602975a..301b3dacb8 100644
+index e2724cb375..1bdf533228 100644
@@ -30,3 +32,3 @@
-@@ -21,2 +21,6 @@
- [suppress_type]
-         name = rte_crypto_asym_op
+@@ -16,2 +16,6 @@
+ [suppress_file]
+         soname_regexp = ^librte_regexdev\.
@@ -38 +40 @@
-index 83066e752d..edf356a30a 100644
+index 2e4ac09bbf..a6190a34e6 100644
@@ -41 +43 @@
-@@ -301,4 +301,5 @@ mlx5_set_context_attr(struct rte_device *dev, struct ibv_context *ctx);
+@@ -302,4 +302,5 @@ mlx5_set_context_attr(struct rte_device *dev, struct ibv_context *ctx);
@@ -48 +50 @@
-index 1c6153c576..cb20a7d893 100644
+index 618c1bf27a..130d47ad8c 100644
@@ -51 +53 @@
-@@ -81,4 +81,5 @@ INTERNAL {
+@@ -80,4 +80,5 @@ INTERNAL {
@@ -57 +59 @@
-@@ -150,3 +151,5 @@ INTERNAL {
+@@ -149,3 +150,5 @@ INTERNAL {


  parent reply	other threads:[~2022-03-10 12:12 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-10 12:11 patch 'examples/kni: add missing trailing newline in log' " Kevin Traynor
2022-03-10 12:11 ` patch 'devtools: remove event/dlb exception in ABI check' " Kevin Traynor
2022-03-10 12:11 ` patch 'build: fix build on FreeBSD with Meson 0.61.1' " Kevin Traynor
2022-03-10 12:11 ` patch 'ethdev: fix doxygen comments for device info struct' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/bnxt: fix null dereference in session cleanup' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix inet IPIP protocol type' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix next protocol RSS expansion' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix shared RSS destroy' " Kevin Traynor
2022-03-10 13:12   ` Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix modify port action validation' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: remove unused reference counter' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix meter policy creation assert' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix flex item availability' " Kevin Traynor
2022-03-21 17:02   ` Kevin Traynor
2022-03-23 16:03     ` Kevin Traynor
2022-03-25 17:27       ` Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix MPLS/GRE Verbs spec ordering' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix configuration without Rx queue' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/mlx5: fix meter creation default state' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/sfc: reduce log level of tunnel restore info error' " Kevin Traynor
2022-03-10 12:11 ` patch 'net/iavf: fix potential out-of-bounds access' " Kevin Traynor
2022-03-10 12:11 ` patch 'regexdev: fix section attribute of symbols' " Kevin Traynor
2022-03-10 12:11 ` Kevin Traynor [this message]
2022-03-10 12:11 ` patch 'build: hide local symbols in shared libraries' " Kevin Traynor
2022-03-10 12:11 ` patch 'devtools: fix symbols check' " Kevin Traynor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20220310121127.1324802-19-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=matan@nvidia.com \
    --cc=michaelba@nvidia.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).