From patchwork Wed Apr 2 21:06:03 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036480 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4B0671F3BAE for ; Wed, 2 Apr 2025 21:06:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627987; cv=none; b=iX6KnvmvhOFpzLvrRsDpBTnynmRuoWc1HO8gCFEJZ9pwunY5hx8ynol1yuoDwhcDA/rkMaPPJYnlTILYMk+e+STdVPbKtnZVnSzQjK936JkevTIGggQWQaRNuaCL/cZATIi/A9fW2+sNxLCgihJBX7eshlB3C1DrAn3wL0F2l/o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627987; c=relaxed/simple; bh=c5K0La0ePXH2HpWseZinhGccyjXKOshmqDPJjeoEAlU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GEnQxLz4yrk9aMs5C/GLkE5HBhLIXwdvZ9WIGIY//Q/mE9iDSXVmsuUMtprvO9HF3+O41PpUhwPnxF1fom9HNFCv0h2F1dSZhQHKK4fal5BSt1yJLUTRhyI+t9JTCycOv73hFaEt2bGfuf4jgGMkZqLs7gwtfCOZ7yk0qTgg0sc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=lcElZ+Id; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="lcElZ+Id" 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=ry/obuxLxTCzbCNXr6YZ9DzG0ANUHcRWWnA+CyLV1DU=; b=lcElZ+IdahLQIKtyF8KzPMU59L NT4X71vpSJPq10zxoouw8+d5CKya02jKShsS5nhZ69fPrUt6xX3V4/nX7P2tL2VnWLQv3f1vnWlGq ImaB5sZcdIM/K5lkGCw+2VF10f4XvuQnzUX0jRrJFWeZKD+5fOL93C0+h67BCsdHn6oVeVNBlGII7 IlTD/jKU9oKwrToM1DeNS18ek7GN49PUL0RuZsUCDXFBL8le8RkshsrNBe+WMC58r4RZqUoKbAYxo 6jFOU/4jwp+DbU2++Na6cQuEu/3VOX7qvW9cKFtapVJzHEJ4ehKqYdttzAg6NqFAxMYez3MJINy0r QWP9N8LQ==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hq-0000000AFqM-3I8S; Wed, 02 Apr 2025 21:06:14 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 1/8] filemap: Remove readahead_page() Date: Wed, 2 Apr 2025 22:06:03 +0100 Message-ID: <20250402210612.2444135-2-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All filesystems have now been converted to call readahead_folio() so we can delete this wrapper. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 26baa78f1ca7..cd4bd0f8e5f6 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1308,9 +1308,9 @@ static inline bool filemap_range_needs_writeback(struct address_space *mapping, * struct readahead_control - Describes a readahead request. * * A readahead request is for consecutive pages. Filesystems which - * implement the ->readahead method should call readahead_page() or - * readahead_page_batch() in a loop and attempt to start I/O against - * each page in the request. + * implement the ->readahead method should call readahead_folio() or + * __readahead_batch() in a loop and attempt to start reads into each + * folio in the request. * * Most of the fields in this struct are private and should be accessed * by the functions below. @@ -1415,22 +1415,6 @@ static inline struct folio *__readahead_folio(struct readahead_control *ractl) return folio; } -/** - * readahead_page - Get the next page to read. - * @ractl: The current readahead request. - * - * Context: The page is locked and has an elevated refcount. The caller - * should decreases the refcount once the page has been submitted for I/O - * and unlock the page once all I/O to that page has completed. - * Return: A pointer to the next page, or %NULL if we are done. - */ -static inline struct page *readahead_page(struct readahead_control *ractl) -{ - struct folio *folio = __readahead_folio(ractl); - - return &folio->page; -} - /** * readahead_folio - Get the next folio to read. * @ractl: The current readahead request. From patchwork Wed Apr 2 21:06:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036482 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B40F319ABB6 for ; Wed, 2 Apr 2025 21:06:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627996; cv=none; b=LpafdbNYRekGmuZXvKAHLevA0j+6ulqERDRFX6d9MEOeQ+joSd9qnKHQw1eotw6iEfBVsNd6Su03jrBFaV6Tjcyv8Fg8uS/6fRgkBNcgHItXzg+/1x2OSaoMNT5B5Ly6wE2sJWQuVmN6eTKStF71o+WbAjsC96Z+8+EqM3W4pkA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627996; c=relaxed/simple; bh=NBijHAvAdRa0dbPiKBbb43mHodcVJ+lFrTv6NNSQLiw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JWU2iib5umrwwD4fAsfxTEDzMm636TP95YJxad6+YHcYfYhAD5uAZu0EM/+3GKC+8C/BpSEUuZOgNK1qJVWigv+tJJWTTaQH/8k0U8DTu04+2a4F0i8cOkiBaoUBNXKiP8fb6fGW87OdDdzKlNLPyPr2k+7I0mlmlml2xc/eNjE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=p++baYfz; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="p++baYfz" 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=UL11Ny1HswpINtl0BZS325Krjlkrbh6vmj2yMHlUsgw=; b=p++baYfz9Bv+Q0RIgPo9kTFmHb 8vrNlEwLKYQangSwCJlWtjtfrT1AIDQf00Uyzf9pPhrb0e5O7++HaAWwxv1fK0zt1lHqU1RQEFGJA /AUB3y9q2bqukF63UezfCw6z5Ivhy59ckoIG0x/Qc3LfAygilO8eY5UUQLJ4a5R1iDxNfuHtD0H9n 49KmZbJDtJIdItnVZ8DDkloo4xQflOb3CQ+kprxRgHLu/KX0i7HJHSWoodsdaIC+dzWJBEgJADkas NkDjlalVz6SL4ZdkDApyZCcTu16hay92qCkAJsVFTQpRpaAIM4xDITdyePk53cOFydxBIMfcw6+Lr MAu7tkUg==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hq-0000000AFqO-3dXI; Wed, 02 Apr 2025 21:06:14 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 2/8] mm: Remove offset_in_thp() Date: Wed, 2 Apr 2025 22:06:04 +0100 Message-ID: <20250402210612.2444135-3-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All callers have been converted to call offset_in_folio(). Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index d910b6ffcbed..99e9addec5cf 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2428,7 +2428,6 @@ static inline void clear_page_pfmemalloc(struct page *page) extern void pagefault_out_of_memory(void); #define offset_in_page(p) ((unsigned long)(p) & ~PAGE_MASK) -#define offset_in_thp(page, p) ((unsigned long)(p) & (thp_size(page) - 1)) #define offset_in_folio(folio, p) ((unsigned long)(p) & (folio_size(folio) - 1)) /* From patchwork Wed Apr 2 21:06:05 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036477 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2ADCE19ABB6 for ; Wed, 2 Apr 2025 21:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627980; cv=none; b=iNV4xIsfigl0V4P3bZ84DhLB3WKuhD6aUMoad4MX/OmY6f6D7EhhUAG597I5AMob/zWaIl5k1jNv8oJlDUS2fJVLzbbIaorGdtL6ErAJ5k6vkZGRFaNCt0yKmPbRSR3ZCbNxugFH/IdGraKoCdEwqoeFXPJKC4T3msvuuDhCCaE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627980; c=relaxed/simple; bh=ghC5CeXHos5lEeSNJ1c2Ou1sXLAxzYxl/Bw2ImzIzRM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EMw3zjHMuMqyEzE4WRnkB42K7M5610Q0777Zjuc0X/AnpvLXDtX7HFmh/MOvxrbNBqFIxoNlqoTmypZxPJSesQcazt4iB536ltYdyk91hhYDvDAXKCfh0wh8CMpnATO8OuWhsk/OETQjPRqff+oAWdCNKBdkMsB04sypXDf5dus= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=raE6Hpsr; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="raE6Hpsr" 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=pe0Pjjm6xDZZPKUtc3KMY1jXMbHe2FmknyFtlN8EIWI=; b=raE6HpsrueXDb9uqvPB13rISbE KJAnPg1e81yzYuuxSGT+g7ro58lEysOfYQPl+VoCHzDhvYglzXvH/MlolRyXNbvbwcxMwJgsKbALl Wb/hP2jxBEYndgJDgEwGKcs4BtDIwYh0zyO/UbcpFRf/W0crLPKqh+KZ6W+eam+JNTUFQ821m/vZQ 9ex28ont48t2jNgurc4aA59N4EM8da5J6CeC3YAY5LrEgi3z3f+spwedf+WzDBOe6BduPhcW6cm8E 5NaRUc8dEg9F+aRAKBKPDVMl/y/L91BP3TuONymRuaIwr1p80Jr3k4QmDF5ttVDSuxXVQgY8QAaSH kC/JJw7A==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hq-0000000AFqQ-410d; Wed, 02 Apr 2025 21:06:14 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 3/8] iov_iter: Convert iter_xarray_populate_pages() to use folios Date: Wed, 2 Apr 2025 22:06:05 +0100 Message-ID: <20250402210612.2444135-4-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ITER_XARRAY is exclusively used with xarrays that contain folios, not pages, so extract folio pointers from it, not page pointers. Removes a hidden call to compound_head() and a use of find_subpage(). Signed-off-by: Matthew Wilcox (Oracle) --- lib/iov_iter.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 8c7fdb7d8c8f..7c50691fc5bb 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1059,22 +1059,22 @@ static ssize_t iter_xarray_populate_pages(struct page **pages, struct xarray *xa pgoff_t index, unsigned int nr_pages) { XA_STATE(xas, xa, index); - struct page *page; + struct folio *folio; unsigned int ret = 0; rcu_read_lock(); - for (page = xas_load(&xas); page; page = xas_next(&xas)) { - if (xas_retry(&xas, page)) + for (folio = xas_load(&xas); folio; folio = xas_next(&xas)) { + if (xas_retry(&xas, folio)) continue; - /* Has the page moved or been split? */ - if (unlikely(page != xas_reload(&xas))) { + /* Has the folio moved or been split? */ + if (unlikely(folio != xas_reload(&xas))) { xas_reset(&xas); continue; } - pages[ret] = find_subpage(page, xas.xa_index); - get_page(pages[ret]); + pages[ret] = folio_file_page(folio, xas.xa_index); + folio_get(folio); if (++ret == nr_pages) break; } From patchwork Wed Apr 2 21:06:06 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036478 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D58A61F3BBE for ; Wed, 2 Apr 2025 21:06:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627981; cv=none; b=A+1HhbBl0vYDzsjogu263CURmJkeg2alwWi9Hb9hP2Z/tsFqW+ykXYdE8b4tPylhmhvpYbn3G57PXbC3VG8XZnuEQA4iZQ+Y6G69iTB4ZcGWSyC8K1SAUF6Fc6T+9bYFD86KLdyRLYA+rruyptvzAfekWym/vmo/ZpxxFARo0Gc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627981; c=relaxed/simple; bh=gnIHiBcv+yBq8aIfhuYk8mi2jYFmQYVcFfyXzxludro=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=c1YCVMi/AUTwhavTCrzuJe5YzI4lTvVR+WYuUrs7R8vg3Edl3+u0AgPo/1Vs6fuYGsAM9J2HVxWCarxUjn+ASNaSTJReD0fnLPvz/sIOUycEBOpr6ZyVmgYoH+/8VaRvCvhaWwFzBdi/gwmBY5UyKICq0VtxF1nJZnb/9t37xpE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=S1WB6wUv; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="S1WB6wUv" 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=m4T5LNp9+vduHggkLGzj9TeayJ79kOVaHGxfjN+fZbw=; b=S1WB6wUvfDFoIOnVbTiCIdOdS7 Z/VKJRySCxvlDmz05MAXh6BrtyZb9211AryI9i2YT3PNl2SntCgyTdEHcLDSm/JroA0MUXA7BXr4l ZZ7d3Gm+sr8FJEfGBQ2MC0msiRrfYXSChveFCLKf5Afa8As4zecAkP+QFzgkcKxVxB0a3ILm+5Z46 0ZdDelC2V+242e51pvdhrroLLjnn7QcdfxHKe/EFVVX9DivrnFsGEapB+RpeaWWilwEzzxmNDVziH Km5tMq/f6gjc8vLmofREGkNe3Hq5Lq52gVOG/XF6slxcKKL/h3JG2dNKs2sII1VpHB/sIaausyLsU pWPG06nQ==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hr-0000000AFqS-07h1; Wed, 02 Apr 2025 21:06:15 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 4/8] iov_iter: Convert iov_iter_extract_xarray_pages() to use folios Date: Wed, 2 Apr 2025 22:06:06 +0100 Message-ID: <20250402210612.2444135-5-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 ITER_XARRAY is exclusively used with xarrays that contain folios, not pages, so extract folio pointers from it, not page pointers. Removes a use of find_subpage(). Signed-off-by: Matthew Wilcox (Oracle) --- lib/iov_iter.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/iov_iter.c b/lib/iov_iter.c index 7c50691fc5bb..a56bbf71a5d6 100644 --- a/lib/iov_iter.c +++ b/lib/iov_iter.c @@ -1650,11 +1650,11 @@ static ssize_t iov_iter_extract_xarray_pages(struct iov_iter *i, iov_iter_extraction_t extraction_flags, size_t *offset0) { - struct page *page, **p; + struct page **p; + struct folio *folio; unsigned int nr = 0, offset; loff_t pos = i->xarray_start + i->iov_offset; - pgoff_t index = pos >> PAGE_SHIFT; - XA_STATE(xas, i->xarray, index); + XA_STATE(xas, i->xarray, pos >> PAGE_SHIFT); offset = pos & ~PAGE_MASK; *offset0 = offset; @@ -1665,17 +1665,17 @@ static ssize_t iov_iter_extract_xarray_pages(struct iov_iter *i, p = *pages; rcu_read_lock(); - for (page = xas_load(&xas); page; page = xas_next(&xas)) { - if (xas_retry(&xas, page)) + for (folio = xas_load(&xas); folio; folio = xas_next(&xas)) { + if (xas_retry(&xas, folio)) continue; - /* Has the page moved or been split? */ - if (unlikely(page != xas_reload(&xas))) { + /* Has the folio moved or been split? */ + if (unlikely(folio != xas_reload(&xas))) { xas_reset(&xas); continue; } - p[nr++] = find_subpage(page, xas.xa_index); + p[nr++] = folio_file_page(folio, xas.xa_index); if (nr == maxpages) break; } From patchwork Wed Apr 2 21:06:07 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036479 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0389A1F3BBE for ; Wed, 2 Apr 2025 21:06:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627984; cv=none; b=jYFFtm4oQlO1of/pCCDxoUuq1uW/TPNvBxwYNt8HL8y5xo8oCnyE2Mn0czl2DW8tVyubqRxodUVCXrE31+E9am3ndBs/iEd8Pl4kpgnbqOAcYKWxBRRTLE4qtG9ZFj6p8R82PSrbTMP3hUvwhOgAQwkI81Yh0TkNCHl+C5kJxZw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627984; c=relaxed/simple; bh=+/vd25kpsQdToYBDEEn8QF2H3E8pjoOKSZg6qP3DmCQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=hXA9W+LxWEDyPvHt3ZZ6QsJAlQLVeSXXehLSo/dA7FlYW+d+z2EzX66KpNsBj3RzVjTMM9ZT1aGREqYWwqj3yFQl4weKvxZ09KvArfwVXOlEqGWUR99Bones2okSWX/6wvTCFfmgBlA7q0Nsm2CQVV/z+FLnW8VFcCAylWMA+Do= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=E2XzTSoy; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="E2XzTSoy" 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=9u8Vjz9C0E4LvrVZKlU/rxeiFIcc78vR/nB2GrB7LV8=; b=E2XzTSoyxW912FP5dXOOzZxQnK mExtIKyJWSjZM0kAHZhVxiU6tOokazeU0Fe7GY2ZCRp8J0gcloVL0CXUWtcUwHS/a2dB/KpS2V5l6 gWF4ytOrvykWlTrBmqXA2YzYU2nl/Mt58FBI9TeNkn7I6jpvjYwFGvxDQNbVeVJuBLmZYT4Kctmep USgKIRGGErnVEPFqSM8fqIm1dZQYMWCtqy5Ng0YQstNSUBMsQbbHkAGdSH16g4+IkV0pO4jSLhGje BvefpRZIwGGgmBoy1av3RWCKJ8hxWI2QiyPCh2KIxF1S1MEcin/0ffQoJapCsrAZn7uT252TrDRXJ D8NixFtg==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hr-0000000AFqU-0V6p; Wed, 02 Apr 2025 21:06:15 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 5/8] filemap: Remove find_subpage() Date: Wed, 2 Apr 2025 22:06:07 +0100 Message-ID: <20250402210612.2444135-6-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All users of this function now call folio_file_page() instead. Delete it. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index cd4bd0f8e5f6..0ddd4bd8cdf8 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -945,19 +945,6 @@ static inline bool folio_contains(struct folio *folio, pgoff_t index) return index - folio_index(folio) < folio_nr_pages(folio); } -/* - * Given the page we found in the page cache, return the page corresponding - * to this index in the file - */ -static inline struct page *find_subpage(struct page *head, pgoff_t index) -{ - /* HugeTLBfs wants the head page regardless */ - if (PageHuge(head)) - return head; - - return head + (index & (thp_nr_pages(head) - 1)); -} - unsigned filemap_get_folios(struct address_space *mapping, pgoff_t *start, pgoff_t end, struct folio_batch *fbatch); unsigned filemap_get_folios_contig(struct address_space *mapping, From patchwork Wed Apr 2 21:06:08 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036476 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AE7B1F0E32 for ; Wed, 2 Apr 2025 21:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627980; cv=none; b=CM67v8azbis/Us7fv9Gt4N7SYfaFUV/te/gXEPnUFeeYjhlEMRRCVZLOdW3pdnzDsADpH1HF2IV7UZ8KbkfZKIk4QbbxibZroeHSl7mXXT1V7I9OQGIKQzBuSlUNvdE1hjsMqvOqErvRMjmF/QZ2UcTAzE54uUJ0dTdQDqz97ZM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627980; c=relaxed/simple; bh=JEqGYHlFPqeM/Nbf0+BITj+nKoRy30A+P2F+TGLzmis=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=m9uhjbxA1OdzMXVuinSusiySJ3V1hVYIcGc24sslrmCfx4+u/t+IY1NS8/W+vLSbgANwb5vD64w4BJXkGVIOYFk2SAu0hKx3ramz7wcjvhA+HkxNbl8KlOS/VEuUa3O5EMXJv1yzM31oX/btZbdIFkJwgi0v0bgDI635dTpTJ0c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=nBSfKrRq; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="nBSfKrRq" 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=aeknInBgahlhrSIfl6BQ35gr/87Ob6URDMcFA+uZRVc=; b=nBSfKrRqW/CJy3iB/seVe8R54U +FqjMUO1A2E5UsJHgEobOCJKv8F4ginlYFU32AmXi8dkxt8+ZAk5qVue8Po3xbpMs7I5CgTjot4ET HRFdKNOe4U6hdXq3YJV0i7kABBZ33AzFc0U3jG8OI4JpjdW6GAMP1ZSbzySZ59j2iXxTMe1NRzeT0 DvzfmWWAzubo8osUsE8Qa5ePrdQkxxW+ZcwWUWlWjQkfh8VThs1TFLgKwRRP69BuC+Fkqa5WnhN1g mKRhfj7AbphkJe1aFphKbHrpKB68GWHNXMCgU/W+LSEmJf8UEUaHfG08+C43bt7c9jeZAIPPa3WDE 6YPPBgnw==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hr-0000000AFqW-0qhe; Wed, 02 Apr 2025 21:06:15 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 6/8] filemap: Convert __readahead_batch() to use a folio Date: Wed, 2 Apr 2025 22:06:08 +0100 Message-ID: <20250402210612.2444135-7-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Extract folios from i_mapping, not pages. Removes a hidden call to compound_head(), a use of thp_nr_pages() and an unnecessary assertion that we didn't find a tail page in the page cache. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 0ddd4bd8cdf8..c5c9b3770d75 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1424,7 +1424,7 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, { unsigned int i = 0; XA_STATE(xas, &rac->mapping->i_pages, 0); - struct page *page; + struct folio *folio; BUG_ON(rac->_batch_count > rac->_nr_pages); rac->_nr_pages -= rac->_batch_count; @@ -1433,13 +1433,12 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, xas_set(&xas, rac->_index); rcu_read_lock(); - xas_for_each(&xas, page, rac->_index + rac->_nr_pages - 1) { - if (xas_retry(&xas, page)) + xas_for_each(&xas, folio, rac->_index + rac->_nr_pages - 1) { + if (xas_retry(&xas, folio)) continue; - VM_BUG_ON_PAGE(!PageLocked(page), page); - VM_BUG_ON_PAGE(PageTail(page), page); - array[i++] = page; - rac->_batch_count += thp_nr_pages(page); + VM_BUG_ON_FOLIO(!folio_test_locked(folio), folio); + array[i++] = folio_page(folio, 0); + rac->_batch_count += folio_nr_pages(folio); if (i == array_sz) break; } From patchwork Wed Apr 2 21:06:09 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036474 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AE261F09B8 for ; Wed, 2 Apr 2025 21:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627978; cv=none; b=E0YK2L/YCvQdHG9fQZbDcM5SnAtE+vcxkHwdInjGVYheIbHsiOMTTMH7PRsOsfmOuxtLfIOcpcycEbtfOguYiEvfc8H3ZbN9PAxJWhEyWm6F7PpZkYmtZPpiZRSB8v2517g8QoBmEXhcNnoMS/bQKU+qc8zhzlorwl/tRluz2EQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627978; c=relaxed/simple; bh=xDBMK9tnXE19cE32DvZI9p5KxQe77wUbhlzM80iEwho=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Dm4MDcgTx2cf3J6gnsTIWryyoyVsbiSUlxEJVE9VDshQpVpUc5OiDx7R/0+ZSl1JZFxLH2YxtFqCgF7jh/I3RIzrG3x+aJDz8Yw1e3SFv1pmnZFzGbSiRgCTLJ4POOk7ZG7bc/Y/0GvBGI8LbMykdleQ44zH35CpI/uDzbUadnY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=suhrBjDL; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="suhrBjDL" 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=FK4WOp5c58Z+NW1ocgPzv/oQMmQ5qTAfrmyeSlx2/M4=; b=suhrBjDLDbKfVT2i3Wu1H0JKrE eKEkCQRVRl0mJNXbrsfHdzRalicBbWC4MsuV6n1s6xYB52VgXHfx0kSNNqNEpDoKjj7GBAUFfHbTG czMv2i+MiYP2o0E33C+tDMxYWm4yFrjstLqzXzFLXnas/vAueK/lVYDAgWj34Mnv0Fp6zxRST9WZC LnYcQQDA/6cBiLcCdLptTlovyFQUxY9lngBUcHv+bE8Zz7OhbJDH4+cw67VdyoVvXw5FN+6cv/aRH NNoXaVorUlfkGhzlhzgPy7ESETcpmVvcgH98SOiBdYD+kQBGWaoKaYeZwIwt9TB1BGIdK3I2PIvO/ QF0xapQw==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hr-0000000AFqi-1LhK; Wed, 02 Apr 2025 21:06:15 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 7/8] filemap: Remove readahead_page_batch() Date: Wed, 2 Apr 2025 22:06:09 +0100 Message-ID: <20250402210612.2444135-8-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This function has no more callers; delete it. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/pagemap.h | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index c5c9b3770d75..af25fb640463 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -1447,20 +1447,6 @@ static inline unsigned int __readahead_batch(struct readahead_control *rac, return i; } -/** - * readahead_page_batch - Get a batch of pages to read. - * @rac: The current readahead request. - * @array: An array of pointers to struct page. - * - * Context: The pages are locked and have an elevated refcount. The caller - * should decreases the refcount once the page has been submitted for I/O - * and unlock the page once all I/O to that page has completed. - * Return: The number of pages placed in the array. 0 indicates the request - * is complete. - */ -#define readahead_page_batch(rac, array) \ - __readahead_batch(rac, array, ARRAY_SIZE(array)) - /** * readahead_pos - The byte offset into the file of this readahead request. * @rac: The readahead request. From patchwork Wed Apr 2 21:06:10 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 14036475 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 2AECE1F12FC for ; Wed, 2 Apr 2025 21:06:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=90.155.50.34 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627979; cv=none; b=Znxxol0TCTBvUDHGxGlj8OiIVLzOyYQfBlLyPq6ChkbjptC7zcRgihbxdKvvsNEFc0Ozw9c0QtvfYBeSAEcKxVbUufzQw8Ocd+cs50zc5uLCAQa5meslmcFYLe6T+4aIfAxBJ1+v/IXpH642aYW9m7UnbiAtFIoYezBP+M9woEw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1743627979; c=relaxed/simple; bh=631XXxZ6QxK0nwCz9l0I946hVkNjfd19zySPawygyS8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=I7fknmlkz508PUkXtopyYlCITxhnOVkMFTeDs2HUmWPb+hhexCuOVJNdBi+S5cy3oySWmWmE6kA16FU66eqh4oHdiYM16bUZzPaNQNfCiF6X3odlZTCZC4ylEjExNtFskuDZ3CGLCdx+Tn4of4xn14QjdC6AqpnLikexo11K+Zo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org; spf=none smtp.mailfrom=infradead.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b=f2DK+Qms; arc=none smtp.client-ip=90.155.50.34 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=infradead.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=infradead.org header.i=@infradead.org header.b="f2DK+Qms" 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=gdGXfhvjWL/gl6s0ULg0sXpHWuECaey6MytSISUvSmU=; b=f2DK+QmsfkUD/9y4y4p6uFyAwb QLKoKT75nwTlNhnRPTNi4DRKLsQoa9GtN6h3hra4F9k9HdCm1YwdBPh6yfjNF7TKxYvc6Y6v3rLss VgWtvxQcw4Tg8/JpilLjBADO2U/dDu5JhewobDEw0UQreO3z5YMvcVI5Nhg2vJYlMtIexflianipV xPZD0HM/TzY6GxJDkjlkgGGFefv9/Zx6p8etSM+UZ5hw/CkXF6nn+cYzffzwgYI5qDL3fU/wybR0O MRWnM6IHE4AoGFEejZBW//wZypeDTU3eOybS8sDyc2IeoqsgK7Ct9iiDKqsUylW7aeewwxC7epke8 x+YdsdAQ==; Received: from willy by casper.infradead.org with local (Exim 4.98.1 #2 (Red Hat Linux)) id 1u05Hr-0000000AFqp-23Ip; Wed, 02 Apr 2025 21:06:15 +0000 From: "Matthew Wilcox (Oracle)" To: Andrew Morton Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 8/8] mm: Delete thp_nr_pages() Date: Wed, 2 Apr 2025 22:06:10 +0100 Message-ID: <20250402210612.2444135-9-willy@infradead.org> X-Mailer: git-send-email 2.49.0 In-Reply-To: <20250402210612.2444135-1-willy@infradead.org> References: <20250402210612.2444135-1-willy@infradead.org> Precedence: bulk X-Mailing-List: linux-fsdevel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 All callers now use folio_nr_pages(). Delete this wrapper. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index 99e9addec5cf..0481e30f563e 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -2206,15 +2206,6 @@ static inline long compound_nr(struct page *page) return folio_large_nr_pages(folio); } -/** - * thp_nr_pages - The number of regular pages in this huge page. - * @page: The head page of a huge page. - */ -static inline long thp_nr_pages(struct page *page) -{ - return folio_nr_pages((struct folio *)page); -} - /** * folio_next - Move to the next physical folio. * @folio: The folio we're currently operating on.