Skip to content

Commit

Permalink
x86/mm: Replace open-coded gap bounding with clamp()
Browse files Browse the repository at this point in the history
Rather than manually bounding gap between gap_min and gap_max,
use the well-known clamp() macro to make the code easier to read.

Signed-off-by: Qasim Ijaz <qasdev00@gmail.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20250215125249.10729-1-qasdev00@gmail.com
  • Loading branch information
Qasim Ijaz authored and Ingo Molnar committed Feb 21, 2025
1 parent 81256a5 commit 282f395
Showing 1 changed file with 1 addition and 8 deletions.
9 changes: 1 addition & 8 deletions arch/x86/mm/mmap.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ static unsigned long mmap_base(unsigned long rnd, unsigned long task_size,
{
unsigned long gap = rlim_stack->rlim_cur;
unsigned long pad = stack_maxrandom_size(task_size) + stack_guard_gap;
unsigned long gap_min, gap_max;

/* Values close to RLIM_INFINITY can overflow. */
if (gap + pad > gap)
Expand All @@ -94,13 +93,7 @@ static unsigned long mmap_base(unsigned long rnd, unsigned long task_size,
* Top of mmap area (just below the process stack).
* Leave an at least ~128 MB hole with possible stack randomization.
*/
gap_min = SIZE_128M;
gap_max = (task_size / 6) * 5;

if (gap < gap_min)
gap = gap_min;
else if (gap > gap_max)
gap = gap_max;
gap = clamp(gap, SIZE_128M, (task_size / 6) * 5);

return PAGE_ALIGN(task_size - gap - rnd);
}
Expand Down

0 comments on commit 282f395

Please sign in to comment.