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 A51C442814 for ; Wed, 29 Mar 2023 03:04:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7F34C40F18; Wed, 29 Mar 2023 03:04:53 +0200 (CEST) Received: from mail-wr1-f50.google.com (mail-wr1-f50.google.com [209.85.221.50]) by mails.dpdk.org (Postfix) with ESMTP id 8EDF340EE7 for ; Wed, 29 Mar 2023 03:04:51 +0200 (CEST) Received: by mail-wr1-f50.google.com with SMTP id r11so13996352wrr.12 for ; Tue, 28 Mar 2023 18:04:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1680051891; x=1682643891; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hPiKNLtY4k5PCaDyJ44byYKKdR7HvGiAawRleauRBFA=; b=OInIwGRAucgS/vwDVj1TnNIKA0isUJimFYlY7dfpz8NK3i09efNKgS0ImxKGCWVD56 4dWZh6L9byyeTx2AkWHAAkBjf6hb3veOZWdawxpzGaZHFMfyM4dEl1gagYGJ2YBgRQXt eNpUBr3ItEFT0qungbU1QfWB4Wuhi83M7weOqOpyhsitXnHrgXDONuF6apb/22B3IzXX 2W3jGumoNuYVLsuOmLOeop7hNghPKxfnmWB5BBQBE8RCgA/JDocST0Qt87qsIbz3mtXF 65VDywDGUeJ1o6kAogsJ8VdbDcY/3nMB82arPa+tc/ST74TrhZLUDoGZCToNr0gE92nN Z/ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1680051891; x=1682643891; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hPiKNLtY4k5PCaDyJ44byYKKdR7HvGiAawRleauRBFA=; b=p/tx47Bm9gwwlRt1o9jLjLKNHGUmORTFwS5SGKGRvw3pWknYhhI5H+BCoa4lIXmYsi LcQa8HaPguvdhxhgFiSEhPwRq+jmRiT2brLgEvnIxksDav9Xdbw1ecQH1eI03QNKOs5j LwgPPWaq5v0KZWGo8e2yxvSawHs1uC9d2jNtv4r4rGiEouWqjhRFLLd/+uv0pfd3C1Sl Dk3A9PpWIuDJwcIrgWeQb85IU1xF3kRYcoYIIOaB2bA8BcHuN+48PjxmJ07DsqyvzA1b GRwQ0yqA/aUotTOkZMnBnuVclj91kOYdPlTPA/SDp/vbibUAQEXZAZDEnhO2ppJvLj0L ntTg== X-Gm-Message-State: AAQBX9cyMLDjJ4rWOUkTwfRrKds5RCv2Mw+ur3t8W1WiPehc62axIOas uJb7OsH4teM2peXLGaYsargOnnFJqwM= X-Google-Smtp-Source: AKy350ZwffmVbod9qn7RtrST0325fkva0rdAxf/FpsrFyh822WZRtzIrogHB3RmmxyDwQ2timB5Wlw== X-Received: by 2002:a5d:590d:0:b0:2cf:ecd0:d1ab with SMTP id v13-20020a5d590d000000b002cfecd0d1abmr12647975wrd.49.1680051890874; Tue, 28 Mar 2023 18:04:50 -0700 (PDT) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id l10-20020a1ced0a000000b003ee1acdb036sm391351wmh.17.2023.03.28.18.04.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 28 Mar 2023 18:04:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Cristian Dumitrescu , dpdk stable Subject: patch 'examples/qos_sched: fix config entries in wrong sections' has been queued to stable release 20.11.8 Date: Wed, 29 Mar 2023 02:04:37 +0100 Message-Id: <20230329010446.563852-1-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230322004155.2333903-19-luca.boccassi@gmail.com> References: <20230322004155.2333903-19-luca.boccassi@gmail.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 20.11.8 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/31/23. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/e3779bd6049db332b5a9b9b58b6ad54a49a03ff0 Thanks. Luca Boccassi --- >From e3779bd6049db332b5a9b9b58b6ad54a49a03ff0 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Tue, 21 Mar 2023 13:13:49 +0000 Subject: [PATCH] examples/qos_sched: fix config entries in wrong sections [ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ] When specifying the QoS config, the profiles to be used for each pipe within a subport must be specified in the subport section, not in the section for the subport profile itself. Similarly for subport profiles, those should be specified in the port section. Fixes: de3cfa2c9823 ("sched: initial import") Signed-off-by: Bruce Richardson Acked-by: Cristian Dumitrescu --- examples/qos_sched/profile.cfg | 4 ++-- examples/qos_sched/profile_ov.cfg | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/qos_sched/profile.cfg b/examples/qos_sched/profile.cfg index a308d61f02..f1769e49bb 100644 --- a/examples/qos_sched/profile.cfg +++ b/examples/qos_sched/profile.cfg @@ -26,6 +26,8 @@ number of subports per port = 1 number of pipes per subport = 4096 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 +pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 + [subport profile 0] tb rate = 1250000000 ; Bytes per second tb size = 1000000 ; Bytes @@ -46,8 +48,6 @@ tc 12 rate = 1250000000 ; Bytes per second tc period = 10 ; Milliseconds -pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 - ; Pipe configuration [pipe profile 0] tb rate = 305175 ; Bytes per second diff --git a/examples/qos_sched/profile_ov.cfg b/examples/qos_sched/profile_ov.cfg index 14c89ae340..b6fe21ee1e 100644 --- a/examples/qos_sched/profile_ov.cfg +++ b/examples/qos_sched/profile_ov.cfg @@ -6,12 +6,14 @@ frame overhead = 24 number of subports per port = 1 +subport 0-8 = 0 + ; Subport configuration [subport 0] number of pipes per subport = 32 queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 -subport 0-8 = 0 +pipe 0-31 = 0 ; These pipes are configured with pipe profile 0 [subport profile 0] tb rate = 8400000 ; Bytes per second @@ -32,8 +34,6 @@ tc 11 rate = 8400000 ; Bytes per second tc 12 rate = 8400000 ; Bytes per second tc period = 10 ; Milliseconds -pipe 0-31 = 0 ; These pipes are configured with pipe profile 0 - ; Pipe configuration [pipe profile 0] tb rate = 16800000 ; Bytes per second -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-03-29 01:31:22.559787373 +0100 +++ 0001-examples-qos_sched-fix-config-entries-in-wrong-secti.patch 2023-03-29 01:31:22.466039159 +0100 @@ -1 +1 @@ -From 86dfed2a8ed704e013f054985a92d46f07ff48d1 Mon Sep 17 00:00:00 2001 +From e3779bd6049db332b5a9b9b58b6ad54a49a03ff0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 86dfed2a8ed704e013f054985a92d46f07ff48d1 ] + @@ -12 +13,0 @@ -Cc: stable@dpdk.org @@ -17,5 +18,3 @@ - examples/qos_sched/profile.cfg | 6 +++--- - examples/qos_sched/profile_ov.cfg | 6 +++--- - examples/qos_sched/profile_pie.cfg | 6 +++--- - examples/qos_sched/profile_red.cfg | 6 +++--- - 4 files changed, 12 insertions(+), 12 deletions(-) + examples/qos_sched/profile.cfg | 4 ++-- + examples/qos_sched/profile_ov.cfg | 6 +++--- + 2 files changed, 5 insertions(+), 5 deletions(-) @@ -24 +23 @@ -index e8de101b6c..00d4c7c1a5 100644 +index a308d61f02..f1769e49bb 100644 @@ -45,7 +43,0 @@ -@@ -71,4 +71,4 @@ tc period = 40 ; Milliseconds - - tc 12 oversubscription weight = 1 - --tc 12 wrr weights = 1 1 1 1 -\ No newline at end of file -+tc 12 wrr weights = 1 1 1 1 @@ -81,58 +72,0 @@ -diff --git a/examples/qos_sched/profile_pie.cfg b/examples/qos_sched/profile_pie.cfg -index 241f748b33..bbc09d912b 100644 ---- a/examples/qos_sched/profile_pie.cfg -+++ b/examples/qos_sched/profile_pie.cfg -@@ -21,12 +21,14 @@ - frame overhead = 24 - number of subports per port = 1 - -+subport 0-8 = 0 ; These subports are configured with subport profile 0 -+ - ; Subport configuration - [subport 0] - number of pipes per subport = 4096 - queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 - --subport 0-8 = 0 ; These subports are configured with subport profile 0 -+pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 - - [subport profile 0] - tb rate = 1250000000 ; Bytes per second -@@ -48,8 +50,6 @@ tc 12 rate = 1250000000 ; Bytes per second - - tc period = 10 ; Milliseconds - --pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 -- - ; Pipe configuration - [pipe profile 0] - tb rate = 305175 ; Bytes per second -diff --git a/examples/qos_sched/profile_red.cfg b/examples/qos_sched/profile_red.cfg -index 4486d2799e..cee1470fd7 100644 ---- a/examples/qos_sched/profile_red.cfg -+++ b/examples/qos_sched/profile_red.cfg -@@ -21,12 +21,14 @@ - frame overhead = 24 - number of subports per port = 1 - -+subport 0-8 = 0 ; These subports are configured with subport profile 0 -+ - ; Subport configuration - [subport 0] - number of pipes per subport = 4096 - queue sizes = 64 64 64 64 64 64 64 64 64 64 64 64 64 - --subport 0-8 = 0 ; These subports are configured with subport profile 0 -+pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 - - [subport profile 0] - tb rate = 1250000000 ; Bytes per second -@@ -48,8 +50,6 @@ tc 12 rate = 1250000000 ; Bytes per second - - tc period = 10 ; Milliseconds - --pipe 0-4095 = 0 ; These pipes are configured with pipe profile 0 -- - ; Pipe configuration - [pipe profile 0] - tb rate = 305175 ; Bytes per second