diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-06-29 09:22:59 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-06-29 17:18:21 -0700 |
| commit | cd74f7c0fa6585f2cda9d79ed4857ea2b1cc3889 (patch) | |
| tree | c9f9b2874a2b073f0738ecc4b7c7455c907eafec | |
| parent | 51bcf14564e0155a492d160e360e89d4bb527fc1 (diff) | |
| download | openvswitch-cd74f7c0fa6585f2cda9d79ed4857ea2b1cc3889.tar.gz | |
ovs-vswitchd: Call mlockall() from the daemon, not the parent or monitor.
mlockall(2) says:
Memory locks are not inherited by a child created via fork(2) and are
automatically removed (unlocked) during an execve(2) or when the
process terminates.
which means that --mlockall was ineffective in combination with --detach
or --monitor or both. Both are used in the most common production
configuration of Open vSwitch, so this means that --mlockall has never been
effective in production.
Signed-off-by: Ben Pfaff <blp@nicira.com>
| -rw-r--r-- | vswitchd/ovs-vswitchd.c | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 76dc52bb5..b6ba11b5d 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -53,6 +53,10 @@ VLOG_DEFINE_THIS_MODULE(vswitchd); +/* --mlockall: If set, locks all process memory into physical RAM, preventing + * the kernel from paging any of its memory to disk. */ +static bool want_mlockall; + static unixctl_cb_func ovs_vswitchd_exit; static char *parse_options(int argc, char *argv[], char **unixctl_path); @@ -79,6 +83,16 @@ main(int argc, char *argv[]) daemonize_start(); + if (want_mlockall) { +#ifdef HAVE_MLOCKALL + if (mlockall(MCL_CURRENT | MCL_FUTURE)) { + VLOG_ERR("mlockall failed: %s", strerror(errno)); + } +#else + VLOG_ERR("mlockall not supported on this system"); +#endif + } + retval = unixctl_server_create(unixctl_path, &unixctl); if (retval) { exit(EXIT_FAILURE); @@ -163,13 +177,7 @@ parse_options(int argc, char *argv[], char **unixctl_pathp) exit(EXIT_SUCCESS); case OPT_MLOCKALL: -#ifdef HAVE_MLOCKALL - if (mlockall(MCL_CURRENT | MCL_FUTURE)) { - VLOG_ERR("mlockall failed: %s", strerror(errno)); - } -#else - VLOG_ERR("mlockall not supported on this system"); -#endif + want_mlockall = true; break; case OPT_UNIXCTL: |