From patchwork Thu Jul 4 11:23:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Pankaj Raghav (Samsung)" X-Patchwork-Id: 13723624 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 D1E28C30653 for ; Thu, 4 Jul 2024 11:23:49 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 683956B00C3; Thu, 4 Jul 2024 07:23:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 634116B00C5; Thu, 4 Jul 2024 07:23:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4AD276B00C8; Thu, 4 Jul 2024 07:23:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 2C9A56B00C3 for ; Thu, 4 Jul 2024 07:23:49 -0400 (EDT) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 7F8D816119F for ; Thu, 4 Jul 2024 11:23:48 +0000 (UTC) X-FDA: 82301835336.12.D6F8C64 Received: from mout-p-201.mailbox.org (mout-p-201.mailbox.org [80.241.56.171]) by imf01.hostedemail.com (Postfix) with ESMTP id B90AD40026 for ; Thu, 4 Jul 2024 11:23:46 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=niHhGXXL; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf01.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1720092208; a=rsa-sha256; cv=none; b=uQa8H79xpBAlLGR//ltGItlpmt3ZBvOof48C2ryahy7brmyNPpLdpGgzZM2177uLJYXvA8 h0GFXB7J4iXVHbYpeznfu41IzsI6VU5LYfbrdbIPYwNUTuq9/elr5mCGb22BdyzF54Eb78 Q+5QdkfTjHahcId1qmh+0GH7sq4Sx7E= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=niHhGXXL; dmarc=pass (policy=quarantine) header.from=pankajraghav.com; spf=pass (imf01.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.171 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1720092208; 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=/8WfUkcPSa7GHZg7/Pn66GCljLM5KeUQHmwEzlJNP7Q=; b=IJJxujBE9LSnx2t1GquJCrstO8b+DzDzqySjFZKtHujk+3r/oO3TJWEsJee7MfLXaqLPGg rsLvDIZU/IdLHhDXjcq4Xzf3V9YJq2EjaFpeViE+KplJW/gzr0XOP6Ga2rgYQoYMu4vT+c 1riad2WKO3WenEoAzZcO7MF+pnS9DiM= Received: from smtp102.mailbox.org (smtp102.mailbox.org [IPv6:2001:67c:2050:b231:465::102]) (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 mout-p-201.mailbox.org (Postfix) with ESMTPS id 4WFDmb3QZCz9tVW; Thu, 4 Jul 2024 13:23:43 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1720092223; h=from:from:reply-to:subject:subject: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=/8WfUkcPSa7GHZg7/Pn66GCljLM5KeUQHmwEzlJNP7Q=; b=niHhGXXLlGfBFEJjR7uSrNiVvSPbFHkCpsbWC7Q43zY0FGd9RzTzh0H9SncE1I//MU/tM8 lZUFPg1YI2YDmp2QSUggek1zSomko9Z9Rx9j15dDPqJ+nYQRytcbL5pffF6zoyfyE9+x5y V/kEZW5KC9gJJy7fBzJ4zaoW8xKsJGB6E5+JVx23Uy9gJKV1KYySvp2kP/5DVS6frkfHSo +7uD3pxnLlSluHwxygKmybygOmxpTqlBP9iKKWtPf2KhdThATzmJnXKvEM5c17VQVGXPZq AVdpjRWG2HM+18T8ruhyhr1v9DseqUimBzIa+yfipmogY1CwvXDG5/RQgRGZVw== From: "Pankaj Raghav (Samsung)" To: david@fromorbit.com, willy@infradead.org, chandan.babu@oracle.com, djwong@kernel.org, brauner@kernel.org, akpm@linux-foundation.org Cc: yang@os.amperecomputing.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, john.g.garry@oracle.com, linux-fsdevel@vger.kernel.org, hare@suse.de, p.raghav@samsung.com, mcgrof@kernel.org, gost.dev@samsung.com, cl@os.amperecomputing.com, linux-xfs@vger.kernel.org, kernel@pankajraghav.com, hch@lst.de, Zi Yan Subject: [PATCH v9 04/10] mm: split a folio in minimum folio order chunks Date: Thu, 4 Jul 2024 11:23:14 +0000 Message-ID: <20240704112320.82104-5-kernel@pankajraghav.com> In-Reply-To: <20240704112320.82104-1-kernel@pankajraghav.com> References: <20240704112320.82104-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: B90AD40026 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: sh1h84rod1scwc51473rsxz31ncaxf31 X-HE-Tag: 1720092226-615013 X-HE-Meta: U2FsdGVkX1+SKe0bFFYNyJrupH49M/6AB5Iecn7zhAHMV0Spm6jL+VGol6IO+6/4bYQsSiqnAw5oETHDef35MLtlwacJ/B/J7jZGCgx9AaWYiuxtBesRtss1lccFETwkk3B58rYT3lueymlQyvGAwpSu8ucM19Vr0Wlaaoil4loiYuA3xtX+LJP/z4F2a9KpQ4zHw58U/yFbxrP54io9SZKaj0bAxGLpH0S0l5VzVXiI/HjUdoIosI08L2Zz1ASZae80moDlIBcaM7IyYgiUzr3Y6z4s9Ws9WqUJCrUb6wGq0X4pqFz3UH8stftJQvZKLWqx2Bo1glFEEOcMTtRflzdXK93lZN7j/WuIComyy/XP+cir9wIWM2KmusdQ8FypFhjlHapJI/iWcZXcJJNWbZ5xMGG3RW5xzl8TGrRiW4LgBMv650dajA58IarF/uatgBieoiJw5TEJuqnfHhOYzkz3hHTe5/z7rTnZMvym43Ftd8WKhVnEpvgtGb01pU/y1UveB7WKAXzUo8htl5xxbOGx4XbVvoISv3tNrw89F6iIoTfgxm7Ecm5PVpffl0PcOsSZ0Z8Si60GIisL+PeljqPalP0mIYzcwWMpMAPbx/ZmSK2F6X77XABTaceelKDZ+FCwmRYMgnfs5TQBJkS3CyQBNfvg9LMp9vk9ZOQg/X/4dlggDOFmLaoV9Zr0nlWDcH/w7zHm8QtmW+bShBeSpgrQfrh6hGg9U/N4AJ5qiuGPoSGMJ3XRTurwnEG1biWyXmKOhYkQs7tff9zM8f7c8R+HIhoA25YTvKARzWX9i6cgT8EZQFCX70bvrh44S6XDxPU2k+zkTgoPsUwI0mznligl13qD4uUwpO9/bhi6I8zXOi+2nNW+9NQRdzwg5ripX2A05X08qbSS6s8vJwFao4dAa4ZKrs+kts9TI3BcEbnB6Vxm66WyViqDeq3wSqsaqEJK/+J2f+OmtG4iwz/ alhW0IjF l3ale9sU3dViQDu8Icebu0K5BWpllEuhfZmZQfRfb9MIzEaJD31YDjJ+PzBroH8DxGRxxKf3dY9sTMu+yvr17xaM6s2AUV6R/SP2isr6g0Gt8l1h8tB39aFBNFzk9kEsStmEAm7L1C8Sb/6w/mYtI7W9oVSChoEoAyDHh7weZa9xlpsJmi7gN7YY2A/b5bWj1nWrgZCQgCIIZzmvKa2BbbcmeA4psmDW3jtI6/i58aVNoCmBWdC0VWa15D+merT4ZmXukU7CuawrLLtCmk4VTkQLDpaAICt9rOFaZ31tdfaw8Aftzp3NxnDaBsLH8t9Rl1332 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: From: Luis Chamberlain split_folio() and split_folio_to_list() assume order 0, to support minorder for non-anonymous folios, we must expand these to check the folio mapping order and use that. Set new_order to be at least minimum folio order if it is set in split_huge_page_to_list() so that we can maintain minimum folio order requirement in the page cache. Update the debugfs write files used for testing to ensure the order is respected as well. We simply enforce the min order when a file mapping is used. Signed-off-by: Luis Chamberlain Signed-off-by: Pankaj Raghav Reviewed-by: Hannes Reinecke --- include/linux/huge_mm.h | 14 ++++++++--- mm/huge_memory.c | 55 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 61 insertions(+), 8 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 4d155c7a47922..b320a246293ec 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -90,6 +90,8 @@ extern struct kobj_attribute thpsize_shmem_enabled_attr; #define thp_vma_allowable_order(vma, vm_flags, tva_flags, order) \ (!!thp_vma_allowable_orders(vma, vm_flags, tva_flags, BIT(order))) +#define split_folio(f) split_folio_to_list(f, NULL) + #ifdef CONFIG_PGTABLE_HAS_HUGE_LEAVES #define HPAGE_PMD_SHIFT PMD_SHIFT #define HPAGE_PUD_SHIFT PUD_SHIFT @@ -327,9 +329,10 @@ unsigned long thp_get_unmapped_area_vmflags(struct file *filp, unsigned long add bool can_split_folio(struct folio *folio, int *pextra_pins); int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, unsigned int new_order); +int split_folio_to_list(struct folio *folio, struct list_head *list); static inline int split_huge_page(struct page *page) { - return split_huge_page_to_list_to_order(page, NULL, 0); + return split_folio(page_folio(page)); } void deferred_split_folio(struct folio *folio); @@ -501,6 +504,12 @@ static inline int split_huge_page(struct page *page) { return 0; } + +static inline int split_folio_to_list(struct folio *folio, struct list_head *list) +{ + return 0; +} + static inline void deferred_split_folio(struct folio *folio) {} #define split_huge_pmd(__vma, __pmd, __address) \ do { } while (0) @@ -615,7 +624,4 @@ static inline int split_folio_to_order(struct folio *folio, int new_order) return split_folio_to_list_to_order(folio, NULL, new_order); } -#define split_folio_to_list(f, l) split_folio_to_list_to_order(f, l, 0) -#define split_folio(f) split_folio_to_order(f, 0) - #endif /* _LINUX_HUGE_MM_H */ diff --git a/mm/huge_memory.c b/mm/huge_memory.c index a633206375af1..2fd45d8730bab 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3062,6 +3062,9 @@ bool can_split_folio(struct folio *folio, int *pextra_pins) * released, or if some unexpected race happened (e.g., anon VMA disappeared, * truncation). * + * Callers should ensure that the order respects the address space mapping + * min-order if one is set for non-anonymous folios. + * * Returns -EINVAL when trying to split to an order that is incompatible * with the folio. Splitting to order 0 is compatible with all folios. */ @@ -3143,6 +3146,7 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, mapping = NULL; anon_vma_lock_write(anon_vma); } else { + unsigned int min_order; gfp_t gfp; mapping = folio->mapping; @@ -3153,6 +3157,14 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, goto out; } + min_order = mapping_min_folio_order(folio->mapping); + if (new_order < min_order) { + VM_WARN_ONCE(1, "Cannot split mapped folio below min-order: %u", + min_order); + ret = -EINVAL; + goto out; + } + gfp = current_gfp_context(mapping_gfp_mask(mapping) & GFP_RECLAIM_MASK); @@ -3265,6 +3277,21 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, return ret; } +int split_folio_to_list(struct folio *folio, struct list_head *list) +{ + unsigned int min_order = 0; + + if (!folio_test_anon(folio)) { + if (!folio->mapping && folio_test_pmd_mappable(folio)) { + count_vm_event(THP_SPLIT_PAGE_FAILED); + return -EBUSY; + } + min_order = mapping_min_folio_order(folio->mapping); + } + + return split_huge_page_to_list_to_order(&folio->page, list, min_order); +} + void __folio_undo_large_rmappable(struct folio *folio) { struct deferred_split *ds_queue; @@ -3496,6 +3523,8 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, struct vm_area_struct *vma = vma_lookup(mm, addr); struct page *page; struct folio *folio; + struct address_space *mapping; + unsigned int target_order = new_order; if (!vma) break; @@ -3516,7 +3545,13 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, if (!is_transparent_hugepage(folio)) goto next; - if (new_order >= folio_order(folio)) + if (!folio_test_anon(folio)) { + mapping = folio->mapping; + target_order = max(new_order, + mapping_min_folio_order(mapping)); + } + + if (target_order >= folio_order(folio)) goto next; total++; @@ -3532,9 +3567,13 @@ static int split_huge_pages_pid(int pid, unsigned long vaddr_start, if (!folio_trylock(folio)) goto next; - if (!split_folio_to_order(folio, new_order)) + if (!folio_test_anon(folio) && folio->mapping != mapping) + goto unlock; + + if (!split_folio_to_order(folio, target_order)) split++; +unlock: folio_unlock(folio); next: folio_put(folio); @@ -3559,6 +3598,7 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start, pgoff_t index; int nr_pages = 1; unsigned long total = 0, split = 0; + unsigned int min_order; file = getname_kernel(file_path); if (IS_ERR(file)) @@ -3572,9 +3612,11 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start, file_path, off_start, off_end); mapping = candidate->f_mapping; + min_order = mapping_min_folio_order(mapping); for (index = off_start; index < off_end; index += nr_pages) { struct folio *folio = filemap_get_folio(mapping, index); + unsigned int target_order = new_order; nr_pages = 1; if (IS_ERR(folio)) @@ -3583,18 +3625,23 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start, if (!folio_test_large(folio)) goto next; + target_order = max(new_order, min_order); total++; nr_pages = folio_nr_pages(folio); - if (new_order >= folio_order(folio)) + if (target_order >= folio_order(folio)) goto next; if (!folio_trylock(folio)) goto next; - if (!split_folio_to_order(folio, new_order)) + if (folio->mapping != mapping) + goto unlock; + + if (!split_folio_to_order(folio, target_order)) split++; +unlock: folio_unlock(folio); next: folio_put(folio);