Merge misc fixes from Andrew Morton: "21 patches. Subsystems affected by this patch series: MAINTAINERS, mailmap, and mm (mlock, pagecache, damon, slub, memcg, hugetlb, and pagecache)" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (21 commits) mm: bdi: initialize bdi_min_ratio when bdi is unregistered hugetlbfs: fix issue of preallocation of gigantic pages can't work mm/memcg: relocate mod_objcg_mlstate(), get_obj_stock() and put_obj_stock() mm/slub: fix endianness bug for alloc/free_traces attributes selftests/damon: split test cases selftests/damon: test debugfs file reads/writes with huge count selftests/damon: test wrong DAMOS condition ranges input selftests/damon: test DAMON enabling with empty target_ids case selftests/damon: skip test if DAMON is running mm/damon/vaddr-test: remove unnecessary variables mm/damon/vaddr-test: split a test function having >1024 bytes frame size mm/damon/vaddr: remove an unnecessary warning message mm/damon/core: remove unnecessary error messages mm/damon/dbgfs: remove an unnecessary error message mm/damon/core: use better timer mechanisms selection threshold mm/damon/core: fix fake load reports due to uninterruptible sleeps timers: implement usleep_idle_range() filemap: remove PageHWPoison check from next_uptodate_page() mailmap: update email address for Guo Ren MAINTAINERS: update kdump maintainers ...
Showing the changes to include/uapi (1 of 23 files). Show all
Unified · Split
| @@ -66,10 +66,17 @@ struct rlimit64 { · 65 unmodified lines | ||
| 66 | 66 | #define _STK_LIM (8*1024*1024) |
| 67 | 67 | |
| 68 | 68 | /* |
| 69 | − * GPG2 wants 64kB of mlocked memory, to make sure pass phrases | |
| 70 | − * and other sensitive information are never written to disk. | |
| 69 | + * Limit the amount of locked memory by some sane default: | |
| 70 | + * root can always increase this limit if needed. | |
| 71 | + * | |
| 72 | + * The main use-cases are (1) preventing sensitive memory | |
| 73 | + * from being swapped; (2) real-time operations; (3) via | |
| 74 | + * IOURING_REGISTER_BUFFERS. | |
| 75 | + * | |
| 76 | + * The first two don't need much. The latter will take as | |
| 77 | + * much as it can get. 8MB is a reasonably sane default. | |
| 71 | 78 | */ |
| 72 | −#define MLOCK_LIMIT ((PAGE_SIZE > 64*1024) ? PAGE_SIZE : 64*1024) | |
| 79 | +#define MLOCK_LIMIT (8*1024*1024) | |
| 73 | 80 | |
| 74 | 81 | /* |
| 75 | 82 | * Due to binary compatibility, the actual resource numbers |