From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id D0D32A0093 for ; Tue, 19 May 2020 15:11:20 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C15F11D703; Tue, 19 May 2020 15:11:20 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 01FA61D702 for ; Tue, 19 May 2020 15:11:20 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id y3so15886913wrt.1 for ; Tue, 19 May 2020 06:11:19 -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=k/cObUqkfVLdH6zpWQcwuc+nEnJtmiCyZ0CamMgmN2w=; b=mVVm6f48QVGOtjIwSKUsBXnh+f5A7jOoYVoiikpWW7QAPxLHtxyItiP0TvstgMRPBA FWgUJV+UC97K+mzwEDCrsS9r/PyZHoCEu868CN7RJEYc+hJFhELVMLVoTMfe2fwOjhNR jEQqSc3I2G6MxLf3t/Bdt9NwUgn9HT32Re6Rb69W++8tUOugh6g+zwmgLMkwrtclTzNz umGxYXVsvyppbKKD7Xe+gLINU9UvkDkPgQo/2SwG6REWZGhOYnUNSkTNFFe8nV1joho3 uystiCpMZTyaJajPVYTwT0Xi3X196WLlvlDoTiSyR4KgMvtOs4ZbHqD3TK6kYnFEpwTW TKEQ== 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=k/cObUqkfVLdH6zpWQcwuc+nEnJtmiCyZ0CamMgmN2w=; b=tCvWfuzx1xmghEdsQhJBy/8XY9apXaEogw4IaEJTTSvLwBebPwl3PA9rz87vsGEVGb ZOakcVW1VrgdFn9eSqEiNm+v3fs+Bg8giqJ+G/59a7Q7s82PDamn13rhiDbCscAb0fhi Ev/vTQemWyCdvIVTxdYymHE1HWdjPbWQ9xU+Igl3JR04dvjlRO72hDo1yCtPpiX6iu3R RSlKF90z72JuP48Kuh6vWtEDhZhR/EmjRJ9KarxDN048wFjMhMquC0FWd97ANHI6cs6d RP02P+sbWd2907rD6CzafDekprCS6NzyT3hi4Zb/jVjvf8+jjgGJ67d5dyVjFqOxgd4w 2X1A== X-Gm-Message-State: AOAM532dvVWbZTYrcoaPkCKDHo//RK3RnCtcDoJWVHGsN8m+DNex7oSv +Y9iGLNZzXwHuyjJ804lfuo= X-Google-Smtp-Source: ABdhPJzhSsGyBChrcpvneRydNujBc6m+MkeS/24NTR60lTbewCkxWY8oVAqDMj/N6tLI9o+zZUlQXg== X-Received: by 2002:a05:6000:1c5:: with SMTP id t5mr27677564wrx.229.1589893879728; Tue, 19 May 2020 06:11:19 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id x10sm2303893wrn.54.2020.05.19.06.11.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:11:19 -0700 (PDT) From: luca.boccassi@gmail.com To: Thomas Monjalon Cc: Viacheslav Ovsiienko , dpdk stable Date: Tue, 19 May 2020 14:03:59 +0100 Message-Id: <20200519130549.112823-104-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'common/mlx5: fix build with rdma-core 21' has been queued to stable release 19.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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 19.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 05/21/20. 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. Thanks. Luca Boccassi --- >From a9018074d1ce9bd4474e28fe0cbf06b7e3e8056a Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 16 Apr 2020 17:59:04 +0200 Subject: [PATCH] common/mlx5: fix build with rdma-core 21 [ upstream commit d53a513aedab1b4d2405ccb1157cd0b9f16f8afb ] drivers/common/mlx5/mlx5_glue.c: In function 'mlx5_glue_devx_qp_query': drivers/common/mlx5/mlx5_glue.c:1010:9: error: implicit declaration of function 'mlx5dv_devx_qp_query' The function mlx5dv_devx_qp_query() was added in rdma-core 22. This function is compiled only if HAVE_IBV_DEVX_OBJ, which is true if the function mlx5dv_devx_obj_create is found. Unfortunately mlx5dv_devx_obj_create() was introduced in rdma-core 21, when mlx5dv_devx_qp_query() did not exist yet. A new flag HAVE_IBV_DEVX_QP is added when mlx5dv_devx_qp_query() is found. Fixes: 62d6f70f30f4 ("net/mlx5: add glue for queue query via DevX") Signed-off-by: Thomas Monjalon Acked-by: Viacheslav Ovsiienko --- drivers/net/mlx5/Makefile | 5 +++++ drivers/net/mlx5/meson.build | 2 ++ drivers/net/mlx5/mlx5_glue.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile index c5cf4397ac..605975c245 100644 --- a/drivers/net/mlx5/Makefile +++ b/drivers/net/mlx5/Makefile @@ -193,6 +193,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh infiniband/mlx5dv.h \ func mlx5dv_devx_obj_query_async \ $(AUTOCONF_OUTPUT) + $Q sh -- '$<' '$@' \ + HAVE_IBV_DEVX_QP \ + infiniband/mlx5dv.h \ + func mlx5dv_devx_qp_query \ + $(AUTOCONF_OUTPUT) $Q sh -- '$<' '$@' \ HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ infiniband/mlx5dv.h \ diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build index 33c9bc5f53..a5775d18e3 100644 --- a/drivers/net/mlx5/meson.build +++ b/drivers/net/mlx5/meson.build @@ -143,6 +143,8 @@ if build 'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ], [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h', 'mlx5dv_devx_obj_query_async' ], + [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_qp_query' ], [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h', 'mlx5dv_dr_action_create_dest_devx_tir' ], [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h', diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c index c5880dd6f2..c2dd0392d0 100644 --- a/drivers/net/mlx5/mlx5_glue.c +++ b/drivers/net/mlx5/mlx5_glue.c @@ -1012,7 +1012,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp, const void *in, size_t inlen, void *out, size_t outlen) { -#ifdef HAVE_IBV_DEVX_OBJ +#ifdef HAVE_IBV_DEVX_QP return mlx5dv_devx_qp_query(qp, in, inlen, out, outlen); #else (void)qp; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:48.689886957 +0100 +++ 0104-common-mlx5-fix-build-with-rdma-core-21.patch 2020-05-19 14:04:44.320650258 +0100 @@ -1,8 +1,10 @@ -From d53a513aedab1b4d2405ccb1157cd0b9f16f8afb Mon Sep 17 00:00:00 2001 +From a9018074d1ce9bd4474e28fe0cbf06b7e3e8056a Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Thu, 16 Apr 2020 17:59:04 +0200 Subject: [PATCH] common/mlx5: fix build with rdma-core 21 +[ upstream commit d53a513aedab1b4d2405ccb1157cd0b9f16f8afb ] + drivers/common/mlx5/mlx5_glue.c: In function 'mlx5_glue_devx_qp_query': drivers/common/mlx5/mlx5_glue.c:1010:9: error: implicit declaration of function 'mlx5dv_devx_qp_query' @@ -17,21 +19,20 @@ is found. Fixes: 62d6f70f30f4 ("net/mlx5: add glue for queue query via DevX") -Cc: stable@dpdk.org Signed-off-by: Thomas Monjalon Acked-by: Viacheslav Ovsiienko --- - drivers/common/mlx5/Makefile | 5 +++++ - drivers/common/mlx5/meson.build | 2 ++ - drivers/common/mlx5/mlx5_glue.c | 2 +- + drivers/net/mlx5/Makefile | 5 +++++ + drivers/net/mlx5/meson.build | 2 ++ + drivers/net/mlx5/mlx5_glue.c | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) -diff --git a/drivers/common/mlx5/Makefile b/drivers/common/mlx5/Makefile -index 0c67755225..8b663ef25f 100644 ---- a/drivers/common/mlx5/Makefile -+++ b/drivers/common/mlx5/Makefile -@@ -152,6 +152,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh +diff --git a/drivers/net/mlx5/Makefile b/drivers/net/mlx5/Makefile +index c5cf4397ac..605975c245 100644 +--- a/drivers/net/mlx5/Makefile ++++ b/drivers/net/mlx5/Makefile +@@ -193,6 +193,11 @@ mlx5_autoconf.h.new: $(RTE_SDK)/buildtools/auto-config-h.sh infiniband/mlx5dv.h \ func mlx5dv_devx_obj_query_async \ $(AUTOCONF_OUTPUT) @@ -43,24 +44,24 @@ $Q sh -- '$<' '$@' \ HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR \ infiniband/mlx5dv.h \ -diff --git a/drivers/common/mlx5/meson.build b/drivers/common/mlx5/meson.build -index 347d282193..165aa25523 100644 ---- a/drivers/common/mlx5/meson.build -+++ b/drivers/common/mlx5/meson.build -@@ -120,6 +120,8 @@ has_sym_args = [ - 'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ], - [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h', - 'mlx5dv_devx_obj_query_async' ], -+ [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h', -+ 'mlx5dv_devx_qp_query' ], - [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h', - 'mlx5dv_dr_action_create_dest_devx_tir' ], - [ 'HAVE_IBV_DEVX_EVENT', 'infiniband/mlx5dv.h', -diff --git a/drivers/common/mlx5/mlx5_glue.c b/drivers/common/mlx5/mlx5_glue.c -index 428de0ffd9..f270f677b7 100644 ---- a/drivers/common/mlx5/mlx5_glue.c -+++ b/drivers/common/mlx5/mlx5_glue.c -@@ -1006,7 +1006,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp, +diff --git a/drivers/net/mlx5/meson.build b/drivers/net/mlx5/meson.build +index 33c9bc5f53..a5775d18e3 100644 +--- a/drivers/net/mlx5/meson.build ++++ b/drivers/net/mlx5/meson.build +@@ -143,6 +143,8 @@ if build + 'MLX5DV_FLOW_ACTION_COUNTERS_DEVX' ], + [ 'HAVE_IBV_DEVX_ASYNC', 'infiniband/mlx5dv.h', + 'mlx5dv_devx_obj_query_async' ], ++ [ 'HAVE_IBV_DEVX_QP', 'infiniband/mlx5dv.h', ++ 'mlx5dv_devx_qp_query' ], + [ 'HAVE_MLX5DV_DR_ACTION_DEST_DEVX_TIR', 'infiniband/mlx5dv.h', + 'mlx5dv_dr_action_create_dest_devx_tir' ], + [ 'HAVE_MLX5_DR_CREATE_ACTION_FLOW_METER', 'infiniband/mlx5dv.h', +diff --git a/drivers/net/mlx5/mlx5_glue.c b/drivers/net/mlx5/mlx5_glue.c +index c5880dd6f2..c2dd0392d0 100644 +--- a/drivers/net/mlx5/mlx5_glue.c ++++ b/drivers/net/mlx5/mlx5_glue.c +@@ -1012,7 +1012,7 @@ mlx5_glue_devx_qp_query(struct ibv_qp *qp, const void *in, size_t inlen, void *out, size_t outlen) {