From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AAC732F28EA for ; Sat, 6 Jun 2026 03:50:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.130 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717843; cv=none; b=c/pb9VDMipbQxpCs+Svx6+hEEfZGJ5ACw1qkggbIdt97j5yTMAQXEYQPNM5AKQanYlTyTP9bvx17sVx4dfs4KWg0mTlUM6kuWZlSEWldfPegyVKPVJcxrVDzE4x237+i5wvGTgEt3u/Mx6CWI5i5KDoIVXzpYiEvJXx+vZoBaSU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717843; c=relaxed/simple; bh=U+fI/nceN7kWgOP/dcMnQdoULx/hTkMUomdPgmEdLaQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N4aDYgZyExg03TxYoVncjQzHjiIBt3AKcFGJaBsNQQLCdirh52eoUL4Ltvg7lk7sQ/GfgWaJzyyqKSxYjdd6roi02f9wqgZz+RWIe2srroPMlnmbpaSm6tFtV+p66nQlb2vgoQ0XJmDtFsxGTOeVgFDbOyV9EAZJvlQVE9TvSUM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de; spf=pass smtp.mailfrom=suse.de; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=PKsog34T; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=XQSlqUll; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=PKsog34T; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=XQSlqUll; arc=none smtp.client-ip=195.135.223.130 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=suse.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=suse.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="PKsog34T"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="XQSlqUll"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="PKsog34T"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="XQSlqUll" Received: from imap1.dmz-prg2.suse.org (unknown [10.150.64.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 27D186B36A; Sat, 6 Jun 2026 03:50:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d7KYi+xJrKG6IlHxcjmqGNj5lOE1J1MuLSqZzzDJwbQ=; b=PKsog34TpY2vp0upg/yQgvVTmVOGXS+D4/iaIGKgE1ksMzqcbrIue9Oh79IhCPlsPHv0g3 /O7W0VKLKv8pauzrGt6GCaiuHZmrzPi2P+4zql/2zb2DId9M0aj5Dcmrymp8e2lzQyvUeO /fw+Efuko7/0eMv2dtuV9+jSjyVO2f0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d7KYi+xJrKG6IlHxcjmqGNj5lOE1J1MuLSqZzzDJwbQ=; b=XQSlqUllUSQSO/gq0Gc9HAvCbFtmVBChS5wVdogZmusrYW3SVHR/MUt5TrVAmTgNk41tGM nTaHdfNGEqXfEjDA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d7KYi+xJrKG6IlHxcjmqGNj5lOE1J1MuLSqZzzDJwbQ=; b=PKsog34TpY2vp0upg/yQgvVTmVOGXS+D4/iaIGKgE1ksMzqcbrIue9Oh79IhCPlsPHv0g3 /O7W0VKLKv8pauzrGt6GCaiuHZmrzPi2P+4zql/2zb2DId9M0aj5Dcmrymp8e2lzQyvUeO /fw+Efuko7/0eMv2dtuV9+jSjyVO2f0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717836; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=d7KYi+xJrKG6IlHxcjmqGNj5lOE1J1MuLSqZzzDJwbQ=; b=XQSlqUllUSQSO/gq0Gc9HAvCbFtmVBChS5wVdogZmusrYW3SVHR/MUt5TrVAmTgNk41tGM nTaHdfNGEqXfEjDA== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 4316E779A7; Sat, 6 Jun 2026 03:50:35 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id MMt0DQuZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:35 +0000 From: Oscar Salvador To: Andrew Morton Cc: Dave Hansen , Karsten Desler , Muchun Song , David Hildenbrand , Lorenzo Stoakes , Vlastimil Babka , "Liam R . Howlett" , Andreas Larsson , "David S . Miller" , Huacai Chen , Alexander Gordeev , Gerald Schaefer , linux-kernel@vger.kernel.org, linux-mm@kvack.org, Oscar Salvador Subject: [PATCH 3/8] arch/x86: Stop special-casing hugetlb mappings in arch_get_unmapped_area Date: Sat, 6 Jun 2026 05:49:58 +0200 Message-ID: <20260606035003.529685-4-osalvador@suse.de> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260606035003.529685-1-osalvador@suse.de> References: <20260606035003.529685-1-osalvador@suse.de> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Flag: NO X-Spamd-Result: default: False [-2.80 / 50.00]; BAYES_HAM(-3.00)[100.00%]; MID_CONTAINS_FROM(1.00)[]; NEURAL_HAM_LONG(-1.00)[-1.000]; R_MISSING_CHARSET(0.50)[]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; TO_MATCH_ENVRCPT_ALL(0.00)[]; FROM_HAS_DN(0.00)[]; ARC_NA(0.00)[]; MIME_TRACE(0.00)[0:+]; TO_DN_SOME(0.00)[]; RCPT_COUNT_TWELVE(0.00)[16]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:mid]; RCVD_VIA_SMTP_AUTH(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; RCVD_COUNT_TWO(0.00)[2]; FUZZY_RATELIMITED(0.00)[rspamd.com]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; R_RATELIMIT(0.00)[to_ip_from(RLc9u4wub3os6qw36hzxobph9o)]; RCVD_TLS_ALL(0.00)[] X-Spam-Level: X-Spam-Score: -2.80 arch_get_unmapped_area* sets info.align_mask to make room for extra alignment, so that is added on top of the length we request in unmapped_area{_topdown}. hugetlb_get_unmapped_area() already adds this extra padding in the 'len' parameter, and it also masks off the address it gets to properly align it to the huge_page_size we are using. So, stop special-casing hugetlb in arch_get_unmapped_area* functions. Also, there is no need to worry about align_offset and start_gap because the former will be masked off back in hugetlb_get_unmapped_area() and the latter only applies to mappings created via vm_mmap_shadow_stack() which do not involve hugetlb. Signed-off-by: Oscar Salvador --- arch/x86/kernel/sys_x86_64.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/arch/x86/kernel/sys_x86_64.c b/arch/x86/kernel/sys_x86_64.c index 776ae6fa7f2d..1cf2dafd223b 100644 --- a/arch/x86/kernel/sys_x86_64.c +++ b/arch/x86/kernel/sys_x86_64.c @@ -18,7 +18,6 @@ #include #include #include -#include #include #include @@ -28,8 +27,6 @@ */ static unsigned long get_align_mask(struct file *filp) { - if (filp && is_file_hugepages(filp)) - return huge_page_mask_align(filp); /* handle 32- and 64-bit case with a single conditional */ if (va_align.flags < 0 || !(va_align.flags & (2 - mmap_is_ia32()))) return 0; @@ -151,10 +148,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, info.length = len; info.low_limit = begin; info.high_limit = end; - if (!(filp && is_file_hugepages(filp))) { - info.align_offset = pgoff << PAGE_SHIFT; - info.start_gap = stack_guard_placement(vm_flags); - } + info.align_offset = pgoff << PAGE_SHIFT; + info.start_gap = stack_guard_placement(vm_flags); if (filp) { info.align_mask = get_align_mask(filp); info.align_offset += get_align_bits(); @@ -205,10 +200,8 @@ arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr0, info.low_limit = PAGE_SIZE; info.high_limit = get_mmap_base(0); - if (!(filp && is_file_hugepages(filp))) { - info.start_gap = stack_guard_placement(vm_flags); - info.align_offset = pgoff << PAGE_SHIFT; - } + info.start_gap = stack_guard_placement(vm_flags); + info.align_offset = pgoff << PAGE_SHIFT; /* * If hint address is above DEFAULT_MAP_WINDOW, look for unmapped area -- 2.35.3