From ca0cef28691be7ea22274c2fa7d95a2725da1ba5 Mon Sep 17 00:00:00 2001

From: Yu Watanabe <watanabe.yu+github@gmail.com>

Date: Sun, 24 Nov 2024 13:19:27 +0900

Subject: [PATCH 1/2] core/device: ignore ID_PROCESSING udev property on

 enumerate

This partially reverts the commit 405be62f05d76f1845f347737b5972158c79dd3e

"tree-wide: refuse enumerated device with ID_PROCESSING=1".

Otherwise, when systemd-udev-trigger.service is started just before

daemon-reexec, which can be easily happen on update, then udev database

files for many devices may have ID_PROCESSING=1 property, thus devices may

not enumerated on daemon-reexec. That causes many units especially mount

units deactivated after daemon-reexec.

Fixes #35329.

---

 src/core/device.c | 3 ---

 1 file changed, 3 deletions(-)

diff --git a/src/core/device.c b/src/core/device.c

index 03a730f6240c1..a8921e91c344e 100644

--- a/src/core/device.c

+++ b/src/core/device.c

@@ -1048,9 +1048,6 @@ static void device_enumerate(Manager *m) {

                 _cleanup_set_free_ Set *ready_units = NULL, *not_ready_units = NULL;

                 Device *d;

-                if (device_is_processed(dev) <= 0)

-                        continue;

-

                 if (device_setup_units(m, dev, &ready_units, &not_ready_units) < 0)

                         continue;

From 388151b72103c10d63bac1e845d6a151619990ae Mon Sep 17 00:00:00 2001

From: Yu Watanabe <watanabe.yu+github@gmail.com>

Date: Sun, 24 Nov 2024 13:57:37 +0900

Subject: [PATCH 2/2] test: add reproducer for issue #35329

Without the previous commit, the test case will fail.

---

 .../TEST-17-UDEV.device_is_processing.sh      | 65 +++++++++++++++++++

 1 file changed, 65 insertions(+)

 create mode 100755 test/units/TEST-17-UDEV.device_is_processing.sh

diff --git a/test/units/TEST-17-UDEV.device_is_processing.sh b/test/units/TEST-17-UDEV.device_is_processing.sh

new file mode 100755

index 0000000000000..9b39b43238e44

--- /dev/null

+++ b/test/units/TEST-17-UDEV.device_is_processing.sh

@@ -0,0 +1,65 @@

+#!/usr/bin/env bash

+# SPDX-License-Identifier: LGPL-2.1-or-later

+set -ex

+set -o pipefail

+

+# This is a reproducer of issue #35329,

+# which is a regression caused by 405be62f05d76f1845f347737b5972158c79dd3e.

+

+IFNAME=udevtestnetif

+

+udevadm settle

+

+mkdir -p /run/udev/udev.conf.d/

+cat >/run/udev/udev.conf.d/timeout.conf <

+event_timeout=1h

+EOF

+

+mkdir -p /run/udev/rules.d/

+cat >/run/udev/rules.d/99-testsuite.rules <

+SUBSYSTEM=="net", ACTION=="change", KERNEL=="${IFNAME}", OPTIONS="log_level=debug", RUN+="/usr/bin/sleep 1000"

+EOF

+

+systemctl restart systemd-udevd.service

+

+ip link add "$IFNAME" type dummy

+IFINDEX=$(ip -json link show "$IFNAME" | jq '.[].ifindex')

+udevadm wait --timeout 10 "/sys/class/net/${IFNAME}"

+# Check if the database file is created.

+[[ -e "/run/udev/data/n${IFINDEX}" ]]

+

+systemd-run \

+    -p After="sys-subsystem-net-devices-${IFNAME}.device" \

+    -p BindsTo="sys-subsystem-net-devices-${IFNAME}.device" \

+    -u testsleep.service \

+    sleep 1h

+

+timeout 10 bash -c 'until systemctl is-active testsleep.service; do sleep .5; done'

+

+udevadm trigger "/sys/class/net/${IFNAME}"

+timeout 30 bash -c "until grep -F 'ID_PROCESSING=1' /run/udev/data/n${IFINDEX}; do sleep .5; done"

+

+for _ in {1..3}; do

+    systemctl daemon-reexec

+    systemctl is-active testsleep.service

+done

+

+for _ in {1..3}; do

+    systemctl daemon-reload

+    systemctl is-active testsleep.service

+done

+

+# Check if the reexec and reload have finished during processing the event.

+grep -F 'ID_PROCESSING=1' "/run/udev/data/n${IFINDEX}"

+

+# cleanup

+systemctl stop testsleep.service

+rm -f /run/udev/udev.conf.d/timeout.conf

+rm -f /run/udev/rules.d/99-testsuite.rules

+# Forcibly kills sleep command invoked by the udev rule before restarting,

+# otherwise systemctl restart below will takes longer.

+killall -KILL sleep

+systemctl restart systemd-udevd.service

+ip link del "$IFNAME"

+

+exit 0