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 6B286A0093 for ; Tue, 19 May 2020 15:16:18 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 60B601D96D; Tue, 19 May 2020 15:16:18 +0200 (CEST) Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by dpdk.org (Postfix) with ESMTP id 37FC21D97B for ; Tue, 19 May 2020 15:16:17 +0200 (CEST) Received: by mail-wr1-f68.google.com with SMTP id j5so15921408wrq.2 for ; Tue, 19 May 2020 06:16:17 -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=RFrTQ2W9e4KUFijVpo9Xgpu3vRc3oZSk4xapAz2jExU=; b=tvZcc373ww9xa+RK0EaX7KIo42b85T4M4xoc7e3sQ+IQba+/y1DucUxXI7L8uStHBN T+aKO1eL6f1BCiYpZQSpXMsQrCa4vVu3P4BuB6Ws4gHYk/SSdieAqQfRZpzwOcVuulyq UsizCzjRu7sZkg9RBWoSw/HGKf5iLNjcxye771m/D5hNrAI/T2F5+nWjsZPuznLNsQKQ 1i1J6ts9z7F7XOZ9zgnv5qlf0ozHejMVIKFt1ljz8BsjIXM7FEtISf4+aVuoSwIaQZH0 RzFr33KKc4l2a4XEkJ0Un73QJXXSNVSYDdYBPtxK2k3RBTIJ1VI4jBe9jcyESgBIckbU e9/A== 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=RFrTQ2W9e4KUFijVpo9Xgpu3vRc3oZSk4xapAz2jExU=; b=Ech/Ualw4DC9lolHypc7xPnrg/9L1vNMJnkH5aql5zKl1YxK+aOoElpi+oFacQUEKI TJmJdQLw9fhCmYAjgAqtScvd/QrELWqhG6osHYCoDA9M2fa8j7lDxW1PgUonkpWf2HZF WuLYqUB5NDpDV3/z+u6PD29OFRIiZAZEdZL9JvKuRw3rLDTZa8fx8IZtsx3yYKFz4tk9 Y/bSC8Bq54gnRbSslzOX8HsY/AOQeooczA1HQw+j84NlDEnGabHwg9vm+/29xVNlURw0 2n/6XsxfxxpSahZ8QjKCxTSYA9cPdp63ZgBeAoN6gKXMqPM4k7KATMREzG0ImCsMvWVw E5iw== X-Gm-Message-State: AOAM530/2N0ILGqfZwC8L0gEhAEzAbgsG8mol/NWCn9OeGZj6LGc31zo OHAPSsM9XFeAv02fLd9RfSJwOkFOjM3pTdWC X-Google-Smtp-Source: ABdhPJyXGg+sLdlwy1sSCUHDBqxtxR8wp0dImRb1rY+Kxn9gh7ECnVjM+TVXLiyXCxrzpE1YIfBYoQ== X-Received: by 2002:adf:d841:: with SMTP id k1mr25378011wrl.129.1589894176952; Tue, 19 May 2020 06:16:16 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id s8sm18836035wrt.69.2020.05.19.06.16.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:16:16 -0700 (PDT) From: luca.boccassi@gmail.com To: Jun Yang Cc: Hemant Agrawal , dpdk stable Date: Tue, 19 May 2020 14:05:35 +0100 Message-Id: <20200519130549.112823-200-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/dpaa2: fix congestion ID for multiple traffic classes' 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/21/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 eeaa4c42b347a19845b43b0a42e36b90fe79adf3 Mon Sep 17 00:00:00 2001 From: Jun Yang Date: Fri, 8 May 2020 18:32:09 +0530 Subject: [PATCH] net/dpaa2: fix congestion ID for multiple traffic classes [ upstream commit 7a3a9d5660303971acb487d016613ce52105ac01 ] When using a single TC, flow id is same as congestion group id. However in case of multiple traffic classes, same flow id values are used within each traffic class, which causes incorrect traffic behavior e.g. halting of traffic. This patches changes to use the cgid as the index which works for single as well as multiple traffic classes. Fixes: 13b856ac02a8 ("net/dpaa2: support taildrop on frame count basis") Signed-off-by: Jun Yang Acked-by: Hemant Agrawal --- drivers/net/dpaa2/dpaa2_ethdev.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c index 4fc550a885..19196cbb65 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c @@ -660,7 +660,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX, dpaa2_q->tc_index, - flow_id, &taildrop); + dpaa2_q->cgid, &taildrop); } else { /*enabling per rx queue congestion control */ taildrop.threshold = CONG_THRESHOLD_RX_BYTES_Q; @@ -687,7 +687,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token, DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX, dpaa2_q->tc_index, - flow_id, &taildrop); + dpaa2_q->cgid, &taildrop); } else { ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token, DPNI_CP_QUEUE, DPNI_QUEUE_RX, -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:52.761946721 +0100 +++ 0200-net-dpaa2-fix-congestion-ID-for-multiple-traffic-cla.patch 2020-05-19 14:04:44.576654898 +0100 @@ -1,8 +1,10 @@ -From 7a3a9d5660303971acb487d016613ce52105ac01 Mon Sep 17 00:00:00 2001 +From eeaa4c42b347a19845b43b0a42e36b90fe79adf3 Mon Sep 17 00:00:00 2001 From: Jun Yang Date: Fri, 8 May 2020 18:32:09 +0530 Subject: [PATCH] net/dpaa2: fix congestion ID for multiple traffic classes +[ upstream commit 7a3a9d5660303971acb487d016613ce52105ac01 ] + When using a single TC, flow id is same as congestion group id. However in case of multiple traffic classes, same flow id values are used within each traffic class, which causes incorrect @@ -11,7 +13,6 @@ for single as well as multiple traffic classes. Fixes: 13b856ac02a8 ("net/dpaa2: support taildrop on frame count basis") -Cc: stable@dpdk.org Signed-off-by: Jun Yang Acked-by: Hemant Agrawal @@ -20,10 +21,10 @@ 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/dpaa2/dpaa2_ethdev.c b/drivers/net/dpaa2/dpaa2_ethdev.c -index 08f9832eb8..d9960b01f7 100644 +index 4fc550a885..19196cbb65 100644 --- a/drivers/net/dpaa2/dpaa2_ethdev.c +++ b/drivers/net/dpaa2/dpaa2_ethdev.c -@@ -669,7 +669,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -660,7 +660,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX, dpaa2_q->tc_index, @@ -32,7 +33,7 @@ } else { /*enabling per rx queue congestion control */ taildrop.threshold = CONG_THRESHOLD_RX_BYTES_Q; -@@ -696,7 +696,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, +@@ -687,7 +687,7 @@ dpaa2_dev_rx_queue_setup(struct rte_eth_dev *dev, ret = dpni_set_taildrop(dpni, CMD_PRI_LOW, priv->token, DPNI_CP_CONGESTION_GROUP, DPNI_QUEUE_RX, dpaa2_q->tc_index,