[ovs-dev] [PATCH 2/2] dpdk: Stop configuring socket-limit with the value of socket-mem.

[Rosemarie O'Riorden]

From: Rosemarie O'Riorden <roriorde at redhat.com>

This change removes the automatic memory limit on start-up of OVS with
DPDK. As DPDK supports dynamic memory allocation, there is no
need to limit the amount of memory available, if not requested.

Currently, if socket-limit is not configured, it is set to the value of
socket-mem. With this change, the user can decide to set it or have no
memory limit.

Reported at: https://bugzilla.redhat.com/show_bug.cgi?id=1949850
Signed-off-by: Rosemarie O'Riorden <roriorde at redhat.com>
---
 NEWS                 | 2 ++
 lib/dpdk.c           | 4 ----
 vswitchd/vswitch.xml | 9 ++++-----
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/NEWS b/NEWS
index 6245b28d2..3d9cac918 100644
--- a/NEWS
+++ b/NEWS
@@ -24,6 +24,8 @@ Post-v2.15.0
        Available only if DPDK experimantal APIs enabled during the build.
      * EAL option --socket-mem is no longer configured by default upon
        start-up.
+     * EAL option --socket-limit no longer takes on the value of --socket-mem
+       by default.
    - ovsdb-tool:
      * New option '--election-timer' to the 'create-cluster' command to set the
        leader election timer during cluster creation.
diff --git a/lib/dpdk.c b/lib/dpdk.c
index 1c128fca3..9e217f825 100644
--- a/lib/dpdk.c
+++ b/lib/dpdk.c
@@ -438,10 +438,6 @@ dpdk_init__(const struct smap *ovs_other_config)
                 break;
             }
         }
-        if (i < args.n - 1) {
-            svec_add(&args, "--socket-limit");
-            svec_add(&args, args.names[i + 1]);
-        }
     }
 
     if (args_contains(&args, "-c") || args_contains(&args, "-l")) {
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 52fd52ce6..10d8e3d0b 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -381,14 +381,13 @@
           <code>0</code> will disable the limit for a particular socket.
         </p>
         <p>
-          If not specified, OVS will configure limits equal to the amount of
-          preallocated memory specified by <ref column="other_config"
+          If not specified, OVS will not configure limits by default.
+          Limits can be configured with <ref column="other_config"
           key="dpdk-socket-mem"/> or <code>--socket-mem</code> in
           <ref column="other_config" key="dpdk-extra"/>. If none of the above
-          options specified or <code>--legacy-mem</code> provided in
+          options are specified or <code>--legacy-mem</code> is provided in
           <ref column="other_config" key="dpdk-extra"/>, limits will not be
-          applied.
-          Changing this value requires restarting the daemon.
+          applied. Changing this value requires restarting the daemon.
         </p>
       </column>
 
-- 
2.31.1