Install a helper script that calls daxctl-reconfigure-device with the new 'check-config' option for a given device. This is meant to be called via a systemd service.
Install a systemd service that calls the above wrapper script with a daxctl device passed in to it via the environment. Install a udev rule that is triggered for every daxctl device, and triggers the above oneshot systemd service. Together, these three things work such that upon boot, whenever a daxctl device is found, udev triggers a device-specific systemd service called, for example: [email protected] This initiates a daxctl-reconfigure-device with a config lookup for the 'dax0.0' device. If the config has an '[auto-online <unique_id>]' section, it uses the information in that to set the operating mode of the device. If any device is in an unexpected status, 'journalctl' can be used to view the reconfiguration log for that device, for example: journalctl --unit [email protected] Update the RPM spec file to include the newly added files to the RPM build. Cc: QI Fuli <[email protected]> Cc: Dan Williams <[email protected]> Signed-off-by: Vishal Verma <[email protected]> --- configure.ac | 9 ++++++++- daxctl/90-daxctl-device.rules | 1 + daxctl/Makefile.am | 10 ++++++++++ daxctl/daxdev-auto-reconfigure.sh | 3 +++ daxctl/[email protected] | 8 ++++++++ ndctl.spec.in | 3 +++ 6 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 daxctl/90-daxctl-device.rules create mode 100755 daxctl/daxdev-auto-reconfigure.sh create mode 100644 daxctl/[email protected] diff --git a/configure.ac b/configure.ac index 9e1c6db..df6ab10 100644 --- a/configure.ac +++ b/configure.ac @@ -160,7 +160,7 @@ AC_CHECK_FUNCS([ \ AC_ARG_WITH([systemd], AS_HELP_STRING([--with-systemd], - [Enable systemd functionality (monitor). @<:@default=yes@:>@]), + [Enable systemd functionality. @<:@default=yes@:>@]), [], [with_systemd=yes]) if test "x$with_systemd" = "xyes"; then @@ -183,6 +183,13 @@ daxctl_modprobe_data=daxctl.conf AC_SUBST([daxctl_modprobe_datadir]) AC_SUBST([daxctl_modprobe_data]) +AC_ARG_WITH(udevrulesdir, + [AS_HELP_STRING([--with-udevrulesdir=DIR], [udev rules.d directory])], + [UDEVRULESDIR="$withval"], + [UDEVRULESDIR='${prefix}/lib/udev/rules.d'] +) +AC_SUBST(UDEVRULESDIR) + AC_ARG_WITH([keyutils], AS_HELP_STRING([--with-keyutils], [Enable keyutils functionality (security). @<:@default=yes@:>@]), [], [with_keyutils=yes]) diff --git a/daxctl/90-daxctl-device.rules b/daxctl/90-daxctl-device.rules new file mode 100644 index 0000000..ee0670f --- /dev/null +++ b/daxctl/90-daxctl-device.rules @@ -0,0 +1 @@ +ACTION=="add", SUBSYSTEM=="dax", TAG+="systemd", ENV{SYSTEMD_WANTS}="daxdev-reconfigure@$env{DEVNAME}.service" diff --git a/daxctl/Makefile.am b/daxctl/Makefile.am index f30c485..d53bdcf 100644 --- a/daxctl/Makefile.am +++ b/daxctl/Makefile.am @@ -28,3 +28,13 @@ daxctl_LDADD =\ $(UUID_LIBS) \ $(KMOD_LIBS) \ $(JSON_LIBS) + +bin_SCRIPTS = daxdev-auto-reconfigure.sh +CLEANFILES = $(bin_SCRIPTS) + +udevrulesdir = $(UDEVRULESDIR) +udevrules_DATA = 90-daxctl-device.rules + +if ENABLE_SYSTEMD_UNITS +systemd_unit_DATA = [email protected] +endif diff --git a/daxctl/daxdev-auto-reconfigure.sh b/daxctl/daxdev-auto-reconfigure.sh new file mode 100755 index 0000000..f6da43f --- /dev/null +++ b/daxctl/daxdev-auto-reconfigure.sh @@ -0,0 +1,3 @@ +#!/bin/bash + +daxctl reconfigure-device --check-config "${1##*/}" diff --git a/daxctl/[email protected] b/daxctl/[email protected] new file mode 100644 index 0000000..451fef1 --- /dev/null +++ b/daxctl/[email protected] @@ -0,0 +1,8 @@ +[Unit] +Description=Automatic daxctl device reconfiguration +Documentation=man:daxctl-reconfigure-device(1) + +[Service] +Type=forking +GuessMainPID=false +ExecStart=/bin/sh -c "exec daxdev-auto-reconfigure.sh %I" diff --git a/ndctl.spec.in b/ndctl.spec.in index 07c36ec..fd1a5ff 100644 --- a/ndctl.spec.in +++ b/ndctl.spec.in @@ -124,8 +124,11 @@ make check %defattr(-,root,root) %license LICENSES/preferred/GPL-2.0 LICENSES/other/MIT LICENSES/other/CC0-1.0 %{_bindir}/daxctl +%{_bindir}/daxdev-auto-reconfigure.sh %{_mandir}/man1/daxctl* %{_datadir}/daxctl/daxctl.conf +%{_unitdir}/[email protected] +%config %{_udevrulesdir}/90-daxctl-device.rules %files -n LNAME %defattr(-,root,root) -- 2.31.1
