From nobody Mon Jun 8 06:36:55 2026 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 3CE731A724C for ; Sat, 6 Jun 2026 03:50:36 +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=1780717837; cv=none; b=vAMj7jZcM0mFOr96yxxjg1eEs5TeA/vAOn2VwEovGwoDVxdYIqfl76nKlRcdl37X5uKC+QUhBq38O8k8HYJ8mZ33FELuwjWxOwhUy8K+mAQXgaQJodggECnBctWimh6Wyr9gHftcVLBSir9DHoI4yk5f0aaIO9Fivt04w0Dwq2Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717837; c=relaxed/simple; bh=xPQl1xgk4KnDJEvzwWJrdltJ95l76KBvHNy64vdYsh4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=unIBVBFgt6idO3u+/hQTHs7P4rZWIl7MlfGMJK2uaUGPrYMx7UYWZGDnCP+iwJOagR8cp3oT3sjjKWxLVr2Tb9oKIc/TP76s1GvQc7z8unl++9jFkwO21iYpev0XW6UpAya/UJZHHfzmlSaN/dy6067bLXbCdxw6G7U/OyJfviE= 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=huQW4xxB; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=f+E3cFfL; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=huQW4xxB; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=f+E3cFfL; 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="huQW4xxB"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="f+E3cFfL"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="huQW4xxB"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="f+E3cFfL" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 3B4326B341; Sat, 6 Jun 2026 03:50:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717834; 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=gILGC54YllDJCaWwgWBdRVH7kRRphrRc85OeaLBmt3c=; b=huQW4xxBTIAxaRXB6trlcWTcgaUaAaV9BXoNXC+qlzO0FoFjGyfQQWHzIVbiy93Z+plCnf DC96+q3GgcTW2J/zwWxNju9i6sfu/aUpgFJAwnTL962qUUdstWzfq3pTKH7PY8Y/7/Qijy hCPoM9wwt81oTTeAUBV3By1P2t7DkuQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717834; 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=gILGC54YllDJCaWwgWBdRVH7kRRphrRc85OeaLBmt3c=; b=f+E3cFfL/kX2m7aCDvhoFJLgaOw6mhwc28JiYQ9htfE6abNmw+UhbGaDSWGtoDhzCVdosz krxUmuMFyIz9vlDQ== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=huQW4xxB; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=f+E3cFfL DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717834; 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=gILGC54YllDJCaWwgWBdRVH7kRRphrRc85OeaLBmt3c=; b=huQW4xxBTIAxaRXB6trlcWTcgaUaAaV9BXoNXC+qlzO0FoFjGyfQQWHzIVbiy93Z+plCnf DC96+q3GgcTW2J/zwWxNju9i6sfu/aUpgFJAwnTL962qUUdstWzfq3pTKH7PY8Y/7/Qijy hCPoM9wwt81oTTeAUBV3By1P2t7DkuQ= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717834; 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=gILGC54YllDJCaWwgWBdRVH7kRRphrRc85OeaLBmt3c=; b=f+E3cFfL/kX2m7aCDvhoFJLgaOw6mhwc28JiYQ9htfE6abNmw+UhbGaDSWGtoDhzCVdosz krxUmuMFyIz9vlDQ== 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 5B7EE779A9; Sat, 6 Jun 2026 03:50:33 +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 KIiMEwmZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:33 +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 1/8] mm,hugetlb: Encode extra padding for aligning directly in hugetlb_get_unmapped_area Date: Sat, 6 Jun 2026 05:49:56 +0200 Message-ID: <20260606035003.529685-2-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: quoted-printable X-Spam-Flag: NO X-Rspamd-Action: no action X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 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)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWELVE(0.00)[16]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLydsffr49uzh5ztt7hyfaj4uc)]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:email,suse.de:dkim,suse.de:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Queue-Id: 3B4326B341 X-Spam-Score: -3.01 Content-Type: text/plain; charset="utf-8" Currently, for hugetlb mappings arches query the align_mask needed in order= to satisfy allocating a gap for the mapping, as it counts the worst-case scena= rio which is being off by one page from boundary of the next hugetlb aligned ad= dress. Later on, unmapped_area{_topdown} add this 'align_mask' on top of the mapping's length we requested to count for worst-case scenario and get a gap big enough, and then do the proper masking off once we get the address. This means we have to special case hugetlb in quite a few places to first 1) ignore align_offset and 2) return a proper align_mask, but we can just do as THP mappings do and encode the align_mask directly in hugetlb_get_unmapp= ed_area and pass that down to mm_get_unmapped_area_vmflags. Once we get the address, we can properly mask it off before handing it over= to userspace. This also allows us to fix a regression on AMD15h family for hugetlb mappings [1]. [1] https://lore.kernel.org/linux-mm/20260527143643.GO31091@soohrt.org/ Fixes: 7bd3f1e1a9ae ("mm: make hugetlb mappings go through mm_get_unmapped_= area_vmflags") Reported-by: Karsten Desler Closes: https://lore.kernel.org/linux-mm/20260527143643.GO31091@soohrt.org/ Signed-off-by: Oscar Salvador Acked-by: Dave Hansen --- fs/hugetlbfs/inode.c | 25 ++++++++++++++++++++++++- include/linux/hugetlb.h | 2 +- 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 78d61bf2bd9b..da9bfb5b79f7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -184,7 +184,30 @@ hugetlb_get_unmapped_area(struct file *file, unsigned = long addr, if (addr) addr0 =3D ALIGN(addr, huge_page_size(h)); =20 - return mm_get_unmapped_area_vmflags(file, addr0, len, pgoff, flags, 0); + /* + * hugetlb mappings need to be huge page aligned. + * mm_get_unmapped_area_vmflags() only gives back PAGE_SIZE aligned + * areas. + * + * Extend the requested unmapped area for the worse case scenario: + * the address comes back and needs to be aligned up to by one small + * page short of a large page. + */ + len +=3D huge_page_size(h) - PAGE_SIZE; + /* + * pgoff is being used for coloring, but hugetlb mappings need strict + * alignment, so it is always ignored by special casing it down the road. + * Set it to 0 here, so we do not need to be hugetlb-aware later on. + */ + pgoff =3D 0; + addr0 =3D mm_get_unmapped_area_vmflags(file, addr0, len, pgoff, flags, 0); + if (IS_ERR_VALUE(addr0)) + return addr0; + + /* Align the address to the next huge_page_size boundary */ + addr0 =3D ALIGN(addr0, huge_page_size(h)); + + return addr0; } =20 /* diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 5957bc25efa8..924e9a464214 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -1085,7 +1085,7 @@ bool is_raw_hwpoison_page_in_hugepage(struct page *pa= ge); =20 static inline unsigned long huge_page_mask_align(struct file *file) { - return PAGE_MASK & ~huge_page_mask(hstate_file(file)); + return 0; } =20 #else /* CONFIG_HUGETLB_PAGE */ --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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: quoted-printable 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: Content-Type: text/plain; charset="utf-8" generic_get_unmapped_area* sets info.align_mask to make room for extra alig= nment, so that is added on top of the length we requested in unmapped_area{_topdow= n}. 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 l= ong addr, info.low_limit =3D mm->mmap_base; info.high_limit =3D mmap_end; info.start_gap =3D stack_guard_placement(vm_flags); - if (filp && is_file_hugepages(filp)) - info.align_mask =3D huge_page_mask_align(filp); return vm_unmapped_area(&info); } =20 @@ -767,8 +765,6 @@ generic_get_unmapped_area_topdown(struct file *filp, un= signed long addr, info.low_limit =3D PAGE_SIZE; info.high_limit =3D arch_get_mmap_base(addr, mm->mmap_base); info.start_gap =3D stack_guard_placement(vm_flags); - if (filp && is_file_hugepages(filp)) - info.align_mask =3D huge_page_mask_align(filp); addr =3D vm_unmapped_area(&info); =20 /* --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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: quoted-printable 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 Content-Type: text/plain; charset="utf-8" arch_get_unmapped_area* sets info.align_mask to make room for extra alignme= nt, 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 =20 #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 lon= g addr, unsigned long len, info.length =3D len; info.low_limit =3D begin; info.high_limit =3D end; - if (!(filp && is_file_hugepages(filp))) { - info.align_offset =3D pgoff << PAGE_SHIFT; - info.start_gap =3D stack_guard_placement(vm_flags); - } + info.align_offset =3D pgoff << PAGE_SHIFT; + info.start_gap =3D stack_guard_placement(vm_flags); if (filp) { info.align_mask =3D get_align_mask(filp); info.align_offset +=3D get_align_bits(); @@ -205,10 +200,8 @@ arch_get_unmapped_area_topdown(struct file *filp, unsi= gned long addr0, info.low_limit =3D PAGE_SIZE; =20 info.high_limit =3D get_mmap_base(0); - if (!(filp && is_file_hugepages(filp))) { - info.start_gap =3D stack_guard_placement(vm_flags); - info.align_offset =3D pgoff << PAGE_SHIFT; - } + info.start_gap =3D stack_guard_placement(vm_flags); + info.align_offset =3D pgoff << PAGE_SHIFT; =20 /* * If hint address is above DEFAULT_MAP_WINDOW, look for unmapped area --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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 289921A724C for ; Sat, 6 Jun 2026 03:50:47 +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=1780717848; cv=none; b=mw6t8dMB0+NdzH0jQg/VAve1L0GmaYzO90ynQDeO0akx7QjJtxsdK8fTDAMeQ1ZkdD/lvM/8KuQ5/R2rHM8aAEJWsqJ34BCyL9v1HbTKdVteDbtfpTIGDqnkJ8i78Dzkzbsj3MyyNZPin7H2Ij6oFkiO3bPkI2ow24SNB5Qz7MY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717848; c=relaxed/simple; bh=300Dc/LzopMI3iXG0tcgelg+wPNGHOd/6R1bvXWxqzQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XAM4f5sx1rTAWsu1BAaXw8yKtC6KW0Hx/xZI6Dem5SMwI061J+mj8yMfjoDiCRDEFFNXqw+2rd3FgS/9h66DWrsplQNOfNvQhqWYOB/klqZvPBmdsx1hqRIC0Hv16qFhNbKLJeBhkTPhlyrifeuhOXze8pjm7iS6dyByGer5MjI= 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=Q4ztDXPB; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=5S0NlQBz; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=Q4ztDXPB; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=5S0NlQBz; 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="Q4ztDXPB"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="5S0NlQBz"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="Q4ztDXPB"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="5S0NlQBz" 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 1FFE375BDE; Sat, 6 Jun 2026 03:50:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717837; 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=BDlgH9aSqIdzXSD7JG6derrdSKWB6MQxgYZfJ4EGB8s=; b=Q4ztDXPBLcaHYm+L8qXSkEdcrF4igvm0r/R9k2NEGWyW4A4L+mktn5MEcPMbhm+0pv+EXf pYtPP/3HW2KUEHMsWCT09G8aYwlrckI92Yep2KJz5+D+dBjXC3KU9sgZcDWQxHou2hBeVb dnd6o9/zXQ6IjeVVTdARwiku+ZMeF34= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717837; 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=BDlgH9aSqIdzXSD7JG6derrdSKWB6MQxgYZfJ4EGB8s=; b=5S0NlQBzmndHRXaN6jPO4w46liqMQu85bz8rBTtDcHCmDj4jdmvKuiFW+WQXKpJ2KzxbMo 1TxGecZIdQ+ihpAQ== Authentication-Results: smtp-out2.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717837; 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=BDlgH9aSqIdzXSD7JG6derrdSKWB6MQxgYZfJ4EGB8s=; b=Q4ztDXPBLcaHYm+L8qXSkEdcrF4igvm0r/R9k2NEGWyW4A4L+mktn5MEcPMbhm+0pv+EXf pYtPP/3HW2KUEHMsWCT09G8aYwlrckI92Yep2KJz5+D+dBjXC3KU9sgZcDWQxHou2hBeVb dnd6o9/zXQ6IjeVVTdARwiku+ZMeF34= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717837; 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=BDlgH9aSqIdzXSD7JG6derrdSKWB6MQxgYZfJ4EGB8s=; b=5S0NlQBzmndHRXaN6jPO4w46liqMQu85bz8rBTtDcHCmDj4jdmvKuiFW+WQXKpJ2KzxbMo 1TxGecZIdQ+ihpAQ== 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 3B4FF779A9; Sat, 6 Jun 2026 03:50:36 +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 AHmPCwyZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:36 +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 4/8] arch/s390: Stop special-casing hugetlb mappings in arch_get_unmapped_area Date: Sat, 6 Jun 2026 05:49:59 +0200 Message-ID: <20260606035003.529685-5-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: quoted-printable 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:+]; 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: Content-Type: text/plain; charset="utf-8" arch_get_unmapped_area* sets info.align_mask to make room for extra alignme= nt, 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 because that will be masked off back in hugetlb_get_unmapped_area(). Signed-off-by: Oscar Salvador --- arch/s390/mm/mmap.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index 2a222a7e14f4..46c29738c5ef 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -16,7 +16,6 @@ #include #include #include -#include #include =20 static unsigned long stack_maxrandom_size(void) @@ -66,8 +65,6 @@ static inline unsigned long mmap_base(unsigned long rnd, =20 static int get_align_mask(struct file *filp, unsigned long flags) { - if (filp && is_file_hugepages(filp)) - return huge_page_mask_align(filp); if (!(current->flags & PF_RANDOMIZE)) return 0; if (filp || (flags & MAP_SHARED)) @@ -101,8 +98,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, = unsigned long addr, info.low_limit =3D mm->mmap_base; info.high_limit =3D TASK_SIZE; info.align_mask =3D get_align_mask(filp, flags); - if (!(filp && is_file_hugepages(filp))) - info.align_offset =3D pgoff << PAGE_SHIFT; + info.align_offset =3D pgoff << PAGE_SHIFT; addr =3D vm_unmapped_area(&info); if (offset_in_page(addr)) return addr; @@ -140,8 +136,7 @@ unsigned long arch_get_unmapped_area_topdown(struct fil= e *filp, unsigned long ad info.low_limit =3D PAGE_SIZE; info.high_limit =3D mm->mmap_base; info.align_mask =3D get_align_mask(filp, flags); - if (!(filp && is_file_hugepages(filp))) - info.align_offset =3D pgoff << PAGE_SHIFT; + info.align_offset =3D pgoff << PAGE_SHIFT; addr =3D vm_unmapped_area(&info); =20 /* --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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 7F9EE26A0DD for ; Sat, 6 Jun 2026 03:50:47 +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=1780717848; cv=none; b=KVcG0jbcydpszrKk+qyPAobc3CbY2fkI03zWIW+r07CCQOeRzz6HLHzg9OBhRUY0pycoqJZGn3wPcVJiwpoZucWDJeJUP6IEs2b7W5ZLb0uyg1+2/E4TOAYhWu+eSCRkrxL9AUMZWgXOQxI0aH+F0Wk2QTFHcwdrleFXQPjBNTU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717848; c=relaxed/simple; bh=d9pldVysQx/UdeljNGmg5q4IFsQwXKSXbwI8UyNv3Qc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Fwh79mswNgqy2MfWxs3sdG9o71c0ypOFyBoQECKoc5YjDf5YwmZMF1o2sH7jhNqpj9mWisVvtvTyb36frf7YR3pcZU1VxHodsUjAoChBjbuxtoCnsIdVfbJIszGvX+6djivCOUnY6sM7fWMFb8/8okgivNuI6pXmO6WX7HnBCnM= 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=HeGGMkjR; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=CQ7A8D37; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=HeGGMkjR; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=CQ7A8D37; 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="HeGGMkjR"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="CQ7A8D37"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="HeGGMkjR"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="CQ7A8D37" 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 13CA96B36B; Sat, 6 Jun 2026 03:50:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717838; 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=rwiYKTL28ZES39WOcBBLGMzPy8yj5CG2CTO54MD2F7M=; b=HeGGMkjR51HA/4VGh6pfRPBl7OfAW2HlguNYRJIYW5oj5nHwRezEEvxp4YfefGDZMTW8J/ 0jzIPj8O1R4TFHofr/ZtJ6WaXX1QFy4/HhMpW4Sz2cF7gYeQKQZ+zAjf70iiRKlIsfJBj3 TDyJAYmRKOyjo0YaSY0Cgvs9aNpilzw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717838; 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=rwiYKTL28ZES39WOcBBLGMzPy8yj5CG2CTO54MD2F7M=; b=CQ7A8D37XEYAdmccBNtNoA7sUjxe/UAr+w+gXOUNopGiauAA0XtG8ZLTkdocmQLpdTgzor wbhX8R7Z4++K3ICw== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717838; 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=rwiYKTL28ZES39WOcBBLGMzPy8yj5CG2CTO54MD2F7M=; b=HeGGMkjR51HA/4VGh6pfRPBl7OfAW2HlguNYRJIYW5oj5nHwRezEEvxp4YfefGDZMTW8J/ 0jzIPj8O1R4TFHofr/ZtJ6WaXX1QFy4/HhMpW4Sz2cF7gYeQKQZ+zAjf70iiRKlIsfJBj3 TDyJAYmRKOyjo0YaSY0Cgvs9aNpilzw= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717838; 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=rwiYKTL28ZES39WOcBBLGMzPy8yj5CG2CTO54MD2F7M=; b=CQ7A8D37XEYAdmccBNtNoA7sUjxe/UAr+w+gXOUNopGiauAA0XtG8ZLTkdocmQLpdTgzor wbhX8R7Z4++K3ICw== 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 32715779A7; Sat, 6 Jun 2026 03:50:37 +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 kNpyCQ2ZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:37 +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 5/8] arch/loongarch: Stop special-casing hugetlb in arch_get_unmapped_area_common Date: Sat, 6 Jun 2026 05:50:00 +0200 Message-ID: <20260606035003.529685-6-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: quoted-printable 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 Content-Type: text/plain; charset="utf-8" arch_get_unmapped_* 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 masks off the address it gets to properly align it to the huge_page_size we are using. Stop special-casing hugetlb in arch_get_unmapped_area_common. The only caveat is that we might get extra align_mask in case we do colorin= g, but that should only make us allocate a larger(ish) gap in unmapped_area{_t= opdown}. Signed-off-by: Oscar Salvador --- arch/loongarch/mm/mmap.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/arch/loongarch/mm/mmap.c b/arch/loongarch/mm/mmap.c index 1df9e99582cc..8f0af181f902 100644 --- a/arch/loongarch/mm/mmap.c +++ b/arch/loongarch/mm/mmap.c @@ -3,7 +3,6 @@ * Copyright (C) 2020-2022 Loongson Technology Corporation Limited */ #include -#include #include #include #include @@ -65,10 +64,7 @@ static unsigned long arch_get_unmapped_area_common(struc= t file *filp, =20 info.length =3D len; info.align_offset =3D pgoff << PAGE_SHIFT; - if (filp && is_file_hugepages(filp)) - info.align_mask =3D huge_page_mask_align(filp); - else - info.align_mask =3D do_color_align ? (PAGE_MASK & SHM_ALIGN_MASK) : 0; + info.align_mask =3D do_color_align ? (PAGE_MASK & SHM_ALIGN_MASK) : 0; =20 if (dir =3D=3D DOWN) { info.flags =3D VM_UNMAPPED_AREA_TOPDOWN; --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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 BFA3F28B4E2 for ; Sat, 6 Jun 2026 03:50:52 +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=1780717854; cv=none; b=p67w+ZcvoMH6OD3ro8IapBjRLtEslW3uKFJGwmN/3wRC0/OSd0MZulGXg8JzMRVfwIlx0I8y9PXBmn8cDzqu8zwxeHjKrMpZ7wfOBpPQugjqxFVb25ZILFJMeycxKsPKbtytjOVNopZvh9yljdbWpoVbxNaTPalfp6TYx6+e9sM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717854; c=relaxed/simple; bh=sHIDxSpMrWwinCwgr4LfNJBV95ujPhhZcX9mvxq54LA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kYLHk8aHWHOV0zZv0nqeffFiRBOIVDgD5/P8fh8ps8dRQdCI7gJ/Bo+IPj9fU3kbtA+h07cYnknFBR7W5XCSWfzPNlNxPuQX22qZB25W3P/WP1SsKqMJuQkreg79pW3togAt3/UZAiVQcBIALhMHg8pa8oMXbowNFkb5HgFkuAw= 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=ALVKPqha; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=xJrDAWN+; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=ALVKPqha; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=xJrDAWN+; 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="ALVKPqha"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="xJrDAWN+"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="ALVKPqha"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="xJrDAWN+" 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 055546B372; Sat, 6 Jun 2026 03:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717839; 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=KR/vS1wU8YZ9Cn0li+AjQl/MlIm/5L0WY4IzBi/9Y3U=; b=ALVKPqhaMIBib2qf0eYqvFVIg+Nr/q5aX1ue7FJ3MazH6zs7U5rXaZUCbGq0z1DosX5t4A Jkj9FG71I23T0djwbsf1g8ZlHWIVnPGzQJSPUdy84TSnVggwPqs9IAnudlRS01IUCxG4l+ OAIJ5l9+idhx72y0fl5r2DNvlWbiP2U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717839; 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=KR/vS1wU8YZ9Cn0li+AjQl/MlIm/5L0WY4IzBi/9Y3U=; b=xJrDAWN+Ct78ffniZWVhS6NSe/XrBJChDAuyXCZcg2uG8kGQhkZVoNT90uCUmvx+oVCUz4 4LtsqPOiy+2k/1BA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717839; 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=KR/vS1wU8YZ9Cn0li+AjQl/MlIm/5L0WY4IzBi/9Y3U=; b=ALVKPqhaMIBib2qf0eYqvFVIg+Nr/q5aX1ue7FJ3MazH6zs7U5rXaZUCbGq0z1DosX5t4A Jkj9FG71I23T0djwbsf1g8ZlHWIVnPGzQJSPUdy84TSnVggwPqs9IAnudlRS01IUCxG4l+ OAIJ5l9+idhx72y0fl5r2DNvlWbiP2U= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717839; 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=KR/vS1wU8YZ9Cn0li+AjQl/MlIm/5L0WY4IzBi/9Y3U=; b=xJrDAWN+Ct78ffniZWVhS6NSe/XrBJChDAuyXCZcg2uG8kGQhkZVoNT90uCUmvx+oVCUz4 4LtsqPOiy+2k/1BA== 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 27384779A9; Sat, 6 Jun 2026 03:50:38 +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 GH/VBg6ZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:38 +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 6/8] arch/sparc64: Stop special-casing hugetlb mappings in arch_get_unmapped_area Date: Sat, 6 Jun 2026 05:50:01 +0200 Message-ID: <20260606035003.529685-7-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: quoted-printable 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 Content-Type: text/plain; charset="utf-8" arch_get_unmapped_area* sets info.align_mask to make room for extra alignme= nt, 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 because that will be masked off back in hugetlb_get_unmapped_area(). Signed-off-by: Oscar Salvador --- arch/sparc/kernel/sys_sparc_64.c | 25 ++++++------------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/arch/sparc/kernel/sys_sparc_64.c b/arch/sparc/kernel/sys_sparc= _64.c index ecefcffcf7b1..6823162befa0 100644 --- a/arch/sparc/kernel/sys_sparc_64.c +++ b/arch/sparc/kernel/sys_sparc_64.c @@ -30,7 +30,6 @@ #include #include #include -#include =20 #include #include @@ -90,8 +89,6 @@ static inline unsigned long COLOR_ALIGN(unsigned long add= r, =20 static unsigned long get_align_mask(struct file *filp, unsigned long flags) { - if (filp && is_file_hugepages(filp)) - return huge_page_mask_align(filp); if (filp || (flags & MAP_SHARED)) return PAGE_MASK & (SHMLBA - 1); =20 @@ -105,16 +102,12 @@ unsigned long arch_get_unmapped_area(struct file *fil= p, unsigned long addr, unsi unsigned long task_size =3D TASK_SIZE; int do_color_align; struct vm_unmapped_area_info info =3D {}; - bool file_hugepage =3D false; - - if (filp && is_file_hugepages(filp)) - file_hugepage =3D true; =20 if (flags & MAP_FIXED) { /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ - if (!file_hugepage && (flags & MAP_SHARED) && + if ((flags & MAP_SHARED) && ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; @@ -126,7 +119,7 @@ unsigned long arch_get_unmapped_area(struct file *filp,= unsigned long addr, unsi return -ENOMEM; =20 do_color_align =3D 0; - if ((filp || (flags & MAP_SHARED)) && !file_hugepage) + if ((filp || (flags & MAP_SHARED))) do_color_align =3D 1; =20 if (addr) { @@ -145,8 +138,7 @@ unsigned long arch_get_unmapped_area(struct file *filp,= unsigned long addr, unsi info.low_limit =3D TASK_UNMAPPED_BASE; info.high_limit =3D min(task_size, VA_EXCLUDE_START); info.align_mask =3D get_align_mask(filp, flags); - if (!file_hugepage) - info.align_offset =3D pgoff << PAGE_SHIFT; + info.align_offset =3D pgoff << PAGE_SHIFT; addr =3D vm_unmapped_area(&info); =20 if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) { @@ -170,19 +162,15 @@ arch_get_unmapped_area_topdown(struct file *filp, con= st unsigned long addr0, unsigned long addr =3D addr0; int do_color_align; struct vm_unmapped_area_info info =3D {}; - bool file_hugepage =3D false; =20 /* This should only ever run for 32-bit processes. */ BUG_ON(!test_thread_flag(TIF_32BIT)); =20 - if (filp && is_file_hugepages(filp)) - file_hugepage =3D true; - if (flags & MAP_FIXED) { /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ - if (!file_hugepage && (flags & MAP_SHARED) && + if ((flags & MAP_SHARED) && ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; @@ -192,7 +180,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const= unsigned long addr0, return -ENOMEM; =20 do_color_align =3D 0; - if ((filp || (flags & MAP_SHARED)) && !file_hugepage) + if ((filp || (flags & MAP_SHARED))) do_color_align =3D 1; =20 /* requesting a specific address */ @@ -213,8 +201,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const= unsigned long addr0, info.low_limit =3D PAGE_SIZE; info.high_limit =3D mm->mmap_base; info.align_mask =3D get_align_mask(filp, flags); - if (!file_hugepage) - info.align_offset =3D pgoff << PAGE_SHIFT; + info.align_offset =3D pgoff << PAGE_SHIFT; addr =3D vm_unmapped_area(&info); =20 /* --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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 15BBF2F547F for ; Sat, 6 Jun 2026 03:50:58 +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=1780717860; cv=none; b=nGHJe+Ue0+4kynldWZ1KOZi8mXHh/VkJQ8WJkfwKRmdLCObGFg7GIUNMvucpyeKHIRVszWoxzgbmHoQaW53dMiTvQWkQPdE9oB1NKdreVtmThibSjC7FSP99aZAXhhNgTxzBdUsGiyA6M9PnlMBRXU/SwlcJECRP8xJ9o1kY01k= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717860; c=relaxed/simple; bh=LHPWmTlRfrhdfwEy7YaLAoELdR8jN7mf+jIlwnYwvYQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Lx2bNRYejF3F/vhZtg1NcVCtPN4kKXL3iztAByI7ckz4108RTf/XXVPccd9P53Qg5lnTcP+jQO1CgBHv9zYf5KkcKcQVBVP9hnDCQAHR6a+yBmN2M78RtDtq+8tGjNldjNIJwby3DuRRDVyK5QIxEXN1/FM+H9W97ncTeubV400= 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=gseG4dB3; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=OMOV4Lui; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=edv1iVWr; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=3V7xnSAU; 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="gseG4dB3"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="OMOV4Lui"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="edv1iVWr"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="3V7xnSAU" Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104: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 F17946B473; Sat, 6 Jun 2026 03:50:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717840; 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=23nljHwZN8InoElJ8nnzrgWbXOooBuedRgi6MNI+VtE=; b=gseG4dB36reexuERC5kjThl1hLPfxICMguSm57v08kDn3GSJsgjXn6aO+VPL7vw53gkpYI EhS7+X9BFc3bYLPTrY73vPfOJW+c5AV4xAwg8sKRzaHKqjZgZPY9XKsokW6T+NqiPyRyvL Cm7+3p7WvIhAVxS0LELiHxBl5EKeaJ0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717840; 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=23nljHwZN8InoElJ8nnzrgWbXOooBuedRgi6MNI+VtE=; b=OMOV4LuifaUsuyOe1mNSMBIQgGbBzJNjw3OxTW5Bm1LlXjbGDzu3FaGH3MQVfDzgCnuKv9 SSAcCj0BaI6NicCg== Authentication-Results: smtp-out1.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=edv1iVWr; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=3V7xnSAU DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717839; 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=23nljHwZN8InoElJ8nnzrgWbXOooBuedRgi6MNI+VtE=; b=edv1iVWrollF3PtT0lW0v1Ni2xwoABffKHquNwFGE+Qrzu0GqAcqX/pHcPgjkGoyvof0eg r/lNmuS34ARydgHq8oDW4PjlwiOqnY7ENzLyDaKtHyu57xDt9Xut1KHYW8rsmDx7tRCox8 ERkS8stUr5DQS8lLAS1/7uNSZn+PWhc= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717839; 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=23nljHwZN8InoElJ8nnzrgWbXOooBuedRgi6MNI+VtE=; b=3V7xnSAUiH82Mm7d2IpaEP7HgCdLnkRs1iZbF6lRIDlwXchCcFU2sKIgd7sDcjFLSkgDh9 O9y4lfHCLSXuLWBQ== 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 19530779A7; Sat, 6 Jun 2026 03:50:39 +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 6LZiAw+ZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:39 +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 7/8] arch/sparc32: Rip out hugetlb from sys_sparc_32.c Date: Sat, 6 Jun 2026 05:50:02 +0200 Message-ID: <20260606035003.529685-8-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: quoted-printable X-Rspamd-Action: no action X-Rspamd-Queue-Id: F17946B473 X-Spam-Flag: NO X-Spam-Score: -3.01 X-Spam-Level: X-Spamd-Result: default: False [-3.01 / 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)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; RCPT_COUNT_TWELVE(0.00)[16]; ARC_NA(0.00)[]; FUZZY_RATELIMITED(0.00)[rspamd.com]; TO_DN_SOME(0.00)[]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; R_RATELIMIT(0.00)[to_ip_from(RLydsffr49uzh5ztt7hyfaj4uc)]; RCVD_TLS_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:email,suse.de:mid]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd1.dmz-prg2.suse.org Content-Type: text/plain; charset="utf-8" ARCH_SUPPORTS_HUGETLBFS is only select for sparc64, so rip out hugetlb-spec= ial-casing from sys_sparc_32.c. Signed-off-by: Oscar Salvador --- arch/sparc/kernel/sys_sparc_32.c | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/arch/sparc/kernel/sys_sparc_32.c b/arch/sparc/kernel/sys_sparc= _32.c index fb31bc0c5b48..960f719b2257 100644 --- a/arch/sparc/kernel/sys_sparc_32.c +++ b/arch/sparc/kernel/sys_sparc_32.c @@ -23,7 +23,6 @@ #include #include #include -#include =20 #include #include @@ -43,16 +42,12 @@ SYSCALL_DEFINE0(getpagesize) unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr= , unsigned long len, unsigned long pgoff, unsigned long flags, vm_flags_t v= m_flags) { struct vm_unmapped_area_info info =3D {}; - bool file_hugepage =3D false; - - if (filp && is_file_hugepages(filp)) - file_hugepage =3D true; =20 if (flags & MAP_FIXED) { /* We do not accept a shared mapping if it would violate * cache aliasing constraints. */ - if (!file_hugepage && (flags & MAP_SHARED) && + if ((flags & MAP_SHARED) && ((addr - (pgoff << PAGE_SHIFT)) & (SHMLBA - 1))) return -EINVAL; return addr; @@ -67,13 +62,8 @@ unsigned long arch_get_unmapped_area(struct file *filp, = unsigned long addr, unsi info.length =3D len; info.low_limit =3D addr; info.high_limit =3D TASK_SIZE; - if (!file_hugepage) { - info.align_mask =3D (flags & MAP_SHARED) ? - (PAGE_MASK & (SHMLBA - 1)) : 0; - info.align_offset =3D pgoff << PAGE_SHIFT; - } else { - info.align_mask =3D huge_page_mask_align(filp); - } + info.align_mask =3D (flags & MAP_SHARED) ? (PAGE_MASK & (SHMLBA - 1)) : 0; + info.align_offset =3D pgoff << PAGE_SHIFT; return vm_unmapped_area(&info); } =20 --=20 2.35.3 From nobody Mon Jun 8 06:36:55 2026 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 BF47D27FD43 for ; Sat, 6 Jun 2026 03:51:04 +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=1780717866; cv=none; b=QJ6buWFWvkwhTCKXnCq1L6wR2XOk7QbpEs3eld2fSEdVciiau2Ixm8ZZ4YdTaf/t1S2AM9zrsvQNZxSBdQ2gaD5BU8UahBZ7ii2OIenVZ4SDosu2s1xg8EJUl5U0plAPA3pA8CsUxRKP1dzbJaTgmiwaqov0T/UlQCSJ1ioNdnY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1780717866; c=relaxed/simple; bh=hdve/CgPOagjbqRoPiLj2Xp/90v283eJPXm92x+vh0I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uFKfNgKGZYiY4g3lR+kuYHghJQ98NviN7/4po20InPVc2Jv/udNcaDDYpU3tREUW/Dw7CmCXSClfsqvBE1DWvNNeZdlIGWMRtb4HTlWFEXoudQ6YCXwnzd+/pfsxoWQsljjZl010TSYkGYqvbQM4n8q9dM26ppH0fexcZosvEd4= 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=fYObg5kP; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=tk0XIgTp; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b=fYObg5kP; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b=tk0XIgTp; 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="fYObg5kP"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="tk0XIgTp"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="fYObg5kP"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="tk0XIgTp" 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 E31AD6B373; Sat, 6 Jun 2026 03:50:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717840; 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=JS/GQ7OJ99Dui5f6CA/0f4Twxh8OjoBMiSDQYrLXiNk=; b=fYObg5kPurS2k6biMbbyvS/b1l+t44Ntr4dcNmPa5b6rJYeLwoqsaUxOq1MLLCB6dLlMlY TW7DspwwdjLIb8AiAzVVJk+tjORj1GKV5PSKcAEcjd39QDIxF0X9HTOywNiba04bqDPGe4 y011mPjX+zBNrS4vpAIul64R/SdWIX8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717840; 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=JS/GQ7OJ99Dui5f6CA/0f4Twxh8OjoBMiSDQYrLXiNk=; b=tk0XIgTpIELBeAbrbrj1ETIovpnJ7UC9+fHSjM86HxjmvfDc6MxBpSM1FLcNVdlK4R2NXK rte44tkobPjV4dBA== Authentication-Results: smtp-out1.suse.de; none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1780717840; 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=JS/GQ7OJ99Dui5f6CA/0f4Twxh8OjoBMiSDQYrLXiNk=; b=fYObg5kPurS2k6biMbbyvS/b1l+t44Ntr4dcNmPa5b6rJYeLwoqsaUxOq1MLLCB6dLlMlY TW7DspwwdjLIb8AiAzVVJk+tjORj1GKV5PSKcAEcjd39QDIxF0X9HTOywNiba04bqDPGe4 y011mPjX+zBNrS4vpAIul64R/SdWIX8= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1780717840; 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=JS/GQ7OJ99Dui5f6CA/0f4Twxh8OjoBMiSDQYrLXiNk=; b=tk0XIgTpIELBeAbrbrj1ETIovpnJ7UC9+fHSjM86HxjmvfDc6MxBpSM1FLcNVdlK4R2NXK rte44tkobPjV4dBA== 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 11486779A9; Sat, 6 Jun 2026 03:50:40 +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 YOR4ARCZI2poQwAAD6G6ig (envelope-from ); Sat, 06 Jun 2026 03:50:40 +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 8/8] mm,hugetlb: Kill huge_page_mask_align Date: Sat, 6 Jun 2026 05:50:03 +0200 Message-ID: <20260606035003.529685-9-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: quoted-printable 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)[-0.999]; 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 Content-Type: text/plain; charset="utf-8" There are no more users of huge_page_mask_align, so kill it. Signed-off-by: Oscar Salvador --- include/linux/hugetlb.h | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index 924e9a464214..24e5079aa767 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -1083,19 +1083,9 @@ void hugetlb_unregister_node(struct node *node); */ bool is_raw_hwpoison_page_in_hugepage(struct page *page); =20 -static inline unsigned long huge_page_mask_align(struct file *file) -{ - return 0; -} - #else /* CONFIG_HUGETLB_PAGE */ struct hstate {}; =20 -static inline unsigned long huge_page_mask_align(struct file *file) -{ - return 0; -} - static inline struct hugepage_subpool *hugetlb_folio_subpool(struct folio = *folio) { return NULL; --=20 2.35.3