From: Heming Zhao <heming.zhao@suse.com>
To: cluster-devel.redhat.com
Subject: [Cluster-devel] [PATCH 06/10] dlm_controld: change dlm_options[] to shared memory type
Date: Sun, 19 Sep 2021 14:43:18 +0800 [thread overview]
Message-ID: <20210919064322.1670-7-heming.zhao@suse.com> (raw)
In-Reply-To: <20210919064322.1670-1-heming.zhao@suse.com>
This commit makes dlm_options[] could be modified after fork().
The patch is foundation to dynamic setting feature.
Signed-off-by: Heming Zhao <heming.zhao@suse.com>
---
dlm_controld/dlm_daemon.h | 2 +-
dlm_controld/main.c | 14 +++++++++++++-
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dlm_controld/dlm_daemon.h b/dlm_controld/dlm_daemon.h
index 76f5f4d082a5..e20e98e78707 100644
--- a/dlm_controld/dlm_daemon.h
+++ b/dlm_controld/dlm_daemon.h
@@ -159,7 +159,7 @@ struct dlm_option {
unsigned int dynamic_uint;
};
-EXTERN struct dlm_option dlm_options[dlm_options_max];
+EXTERN struct dlm_option *dlm_options;
#define opt(x) dlm_options[x].use_int
#define opts(x) dlm_options[x].use_str
#define optu(x) dlm_options[x].use_uint
diff --git a/dlm_controld/main.c b/dlm_controld/main.c
index 504cafa12ec6..2a4f33b1b455 100644
--- a/dlm_controld/main.c
+++ b/dlm_controld/main.c
@@ -14,6 +14,7 @@
#include <linux/genetlink.h>
#include <linux/dlm_netlink.h>
#include <uuid/uuid.h>
+#include <sys/mman.h>
#ifdef USE_SD_NOTIFY
#include <systemd/sd-daemon.h>
@@ -2104,11 +2105,21 @@ int main(int argc, char **argv)
struct sigaction act;
int fd, rv;
+ /* share the cfg memory for helper process */
+ dlm_options = mmap(NULL, sizeof(struct dlm_option)*dlm_options_max,
+ PROT_READ|PROT_WRITE, MAP_SHARED|MAP_ANON, -1, 0);
+ if (dlm_options == MAP_FAILED) {
+ perror("mmap failed");
+ return 1;
+ }
+
/*
- * config priority: cli, config file, default
+ * config priority: dynamic, cli, config file, default
* - explicit cli setting will override default,
* - explicit file setting will override default
* - explicit file setting will not override explicit cli setting
+ * - explicit dynamic setting will override using value,
+ * "dlm_tool dump_config" will show which option is using dynamic setting.
*/
set_opt_defaults();
--
2.32.0
next prev parent reply other threads:[~2021-09-19 6:43 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-19 6:43 [Cluster-devel] [RFC PATCH dlm 00/10] dlm_controld config settings can be Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 01/10] dlm_tool man: add command "joinleave", add "USAGE" section Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 02/10] dlm_tool: add run_(check|cancel) all feature Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 03/10] dlm_tool man: add dynamic setting and examples Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 04/10] dlm_controld: put MAX_LINE in header file Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 05/10] dlm_controld: add dynamic setting items in "struct dlm_option" Heming Zhao
2021-09-19 6:43 ` Heming Zhao [this message]
2021-09-19 6:43 ` [Cluster-devel] [PATCH 07/10] dlm_controld: make few APIs public Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 08/10] dlm_controld: support "dlm_tool dump_config" to show dynamic setting Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 09/10] dlm_controld: add new API set_opt_online() Heming Zhao
2021-09-19 6:43 ` [Cluster-devel] [PATCH 10/10] dlm_controld: enable "dlm_tool run|run_start" dynamic setting feature Heming Zhao
2021-09-20 17:57 ` [Cluster-devel] [RFC PATCH dlm 00/10] dlm_controld config settings can be David Teigland
2021-09-21 6:38 ` heming.zhao
2021-09-21 13:54 ` David Teigland
2021-09-22 9:32 ` heming.zhao
2021-09-22 13:46 ` David Teigland
2021-09-22 14:35 ` heming.zhao
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210919064322.1670-7-heming.zhao@suse.com \
--to=heming.zhao@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).