From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <stable-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 1EE3FA0C47
for <public@inbox.dpdk.org>; Mon, 26 Jul 2021 15:54:24 +0200 (CEST)
Received: from [217.70.189.124] (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id 0C281410EE;
Mon, 26 Jul 2021 15:54:24 +0200 (CEST)
Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com
[209.85.128.49]) by mails.dpdk.org (Postfix) with ESMTP id D673940DDA
for <stable@dpdk.org>; Mon, 26 Jul 2021 15:54:22 +0200 (CEST)
Received: by mail-wm1-f49.google.com with SMTP id
f14-20020a05600c154eb02902519e4abe10so2071587wmg.4
for <stable@dpdk.org>; Mon, 26 Jul 2021 06:54:22 -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=i28nqkkYPKCP1iDCurlDgzr5zwS3Gfh8owIA+RS2ymw=;
b=sWCs7YWOuPjsQF+6i0sXnZg8YHu5y8pA2TZBRvr5LF3yxWTvwpvu+MNYiWjsOc60VA
l2+663qdooVL7uKhwFrtP/z6Gngxw+VK8sQAEWhzvmnLKxp+ufSiu6PvwtKcJ3/Ajp2Z
7aer1vgG51bsflHiRjj7RnXYsquCPreZGDw8sww5HHKOT0jNY3rucCRNQFevEtVT/vdi
GsqPCyoePfQimX3Iw5lXuE9qbwF3b+qwD/DpXT7AZ0Aymheu4qwJ3vAAL9vnSwIzhEmx
GzNbBTsrGYiYySZpyBNRO/2dqsD0m7Yr/O98dnZJEllaQ8R09RA5TFRAmBsJ7/p+rYtC
Erxg==
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=i28nqkkYPKCP1iDCurlDgzr5zwS3Gfh8owIA+RS2ymw=;
b=h2l6FosAVhTST7FfazHl2orphvB2v0BPx9WNE5NuySe6/YMSNBRJvEF9W8KoW/pzEW
bu+7L3GFx7hr6Kmk7ULj20O9h5a3h6lyIrGBTkZhrk7ezd0WknkaU2g3cyJ97qXTynji
T98x326tfZ8cdVBlZxWnmOP/MYATJTcPumRRMHlsMsg4r1lw8DX1mELpp8lI1eWbpkAU
/GzOpvFoNu4uh5AAokYAcI7DpwRfRHJAxBPczzQnYhR8qYfkx7F18wVmF5WFTHFfAeQz
5CSeLm2vTtuXDcK/uczVVYl917U+ia9oWWHJfgDJyrKux/uLIwqgdNdv7QUwId+2HDJf
fWAg==
X-Gm-Message-State: AOAM530MpDlgQXBLM8Rvq9dX5OMOW61F8aQHxvl58MQS+sbjUUQW1SY2
OAR3YLItJzlV4Bg/WWmbQaA=
X-Google-Smtp-Source: ABdhPJwQMww5K4iGjtdI9S3ey7SBuyq85tJ+j+XiWsmpSYag1XGc/X287pV5Jz0vXzpi9NFc920tMQ==
X-Received: by 2002:a7b:cc16:: with SMTP id f22mr15178379wmh.99.1627307662535;
Mon, 26 Jul 2021 06:54:22 -0700 (PDT)
Received: from localhost ([137.220.125.106])
by smtp.gmail.com with ESMTPSA id f15sm13383777wmj.15.2021.07.26.06.54.21
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Mon, 26 Jul 2021 06:54:22 -0700 (PDT)
From: luca.boccassi@gmail.com
To: Kevin Laatz <kevin.laatz@intel.com>
Cc: Konstantin Ananyev <konstantin.ananyev@intel.com>,
Bruce Richardson <bruce.richardson@intel.com>,
dpdk stable <stable@dpdk.org>
Date: Mon, 26 Jul 2021 14:52:40 +0100
Message-Id: <20210726135322.149850-17-luca.boccassi@gmail.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20210726135322.149850-1-luca.boccassi@gmail.com>
References: <20210712130551.2462159-1-luca.boccassi@gmail.com>
<20210726135322.149850-1-luca.boccassi@gmail.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
Subject: [dpdk-stable] patch 'raw/ioat: fix config script queue size
calculation' has been queued to stable release 20.11.3
X-BeenThere: stable@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: patches for DPDK stable branches <stable.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/stable>,
<mailto:stable-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/stable/>
List-Post: <mailto:stable@dpdk.org>
List-Help: <mailto:stable-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/stable>,
<mailto:stable-request@dpdk.org?subject=subscribe>
Errors-To: stable-bounces@dpdk.org
Sender: "stable" <stable-bounces@dpdk.org>
Hi,
FYI, your patch has been queued to stable release 20.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 07/28/21. 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/1f4a450852e4800fb4c1faa610fdea441c02dc05
Thanks.
Luca Boccassi
---
>From 1f4a450852e4800fb4c1faa610fdea441c02dc05 Mon Sep 17 00:00:00 2001
From: Kevin Laatz <kevin.laatz@intel.com>
Date: Fri, 16 Jul 2021 13:21:55 +0000
Subject: [PATCH] raw/ioat: fix config script queue size calculation
[ upstream commit 9cf9ac48b116e371e25e1daca33636e9cdc07db8 ]
The queue size calculation is currently based on "max_tokens" rather than
"max_work_queues_size". This is resulting in the queue size being
incorrectly configured when using the script to configure devices bound to
the IDXD kernel driver.
This patch fixes this miscalculation so devices are configured with
appropriate queue size.
Fixes: 01863b9d2354 ("raw/ioat: include example configuration script")
Reported-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Signed-off-by: Kevin Laatz <kevin.laatz@intel.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Acked-by: Bruce Richardson <bruce.richardson@intel.com>
---
drivers/raw/ioat/dpdk_idxd_cfg.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py b/drivers/raw/ioat/dpdk_idxd_cfg.py
index 56e44063e4..fdb636498c 100755
--- a/drivers/raw/ioat/dpdk_idxd_cfg.py
+++ b/drivers/raw/ioat/dpdk_idxd_cfg.py
@@ -37,7 +37,7 @@ def configure_dsa(dsa_id, queues):
max_groups = dsa_dir.read_int("max_groups")
max_engines = dsa_dir.read_int("max_engines")
max_queues = dsa_dir.read_int("max_work_queues")
- max_tokens = dsa_dir.read_int("max_tokens")
+ max_work_queues_size = dsa_dir.read_int("max_work_queues_size")
nb_queues = min(queues, max_queues)
if queues > nb_queues:
@@ -56,7 +56,7 @@ def configure_dsa(dsa_id, queues):
"mode": "dedicated",
"name": f"dpdk_wq{dsa_id}.{q}",
"priority": 1,
- "size": int(max_tokens / nb_queues)})
+ "size": int(max_work_queues_size / nb_queues)})
# enable device and then queues
drv_dir.write_values({"bind": f"dsa{dsa_id}"})
--
2.30.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2021-07-26 13:53:16.780509559 +0100
+++ 0017-raw-ioat-fix-config-script-queue-size-calculation.patch 2021-07-26 13:53:15.833292286 +0100
@@ -1 +1 @@
-From 9cf9ac48b116e371e25e1daca33636e9cdc07db8 Mon Sep 17 00:00:00 2001
+From 1f4a450852e4800fb4c1faa610fdea441c02dc05 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 9cf9ac48b116e371e25e1daca33636e9cdc07db8 ]
+
@@ -14 +15,0 @@
-Cc: stable@dpdk.org
@@ -25 +26 @@
-index 83ef4817db..fcc27822ef 100755
+index 56e44063e4..fdb636498c 100755
@@ -28 +29 @@
-@@ -63,7 +63,7 @@ def configure_dsa(dsa_id, queues, prefix):
+@@ -37,7 +37,7 @@ def configure_dsa(dsa_id, queues):
@@ -37 +38 @@
-@@ -82,7 +82,7 @@ def configure_dsa(dsa_id, queues, prefix):
+@@ -56,7 +56,7 @@ def configure_dsa(dsa_id, queues):
@@ -39 +40 @@
- "name": f"{prefix}_wq{dsa_id}.{q}",
+ "name": f"dpdk_wq{dsa_id}.{q}",