linux-next: build failure after merge of the folio tree

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3701 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/erofs/fscache.c:255:10: error: 'const struct address_space_operations' has no member named 'readpage'
  255 |         .readpage = erofs_fscache_meta_readpage,
      |          ^~~~~~~~
fs/erofs/fscache.c:255:21: error: initialization of 'int (*)(struct page *, struct writeback_control *)' from incompatible pointer type 'int (*)(struct file *, struct page *)' [-Werror=incompatible-pointer-types]
  255 |         .readpage = erofs_fscache_meta_readpage,
      |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
fs/erofs/fscache.c:255:21: note: (near initialization for 'erofs_fscache_meta_aops.writepage')
fs/erofs/fscache.c:259:10: error: 'const struct address_space_operations' has no member named 'readpage'
  259 |         .readpage = erofs_fscache_readpage,
      |          ^~~~~~~~
fs/erofs/fscache.c:259:21: error: initialization of 'int (*)(struct page *, struct writeback_control *)' from incompatible pointer type 'int (*)(struct file *, struct page *)' [-Werror=incompatible-pointer-types]
  259 |         .readpage = erofs_fscache_readpage,
      |                     ^~~~~~~~~~~~~~~~~~~~~~
fs/erofs/fscache.c:259:21: note: (near initialization for 'erofs_fscache_access_aops.writepage')

Caused by commit

  00da6d4b7219 ("mm,fs: Remove stray references to ->readpage")

interacting with commits

  60aa7e805f00 ("erofs: implement fscache-based metadata read")
  e472f468adbe ("erofs: implement fscache-based data read for non-inline layout")

from the erofs tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 2 May 2022 17:57:39 +1000
Subject: [PATCH] fixup for "mm,fs: Remove stray references to ->readpage"

interacting with commits

  60aa7e805f00 ("erofs: implement fscache-based metadata read")
  e472f468adbe ("erofs: implement fscache-based data read for non-inline layout")

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/erofs/fscache.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
index a402d8f0a063..1bb2d0fc19c8 100644
--- a/fs/erofs/fscache.c
+++ b/fs/erofs/fscache.c
@@ -59,10 +59,9 @@ static int erofs_fscache_read_folios(struct fscache_cookie *cookie,
 	return ret;
 }
 
