patch 'dma/idxd: fix paths to driver sysfs directory' has been queued to stable release 20.11.5

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 20.11.5

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/20/22. 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/0602aa0fd4cb91b55146a8922d04bba4cc666758

Thanks.

Luca Boccassi

---
>From 0602aa0fd4cb91b55146a8922d04bba4cc666758 Mon Sep 17 00:00:00 2001
From: Bruce Richardson <bruce.richardson at intel.com>
Date: Tue, 11 Jan 2022 13:41:03 +0000
Subject: [PATCH] dma/idxd: fix paths to driver sysfs directory

[ upstream commit 3277676319f61dbc14a38e5c9c79d97c59889855 ]

Recent kernel changes[1][2] mean that we cannot guarantee that the paths
in sysfs used for creating/binding a DSA or workqueue instance will be
as given in the utility script, since they are now "compatibility-mode
only". Update script to support both new paths and compatibility ones.

[1] https://lore.kernel.org/all/162637445139.744545.6008938867943724701.stgit@djiang5-desk3.ch.intel.com/
[2] https://lore.kernel.org/all/162637468705.744545.4399080971745974435.stgit@djiang5-desk3.ch.intel.com/

Fixes: 01863b9d2354 ("raw/ioat: include example configuration script")

Signed-off-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Kevin Laatz <kevin.laatz at intel.com>
---
 drivers/raw/ioat/dpdk_idxd_cfg.py | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py b/drivers/raw/ioat/dpdk_idxd_cfg.py
index fdb636498c..e999a27d45 100755
--- a/drivers/raw/ioat/dpdk_idxd_cfg.py
+++ b/drivers/raw/ioat/dpdk_idxd_cfg.py
@@ -29,10 +29,17 @@ class SysfsDir:
                 f.write(str(contents))
 
 
+def get_drv_dir(dtype):
+    "Get the sysfs path for the driver, either 'idxd' or 'user'"
+    drv_dir = "/sys/bus/dsa/drivers/" + dtype
+    if not os.path.exists(drv_dir):
+        return "/sys/bus/dsa/drivers/dsa"
+    return drv_dir
+
+
 def configure_dsa(dsa_id, queues):
     "Configure the DSA instance with appropriate number of queues"
     dsa_dir = SysfsDir(f"/sys/bus/dsa/devices/dsa{dsa_id}")
-    drv_dir = SysfsDir("/sys/bus/dsa/drivers/dsa")
 
     max_groups = dsa_dir.read_int("max_groups")
     max_engines = dsa_dir.read_int("max_engines")
@@ -59,9 +66,12 @@ def configure_dsa(dsa_id, queues):
                              "size": int(max_work_queues_size / nb_queues)})
 
     # enable device and then queues
-    drv_dir.write_values({"bind": f"dsa{dsa_id}"})
+    idxd_dir = SysfsDir(get_drv_dir("idxd"))
+    idxd_dir.write_values({"bind": f"dsa{dsa_id}"})
+
+    user_dir = SysfsDir(get_drv_dir("user"))
     for q in range(nb_queues):
-        drv_dir.write_values({"bind": f"wq{dsa_id}.{q}"})
+        user_dir.write_values({"bind": f"wq{dsa_id}.{q}"})
 
 
 def main(args):
-- 
2.30.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2022-02-18 12:37:38.458604070 +0000
+++ 0006-dma-idxd-fix-paths-to-driver-sysfs-directory.patch	2022-02-18 12:37:37.502787721 +0000
@@ -1 +1 @@
-From 3277676319f61dbc14a38e5c9c79d97c59889855 Mon Sep 17 00:00:00 2001
+From 0602aa0fd4cb91b55146a8922d04bba4cc666758 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 3277676319f61dbc14a38e5c9c79d97c59889855 ]
+
@@ -15 +16,0 @@
-Cc: stable at dpdk.org
@@ -20,2 +21,2 @@
- drivers/dma/idxd/dpdk_idxd_cfg.py | 18 ++++++++++++++----
- 1 file changed, 14 insertions(+), 4 deletions(-)
+ drivers/raw/ioat/dpdk_idxd_cfg.py | 16 +++++++++++++---
+ 1 file changed, 13 insertions(+), 3 deletions(-)
@@ -23,5 +24,5 @@
-diff --git a/drivers/dma/idxd/dpdk_idxd_cfg.py b/drivers/dma/idxd/dpdk_idxd_cfg.py
-index fcc27822ef..34537cb980 100755
---- a/drivers/dma/idxd/dpdk_idxd_cfg.py
-+++ b/drivers/dma/idxd/dpdk_idxd_cfg.py
-@@ -29,9 +29,17 @@ class SysfsDir:
+diff --git a/drivers/raw/ioat/dpdk_idxd_cfg.py b/drivers/raw/ioat/dpdk_idxd_cfg.py
+index fdb636498c..e999a27d45 100755
+--- a/drivers/raw/ioat/dpdk_idxd_cfg.py
++++ b/drivers/raw/ioat/dpdk_idxd_cfg.py
+@@ -29,10 +29,17 @@ class SysfsDir:
@@ -39,9 +40 @@
- def reset_device(dsa_id):
-     "Reset the DSA device and all its queues"
--    drv_dir = SysfsDir("/sys/bus/dsa/drivers/dsa")
-+    drv_dir = SysfsDir(get_drv_dir("idxd"))
-     drv_dir.write_values({"unbind": f"dsa{dsa_id}"})
- 
- 
-@@ -58,7 +66,6 @@ def get_dsa_id(pci):
- def configure_dsa(dsa_id, queues, prefix):
+ def configure_dsa(dsa_id, queues):
@@ -54 +47 @@
-@@ -85,9 +92,12 @@ def configure_dsa(dsa_id, queues, prefix):
+@@ -59,9 +66,12 @@ def configure_dsa(dsa_id, queues):