Browse Source

lvm2: finally fix memory locking issues on musl

Always use mlockall fixes it, still trying to keep everything else
as untouched as possible.

Signed-off-by: Daniel Golle <daniel@makrotopia.org>
lilik-openwrt-22.03
Daniel Golle 10 years ago
parent
commit
855fdd21d1
2 changed files with 21 additions and 2 deletions
  1. +1
    -1
      utils/lvm2/Makefile
  2. +20
    -1
      utils/lvm2/patches/003-no-mallinfo.patch

+ 1
- 1
utils/lvm2/Makefile View File

@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=LVM2
PKG_VERSION:=2.02.119
PKG_RELEASE:=1
PKG_RELEASE:=2
PKG_LICENSE:=GPL-2.0 LGPL-2.1
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz


+ 20
- 1
utils/lvm2/patches/003-no-mallinfo.patch View File

@ -18,11 +18,30 @@ Index: LVM2.2.02.119/lib/mm/memlock.c
inf = mallinfo();
if (hblks < inf.hblks) {
@@ -179,6 +182,7 @@ static void _allocate_memory(void)
@@ -176,9 +179,12 @@ static void _allocate_memory(void)
free(areas[area]);
_size_malloc_tmp /= 2;
} else {
+#endif
++ area;
missing -= _size_malloc_tmp;
+#ifdef __GLIBC__
}
+#endif
if (area == max_areas && missing > 0) {
/* Too bad. Warn the user and proceed, as things are
@@ -467,8 +473,13 @@ static void _lock_mem(struct cmd_context
* will not block memory locked thread
* Note: assuming _memlock_count_daemon is updated before _memlock_count
*/
+#ifdef __GLIBC__
_use_mlockall = _memlock_count_daemon ? 1 :
find_config_tree_bool(cmd, activation_use_mlockall_CFG, NULL);
+#else
+ /* always use mlockall on musl */
+ _use_mlockall = 1;
+#endif
if (!_use_mlockall) {
if (!*_procselfmaps &&

Loading…
Cancel
Save