From patchwork Mon Feb 5 12:46:33 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545459 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wm1-f49.google.com (mail-wm1-f49.google.com [209.85.128.49]) (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 E2D0522F11 for ; Mon, 5 Feb 2024 12:46:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137211; cv=none; b=chMnYE4PZYBQ0edHtgjhgzjVKXpeuMvknMKUh1uofvTIs0Vxd0E4XD6ftC67PB0WjbFCp41WI4Q7taUDIKTvJopN9V7KoMI0pQoKkrBkQGDufysojub44oCx6WFVR0AxJsnvLlafoUOVaNybeoNToHZJrNqnNqJX1Ra3PmtlODM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137211; c=relaxed/simple; bh=ldSQ/NSMgM2HZpZbAR9qbsuf81P8HLoTD1w+oSeT06s=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YrmteCjiCQsiY43LuH8Tu8di2XZT0+2IOTnaUDmDJqKemArdTnn1bOBlP+yaFQa+RCXFK7EVEsKYmtwbWFNUFaMswY4xxu1nPJZ3kSj+f1mchnU82FW36WU1nvIG0zX1f/jNlwyj/7aX/m2BX9giLDM1YNLX4QBOewT/uBGSlmQ= 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=WBqEsil8; arc=none smtp.client-ip=209.85.128.49 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="WBqEsil8" Received: by mail-wm1-f49.google.com with SMTP id 5b1f17b1804b1-40fc549ab9bso27092095e9.0 for ; Mon, 05 Feb 2024 04:46:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137207; x=1707742007; 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=UlwHtHHIJe5vSwHMIayHU8mS2RiUdCohkN/ZANC9VA8=; b=WBqEsil8814XmzUNX2E2HTcvuEySLNhAFYtGuQq3AAne/3zeEwmReIkWOzobnfGOHy ZSrcxJT+wiWgwmP7X6Q1a1sL1yFZA72kUQaJH2h3UNYtkELAV2kBP7jkgTWZ6c/wcq5u MRuJwft1iLbrXe1fiaiY3usfwI2FdLN2tP2cTUQ9s/MrMrSfnLw4kxSU6+rkwXLV+zgB 5+DkuSCcAi4+pw9xOnxFTnHoPwYt/4jBTkmjOcZNbTCitSgHEQr4e3bifiCSOPcROPSD YdWTL2X1wHTGGrA6ajbrMbfS4gWYzOfVhJ538guPaXNccxGAFalX0vydszGKgOW5TctH 9fOA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137207; x=1707742007; 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=UlwHtHHIJe5vSwHMIayHU8mS2RiUdCohkN/ZANC9VA8=; b=iy1/ErEMmk36Xp9SJk7caJtfhi78eGiCzD0Uo4tW942lXGh9atwvW6JJccXPGja6Ti V/INugQqXH0F2Yzt5oIJaxji1gbUnBUS+RpilhdeaEDsIiHq88OVpB2YxJIVCEOOE6xw pjGmCU2J2zT2XT4J0bUf5vjWR+j/FKE7aSV7Zs0z4EU2fZW/UwrQdyMkm5qpizrlmA5O K0WY7Kch1g7L3yTYvOxtsWv7wa/GPtOw6oHlV6NtMFXVzsp0xv4hBGRWGPUKJIQTYOHm WwmmyRNqTRgOwCv0XjRClL+3GCu6WTPEOrj85rraw/Idq841yzyr+A90uo5hnOj5/LqF zS/Q== X-Gm-Message-State: AOJu0YyTXlb1evLkILeVojKyWGPJAFtn6q6ieeqCtsT10zaBLRGi0RNL mhAfc0nDmxzvyEAp34WAV5I3FhPMJfTkuTqwiyQML4fCS9pS0KG9Lzxfeif/MAI= X-Google-Smtp-Source: AGHT+IE7W2AflU4qzeOTmDYCD4OJWKQWHhh8HJtTQ3Bxbimn6L3Hq4XqCM5S0KSUQ3ifq3U2SClOzA== X-Received: by 2002:a5d:698e:0:b0:33b:14e4:6dfd with SMTP id g14-20020a5d698e000000b0033b14e46dfdmr6498808wru.12.1707137207235; Mon, 05 Feb 2024 04:46:47 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCX6s8I1F8xkg2XPCKOBp+8BnZo58zR0pkfcfkb9d0cnU17xdr5mIvZU70L7HhoG73y0cdHNghWb/btIPWBgrZm71mDJXWqNSeE3C7jOmUfK683gDXI0G2GHFsoyHAwD8eUgFrg5/5zLH1iSszWqsZwNjctwnle4VM5roX+3Akst4YiDJfx2rKhM 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 x5-20020adfdd85000000b0033afe6968bfsm7997648wrl.64.2024.02.05.04.46.46 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:47 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha Subject: [PATCH 1/6] 11-dm-mpath.rules: don't import properties that are already set Date: Mon, 5 Feb 2024 13:46:33 +0100 Message-ID: <20240205124638.17877-2-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 DM_UDEV_DISABLE_OTHER_RULES_FLAG and DM_NOSCAN may be already set from previous rules, e.g. if the device is suspended. Make sure we don't overwrite them. DM_DISABLE_OTHER_RULES_FLAG_OLD and MPATH_DEVICE_READY are only used in this file, and not used in the scan_import code path. Signed-off-by: Martin Wilck --- multipath/11-dm-mpath.rules | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules index c339f52..2c4d006 100644 --- a/multipath/11-dm-mpath.rules +++ b/multipath/11-dm-mpath.rules @@ -2,12 +2,19 @@ ACTION!="add|change", GOTO="mpath_end" ENV{DM_UDEV_RULES_VSN}!="?*", GOTO="mpath_end" ENV{DM_UUID}!="mpath-?*", GOTO="mpath_end" -IMPORT{db}="DM_DISABLE_OTHER_RULES_FLAG_OLD" -IMPORT{db}="MPATH_DEVICE_READY" - # If this uevent didn't come from dm, don't try to update the # device state -ENV{DM_COOKIE}!="?*", ENV{DM_ACTION}!="PATH_*", IMPORT{db}="DM_UDEV_DISABLE_OTHER_RULES_FLAG", IMPORT{db}="DM_NOSCAN", GOTO="scan_import" +ENV{DM_COOKIE}=="?*", GOTO="check_ready" +ENV{DM_ACTION}=="PATH_*", GOTO="check_ready" + +ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="?*", IMPORT{db}="DM_UDEV_DISABLE_OTHER_RULES_FLAG" +ENV{DM_NOSCAN}!="?*", IMPORT{db}="DM_NOSCAN" +GOTO="scan_import" + +LABEL="check_ready" + +IMPORT{db}="DM_DISABLE_OTHER_RULES_FLAG_OLD" +IMPORT{db}="MPATH_DEVICE_READY" ENV{.MPATH_DEVICE_READY_OLD}="$env{MPATH_DEVICE_READY}" From patchwork Mon Feb 5 12:46:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545460 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 0A3F023768 for ; Mon, 5 Feb 2024 12:46:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137213; cv=none; b=jdfPam1QNFmtZgIJmtR/qczNrYep9JhBVeFXFR2oloTe5riN1+OxJzQWguh/ysoyYa8V4/x1osTVSTqYQFIL/O6o6CsK7YBEFq/dWNYDKZr/tlCyEFZUJv0M3BUYkFbupL9NBiGL3kxzi4hqRXgPXPgieQfBXgnGwmlzxE0ZFsc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137213; c=relaxed/simple; bh=lBn7URuszkpHT+5AnuxcemTzKmPsCPPZ4laUvqRgF6g=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=U4A7jqZRgad9ngrFxCjsVHNO4CRLbkMrwEeiBcTr1qSSWrFL1WnWTzD0aqDCmwie2/rxpUbo2hMNIvcEQBSrRSqwByFCvLpJedzJnAMRw+D1Dq52UevLy9WVazdo1EXbAs47oasHBq1niVuzUeBJjEmx4sr1Z5O76n4JcY4E888= 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=OFDuB0aS; arc=none smtp.client-ip=209.85.128.54 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="OFDuB0aS" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-40fdd65a9cfso4473175e9.3 for ; Mon, 05 Feb 2024 04:46:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137208; x=1707742008; 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=Bb97CUPZUoldczzs3axUAOhdvUQBJIcClp5cbcA1EPw=; b=OFDuB0aS6e1eiMQOi58+hMbylX5Ds7YleprTIe2kKwFc5oe+B0bGf2A7Ohbmz/bqYq 58qNkNYDp2kNBtwpMuiNz8uZm2c2if0970rfK4HfDppr+GpK8B4KSLxdGuZTC1lHNK+7 x3Ors1gIw8V+LcNRTm6xCqSQ4Ul89CQwUJioUAZwAMq7UkKO/O//D3F7A5+ruzbYlqZM uSaL2wZkUSEWpZ626GnFX8sYRczGXOtCrR4r7HW6Qh2Kmki1mhzbV7xXlm++oJZ8jga4 aUl7cCIozDfXbJqeooOB9uM/Oa1PMY/5yTVUcHeaqamgo/HV9qS1/4M2EKTQcieN/mWj ErRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137208; x=1707742008; 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=Bb97CUPZUoldczzs3axUAOhdvUQBJIcClp5cbcA1EPw=; b=e9anFKSWMyqqdQl72U6OnqqeJlu7gKq7FX5fJmASI9xjXt8EeIF9FRvHF+ULmSKYqB In/480mGCNSDppQQQpVHfLf9+u1R+NdIwL01QWEfoAAFEZ4I6Aeev8ovRcfVyd7I1Y4h FpoyBSFQhA5v47xcfvI9kIE1vH2EWMRE40CgRRUV3TxRti5SORvu+Wd+dUFEoSCszi7H tLEE8m+nNc7qpSZRMuALbbxBF9kzIY3Xxx7Yf9BQw/AX8x8py6Lu0any8exGfRl4acnC danNRFAkv9lXnp1h6LCz70o+TDsEuHU8hnyadapPGAS8zhgp7J06XAJkQ/4EyX0s87v8 3+BQ== X-Gm-Message-State: AOJu0Yz0n5z9vDWt2G9N3yplUyjLBWY5AGOqZuZWaivZdvwhlyMHIYbe aHO7DsfHhRL+7wXsD+NNahxWbZxrbfgTkm3s+DjbkO6ztnAaVEpWGJ3x0ZC8Elw= X-Google-Smtp-Source: AGHT+IHswfurlsOxMiBC6tTM4NPVbL+OXOQgZj27n2UTvs68eWcVwcbrbDKqbIllqo8TL2ItPNG8Sg== X-Received: by 2002:a05:600c:4f47:b0:40f:dd0e:9e14 with SMTP id m7-20020a05600c4f4700b0040fdd0e9e14mr1204271wmq.7.1707137208251; Mon, 05 Feb 2024 04:46:48 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVdnwc8x2bPMOyOEoN+ouc4He7RBEopExgeSO/nZHGNsJZVmqEi1GXWchN5KWm50dyUF0T2Ww4Snymjco6xiTBKNS6C5Jh1wd5SDSVWkLeAQoyRVaNuw+WZi9Ptpb31AdcIQQAU2wq3WLjO5fKYfMFqemyOQ5BHzsHSrKZmX/JevLH+NoXdkC5O 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 q11-20020a5d574b000000b0033ae4a3b285sm8002392wrw.36.2024.02.05.04.46.47 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:48 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha Subject: [PATCH 2/6] 11-dm-mpath.rules: fix list of imported properties Date: Mon, 5 Feb 2024 13:46:34 +0100 Message-ID: <20240205124638.17877-3-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Make sure we import all properties that are also imported in 13-dm-disk.rules. Keep importing ID_FS_TYPE for now to avoid breakage, even if 13-dm-disk.rules does not. Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- multipath/11-dm-mpath.rules | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules index 2c4d006..43d227c 100644 --- a/multipath/11-dm-mpath.rules +++ b/multipath/11-dm-mpath.rules @@ -92,11 +92,13 @@ LABEL="scan_import" ENV{DM_NOSCAN}!="1", GOTO="import_end" IMPORT{db}="ID_FS_TYPE" IMPORT{db}="ID_FS_USAGE" -IMPORT{db}="ID_FS_UUID" IMPORT{db}="ID_FS_UUID_ENC" -IMPORT{db}="ID_FS_LABEL" IMPORT{db}="ID_FS_LABEL_ENC" IMPORT{db}="ID_FS_VERSION" +IMPORT{db}="ID_PART_ENTRY_NAME" +IMPORT{db}="ID_PART_ENTRY_UUID" +IMPORT{db}="ID_PART_ENTRY_SCHEME" +IMPORT{db}="ID_PART_GPT_AUTO_ROOT" LABEL="import_end" From patchwork Mon Feb 5 12:46:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545462 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wm1-f48.google.com (mail-wm1-f48.google.com [209.85.128.48]) (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 9BDAF1CD08 for ; Mon, 5 Feb 2024 12:46:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137214; cv=none; b=DvHiSjA4/8jUuKEuwzfi4CNZs9NoUjK7TeumStnUerj1DYnnEJx1yGZ7F2BAvCYItkdeW9ovRzjkfMmHraMZxPp59izn6IM1TkT9hIFy8F+oclMAyKl5xaePTt/7dakTxgRb10D9sRP/HwZwHuGIgGTCH5m2uy3UFsIWj8QEQ+w= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137214; c=relaxed/simple; bh=CwLS1tCXQGaOMl4151yRpmTmM5aGbS5ECce8eIZx0EQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=TyfK8qXXa0+xo+WUcmn2FXHYk3iqCx4SPTe7DG9Pf1DhBsSMJ5oRa/29LWjxWS/nlUe4WFzFQIQP8xYi/YBVkcEwgk7BzG5LToRZ2OBSxy+/Hv8mSS/O2+qhEh9DV3wqEGtpEeEfYb3q5FMwXs7yrCEoMLhzwKW9SVZ4J1obb8k= 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=XiBSmZgv; arc=none smtp.client-ip=209.85.128.48 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="XiBSmZgv" Received: by mail-wm1-f48.google.com with SMTP id 5b1f17b1804b1-40fdd5bbe65so4326565e9.2 for ; Mon, 05 Feb 2024 04:46:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137210; x=1707742010; 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=bD7Kg8XXkPr56bmFVSxt8Cn654XeP0exS5tfljsujs8=; b=XiBSmZgvGgkJZWytkyPVQAslZJHtpoj7L2ll6W3f2Ri7dmb8Ov+6i8azVAYJwBiGLK yHeXl0o+3USKsJMITlqXGen6jZ4BHGlRtEttWP0Pxkd99F5I/2JZVpGNGcKGrcsB9MRg o4i0dSISEhLpmIw2g0PZKMreD445+KbGE6qIXasIh7yemjjUmgInEAylOgz/tO6CguUJ fW6uLrj0FEDvFz2abYk/CjzOVYdOpUoSnt/B2+ypv/RoAXUhbIsfBUhUdTG1URM+Skq1 Uvd72+XmlQPI8ONJSm6nsiZ9leHq7T9leroKPXufu8AdLWlEFoxKApbH5FKoRf1AdHlB gOpw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137210; x=1707742010; 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=bD7Kg8XXkPr56bmFVSxt8Cn654XeP0exS5tfljsujs8=; b=DlecmLHZ8oHpbyNlsI+SK76cK4EG4u9jFV+hJCmGvsuuF9p8YelL4NTqxyNgTXwWL3 yiIv0ZcHP87kaxiAcbk07ZIyOY6lh/HcfnT9S53G/CAahwy6yAerykenTN+Iqj72LYfD aHWSf8VchBbFgDj9btAtzvgfVZb9IWGP2FTfc9f2mQz4xSFsJWfnUpCCkvumnqtICyXE TGVBOxHcizr9diNszIe2wsYVj36WSqEkfINmTdbKusL282eoW4N/sVTvVJ0Fpvtw3/mm ol0GIzt6iXYXEZXe3qTDHFnAE1bVUmASuflxrgY3+idMacwiKYpibjlLWz+KaM7Znmsr 9G6g== X-Gm-Message-State: AOJu0Yz81AteCBRyM5ofp7dkYWkpvr9MMBVWBQPEutBqrQ+Sh85g6IcP LKI2QDJMO9/gaZ5F3DKO+ZPxpac6DfUuaTeCmj6rVzB62i2Vhk4wteHnUtgM3PU= X-Google-Smtp-Source: AGHT+IFjOlAspad2BCbWKZoT4Ah66eV9BiwBiZ7ZB8Gl4vIMrbh5wG8EiZRAoW6Oco/vUhvv0+bk3A== X-Received: by 2002:a05:600c:1da6:b0:40f:afd6:b266 with SMTP id p38-20020a05600c1da600b0040fafd6b266mr4453912wms.18.1707137209384; Mon, 05 Feb 2024 04:46:49 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCVxl9iffdyznSF3r8Ml2twEkVZorAKlEg5vZA5aGnw9DrcLPEfNhs0GpwJDvU+XLWl2BrCYOvWynOk5Y5guG8a12dWGBCsB6d6ycrD+TNMyy6uC12cnYZBwWU5ghKFI1pxh/L6ye6UpU0gQsS7FNOnRlgTSEBjv63McKIAcujzWO443+oo9PQ+4 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 m21-20020a05600c3b1500b0040fd2f3dc0esm6652892wms.45.2024.02.05.04.46.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:49 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha Subject: [PATCH 3/6] 11-dm-mpath.rules: use import logic like 13-dm-disk.rules Date: Mon, 5 Feb 2024 13:46:35 +0100 Message-ID: <20240205124638.17877-4-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 We have to import the properties if either DM_NOSCAN or DM_DISABLE_OTHER_RULES_FLAG is set, because blkid will be skipped in both cases. Also, if DM_UDEV_PRIMARY_SOURCE_FLAG is not set, it makes no sense to try and import the properties. Signed-off-by: Martin Wilck --- multipath/11-dm-mpath.rules | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules index 43d227c..8fc4a6f 100644 --- a/multipath/11-dm-mpath.rules +++ b/multipath/11-dm-mpath.rules @@ -89,7 +89,8 @@ ENV{MPATH_DEVICE_READY}!="0", ENV{.MPATH_DEVICE_READY_OLD}=="0", \ # not. If symlinks get lost, systemd may auto-unmount file systems. LABEL="scan_import" -ENV{DM_NOSCAN}!="1", GOTO="import_end" +ENV{DM_NOSCAN}!="1", ENV{DM_DISABLE_OTHER_RULES_FLAG}!="1", \ + ENV{DM_UDEV_PRIMARY_SOURCE_FLAG}=="1", GOTO="import_end" IMPORT{db}="ID_FS_TYPE" IMPORT{db}="ID_FS_USAGE" IMPORT{db}="ID_FS_UUID_ENC" From patchwork Mon Feb 5 12:46:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545461 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) (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 E02C522EF8 for ; Mon, 5 Feb 2024 12:46:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137214; cv=none; b=eDUBltBBWQ3tznPzYztkpqyPCfnR+JVQq+hpXU3usR1EMfQdCOg5nesZ8zQdl5tciysatMYfFvuuvgnSVJpji+kVVFEHWuK00kiAgdz7E3NUHSvr9pRJGITbipa3Qzx54o87bDMMVzkT2iv6tf64g0fgIEnF4NGkT5FZWV74CKg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137214; c=relaxed/simple; bh=D2Vl0FmplNSA93s1bIfQaWieJL2IHHa9jsFmOrweAKY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=cUi7rsuQeqAKRq69uSWcOo1X0KbDfS302umjzqPzzC8KZGuwZSZxq9CfgNVT3Ba1s99nZfnaB5FzMUyrP+AEtjCoBVWjlJTqEQbvFQCh5xGRPnv+MXTu15xqSFt6VyoJSVnZJRr1OC7f2N4J/dzXJknrZFOnE23fjF1p74CtVZc= 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=GLNpSKSW; arc=none smtp.client-ip=209.85.221.51 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="GLNpSKSW" Received: by mail-wr1-f51.google.com with SMTP id ffacd0b85a97d-33b130f605eso2822186f8f.1 for ; Mon, 05 Feb 2024 04:46:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137210; x=1707742010; 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=fTq3LbSBVSDVVJF9Agks6bAQ+2mtZSg8+mqEtrlbwWg=; b=GLNpSKSWJMktj9px7WEseE9KtVqv/5b0wZWBSW83e0lA5Ha4SE0DAZlKBbUCRbxEKx aruliaWM/t+4fTMsPqu4lreBaPNqQYTzqi8J++0N/MHTpIDcD9lUn1s2Iu+qvsEBeQ8O d+p53aQOI/ZsZmVOI24hKwNrFaiE7+ifjqRvtf+0NN41gBFOhOl01iuvQmqEZWjHj0/I 1y4KyxO6mjXN6rXgwqD6NaRw0vgSXx9BBsMm1iQ4Fai9KC3UwoPX8C2k0jkfjbNP/EL6 KLa4KDhYblmBZq0+bjITx70Bh39nPigKWov3AmoVbZTd2G/Ds1BxYD6F93jDhN/Ngg25 DmCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137210; x=1707742010; 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=fTq3LbSBVSDVVJF9Agks6bAQ+2mtZSg8+mqEtrlbwWg=; b=AWWirtBYdGG6xHxus0VOnIsAodGFk83XGmF13GXuKqmwa8pW8cz0u/nLDR2rJaE4nC n+pBlWnQsFXaIeq30BWJO4UFuahcC6drV0MIhFkvvcl8sCZCA+sv2isX3kRSnmT8dlSm 57fQj6S/OTBHdebeimVYemo/MdIZYhTWGE7NLJzViMxhIIrGZSYkm1qDU3Mwg45nQ0v/ BdDZvw2M8yC7lOzNEy/cP5wmGijOTmEDs89uF8CCrbkyaJtYY8TKS/OqU1RTMntZC9dN vOviqmnfdZ8r5sipOiComn0UNF/DbaBtjHSg687i8fgUuORN4e4iv7YcTMyyhqScGQqD Fcfg== X-Gm-Message-State: AOJu0Yy01x5rhfxl1y7FNpmIEqomEgrAmWNnN6OpZY9y6YVs+cuWitMv 9J5vckIOUxsVAMWH6yTS2xWl3w+cn9o8C2ENqzmfNxuWidYV2gJGZmhh4QxNjC4= X-Google-Smtp-Source: AGHT+IGnmvB4DrfaiXnbMISwSoozD061LR730vtYXabaWmWqAUCItDzXerhfIc67IZtFYKZ5hRbeCA== X-Received: by 2002:a05:6000:144c:b0:33b:3b86:b845 with SMTP id v12-20020a056000144c00b0033b3b86b845mr2825597wrx.58.1707137210348; Mon, 05 Feb 2024 04:46:50 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXTsvf9oynPrDc9Ln7o/M56uVM5NLLAJqO+CuDMDGAJ4KF9xAwA2cnrzAELPu3vrnovYyGxRCeNinMKTSOE747HX6Y4ukZznQVyG2qQ0YYGxkYJrjuXx6ofuTP/YB/q9GMfQ0GnzapNaqw2SCZ8vuGlCnrKjDQhlQHFQ0uhZuA6nHt/O06turTN 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 v23-20020adfa1d7000000b0033b37fe0577sm3302915wrv.54.2024.02.05.04.46.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:50 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha Subject: [PATCH 4/6] 11-dm-mpath.rules: handle reloads during coldplug events Date: Mon, 5 Feb 2024 13:46:36 +0100 Message-ID: <20240205124638.17877-5-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If a map reload happens while udev is processing rules for a coldplug event, DM_SUSPENDED may be set if the respective test in 10-dm.rules happens while the device is suspened. This will cause the rules for all higher block device layers to be skipped. Record this situation in an udev property. The reload operation will trigger another "change" uevent later, which would normally be treated as a reload, and be ignored without rescanning the device. If a previous "coldplug while suspended" situation is detected, perform a full device rescan instead. Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- multipath/11-dm-mpath.rules | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules index 8fc4a6f..2706809 100644 --- a/multipath/11-dm-mpath.rules +++ b/multipath/11-dm-mpath.rules @@ -9,8 +9,13 @@ ENV{DM_ACTION}=="PATH_*", GOTO="check_ready" ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}!="?*", IMPORT{db}="DM_UDEV_DISABLE_OTHER_RULES_FLAG" ENV{DM_NOSCAN}!="?*", IMPORT{db}="DM_NOSCAN" -GOTO="scan_import" +# Coldplug event while device is suspended (e.g. during a reload) +ACTION=="add", ENV{DM_ACTIVATION}=="1", ENV{DM_SUSPENDED}=="1", \ + PROGRAM="/bin/logger -t 11-dm-mpath.rules -p daemon.warning \"Coldplug event for suspended device\"", \ + ENV{DM_COLDPLUG_SUSPENDED}="1" + +GOTO="scan_import" LABEL="check_ready" IMPORT{db}="DM_DISABLE_OTHER_RULES_FLAG_OLD" @@ -53,6 +58,16 @@ ENV{DM_ACTION}=="PATH_FAILED", GOTO="mpath_action" ENV{MPATH_DEVICE_READY}="1" LABEL="mpath_action" + +# A previous coldplug event occured while the device was suspended. +# Activation might have been partially skipped. Activate the device now, +# i.e. disable the MPATH_UNCHANGED logic and set DM_ACTIVATION=1. +IMPORT{db}="DM_COLDPLUG_SUSPENDED" +ENV{DM_COLDPLUG_SUSPENDED}=="1", ENV{DM_SUSPENDED}!="1", \ + ENV{DM_ACTIVATION}="1", ENV{MPATH_UNCHANGED}="0", \ + PROGRAM="/bin/logger -t 11-dm-mpath.rules -p daemon.notice \"Forcing activation of previously suspended device\"", \ + GOTO="force_activation" + # DM_SUBSYSTEM_UDEV_FLAG0 is the "RELOAD" flag for multipath subsystem. # Drop the DM_ACTIVATION flag here as mpath reloads tables if any of its # paths are lost/recovered. For any stack above the mpath device, this is not @@ -67,6 +82,8 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}=="1", \ ENV{DM_ACTION}=="PATH_FAILED|PATH_REINSTATED", \ ENV{DM_ACTIVATION}="0", ENV{MPATH_UNCHANGED}="1" +LABEL="force_activation" + # Do not initiate scanning if no path is available, # otherwise there would be a hang or IO error on access. # We'd like to avoid this, especially within udev processing. @@ -103,6 +120,9 @@ IMPORT{db}="ID_PART_GPT_AUTO_ROOT" LABEL="import_end" +# Reset previous DM_COLDPLUG_SUSPENDED if activation happens now +ENV{DM_SUSPENDED}!="1", ENV{DM_ACTIVATION}=="1", ENV{DM_COLDPLUG_SUSPENDED}="" + # Multipath maps should take precedence over their members. ENV{DM_UDEV_LOW_PRIORITY_FLAG}!="1", OPTIONS+="link_priority=50" From patchwork Mon Feb 5 12:46:37 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545463 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wm1-f51.google.com (mail-wm1-f51.google.com [209.85.128.51]) (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 60CE824219 for ; Mon, 5 Feb 2024 12:46:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.51 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137215; cv=none; b=nGaEIhRAG6TL/SKQi8vLlDPhr+OPGpsOASdPdZD9wA5MCPjEjdJvd6I7hfk4sJO/Wfg6IwAY2P6Bm6Dln3MSacDW7nBUTJVS3suGmCy53+P1uKNaAVMs5MTy8ZRCV9QtB27trBi5TIwGBU39LEY2rws/SBllaL4/Sm5nDDD1qgw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137215; c=relaxed/simple; bh=n9cQHMwP98CELEkzfrS4l22uQujoD+eSCtIeqpfnQJM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=CXmN3+Qkh8lDL0g3e5i89daXk4E4uPZYltwW54csCo3Lh+icd7Z+n+51uhhSf2yvtYy+icva8HPNzsBJchlZEP3mboll9Wzg3LKNFO82jKOOGmRGHad3TTtqePXOrYydHZHMc42RaNED3e8HKgEe2T5ld8Q9HrayU+ODrgVTJzE= 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=HRQ0eq24; arc=none smtp.client-ip=209.85.128.51 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="HRQ0eq24" Received: by mail-wm1-f51.google.com with SMTP id 5b1f17b1804b1-40fdf17fa89so220975e9.0 for ; Mon, 05 Feb 2024 04:46:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137211; x=1707742011; 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=Ju2lOeFQEMu7la/gUeUclp0xy0IYVncQ6eP171nU1lo=; b=HRQ0eq24vAy0d5KHcnIiU+j4AhZ21fKvw4nrLKvkoVelgZ4b2NDkkJvwZ/7rg0tOg1 mzG4BDIMTw+AV0ngN/xpcLWIgu2jV9rRKUXnqAfXix5qJYYAWUN8qg0I9OujCHmpRqVx chVYIS/M1RvcQhC9xS1r/sqYSzFCVu5urAXrjtSZaPdSyazuuiVlXGSMrsskTDrwZfkP cNUET/Tex2aC7T63Zw4HdFpxtp4IyiQqec6vO9Ikni3kfFYY6tqrOmdT0p/3NmhDMfl/ ChNYGugfiGU4wFvcT13BYFLeYauImIs21rpTxMyHsGtfPFPEoU+ot92O7gs48iF4dzRt qleA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137211; x=1707742011; 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=Ju2lOeFQEMu7la/gUeUclp0xy0IYVncQ6eP171nU1lo=; b=ahdPPb0G9U8GZadoiF/oVpGQig4S7aR9O+gat3VsEw8kidfU2QqciCGJx36E7FmzP2 lfKKs5eSFSrOMLhEd0czU6p98JP0rlLuVz/7MmVCBllvS8M5OPT4oILvHyMaRryiwqzt dQ51Xkadh7Q+2zEymA6NWRvikG+5gA/ZYLGkwnlcYwr/kYmFo4pWWqb9LytCDu7PKqcR +wvg3GFSyvAfXvtVIKquWj7A/2JNWUQpBRUPU1+KN5LIUL7IN2tOzLqnvEsBZc7Usv1C przX+I89givjdkJN/put5z0Bv7fuGMT24jyutDD3hk4aRgw7Y/grtoRHun67E8q9lH4Q MHUg== X-Gm-Message-State: AOJu0YwbhuYJgo+vTKKmVetLw/U6O0As6JS5Breoaog1dENA/0WT/v13 hQSwdVu26vYp5vO9brCEVY+rj1VFgeRw2pV5UsAnTyNI4mCKdj4M8U5G4e52FVE= X-Google-Smtp-Source: AGHT+IHRPSrgdn6ib08qTTnhbVNC3GNZO7eOIstVvJNek1uu0R9MMcQiFHpxvq4bnN0o0QoNstT8bw== X-Received: by 2002:a05:600c:3b14:b0:40e:aca0:7b0a with SMTP id m20-20020a05600c3b1400b0040eaca07b0amr4402282wms.10.1707137211648; Mon, 05 Feb 2024 04:46:51 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCXH5scUH3bj0D+YUAqjGplTvyv90SChT9bgMDN9lLslkKR2t7EMFXGLIY4EVJUixvPLpPc0J0R7VmT20FuMWleSCK8mriNYli8r+yanDuQiflnS1o8xBDcEEnKXDFet6q3z3147GMGtCv/zCkN3Ix+AbDDAStCfsH1yf+3DxPnxb8Jc9f4RJKeG 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 m9-20020a7bcb89000000b0040e813f1f31sm8426652wmi.25.2024.02.05.04.46.51 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:51 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha Subject: [PATCH 5/6] multipath: udev rules: use configured $(bindir) in udev rules Date: Mon, 5 Feb 2024 13:46:37 +0100 Message-ID: <20240205124638.17877-6-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This allows us to remove the lumsy MPATH_SBIN_PATH property and related tests. Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- .gitignore | 1 + Makefile.inc | 2 +- multipath/{11-dm-mpath.rules => 11-dm-mpath.rules.in} | 5 +---- multipath/Makefile | 2 +- multipath/multipath.rules.in | 5 +---- 5 files changed, 5 insertions(+), 10 deletions(-) rename multipath/{11-dm-mpath.rules => 11-dm-mpath.rules.in} (97%) diff --git a/.gitignore b/.gitignore index 6890e4a..049ffe8 100644 --- a/.gitignore +++ b/.gitignore @@ -16,6 +16,7 @@ multipath/multipath multipath/multipath.8 multipath/multipath.conf.5 multipath/multipath.rules +multipath/11-dm-mpath.rules multipath/tmpfiles.conf multipathd/multipathd multipathd/multipathd.8 diff --git a/Makefile.inc b/Makefile.inc index 06bdd5e..3bcc7c2 100644 --- a/Makefile.inc +++ b/Makefile.inc @@ -148,4 +148,4 @@ NV_VERSION_SCRIPT = $(DEVLIB:%.so=%-nv.version) %: %.in @echo creating $@ - $(Q)sed 's:@CONFIGFILE@:'$(configfile)':g;s:@CONFIGDIR@:'$(configdir)':g;s:@STATE_DIR@:'$(statedir)':g;s:@RUNTIME_DIR@:'$(runtimedir)':g;s/@MODPROBE_UNIT@/'$(MODPROBE_UNIT)'/g' $< >$@ + $(Q)sed 's:@CONFIGFILE@:'$(configfile)':g;s:@CONFIGDIR@:'$(configdir)':g;s:@STATE_DIR@:'$(statedir)':g;s:@RUNTIME_DIR@:'$(runtimedir)':g;s/@MODPROBE_UNIT@/'$(MODPROBE_UNIT)'/g;s:@BINDIR@:'$(bindir)':g' $< >$@ diff --git a/multipath/11-dm-mpath.rules b/multipath/11-dm-mpath.rules.in similarity index 97% rename from multipath/11-dm-mpath.rules rename to multipath/11-dm-mpath.rules.in index 2706809..38a0132 100644 --- a/multipath/11-dm-mpath.rules +++ b/multipath/11-dm-mpath.rules.in @@ -35,16 +35,13 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG2}=="1", ENV{MPATH_DEVICE_READY}="0", \ # This may not be reliable, as events aren't necessarily received in order. ENV{DM_NR_VALID_PATHS}=="0", ENV{MPATH_DEVICE_READY}="0", GOTO="mpath_action" -ENV{MPATH_SBIN_PATH}="/sbin" -TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" - # Don't run multipath -U during "coldplug" after switching root, # because paths are just being added to the udev db. ACTION=="add", ENV{.MPATH_DEVICE_READY_OLD}=="1", GOTO="paths_ok" # Check the map state directly with multipath -U. # This doesn't attempt I/O on the device. -PROGRAM=="$env{MPATH_SBIN_PATH}/multipath -U -v1 %k", GOTO="paths_ok" +PROGRAM=="@BINDIR@/multipath -U -v1 %k", GOTO="paths_ok" ENV{MPATH_DEVICE_READY}="0", GOTO="mpath_action" LABEL="paths_ok" diff --git a/multipath/Makefile b/multipath/Makefile index 0efb9b2..f8c1f5e 100644 --- a/multipath/Makefile +++ b/multipath/Makefile @@ -5,7 +5,7 @@ include ../Makefile.inc EXEC := multipath MANPAGES := multipath.8 multipath.conf.5 -GENERATED := $(MANPAGES) multipath.rules tmpfiles.conf +GENERATED := $(MANPAGES) multipath.rules tmpfiles.conf 11-dm-mpath.rules CPPFLAGS += -I$(multipathdir) -I$(mpathutildir) -I$(mpathcmddir) CFLAGS += $(BIN_CFLAGS) diff --git a/multipath/multipath.rules.in b/multipath/multipath.rules.in index 03fa4d7..780bf85 100644 --- a/multipath/multipath.rules.in +++ b/multipath/multipath.rules.in @@ -18,9 +18,6 @@ GOTO="end_mpath" LABEL="test_dev" -ENV{MPATH_SBIN_PATH}="/sbin" -TEST!="$env{MPATH_SBIN_PATH}/multipath", ENV{MPATH_SBIN_PATH}="/usr/sbin" - # FIND_MULTIPATHS_WAIT_UNTIL is the timeout (in seconds after the # epoch). IMPORT{db}="FIND_MULTIPATHS_WAIT_UNTIL" @@ -31,7 +28,7 @@ IMPORT{db}="DM_MULTIPATH_DEVICE_PATH" # multipath -u sets DM_MULTIPATH_DEVICE_PATH and, # if "find_multipaths smart", also FIND_MULTIPATHS_WAIT_UNTIL. -IMPORT{program}=="$env{MPATH_SBIN_PATH}/multipath -u %k", \ +IMPORT{program}=="@BINDIR@/multipath -u %k", \ ENV{.MPATH_CHECK_PASSED}="1" # case 1: this is definitely multipath From patchwork Mon Feb 5 12:46:38 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 13545464 X-Patchwork-Delegate: snitzer@redhat.com Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 78B7D28E0D for ; Mon, 5 Feb 2024 12:46:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.53 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137216; cv=none; b=GbLL/hk/ciJRFKzv9OD0J28yZISJcrjtVlnjvMb1eR7hKXvxNextt0YC0g2rJRERXognpKY2k3eaLRuuWlAtJuRmw5s22W28KhBIIEEYEYrIq5t70PCxELzdMZCyddDiUIeNYd3mPKLHTSqOjkfTGZdEgDoqw1it1ZolkqHS89A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707137216; c=relaxed/simple; bh=uCHwYtcqJvKd0vl1r4shZl0zfIqS2AF7bW4iDLZRD6E=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QIGmJBU+KdLEjpkB2e6f9NwgKZHfRZIfnG1EjG6RZfGUlrSAr3cuIHScIgqJPrngZHqszWbXnP9XFvWZqbPTQlEMP50RHKnoF10FaDlNP16e9jvphDZYNlk30DgrTFFi5S+7P6KIM4nR+ck+cSp1Nj/ICiJTjW/0igT0lb9ujhI= 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=Xsbbi34h; arc=none smtp.client-ip=209.85.128.53 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="Xsbbi34h" Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-40f02b8d176so38222775e9.1 for ; Mon, 05 Feb 2024 04:46:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=google; t=1707137213; x=1707742013; 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=TS6RPL1ziCGOnuiUbiIHJtHOa3zWHBq75Wkktv9HZ/k=; b=Xsbbi34hTFx1HO/gQ1Xc2FgxvLPXzZ4m6Gz9jC4/vxF8G7THmVcreLM86v+IrR6U+t Vesy+VjDI+FM3J3tNnTjdox7T0XTQi8AxkRioNC2NrqJ/6LifqbavkbncRFEO6pUPkGZ jx/XoiIex7zdKZCfImocGD9H0xlkZhdMYGt3N19AlUaO+0pIxTtRrWcKmcAOL5x9hPfX 91m8mxCz5gdGfSwV395i3CYOOlOMDNcpP+osBdTugNrKp3omzdraON4uKmBEPSdee2D/ jo92qZyZLHtWpRn3xA9HSr49purcpATp/FH3fAvTYV8PVNHB2m0nX8HzQJZ/q91kdwqY vDKw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707137213; x=1707742013; 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=TS6RPL1ziCGOnuiUbiIHJtHOa3zWHBq75Wkktv9HZ/k=; b=mMSNy3ahqyTKaG8Nv86M1ftF2CtiZ3zUYh/C1BacMKjhOwVlE/cA6do1aUjgKUfnN6 M8adLob9wYlRCtTwrt+EMT8MYCIOywOpHFyZTLz15UuY6Cqwbh2useXCeUBKTHEKIUnd niF9wMnt7eQ4YZrbyGbD2EaCkNXsiA8Sa4gjLFRrEeREa96uvS7Wo0m82SV1q+UfErMP p0kmajcIDLKT/E0gqoBMIZSSJIT4cs1B9T4PdQzm8QUVIMP/R3zDc77ldul53pDehf3D glp+C3m+8mkbLJSfb5Es6uG0bHxfSJpxY6xRkX0Q0maZuD7Pvcg7JvFBe5koBoc5bAaz DtQw== X-Gm-Message-State: AOJu0YzW3AegYKPVr+bD9mEa3sjCnEm4dvGr8xFrn9f2SzSE4GLUDEFX x2voi2q/s1AiGZgZ0egE2dGW1d59+n/V9gDCZ0QFw3+AT3Glg+COvWLH+3WfHas= X-Google-Smtp-Source: AGHT+IEyBSh7/mcrMvtcAFb0iUUFQNfJAkDR9dHyjEisZ8h4ikt+VTBryf7aHog49AftJP4To04maA== X-Received: by 2002:a05:600c:35c7:b0:40e:fc29:f527 with SMTP id r7-20020a05600c35c700b0040efc29f527mr4912104wmq.31.1707137212820; Mon, 05 Feb 2024 04:46:52 -0800 (PST) X-Forwarded-Encrypted: i=0; AJvYcCU+aDRcP0sy2EzKUgYgs8p4qL9EBmvPfsvTEu9dU5B4U0saWyjDNZ8BBGCGG6nsSTX2ekSEai6txJxm5lTsvfxNYZvC29D/8pOWxEhSI98RcKEMrCoyd4zHZWEowlX3Toxg+v06H8mqi5dUq5w5RqBePL7U/A9UVbmpRjb1ZSIOBwTUXBk/nZgENA2mjXQJTeDbbTp450fBTBOp2PSNndOhMsHiUDGHbFxhnAzg5RwjMA== 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 fm16-20020a05600c0c1000b0040ef67bd244sm8571313wmb.17.2024.02.05.04.46.52 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 05 Feb 2024 04:46:52 -0800 (PST) From: Martin Wilck X-Google-Original-From: Martin Wilck To: Christophe Varoqui , Benjamin Marzinski Cc: dm-devel@lists.linux.dev, linux-lvm@lists.linux.dev, Zdenek Kabelac , Peter Rajnoha , Sergio Durigan Junior , Chris Hofstaedtler Subject: [PATCH 6/6] multipathd: don't activate socket activation by default Date: Mon, 5 Feb 2024 13:46:38 +0100 Message-ID: <20240205124638.17877-7-mwilck@suse.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240205124638.17877-1-mwilck@suse.com> References: <20240205124638.17877-1-mwilck@suse.com> Precedence: bulk X-Mailing-List: dm-devel@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Socket activation will start multipathd on systems that don't have multipath hardware. This is often not desired. On systems that do have multipath hardware, OTOH, it is highly recommended to enable multipathd.service directly rather than have it started via socket activation. Therefore don't activate the socket by default. multipathd still supports socket activation, so users who find it useful can disable multipathd.service and activate the socket. Fixes: https://github.com/opensvc/multipath-tools/issues/76 Signed-off-by: Martin Wilck Cc: Sergio Durigan Junior Cc: Chris Hofstaedtler Reviewed-by: Benjamin Marzinski --- multipathd/multipathd.socket | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/multipathd/multipathd.socket b/multipathd/multipathd.socket index c777e5e..6a62f5f 100644 --- a/multipathd/multipathd.socket +++ b/multipathd/multipathd.socket @@ -10,4 +10,6 @@ Before=sockets.target ListenStream=@/org/kernel/linux/storage/multipathd [Install] -WantedBy=sockets.target +# Socket activation for multipathd is disabled by default. +# Activate it here if you find it useful. +# WantedBy=sockets.target