Skip to content

Commit 4eb3d71

Browse files
marmijomarmijo
committed
overlay.d: add 25rhcos-azure-udev overlay
Add an overlay to install udev rules that support certain VM types that present managed disks as NVMe devices instead of traditional SCSI. These rules are provded by the azure-vm-utils package which will be included in EL10[1], this overlay can be dropped at that time. [1] https://issues.redhat.com/browse/RHEL-73904
1 parent 566f7b3 commit 4eb3d71

File tree

5 files changed

+87
-0
lines changed

5 files changed

+87
-0
lines changed

‎manifest-el9-shared.yaml

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ remove-from-packages:
88
- - zram-generator
99
- "/usr/lib/systemd/zram-generator.conf"
1010

11+
ostree-layers:
12+
- overlay/25rhcos-azure-udev
13+
1114
postprocess:
1215
- |
1316
#!/usr/bin/bash

‎overlay.d/25rhcos-azure-udev/statoverride

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Config file for overriding permission bits on overlay files/dirs
2+
# Format: =<file mode in decimal> <absolute path to a file or directory>

‎overlay.d/25rhcos-azure-udev/usr/lib/dracut/modules.d/25rhcos-azure-udev/module-setup.sh

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#!/bin/bash
2+
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
3+
# ex: ts=8 sw=4 sts=4 et filetype=sh
4+
5+
# These udev rules support certain VM types that present managed disks as
6+
# NVMe devices instead of traditional SCSI devices (e.g. Standard_M16bds_v3,
7+
# Standard_M16bs_v3, Standard_L8s_v4). The rules allow the Azure Disk CSI
8+
# driver to perform LUN-based disk detection when mounting these NVMe disks.
9+
# The azure-vm-utils package provides these udev rules[1], but it wont be added
10+
# until EL10 [2]. This can be dropped when moving to EL10, provided the
11+
# package is included at that time.
12+
#
13+
# [1] https://github.com/Azure/azure-vm-utils/blob/9c596916b6774f24420dac0ee7a72a6c9ddb5060/udev/80-azure-disk.rules
14+
# [2] https://issues.redhat.com/browse/RHEL-73904
15+
16+
install() {
17+
inst_rules /usr/lib/udev/rules.d/80-azure-disk.rules
18+
}

‎overlay.d/25rhcos-azure-udev/usr/lib/udev/rules.d/80-azure-disk.rules

