From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id F0492A0093 for ; Thu, 10 Mar 2022 13:12:27 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EAA254113E; Thu, 10 Mar 2022 13:12:27 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id DD9054114A for ; Thu, 10 Mar 2022 13:12:26 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1646914346; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=kKP+SHugCXtdP8mjrcZAFdSM6xbgogTtyQ+bM5zlXpk=; b=GVaFDvwnVAQHrxifkRtm9zCfSId8mzmcEfy/elkAH+FE9sPX9ObH6F631sSdOQ6cg3FDEx FcByhmB2Q73KwSaYTL1/Ka7JHGUxXuHQmhSdhnMGMFPBAuzYnpP7EwgRxq4NM/lxKBnzTQ LFOjQ3bS5nRRMrugnOqx7JlPLeLzcL0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-258-JGa53tCGNH6o5bffr0VLWg-1; Thu, 10 Mar 2022 07:12:23 -0500 X-MC-Unique: JGa53tCGNH6o5bffr0VLWg-1 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 3B1C41091DA0; Thu, 10 Mar 2022 12:12:22 +0000 (UTC) Received: from rh.Home (unknown [10.39.195.75]) by smtp.corp.redhat.com (Postfix) with ESMTP id 2F8842D1F8; Thu, 10 Mar 2022 12:12:21 +0000 (UTC) From: Kevin Traynor To: Michael Baum Cc: Matan Azrad , dpdk stable 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 Message-Id: <20220310121127.1324802-19-ktraynor@redhat.com> In-Reply-To: <20220310121127.1324802-1-ktraynor@redhat.com> References: <20220310121127.1324802-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org 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 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 Acked-by: Matan Azrad --- 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 {