LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: "Matthew Wilcox (Oracle)" <willy@infradead.org>
To: akpm@linux-foundation.org
Cc: "Matthew Wilcox (Oracle)" <willy@infradead.org>,
	linux-kernel@vger.kernel.org, linux-mm@kvack.org,
	linux-fsdevel@vger.kernel.org, Christoph Hellwig <hch@lst.de>,
	Jeff Layton <jlayton@kernel.org>,
	"Kirill A . Shutemov" <kirill.shutemov@linux.intel.com>,
	Vlastimil Babka <vbabka@suse.cz>,
	William Kucharski <william.kucharski@oracle.com>,
	David Howells <dhowells@redhat.com>
Subject: [PATCH v13 26/32] mm/writeback: Add folio_wait_stable()
Date: Mon, 12 Jul 2021 20:01:58 +0100	[thread overview]
Message-ID: <20210712190204.80979-27-willy@infradead.org> (raw)
In-Reply-To: <20210712190204.80979-1-willy@infradead.org>

Move wait_for_stable_page() into the folio compatibility file.
folio_wait_stable() avoids a call to compound_head() and is 14 bytes
smaller than wait_for_stable_page() was.  The net text size grows by 16
bytes as a result of this patch.  We can also remove thp_head() as this
was the last user.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Acked-by: Jeff Layton <jlayton@kernel.org>
Acked-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: William Kucharski <william.kucharski@oracle.com>
Reviewed-by: David Howells <dhowells@redhat.com>
---
 include/linux/huge_mm.h | 15 ---------------
 include/linux/pagemap.h |  1 +
 mm/folio-compat.c       |  6 ++++++
 mm/page-writeback.c     | 24 ++++++++++++++----------
 4 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/include/linux/huge_mm.h b/include/linux/huge_mm.h
index f123e15d966e..f280f33ff223 100644
--- a/include/linux/huge_mm.h
+++ b/include/linux/huge_mm.h
@@ -250,15 +250,6 @@ static inline spinlock_t *pud_trans_huge_lock(pud_t *pud,
 		return NULL;
 }
 
-/**
- * thp_head - Head page of a transparent huge page.
- * @page: Any page (tail, head or regular) found in the page cache.
- */
-static inline struct page *thp_head(struct page *page)
-{
-	return compound_head(page);
-}
-
 /**
  * thp_order - Order of a transparent huge page.
  * @page: Head page of a transparent huge page.
@@ -336,12 +327,6 @@ static inline struct list_head *page_deferred_list(struct page *page)
 #define HPAGE_PUD_MASK ({ BUILD_BUG(); 0; })
 #define HPAGE_PUD_SIZE ({ BUILD_BUG(); 0; })
 
-static inline struct page *thp_head(struct page *page)
-{
-	VM_BUG_ON_PGFLAGS(PageTail(page), page);
-	return page;
-}
-
 static inline unsigned int thp_order(struct page *page)
 {
 	VM_BUG_ON_PGFLAGS(PageTail(page), page);
diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h
index b4a9eb0b7471..da8fc2eec14a 100644
--- a/include/linux/pagemap.h
+++ b/include/linux/pagemap.h
@@ -772,6 +772,7 @@ int folio_wait_writeback_killable(struct folio *folio);
 void end_page_writeback(struct page *page);
 void folio_end_writeback(struct folio *folio);
 void wait_for_stable_page(struct page *page);
+void folio_wait_stable(struct folio *folio);
 
 void __set_page_dirty(struct page *, struct address_space *, int warn);
 int __set_page_dirty_nobuffers(struct page *page);
diff --git a/mm/folio-compat.c b/mm/folio-compat.c
index 41275dac7a92..3c83f03b80d7 100644
--- a/mm/folio-compat.c
+++ b/mm/folio-compat.c
@@ -29,3 +29,9 @@ void wait_on_page_writeback(struct page *page)
 	return folio_wait_writeback(page_folio(page));
 }
 EXPORT_SYMBOL_GPL(wait_on_page_writeback);
+
+void wait_for_stable_page(struct page *page)
+{
+	return folio_wait_stable(page_folio(page));
+}
+EXPORT_SYMBOL_GPL(wait_for_stable_page);
diff --git a/mm/page-writeback.c b/mm/page-writeback.c
index 4abf5a5fff81..1554f25ba7fb 100644
--- a/mm/page-writeback.c
+++ b/mm/page-writeback.c
@@ -2877,17 +2877,21 @@ int folio_wait_writeback_killable(struct folio *folio)
 EXPORT_SYMBOL_GPL(folio_wait_writeback_killable);
 
 /**
- * wait_for_stable_page() - wait for writeback to finish, if necessary.
- * @page:	The page to wait on.
+ * folio_wait_stable() - wait for writeback to finish, if necessary.
+ * @folio: The folio to wait on.
  *
- * This function determines if the given page is related to a backing device
- * that requires page contents to be held stable during writeback.  If so, then
- * it will wait for any pending writeback to complete.
+ * This function determines if the given folio is related to a backing
+ * device that requires folio contents to be held stable during writeback.
+ * If so, then it will wait for any pending writeback to complete.
+ *
+ * Context: Sleeps.  Must be called in process context and with
+ * no spinlocks held.  Caller should hold a reference on the folio.
+ * If the folio is not locked, writeback may start again after writeback
+ * has finished.
  */