-static int erofs_fscache_meta_readpage(struct file *data, struct page *page)
+static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)
 {
 	int ret;
-	struct folio *folio = page_folio(page);
 	struct super_block *sb = folio_mapping(folio)->host->i_sb;
 	struct erofs_map_dev mdev = {
 		.m_deviceid = 0,
@@ -110,9 +109,8 @@ static int erofs_fscache_readpage_inline(struct folio *folio,
 	return 0;
 }
 
-static int erofs_fscache_readpage(struct file *file, struct page *page)
+static int erofs_fscache_read_folio(struct file *file, struct folio *folio)
 {
-	struct folio *folio = page_folio(page);
 	struct inode *inode = folio_mapping(folio)->host;
 	struct super_block *sb = inode->i_sb;
 	struct erofs_map_blocks map;
@@ -252,11 +250,11 @@ static void erofs_fscache_readahead(struct readahead_control *rac)
 }
 
 static const struct address_space_operations erofs_fscache_meta_aops = {
-	.readpage = erofs_fscache_meta_readpage,
+	.read_folio = erofs_fscache_meta_read_folio,
 };
 
 const struct address_space_operations erofs_fscache_access_aops = {
-	.readpage = erofs_fscache_readpage,
+	.read_folio = erofs_fscache_read_folio,
 	.readahead = erofs_fscache_readahead,
 };
 
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[Gao Xiang]

Hi Stephen,

On Mon, May 02, 2022 at 06:04:25PM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the folio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/erofs/fscache.c:255:10: error: 'const struct address_space_operations' has no member named 'readpage'
>   255 |         .readpage = erofs_fscache_meta_readpage,
>       |          ^~~~~~~~
> fs/erofs/fscache.c:255:21: error: initialization of 'int (*)(struct page *, struct writeback_control *)' from incompatible pointer type 'int (*)(struct file *, struct page *)' [-Werror=incompatible-pointer-types]
>   255 |         .readpage = erofs_fscache_meta_readpage,
>       |                     ^~~~~~~~~~~~~~~~~~~~~~~~~~~
> fs/erofs/fscache.c:255:21: note: (near initialization for 'erofs_fscache_meta_aops.writepage')
> fs/erofs/fscache.c:259:10: error: 'const struct address_space_operations' has no member named 'readpage'
>   259 |         .readpage = erofs_fscache_readpage,
>       |          ^~~~~~~~
> fs/erofs/fscache.c:259:21: error: initialization of 'int (*)(struct page *, struct writeback_control *)' from incompatible pointer type 'int (*)(struct file *, struct page *)' [-Werror=incompatible-pointer-types]
>   259 |         .readpage = erofs_fscache_readpage,
>       |                     ^~~~~~~~~~~~~~~~~~~~~~
> fs/erofs/fscache.c:259:21: note: (near initialization for 'erofs_fscache_access_aops.writepage')
> 
> Caused by commit
> 
>   00da6d4b7219 ("mm,fs: Remove stray references to ->readpage")
> 
> interacting with commits
> 
>   60aa7e805f00 ("erofs: implement fscache-based metadata read")
>   e472f468adbe ("erofs: implement fscache-based data read for non-inline layout")
> 
> from the erofs tree.
> 
> I have applied the following merge fix patch.
> 

That looks good to me, will point out this conflict then.

Thanks,
Gao Xiang

> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 2 May 2022 17:57:39 +1000
> Subject: [PATCH] fixup for "mm,fs: Remove stray references to ->readpage"
> 
> interacting with commits
> 
>   60aa7e805f00 ("erofs: implement fscache-based metadata read")
>   e472f468adbe ("erofs: implement fscache-based data read for non-inline layout")
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/erofs/fscache.c | 10 ++++------
>  1 file changed, 4 insertions(+), 6 deletions(-)
> 
> diff --git a/fs/erofs/fscache.c b/fs/erofs/fscache.c
> index a402d8f0a063..1bb2d0fc19c8 100644
> --- a/fs/erofs/fscache.c
> +++ b/fs/erofs/fscache.c
> @@ -59,10 +59,9 @@ static int erofs_fscache_read_folios(struct fscache_cookie *cookie,
>  	return ret;
>  }
>  
> -static int erofs_fscache_meta_readpage(struct file *data, struct page *page)
> +static int erofs_fscache_meta_read_folio(struct file *data, struct folio *folio)
>  {
>  	int ret;
> -	struct folio *folio = page_folio(page);
>  	struct super_block *sb = folio_mapping(folio)->host->i_sb;
>  	struct erofs_map_dev mdev = {
>  		.m_deviceid = 0,
> @@ -110,9 +109,8 @@ static int erofs_fscache_readpage_inline(struct folio *folio,
>  	return 0;
>  }
>  
> -static int erofs_fscache_readpage(struct file *file, struct page *page)
> +static int erofs_fscache_read_folio(struct file *file, struct folio *folio)
>  {
> -	struct folio *folio = page_folio(page);
>  	struct inode *inode = folio_mapping(folio)->host;
>  	struct super_block *sb = inode->i_sb;
>  	struct erofs_map_blocks map;
> @@ -252,11 +250,11 @@ static void erofs_fscache_readahead(struct readahead_control *rac)
>  }
>  
>  static const struct address_space_operations erofs_fscache_meta_aops = {
> -	.readpage = erofs_fscache_meta_readpage,
> +	.read_folio = erofs_fscache_meta_read_folio,
>  };
>  
>  const struct address_space_operations erofs_fscache_access_aops = {
> -	.readpage = erofs_fscache_readpage,
> +	.read_folio = erofs_fscache_read_folio,
>  	.readahead = erofs_fscache_readahead,
>  };
>  
> -- 
> 2.35.1
> 
> -- 
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 666 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

mm/readahead.c: In function 'read_cache_pages_invalidate_page':
mm/readahead.c:54:17: error: implicit declaration of function 'do_invalidatepage'; did you mean 'd_invalidate'? [-Werror=implicit-function-declaration]
   54 |                 do_invalidatepage(page, 0, PAGE_SIZE);
      |                 ^~~~~~~~~~~~~~~~~
      |                 d_invalidate

Caused by commit

  f1fdabbaae8e ("fs: Turn do_invalidatepage() into folio_invalidate()")

I have used the folio tree from next-20220310 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[Matthew Wilcox]

On Tue, Mar 15, 2022 at 09:26:10PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the folio tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> mm/readahead.c: In function 'read_cache_pages_invalidate_page':
> mm/readahead.c:54:17: error: implicit declaration of function 'do_invalidatepage'; did you mean 'd_invalidate'? [-Werror=implicit-function-declaration]
>    54 |                 do_invalidatepage(page, 0, PAGE_SIZE);
>       |                 ^~~~~~~~~~~~~~~~~
>       |                 d_invalidate
> 
> Caused by commit
> 
>   f1fdabbaae8e ("fs: Turn do_invalidatepage() into folio_invalidate()")
> 
> I have used the folio tree from next-20220310 for today.

Sorry about that.  Originally, I'd removed that entire function in an
earlier commit, but had to shuffle that commit to after the NFS tree
merges.

There's a new for-next for your merge resolution tomorrow ... not much
I can do about the conflicts, but all your resolutions seemed
reasonable.  Fixed a couple of other build bugs noted by the build bots
(ceph & hostfs)

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1462 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

mm/mmap.c: In function 'do_mas_align_munmap':
mm/mmap.c:2375:25: error: implicit declaration of function 'munlock_vma_pages_all'; did you mean 'munlock_vma_page'? [-Werror=implicit-function-declaration]
 2375 |                         munlock_vma_pages_all(next);
      |                         ^~~~~~~~~~~~~~~~~~~~~
      |                         munlock_vma_page
mm/mmap.c: In function 'do_brk_munmap':
mm/mmap.c:2908:17: error: implicit declaration of function 'munlock_vma_pages_range'; did you mean 'count_vma_pages_range'? [-Werror=implicit-function-declaration]
 2908 |                 munlock_vma_pages_range(&unmap, newbrk, oldbrk);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~
      |                 count_vma_pages_range

Caused by commits

  a213e5cf71cb ("mm/munlock: delete munlock_vma_pages_all(), allow oomreap")
  34b6792380ce ("mm/munlock: mlock_pte_range() when mlocking or munlocking")

interacting with commits

  99f86dff3df6 ("mm/mmap: Change do_brk_flags() to expand existing VMA and add do_brk_munmap()")
  04552dc1edc5 ("mm: Remove the vma linked list")

from the maple tree.

Given other feedback about the maple tree, I have dropped it for today.

I am not sure what effect this will have on Andrew's patch series, but
I guess I will find out shortly :-(
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

mm/mmap.c: In function 'do_mas_align_munmap':
mm/mmap.c:2373:25: error: implicit declaration of function 'munlock_vma_pages_all'; did you mean 'munlock_vma_page'? [-Werror=implicit-function-declaration]
 2373 |                         munlock_vma_pages_all(next);
      |                         ^~~~~~~~~~~~~~~~~~~~~
      |                         munlock_vma_page
mm/mmap.c: In function 'do_brk_munmap':
mm/mmap.c:2906:17: error: implicit declaration of function 'munlock_vma_pages_range'; did you mean 'count_vma_pages_range'? [-Werror=implicit-function-declaration]
 2906 |                 munlock_vma_pages_range(&unmap, newbrk, oldbrk);
      |                 ^~~~~~~~~~~~~~~~~~~~~~~
      |                 count_vma_pages_range

This is undoubtably due to something I missed in the merge resolution,
so I am giving up on merging the folio tree again today and am back to
the version from next-20220204 again.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1572 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (sparc defconfig)
failed like this:

mm/page_vma_mapped.c: In function 'page_vma_mapped_walk':
mm/page_vma_mapped.c:219:48: error: implicit declaration of function 'pmd_pfn'; did you mean 'pmd_off'? [-Werror=implicit-function-declaration]
  219 |                                 if (!check_pmd(pmd_pfn(pmde), pvmw))
      |                                                ^~~~~~~
      |                                                pmd_off


Caused by commit

  b1dede582893 ("mm: Convert page_vma_mapped_walk to work on PFNs")

I applied the following hack just to make it build:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 15 Feb 2022 17:15:48 +1100
Subject: [PATCH] fix up for "mm: Convert page_vma_mapped_walk to work on PFNs"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 arch/sparc/include/asm/pgtable_32.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/arch/sparc/include/asm/pgtable_32.h b/arch/sparc/include/asm/pgtable_32.h
index ffccfe3b22ed..30d55a37515d 100644
--- a/arch/sparc/include/asm/pgtable_32.h
+++ b/arch/sparc/include/asm/pgtable_32.h
@@ -424,6 +424,13 @@ static inline int io_remap_pfn_range(struct vm_area_struct *vma,
 	__changed;							  \
 })
 
+static inline unsigned long pmd_pfn(pmd_t pmd)
+{
+	pte_t pte = __pte(pmd_val(pmd));
+
+	return pte_pfn(pte);
+}
+
 #endif /* !(__ASSEMBLY__) */
 
 #define VMALLOC_START           _AC(0xfe600000,UL)
-- 
2.34.1

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 772 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

mm/page_vma_mapped.c: In function 'page_vma_mapped_walk':
mm/page_vma_mapped.c:219:48: error: implicit declaration of function 'pmd_pfn'; did you mean 'pmd_off'? [-Werror=implicit-function-declaration]
  219 |                                 if (!check_pmd(pmd_pfn(pmde), pvmw))
      |                                                ^~~~~~~
      |                                                pmd_off

Caused by commit

  02ecfe9b9580 ("mm: Convert page_vma_mapped_walk to work on PFNs")

Presumably you need to explicitly include <linux/pgtable.h>?

I have used the folio tree from next-20220204 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 929 bytes --]

Hi all,

On Mon, 7 Feb 2022 15:06:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the folio tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> mm/page_vma_mapped.c: In function 'page_vma_mapped_walk':
> mm/page_vma_mapped.c:219:48: error: implicit declaration of function 'pmd_pfn'; did you mean 'pmd_off'? [-Werror=implicit-function-declaration]
>   219 |                                 if (!check_pmd(pmd_pfn(pmde), pvmw))
>       |                                                ^~~~~~~
>       |                                                pmd_off
> 
> Caused by commit
> 
>   02ecfe9b9580 ("mm: Convert page_vma_mapped_walk to work on PFNs")
> 
> Presumably you need to explicitly include <linux/pgtable.h>?
> 
> I have used the folio tree from next-20220204 for today.

I am still getting this build failure.
-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[Matthew Wilcox]

On Wed, Feb 09, 2022 at 02:38:04PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> On Mon, 7 Feb 2022 15:06:21 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the folio tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > mm/page_vma_mapped.c: In function 'page_vma_mapped_walk':
> > mm/page_vma_mapped.c:219:48: error: implicit declaration of function 'pmd_pfn'; did you mean 'pmd_off'? [-Werror=implicit-function-declaration]
> >   219 |                                 if (!check_pmd(pmd_pfn(pmde), pvmw))
> >       |                                                ^~~~~~~
> >       |                                                pmd_off
> > 
> > Caused by commit
> > 
> >   02ecfe9b9580 ("mm: Convert page_vma_mapped_walk to work on PFNs")
> > 
> > Presumably you need to explicitly include <linux/pgtable.h>?
> > 
> > I have used the folio tree from next-20220204 for today.
> 
> I am still getting this build failure.

I have it fixed in my tree, but haven't pushed it out yet.
There's going to be a giant pile of conflicts between Hugh's rework
of mlock which just landed in mm and my folioisation of mlock, which
I haven't even started trying to redo yet.

We're back to the "it's hard to work with the mm tree" problem.
Tempted to resolve it by taking Hugh's patches into my tree since
there's no other way to create a stable base to work against.

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 802 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

In file included from include/linux/socket.h:8,
                 from include/linux/compat.h:15,
                 from arch/powerpc/kernel/asm-offsets.c:12:
include/linux/uio.h: In function 'copy_folio_to_iter':
include/linux/uio.h:153:33: error: invalid use of undefined type 'struct folio'
  153 |  return copy_page_to_iter(&folio->page, offset, bytes, i);
      |                                 ^~

Caused by commit

  442f739136ee ("iov_iter: Add copy_folio_to_iter()")

struct folio is only forward declared in uio.h.  Presumably other builds
include mm_types.h indirectly.

I have used the folio tree from next-20211224 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:


Caused by commit

  d389a4a81155 ("mm: Add folio flag manipulation functions")

interacting with commit

  eac96c3efdb5 ("mm: filemap: check if THP has hwpoisoned subpage for PMD page fault")

from Linus' tree.

I have applied the following merge fix patch taken from Andrew's patch
series.

From: Andrew Morton <akpm@linux-foundation.org>
Subject: mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios

fix
mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault.patch
for folio tree PAGEFLAG_FALSE() change.

Cc: Yang Shi <shy828301@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 include/linux/page-flags.h |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- a/include/linux/page-flags.h~mm-filemap-check-if-thp-has-hwpoisoned-subpage-for-pmd-page-fault-vs-folios
+++ a/include/linux/page-flags.h
@@ -803,8 +803,8 @@ PAGEFLAG_FALSE(DoubleMap, double_map)
 PAGEFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)
 	TESTSCFLAG(HasHWPoisoned, has_hwpoisoned, PF_SECOND)
 #else
-PAGEFLAG_FALSE(HasHWPoisoned)
-	TESTSCFLAG_FALSE(HasHWPoisoned)
+PAGEFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)
+	TESTSCFLAG_FALSE(HasHWPoisoned, has_hwpoisoned)
 #endif
 
 /*
_

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1604 bytes --]

Hi all,

After merging the folio tree, today's linux-next build (x86_64
allmodconfig) failed like this:

fs/9p/vfs_file.c: In function 'v9fs_vm_page_mkwrite':
fs/9p/vfs_file.c:557:6: error: implicit declaration of function 'wait_on_page_bit_killable'; did you mean 'wait_on_page_locked_killable'? [-Werror=implicit-function-declaration]
  557 |      wait_on_page_bit_killable(page, PG_writeback) < 0)
      |      ^~~~~~~~~~~~~~~~~~~~~~~~~
      |      wait_on_page_locked_killable

Caused by commit

  be8f72914261 ("mm/filemap: Add folio_wait_bit()")

interacting with commit

  82766b47b26c ("9p: (untested) Convert to using the netfs helper lib to do reads and caching")

from the fscache tree.

I have applied the following merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 21 Sep 2021 14:18:06 +1000
Subject: [PATCH] fix up for "9p: (untested) Convert to using the netfs helper
 lib to do reads and caching"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/9p/vfs_file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 4b617d10cf28..68d05b2aa290 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -554,7 +554,7 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
 #endif
 
 	if (PageWriteback(page) &&
-	    wait_on_page_bit_killable(page, PG_writeback) < 0)
+	    folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
 		return VM_FAULT_RETRY;
 
 	/* Update file times before taking page lock */
-- 
2.32.0

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2795 bytes --]

