From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) (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 88A702F0661 for ; Sat, 6 Jun 2026 03:50:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=195.135.223.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717841; cv=none; b=jQcQ0bP5gVQMC2S8sDnt3h/OX9x+/CQwafzMWoXEg/BR57W2XgOR4iO/2RmqkEPbIs1E0BPD1lbWUatzipcjHWEMxKqQtDX4TqAROZRVHYNag00WoP3u7d/oeAZQSblmIOZDnjzmMQ2/gAjpKcxWUmEtsz5m1TXm1N9WrUu7idI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717841; c=relaxed/simple; bh=LbRvRFCRycIdxJXtt8Ts3onU2hrc4Nx7Vd5YRHpT7cE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AHnHVziNNK51AR51u9NO/KULj5MQ6smMEQWYQ2y7Z+8A6uXjiYep28fB18LB9if+NPZJrIYZu78S2CvlV24dBAFh0AdRCPBn9a8xBJc6kMXFOf92z/B/o2fc6ib18B9w+RiIiSWoZGu0htk5DfEgl/eGdMsGWl4HV+aGPYWfFAk= 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=zd7e6bMo; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=OOINykmD; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=zd7e6bMo; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=OOINykmD; arc=none smtp.client-ip=195.135.223.131 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="zd7e6bMo"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="OOINykmD"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="zd7e6bMo"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="OOINykmD" 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-out2.suse.de (Postfix) with ESMTPS id 2F59175BDC; Sat, 6 Jun 2026 03:50:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717835; 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=PiUHkYsEHrYPIfd24rvBp/nbuzBhF0loEn0qGJjej88=; b=zd7e6bMot+n41fRdWRjK+zqJkovr2Fc5exf5AwbHTzAk7ezdCj+OUE4G+a64eR3oXs/5to lJ83IPchuUSXCKv0T8q6vDSbUB/btp0FQ/BZ5PBxYcH27KpusnZCDMoFYVKxwo3kxm1oiP Yu8ZlsymBKld+DOmM06btsuy52XsZmQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717835; 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=PiUHkYsEHrYPIfd24rvBp/nbuzBhF0loEn0qGJjej88=; b=OOINykmDQN3+6wcQTjl5ayRcYRwb5rqkgcZ/JxKKGAGTxyz8hpzM/6yUQ+yj8QVpvvdJnG Nvnb0h4cWdS7xUAw== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717835; 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=PiUHkYsEHrYPIfd24rvBp/nbuzBhF0loEn0qGJjej88=; b=zd7e6bMot+n41fRdWRjK+zqJkovr2Fc5exf5AwbHTzAk7ezdCj+OUE4G+a64eR3oXs/5to lJ83IPchuUSXCKv0T8q6vDSbUB/btp0FQ/BZ5PBxYcH27KpusnZCDMoFYVKxwo3kxm1oiP Yu8ZlsymBKld+DOmM06btsuy52XsZmQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717835; 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=PiUHkYsEHrYPIfd24rvBp/nbuzBhF0loEn0qGJjej88=; b=OOINykmDQN3+6wcQTjl5ayRcYRwb5rqkgcZ/JxKKGAGTxyz8hpzM/6yUQ+yj8QVpvvdJnG Nvnb0h4cWdS7xUAw== 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 5022F779A7; Sat, 6 Jun 2026 03:50:34 +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 gOm8EAqZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:34 +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 2/8] mm/mmap: Stop special-casing hugetlb in generic_get_unmapped_area path Date: Sat, 6 Jun 2026 05:49:57 +0200 Message-ID: <20260606035003.529685-3-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-Spam-Score: -2.80 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:+]; 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]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[] X-Spam-Level: generic_get_unmapped_area* sets info.align_mask to make room for extra alignment, so that is added on top of the length we requested 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. Stop special-casing hugetlb in generic_get_unmapped_area* functions. Signed-off-by: Oscar Salvador --- mm/mmap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/mm/mmap.c b/mm/mmap.c index 5754d1c36462..e4defe9fb1b7 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -715,8 +715,6 @@ generic_get_unmapped_area(struct file *filp, unsigned long addr, info.low_limit = mm->mmap_base; info.high_limit = mmap_end; info.start_gap = stack_guard_placement(vm_flags); - if (filp && is_file_hugepages(filp)) - info.align_mask = huge_page_mask_align(filp); return vm_unmapped_area(&info); } @@ -767,8 +765,6 @@ generic_get_unmapped_area_topdown(struct file *filp, unsigned long addr, info.low_limit = PAGE_SIZE; info.high_limit = arch_get_mmap_base(addr, mm->mmap_base); info.start_gap = stack_guard_placement(vm_flags); - if (filp && is_file_hugepages(filp)) - info.align_mask = huge_page_mask_align(filp); addr = vm_unmapped_area(&info); /* -- 2.35.3