From: Vishal Verma <vishal.l.verma@intel.com>
To: <nvdimm@lists.linux.dev>
Cc: Dan Williams <dan.j.williams@intel.com>,
QI Fuli <qi.fuli@jp.fujitsu.com>,
fenghua.hu@intel.com, Vishal Verma <vishal.l.verma@intel.com>,
QI Fuli <qi.fuli@fujitsu.com>
Subject: [ndctl PATCH 4/7] daxctl: add basic config parsing support
Date: Tue, 31 Aug 2021 03:04:56 -0600 [thread overview]
Message-ID: <20210831090459.2306727-5-vishal.l.verma@intel.com> (raw)
In-Reply-To: <20210831090459.2306727-1-vishal.l.verma@intel.com>
Add support similar to ndctl and libndctl for parsing config files. This
allows storing a config file path/list in the daxctl_ctx, and adds APIs
for setting and retrieving it.
Cc: QI Fuli <qi.fuli@fujitsu.com>
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
---
daxctl/lib/libdaxctl.c | 37 +++++++++++++++++++++++++++++++++++++
daxctl/libdaxctl.h | 2 ++
daxctl/Makefile.am | 1 +
daxctl/lib/Makefile.am | 4 ++++
daxctl/lib/libdaxctl.sym | 2 ++
5 files changed, 46 insertions(+)
diff --git a/daxctl/lib/libdaxctl.c b/daxctl/lib/libdaxctl.c
index 860bd9c..659d2fe 100644
--- a/daxctl/lib/libdaxctl.c
+++ b/daxctl/lib/libdaxctl.c
@@ -17,6 +17,8 @@
#include <util/log.h>
#include <util/sysfs.h>
#include <util/iomem.h>
+#include <util/strbuf.h>
+#include <util/parse-configs.h>
#include <daxctl/libdaxctl.h>
#include "libdaxctl-private.h"
@@ -37,6 +39,7 @@ struct daxctl_ctx {
struct log_ctx ctx;
int refcount;
void *userdata;
+ const char *configs;
int regions_init;
struct list_head regions;
struct kmod_ctx *kmod_ctx;
@@ -68,6 +71,40 @@ DAXCTL_EXPORT void daxctl_set_userdata(struct daxctl_ctx *ctx, void *userdata)
ctx->userdata = userdata;
}
+DAXCTL_EXPORT void daxctl_set_configs(struct daxctl_ctx **ctx, char *conf_dir)
+{
+ struct dirent **namelist;
+ struct strbuf value = STRBUF_INIT;
+ int rc;
+
+ if ((!ctx) || (!conf_dir))
+ return;
+
+ rc = scandir(conf_dir, &namelist, filter_conf_files, alphasort);
+ if (rc == -1) {
+ perror("scandir");
+ return;
+ }
+
+ while (rc--) {
+ if (value.len)
+ strbuf_addstr(&value, " ");
+ strbuf_addstr(&value, conf_dir);
+ strbuf_addstr(&value, "/");
+ strbuf_addstr(&value, namelist[rc]->d_name);
+ free(namelist[rc]);
+ }
+ (*ctx)->configs = strbuf_detach(&value, NULL);
+ free(namelist);
+}
+
+DAXCTL_EXPORT const char *daxctl_get_configs(struct daxctl_ctx *ctx)
+{
+ if (ctx == NULL)
+ return NULL;
+ return ctx->configs;
+}
+
/**
* daxctl_new - instantiate a new library context
* @ctx: context to establish
diff --git a/daxctl/libdaxctl.h b/daxctl/libdaxctl.h
index 683ae9c..9388f85 100644
--- a/daxctl/libdaxctl.h
+++ b/daxctl/libdaxctl.h
@@ -28,6 +28,8 @@ int daxctl_get_log_priority(struct daxctl_ctx *ctx);
void daxctl_set_log_priority(struct daxctl_ctx *ctx, int priority);
void daxctl_set_userdata(struct daxctl_ctx *ctx, void *userdata);
void *daxctl_get_userdata(struct daxctl_ctx *ctx);
+void daxctl_set_configs(struct daxctl_ctx **ctx, char *conf_dir);
+const char *daxctl_get_configs(struct daxctl_ctx *ctx);
struct daxctl_region;
struct daxctl_region *daxctl_new_region(struct daxctl_ctx *ctx, int id,
diff --git a/daxctl/Makefile.am b/daxctl/Makefile.am
index 9b1313a..a9845a0 100644
--- a/daxctl/Makefile.am
+++ b/daxctl/Makefile.am
@@ -10,6 +10,7 @@ config.h: $(srcdir)/Makefile.am
"$(daxctl_modprobe_datadir)/$(daxctl_modprobe_data)"' >>$@ && \
echo '#define DAXCTL_MODPROBE_INSTALL \
"$(sysconfdir)/modprobe.d/$(daxctl_modprobe_data)"' >>$@
+ $(AM_V_GEN) echo '#define DAXCTL_CONF_DIR "$(ndctl_confdir)"' >>$@
daxctl_SOURCES =\
daxctl.c \
diff --git a/daxctl/lib/Makefile.am b/daxctl/lib/Makefile.am
index db2351e..7a53598 100644
--- a/daxctl/lib/Makefile.am
+++ b/daxctl/lib/Makefile.am
@@ -13,6 +13,10 @@ libdaxctl_la_SOURCES =\
../../util/iomem.h \
../../util/sysfs.c \
../../util/sysfs.h \
+ ../../util/strbuf.h \
+ ../../util/strbuf.c \
+ ../../util/wrapper.c \
+ ../../util/usage.c \
../../util/log.c \
../../util/log.h \
../../util/parse-configs.h \
diff --git a/daxctl/lib/libdaxctl.sym b/daxctl/lib/libdaxctl.sym
index a13e93d..190b605 100644
--- a/daxctl/lib/libdaxctl.sym
+++ b/daxctl/lib/libdaxctl.sym
@@ -96,4 +96,6 @@ LIBDAXCTL_9 {
global:
daxctl_dev_will_auto_online_memory;
daxctl_dev_has_online_memory;
+ daxctl_set_configs;
+ daxctl_get_configs;
} LIBDAXCTL_8;
--
2.31.1
next prev parent reply other threads:[~2021-08-31 9:06 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-31 9:04 [ndctl PATCH 0/7] Policy based reconfiguration for daxctl Vishal Verma
2021-08-31 9:04 ` [ndctl PATCH 1/7] ndctl: Update ndctl.spec.in for 'ndctl.conf' Vishal Verma
2021-09-02 12:15 ` qi.fuli
2021-08-31 9:04 ` [ndctl PATCH 2/7] daxctl: Documentation updates for persistent reconfiguration Vishal Verma
2021-09-16 22:47 ` Dan Williams
2021-11-17 23:02 ` Verma, Vishal L
2021-08-31 9:04 ` [ndctl PATCH 3/7] util/parse-config: refactor filter_conf_files into util/ Vishal Verma
2021-09-02 12:17 ` qi.fuli
2021-09-16 22:54 ` Dan Williams
2021-08-31 9:04 ` Vishal Verma [this message]
2021-09-02 12:19 ` [ndctl PATCH 4/7] daxctl: add basic config parsing support qi.fuli
2021-09-16 22:58 ` Dan Williams
2021-11-17 23:17 ` Verma, Vishal L
2021-08-31 9:04 ` [ndctl PATCH 5/7] util/parse-configs: add a key/value search helper Vishal Verma
2021-09-02 13:12 ` qi.fuli
2021-09-16 23:54 ` Dan Williams
2021-11-17 23:21 ` Verma, Vishal L
2021-08-31 9:04 ` [ndctl PATCH 6/7] daxctl/device.c: add an option for getting params from a config file Vishal Verma
2021-09-17 1:59 ` Dan Williams
2021-11-17 23:45 ` Verma, Vishal L
2021-08-31 9:04 ` [ndctl PATCH 7/7] daxctl: add systemd service and udev rule for auto-onlining Vishal Verma
2021-09-03 0:56 ` qi.fuli
2021-09-17 18:10 ` Dan Williams
2021-11-17 23:29 ` Verma, Vishal L
2021-11-17 23:43 ` Dan Williams
2021-11-18 2:40 ` Verma, Vishal L
2021-11-18 3:40 ` Dan Williams
2021-09-16 22:12 ` [ndctl PATCH 0/7] Policy based reconfiguration for daxctl Dan Williams
2021-11-19 20:57 ` Verma, Vishal L
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=20210831090459.2306727-5-vishal.l.verma@intel.com \
--to=vishal.l.verma@intel.com \
--cc=dan.j.williams@intel.com \
--cc=fenghua.hu@intel.com \
--cc=nvdimm@lists.linux.dev \
--cc=qi.fuli@fujitsu.com \
--cc=qi.fuli@jp.fujitsu.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).