-void wait_for_stable_page(struct page *page)
+void folio_wait_stable(struct folio *folio)
 {
-	page = thp_head(page);
-	if (page->mapping->host->i_sb->s_iflags & SB_I_STABLE_WRITES)
-		wait_on_page_writeback(page);
+	if (folio->mapping->host->i_sb->s_iflags & SB_I_STABLE_WRITES)
+		folio_wait_writeback(folio);
 }
-EXPORT_SYMBOL_GPL(wait_for_stable_page);
+EXPORT_SYMBOL_GPL(folio_wait_stable);
-- 
2.30.2


  parent reply	other threads:[~2021-07-12 19:17 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-12 19:01 [PATCH v13a 00/32] Memory folios Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 01/32] mm: Convert get_page_unless_zero() to return bool Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 02/32] mm: Introduce struct folio Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 03/32] mm: Add folio_pgdat(), folio_zone() and folio_zonenum() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 04/32] mm/vmstat: Add functions to account folio statistics Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 05/32] mm/debug: Add VM_BUG_ON_FOLIO() and VM_WARN_ON_ONCE_FOLIO() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 06/32] mm: Add folio reference count functions Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 07/32] mm: Add folio_put() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 08/32] mm: Add folio_get() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 09/32] mm: Add folio_try_get_rcu() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 10/32] mm: Add folio flag manipulation functions Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 11/32] mm/lru: Add folio LRU functions Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 12/32] mm: Handle per-folio private data Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 13/32] mm/filemap: Add folio_index(), folio_file_page() and folio_contains() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 14/32] mm/filemap: Add folio_next_index() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 15/32] mm/filemap: Add folio_pos() and folio_file_pos() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 16/32] mm/util: Add folio_mapping() and folio_file_mapping() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 17/32] mm/filemap: Add folio_unlock() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 18/32] mm/filemap: Add folio_lock() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 19/32] mm/filemap: Add folio_lock_killable() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 20/32] mm/filemap: Add __folio_lock_async() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 21/32] mm/filemap: Add folio_wait_locked() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 22/32] mm/filemap: Add __folio_lock_or_retry() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 23/32] mm/swap: Add folio_rotate_reclaimable() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 24/32] mm/filemap: Add folio_end_writeback() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` [PATCH v13 25/32] mm/writeback: Add folio_wait_writeback() Matthew Wilcox (Oracle)
2021-07-12 19:01 ` Matthew Wilcox (Oracle) [this message]
2021-07-12 19:01 ` [PATCH v13 27/32] mm/filemap: Add folio_wait_bit() Matthew Wilcox (Oracle)
2021-07-12 19:02 ` [PATCH v13 28/32] mm/filemap: Add folio_wake_bit() Matthew Wilcox (Oracle)
2021-07-12 19:02 ` [PATCH v13 29/32] mm/filemap: Convert page wait queues to be folios Matthew Wilcox (Oracle)
2021-07-12 19:02 ` [PATCH v13 30/32] mm/filemap: Add folio private_2 functions Matthew Wilcox (Oracle)
2021-07-12 19:02 ` [PATCH v13 31/32] fs/netfs: Add folio fscache functions Matthew Wilcox (Oracle)
2021-07-12 19:02 ` [PATCH v13 32/32] mm: Add folio_mapped() Matthew Wilcox (Oracle)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210712190204.80979-27-willy@infradead.org \
    --to=willy@infradead.org \
    --cc=akpm@linux-foundation.org \
    --cc=dhowells@redhat.com \
    --cc=hch@lst.de \
    --cc=jlayton@kernel.org \
    --cc=kirill.shutemov@linux.intel.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=vbabka@suse.cz \
    --cc=william.kucharski@oracle.com \
    --subject='Re: [PATCH v13 26/32] mm/writeback: Add folio_wait_stable()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).