diff options
| author | Ben Pfaff <blp@nicira.com> | 2012-06-29 09:22:59 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2012-07-02 10:17:41 -0700 |
| commit | b4c2d8827346169f350489b18a418cd52307cba3 (patch) | |
| tree | 04c4d5165ae4a55f1edf1b3ee32016c96291541e | |
| parent | cc8ccb53fd54d27cd08fd15d0e96fce6b7a640bd (diff) | |
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 | 24 |
1 files changed, 16 insertions, 8 deletions
diff --git a/vswitchd/ovs-vswitchd.c b/vswitchd/ovs-vswitchd.c index 301d0739..57773bba 100644 --- a/vswitchd/ovs-vswitchd.c +++ b/vswitchd/ovs-vswitchd.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2008, 2009, 2010, 2011 Nicira Networks +/* Copyright (c) 2008, 2009, 2010, 2011, 2012 Nicira Networks * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -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[]); @@ -78,6 +82,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(NULL, &unixctl); if (retval) { exit(EXIT_FAILURE); @@ -160,13 +174,7 @@ parse_options(int argc, char *argv[]) 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; VLOG_OPTION_HANDLERS |