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 DA2CFA0C41 for ; Tue, 30 Nov 2021 17:39:57 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D5E0241190; Tue, 30 Nov 2021 17:39:57 +0100 (CET) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id B3A6F41177 for ; Tue, 30 Nov 2021 17:39:55 +0100 (CET) Received: from mail-ed1-f72.google.com (mail-ed1-f72.google.com [209.85.208.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 82BAE3F044 for ; Tue, 30 Nov 2021 16:39:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1638290395; bh=G3T9+g+E9i2DLlHYsZlyYxfd4QGnfevaUxDs0ZZqUeA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SXUoGSf3BZHpmQZz26h8ECR9fNnauADNcZf1qMv/iN+0QlOn2zzpZJoXuMqNg8xDX UjzApFVYPYjbegWugkYe032u/lrOxMGD9HDD4xAbAggnyxHuadXW2qT7FiWsg53FeL 1s7uBC3ebTZNa35TKYRvq07JqiMKkxWtlcq9T963yqJ/W97UXtyPhQ78KncjtW9wA7 7ANmkadz2fgonc2GyJD8zFZGMjowcuhhkxLheML5gz/dPT7mTV/6AmdV4iobZOdoxE TEY2Pppm76qzyqH8wU27/gHr02DCNsKG1wv5V3erHaexEqnGg3gTavO07wISfHXBnq SMs9XYOmqFDSQ== Received: by mail-ed1-f72.google.com with SMTP id l15-20020a056402124f00b003e57269ab87so17429334edw.6 for ; Tue, 30 Nov 2021 08:39:55 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=G3T9+g+E9i2DLlHYsZlyYxfd4QGnfevaUxDs0ZZqUeA=; b=ds7GFfjOMuDgpZUvIw4YC/LxwmhgMUrApjtf0iQV8+TOh4czp32oO2ClLakmd+QVB2 QI3aY8nh8IxeVBZjdRoXCCGw3pLXvo+m93WI8N/sgIOwtlUTUnhx4CVquk01qdNxRCjc iXBFh9ihsDWB+SOUD0mVwqFvQpnkJGp93K5oAmFQ3R+eq9+JXH5+AykP743cPr+I6Vqm 1Ij9qdDm6OA3AAcrigsYrTtmgSdteEDWNRXio2ufb5nsAOPXTlP/VE+h2DkEOkDwFbH6 jUwqVFT1szd+CleMQVxv5hjZJGMtt7AihaHacRYVfdSuwVGRGNhY67SKI+19E9EQuncq 5FkQ== X-Gm-Message-State: AOAM530QSdOV0OYZgHX+lsJFdEpxE6axPGWAPrGh9RcsoR5lzDjsvLa6 T503zKyzf8o8DiMaFjX1QP07NrPHLROYxR74IaOIIGsqrpGphDAel7/gJX+RJcjrgyl/GCh6uQR Z7IYQRfZXv+NRzQxN9X8l9dBP X-Received: by 2002:a05:6402:445:: with SMTP id p5mr130638edw.110.1638290395254; Tue, 30 Nov 2021 08:39:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyS5+ljpmWFJBDpYHvToVEBWPYeBfmyGeUqCHcetHjChnQJYh6BX6B8q03B6Yk1v6feLlKnOw== X-Received: by 2002:a05:6402:445:: with SMTP id p5mr130617edw.110.1638290395132; Tue, 30 Nov 2021 08:39:55 -0800 (PST) Received: from localhost.localdomain ([2001:67c:1560:8007::aac:c4ad]) by smtp.gmail.com with ESMTPSA id w5sm13073870edc.58.2021.11.30.08.39.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 08:39:54 -0800 (PST) From: christian.ehrhardt@canonical.com To: Huisong Li Cc: Min Hu , Xiaoyun Li , dpdk stable Subject: patch 'app/testpmd: retain all original dev conf when config DCB' has been queued to stable release 19.11.11 Date: Tue, 30 Nov 2021 17:34:38 +0100 Message-Id: <20211130163605.2460997-74-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.34.0 In-Reply-To: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> References: <20211130163605.2460997-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Hi, FYI, your patch has been queued to stable release 19.11.11 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before December 10th 2021. 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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/8eb9be9f82feb15f646c46067485dc29a0ef95e7 Thanks. Christian Ehrhardt --- >From 8eb9be9f82feb15f646c46067485dc29a0ef95e7 Mon Sep 17 00:00:00 2001 From: Huisong Li Date: Mon, 11 Oct 2021 17:12:46 +0800 Subject: [PATCH] app/testpmd: retain all original dev conf when config DCB [ upstream commit c1ba6c325c4c7c8e0f32d9e96bc25ab172a222ee ] When configuring DCB, testpmd retains the rx_mode/tx_mode configuration in rte_port->dev_conf. But some configurations, such as the link_speed, were not saved if they were set before configuring DCB. Fixes: 1a572499beb6 ("app/testpmd: setup DCB forwarding based on traffic class") Signed-off-by: Huisong Li Signed-off-by: Min Hu (Connor) Acked-by: Xiaoyun Li --- app/test-pmd/testpmd.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c index dca10e7b66..bd15fe9e53 100644 --- a/app/test-pmd/testpmd.c +++ b/app/test-pmd/testpmd.c @@ -3474,10 +3474,8 @@ init_port_dcb_config(portid_t pid, rte_port = &ports[pid]; - memset(&port_conf, 0, sizeof(struct rte_eth_conf)); - - port_conf.rxmode = rte_port->dev_conf.rxmode; - port_conf.txmode = rte_port->dev_conf.txmode; + /* retain the original device configuration. */ + memcpy(&port_conf, &rte_port->dev_conf, sizeof(struct rte_eth_conf)); /*set configuration of DCB in vt mode and DCB in non-vt mode*/ retval = get_eth_dcb_conf(pid, &port_conf, dcb_mode, num_tcs, pfc_en); -- 2.34.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-11-30 16:50:10.212513860 +0100 +++ 0074-app-testpmd-retain-all-original-dev-conf-when-config.patch 2021-11-30 16:50:05.762873324 +0100 @@ -1 +1 @@ -From c1ba6c325c4c7c8e0f32d9e96bc25ab172a222ee Mon Sep 17 00:00:00 2001 +From 8eb9be9f82feb15f646c46067485dc29a0ef95e7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit c1ba6c325c4c7c8e0f32d9e96bc25ab172a222ee ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -21 +22 @@ -index eec4f1b81d..12a0db8796 100644 +index dca10e7b66..bd15fe9e53 100644 @@ -24,2 +25,2 @@ -@@ -3729,10 +3729,8 @@ init_port_dcb_config(portid_t pid, - } +@@ -3474,10 +3474,8 @@ init_port_dcb_config(portid_t pid, +