From patchwork Wed Nov 22 02:14:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 13463862 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="LT5DOMUG" Received: from gandalf.ozlabs.org (gandalf.ozlabs.org [150.107.74.76]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA91298; Tue, 21 Nov 2023 18:14:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canb.auug.org.au; s=201702; t=1700619270; bh=jMhp3OO1OuD6ZqqAsOzECGZ72/P154caojLkXwRL41U=; h=Date:From:To:Cc:Subject:From; b=LT5DOMUGm6oxoBluIfXnUbTw906Ry0buC3EaQQnVidLlrMLljA2K40T2xlof4w/Ag sHlnqbuLOtBbNeMAbIizkhafQEnta+dd7I8DQazbOL60zdUsWaB0X0U22xto88mjoR dykM7PJNh4DPm70zxYi+QbTX8SqsxcXpmU2Uhwv03hf5biTxjvrJVNRjoLS3jJYx9o 6ovPPqQkk27PyjdBDCdAIZ1So3AXyRSHI6M1QIL7ECGuL8dlMBwUvGKc9e2LhyHlTd 4XMyeh6A1UsNJUI+oljCmwjRr26EqQU7eDsekA33LwPZaw7jX3fnJlelBLFa6ZaMmz aOYz2AOtzsIHQ== 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 4SZlDj1X1Mz4xSQ; Wed, 22 Nov 2023 13:14:29 +1100 (AEDT) Date: Wed, 22 Nov 2023 13:14:28 +1100 From: Stephen Rothwell To: Paolo Bonzini , Christian Brauner Cc: KVM , "Matthew Wilcox (Oracle)" , Ackerley Tng , Chao Peng , Isaku Yamahata , "Kirill A. Shutemov" , Michael Roth , Sean Christopherson , Yu Zhang , Linux Kernel Mailing List , Linux Next Mailing List Subject: linux-next: build failure after merge of the kvm tree Message-ID: <20231122131428.599f2931@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: 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 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 --- 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;