From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Paolo Bonzini <pbonzini@redhat.com>,
Christian Brauner <brauner@kernel.org>
Cc: KVM <kvm@vger.kernel.org>,
"Matthew Wilcox (Oracle)" <willy@infradead.org>,
Ackerley Tng <ackerleytng@google.com>,
Chao Peng <chao.p.peng@linux.intel.com>,
Isaku Yamahata <isaku.yamahata@intel.com>,
"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>,
Michael Roth <michael.roth@amd.com>,
Sean Christopherson <seanjc@google.com>,
Yu Zhang <yu.c.zhang@linux.intel.com>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Linux Next Mailing List <linux-next@vger.kernel.org>
Subject: linux-next: build failure after merge of the kvm tree
Date: Wed, 22 Nov 2023 13:14:28 +1100 [thread overview]
Message-ID: <20231122131428.599f2931@canb.auug.org.au> (raw)
[-- Attachment #1: Type: text/plain, Size: 3500 bytes --]
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: In function 'kvm_gmem_punch_hole':
arch/x86/kvm/../../../virt/kvm/guest_memfd.c:100:58: error: 'struct address_space' has no member named 'private_list'; did you mean 'i_private_list'?
100 | struct list_head *gmem_list = &inode->i_mapping->private_list;
| ^~~~~~~~~~~~
| i_private_list
arch/x86/kvm/../../../virt/kvm/guest_memfd.c: In function 'kvm_gmem_error_folio':
arch/x86/kvm/../../../virt/kvm/guest_memfd.c:273:49: error: 'struct address_space' has no member named 'private_list'; did you mean 'i_private_list'?
273 | struct list_head *gmem_list = &mapping->private_list;
| ^~~~~~~~~~~~
| i_private_list
arch/x86/kvm/../../../virt/kvm/guest_memfd.c: In function '__kvm_gmem_create':
arch/x86/kvm/../../../virt/kvm/guest_memfd.c:373:51: error: 'struct address_space' has no member named 'private_list'; did you mean 'i_private_list'?
373 | list_add(&gmem->entry, &inode->i_mapping->private_list);
| ^~~~~~~~~~~~
| i_private_list
Caused by commit
a7800aa80ea4 ("KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory")
interacting with commit
488e2eea5100 ("fs: Rename mapping private members")
from the vfs-brauner tree.
I have applied the following merge fix patch.
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 22 Nov 2023 13:10:06 +1100
Subject: [PATCH] fix up for "KVM: Add KVM_CREATE_GUEST_MEMFD ioctl() for guest-specific backing memory"
interacting with "fs: Rename mapping private members" from the vfs-brauner
tree.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
virt/kvm/guest_memfd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c
index 451435123fe7..16d58806e913 100644
--- a/virt/kvm/guest_memfd.c
+++ b/virt/kvm/guest_memfd.c
@@ -97,7 +97,7 @@ static void kvm_gmem_invalidate_end(struct kvm_gmem *gmem, pgoff_t start,
static long kvm_gmem_punch_hole(struct inode *inode, loff_t offset, loff_t len)
{
- struct list_head *gmem_list = &inode->i_mapping->private_list;
+ struct list_head *gmem_list = &inode->i_mapping->i_private_list;
pgoff_t start = offset >> PAGE_SHIFT;
pgoff_t end = (offset + len) >> PAGE_SHIFT;
struct kvm_gmem *gmem;
@@ -270,7 +270,7 @@ static int kvm_gmem_migrate_folio(struct address_space *mapping,
static int kvm_gmem_error_folio(struct address_space *mapping,
struct folio *folio)
{
- struct list_head *gmem_list = &mapping->private_list;
+ struct list_head *gmem_list = &mapping->i_private_list;
struct kvm_gmem *gmem;
pgoff_t start, end;
@@ -370,7 +370,7 @@ static int __kvm_gmem_create(struct kvm *kvm, loff_t size, u64 flags)
kvm_get_kvm(kvm);
gmem->kvm = kvm;
xa_init(&gmem->bindings);
- list_add(&gmem->entry, &inode->i_mapping->private_list);
+ list_add(&gmem->entry, &inode->i_mapping->i_private_list);
fd_install(fd, file);
return fd;
--
2.40.1
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2023-11-22 2:14 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-11-22 2:14 Stephen Rothwell [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-05-02 6:47 linux-next: build failure after merge of the kvm tree Stephen Rothwell
2024-04-12 3:34 Stephen Rothwell
2024-04-12 3:35 ` Stephen Rothwell
2024-04-12 12:14 ` Paolo Bonzini
2023-11-20 4:22 Stephen Rothwell
2023-12-11 2:50 ` Stephen Rothwell
2022-04-19 5:34 Stephen Rothwell
2022-04-19 16:01 ` Sean Christopherson
2022-04-19 16:09 ` Paolo Bonzini
2022-04-21 18:06 ` Paolo Bonzini
2022-04-27 3:23 ` Stephen Rothwell
2022-04-27 6:06 ` Paolo Bonzini
2021-02-08 5:33 Stephen Rothwell
2021-02-08 11:18 ` Yu Zhang
2021-02-05 5:02 Stephen Rothwell
2021-02-05 10:08 ` Paolo Bonzini
2021-02-07 19:48 ` Stephen Rothwell
2021-02-09 4:56 ` Stephen Rothwell
2020-07-17 5:57 Stephen Rothwell
2020-07-29 7:06 ` Stephen Rothwell
2020-05-21 6:28 Stephen Rothwell
2020-06-04 2:54 ` Stephen Rothwell
2019-02-18 3:42 Stephen Rothwell
2019-02-19 15:36 ` Sean Christopherson
2019-02-19 18:17 ` Paolo Bonzini
2018-12-19 4:33 Stephen Rothwell
2017-02-08 3:23 Stephen Rothwell
2016-12-19 1:11 Stephen Rothwell
2015-09-08 1:35 Stephen Rothwell
2015-09-08 2:10 ` Wanpeng Li
2015-09-08 9:24 ` Paolo Bonzini
2015-05-29 7:36 Stephen Rothwell
2015-05-29 7:54 ` Ingo Molnar
2015-05-29 12:08 ` Paolo Bonzini
2014-11-24 6:19 Stephen Rothwell
2014-11-24 9:38 ` Paolo Bonzini
2014-08-06 4:39 Stephen Rothwell
2014-03-11 23:55 Mark Brown
2014-01-10 3:00 Stephen Rothwell
2014-01-17 4:03 ` Stephen Rothwell
2012-08-23 3:21 Stephen Rothwell
2012-03-06 4:53 Stephen Rothwell
2012-03-06 10:34 ` Avi Kivity
2010-08-30 1:35 Stephen Rothwell
2010-08-30 10:03 ` Alexander Graf
2010-08-30 10:56 ` Avi Kivity
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=20231122131428.599f2931@canb.auug.org.au \
--to=sfr@canb.auug.org.au \
--cc=ackerleytng@google.com \
--cc=brauner@kernel.org \
--cc=chao.p.peng@linux.intel.com \
--cc=isaku.yamahata@intel.com \
--cc=kirill.shutemov@linux.intel.com \
--cc=kvm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=michael.roth@amd.com \
--cc=pbonzini@redhat.com \
--cc=seanjc@google.com \
--cc=willy@infradead.org \
--cc=yu.c.zhang@linux.intel.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).