From 33904a01d7e1740b798c0d05e1dc56bdcd8ee7ca Mon Sep 17 00:00:00 2001 From: Yangyang Shen Date: Mon, 23 Nov 2020 16:26:49 +0800 Subject: [PATCH 1/2] add elevator= kernel command line parameter and don't enable bfq by default --- ...dev-use-bfq-as-the-default-scheduler.patch | 40 ------------------- ...le-that-adds-elevator-kernel-command.patch | 6 +-- systemd.spec | 11 +++-- 3 files changed, 11 insertions(+), 46 deletions(-) delete mode 100644 0001-udev-use-bfq-as-the-default-scheduler.patch diff --git a/0001-udev-use-bfq-as-the-default-scheduler.patch b/0001-udev-use-bfq-as-the-default-scheduler.patch deleted file mode 100644 index bbb294b..0000000 --- a/0001-udev-use-bfq-as-the-default-scheduler.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 5ab4d083dbe0a1ae095875c4af6ac26749b67211 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Wed, 14 Aug 2019 15:57:42 +0200 -Subject: [PATCH] udev: use bfq as the default scheduler - -As requested in https://bugzilla.redhat.com/show_bug.cgi?id=1738828. -Test results are that bfq seems to behave better and more consistently on -typical hardware. The kernel does not have a configuration option to set -the default scheduler, and it currently needs to be set by userspace. - -See the bug for more discussion and links. ---- - rules/60-block-scheduler.rules | 5 +++++ - rules/meson.build | 1 + - 2 files changed, 6 insertions(+) - create mode 100644 rules/60-block-scheduler.rules - -diff --git a/rules/60-block-scheduler.rules b/rules/60-block-scheduler.rules -new file mode 100644 -index 00000000000..480b941761f ---- /dev/null -+++ b/rules/60-block-scheduler.rules -@@ -0,0 +1,5 @@ -+# do not edit this file, it will be overwritten on update -+ -+ACTION=="add", SUBSYSTEM=="block", \ -+ KERNEL=="mmcblk*[0-9]|msblk*[0-9]|mspblk*[0-9]|sd*[!0-9]|sr*", \ -+ ATTR{queue/scheduler}="bfq" -diff --git a/rules/meson.build b/rules/meson.build -index b6a32ba77e2..1da958b4d46 100644 ---- a/rules/meson.build -+++ b/rules/meson.build -@@ -2,6 +2,7 @@ - - rules = files(''' - 60-block.rules -+ 60-block-scheduler.rules - 60-cdrom_id.rules - 60-drm.rules - 60-evdev.rules diff --git a/rules-add-the-rule-that-adds-elevator-kernel-command.patch b/rules-add-the-rule-that-adds-elevator-kernel-command.patch index dd20b73..2e5faab 100644 --- a/rules-add-the-rule-that-adds-elevator-kernel-command.patch +++ b/rules-add-the-rule-that-adds-elevator-kernel-command.patch @@ -11,7 +11,7 @@ Resolves: #1670126 1 file changed, 1 insertion(+) diff --git a/rules/meson.build b/rules/meson.build -index 1da958b..043313a 100644 +index 0fb5c6a..a2dbf2b 100644 --- a/rules/meson.build +++ b/rules/meson.build @@ -1,6 +1,7 @@ @@ -20,8 +20,8 @@ index 1da958b..043313a 100644 rules = files(''' + 40-elevator.rules 60-block.rules - 60-block-scheduler.rules 60-cdrom_id.rules + 60-drm.rules -- -2.19.1 +2.23.0 diff --git a/systemd.spec b/systemd.spec index 6a90b19..28e6d50 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 243 -Release: 26 +Release: 27 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -44,7 +44,6 @@ Source105: rule_generator.functions Source106: write_net_rules Source107: detect_virt -Patch0001: 0001-udev-use-bfq-as-the-default-scheduler.patch Patch0002: 0001-udev-ignore-error-caused-by-device-disconnection.patch Patch0003: 0001-core-dont-check-error-parameter-of-get_name_owner_handler.patch Patch0004: 0001-core-dont-check-potentially-NULL-error.patch @@ -1409,7 +1408,6 @@ fi %{_udevrulesdir}/60-persistent-v4l.rules %{_udevrulesdir}/70-joystick.rules %{_udevrulesdir}/70-power-switch.rules -%{_udevrulesdir}/60-block-scheduler.rules %{_udevrulesdir}/60-persistent-storage.rules %{_udevrulesdir}/80-net-setup-link.rules %{_udevrulesdir}/60-evdev.rules @@ -1506,6 +1504,13 @@ fi %exclude /usr/share/man/man3/* %changelog +* Mon Nov 23 2020 openEuler Buildteam - 243-27 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:add elevator= kernel command line parameter and don't enable bfq + by default + * Tue Jul 7 2020 openEuler Buildteam - 243-26 - Type:enhancement - ID:NA -- Gitee From 6aa75ab3773d8a7a9eb0aa3c115b4ffa2400b4c0 Mon Sep 17 00:00:00 2001 From: Yangyang Shen Date: Wed, 25 Nov 2020 10:59:27 +0800 Subject: [PATCH 2/2] don't enable systemd-journald-audit.socket by default --- ...able-systemd-journald-audit.socket-b.patch | 19 +++++++++++++++++-- systemd.spec | 9 +++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/journal-don-t-enable-systemd-journald-audit.socket-b.patch b/journal-don-t-enable-systemd-journald-audit.socket-b.patch index bdb9129..1c4f54a 100644 --- a/journal-don-t-enable-systemd-journald-audit.socket-b.patch +++ b/journal-don-t-enable-systemd-journald-audit.socket-b.patch @@ -7,9 +7,24 @@ Subject: [PATCH] journal: don't enable systemd-journald-audit.socket Resolves: #1699287 --- + units/meson.build | 3 +-- units/systemd-journald.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + 2 files changed, 2 insertions(+), 3 deletions(-) +diff --git a/units/meson.build b/units/meson.build +index e105ade..48c621d 100644 +--- a/units/meson.build ++++ b/units/meson.build +@@ -88,8 +88,7 @@ units = [ + 'sockets.target.wants/'], + ['systemd-journal-gatewayd.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], + ['systemd-journal-remote.socket', 'ENABLE_REMOTE HAVE_MICROHTTPD'], +- ['systemd-journald-audit.socket', '', +- 'sockets.target.wants/'], ++ ['systemd-journald-audit.socket', ''], + ['systemd-journald-dev-log.socket', '', + 'sockets.target.wants/'], + ['systemd-journald.socket', '', diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in index 089bc38..7436619 100644 --- a/units/systemd-journald.service.in @@ -24,5 +39,5 @@ index 089bc38..7436619 100644 SystemCallArchitectures=native SystemCallErrorNumber=EPERM -- -2.19.1 +2.23.0 diff --git a/systemd.spec b/systemd.spec index 28e6d50..e4bbaba 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: https://www.freedesktop.org/wiki/Software/systemd Version: 243 -Release: 27 +Release: 28 License: MIT and LGPLv2+ and GPLv2+ Summary: System and Service Manager @@ -1139,7 +1139,6 @@ fi %{_unitdir}/multi-user.target.wants/systemd-update-utmp-runlevel.service %{_unitdir}/systemd-hostnamed.service.d/disable-privatedevices.conf %{_unitdir}/sockets.target.wants/systemd-coredump.socket -%{_unitdir}/sockets.target.wants/systemd-journald-audit.socket %{_unitdir}/sockets.target.wants/systemd-journald-dev-log.socket %{_unitdir}/sockets.target.wants/systemd-journald.socket %{_unitdir}/sockets.target.wants/systemd-initctl.socket @@ -1504,6 +1503,12 @@ fi %exclude /usr/share/man/man3/* %changelog +* Wed Nov 25 2020 shenyangyang - 243-28 +- Type:enhancement +- ID:NA +- SUG:NA +- DESC:don't enable systemd-journald-audit.socket by default + * Mon Nov 23 2020 openEuler Buildteam - 243-27 - Type:enhancement - ID:NA -- Gitee