From patchwork Wed Jul 10 10:50:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oscar Salvador X-Patchwork-Id: 13729171 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0D61AC3DA49 for ; Wed, 10 Jul 2024 10:51:31 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 61A056B009E; Wed, 10 Jul 2024 06:51:29 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A1556B009F; Wed, 10 Jul 2024 06:51:29 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3F15D6B00A0; Wed, 10 Jul 2024 06:51:29 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 1AC526B009E for ; Wed, 10 Jul 2024 06:51:29 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id A33AF817D8 for ; Wed, 10 Jul 2024 10:51:28 +0000 (UTC) X-FDA: 82323526656.23.21F0D79 Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by imf25.hostedemail.com (Postfix) with ESMTP id 80DD1A000A for ; Wed, 10 Jul 2024 10:51:26 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vWma3QMm; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="hdePWM/l"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vWma3QMm; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="hdePWM/l"; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf25.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720608661; a=rsa-sha256; cv=none; b=yLSGlZ/Kv2nxlQ3hdr/SYJUeK7WYUDTGXNBhwnHefBua3ZWNXKXPdzH2TYs2+tikeHqpHY Hq3iqrDaRlYJMeUbpuEdDwdvVPjIUxkKNx7iZbvTTFt8Dl94K2Qw+omY6QTiWmusTWDwXD qA0SIkuAaAc/a/p6RB/89Zl1QGAEZ18= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vWma3QMm; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="hdePWM/l"; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=vWma3QMm; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b="hdePWM/l"; dmarc=pass (policy=none) header.from=suse.de; spf=pass (imf25.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.131 as permitted sender) smtp.mailfrom=osalvador@suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720608661; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=MiX8eoexrmO/wjIpeeQ9glTEYeXiTS6tsv5T+BPJcGU=; b=zqBXEJhN4Zj2xBZBolBfnLQmRZIbFLxAC53mYLmG4czroUcpQEhxcxvBP9myXwXklLWqho kQO8lSEtfnk8rMSAoyJFw8gOgUpEk1M2AbMbXVL2WAQBUzO92E3d3Yh+nQYLi8oY6eS4xI t0RniS4T/gsNho0Shk8XsfGJ96yOWF0= 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 364F61F824; Wed, 10 Jul 2024 10:51:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720608685; 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=MiX8eoexrmO/wjIpeeQ9glTEYeXiTS6tsv5T+BPJcGU=; b=vWma3QMmGeWRXJcr6gHXAh51UbyOC3/rO+Nxlq+dJJq+R+LMUKQD3tP2toFmn9IH4RsdtW XWOaFAZBQ7XWMwl6sf/zBMjtQlSOg7hRWPqODWwGD2lRvpSkFQGFg66rLqG3gJUQS7WeWN 5Sh9v+CKdJQ93f4u5gZe257D5HEOWzA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720608685; 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=MiX8eoexrmO/wjIpeeQ9glTEYeXiTS6tsv5T+BPJcGU=; b=hdePWM/lQgzDbtl3y1qRTw5AcA/nnPR2xCuLciXlwjGsJ8dQFNayVGStGn0kpjV3Z5iagx rWKWfsL4/uk4quCQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720608685; 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=MiX8eoexrmO/wjIpeeQ9glTEYeXiTS6tsv5T+BPJcGU=; b=vWma3QMmGeWRXJcr6gHXAh51UbyOC3/rO+Nxlq+dJJq+R+LMUKQD3tP2toFmn9IH4RsdtW XWOaFAZBQ7XWMwl6sf/zBMjtQlSOg7hRWPqODWwGD2lRvpSkFQGFg66rLqG3gJUQS7WeWN 5Sh9v+CKdJQ93f4u5gZe257D5HEOWzA= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720608685; 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=MiX8eoexrmO/wjIpeeQ9glTEYeXiTS6tsv5T+BPJcGU=; b=hdePWM/lQgzDbtl3y1qRTw5AcA/nnPR2xCuLciXlwjGsJ8dQFNayVGStGn0kpjV3Z5iagx rWKWfsL4/uk4quCQ== 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 0BB471369A; Wed, 10 Jul 2024 10:51:23 +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 uIvoN6tnjmazcwAAD6G6ig (envelope-from ); Wed, 10 Jul 2024 10:51:23 +0000 From: Oscar Salvador To: Andrew Morton Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, Muchun Song , David Hildenbrand , Michal Hocko , Donet Tom , "Kirill A . Shutemov" , Matthew Wilcox , Vlastimil Babka , Oscar Salvador Subject: [RFC PATCH 2/8] arch/s390: Teach arch_get_unmapped_area{_topdown} to handle hugetlb mappings Date: Wed, 10 Jul 2024 12:50:36 +0200 Message-ID: <20240710105042.30165-3-osalvador@suse.de> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240710105042.30165-1-osalvador@suse.de> References: <20240710105042.30165-1-osalvador@suse.de> MIME-Version: 1.0 X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 80DD1A000A X-Stat-Signature: kjff4m8cj7w85tgsofq6si9kgpm4rzcm X-Rspam-User: X-HE-Tag: 1720608686-280706 X-HE-Meta: U2FsdGVkX1/nLpa5tnVrtLG505/50KC6/mg+bYwkfTdDr9XLtYcndEzXtD4UldPNqY/OCEohqQUoBy3MFLLItvemEImClsHvZkU5HrcI1isuwfaUH5YKbWN0J6g+YvWTogO/xx49ifqIk2ZF4P0PYYwADoPrmJipnWX/kA0O8mEccEZptSXNSaWfd1iT/xcgKZ8bkrWattnl3pP9TKxQnw3X7M3fI5C8DFyU0WDfB/HNqVVBeNtDE6JMFV59XGHX3h3rkVE2njYF4LLmd46xt3kT5lsYfL2TJUbXaAhDc4GLd6AkOX8Fki8020r2ohS4OeuXAVQ6oorBLHKBwR7C8hdJ1N27o8W1WaJHOv5QohLBNXWvbCZT1bnawvyrPVk/JVrDDQEG5XaeE6u61Jbemv5x0KJJkPv1oFQ3JHHvd1dxcy6h4Pf2d0+5GX060eFcmzpuUz8PV7AaZhFD2+dS+dBU/bqqj4pPWtgTZODi7zIiIJI3uPWU/SVmhfiK3vNUy26K2dCyRzgcNFDOmDlIFZBkpRy1GjwCgdJkOOPadZecQxC8+p50t8UhFEE+KbrsKPj9U0z/CM/bAqSMwoo3Wk5j1Y9U+rInbfggu2PnF1nPErn8+Of27hD5Xt4iCvkSWOUAU6zgzI0iUev+0je/ehvDQjbd+NpHDtoWS8AGuLJPWHaJcc0gh2oNxRgWjCjRc1i9Q6+yUZ6Zgo5zXkhQL4fv8zFz08Ulvf9jX5/2DRAtZ2CD1jPllUpzkQ5u7YR2HrQjtxq4Y0z2Z6IImzfK9/tJX7YlJQIubMYzUgssO5L0mPJB717+swojXGi4Dc3S32xDARvALEXdFtB3SVU8EP6DcQI2izbF17qWpI89XtDasA2TXA0vlaVyIPe8T5mV47+qVanaLb8Vce7BdNLD9o1ZKGgVjtVx5pa27rzrtSnDzVzhMdIfxYcXI+Cj3ZOu/FjT9qW1s2mQguX3EEi 6ILXm58i k0/2fwpVGU20fJkXVP2KaRgaj1XWI59dqm/wrIm1boKHK0+6kh2j60r2kdSuEt8gW2GstZMeCuI14WZ+4/71aqmdG2TiLZtoWMrRCeKA34KYksUNZyS9c2QRcPIf4o9/dWCRSeI1ozsJYuza3GQKf9sneXOFKTwggyOBobYMS6XRHmfgrD63XvprtlnCY9juSgU1Qymeph5eikcGxzjrlPePq9tj4pNgjifRcl98Z3CUNRha/bTYj5NYTGxE5I8Pt5qOMgmcwfBkr6vOIrioa+jA5BcWf2X/vU91Y X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: We want to stop special casing hugetlb mappings and make them go through generic channels, so teach arch_get_unmapped_area{_topdown} to handle those. s390 specific hugetlb function does not set info.align_offset, so do the same here for compatibility. Signed-off-by: Oscar Salvador --- arch/s390/mm/mmap.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/arch/s390/mm/mmap.c b/arch/s390/mm/mmap.c index 206756946589..e98c00df586f 100644 --- a/arch/s390/mm/mmap.c +++ b/arch/s390/mm/mmap.c @@ -73,6 +73,8 @@ 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)) @@ -106,7 +108,8 @@ 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); - info.align_offset = pgoff << PAGE_SHIFT; + if (!(file && is_file_hugepages(filp)) + info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info); if (offset_in_page(addr)) return addr; @@ -144,7 +147,8 @@ 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); - info.align_offset = pgoff << PAGE_SHIFT; + if (!(file && is_file_hugepages(filp)) + info.align_offset = pgoff << PAGE_SHIFT; addr = vm_unmapped_area(&info); /*