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 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: 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 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 #include #include @@ -90,8 +89,6 @@ static inline unsigned long COLOR_ALIGN(unsigned long addr, 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); @@ -105,16 +102,12 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi unsigned long task_size = TASK_SIZE; int do_color_align; struct vm_unmapped_area_info info = {}; - bool file_hugepage = false; - - if (filp && is_file_hugepages(filp)) - file_hugepage = 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; @@ -126,7 +119,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi return -ENOMEM; do_color_align = 0; - if ((filp || (flags & MAP_SHARED)) && !file_hugepage) + if ((filp || (flags & MAP_SHARED))) do_color_align = 1; if (addr) { @@ -145,8 +138,7 @@ unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsi info.low_limit = TASK_UNMAPPED_BASE; info.high_limit = min(task_size, VA_EXCLUDE_START); info.align_mask = get_align_mask(filp, flags); - if (!file_hugepage) - info.align_offset = pgoff << PAGE_SHIFT; + info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info); if ((addr & ~PAGE_MASK) && task_size > VA_EXCLUDE_END) { @@ -170,19 +162,15 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, unsigned long addr = addr0; int do_color_align; struct vm_unmapped_area_info info = {}; - bool file_hugepage = false; /* This should only ever run for 32-bit processes. */ BUG_ON(!test_thread_flag(TIF_32BIT)); - if (filp && is_file_hugepages(filp)) - file_hugepage = 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; do_color_align = 0; - if ((filp || (flags & MAP_SHARED)) && !file_hugepage) + if ((filp || (flags & MAP_SHARED))) do_color_align = 1; /* requesting a specific address */ @@ -213,8 +201,7 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, info.low_limit = PAGE_SIZE; info.high_limit = mm->mmap_base; info.align_mask = get_align_mask(filp, flags); - if (!file_hugepage) - info.align_offset = pgoff << PAGE_SHIFT; + info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info); /* -- 2.35.3