udevadm: introduce 'wait' command #22872

yuwata · 2022-03-25T20:44:56Z

yuwata · 2022-03-26T05:28:33Z

TODO:

support syspath
check initialized, and add --initialized=BOOL
add --removed

yuwata · 2022-03-27T15:02:38Z

TODO:

* support syspath

* check initialized, and add --initialized=BOOL

* add --removed

done.

poettering

so, the concept is great, but i am very sure we shouldn#t use inotify for this, but use proper sd-event apis, i.e. the device monitor.

i.e. more along the lines of device_wait_for_devlink().

i.e. it is crucial for this tool to be useful that the complete udev ruleset ran for the device, i.e. we should only report ready once the udev db exists.

src/libsystemd/sd-device/sd-device.c

src/udev/udevadm-wait.c

yuwata · 2022-03-28T20:09:39Z

@poettering Thank you for the review. All comments are addressed. PTAL.

src/libsystemd/sd-device/sd-device.c

src/udev/udevadm-wait.c

yuwata · 2022-03-29T04:19:27Z

@poettering Thank you for the review. Hopefully, all comments are addressed. PTAL.

yuwata · 2022-03-30T12:24:19Z

The CI failures are by the tests for homed or dissect, should not be related.

poettering

looks really good

src/libsystemd/sd-device/sd-device.c

src/udev/udev-node.c

src/udev/udevd.c

src/libsystemd/sd-device/sd-device.c

src/udev/udevadm-wait.c

poettering · 2022-03-30T21:08:50Z

test/units/testsuite-64.sh

    helper_check_device_symlinks "/dev/disk"
    # Reconnect the iSCSI devices and check if everything get detected correctly
    iscsiadm --mode discoverydb --type sendtargets --portal "$target_ip" --discover
    iscsiadm --mode node --targetname "$target_name" --portal "$target_ip:$target_port" --login
-    udevadm settle
+    udevadm wait --settle --timeout=30 "${expected_symlinks[@]}"


do we really need --settle on these?

Yes. Not only 'add' but 'change' event may be already queued for the devices.

poettering · 2022-03-30T21:22:10Z

Another candidate for sd_device_open() is src/gpt-auto-generator/gpt-auto-generator.c's open_parent_block_device()...

yuwata · 2022-03-30T23:00:09Z

@poettering Thank you for the review. Most comments are addressed. PTAL.

Another candidate for sd_device_open() is src/gpt-auto-generator/gpt-auto-generator.c's open_parent_block_device()...

Let's update it in later PR.

poettering

lgtm

src/libsystemd/sd-device/sd-device.c

and sd_device_new_from_path() which takes devname or syspath.

Prompted by systemd#22717 (comment). The new command 'udevadm wait' waits for device or device symlink being created. This may be useful to wait for a device is processed by udevd after e.g. formatting or partitioning the device.

As it is defined at linux/fs.h.

And move it from loop-util.[ch] -> fd-util.[ch]

We usually open() device node obtained by sd_device_get_devname(). However, the device node corresponds to the sd-device object may be already removed, and another device node with the same path may be created, hence an unexpected device may be opened. The sd_device_open() opens device node, and checks the devnum and diskseq of opened devnum, to avoid the above possibility. Prompted by systemd#22906 (comment).

yuwata · 2022-04-01T07:22:52Z

@poettering Thank you. The above two comments are addressed. Upgrading the green label.

yuwata added udev tests labels Mar 25, 2022

yuwata force-pushed the udevadm-wait branch from 81d6896 to 94a8d76 Compare March 25, 2022 20:55

bluca approved these changes Mar 26, 2022

View reviewed changes

bluca requested review from mrc0mmand and poettering March 26, 2022 10:50

bluca added the please-review label Mar 26, 2022

yuwata force-pushed the udevadm-wait branch from 94a8d76 to 9e17acc Compare March 27, 2022 15:02

yuwata force-pushed the udevadm-wait branch from 9e17acc to 958118d Compare March 27, 2022 16:51

poettering requested changes Mar 28, 2022

View reviewed changes

src/libsystemd/sd-device/sd-device.c Outdated Show resolved Hide resolved

src/udev/udevadm-wait.c Outdated Show resolved Hide resolved

src/udev/udevadm-wait.c Outdated Show resolved Hide resolved

src/udev/udevadm-wait.c Outdated Show resolved Hide resolved

poettering added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed please-review labels Mar 28, 2022

yuwata force-pushed the udevadm-wait branch from 958118d to ca77ca4 Compare March 28, 2022 20:09

yuwata added please-review and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Mar 28, 2022

yuwata force-pushed the udevadm-wait branch from ca77ca4 to fb6bf75 Compare March 28, 2022 20:42

poettering requested changes Mar 28, 2022

View reviewed changes

