From patchwork Mon Jul 15 09:44:51 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: 13733197 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 D5195C3DA5D for ; Mon, 15 Jul 2024 09:45:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 68BEB6B0099; Mon, 15 Jul 2024 05:45:34 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 63DF26B009A; Mon, 15 Jul 2024 05:45:34 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4B57B6B009B; Mon, 15 Jul 2024 05:45:34 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 2D3F96B0099 for ; Mon, 15 Jul 2024 05:45:34 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AB95FA1566 for ; Mon, 15 Jul 2024 09:45:33 +0000 (UTC) X-FDA: 82341504546.11.F14B353 Received: from mout-p-102.mailbox.org (mout-p-102.mailbox.org [80.241.56.152]) by imf02.hostedemail.com (Postfix) with ESMTP id DF4FD8001F for ; Mon, 15 Jul 2024 09:45:31 +0000 (UTC) Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=vKp4PhSQ; spf=pass (imf02.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.152 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1721036695; 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=+ToOeUI0Q85Jph7Cl2b3XbtSv31nGYoKCrXgwgV3xFo=; b=2lVI/nb3MLzJnxMGJlQ5lwgjDPuN2cgqWrP+E1JnM1Uqxsj31Qp3jpl2VQwG7JoiA5pdQg GLz56tDddfvycB/HZ+CfklexRvmTzGQ1CW/7eEMPF98JHkI1Abg+uDf2zQYCPC6bLQeDl3 GPT10lkQI08YwJ190MCNI4IJ0/oKc+I= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1721036695; a=rsa-sha256; cv=none; b=Oi8ZofmgtW59ZA4kfCFYGTHlFzsqnWoKDGdH17aeADU8tSLexCYg+z6fLUCAp+h/wewGqZ 9p4/84B3wpdh6lPTJmlseC/kgXRxWi4zIIi/zrCkokkY1yVNeabqRX9TFn4Nr5To/EOHQf d/0BskWOrZeSO+25TPVZUwv1mGYWzyU= ARC-Authentication-Results: i=1; imf02.hostedemail.com; dkim=pass header.d=pankajraghav.com header.s=MBO0001 header.b=vKp4PhSQ; spf=pass (imf02.hostedemail.com: domain of kernel@pankajraghav.com designates 80.241.56.152 as permitted sender) smtp.mailfrom=kernel@pankajraghav.com; dmarc=pass (policy=quarantine) header.from=pankajraghav.com Received: from smtp102.mailbox.org (smtp102.mailbox.org [10.196.197.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-102.mailbox.org (Postfix) with ESMTPS id 4WMy485Gpzz9sb6; Mon, 15 Jul 2024 11:45:28 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pankajraghav.com; s=MBO0001; t=1721036728; 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=+ToOeUI0Q85Jph7Cl2b3XbtSv31nGYoKCrXgwgV3xFo=; b=vKp4PhSQp4EnJr4FcZto6if1untrb2j45gRqsxA9hWNGiIfP7AwjUhuThX9UCdDjpbCa+X YuRDoyElJViodEfb747vf7vl4gSCyw+oqFYLTa34taXk5NzzdtWxjrPuqjtNjYhqPgAHAJ 0NsKjzQsCHSJGYnpSuYvC9PoTC8gAH+ljFUY2prftVzZaReBzJOMLl+5ptx0jhShQOrewb kFuCI1kDo2rbOwY3msH/UTLJLdVFawAtJZ1hy7etNQj/Q+4iyr/Vwj5clkZBWldzdpbdfJ 4BanE2Jk7goXfqb6DYRsEJfUU2ZMUIh/jHb6Prv4jub7q79XsEgnlQiZ7oJ4rQ== 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: linux-kernel@vger.kernel.org, yang@os.amperecomputing.com, 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, ryan.roberts@arm.com, hch@lst.de, Zi Yan Subject: [PATCH v10 04/10] mm: split a folio in minimum folio order chunks Date: Mon, 15 Jul 2024 11:44:51 +0200 Message-ID: <20240715094457.452836-5-kernel@pankajraghav.com> In-Reply-To: <20240715094457.452836-1-kernel@pankajraghav.com> References: <20240715094457.452836-1-kernel@pankajraghav.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: DF4FD8001F X-Stat-Signature: dtc6ujwo89i3kbwyt4bcb5riwumeacsp X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1721036731-922888 X-HE-Meta: U2FsdGVkX1/02ZA4j7dXb6avaNU3Dw2L6i9x4HfnJQKtnxIpaFU0a+5+4cdfQbyBIEGwPgaukgIx5BEzNDRgw7hCKXHAXX1Hc6b0l0XLsH7GFkyzsgKf7sdjr1hPb4+STU/z3X9CZOl8p0K9QTQ+yDjxPyQtwXwVHOP8aLff/IEvSY4CIsE+FhrsQRwbWmTkK/frXNmy8WD/PostyhQyXMLww4cGwq/+rGlTA9MxEI5XsWGAce5an5lpzmTm7lc8OBJuect3kdYLWCG5+8n3ZX71rXyFoVPV0+UhsHQOt4YtHzgF9iqz1fd2VEG8Of9xsd6YDFuGOw9SDeRRZq78ZdRKvZVv3YU4Aa958CcKUBGqZ6WU5XAHp4FjlNHc5RZkbV44dQorzqan6CzS+LvZ7yIgEBR1ae4j/zlbKiOKjjPJSFZpkazlgzvqvhvE6bkitmPrTGX8OL12dyRvZxoDT9a0W4kxEA40ZNsAHojUXo1yL3Wvc60Xl7T+hw9z9rWXEMLwI2WQn18pD5061x8El/6wyPW+ya6Mk0yo4Gqpjmxc2jBj0Id1pemnmYLoG8mwhW3wiFflH5hK0rDkZJGZZzrtHv5luRy141FZInt4tYqjyqGq8HANABEyLp+8+QZWrCjF3Ika9AVin1+qaslyvDx99iWvSgeIvMAt9BmUqm0E9XKRJrl+ilrF5OJD3Q6XUK/7Woj52akqTjjgXLBbU0Vn+Krai75ZJWaTP5hg3gPiCk/mqg8gL4gYFdRuWVt45DCwrGdYEypug3XUayzVqm2azX8mYijDeFHzZInGTSh6t0egHLCHmVFkPle1+KzSUeS5WDqy1QYIDMjGrGY3/UT0aBLsAL+X6wJSDjPgHroKHR7kuiPF4Ws6NCTvgpMaVOGnRaKCSVEITnDY1xko7TzK5U+SKlrMmOCs8fH0DJRhugJ7daj2IYMfU1XCCtDlDqlkSo7VJo/K4+KwAnv gaVquD3x Mj6vfa4ZvGmamZKdZQwRs2M7BZl4TnFtyD2PZps53c+/9o7JFoRGv3N1/Iu3cuZ+hShG0Z7zmg5CUyZLdthRpE3TV1p5uRLjZwX9gIlYVjBxvpfA9H2cY84o/67GSv774uCga+5fC91dzkaOT9vIdmTzShnab1fG0thBS53DwV2isR7n5o3Bm3MIykj59Ri38YM2XXGpK63z8PKWFMVq1Kx6kz1Gq/unAecrV3ugfXYjMkF+f3IFSdG27lBn6Ec37nxzmELp4s8AxOo+Uhl/zAlDHHTVmgL+57mtpYLQO7lj/HqzqLcJcdtNqDF0jzMv2B9T3 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 Reviewed-by: Zi Yan --- include/linux/huge_mm.h | 14 +++++++--- mm/huge_memory.c | 59 ++++++++++++++++++++++++++++++++++++++--- 2 files changed, 65 insertions(+), 8 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index cee3c5da8f0ed..b6024bf39a9fe 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 @@ -323,9 +325,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); @@ -490,6 +493,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) @@ -604,7 +613,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 251d6932130fa..af080296e11b3 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,25 @@ 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)) + goto out; + + if (!folio->mapping) { + if (folio_test_pmd_mappable(folio)) + count_vm_event(THP_SPLIT_PAGE_FAILED); + return -EBUSY; + } + + min_order = mapping_min_folio_order(folio->mapping); +out: + 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 +3527,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 +3549,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 +3571,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 +3602,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 +3616,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 +3629,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);