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: 168063 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2b07:b0:403:3b70:6f57 with SMTP id io7csp1048098vqb; Tue, 21 Nov 2023 18:14:41 -0800 (PST) X-Google-Smtp-Source: AGHT+IGWpRdv3EKC3U+dzVAejCYbRsBeKng496yqYhNl7sbQXS5CaB0CDfkpJOUMoq3x5iobrk21 X-Received: by 2002:a9d:7516:0:b0:6d4:80e7:7884 with SMTP id r22-20020a9d7516000000b006d480e77884mr1079180otk.1.1700619281252; Tue, 21 Nov 2023 18:14:41 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700619281; cv=none; d=google.com; s=arc-20160816; b=AoNhjioi3PEDQcEu18fBcVuY1aOuWgvlpJfTu4oLGPbzzrfg8/Z5HXTUD9s5zFH/CL 89gWNrknQE5P/UNf97+7ihSIA1yLPqfgruB5cIGU8SlwB6TFDWbACQ786QNSkkppRoI4 olWtjpaU7eB/e5/zargmVDq5DSqCdM1MK8H1sQ3dsToCT6UQnqLP/305t9+jYRtv9DDH 5uNFJzy66AqvC+Ja7NCrsXLRb/89Jp8gqrebjA5ZcBKfOVzgPoiVZXn84BfE7sYQEo8b p+obnXLoAImba5+rSpGt45iDuSxIs/7hBgObyytEx2QhlPAwfcQFjK9nHrKchzn2zj+E AVvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:message-id:subject:cc:to:from:date :dkim-signature; bh=jMhp3OO1OuD6ZqqAsOzECGZ72/P154caojLkXwRL41U=; fh=mPohuDMKfLt5tJqes2JAtO8wKC3+gntOSuRdPWFH8U4=; b=oM8bn7pBckX5LC3whzOZ5HsHuNd3JMPTL5Qj4IVCW1ljFjLZNFpz3PxD04Bl61xCSZ MCgf7xATFb61cV6RmScCwZwQdfigQl10EbNOZuopJeBTXARKHEvmYTD7JfPFwVTPFJbZ 6hNm6fE36aMKjFweqBC9k4zpalGGrORoZWPdbyPHLleG9P/39apcreeE2+GFPenhlNYd tAQGC8uz+QbPuoQX6DieGlSgn6bW8HNAsIX7XzdcWOA57rDGmmiP78O1zSbCkuduR/UM CQSCbUYVZch29LNW834qHAxZ3RIACpUi7voC8Qyjr2zAHUCIOBo6wvy+9sJ5oQQy+aK+ vlfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LT5DOMUG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from lipwig.vger.email (lipwig.vger.email. [23.128.96.33]) by mx.google.com with ESMTPS id c23-20020a63d517000000b005b96c4292bbsi11177550pgg.420.2023.11.21.18.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 Nov 2023 18:14:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) client-ip=23.128.96.33; Authentication-Results: mx.google.com; dkim=pass header.i=@canb.auug.org.au header.s=201702 header.b=LT5DOMUG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.33 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canb.auug.org.au Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by lipwig.vger.email (Postfix) with ESMTP id 7B5C58184520; Tue, 21 Nov 2023 18:14:37 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at lipwig.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1343520AbjKVCOh (ORCPT + 99 others); Tue, 21 Nov 2023 21:14:37 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229850AbjKVCOg (ORCPT ); Tue, 21 Nov 2023 21:14:36 -0500 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> MIME-Version: 1.0 X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lipwig.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (lipwig.vger.email [0.0.0.0]); Tue, 21 Nov 2023 18:14:37 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1783228563163549089 X-GMAIL-MSGID: 1783228563163549089 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;