Hi all,

On Tue, 21 Sep 2021 14:26:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the folio tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> fs/9p/vfs_file.c: In function 'v9fs_vm_page_mkwrite':
> fs/9p/vfs_file.c:557:6: error: implicit declaration of function 'wait_on_page_bit_killable'; did you mean 'wait_on_page_locked_killable'? [-Werror=implicit-function-declaration]
>   557 |      wait_on_page_bit_killable(page, PG_writeback) < 0)
>       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
>       |      wait_on_page_locked_killable
> 
> Caused by commit
> 
>   be8f72914261 ("mm/filemap: Add folio_wait_bit()")
> 
> interacting with commit
> 
>   82766b47b26c ("9p: (untested) Convert to using the netfs helper lib to do reads and caching")
> 
> from the fscache tree.
> 
> I have applied the following merge fix patch.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 21 Sep 2021 14:18:06 +1000
> Subject: [PATCH] fix up for "9p: (untested) Convert to using the netfs helper
>  lib to do reads and caching"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/9p/vfs_file.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> index 4b617d10cf28..68d05b2aa290 100644
> --- a/fs/9p/vfs_file.c
> +++ b/fs/9p/vfs_file.c
> @@ -554,7 +554,7 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
>  #endif
>  
>  	if (PageWriteback(page) &&
> -	    wait_on_page_bit_killable(page, PG_writeback) < 0)
> +	    folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
>  		return VM_FAULT_RETRY;
>  
>  	/* Update file times before taking page lock */

