From 9aafca72cd1903355a54b5ccc1bdde238972205fcb8cc59cd17c59650c21fcdf Mon Sep 17 00:00:00 2001 From: Franck Bui Date: Fri, 16 Sep 2016 12:27:58 +0000 Subject: [PATCH] - Add rules: block: add support for pmem devices (#3683) (bsc#988119) OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=949 --- ...ck-add-support-for-pmem-devices-3683.patch | 51 +++++++++++++++++++ systemd-mini.changes | 5 ++ systemd-mini.spec | 3 ++ systemd.changes | 5 ++ systemd.spec | 3 ++ 5 files changed, 67 insertions(+) create mode 100644 0001-rules-block-add-support-for-pmem-devices-3683.patch diff --git a/0001-rules-block-add-support-for-pmem-devices-3683.patch b/0001-rules-block-add-support-for-pmem-devices-3683.patch new file mode 100644 index 00000000..2af5f771 --- /dev/null +++ b/0001-rules-block-add-support-for-pmem-devices-3683.patch @@ -0,0 +1,51 @@ +From 31ae8c8741ce9595f4053234d6a6b2fb3616fedf Mon Sep 17 00:00:00 2001 +From: bgbhpe +Date: Fri, 8 Jul 2016 11:43:56 -0400 +Subject: [PATCH 1/1] rules: block: add support for pmem devices (#3683) + +Persistent memory devices can be exposed as block devices as /dev/pmemN +and /dev/pmemNs. pmemN is the raw device and is byte-addressable from +within the kernel and when mmapped by applications from a DAX-mounted +file system. pmemNs has the block translation table (BTT) layered on top, +offering atomic sector/block access. Both pmemN and pmemNs are expected +to contain file systems. + +blkid(8) and lsblk(8) seem to correctly report on pmemN and pmemNs. +systemd v219 will populate /dev/disk/by-uuid/ when, for example, mkfs is +used on pmem, but systemd v228 does not. + +Add pmem to the whitelist. +(cherry picked from commit f3bc4ccc2edf5ad2a99d6ba2795b9999fe76c3df) + +[tblume: fixes bsc#988119] +--- + rules/60-block.rules | 2 +- + rules/60-persistent-storage.rules | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rules/60-block.rules b/rules/60-block.rules +index c74caca..42c7597 100644 +--- a/rules/60-block.rules ++++ b/rules/60-block.rules +@@ -8,4 +8,4 @@ ACTION=="add", SUBSYSTEM=="module", KERNEL=="block", ATTR{parameters/events_dfl_ + ACTION=="change", SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST=="block", ATTR{block/*/uevent}="change" + + # watch metadata changes, caused by tools closing the device node which was opened for writing +-ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*", OPTIONS+="watch" ++ACTION!="remove", SUBSYSTEM=="block", KERNEL=="loop*|nvme*|sd*|vd*|xvd*|pmem*", OPTIONS+="watch" +diff --git a/rules/60-persistent-storage.rules b/rules/60-persistent-storage.rules +index ee1fb08f..ef5d205 100644 +--- a/rules/60-persistent-storage.rules ++++ b/rules/60-persistent-storage.rules +@@ -6,7 +6,7 @@ + ACTION=="remove", GOTO="persistent_storage_end" + + SUBSYSTEM!="block", GOTO="persistent_storage_end" +-KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*", GOTO="persistent_storage_end" ++KERNEL!="loop*|mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|nvme*|sd*|sr*|vd*|xvd*|bcache*|cciss*|dasd*|ubd*|pmem*", GOTO="persistent_storage_end" + + # ignore partitions that span the entire disk + TEST=="whole_disk", GOTO="persistent_storage_end" +-- +2.10.0 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 33c5c5bc..b6ca4b73 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 16 12:27:02 UTC 2016 - fbui@suse.com + +- Add rules: block: add support for pmem devices (#3683) (bsc#988119) + ------------------------------------------------------------------- Tue Sep 6 08:14:06 UTC 2016 - tbechtold@suse.com diff --git a/systemd-mini.spec b/systemd-mini.spec index fcbbf9b6..6e6d1850 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -264,6 +264,8 @@ Patch528: 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch Patch529: 0001-systemctl-pid1-do-not-warn-about-missing-install-inf.patch # PATCH-FIX-UPSTREAM -- fixed after 320 Patch530: systemd-230-cgroup2-use-new-fstype-for-unified-hierarchy.patch +# PATCH-FIX-UPSTREAM -- fixed after 231 +Patch531: 0001-rules-block-add-support-for-pmem-devices-3683.patch # UDEV PATCHES # ============ @@ -611,6 +613,7 @@ cp %{SOURCE7} m4/ %patch528 -p1 %patch529 -p1 %patch530 -p1 +%patch531 -p1 # udev patches %patch1002 -p1 diff --git a/systemd.changes b/systemd.changes index 33c5c5bc..b6ca4b73 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 16 12:27:02 UTC 2016 - fbui@suse.com + +- Add rules: block: add support for pmem devices (#3683) (bsc#988119) + ------------------------------------------------------------------- Tue Sep 6 08:14:06 UTC 2016 - tbechtold@suse.com diff --git a/systemd.spec b/systemd.spec index a3d3d79e..80c07f49 100644 --- a/systemd.spec +++ b/systemd.spec @@ -259,6 +259,8 @@ Patch528: 0001-core-re-sync-bus-name-list-after-deserializing-durin.patch Patch529: 0001-systemctl-pid1-do-not-warn-about-missing-install-inf.patch # PATCH-FIX-UPSTREAM -- fixed after 320 Patch530: systemd-230-cgroup2-use-new-fstype-for-unified-hierarchy.patch +# PATCH-FIX-UPSTREAM -- fixed after 231 +Patch531: 0001-rules-block-add-support-for-pmem-devices-3683.patch # UDEV PATCHES # ============ @@ -606,6 +608,7 @@ cp %{SOURCE7} m4/ %patch528 -p1 %patch529 -p1 %patch530 -p1 +%patch531 -p1 # udev patches %patch1002 -p1