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 1E679A04DD for ; Wed, 28 Oct 2020 11:52:57 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1819449E0; Wed, 28 Oct 2020 11:52:56 +0100 (CET) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id 489E549E0 for ; Wed, 28 Oct 2020 11:52:55 +0100 (CET) Received: by mail-wr1-f67.google.com with SMTP id b8so5199256wrn.0 for ; Wed, 28 Oct 2020 03:52:55 -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=dYvD7lgkc2mcNmK57E54JLGJopn5anYbpz4DAy95YWM=; b=BJlOgcl4UESwuFoPbfdXHpwkcZVUJQm6x6q9fcUK7IInQkfxqUtQEfYCGKfD3xLPz1 dD06SKFa6yWJVCxhVk/7xj94b4YkN57W3wqQ7u+uS2P1MaUkVJhZzzkb2kzgsiYlOvDn Xx78uku9M7jKsjVWE2WUNxqZQSqbrWRyScToDECCTyr3wjaX0SAvyi/9jmghBEzIzj04 v7O5kAOpd3FkN93duYyjhFsmt7t6+434Un3gbURiOlRGObVTf6qNNPOgH0rOpQjv+dPY Kt5e/ApswKau4HuM3MJO1UlxjzvUTnX0L1gYpMv6J/ymcD9xQ2+6O6uHWs02RNEurVLN qd3w== 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=dYvD7lgkc2mcNmK57E54JLGJopn5anYbpz4DAy95YWM=; b=quT5auwQXsExmdkc94pAWNnQwt3fXJQNg33UJI3ORJv+KCpHTuWbQOKXS7DsKDD0Rx l/kWQ0D524+WYSI5c4OibW9ZR/Lo4H74TJdxm+JT2qoCMrIOxcHgaDq23mhdiYFq/OoL /tpAjPhbGDkKFefAPjj2wf7wPaFCsZEZIkpLKcCeSigP04hyKKXsLtEYPC/LgNsiiT3k /knFdPXrMtlQoxf8qu7KxzCpYu3Zf6MMv65oxmKBwziglFdzS7Vipa02bw0HVv2EO/pQ owCCfzL1Tz9OmGoLZT+rcw7ahAylsa2FJijnRfeuZ6Zu1tGP2gO65Uz5FVw5KDOBm2Pt PXeA== X-Gm-Message-State: AOAM530t/Bf7QFCdA4uC/A63J9IdQFKVnyr2XmPcaWh8x8QNn9CfxYSd KMVw/9CLJKb60kIJTD8RqhM= X-Google-Smtp-Source: ABdhPJz/vAJAxEGxbLuq//2NZRVHNBP2Ds7pvW6y+SaTpUx1ZTRrhFvtTGn2BEBTj99JOsTNiuEZnw== X-Received: by 2002:adf:fd8a:: with SMTP id d10mr7766808wrr.85.1603882373974; Wed, 28 Oct 2020 03:52:53 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id f17sm5658855wme.22.2020.10.28.03.52.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:52:53 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Wed, 28 Oct 2020 10:44:45 +0000 Message-Id: <20201028104606.3504127-126-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: remove unused variable in Tx queue creation' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 17919bbb10f606a242a7c3b860c5c713255ae40d Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 1 Oct 2020 14:09:13 +0000 Subject: [PATCH] net/mlx5: remove unused variable in Tx queue creation [ upstream commit fa2dd3d4d6e24bf2956828bf05de86e6e6d88c3e ] When a CQ is not created by DevX, it be allocated by either DV function or by regular Verbs function. The CQ DV attributes variable was wrongly defined and initialized in Tx queue creation while the CQ is created by the regular Verbs function what remained the attributes variable unused. Remove the unused variable. Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_txq.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index f688027fb3..36aa9b59f3 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -582,7 +582,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx, struct mlx5_txq_obj *txq_obj = NULL; union { struct ibv_qp_init_attr_ex init; - struct ibv_cq_init_attr_ex cq; struct ibv_qp_attr mod; } attr; unsigned int cqe_n; @@ -610,9 +609,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx, return NULL; } memset(&tmpl, 0, sizeof(struct mlx5_txq_obj)); - attr.cq = (struct ibv_cq_init_attr_ex){ - .comp_mask = 0, - }; cqe_n = desc / MLX5_TX_COMP_THRESH + 1 + MLX5_TX_COMP_THRESH_INLINE_DIV; tmpl.cq = mlx5_glue->create_cq(priv->sh->ctx, cqe_n, NULL, NULL, 0); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:15.659600639 +0000 +++ 0126-net-mlx5-remove-unused-variable-in-Tx-queue-creation.patch 2020-10-28 10:35:11.688832733 +0000 @@ -1,8 +1,10 @@ -From fa2dd3d4d6e24bf2956828bf05de86e6e6d88c3e Mon Sep 17 00:00:00 2001 +From 17919bbb10f606a242a7c3b860c5c713255ae40d Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Thu, 1 Oct 2020 14:09:13 +0000 Subject: [PATCH] net/mlx5: remove unused variable in Tx queue creation +[ upstream commit fa2dd3d4d6e24bf2956828bf05de86e6e6d88c3e ] + When a CQ is not created by DevX, it be allocated by either DV function or by regular Verbs function. @@ -13,7 +15,6 @@ Remove the unused variable. Fixes: faf2667fe8d5 ("net/mlx5: separate DPDK from verbs Tx queue objects") -Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad @@ -22,10 +23,10 @@ 1 file changed, 4 deletions(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c -index fc730fae82..ef3137bd14 100644 +index f688027fb3..36aa9b59f3 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c -@@ -1168,7 +1168,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx, +@@ -582,7 +582,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx, struct mlx5_txq_obj *txq_obj = NULL; union { struct ibv_qp_init_attr_ex init; @@ -33,7 +34,7 @@ struct ibv_qp_attr mod; } attr; unsigned int cqe_n; -@@ -1198,9 +1197,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx, +@@ -610,9 +609,6 @@ mlx5_txq_obj_new(struct rte_eth_dev *dev, uint16_t idx, return NULL; } memset(&tmpl, 0, sizeof(struct mlx5_txq_obj));