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 70D9CC6FA82 for ; Fri, 2 Sep 2022 19:48:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B0A4C8011F; Fri, 2 Sep 2022 15:47:23 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id ADEBD80119; Fri, 2 Sep 2022 15:47:23 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7D2EC8011F; Fri, 2 Sep 2022 15:47:23 -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 63A6E80119 for ; Fri, 2 Sep 2022 15:47:23 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 3FD8A1A04CC for ; Fri, 2 Sep 2022 19:47:23 +0000 (UTC) X-FDA: 79868179566.09.64D84CF Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf04.hostedemail.com (Postfix) with ESMTP id 0BA314004E for ; Fri, 2 Sep 2022 19:47:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; h=Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender:Reply-To: Content-Type:Content-ID:Content-Description; bh=POr6peHZOfBhUzVXg3Q+r28kRUt2++JqJXx/jXBS+8U=; b=T6hKIpNnWQcP3OwCJCPqepRbq2 rJCnkjee+zJH0/Ow+NzKHHjtQ+/dDR/VtAeazTtIEWGYKuxEAZK5ZCC4H808iwBwlubonzbh3CDun kHQF49jCHmUUpmjPejIRpNrHMH/1HVBTWdCOmYHxzdRJ1EmNVKwOM39YDYRP2A/Gq7HOd3436AMHf QOndF2oWyDZu+tpcIUsLkFMiHWu4zieP0LZxw1IDda/jnfGmLZ3dLrPLtfdltTwFwMqrqQroerhjY hCpWMsYjS3O6Q1e7Sn7mfIDfgN11Eb+Ka9NytZiG8XreSQIYVRavqR5Qwwew4hZEY7PJ3vw7Hn+SW +bNc+nhw==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1oUCd0-007Ibj-7k; Fri, 02 Sep 2022 19:46:58 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH v2 04/57] mm: Add split_folio() Date: Fri, 2 Sep 2022 20:46:00 +0100 Message-Id: <20220902194653.1739778-5-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220902194653.1739778-1-willy@infradead.org> References: <20220902194653.1739778-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662148043; a=rsa-sha256; cv=none; b=xq9m8UASjR8xDy0Hy/FbLVdK/KixUTXyNU1ftocreUoY0olCR4d4QKgzvyQ50eILVaFcUI 12QvhavXLsQ3XP+CXcJHNO+uLL3zn93fBeVQpNtt7Xlyj8z/n9DLB9lqwqp7VHj3apT/wF lUZ58269TyVUyMvEMhwJKPZiDlQ8n3I= ARC-Authentication-Results: i=1; imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=T6hKIpNn; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662148043; 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=POr6peHZOfBhUzVXg3Q+r28kRUt2++JqJXx/jXBS+8U=; b=hTAvcqWo6VtyxGIoI1lBWOR1deT97VGplsBpjW0vSoE0Bul+gqHDWRKVAUB32WfnbiAoV+ UUzpszB/djPgF+8EbAhNF2QKHPoKeTylPQunKKnZT4y53+gEi/Z+URSfk0CXaQJutoiBb9 XDqO21ID77SjzfCd91d3cgaCw1BinK8= X-Stat-Signature: 3k4z9pnj53kfk5yc78knpmre3f7rgpkp X-Rspamd-Queue-Id: 0BA314004E Authentication-Results: imf04.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=T6hKIpNn; dmarc=none; spf=none (imf04.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1662148042-713084 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: This wrapper removes a need to use split_huge_page(&folio->page). Convert two callers. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/huge_mm.h | 5 +++++ mm/shmem.c | 2 +- mm/truncate.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h index 768e5261fdae..aa0a427284aa 100644 --- a/include/linux/huge_mm.h +++ b/include/linux/huge_mm.h @@ -435,6 +435,11 @@ static inline int split_folio_to_list(struct folio *folio, return split_huge_page_to_list(&folio->page, list); } +static inline int split_folio(struct folio *folio) +{ + return split_folio_to_list(folio, NULL); +} + /* * archs that select ARCH_WANTS_THP_SWAP but don't support THP_SWP due to * limitations in the implementation like arm64 MTE can override this to diff --git a/mm/shmem.c b/mm/shmem.c index 42e5888bf84d..674bde8b3085 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -629,7 +629,7 @@ static unsigned long shmem_unused_huge_shrink(struct shmem_sb_info *sbinfo, goto move_back; } - ret = split_huge_page(&folio->page); + ret = split_folio(folio); folio_unlock(folio); folio_put(folio); diff --git a/mm/truncate.c b/mm/truncate.c index 0b0708bf935f..c0be77e5c008 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -240,7 +240,7 @@ bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end) folio_invalidate(folio, offset, length); if (!folio_test_large(folio)) return true; - if (split_huge_page(&folio->page) == 0) + if (split_folio(folio) == 0) return true; if (folio_test_dirty(folio)) return false; -- 2.35.1