[Accel-config] [PATCH v1 1/2] accel-config/test: replace token with read_buffer of config files in contrib

Tony Zhu <tony.zhu at intel.com> Wed, 07 Sep 2022 14:08:13 +0800
Newsgroups dev.linux.lists.accel-config
Message-ID <[email protected]>
--===============5117272683370395329==
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable

use_token_limit tokens_reserved tokens_allowed and token_limit will be
replaced as use_read_buffer_limit read_buffers_reserved
read_buffers_allowed and read_buffer_limit. It is not necessary to keep
token attributes which will give warnings when try to config devices.

Signed-off-by: Tony Zhu <tony.zhu(a)intel.com>
---
 contrib/accel-config.conf.sample     | 28 +++++++++++++++-------------
 contrib/configs/app_profile.conf     | 14 +++++++-------
 contrib/configs/net_profile.conf     | 26 +++++++++++++-------------
 contrib/configs/os_profile.conf      |  8 ++++----
 contrib/configs/profilenote.txt      |  8 ++++----
 contrib/configs/storage_profile.conf | 14 +++++++-------
 6 files changed, 50 insertions(+), 48 deletions(-)

diff --git a/contrib/accel-config.conf.sample b/contrib/accel-config.conf.s=
ample
index e439189..1b61ce2 100644
--- a/contrib/accel-config.conf.sample
+++ b/contrib/accel-config.conf.sample
@@ -1,13 +1,13 @@
 [
   {
     "dev":"dsa0",
-    "token_limit":0,
+    "read_buffer_limit":0,
     "groups":[
       {
         "dev":"group0.0",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "traffic_class_a":-1,
         "traffic_class_b":-1,
         "grouped_workqueues":[
@@ -19,6 +19,7 @@
             "priority":10,
             "block_on_fault":1,
             "type":"user",
+            "driver_name":"user",
             "name":"app1",
             "threshold":15
           }
@@ -36,9 +37,9 @@
       },
       {
         "dev":"group0.1",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "traffic_class_a":-1,
         "traffic_class_b":-1,
         "grouped_workqueues":[
@@ -50,6 +51,7 @@
             "priority":10,
             "block_on_fault":1,
             "type":"user",
+            "driver_name":"user",
 	    "name":"app2",
             "threshold":0
           }
@@ -67,17 +69,17 @@
       },
       {
         "dev":"group0.2",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "traffic_class_a":-1,
         "traffic_class_b":-1
       },
       {
         "dev":"group0.3",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "traffic_class_a":-1,
         "traffic_class_b":-1
       }
diff --git a/contrib/configs/app_profile.conf b/contrib/configs/app_profile=
.conf
index 4f8ad22..c2b2d90 100644
--- a/contrib/configs/app_profile.conf
+++ b/contrib/configs/app_profile.conf
@@ -1,13 +1,13 @@
 [
   {
     "dev":"dsa0",
-    "token_limit":0,
+    "read_buffer_limit":0,
     "groups":[
       {
         "dev":"group0.0",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.0",
@@ -33,9 +33,9 @@
       },
       {
         "dev":"group0.1",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.1",
diff --git a/contrib/configs/net_profile.conf b/contrib/configs/net_profile=
.conf
index 55b84a8..da3f7f1 100644
--- a/contrib/configs/net_profile.conf
+++ b/contrib/configs/net_profile.conf
@@ -1,13 +1,13 @@
 [
   {
     "dev":"dsa0",
-    "token_limit":0,
+    "read_buffer_limit":0,
     "groups":[
       {
         "dev":"group0.0",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.0",
@@ -33,9 +33,9 @@
       },
       {
         "dev":"group0.1",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.1",
@@ -61,9 +61,9 @@
       },
       {
         "dev":"group0.2",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.2",
@@ -89,9 +89,9 @@
       },
       {
         "dev":"group0.3",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.3",
diff --git a/contrib/configs/os_profile.conf b/contrib/configs/os_profile.c=
onf
index 88a9224..6baebcd 100644
--- a/contrib/configs/os_profile.conf
+++ b/contrib/configs/os_profile.conf
@@ -1,13 +1,13 @@
 [
   {
     "dev":"dsa0",
-    "token_limit":0,
+    "read_buffer_limit":0,
     "groups":[
       {
         "dev":"group0.0",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.0",
diff --git a/contrib/configs/profilenote.txt b/contrib/configs/profilenote.=
txt
index 1e3d1c7..5843e9f 100644
--- a/contrib/configs/profilenote.txt
+++ b/contrib/configs/profilenote.txt
@@ -9,7 +9,7 @@ profile descriptions.
             - max xfer size=3D2MB, max batch sz=3D32, bof=3D0
             - priority 10
             - threshold 15
-	    - tokens_allowed 0
+	    - read_buffers_allowed 0
 =

 2. app_profile.conf
     Recommended dsa default application profile.
@@ -18,7 +18,7 @@ profile descriptions.
               max xfer size=3D16KB, max batch sz=3D32, bof=3D0, threshold=
=3D6
             - Grp2 - SWQ2(a)32qd, 1eng
               max xfer size=3D2MB, max batch sz=3D32, bof=3D0, threshold=
=3D28
-	    - tokens_allowed 0
+	    - read_buffers_allowed 0
             - Use group1 for smaller size ops with better latency characte=
ristics
 =

 3. net_profile.conf
@@ -26,7 +26,7 @@ profile descriptions.
     - 4 groups, each with 1 DWQ(a)32qd/1 eng per group
             - Each DWQ has max xfer size=3D16KB
 	    - DWQ threshold default 0
-	    - tokens_allowed 0
+	    - read_buffers_allowed 0
 =

 4. storage_profile.conf
     Recommended dsa storage accel profile
@@ -37,4 +37,4 @@ profile descriptions.
               for throughput ops
             - targeting SPDK-like uses
 	    - DWQ threshold default 0
-	    - tokens_allowed 0
+	    - read_buffers_allowed 0
diff --git a/contrib/configs/storage_profile.conf b/contrib/configs/storage=
_profile.conf
index 1ed5fcf..7950aa4 100644
--- a/contrib/configs/storage_profile.conf
+++ b/contrib/configs/storage_profile.conf
@@ -1,13 +1,13 @@
 [
   {
     "dev":"dsa0",
-    "token_limit":0,
+    "read_buffer_limit":0,
     "groups":[
       {
         "dev":"group0.0",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.0",
@@ -33,9 +33,9 @@
       },
       {
         "dev":"group0.1",
-        "tokens_reserved":0,
-        "use_token_limit":0,
-        "tokens_allowed":0,
+        "read_buffers_reserved":0,
+        "use_read_buffer_limit":0,
+        "read_buffers_allowed":0,
         "grouped_workqueues":[
           {
             "dev":"wq0.1",
-- =

2.27.0

--===============5117272683370395329==--