From patchwork Mon Nov 20 04:22:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13460783 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=canb.auug.org.au header.i=@canb.auug.org.au header.b="SWM5zXWm" Received: from gandalf.ozlabs.org (mail.ozlabs.org [IPv6:2404:9400:2221:ea00::3]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3623BC5; Sun, 19 Nov 2023 20:22:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700454156; bh=0q6NjU+ifeLvujPJLHr8VqYO47RqQ4I3ODqxgOoEHMY=; h=Date:From:To:Cc:Subject:From; b=SWM5zXWmCl9j2pPW5U4s2sP/7ykJceEih5LBo4n7tulgcg9ecov73QBwrU1jSz/gy 5d87zLWpgenaT673+I/V71Z80HQs5zI4nMezehUVreW+r4XvrR76IkCsoK155PyRUp 3Wm1UsnIyJKTFTrwp10qsnY47K2oH8oe6Y2YuQ1GuSUOcP2QStBreNvCYh7gdVse36 Ddb3al2kKGjsfYl+NG/UVAWS9m4GrE1yOiABts1Ct2HsA6diM5O0wZ4n3Cioxmu8Rr tzBkuInPyoXWh5TG/i87kZ3np9VFHAUx600dtU6w084YCTaXBdn+pXiKP4//mLGzgr iPCwyisrsm3GQ== Received: from authenticated.ozlabs.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.ozlabs.org (Postfix) with ESMTPSA id 4SYZ9M3Hsmz4xS9; Mon, 20 Nov 2023 15:22:31 +1100 (AEDT) Date: Mon, 20 Nov 2023 15:22:27 +1100 From: Stephen Rothwell To: Paolo Bonzini , Andrew Morton Cc: KVM , Ackerley Tng , Chao Peng , Isaku Yamahata , "Kirill A. Shutemov" , Michael Roth , Sean Christopherson , Yu Zhang , "Matthew Wilcox (Oracle)" , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the kvm tree Message-ID: <20231120152227.3bfe2450@canb.auug.org.au> Precedence: bulk X-Mailing-List: kvm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Hi all, After merging the kvm tree, today's linux-next build (x86_64 allmodconfig) failed like this: arch/x86/kvm/../../../virt/kvm/guest_memfd.c:306:10: error: 'const struct address_space_operations' has no member named 'error_remove_page'; did you mean 'error_remove_folio'? 306 | .error_remove_page = kvm_gmem_error_page, | ^~~~~~~~~~~~~~~~~ | error_remove_folio arch/x86/kvm/../../../virt/kvm/guest_memfd.c:306:30: error: initialization of 'int (*)(struct folio *)' from incompatible pointer type 'int (*)(struct address_space *, struct page *)' [-Werror=incompatible-pointer-types] 306 | .error_remove_page = kvm_gmem_error_page, | ^~~~~~~~~~~~~~~~~~~ arch/x86/kvm/../../../virt/kvm/guest_memfd.c:306:30: note: (near initialization for 'kvm_gmem_aops.launder_folio') Caused by commit 640be5bc564f ("fs: convert error_remove_page to error_remove_folio") from the mm tree intercting with commit a7800aa80ea4 ("KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory") I have applied the following supplied merge fix patch (thanks Andrew). From: Andrew Morton Date: Fri, 17 Nov 2023 09:28:33 -0800 Subject: [PATCH] fs: Convert error_remove_page to error_remove_folio On Fri, 17 Nov 2023 16:14:47 +0000 "Matthew Wilcox (Oracle)" wrote: > There were already assertions that we were not passing a tail page > to error_remove_page(), so make the compiler enforce that by converting > everything to pass and use a folio. > > Signed-off-by: Matthew Wilcox (Oracle) > --- > Documentation/filesystems/locking.rst | 4 ++-- > Documentation/filesystems/vfs.rst | 6 +++--- > block/fops.c | 2 +- > fs/afs/write.c | 2 +- > fs/bcachefs/fs.c | 2 +- > fs/btrfs/inode.c | 2 +- > fs/ceph/addr.c | 4 ++-- > fs/ext2/inode.c | 2 +- > fs/ext4/inode.c | 6 +++--- > fs/f2fs/compress.c | 2 +- > fs/f2fs/inode.c | 2 +- > fs/gfs2/aops.c | 4 ++-- > fs/hugetlbfs/inode.c | 6 +++--- > fs/nfs/file.c | 2 +- > fs/ntfs/aops.c | 6 +++--- > fs/ocfs2/aops.c | 2 +- > fs/xfs/xfs_aops.c | 2 +- > fs/zonefs/file.c | 2 +- > include/linux/fs.h | 2 +- > include/linux/mm.h | 3 ++- > mm/memory-failure.c | 10 +++++----- > mm/shmem.c | 6 +++--- > mm/truncate.c | 9 ++++----- > virt/kvm/guest_memfd.c | 9 +++++---- virt/kvm/guest_memfd.c exists only in the KVM tree (and hence linux-next). So I assume Stephen will use the change from this patch when doing his resolution. This: --- virt/kvm/guest_memfd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c index b99272396119..451435123fe7 100644 --- a/virt/kvm/guest_memfd.c +++ b/virt/kvm/guest_memfd.c @@ -267,7 +267,8 @@ static int kvm_gmem_migrate_folio(struct address_space *mapping, return -EINVAL; } -static int kvm_gmem_error_page(struct address_space *mapping, struct page *page) +static int kvm_gmem_error_folio(struct address_space *mapping, + struct folio *folio) { struct list_head *gmem_list = &mapping->private_list; struct kvm_gmem *gmem; @@ -275,8 +276,8 @@ static int kvm_gmem_error_page(struct address_space *mapping, struct page *page) filemap_invalidate_lock_shared(mapping); - start = page->index; - end = start + thp_nr_pages(page); + start = folio->index; + end = start + folio_nr_pages(folio); list_for_each_entry(gmem, gmem_list, entry) kvm_gmem_invalidate_begin(gmem, start, end); @@ -303,7 +304,7 @@ static const struct address_space_operations kvm_gmem_aops = { #ifdef CONFIG_MIGRATION .migrate_folio = kvm_gmem_migrate_folio, #endif - .error_remove_page = kvm_gmem_error_page, + .error_remove_folio = kvm_gmem_error_folio, }; static int kvm_gmem_getattr(struct mnt_idmap *idmap, const struct path *path,