From patchwork Mon Oct 19 09:41:51 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Marchand X-Patchwork-Id: 81346 X-Patchwork-Delegate: rasland@nvidia.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 9AC33A04DC; Mon, 19 Oct 2020 11:42:34 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 032DEACE4; Mon, 19 Oct 2020 11:42:32 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [63.128.21.124]) by dpdk.org (Postfix) with ESMTP id 5E949AC92 for ; Mon, 19 Oct 2020 11:42:30 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1603100548; 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=nhUvby27azBTLoOnmBQoy1xxYK9cjbzfy2U4h1LARts=; b=fP3iK9hztIrO6qv9i9KMqsWfes0CNH7MlZrKVoYTUABZUrM8nbFZFLAwtrAAGZXAPVSEtR /0asRiiR11wnzcFW+t/nmYbkPV375R+Z0SsRznq05hBhB73M/lloCSwFT+0A2OAYSWJ99a s7tOgakXDR26BOEnvizykGKPiFgz/Z0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-280-L_kquW9gMJa6rDHMZZw8jQ-1; Mon, 19 Oct 2020 05:42:27 -0400 X-MC-Unique: L_kquW9gMJa6rDHMZZw8jQ-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id A7C6C81CBDD; Mon, 19 Oct 2020 09:42:25 +0000 (UTC) Received: from dmarchan.remote.csb (unknown [10.40.195.116]) by smtp.corp.redhat.com (Postfix) with ESMTP id 829D15B4B2; Mon, 19 Oct 2020 09:42:23 +0000 (UTC) From: David Marchand To: dev@dpdk.org Cc: thomas@monjalon.net, Matan Azrad , Shahaf Shuler , Viacheslav Ovsiienko Date: Mon, 19 Oct 2020 11:41:51 +0200 Message-Id: <20201019094151.30185-1-david.marchand@redhat.com> In-Reply-To: <20191204100546.32095-1-david.marchand@redhat.com> References: <20191204100546.32095-1-david.marchand@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david.marchand@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Subject: [dpdk-dev] [PATCH v2] drivers: remove mlx* glue libraries separate ABI version X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" The glue libraries are tightly bound to the mlx drivers of a dpdk version and are packaged with them. Keeping a separate ABI version prevents us from installing two versions of dpdk. Maintaining this separate version just adds confusion. Align the glue library ABI version to the global ABI version. Signed-off-by: David Marchand Acked-by: Thomas Monjalon Acked-by: Viacheslav Ovsiienko --- drivers/common/mlx5/linux/meson.build | 2 +- drivers/common/mlx5/linux/mlx5_glue.h | 1 - drivers/net/mlx4/meson.build | 2 +- drivers/net/mlx4/mlx4_glue.h | 1 - 4 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index 9ef8e181d7..483df0e181 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -6,7 +6,7 @@ includes += include_directories('.') static_ibverbs = (get_option('ibverbs_link') == 'static') dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_pmd_mlx5_glue.so' -LIB_GLUE_VERSION = '20.02.0' +LIB_GLUE_VERSION = abi_version LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) diff --git a/drivers/common/mlx5/linux/mlx5_glue.h b/drivers/common/mlx5/linux/mlx5_glue.h index 42b2f61523..ace36c6b07 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.h +++ b/drivers/common/mlx5/linux/mlx5_glue.h @@ -131,7 +131,6 @@ struct mlx5dv_var { uint32_t page_id; uint32_t length; off_t mmap_off; #define IBV_ACCESS_RELAXED_ORDERING 0 #endif -/* LIB_GLUE_VERSION must be updated every time this structure is modified. */ struct mlx5_glue { const char *version; int (*fork_init)(void); diff --git a/drivers/net/mlx4/meson.build b/drivers/net/mlx4/meson.build index 5a25e11a7b..395776a495 100644 --- a/drivers/net/mlx4/meson.build +++ b/drivers/net/mlx4/meson.build @@ -11,7 +11,7 @@ endif static_ibverbs = (get_option('ibverbs_link') == 'static') dlopen_ibverbs = (get_option('ibverbs_link') == 'dlopen') LIB_GLUE_BASE = 'librte_pmd_mlx4_glue.so' -LIB_GLUE_VERSION = '18.02.0' +LIB_GLUE_VERSION = abi_version LIB_GLUE = LIB_GLUE_BASE + '.' + LIB_GLUE_VERSION if dlopen_ibverbs dpdk_conf.set('RTE_IBVERBS_LINK_DLOPEN', 1) diff --git a/drivers/net/mlx4/mlx4_glue.h b/drivers/net/mlx4/mlx4_glue.h index 5d9e985495..96d5cb16b4 100644 --- a/drivers/net/mlx4/mlx4_glue.h +++ b/drivers/net/mlx4/mlx4_glue.h @@ -23,7 +23,6 @@ #define MLX4_GLUE_VERSION "" #endif -/* LIB_GLUE_VERSION must be updated every time this structure is modified. */ struct mlx4_glue { const char *version; int (*fork_init)(void);