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 1A4ACA0093 for ; Fri, 22 May 2020 11:41:52 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0F6D71D967; Fri, 22 May 2020 11:41:52 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 189C91D970 for ; Fri, 22 May 2020 11:41:51 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id f13so8048581wmc.5 for ; Fri, 22 May 2020 02:41:51 -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=CMKcZYt8WMJq1ek/hOTxBGv1fG5myLsyLQIClyFjVAU=; b=s6XDcpfj4//FeOv9P5Gxm9F4HBaQNH129eH6flvJKNdOn0Y7x8WkOPE5uC4AvE9JML C0T+Sc09YAlcPD3na8kgpj1EH1hj8CLKjsfcOoclxJfPZ0q1yNj/IunymEOwg7AF4Pvx G49+5OLGhxEQ90qc3dp4UO6jfVm8JWySagfcKwNBx5LEj1QNPnu89mwSMEscDnAzuuba j8HnSaWo7qiSnkTXkREhx5bRBGicjenUuxEBqzSE6OLYV9zeYSMUoWOz5orQAtO5Fa84 kP8s4k3jWoCgZnN93Bj7aoieD55HtuMEoNExD+BOBln5Nwd62AusTG0SMZUnnliOa/Ou ABLQ== 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=CMKcZYt8WMJq1ek/hOTxBGv1fG5myLsyLQIClyFjVAU=; b=sJSCSxwSPudF2nE+ZM72Ia+Db0sAObKtytGBp0eEvlkdANEAm45GGCqZQM2brWiEsd RxSqXR1zs6imnpbVc6eMnglIIrldpoH3RP3mFHofXxAzc4thvyXu3oMO9LwmoqiX2WYU dD3C57b1VvfHkl09z3A3DYxEcbtHZTu4/fhb4NCo5ZzsOJR4KiXRAOCZeEZs+QlY4g96 k98z+X/fx1P88TZUmi3e8Lbh9FfOkWciWxvWnacAVXRrvJmuiUIfdwU09Rxw7nSibN8s KsIYT+YvDcg+xbR6IGJfLUlcXUqobd7vEoemRSj6I/DB83826i1Kq+zueXuhgeYOFsxT kabw== X-Gm-Message-State: AOAM533EeNjX0k9MOd+L6ruLSoFDkVGNben+LupastQrJeE8GCOgIZiX m3b0jAiZk0JrSpwxV8vuI+KvU5y0CkDYBA== X-Google-Smtp-Source: ABdhPJwov8eXhVniRISmVgJvRq2zFmA2PKtdvYtdxK6SuXBeElaZLWsRB1s/kx74grGQjS/Cc00JBg== X-Received: by 2002:a1c:68c3:: with SMTP id d186mr2363014wmc.55.1590140510556; Fri, 22 May 2020 02:41:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q74sm9584747wme.14.2020.05.22.02.41.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:50 -0700 (PDT) From: luca.boccassi@gmail.com To: Ting Xu Cc: Ferruh Yigit , dpdk stable Date: Fri, 22 May 2020 10:40:07 +0100 Message-Id: <20200522094022.1025696-28-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'app/testpmd: fix DCB set' 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/24/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 7c36f2ea8b0efec5a75a367cf739cc023af0609c Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Tue, 12 May 2020 10:13:56 +0000 Subject: [PATCH] app/testpmd: fix DCB set [ upstream commit 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 ] When set DCB in testpmd, there is a segmentation fault. It is because the local variable rss_conf in get_eth_dcb_conf() is not cleared, so that the pointer member variable rss_key has a random address, which leads to an error in the following processing. This patch initialized the local variable rss_conf to avoid this situation. Fixes: ac7c491c3fec ("app/testpmd: fix DCB config") Signed-off-by: Ting Xu Reviewed-by: Ferruh Yigit --- app/test-pmd/testpmd.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index 46d0f1c875..0b126594b7 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3193,6 +3193,8 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf, struct rte_eth_dcb_tx_conf *tx_conf = ð_conf->tx_adv_conf.dcb_tx_conf; + memset(&rss_conf, 0, sizeof(struct rte_eth_rss_conf)); + rc = rte_eth_dev_rss_hash_conf_get(pid, &rss_conf); if (rc != 0) return rc; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:40.298575521 +0100 +++ 0028-app-testpmd-fix-DCB-set.patch 2020-05-22 10:37:39.148413072 +0100 @@ -1,8 +1,10 @@ -From 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 Mon Sep 17 00:00:00 2001 +From 7c36f2ea8b0efec5a75a367cf739cc023af0609c Mon Sep 17 00:00:00 2001 From: Ting Xu Date: Tue, 12 May 2020 10:13:56 +0000 Subject: [PATCH] app/testpmd: fix DCB set +[ upstream commit 5139bc12b0d133fd99d0a0c07f0c5a31cff0ac39 ] + When set DCB in testpmd, there is a segmentation fault. It is because the local variable rss_conf in get_eth_dcb_conf() is not cleared, so that the pointer member variable rss_key has @@ -11,7 +13,6 @@ to avoid this situation. Fixes: ac7c491c3fec ("app/testpmd: fix DCB config") -Cc: stable@dpdk.org Signed-off-by: Ting Xu Reviewed-by: Ferruh Yigit @@ -20,10 +21,10 @@ 1 file changed, 2 insertions(+) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c -index baccc3a495..4989d22ca8 100644 +index 46d0f1c875..0b126594b7 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c -@@ -3460,6 +3460,8 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf, +@@ -3193,6 +3193,8 @@ get_eth_dcb_conf(portid_t pid, struct rte_eth_conf *eth_conf, struct rte_eth_dcb_tx_conf *tx_conf = ð_conf->tx_adv_conf.dcb_tx_conf;