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 6870EA0518 for ; Fri, 24 Jul 2020 14:01:13 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 616021C032; Fri, 24 Jul 2020 14:01:13 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 003461C02A for ; Fri, 24 Jul 2020 14:01:11 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id a15so8059974wrh.10 for ; Fri, 24 Jul 2020 05:01:11 -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=iNTATAFj4m0YCbKJV23KhzcS98W/ZdiTuyxKinjoX40=; b=jTlFJrSg0FuBJqEuladyHP9WTwB5Jw1mqNXQ4QSq69VZarhDZeTsVHT3Uq9ju2tIin CgMHFWiMAko4r11XmL5V/jb0Ux5UxrjWTAQ9qd8aAjxd/UEWdqQKNu0IQlrn/1EzhWKz v8xWxiIT8a1MTGGh1hI1yRoNc44MnHKxSmTwqpJBPbDwsALfbMYO+Z5mjYtBAm1Hshm6 ywZEZlfpBVS2KusiRyy2NbqQS91nvNASdMl1zhSaXzZ26FvnSzX13CrR+e860DNqoDQw 1h0IfRBakr6QeVN1wH2EmfGquM1yP5qfwAYGmrDQTAUx/g0cAwnnXxP/0ngZsdVTrQg2 hs3g== 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=iNTATAFj4m0YCbKJV23KhzcS98W/ZdiTuyxKinjoX40=; b=rJ1GJl/9k3aG2+RTJohoyI3RjrAw85pbQDdfUuC8ipZv8byE9Mr0fOUChfOZD7DfG8 7xcumltDRAAbFcbveCUy09y43H4BsjpKRmnk0wSU9jOAo2F+zXv9mWSXZC3rHE2Cyk8p FiKp8xsLua70nXFzPTNRE3Zh66DiNpdD+d4nhjbN1GDiwpQxlUXZ1oYvs623DXRnwAIn uu+6GUpRcv2awydarzA/LZ+KA4avTK1Ad4k/4w4IX/p8E1xA9BUIeusHsN8l4foC+xNd LNAMA4j7yxPbzZby7kpmKVjaATZhIXuw6SyAWoDLUlApvX07lFt+/OdVHYM1l66xyxE3 PORw== X-Gm-Message-State: AOAM531IY4uJ/MMDHgOpf54Eyrya+L6wA5Xf8By3q+xO2cJEwUXt8TEM Xx+WAVTmiT0jX50TEBcwZp6G1tzIz/4= X-Google-Smtp-Source: ABdhPJwJ7mCdsNMZuvAadFCgrAwDAjSCbNCc2g/6dMZoxHg9mejOZoRDg8Whz7yD9RpJDcgjsJBEFA== X-Received: by 2002:adf:f806:: with SMTP id s6mr8524354wrp.252.1595592071729; Fri, 24 Jul 2020 05:01:11 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id m16sm1052292wrr.71.2020.07.24.05.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:01:11 -0700 (PDT) From: luca.boccassi@gmail.com To: Michael Baum Cc: Matan Azrad , dpdk stable Date: Fri, 24 Jul 2020 12:57:30 +0100 Message-Id: <20200724120030.1863487-12-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/mlx5: remove needless Tx queue initialization check' has been queued to stable release 19.11.4 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.4 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/26/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 efe4acdd4a6962bf704b8f7eaffb4731aaa60a05 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 27 May 2020 08:37:56 +0000 Subject: [PATCH] net/mlx5: remove needless Tx queue initialization check [ upstream commit c55ec83b5822af0a1be9ad016714b8adc68b1a51 ] The mlx5_txq_obj_new function defines a pointer named txq_data and assign value into it. After assigning, the code writer is sure that the variable does not point to NULL and even express it using assertion. During the function, the function does dereferencing to the pointer several times and at no point change its value. However, at the end of the function at the error label when it wants to free one of the fields of the structure that txq_data points to, it checks again whether txq_data is invalid. This check is unnecessary since it knows for sure that txq_data is valid. Remove the aforementioned needless check. Fixes: 644906881881 ("net/mlx5: add free on completion queue") Signed-off-by: Michael Baum Acked-by: Matan Azrad --- drivers/net/mlx5/mlx5_txq.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c index c7751e83c..42dcd7a4b 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c @@ -786,7 +786,7 @@ error: claim_zero(mlx5_glue->destroy_cq(tmpl.cq)); if (tmpl.qp) claim_zero(mlx5_glue->destroy_qp(tmpl.qp)); - if (txq_data && txq_data->fcqs) + if (txq_data->fcqs) rte_free(txq_data->fcqs); if (txq_obj) rte_free(txq_obj); -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:49.061713647 +0100 +++ 0012-net-mlx5-remove-needless-Tx-queue-initialization-che.patch 2020-07-24 12:53:48.163004149 +0100 @@ -1,8 +1,10 @@ -From c55ec83b5822af0a1be9ad016714b8adc68b1a51 Mon Sep 17 00:00:00 2001 +From efe4acdd4a6962bf704b8f7eaffb4731aaa60a05 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Wed, 27 May 2020 08:37:56 +0000 Subject: [PATCH] net/mlx5: remove needless Tx queue initialization check +[ upstream commit c55ec83b5822af0a1be9ad016714b8adc68b1a51 ] + The mlx5_txq_obj_new function defines a pointer named txq_data and assign value into it. After assigning, the code writer is sure that the variable does not point to NULL and even express it using assertion. @@ -18,7 +20,6 @@ Remove the aforementioned needless check. Fixes: 644906881881 ("net/mlx5: add free on completion queue") -Cc: stable@dpdk.org Signed-off-by: Michael Baum Acked-by: Matan Azrad @@ -27,10 +28,10 @@ 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/mlx5/mlx5_txq.c b/drivers/net/mlx5/mlx5_txq.c -index 7cc620a90..80d99ff94 100644 +index c7751e83c..42dcd7a4b 100644 --- a/drivers/net/mlx5/mlx5_txq.c +++ b/drivers/net/mlx5/mlx5_txq.c -@@ -793,7 +793,7 @@ error: +@@ -786,7 +786,7 @@ error: claim_zero(mlx5_glue->destroy_cq(tmpl.cq)); if (tmpl.qp) claim_zero(mlx5_glue->destroy_qp(tmpl.qp));