From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-ej1-f43.google.com (mail-ej1-f43.google.com [209.85.218.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0A7935EE91 for ; Fri, 1 Mar 2024 22:40:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.43 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709332852; cv=none; b=DZkPODtm6afDTR3EkOY1Bv7FlvGYvSfMIXQjTgcVuGJEP0IilLCEO/rTUA3uKMWrk7CoWH1BLBwHyVIsXqCIYYBZppu6nZH9LPHtjfhDqZVgouLVe//hSW7nkjVnB5OTi0wyU8iBYU0o26ZJv7xahS2v036AT+sSi88498AU75k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709332852; c=relaxed/simple; bh=+VjIySEqs5Z2bxfkZzP3umO4/YDX82hwzmKSRMSRzs8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=exS8Neva7rnDtX2ChotIQCuc4iQ/NAyBSGMJlSqIURcsyCy1m3Tjv9zSDXs54ddxIzrhtY4ofL6I1bYnKKW87OsBRODEEIsyhGuG2nb17CTWF/0lNdz9cK7emcs//pcoy7wKP6spvfKq+HrrUI1R8Sq64q+H8y51BxBx/B/jXV4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com; spf=pass smtp.mailfrom=suse.com; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b=UiLDXmP8; arc=none smtp.client-ip=209.85.218.43 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=suse.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=suse.com header.i=@suse.com header.b="UiLDXmP8" Received: by mail-ej1-f43.google.com with SMTP id a640c23a62f3a-a44d4519e7eso4146766b.3 for ; Fri, 01 Mar 2024 14:40:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1709332848; x=1709937648; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=rp9bSioWnoo0g2kZ/DumjS1G4VPkVqOv4pb9vfLKQXE=; b=UiLDXmP8g687KweTjZEuKnQHYu/242N+h/tj58xNcznn0CfRt2/rP2LOqn8e5FzcLp yxR+BBwOui6wvbFEK/84fUwQ1iROqc6KDzHTQL/1M2Xo/Am3JFf5uzzGaXKfxW6f73sD cln5h56OyFamk6VUdjyv48Tl+cfDgyegnWJEhc6fQoSZNGXvhFdXNuSXxTyR2D+bqzMm X96f4/UcRJv1REoVOiCMCWId5iKVKbxFg8aSLDsnXkXM8nNQefpBapiEGnf1qPJIoKhU dKYXGZJ8GC9n19Jos2MguHtKiFJqbaRIc6U3Z7zcVRpVHckwSy5GV8nuMjHYb/ipd5BV Q6IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709332848; x=1709937648; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=rp9bSioWnoo0g2kZ/DumjS1G4VPkVqOv4pb9vfLKQXE=; b=XtI3Z7ynKG9P2VlYXs1GtUxLv5FSLsp0zNtz+UHQ/AD0BIVz+AbHsps8+/jTFRF9sy Q4Jl08AeBJB2vKc4dD8OZ3+SdjJ46wLqDDrSW+Vkx3rj8N/E6Yj0T9XQ1QO+gCKCUl6S 302zoZ1Z+H0Om0TKBqQGMyrYTh1Jy72EY1XnBdbn3Izg3XSYMpgm1mIn1kKJnQpqntcS 0AUaZorpIrC7ci3OOySKeOaTe5fpZfpGXhAR+DuDJS+F2CQUnDLpUlqOaOe3uAbyLSUS g83orRtel9t0pCoWhHYFSGJwZWpKDQch60dHkXSAuOsXL4vqwHbo1GTDAR9KEp++6Woe 2y+A== X-Gm-Message-State: AOJu0Yz9jVhW0OEtXJNOJczwsilr71SexND4aV4YqaetOsbDmdnuBoeV GWvuKpREYHSQVS9OYRKEsUC1IETvQ1O4UQPWU1QGAJGTjx/CvUq148pvGa53Vjg= X-Google-Smtp-Source: AGHT+IG6nXTMKfbMTuqrqpcqjnXoTJKydV7ClN57s4yN1iCeIFmuI7VD4dCRG0FR57FRY+EYJKxirw== X-Received: by 2002:a17:906:a391:b0:a43:5dbc:4bfc with SMTP id k17-20020a170906a39100b00a435dbc4bfcmr2044772ejz.1.1709332848576; Fri, 01 Mar 2024 14:40:48 -0800 (PST) Received: from localhost (dslb-002-202-118-224.002.202.pools.vodafone-ip.de. [2.202.118.224]) by smtp.gmail.com with UTF8SMTPSA id o7-20020a170906288700b00a42ed7421b8sm2121795ejd.93.2024.03.01.14.40.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 01 Mar 2024 14:40:48 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Peter Rajnoha , Zdenek Kabelac , Benjamin Marzinski , David Teigland Cc: linux-lvm@lists.linux.dev, dm-devel@lists.linux.dev, Martin Wilck , Hannes Reinecke Subject: [RFC PATCH 5/7] dm udev rules: don't export and save DM_SUSPENDED Date: Fri, 1 Mar 2024 23:40:09 +0100 Message-ID: <20240301224011.11117-6-mwilck@suse.com> X-Mailer: git-send-email 2.43.2 In-Reply-To: <20240301224011.11117-1-mwilck@suse.com> References: <20240301224011.11117-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: linux-lvm@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit DM_SUSPENDED is a device-mapper internal flag, which is not intended to be used by other rules, and which is determined by 10-dm.rules from sysfs for every uevent. Rename it to ".DM_SUSPENDED", so that it won't be saved in the udev database. Known consumers of DM_SUSPENDED are 66-kpartx.rules (from multipath-tools) and 99-systemd.rules (from systemd). These will have to be adapted. 11-dm-mpath.rules will be changed to use .DM_SUSPENDED. Signed-off-by: Martin Wilck --- udev/10-dm.rules.in | 15 +++++++++------ udev/12-dm-permissions.rules | 2 +- udev/13-dm-disk.rules.in | 4 ++-- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/udev/10-dm.rules.in b/udev/10-dm.rules.in index ef36209..d30f663 100644 --- a/udev/10-dm.rules.in +++ b/udev/10-dm.rules.in @@ -11,7 +11,7 @@ # for use in later rules: # DM_NAME - actual DM device's name # DM_UUID - UUID set for DM device (blank if not specified) -# DM_SUSPENDED - suspended state of DM device (0 or 1) +# .DM_SUSPENDED - suspended state of DM device (0 or 1) # DM_UDEV_RULES_VSN - DM udev rules version # # These rules cover only basic device-mapper functionality in udev. @@ -114,15 +114,18 @@ LABEL="dm_no_coldplug" # The "suspended" item was added even later (kernels >= 2.6.31), # so we also have to call dmsetup if the kernel version used # is in between these releases. -TEST=="dm", ENV{DM_NAME}="$attr{dm/name}", ENV{DM_UUID}="$attr{dm/uuid}", ENV{DM_SUSPENDED}="$attr{dm/suspended}" +TEST=="dm", ENV{DM_NAME}="$attr{dm/name}", ENV{DM_UUID}="$attr{dm/uuid}", ENV{.DM_SUSPENDED}="$attr{dm/suspended}" TEST!="dm", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o name,uuid,suspended" -ENV{DM_SUSPENDED}!="?*", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o suspended" +ENV{.DM_SUSPENDED}=="?*", GOTO="dm_suspended_set" +TEST=="dm", IMPORT{program}="(DM_EXEC)/dmsetup info -j %M -m %m -c --nameprefixes --noheadings --rows -o suspended" # dmsetup tool provides suspended state information in textual # form with values "Suspended"/"Active". We translate it to # 0/1 respectively to be consistent with sysfs values. -ENV{DM_SUSPENDED}=="Active", ENV{DM_SUSPENDED}="0" -ENV{DM_SUSPENDED}=="Suspended", ENV{DM_SUSPENDED}="1" +ENV{DM_SUSPENDED}=="Active", ENV{.DM_SUSPENDED}="0" +ENV{DM_SUSPENDED}=="Suspended", ENV{.DM_SUSPENDED}="1" +ENV{DM_SUSPENDED}="" +LABEL="dm_suspended_set" # This variable provides a reliable way to check that device-mapper # rules were installed. It means that all needed variables are set @@ -140,7 +143,7 @@ ENV{DM_UDEV_DISABLE_DM_RULES_FLAG}!="1", ENV{DM_NAME}=="?*", SYMLINK+="(DM_DIR)/ # Avoid processing and scanning a DM device in the other (foreign) # rules if it is in suspended state. However, we still keep 'disk' # and 'DM subsystem' related rules enabled in this case. -ENV{DM_SUSPENDED}=="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1" +ENV{.DM_SUSPENDED}=="1", ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}="1" GOTO="dm_end" diff --git a/udev/12-dm-permissions.rules b/udev/12-dm-permissions.rules index a9d4c32..6a69d2f 100644 --- a/udev/12-dm-permissions.rules +++ b/udev/12-dm-permissions.rules @@ -14,7 +14,7 @@ # DM_UDEV_RULES_VSN - DM udev rules version # DM_NAME - actual DM device's name # DM_UUID - UUID set for DM device (blank if not specified) -# DM_SUSPENDED - suspended state of DM device (0 or 1) +# .DM_SUSPENDED - suspended state of DM device (0 or 1) # DM_LV_NAME - logical volume name (not set if LVM device not present) # DM_VG_NAME - volume group name (not set if LVM device not present) # DM_LV_LAYER - logical volume layer (not set if LVM device not present) diff --git a/udev/13-dm-disk.rules.in b/udev/13-dm-disk.rules.in index eaad972..cb2ce2d 100644 --- a/udev/13-dm-disk.rules.in +++ b/udev/13-dm-disk.rules.in @@ -17,9 +17,9 @@ ENV{DM_UDEV_DISABLE_DISK_RULES_FLAG}=="1", GOTO="dm_end" SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}" ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}" -ENV{DM_SUSPENDED}=="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="dm_import" +ENV{.DM_SUSPENDED}=="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="dm_import" ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="dm_import" -ENV{DM_SUSPENDED}=="1", GOTO="dm_end" +ENV{.DM_SUSPENDED}=="1", GOTO="dm_end" ENV{DM_NOSCAN}=="1", GOTO="dm_watch" (BLKID_RULE) -- 2.43.2