NVMeoF / TCP boot support #2184
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ | |
|
|
||
| # called by dracut | ||
| check() { | ||
| require_binaries nvme jq || return 1 | ||
| [ -f /etc/nvme/hostnqn ] || return 255 | ||
| [ -f /etc/nvme/hostid ] || return 255 | ||
|
|
||
|
|
@@ -25,17 +25,27 @@ check() { | |
| [[ $trtype == "fc" ]] || [[ $trtype == "tcp" ]] || [[ $trtype == "rdma" ]] | ||
| } | ||
|
|
||
| has_nbft() { | ||
| local f found= | ||
| for f in /sys/firmware/acpi/tables/NBFT*; do | ||
| [ -f "$f" ] || continue | ||
| found=1 | ||
| break | ||
| done | ||
| [[ $found ]] | ||
| } | ||
|
|
||
| [[ $hostonly ]] || [[ $mount_needs ]] && { | ||
| pushd . > /dev/null | ||
|
There was a problem hiding this comment. I know this is not part of the PR, but does anyone know why There was a problem hiding this comment. Is it just checking that There was a problem hiding this comment. It is indeed not part of this PR, therefore I'd like to close this conversation. AFAICS, the There was a problem hiding this comment. Right, good to know the origin of it. Thanks for the response! |
||
| for_each_host_dev_and_slaves is_nvmf | ||
| local _is_nvmf=$? | ||
| popd > /dev/null || exit | ||
| [[ $_is_nvmf == 0 ]] || return 255 | ||
| if [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ] \ | ||
| && [ ! -f /etc/nvme/discovery.conf ] \ | ||
| && [ ! -f /etc/nvme/config.json ] && ! has_nbft; then | ||
|
There was a problem hiding this comment. Just a note: same usage of There was a problem hiding this comment.
|
||
| echo "No discovery arguments present" | ||
| return 255 | ||
| fi | ||
| } | ||
| return 0 | ||
|
|
@@ -50,7 +60,7 @@ depends() { | |
| # called by dracut | ||
| installkernel() { | ||
| instmods nvme_fc lpfc qla2xxx | ||
| hostonly="" instmods nvme_tcp nvme_fabrics 8021q | ||
| } | ||
|
|
||
| # called by dracut | ||
|
|
@@ -126,10 +136,12 @@ install() { | |
| inst_multiple ip sed | ||
|
|
||
| inst_script "${moddir}/nvmf-autoconnect.sh" /sbin/nvmf-autoconnect.sh | ||
| inst_script "${moddir}/nbftroot.sh" /sbin/nbftroot | ||
|
|
||
| inst_multiple nvme jq | ||
| inst_hook cmdline 92 "$moddir/parse-nvmf-boot-connections.sh" | ||
| inst_simple "/etc/nvme/discovery.conf" | ||
| inst_simple "/etc/nvme/config.json" | ||
| inst_rules /usr/lib/udev/rules.d/71-nvmf-iopolicy-netapp.rules | ||
| inst_rules "$moddir/95-nvmf-initqueue.rules" | ||
| dracut_need_initqueue | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| #! /bin/sh | ||
| # This script is called from /sbin/netroot | ||
|
|
||
| /sbin/nvmf-autoconnect.sh online | ||
| exit 0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,54 @@ | ||
| #!/bin/sh | ||
| # Argument $1 is "settled", "online", or "timeout", indicating | ||
aafeijoo-suse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| # the queue from which the script is called. | ||
| # In the "timeout" case, try everything. | ||
| # Otherwise, try options according to the priorities below. | ||
|
|
||
| [ "$RD_DEBUG" != yes ] || set -x | ||
|
|
||
| if [ "$1" = timeout ]; then | ||
| [ ! -f /sys/class/fc/fc_udev_device/nvme_discovery ] \ | ||
|
There was a problem hiding this comment. Just a note: same usage of There was a problem hiding this comment. Again, |
||
| || echo add > /sys/class/fc/fc_udev_device/nvme_discovery | ||
| /usr/sbin/nvme connect-all | ||
aafeijoo-suse marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| exit 0 | ||
| fi | ||
|
|
||
| NVMF_HOSTNQN_OK= | ||
| [ ! -f "/etc/nvme/hostnqn" ] || [ ! -f "/etc/nvme/hostid" ] || NVMF_HOSTNQN_OK=1 | ||
|
|
||
| # Only nvme-cli 2.5 or newer supports the options --nbft and --no-nbft | ||
| # for the connect-all command. | ||
| # Make sure we don't use unsupported options with earlier versions. | ||
| NBFT_SUPPORTED= | ||
| # shellcheck disable=SC2016 | ||
| /usr/sbin/nvme connect-all --help 2>&1 | sed -n '/[[:space:]]--nbft[[:space:]]/q1;$q0' \ | ||
| || NBFT_SUPPORTED=1 | ||
|
|
||
| if [ -e /tmp/nvmf-fc-auto ] && [ "$NVMF_HOSTNQN_OK" ] \ | ||
| && [ -f /sys/class/fc/fc_udev_device/nvme_discovery ]; then | ||
| # prio 1: cmdline override "rd.nvmf.discovery=fc,auto" | ||
| echo add > /sys/class/fc/fc_udev_device/nvme_discovery | ||
| exit 0 | ||
| fi | ||
| if [ "$NBFT_SUPPORTED" ] && [ -e /tmp/valid_nbft_entry_found ]; then | ||
| # prio 2: NBFT | ||
| /usr/sbin/nvme connect-all --nbft | ||
| exit 0 | ||
| fi | ||
| if [ -f /etc/nvme/discovery.conf ] || [ -f /etc/nvme/config.json ] \ | ||
| && [ "$NVMF_HOSTNQN_OK" ]; then | ||
| # prio 3: configuration from initrd and/or kernel command line | ||
| # We can get here even if "rd.nvmf.nonbft" was given, thus use --no-nbft | ||
| if [ "$NBFT_SUPPORTED" ]; then | ||
| /usr/sbin/nvme connect-all --no-nbft | ||
| else | ||
| /usr/sbin/nvme connect-all | ||
| fi | ||
| exit 0 | ||
| fi | ||
| if [ "$NVMF_HOSTNQN_OK" ] \ | ||
| && [ -f /sys/class/fc/fc_udev_device/nvme_discovery ]; then | ||
| # prio 4: no discovery entries, try NVMeoFC autoconnect | ||
| echo add > /sys/class/fc/fc_udev_device/nvme_discovery | ||
| fi | ||
| exit 0 | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This checks only for regular files. Is that intentional?
You could check for
-e(existence) instead.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ok.Actually, no. Technically, this check serves to avoid a case where no
NBFT*file exists, in which case$fwould equal/sys/firmware/acpi/tables/NBFT*(as we don't usenullglob). But in the (extremely unlikely) case that a directory entryNBFT*existed in sysfs, and was not a regular file, we'd definitely want to skip it, too.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Right, folders, I didn't think of that - but It might be symlink or other file-like type as well f.e.; but if only regular files are expected/accepted, I'm fine with that.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, only regular files should be accepted.
Note that
[(akatest) dereferences symlinks for all flags except-hand-L. Thus if/sys/firmware/acpi/tables/NBFT*was a symlink to some existing regular file, this test wouldn't skip it, which looks wrong. But this case would indicate a severely broken kernel. I believe we can ignore it. In the worst case, we'd include the NBFT code in the initramfs on a broken system.