From mboxrd@z Thu Jan 1 00:00:00 1970 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 65EF5C3DA42 for ; Wed, 10 Jul 2024 10:51:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1D1346B00A0; Wed, 10 Jul 2024 06:51:33 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 15C756B00A2; Wed, 10 Jul 2024 06:51:33 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA3FD6B00A3; Wed, 10 Jul 2024 06:51:32 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id C360A6B00A0 for ; Wed, 10 Jul 2024 06:51:32 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 755A8141C0F for ; Wed, 10 Jul 2024 10:51:32 +0000 (UTC) X-FDA: 82323526824.03.05BB5BE Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.223.130]) by imf02.hostedemail.com (Postfix) with ESMTP id 5405880012 for ; Wed, 10 Jul 2024 10:51:30 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="o/R9ZuDL"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Wx7vnkPn; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="o/R9ZuDL"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Wx7vnkPn; spf=pass (imf02.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720608659; 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=4aP7LJidVwaEiyg2vEhcsAqZZw1DICdTCoxEateoTEY=; b=ThdS9pourtQ6RwZuVlQJppgyvS0ogoyLUDr0zDuBrQncevr0eV5JN5Iy6aDo0pPSy4kWlp iMDVe3K0b9bgBWUbCIIEZ4ZoKVKeJDybZxgZ/4mzTBySLg/eHyL9S3rXqQrsTeXjEBRqr8 XqYGO5EhD2pPySl4G29yXkjBSxUw1QE= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720608659; a=rsa-sha256; cv=none; b=SFck6e25CqEfL4ZeIBN0eFXZZm/E/Kx/LtFe35HgQMuzVq3XK3N0BcsZUDx7Ya0vqF0zJy IWIF/Numtn+L9TpWomw/Ux8q/nQyPje6BVaqcSEaWlMnKbLAaOx3sIC4m2S8szgivWHnwc CdYpRBFEZQkNvXy1U38NoCK4hfGEbUA= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="o/R9ZuDL"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Wx7vnkPn; dkim=pass header.d=suse.de header.s=susede2_rsa header.b="o/R9ZuDL"; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=Wx7vnkPn; spf=pass (imf02.hostedemail.com: domain of osalvador@suse.de designates 195.135.223.130 as permitted sender) smtp.mailfrom=osalvador@suse.de; dmarc=pass (policy=none) header.from=suse.de 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 0C7AA21A33; Wed, 10 Jul 2024 10:51:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720608689; 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=4aP7LJidVwaEiyg2vEhcsAqZZw1DICdTCoxEateoTEY=; b=o/R9ZuDLTBFAeen3OTEvbuoQTG+0ttv6ilWicNUQx0VjjRe1d2Up3cp0/8+x3YfBH2uMnf JKDJhaY0AY4YzLPDKX0j1rcmcrJuf+OVuHyMr7/IGf2LIZ6jvsCqW7o7whTOLS2nT2d4NR NEI1eQn7lkOnn83FIhhH1NzCWEkh8qk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720608689; 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=4aP7LJidVwaEiyg2vEhcsAqZZw1DICdTCoxEateoTEY=; b=Wx7vnkPnXLV89jq+HQkZWLMRhtuwOGjeItAZ0ibHsDgzQXaXRZmCXRBtyVOtI1O92c951J mfyReADNVpXDpSDA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1720608689; 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=4aP7LJidVwaEiyg2vEhcsAqZZw1DICdTCoxEateoTEY=; b=o/R9ZuDLTBFAeen3OTEvbuoQTG+0ttv6ilWicNUQx0VjjRe1d2Up3cp0/8+x3YfBH2uMnf JKDJhaY0AY4YzLPDKX0j1rcmcrJuf+OVuHyMr7/IGf2LIZ6jvsCqW7o7whTOLS2nT2d4NR NEI1eQn7lkOnn83FIhhH1NzCWEkh8qk= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1720608689; 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=4aP7LJidVwaEiyg2vEhcsAqZZw1DICdTCoxEateoTEY=; b=Wx7vnkPnXLV89jq+HQkZWLMRhtuwOGjeItAZ0ibHsDgzQXaXRZmCXRBtyVOtI1O92c951J mfyReADNVpXDpSDA== 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 E57C31369A; Wed, 10 Jul 2024 10:51:27 +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 oPBeM69njmazcwAAD6G6ig (envelope-from ); Wed, 10 Jul 2024 10:51:27 +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 5/8] arch/powerpc: Teach book3s64 arch_get_unmapped_area{_topdown} to handle hugetlb mappings Date: Wed, 10 Jul 2024 12:50:39 +0200 Message-ID: <20240710105042.30165-6-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 Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 5405880012 X-Stat-Signature: d57tc751btpxps5o38xruot5864ybjww X-HE-Tag: 1720608690-109706 X-HE-Meta: U2FsdGVkX19sRVzUtpzqMqTEofcXkbHIgAc8rlL5pVaOp6uE6IXj/T7aMep/Q/Bu8b8KbN/YO/OUZh5M76OGPnIAG3bi6LVWlqkVVVs681IcjVj5j3OxmkaIWxpZwE+cxsiKyKTM9W3Px8vFNa8H8csMVSG7qjrI3CvwK2NVNcSkE/LIb9ySp26gVrDIhrc94UFcf7H/orDIFT6yLMfd4G+ecARJS82Vghet4zu9tyQp3MgwD7uAg0uwsO1mGwhsk502HIpjZwWnJyISuz1NVed3VvkRVZuLbUIEYvB14s+GzoEPwZMDeFOlJMnNf+L2EgUJw4bJrCScU/yCks4XEFO9OXWKxxxgXv3DE+yzapNFMfFCv0DKcfpVgcAu17yf2aKA/8XEvxrLj0XGx7Pl55Ai3Amds1r7waToF8P/p50cYsy+/rPHSIBApKmqiYJdY0dwIvh1GFusyKRau7pOK/2iSPySuFvX8aMe/i8obaBoiYJ15j0vI58Wprs5SHheAE1/3UHLQ/wJEvyx698HPwX2nIWzLEpcTxXzLLxu4xvqhzVtQ9VtcS0itHUCaW86uA9RZvhygrPpc/EJNH7gGF7G2WpTeWs48qQy+O7Tq+Tk71DIcgTeQ30saR8zTvR5xDZkU7dXMLSWE1LYuOHH7jkVGr817IOkvXs33ZBadyIqxpuUspglfShJGRXduH3XvldaCiVNrxHPhvPiIeGkJnUI69tAF5GAFPHNJ73mI7hFyayXqH6rb+Eq4MW0IvlPwEfKyiYhPipmNy+qUJ2YwjtTy+z7rgeFHa3ejPaweszlJVLbUVeCciQNoTfEg+/+cQZ9BLnyvRGrG1DTEwCpw+MK1CgbfPcy/HMfo9gLh4W6EjjPu0uLVqhAAOHC0uNEEd0RUwneKZJBpUA1d2ADk2x4nHtjjrWb+9S9DE9YinTOaWBg5wzW96w+0VtKrwLqhgQ1HxELCNVMC/nzsOU 6vPaNZnf jn88NFXzHT8yAykXzOlfTyaV57v+9EpDWReQ3gsr6s8G6ZX+NDadE2HKNkqMHzQMbUhSAMMdpKAJQiZT0bJl0iLffXRvrnfP40uiwLXZf3YgcURk5RJWyrHC1UFlWyHDJ9rFWB4LTUctjVkFL+rFSYg/Ksi2g5qHrx3Cotu+5/ej10elbyg2QTLiyB0bLpqzsHIGL8MzvDtbK+DOeSZ8J0g0Xa2HXOPOCGeEtVV3/TLLwahqRwJv9ntSkJRhJqdz9+AKONh6yvvhjGfclX6hrxcgLo22K0uxtCjfu 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. Reshuffle file_to_psize() definition so arch_get_unmapped_area{_topdown} can make use of it. Signed-off-by: Oscar Salvador --- arch/powerpc/mm/book3s64/slice.c | 39 ++++++++++++++++++++++++-------- 1 file changed, 29 insertions(+), 10 deletions(-) diff --git a/arch/powerpc/mm/book3s64/slice.c b/arch/powerpc/mm/book3s64/slice.c index ef3ce37f1bb3..6914b8de627c 100644 --- a/arch/powerpc/mm/book3s64/slice.c +++ b/arch/powerpc/mm/book3s64/slice.c @@ -633,17 +633,36 @@ unsigned long slice_get_unmapped_area(unsigned long addr, unsigned long len, } EXPORT_SYMBOL_GPL(slice_get_unmapped_area); +#ifdef CONFIG_HUGETLB_PAGE +static int file_to_psize(struct file *file) +{ + struct hstate *hstate = hstate_file(file); + return shift_to_mmu_psize(huge_page_shift(hstate)); +} +#else +static int file_to_psize(struct file *file) +{ + return 0; +} +#endif + unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) { + unsigned int psize; + if (radix_enabled()) return generic_get_unmapped_area(filp, addr, len, pgoff, flags); - return slice_get_unmapped_area(addr, len, flags, - mm_ctx_user_psize(¤t->mm->context), 0); + if (filp && is_file_hugepages(filp)) + psize = file_to_psize(filp); + else + psize = mm_ctx_user_psize(¤t->mm->context); + + return slice_get_unmapped_area(addr, len, flags, psize, 0); } unsigned long arch_get_unmapped_area_topdown(struct file *filp, @@ -652,11 +671,17 @@ unsigned long arch_get_unmapped_area_topdown(struct file *filp, const unsigned long pgoff, const unsigned long flags) { + unsigned int psize; + if (radix_enabled()) return generic_get_unmapped_area_topdown(filp, addr0, len, pgoff, flags); - return slice_get_unmapped_area(addr0, len, flags, - mm_ctx_user_psize(¤t->mm->context), 1); + if (filp && is_file_hugepages(filp)) + psize = file_to_psize(filp); + else + psize = mm_ctx_user_psize(¤t->mm->context); + + return slice_get_unmapped_area(addr0, len, flags, psize, 1); } unsigned int notrace get_slice_psize(struct mm_struct *mm, unsigned long addr) @@ -787,12 +812,6 @@ unsigned long vma_mmu_pagesize(struct vm_area_struct *vma) return 1UL << mmu_psize_to_shift(get_slice_psize(vma->vm_mm, vma->vm_start)); } -static int file_to_psize(struct file *file) -{ - struct hstate *hstate = hstate_file(file); - return shift_to_mmu_psize(huge_page_shift(hstate)); -} - unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr, unsigned long len, unsigned long pgoff, unsigned long flags) -- 2.45.2