This fix patch now looks like this:

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Sep 2021 14:16:55 +1000
Subject: [PATCH] fix up for "9p: Convert to using the netfs helper lib to do reads and caching"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 fs/9p/vfs_file.c | 4 ++--
 1 file changed, 2 insertion(+), 2 deletion(-)

diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 7ed76a4c18f1..0f99ec49006e 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -549,12 +549,12 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
 	 */
 #ifdef CONFIG_9P_FSCACHE
 	if (PageFsCache(page) &&
-	    wait_on_page_bit_killable(page, PG_fscache) < 0)
+	    folio_wait_bit_killable(page_folio(page), PG_fscache) < 0)
 		return VM_FAULT_RETRY;
 #endif
 
 	if (PageWriteback(page) &&
-	    wait_on_page_bit_killable(page, PG_writeback) < 0)
+	    folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
 		return VM_FAULT_RETRY;
 
 	/* Update file times before taking page lock */

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 3105 bytes --]

Hi all,

On Wed, 22 Sep 2021 14:19:10 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> On Tue, 21 Sep 2021 14:26:28 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the folio tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > fs/9p/vfs_file.c: In function 'v9fs_vm_page_mkwrite':
> > fs/9p/vfs_file.c:557:6: error: implicit declaration of function 'wait_on_page_bit_killable'; did you mean 'wait_on_page_locked_killable'? [-Werror=implicit-function-declaration]
> >   557 |      wait_on_page_bit_killable(page, PG_writeback) < 0)
> >       |      ^~~~~~~~~~~~~~~~~~~~~~~~~
> >       |      wait_on_page_locked_killable
> > 
> > Caused by commit
> > 
> >   be8f72914261 ("mm/filemap: Add folio_wait_bit()")
> > 
> > interacting with commit
> > 
> >   82766b47b26c ("9p: (untested) Convert to using the netfs helper lib to do reads and caching")
> > 
> > from the fscache tree.
> > 
> > I have applied the following merge fix patch.
> > 
> > From: Stephen Rothwell <sfr@canb.auug.org.au>
> > Date: Tue, 21 Sep 2021 14:18:06 +1000
> > Subject: [PATCH] fix up for "9p: (untested) Convert to using the netfs helper
> >  lib to do reads and caching"
> > 
> > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> > ---
> >  fs/9p/vfs_file.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> > index 4b617d10cf28..68d05b2aa290 100644
> > --- a/fs/9p/vfs_file.c
> > +++ b/fs/9p/vfs_file.c
> > @@ -554,7 +554,7 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
> >  #endif
> >  
> >  	if (PageWriteback(page) &&
> > -	    wait_on_page_bit_killable(page, PG_writeback) < 0)
> > +	    folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
> >  		return VM_FAULT_RETRY;
> >  
> >  	/* Update file times before taking page lock */  
> 
> This fix patch now looks like this:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Wed, 22 Sep 2021 14:16:55 +1000
> Subject: [PATCH] fix up for "9p: Convert to using the netfs helper lib to do reads and caching"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  fs/9p/vfs_file.c | 4 ++--
>  1 file changed, 2 insertion(+), 2 deletion(-)
> 
> diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
> index 7ed76a4c18f1..0f99ec49006e 100644
> --- a/fs/9p/vfs_file.c
> +++ b/fs/9p/vfs_file.c
> @@ -549,12 +549,12 @@ v9fs_vm_page_mkwrite(struct vm_fault *vmf)
>  	 */
>  #ifdef CONFIG_9P_FSCACHE
>  	if (PageFsCache(page) &&
> -	    wait_on_page_bit_killable(page, PG_fscache) < 0)
> +	    folio_wait_bit_killable(page_folio(page), PG_fscache) < 0)
>  		return VM_FAULT_RETRY;
>  #endif
>  
>  	if (PageWriteback(page) &&
> -	    wait_on_page_bit_killable(page, PG_writeback) < 0)
> +	    folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)
>  		return VM_FAULT_RETRY;
>  
>  	/* Update file times before taking page lock */

This is now a conflict between Linus' tree and the fscache tree.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the folio tree

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> > -	    wait_on_page_bit_killable(page, PG_fscache) < 0)
> > +	    folio_wait_bit_killable(page_folio(page), PG_fscache) < 0)
> ...
> > -	    wait_on_page_bit_killable(page, PG_writeback) < 0)
> > +	    folio_wait_bit_killable(page_folio(page), PG_writeback) < 0)

I rebased it and pushed a new version, but I think I missed your pull by a
couple of hours.

David