+50
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
ACTION!="add|change", GOTO="azure_disk_end"
2+
SUBSYSTEM!="block", GOTO="azure_disk_end"
3+
4+
KERNEL=="nvme*", ATTRS{nsid}=="?*", ENV{ID_MODEL}=="Microsoft NVMe Direct Disk", GOTO="azure_disk_nvme_direct_v1"
5+
KERNEL=="nvme*", ATTRS{nsid}=="?*", ENV{ID_MODEL}=="Microsoft NVMe Direct Disk v2", GOTO="azure_disk_nvme_direct_v2"
6+
KERNEL=="nvme*", ATTRS{nsid}=="?*", ENV{ID_MODEL}=="MSFT NVMe Accelerator v1.0", GOTO="azure_disk_nvme_remote_v1"
7+
ENV{ID_VENDOR}=="Msft", ENV{ID_MODEL}=="Virtual_Disk", GOTO="azure_disk_scsi"
8+
GOTO="azure_disk_end"
9+
10+
LABEL="azure_disk_scsi"
11+
ATTRS{device_id}=="?00000000-0000-*", ENV{AZURE_DISK_TYPE}="os", GOTO="azure_disk_symlink"
12+
ENV{DEVTYPE}=="partition", PROGRAM="/bin/sh -c 'readlink /sys/class/block/%k/../device|cut -d: -f4'", ENV{AZURE_DISK_LUN}="$result"
13+
ENV{DEVTYPE}=="disk", PROGRAM="/bin/sh -c 'readlink /sys/class/block/%k/device|cut -d: -f4'", ENV{AZURE_DISK_LUN}="$result"
14+
ATTRS{device_id}=="{f8b3781a-1e82-4818-a1c3-63d806ec15bb}", ENV{AZURE_DISK_LUN}=="0", ENV{AZURE_DISK_TYPE}="os", ENV{AZURE_DISK_LUN}="", GOTO="azure_disk_symlink"
15+
ATTRS{device_id}=="{f8b3781b-1e82-4818-a1c3-63d806ec15bb}", ENV{AZURE_DISK_TYPE}="data", GOTO="azure_disk_symlink"
16+
ATTRS{device_id}=="{f8b3781c-1e82-4818-a1c3-63d806ec15bb}", ENV{AZURE_DISK_TYPE}="data", GOTO="azure_disk_symlink"
17+
ATTRS{device_id}=="{f8b3781d-1e82-4818-a1c3-63d806ec15bb}", ENV{AZURE_DISK_TYPE}="data", GOTO="azure_disk_symlink"
18+
19+
# Use "resource" type for local SCSI because some VM skus offer NVMe local disks in addition to a SCSI resource disk, e.g. LSv3 family.
20+
# This logic is already in walinuxagent rules but we duplicate it here to avoid an unnecessary dependency for anyone requiring it.
21+
ATTRS{device_id}=="?00000000-0001-*", ENV{AZURE_DISK_TYPE}="resource", ENV{AZURE_DISK_LUN}="", GOTO="azure_disk_symlink"
22+
ATTRS{device_id}=="{f8b3781a-1e82-4818-a1c3-63d806ec15bb}", ENV{AZURE_DISK_LUN}=="1", ENV{AZURE_DISK_TYPE}="resource", ENV{AZURE_DISK_LUN}="", GOTO="azure_disk_symlink"
23+
GOTO="azure_disk_end"
24+
25+
LABEL="azure_disk_nvme_direct_v1"
26+
LABEL="azure_disk_nvme_direct_v2"
27+
ATTRS{nsid}=="?*", ENV{AZURE_DISK_TYPE}="local", ENV{AZURE_DISK_SERIAL}="$env{ID_SERIAL_SHORT}"
28+
GOTO="azure_disk_nvme_id"
29+
30+
LABEL="azure_disk_nvme_remote_v1"
31+
ATTRS{nsid}=="1", ENV{AZURE_DISK_TYPE}="os", GOTO="azure_disk_nvme_id"
32+
ATTRS{nsid}=="?*", ENV{AZURE_DISK_TYPE}="data", PROGRAM="/bin/sh -ec 'echo $$((%s{nsid}-2))'", ENV{AZURE_DISK_LUN}="$result"
33+
34+
LABEL="azure_disk_nvme_id"
35+
ATTRS{nsid}=="?*", IMPORT{program}="/usr/sbin/azure-nvme-id --udev"
36+
37+
LABEL="azure_disk_symlink"
38+
# systemd v254 ships an updated 60-persistent-storage.rules that would allow
39+
# these to be deduplicated using $env{.PART_SUFFIX}
40+
ENV{DEVTYPE}=="disk", ENV{AZURE_DISK_TYPE}=="os|resource|root", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}"
41+
ENV{DEVTYPE}=="disk", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_INDEX}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-index/$env{AZURE_DISK_INDEX}"
42+
ENV{DEVTYPE}=="disk", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_LUN}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-lun/$env{AZURE_DISK_LUN}"
43+
ENV{DEVTYPE}=="disk", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_NAME}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-name/$env{AZURE_DISK_NAME}"
44+
ENV{DEVTYPE}=="disk", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_SERIAL}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-serial/$env{AZURE_DISK_SERIAL}"
45+
ENV{DEVTYPE}=="partition", ENV{AZURE_DISK_TYPE}=="os|resource|root", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}-part%n"
46+
ENV{DEVTYPE}=="partition", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_INDEX}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-index/$env{AZURE_DISK_INDEX}-part%n"
47+
ENV{DEVTYPE}=="partition", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_LUN}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-lun/$env{AZURE_DISK_LUN}-part%n"
48+
ENV{DEVTYPE}=="partition", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_NAME}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-name/$env{AZURE_DISK_NAME}-part%n"
49+
ENV{DEVTYPE}=="partition", ENV{AZURE_DISK_TYPE}=="?*", ENV{AZURE_DISK_SERIAL}=="?*", SYMLINK+="disk/azure/$env{AZURE_DISK_TYPE}/by-serial/$env{AZURE_DISK_SERIAL}-part%n"
50+
LABEL="azure_disk_end"

‎overlay.d/README.md

+14
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,20 @@ and handling in 20-chrony and chrony-helper using the defaults
3838
lands in downstream packages. See upstream thread:
3939
https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-dev/2020/05/msg00022.html
4040

41+
25rhcos-azure-udev
42+
------------------
43+
44+
These udev rules support certain VM types that present managed disks as
45+
NVMe devices instead of traditional SCSI devices (e.g. Standard_M16bds_v3,
46+
Standard_M16bs_v3, Standard_L8s_v4). The rules allow the Azure Disk CSI
47+
driver to perform LUN-based disk detection when mounting these NVMe disks.
48+
The azure-vm-utils package provides these udev rules[1], but it wont be added
49+
until EL10 [1]. This can be dropped when moving to EL10, provided the
50+
package is included at that time.
51+
52+
[1] https://github.com/Azure/azure-vm-utils/blob/9c596916b6774f24420dac0ee7a72a6c9ddb5060/udev/80-azure-disk.rules
53+
[2] https://issues.redhat.com/browse/RHEL-73904
54+
4155
30rhcos-nvme-compat-udev
4256
------------------------
4357

0 commit comments

Comments
 (0)