From patchwork Wed Apr 24 22:57:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Luis Chamberlain X-Patchwork-Id: 13642612 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 AF3FCC4345F for ; Wed, 24 Apr 2024 22:57:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3F2FC6B008A; Wed, 24 Apr 2024 18:57:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3A36F6B0092; Wed, 24 Apr 2024 18:57:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 26BB86B0093; Wed, 24 Apr 2024 18:57:41 -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 0AA7C6B008A for ; Wed, 24 Apr 2024 18:57:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 8582E1A03D7 for ; Wed, 24 Apr 2024 22:57:40 +0000 (UTC) X-FDA: 82045939080.16.74B728E Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf01.hostedemail.com (Postfix) with ESMTP id 3950C40003 for ; Wed, 24 Apr 2024 22:57:39 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=isdLGzb9; spf=none (imf01.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1713999459; h=from:from:sender: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:references:dkim-signature; bh=/6C2shD4qBCTT7YeBf2iTXjP2N2Wy5ZL4SfFDScrsFE=; b=V6CwmU7R37YyY+atgr6MI50BMnJaF37joO8XdS46y1++X46qQVpEGiunrust5XzZwrZxh5 082sb2nUUn3PI5nYO0qZ+CmdLUZti9ZPBUNsBWBlcPglAfZH3aEi/QRq/AASS+J/d6+CYY U69B57hBkUeBWSf6GWORylqkwUdSrQ4= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=isdLGzb9; spf=none (imf01.hostedemail.com: domain of mcgrof@infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=mcgrof@infradead.org; dmarc=fail reason="No valid SPF, DKIM not aligned (relaxed)" header.from=kernel.org (policy=none) ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1713999459; a=rsa-sha256; cv=none; b=O+dz5nLfuIooMqr2H8/w2P0RQSezUIpLHy5hA3sLhWPt7HIWVQylP9+y0MCQCnN3AGj7G0 d1HjJ9D0jm8CyobfjPvTKQaFxNiFTBb/Zldzp6FBBxxK2967lOBYKF+o03Y/oO4wzJkS7P pyjG9ea3hvb76BBAXKcqIaRH3TH4rQ0= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Sender:Content-Transfer-Encoding: MIME-Version:Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-Type: Content-ID:Content-Description:In-Reply-To:References; bh=/6C2shD4qBCTT7YeBf2iTXjP2N2Wy5ZL4SfFDScrsFE=; b=isdLGzb9DsGv6ujvVfVDJszM0h f0WjjfF7KgwVjGH6VHD29bbBaF+mAnPLlwf354oFmGP9JoV7Ilw2/PtXIsaYCyTMcmSe1a2hmR6TH fhq2/sJevPoJjGv0OsfkfFGuyzptrHQV0hoiiYaShWW8J1rm6HpfQNKMX3GjJia/5eLkntxSkQUw6 +yQ0AhoAdH1Cd8o0J3RkMYTkuuOJjwYnJ+D0G+AqxjMZW8WOWcyrBhjPWJpjfrqDODcQm1AGqPhlM 6oZUE2Z8/Nyb5qATc61CXrN2AIofoe9npQB0LO7OwuijIHw/DuEK+7exmo+Jz6Nmen7E+N+01Ho8E P5mfpiZw==; Received: from mcgrof by bombadil.infradead.org with local (Exim 4.97.1 #2 (Red Hat Linux)) id 1rzlYX-00000006IUP-2Zdv; Wed, 24 Apr 2024 22:57:37 +0000 From: Luis Chamberlain To: akpm@linux-foundation.org, ziy@nvidia.com, linux-mm@kvack.org Cc: fstests@vger.kernel.org, linux-xfs@vger.kernel.org, linux-kernel@vger.kernel.org, willy@infradead.org, hare@suse.de, john.g.garry@oracle.com, p.raghav@samsung.com, da.gomez@samsung.com, mcgrof@kernel.org Subject: [PATCH] mm/huge_memory: move writeback and truncation checks early Date: Wed, 24 Apr 2024 15:57:36 -0700 Message-ID: <20240424225736.1501030-1-mcgrof@kernel.org> X-Mailer: git-send-email 2.44.0 MIME-Version: 1.0 X-Stat-Signature: 1kxmct3todm3ga6n4sgcj849ku9mpemx X-Rspamd-Queue-Id: 3950C40003 X-Rspamd-Server: rspam02 X-Rspam-User: X-HE-Tag: 1713999459-774978 X-HE-Meta: U2FsdGVkX1+5USy91EAg7wsiS3CwoAXliB8kc7BkZy8RTMxns2zMyeFKrFv1RhK279aHcmhHzsqYzYQDWfAdmwi2f74moMNm41/MBh57ISiLr9kpVl7oMieIMR4JLoXWFX/liTxSjQxvO4XyrUQ+d88syiOD5ZF6jNH1sNWOEShEGiqBDhUpF7cHwI3+kWgIZnWN1K0gE+c9uNvV0/xrPGQs2CcXoMc8sSNznkvsnTHxCOvZg2wJWhVzB6/bAvp39nwuhmYjxgGt9wTWovun/GoyzMJcTdLQN0lLJrZZWv0MI9Hdczyp+UTev9CYPpO1ZZHI/rS6IGMIJ+wxcv1w5UY6mNbf/f0s/elMGKcYeWxW/p1d2KWmL4si1XzGLGw0ahmNA+RJizPUUITovb3B3a7BiVrlVEMwYLA2VYFCp6mo9EnwyvVSHYe4m9VdMPp9XeHuyi3cUFH412uaSbUST8DcOdISZpjoAg6wOz1TWeaLx9HfoauiHmGSrb1ZpoJBYQ2qICXjYW2atASn0IGuSW67DWkZaJFpHIj6Sprl4qbylY4R6WIWzobhAUHOnTzUIfxIpTVDEHBX+Oo7rzx7LIbVxhotpJies/7QtQ/WUYcSb20yrz2n5jPaKtxmhzmWws1ST7WQAcATi5XY2ATuK3Mkv06xTEyltewPnXGuo/FRv8puOPw7ecu5MX4pIJXo03Ruz67FSwMVoOl8uWzwWXI+mDcYEyAbgPCtnp8v3nmN1q0gc7OM8wDdFbFTx26lKAy3bGAu+1BxH8fwCk0NJJRNtoa28I3AkK7ZuvgCX89gm9+TpaauaV78hwB6PvrB4z2KYtSGjm9bhmgDFEOWUz6yVsrjKeBUO/HasrNar9l7VDjERlhVtGyT5aLbcczFqlp3q5MhOg0Dh19HKv6Vskdgvp8E4+l4e3Z+5hRpcxtabg9yyocPTnG9LSM/WP+JOY0OxGy1ghKHDCInsim DIcglq+/ LFMMtfLGO6EOSDB+KevciFgiqhiU9PUop0ycrs1jCrC4EC7Bze0Gfk7frTxiFp9vRb3J+UAHu2MEuSdma/vhNNpW0DAuXWmMHYwOwcMisAUSNDYdbPZDg4+c0AqaLTW9MX8f660dOXGcNwA6n+3U3xO3hUNti4NOCpP0X 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 should check as early as possible if we should bail due to writeback or truncation. This will allow us to add further sanity checks earlier as well. This introduces no functional changes. Signed-off-by: Luis Chamberlain --- mm/huge_memory.c | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) While working on min order support for LBS this came up as an improvement as we can check for the min order early earlier, so this sets the stage up for that. diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 86a8c7b3b8dc..32c701821e0d 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3055,8 +3055,17 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, if (new_order >= folio_order(folio)) return -EINVAL; - /* Cannot split anonymous THP to order-1 */ - if (new_order == 1 && folio_test_anon(folio)) { + if (folio_test_writeback(folio)) + return -EBUSY; + + if (!folio_test_anon(folio)) { + /* Truncated ? */ + if (!folio->mapping) { + ret = -EBUSY; + goto out; + } + } else if (new_order == 1) { + /* Cannot split anonymous THP to order-1 */ VM_WARN_ONCE(1, "Cannot split to order-1 folio"); return -EINVAL; } @@ -3079,16 +3088,12 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, } } - is_hzp = is_huge_zero_page(&folio->page); if (is_hzp) { pr_warn_ratelimited("Called split_huge_page for huge zero page\n"); return -EBUSY; } - if (folio_test_writeback(folio)) - return -EBUSY; - if (folio_test_anon(folio)) { /* * The caller does not necessarily hold an mmap_lock that would @@ -3111,12 +3116,6 @@ int split_huge_page_to_list_to_order(struct page *page, struct list_head *list, mapping = folio->mapping; - /* Truncated ? */ - if (!mapping) { - ret = -EBUSY; - goto out; - } - /* * Do not split if mapping has minimum folio order * requirement.