diff mbox series

[ovs-dev,v3,3/3] dpdk: Stop configuring socket-limit with the value of socket-mem.

Message ID 20210715213753.118036-4-roriorde@redhat.com
State Accepted
Headers show
Series Stop configuring '--socket-mem'/'--socket-limit' by default for DPDK if not requested. | expand

Checks

Context Check Description
ovsrobot/apply-robot success apply and check: success
ovsrobot/github-robot success github build: passed

Commit Message

Rosemarie O'Riorden July 15, 2021, 9:37 p.m. UTC 
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.

Removed logs that announce this change and fixed documentation.

Reported at: https://bugzilla.redhat.com/show_bug.cgi?id=1949850
Signed-off-by: Rosemarie O'Riorden <roriorde@redhat.com>
---
Version 1:
 - Removes logs added in patch 1 that were not in v1.

Version 2:
 - Removed reference to "patch 1"
 - Removed additional code that was unnecessary in lib/dpdk.c
 - Updated documentation

 NEWS                 |  2 ++
 lib/dpdk.c           | 19 -------------------
 vswitchd/vswitch.xml |  8 +-------
 3 files changed, 3 insertions(+), 26 deletions(-)
diff mbox series

Patch

diff --git a/NEWS b/NEWS
index 948f68283..99b8b9fce 100644
--- a/NEWS
+++ b/NEWS
@@ -31,6 +31,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 3a6990e2f..e88183236 100644
--- a/lib/dpdk.c
+++ b/lib/dpdk.c
@@ -405,25 +405,6 @@  dpdk_init__(const struct smap *ovs_other_config)
     svec_add(&args, ovs_get_program_name());
     construct_dpdk_args(ovs_other_config, &args);
 
-    if (!args_contains(&args, "--legacy-mem")
-        && !args_contains(&args, "--socket-limit")) {
-        const char *arg;
-        size_t i;
-
-        SVEC_FOR_EACH (i, arg, &args) {
-            if (!strcmp(arg, "--socket-mem")) {
-                break;
-            }
-        }
-        if (i < args.n - 1) {
-            svec_add(&args, "--socket-limit");
-            svec_add(&args, args.names[i + 1]);
-            VLOG_INFO("Using default value for '--socket-limit. OVS will no "
-                      "longer provide a default for this argument starting "
-                      "from 2.17 release. DPDK defaults will be used instead.");
-        }
-    }
-
     if (args_contains(&args, "-c") || args_contains(&args, "-l")) {
         auto_determine = false;
     }
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 190e377d3..10eecfb09 100644
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -381,13 +381,7 @@ 
           <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"
-          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
-          <ref column="other_config" key="dpdk-extra"/>, limits will not be
-          applied. There is no default value from OVS.
+          If not specified, OVS will not configure limits by default.
           Changing this value requires restarting the daemon.
         </p>
       </column>