diff -Nru systemd-237/debian/changelog systemd-237/debian/changelog --- systemd-237/debian/changelog 2020-07-08 15:59:14.000000000 -0300 +++ systemd-237/debian/changelog 2020-09-10 11:54:26.000000000 -0300 @@ -1,3 +1,10 @@ +systemd (237-3ubuntu10.43) bionic; urgency=medium + + * d/p/lp1830746-bump-mlock-ulimit-to-64Mb.patch: + - Bump the memlock limit to match Focal and newer releases (LP: #1830746) + + -- Guilherme G. Piccoli Thu, 10 Sep 2020 11:54:26 -0300 + systemd (237-3ubuntu10.42) bionic; urgency=medium [ Dan Streetman ] diff -Nru systemd-237/debian/patches/lp1830746-bump-mlock-ulimit-to-64Mb.patch systemd-237/debian/patches/lp1830746-bump-mlock-ulimit-to-64Mb.patch --- systemd-237/debian/patches/lp1830746-bump-mlock-ulimit-to-64Mb.patch 1969-12-31 21:00:00.000000000 -0300 +++ systemd-237/debian/patches/lp1830746-bump-mlock-ulimit-to-64Mb.patch 2020-09-10 11:54:26.000000000 -0300 @@ -0,0 +1,31 @@ +From 91cfdd8d29b353dc1fd825673c9a23e00c92a341 Mon Sep 17 00:00:00 2001 +From: Roman Gushchin +Date: Thu, 23 Aug 2018 10:46:20 -0700 +Subject: [PATCH] core: bump mlock ulimit to 64Mb +Bug-Ubuntu: https://bugs.launchpad.net/bugs/1830746 +Origin: upstream, https://github.com/systemd/systemd/commit/91cfdd8d29b3 + +Bpf programs are charged against memlock ulimit, and the default value +can be too tight on machines with many cgroups and attached bpf programs. + +Let's bump it to 64Mb. +--- + src/core/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/core/main.c b/src/core/main.c +index ce45f2ded234..88656dcabf56 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -1295,7 +1295,7 @@ static int bump_rlimit_memlock(struct rlimit *saved_rlimit) { + if (getrlimit(RLIMIT_MEMLOCK, saved_rlimit) < 0) + return log_warning_errno(errno, "Reading RLIMIT_MEMLOCK failed, ignoring: %m"); + +- r = setrlimit_closest(RLIMIT_MEMLOCK, &RLIMIT_MAKE_CONST(1024ULL*1024ULL*16ULL)); ++ r = setrlimit_closest(RLIMIT_MEMLOCK, &RLIMIT_MAKE_CONST(1024ULL*1024ULL*64ULL)); + if (r < 0) + return log_warning_errno(r, "Setting RLIMIT_MEMLOCK failed, ignoring: %m"); + +-- +2.28.0 + diff -Nru systemd-237/debian/patches/series systemd-237/debian/patches/series --- systemd-237/debian/patches/series 2020-07-08 15:59:14.000000000 -0300 +++ systemd-237/debian/patches/series 2020-09-10 11:54:26.000000000 -0300 @@ -221,3 +221,4 @@ lp1832754/0001-umount-Try-unmounting-even-if-remounting-read-only-f.patch lp1832754/0002-umount-Don-t-bother-remounting-api-and-ro-filesystem.patch lp1886115-pid1-fix-free-of-uninitialized-pointer-in-unit_fail_.patch +lp1830746-bump-mlock-ulimit-to-64Mb.patch