diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /poky/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch')
-rw-r--r-- | poky/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch | 65 |
1 files changed, 65 insertions, 0 deletions
diff --git a/poky/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch b/poky/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch new file mode 100644 index 000000000..645478525 --- /dev/null +++ b/poky/meta/recipes-devtools/rpm/files/0001-rpm-rpmio.c-restrict-virtual-memory-usage-if-limit-s.patch @@ -0,0 +1,65 @@ +From 0066b862bb3a09f39295abd5d972a53ac8dc1555 Mon Sep 17 00:00:00 2001 +From: Peter Bergin <peter@berginkonsult.se> +Date: Wed, 19 Sep 2018 15:12:31 +0200 +Subject: [PATCH] rpm/rpmio.c: restrict virtual memory usage if limit set + +A solution to avoid OOM situation when the virtual memory is restricted +for a user (ulimit -v). As the lzopen_internal function is run in parallel +one instance per CPU thread the available virtual memory is limited per +CPU thread. + +Upstream-Status: Pending [merge of multithreading patches to upstream] + +Signed-off-by: Peter Bergin <peter@berginkonsult.se> +--- + rpmio/rpmio.c | 34 ++++++++++++++++++++++++++++++++++ + 1 file changed, 34 insertions(+) + +diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c +index e051c98..b3c56b6 100644 +--- a/rpmio/rpmio.c ++++ b/rpmio/rpmio.c +@@ -845,6 +845,40 @@ static LZFILE *lzopen_internal(const char *mode, int fd, int xz) + } + #endif + ++ struct rlimit virtual_memory; ++ getrlimit(RLIMIT_AS, &virtual_memory); ++ if (virtual_memory.rlim_cur != RLIM_INFINITY) { ++ const uint64_t virtual_memlimit = virtual_memory.rlim_cur; ++ const uint64_t virtual_memlimit_per_cpu_thread = ++ virtual_memlimit / lzma_cputhreads(); ++ uint64_t memory_usage_virt; ++ rpmlog(RPMLOG_NOTICE, "XZ: virtual memory restricted to %lu and " ++ "per CPU thread %lu\n", virtual_memlimit, virtual_memlimit_per_cpu_thread); ++ /* keep reducing the number of compression threads until memory ++ usage falls below the limit per CPU thread*/ ++ while ((memory_usage_virt = lzma_stream_encoder_mt_memusage(&mt_options)) > ++ virtual_memlimit_per_cpu_thread) { ++ /* If number of threads goes down to zero lzma_stream_encoder will ++ * will return UINT64_MAX. We must check here to avoid an infinite loop. ++ * If we get into situation that one thread requires more virtual memory ++ * than available we set one thread, print error message and try anyway. */ ++ if (--mt_options.threads == 0) { ++ mt_options.threads = 1; ++ rpmlog(RPMLOG_WARNING, ++ "XZ: Could not adjust number of threads to get below " ++ "virtual memory limit %lu. usage %lu\n", ++ virtual_memlimit_per_cpu_thread, memory_usage_virt); ++ break; ++ } ++ } ++ if (threads != (int)mt_options.threads) ++ rpmlog(RPMLOG_NOTICE, ++ "XZ: Adjusted the number of threads from %d to %d to not " ++ "exceed the memory usage limit of %lu bytes\n", ++ threads, mt_options.threads, virtual_memlimit); ++ ++ } ++ + ret = lzma_stream_encoder_mt(&lzfile->strm, &mt_options); + } + #endif +-- +2.7.4 + |