From dc597ce8df5ae6efd2728a2d7ba7d92486028f79 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 2 Jul 2021 22:40:30 +0200 Subject: Adding upstream version 1.12. Signed-off-by: Daniel Baumann --- .../dracut-conf/70-nvmf-autoconnect.conf.in | 1 + .../systemd/nvmefc-boot-connections.service | 10 ++++++++++ nvmf-autoconnect/systemd/nvmf-autoconnect.service | 12 ++++++++++++ nvmf-autoconnect/systemd/nvmf-connect.target | 2 ++ nvmf-autoconnect/systemd/nvmf-connect@.service | 14 ++++++++++++++ nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules | 19 +++++++++++++++++++ .../udev-rules/71-nvmf-iopolicy-netapp.rules | 3 +++ 7 files changed, 61 insertions(+) create mode 100644 nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in create mode 100644 nvmf-autoconnect/systemd/nvmefc-boot-connections.service create mode 100644 nvmf-autoconnect/systemd/nvmf-autoconnect.service create mode 100644 nvmf-autoconnect/systemd/nvmf-connect.target create mode 100644 nvmf-autoconnect/systemd/nvmf-connect@.service create mode 100644 nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules create mode 100644 nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules (limited to 'nvmf-autoconnect') diff --git a/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in new file mode 100644 index 0000000..41ea83c --- /dev/null +++ b/nvmf-autoconnect/dracut-conf/70-nvmf-autoconnect.conf.in @@ -0,0 +1 @@ +install_items+="@@UDEVRULESDIR@@/70-nvmf-autoconnect.rules" diff --git a/nvmf-autoconnect/systemd/nvmefc-boot-connections.service b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service new file mode 100644 index 0000000..33ab8c1 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmefc-boot-connections.service @@ -0,0 +1,10 @@ +[Unit] +Description=Auto-connect to subsystems on FC-NVME devices found during boot +ConditionPathExists=/sys/class/fc/fc_udev_device/nvme_discovery + +[Service] +Type=oneshot +ExecStart=/bin/sh -c "echo add > /sys/class/fc/fc_udev_device/nvme_discovery" + +[Install] +WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-autoconnect.service b/nvmf-autoconnect/systemd/nvmf-autoconnect.service new file mode 100644 index 0000000..2690467 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-autoconnect.service @@ -0,0 +1,12 @@ +[Unit] +Description=Connect NVMe-oF subsystems automatically during boot +ConditionPathExists=/etc/nvme/discovery.conf +After=network.target +Before=remote-fs-pre.target + +[Service] +Type=oneshot +ExecStart=/usr/sbin/nvme connect-all + +[Install] +WantedBy=default.target diff --git a/nvmf-autoconnect/systemd/nvmf-connect.target b/nvmf-autoconnect/systemd/nvmf-connect.target new file mode 100644 index 0000000..f64a37c --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-connect.target @@ -0,0 +1,2 @@ +[Unit] +Description=All instances of nvmf-autoconnect daemon diff --git a/nvmf-autoconnect/systemd/nvmf-connect@.service b/nvmf-autoconnect/systemd/nvmf-connect@.service new file mode 100644 index 0000000..5fbf081 --- /dev/null +++ b/nvmf-autoconnect/systemd/nvmf-connect@.service @@ -0,0 +1,14 @@ +# +# Unit file used by 70-nvmf-autoconnect.rules. +# + +[Unit] +Description=NVMf auto-connect scan upon nvme discovery controller Events +After=syslog.target +PartOf=nvmf-connect.target +Requires=nvmf-connect.target + +[Service] +Type=simple +Environment="CONNECT_ARGS=%i" +ExecStart=/bin/sh -c "nvme connect-all --matching --quiet `/bin/echo -e '${CONNECT_ARGS}'`" diff --git a/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules new file mode 100644 index 0000000..cbbebc5 --- /dev/null +++ b/nvmf-autoconnect/udev-rules/70-nvmf-autoconnect.rules @@ -0,0 +1,19 @@ +# +# nvmf-autoconnect.rules: +# Handles udev events which invoke automatically scan via discovery +# controller and connect to elements in the discovery log. +# +# + +# Events from persistent discovery controllers or nvme-fc transport events +# NVME_AEN: +# type 0x2 (NOTICE) info 0xf0 (DISCOVERY_LOG_CHANGE) log-page-id 0x70 (DISCOVERY_LOG_PAGE) +ACTION=="change", SUBSYSTEM=="nvme", ENV{NVME_AEN}=="0x70f002",\ + ENV{NVME_TRTYPE}=="*", ENV{NVME_TRADDR}=="*", \ + ENV{NVME_TRSVCID}=="*", ENV{NVME_HOST_TRADDR}=="*", \ + RUN+="/bin/systemctl --no-block start nvmf-connect@--device=$kernel\t--transport=$env{NVME_TRTYPE}\t--traddr=$env{NVME_TRADDR}\t--trsvcid=$env{NVME_TRSVCID}\t--host-traddr=$env{NVME_HOST_TRADDR}.service" + +# nvme-fc transport generated events (old-style for compatibility) +ACTION=="change", SUBSYSTEM=="fc", ENV{FC_EVENT}=="nvmediscovery", \ + ENV{NVMEFC_HOST_TRADDR}=="*", ENV{NVMEFC_TRADDR}=="*", \ + RUN+="/bin/systemctl --no-block start nvmf-connect@--device=none\t--transport=fc\t--traddr=$env{NVMEFC_TRADDR}\t--trsvcid=none\t--host-traddr=$env{NVMEFC_HOST_TRADDR}.service" diff --git a/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules new file mode 100644 index 0000000..aefd9d4 --- /dev/null +++ b/nvmf-autoconnect/udev-rules/71-nvmf-iopolicy-netapp.rules @@ -0,0 +1,3 @@ +# Enable round-robin for NetApp ONTAP and NetApp E-Series +ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp ONTAP Controller", ATTR{iopolicy}="round-robin" +ACTION=="add", SUBSYSTEM=="nvme-subsystem", ATTR{model}=="NetApp E-Series", ATTR{iopolicy}="round-robin" -- cgit v1.2.3