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 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: 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:+]; 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: 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 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 static unsigned long stack_maxrandom_size(void) @@ -66,8 +65,6 @@ static inline unsigned long mmap_base(unsigned long rnd, 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 = mm->mmap_base; info.high_limit = TASK_SIZE; info.align_mask = get_align_mask(filp, flags); - if (!(filp && is_file_hugepages(filp))) - info.align_offset = pgoff << PAGE_SHIFT; + info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info); if (offset_in_page(addr)) return addr; @@ -140,8 +136,7 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long ad info.low_limit = PAGE_SIZE; info.high_limit = mm->mmap_base; info.align_mask = get_align_mask(filp, flags); - if (!(filp && is_file_hugepages(filp))) - info.align_offset = pgoff << PAGE_SHIFT; + info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info); /* -- 2.35.3