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 A63F3A0C4C for ; Mon, 12 Jul 2021 15:15:32 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A448406B4; Mon, 12 Jul 2021 15:15:32 +0200 (CEST) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) by mails.dpdk.org (Postfix) with ESMTP id 27CAC40685 for ; Mon, 12 Jul 2021 15:15:31 +0200 (CEST) Received: by mail-wm1-f43.google.com with SMTP id h18-20020a05600c3512b029020e4ceb9588so14451344wmq.5 for ; Mon, 12 Jul 2021 06:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6x44itG9fhmmheiFYQQWqQKAxt6UEGlDtLeywK6xLMg=; b=cyjO2Phl4QCowWzSgX+pE/OpWc1Gf4YaibnRLO19sD74Xf5FIFuiA63zk53lN+aHWy Hqep9k7gQqgkVvWMElHbd4XUESwMoWgNyz0UXP5jEj8nwjWwSbyYb5YJU+TWtOFaIIKi 77NqZkwckelA/7ST19XP2l4s8fskZ7tCHMU/NTSb0OJku69/2OKl9/F273iIwNSatuSi 9D92HLGXDy/pGisaofafVXdKiFmKTjdGMPMuI0+DNNXvYDbWbi0rdvvBYz+QVqM9y5bF qepx0d/Z9wO/pEYPTmTi2nG1v2Bnc3OsQBDjpaWsUFq1ZpLAJ3xVop10QURA9+bwDeAT Aekw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=6x44itG9fhmmheiFYQQWqQKAxt6UEGlDtLeywK6xLMg=; b=t3M6lAXGe8+xcXxIB1eTb8xygr5lEW2IK6a+BoFP7lDFeoNm/e8G8/TwxL9eRjqN94 mwnsWArZRIr4rGIm8fqCWzfd49N32XgmaO/upwntY13cm7ApVNtVGYcIbfBucsv+oVOJ /ZjB0bko9OSXcbMRapQ1z+Xw3ogX1hYnBoMAfyu5Ru6wBJupweGjpqodwhqmlsEmg6Yu oU89Pp5eKlWYozLMSjkHIrEDhA5NFkMxfwZTUSshOVccoUw4vlzIpzGFND3GOJkadiLL tEtZQlmvyEO0W/IsfGCvJ+LIJRJXw5fMQsHyVMEc40g7rkxocMewtjCQN83BTEiLzAFo DOuw== X-Gm-Message-State: AOAM533xPlq45ktdd5Izsb1vXcSofuBZaPqU7cAWNM0HpUU1kufl1OJv Qtr2M1mQUrhEyYyYfZXjHR8= X-Google-Smtp-Source: ABdhPJwXXk9I0SszmU4RDJhiW31scSoSbucvmqYWz1cknFrXpMhs3H3zarCX3O83DOzEqbNcSE/sSA== X-Received: by 2002:a7b:c258:: with SMTP id b24mr12547239wmj.128.1626095730956; Mon, 12 Jul 2021 06:15:30 -0700 (PDT) Received: from localhost ([137.220.125.106]) by smtp.gmail.com with ESMTPSA id b8sm20616668wmb.20.2021.07.12.06.15.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Jul 2021 06:15:30 -0700 (PDT) From: luca.boccassi@gmail.com To: Viacheslav Ovsiienko Cc: Matan Azrad , dpdk stable Date: Mon, 12 Jul 2021 14:05:38 +0100 Message-Id: <20210712130551.2462159-103-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210712130551.2462159-1-luca.boccassi@gmail.com> References: <20210712130551.2462159-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix compatibility with OFED port query API' has been queued to stable release 20.11.3 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.11.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/14/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/71ce9c8caa9b0d79eb523447fc66afa1f143262e Thanks. Luca Boccassi --- >From 71ce9c8caa9b0d79eb523447fc66afa1f143262e Mon Sep 17 00:00:00 2001 From: Viacheslav Ovsiienko Date: Wed, 7 Jul 2021 18:54:28 +0300 Subject: [PATCH] common/mlx5: fix compatibility with OFED port query API [ upstream commit 0fd928bbbae5e6f89376f9996d5340a861fc14e3 ] The compilation flag HAVE_MLX5DV_DR_DEVX_PORT depends on presence of mlx5dv_query_devx_port routine in rdma-core library. The mlx5dv_query_devx_port routine exists only in OFED versions of rdma-core library and is being planned to be removed and replaced with Upstream compatible mlx5dv_query_port. As mlx5dv_query_devx_port is being removed all the dependencies on the HAVE_MLX5DV_DR_DEVX_PORT compilation flag are reconsidered. The new compilation flag HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT is for backward compatibility with older OFED versions. Fixes: 6cfe84fbe7b1 ("net/mlx5: fix port action for LAG") Signed-off-by: Viacheslav Ovsiienko Acked-by: Matan Azrad --- drivers/common/mlx5/linux/meson.build | 2 ++ drivers/common/mlx5/linux/mlx5_glue.c | 2 +- drivers/net/mlx5/mlx5_flow_dv.c | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/common/mlx5/linux/meson.build b/drivers/common/mlx5/linux/meson.build index 8295cfbe41..c2d580c4a6 100644 --- a/drivers/common/mlx5/linux/meson.build +++ b/drivers/common/mlx5/linux/meson.build @@ -96,6 +96,8 @@ has_sym_args = [ 'mlx5dv_query_devx_port' ], [ 'HAVE_MLX5DV_DR_DEVX_PORT_V35', 'infiniband/mlx5dv.h', 'mlx5dv_query_port' ], + [ 'HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT', 'infiniband/mlx5dv.h', + 'mlx5dv_dr_action_create_dest_ib_port' ], [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', 'mlx5dv_devx_obj_create' ], [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', diff --git a/drivers/common/mlx5/linux/mlx5_glue.c b/drivers/common/mlx5/linux/mlx5_glue.c index e24bcdfbd1..09fdce1c22 100644 --- a/drivers/common/mlx5/linux/mlx5_glue.c +++ b/drivers/common/mlx5/linux/mlx5_glue.c @@ -391,7 +391,7 @@ mlx5_glue_dr_create_flow_action_dest_flow_tbl(void *tbl) static void * mlx5_glue_dr_create_flow_action_dest_port(void *domain, uint32_t port) { -#ifdef HAVE_MLX5DV_DR_DEVX_PORT +#ifdef HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT return mlx5dv_dr_action_create_dest_ib_port(domain, port); #else #ifdef HAVE_MLX5DV_DR_ESWITCH diff --git a/drivers/net/mlx5/mlx5_flow_dv.c b/drivers/net/mlx5/mlx5_flow_dv.c index 0ffbdb4ab7..3e5c8d3af9 100644 --- a/drivers/net/mlx5/mlx5_flow_dv.c +++ b/drivers/net/mlx5/mlx5_flow_dv.c @@ -8498,7 +8498,7 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev, RTE_FLOW_ERROR_TYPE_ACTION, NULL, "No eswitch info was found for port"); -#ifdef HAVE_MLX5DV_DR_DEVX_PORT +#ifdef HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT /* * This parameter is transferred to * mlx5dv_dr_action_create_dest_ib_port(). -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-07-12 13:41:41.936934295 +0100 +++ 0103-common-mlx5-fix-compatibility-with-OFED-port-query-A.patch 2021-07-12 13:41:36.894131026 +0100 @@ -1 +1 @@ -From 0fd928bbbae5e6f89376f9996d5340a861fc14e3 Mon Sep 17 00:00:00 2001 +From 71ce9c8caa9b0d79eb523447fc66afa1f143262e Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 0fd928bbbae5e6f89376f9996d5340a861fc14e3 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -31 +32 @@ -index e1968a6906..686df26909 100644 +index 8295cfbe41..c2d580c4a6 100644 @@ -34,9 +35,9 @@ -@@ -95,6 +95,8 @@ has_sym_args = [ - 'mlx5dv_query_devx_port' ], - [ 'HAVE_MLX5DV_DR_DEVX_PORT_V35', 'infiniband/mlx5dv.h', - 'mlx5dv_query_port' ], -+ [ 'HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT', 'infiniband/mlx5dv.h', -+ 'mlx5dv_dr_action_create_dest_ib_port' ], - [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', - 'mlx5dv_devx_obj_create' ], - [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', +@@ -96,6 +96,8 @@ has_sym_args = [ + 'mlx5dv_query_devx_port' ], + [ 'HAVE_MLX5DV_DR_DEVX_PORT_V35', 'infiniband/mlx5dv.h', + 'mlx5dv_query_port' ], ++ [ 'HAVE_MLX5DV_DR_CREATE_DEST_IB_PORT', 'infiniband/mlx5dv.h', ++ 'mlx5dv_dr_action_create_dest_ib_port' ], + [ 'HAVE_IBV_DEVX_OBJ', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_obj_create' ], + [ 'HAVE_IBV_FLOW_DEVX_COUNTERS', 'infiniband/mlx5dv.h', @@ -44 +45 @@ -index b371fb7aa1..037ca961a0 100644 +index e24bcdfbd1..09fdce1c22 100644 @@ -57 +58 @@ -index fa05882302..2f4c0eeb5b 100644 +index 0ffbdb4ab7..3e5c8d3af9 100644 @@ -60 +61 @@ -@@ -10386,7 +10386,7 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev, +@@ -8498,7 +8498,7 @@ flow_dv_translate_action_port_id(struct rte_eth_dev *dev,