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 A6158C433FE for ; Wed, 19 Oct 2022 18:33:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F6F46B0072; Wed, 19 Oct 2022 14:33:39 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A74B6B0074; Wed, 19 Oct 2022 14:33:39 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 097066B0075; Wed, 19 Oct 2022 14:33:39 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id EDF376B0072 for ; Wed, 19 Oct 2022 14:33:38 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id CBD11A06FE for ; Wed, 19 Oct 2022 18:33:38 +0000 (UTC) X-FDA: 80038547316.17.7420A0D Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf29.hostedemail.com (Postfix) with ESMTP id 2924F120047 for ; Wed, 19 Oct 2022 18:33:35 +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=D27kU4fXfBb5m/MQ77kisHP+n6yJ4gnj/zUX2AE+wz4=; b=XJI01kkzd3Wu41jyn+XS0O+36C l1CSAy9yXbOWUwKuav3hLKQUvZknmJ9ZrVj5QusgS43DOD4Ra6akOv+ycDrj1z30FUnT/thNOvdrX SZITc0ux0anUCY9YW1qco6s8A+wKTOEXKnbOqAkd2qBhYqmpgUUdAAkB3P8e96V6kIRZd9B3e/IYm HZq2jRpWNl+YPPdKHK0EgYHBW2FoHUhRGBFuBIN5CL38GEvFFYt3sRP8UjjY1ASVWwwbBBvfgsCTi 0HScJBzAEB9BvkG35m8BAQPTmyqMUrC18MQAycneVOvsRMfD8VlzKQ9W7zFVecVdzG/3FR3ijCoo7 J3BnKrBA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1olDsm-00BkzB-LA; Wed, 19 Oct 2022 18:33:36 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org Subject: [PATCH 1/4] mm/huge_memory: Convert split_huge_pages_in_file() to use a folio Date: Wed, 19 Oct 2022 19:33:29 +0100 Message-Id: <20221019183332.2802139-2-willy@infradead.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20221019183332.2802139-1-willy@infradead.org> References: <20221019183332.2802139-1-willy@infradead.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1666204418; 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=D27kU4fXfBb5m/MQ77kisHP+n6yJ4gnj/zUX2AE+wz4=; b=CuPs7KjmGgGSGV52aNbYXi04iijOL9ERNAZwqqAN2gBUSJ8YpcmgZimhgIl+41xwNuqTYl XKaPn7UuOhZV5VbRDaIeaN16eKKIP1V0trKetM1c9ArC3iiYC3hsTExcBDuUQS/3S6hADz CBewxrW3qhT+X1yz9Wkg5ikb8DNIHl8= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XJI01kkz; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1666204418; a=rsa-sha256; cv=none; b=wnLHJP/y/rFsZ3eUPvIu9KfDI+/pllDWszSsbhzLZqRtFWwQEgu1B6cwQkjDDyVub0dDRg yOzbDdBMsvJswKuknCbWnsxdJqzV2kez3EmPuD4DyO6/c15HHzR6B0rJ4xeO/+Z9YYobnl CWTV6u/ncFdVRmMbgtbV/oKRHr8ryp4= Authentication-Results: imf29.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=XJI01kkz; spf=none (imf29.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-Stat-Signature: wzppqps1r1fs1ipbz1zeqn13zy3sqtwi X-Rspamd-Queue-Id: 2924F120047 X-Rspam-User: X-Rspamd-Server: rspam04 X-HE-Tag: 1666204415-949623 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: Removes a number of calls to compound_head() and a call to pagecache_get_page(). Signed-off-by: Matthew Wilcox (Oracle) --- mm/huge_memory.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/mm/huge_memory.c b/mm/huge_memory.c index 1cc4a5f4791e..6d9ca4819d68 100644 --- a/mm/huge_memory.c +++ b/mm/huge_memory.c @@ -3057,28 +3057,28 @@ static int split_huge_pages_in_file(const char *file_path, pgoff_t off_start, mapping = candidate->f_mapping; for (index = off_start; index < off_end; index += nr_pages) { - struct page *fpage = pagecache_get_page(mapping, index, - FGP_ENTRY | FGP_HEAD, 0); + struct folio *folio = __filemap_get_folio(mapping, index, + FGP_ENTRY, 0); nr_pages = 1; - if (xa_is_value(fpage) || !fpage) + if (xa_is_value(folio) || !folio) continue; - if (!is_transparent_hugepage(fpage)) + if (!folio_test_large(folio)) goto next; total++; - nr_pages = thp_nr_pages(fpage); + nr_pages = folio_nr_pages(folio); - if (!trylock_page(fpage)) + if (!folio_trylock(folio)) goto next; - if (!split_huge_page(fpage)) + if (!split_folio(folio)) split++; - unlock_page(fpage); + folio_unlock(folio); next: - put_page(fpage); + folio_put(folio); cond_resched(); } -- 2.35.1