src/libsystemd/sd-device/sd-device.c Outdated Show resolved Hide resolved

src/udev/udevadm-wait.c Outdated Show resolved Hide resolved

src/udev/udevadm-wait.c Show resolved Hide resolved

src/udev/udevadm-wait.c Outdated Show resolved Hide resolved

poettering added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed please-review labels Mar 28, 2022

yuwata force-pushed the udevadm-wait branch from fb6bf75 to 4607e3d Compare March 29, 2022 04:17

yuwata added please-review and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Mar 29, 2022

yuwata force-pushed the udevadm-wait branch from a16418c to 4736270 Compare March 29, 2022 06:06

yuwata added this to the v251 milestone Mar 29, 2022

yuwata force-pushed the udevadm-wait branch from 4736270 to 9425488 Compare March 30, 2022 20:09

yuwata mentioned this pull request Mar 30, 2022

RFE: provide a helper for opening /dev/XYZ in a race-free way #22906

Closed

poettering requested changes Mar 30, 2022

View reviewed changes

poettering added reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks and removed please-review labels Mar 30, 2022

yuwata force-pushed the udevadm-wait branch 2 times, most recently from 50a6c37 to 148fb2f Compare March 30, 2022 22:26

yuwata added please-review and removed reviewed/needs-rework 🔨 PR has been reviewed and needs another round of reworks labels Mar 30, 2022

yuwata force-pushed the udevadm-wait branch from 148fb2f to ca3c205 Compare March 31, 2022 00:26

poettering approved these changes Mar 31, 2022

View reviewed changes

src/libsystemd/sd-device/sd-device.c Show resolved Hide resolved

src/libsystemd/sd-device/sd-device.c Show resolved Hide resolved

poettering added good-to-merge/with-minor-suggestions and removed please-review labels Mar 31, 2022

yuwata added 9 commits April 1, 2022 15:03

sd-device: introduce sd_device_new_from_devname()

e418f96

and sd_device_new_from_path() which takes devname or syspath.

test: add more tests for sd_device_new_from_xxx()

209294a

udevadm: introduce new 'wait' command

aa2b0d8

Prompted by systemd#22717 (comment). The new command 'udevadm wait' waits for device or device symlink being created. This may be useful to wait for a device is processed by udevd after e.g. formatting or partitioning the device.

test: replace helper_wait_for_dev() with 'udevadm wait'

e529abe

basic/missing: move BLKGETDISKSEQ to missing_fs.h

2076612

As it is defined at linux/fs.h.

fd-util: rename loop_get_diskseq() -> fd_get_diskseq()

7e93a65

And move it from loop-util.[ch] -> fd-util.[ch]

test: add test for sd_device_open()

9534d6c

udev: use sd_device_open() where appropriate

78e278a

yuwata force-pushed the udevadm-wait branch from ca3c205 to 78e278a Compare April 1, 2022 06:21

yuwata added good-to-merge/waiting-for-ci 👍 PR is good to merge, but CI hasn't passed at time of review. Please merge if you see CI has passed and removed good-to-merge/with-minor-suggestions labels Apr 1, 2022

yuwata merged commit b8529cf into systemd:main Apr 1, 2022

yuwata deleted the udevadm-wait branch April 1, 2022 09:41

mrc0mmand mentioned this pull request Jul 19, 2022

Backport udevadm wait & udevadm lock stuff redhat-plumbers/systemd-rhel9#96

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

udevadm: introduce 'wait' command #22872

udevadm: introduce 'wait' command #22872

yuwata commented Mar 25, 2022

yuwata commented Mar 26, 2022

yuwata commented Mar 27, 2022

poettering left a comment

yuwata commented Mar 28, 2022

yuwata commented Mar 29, 2022

yuwata commented Mar 30, 2022

poettering left a comment

poettering Mar 30, 2022

yuwata Mar 30, 2022

poettering commented Mar 30, 2022

yuwata commented Mar 30, 2022

poettering left a comment

yuwata commented Apr 1, 2022

udevadm: introduce 'wait' command #22872

udevadm: introduce 'wait' command #22872

Conversation

yuwata commented Mar 25, 2022

yuwata commented Mar 26, 2022

yuwata commented Mar 27, 2022

poettering left a comment

Choose a reason for hiding this comment

yuwata commented Mar 28, 2022

yuwata commented Mar 29, 2022

yuwata commented Mar 30, 2022

poettering left a comment

Choose a reason for hiding this comment

poettering Mar 30, 2022

Choose a reason for hiding this comment

yuwata Mar 30, 2022

Choose a reason for hiding this comment

poettering commented Mar 30, 2022

yuwata commented Mar 30, 2022

poettering left a comment

Choose a reason for hiding this comment

yuwata commented Apr 1, 2022