From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from fra-out-009.esa.eu-central-1.outbound.mail-perimeter.amazon.com (fra-out-009.esa.eu-central-1.outbound.mail-perimeter.amazon.com [3.64.237.68]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A7C51307AFA; Wed, 24 Sep 2025 15:22:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=3.64.237.68 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758727364; cv=none; b=LByAvfFqjtXPDgGgkLXUz17qmOPiiOhpw1SK+vZqNBxVlMV29/Dmj31CNvmd0FZvv8VmCD19B792jeGUObWXmrjCv5dg7wDefWj5RJ4Da0y/BFHaGpgepFm+46TX+IQZyJjpa7B+h0/9mPN/siiur43F5z3hwB0zrhsl4rOMgi0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758727364; c=relaxed/simple; bh=boCNRJaDJe5DVCwMhY/OC0YANe+R12MkBrGvEOzU35U=; h=From:CC:Subject:Date:Message-ID:References:In-Reply-To: Content-Type:MIME-Version; b=PfemqIJ+QaYO7JHpUfe8cT9h6bfZo/EvC13mIJFGzO8m6lqFcBvaDIYWljLzt6rI97z7RVbT5Sw6fNMRWkK4/D4VIBu0UhYXChnDT1DobEo4IEi9xzSYqcZCWipTX4Gn5/b7/Ke3RZAhfkSRKdTj0VUjRVLY/fcdTdS3QgG1SZM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk; spf=pass smtp.mailfrom=amazon.co.uk; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b=BooTx5Mn; arc=none smtp.client-ip=3.64.237.68 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=amazon.co.uk Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=amazon.co.uk header.i=@amazon.co.uk header.b="BooTx5Mn" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.co.uk; i=@amazon.co.uk; q=dns/txt; s=amazoncorp2; t=1758727362; x=1790263362; h=from:cc:subject:date:message-id:references:in-reply-to: content-transfer-encoding:mime-version; bh=+UU/9USrfzM95aGLT2Fsiof0dffr8QNJGxTG3aI9K58=; b=BooTx5Mn3qLDJcFOlp1Am9z2RE+yF8z2YOc1+F6ec4HoepLQDBx9RufZ VHYOQ/FOHUHV9b/nQtyp1vB5GmcABGY5huNeM27IfA4Wv0TMglSZqfiaA 10nGxuuEix4bYpLHps0TELJLD1QBAbhau6pNSqwuG1eu4zG5YLBAqmabK 3hg8n0O5CIe4oR44148qHyJNgnBYatV/kbEndUNYubTM3npO8ElhofRYc BFvJ2X02i4vlSkEWUzTJDEvr7iMWKkM5fb863581UcJIy/rAQwlDOb3rO T4MFoUBbpRWb1FwFG6e8wm7/TDLMtzRxfi2bwBONyazuKk+LAR8+vTuw3 A==; X-CSE-ConnectionGUID: nvEDSrW2SqWzBBNRU6SmrQ== X-CSE-MsgGUID: 2Yf5dc86RUi62WhOIbT3ag== X-IronPort-AV: E=Sophos;i="6.18,290,1751241600"; d="scan'208";a="2519318" Received: from ip-10-6-3-216.eu-central-1.compute.internal (HELO smtpout.naws.eu-central-1.prod.farcaster.email.amazon.dev) ([10.6.3.216]) by internal-fra-out-009.esa.eu-central-1.outbound.mail-perimeter.amazon.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Sep 2025 15:22:25 +0000 Received: from EX19MTAEUC002.ant.amazon.com [54.240.197.228:11349] by smtpin.naws.eu-central-1.prod.farcaster.email.amazon.dev [10.0.33.43:2525] with esmtp (Farcaster) id 03c68cf9-a36f-49f5-a600-2aaa8ed6dfea; Wed, 24 Sep 2025 15:22:25 +0000 (UTC) X-Farcaster-Flow-ID: 03c68cf9-a36f-49f5-a600-2aaa8ed6dfea Received: from EX19D015EUB002.ant.amazon.com (10.252.51.123) by EX19MTAEUC002.ant.amazon.com (10.252.51.245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Wed, 24 Sep 2025 15:22:25 +0000 Received: from EX19D015EUB004.ant.amazon.com (10.252.51.13) by EX19D015EUB002.ant.amazon.com (10.252.51.123) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA) id 15.2.2562.20; Wed, 24 Sep 2025 15:22:24 +0000 Received: from EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a]) by EX19D015EUB004.ant.amazon.com ([fe80::2dc9:7aa9:9cd3:fc8a%3]) with mapi id 15.02.2562.020; Wed, 24 Sep 2025 15:22:24 +0000 From: "Roy, Patrick" CC: "Roy, Patrick" , "pbonzini@redhat.com" , "corbet@lwn.net" , "maz@kernel.org" , "oliver.upton@linux.dev" , "joey.gouly@arm.com" , "suzuki.poulose@arm.com" , "yuzenghui@huawei.com" , "catalin.marinas@arm.com" , "will@kernel.org" , "tglx@linutronix.de" , "mingo@redhat.com" , "bp@alien8.de" , "dave.hansen@linux.intel.com" , "x86@kernel.org" , "hpa@zytor.com" , "luto@kernel.org" , "peterz@infradead.org" , "willy@infradead.org" , "akpm@linux-foundation.org" , "david@redhat.com" , "lorenzo.stoakes@oracle.com" , "Liam.Howlett@oracle.com" , "vbabka@suse.cz" , "rppt@kernel.org" , "surenb@google.com" , "mhocko@suse.com" , "song@kernel.org" , "jolsa@kernel.org" , "ast@kernel.org" , "daniel@iogearbox.net" , "andrii@kernel.org" , "martin.lau@linux.dev" , "eddyz87@gmail.com" , "yonghong.song@linux.dev" , "john.fastabend@gmail.com" , "kpsingh@kernel.org" , "sdf@fomichev.me" , "haoluo@google.com" , "jgg@ziepe.ca" , "jhubbard@nvidia.com" , "peterx@redhat.com" , "jannh@google.com" , "pfalcato@suse.de" , "shuah@kernel.org" , "seanjc@google.com" , "kvm@vger.kernel.org" , "linux-doc@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.linux.dev" , "linux-fsdevel@vger.kernel.org" , "linux-mm@kvack.org" , "bpf@vger.kernel.org" , "linux-kselftest@vger.kernel.org" , "Cali, Marco" , "Kalyazin, Nikita" , "Thomson, Jack" , "derekmn@amazon.co.uk" , "tabba@google.com" , "ackerleytng@google.com" Subject: [PATCH v7 04/12] KVM: guest_memfd: Add stub for kvm_arch_gmem_invalidate Thread-Topic: [PATCH v7 04/12] KVM: guest_memfd: Add stub for kvm_arch_gmem_invalidate Thread-Index: AQHcLWcH60RhAO+AlEuiH93VYclyIg== Date: Wed, 24 Sep 2025 15:22:24 +0000 Message-ID: <20250924152214.7292-1-roypat@amazon.co.uk> References: <20250924151101.2225820-4-patrick.roy@campus.lmu.de> In-Reply-To: <20250924151101.2225820-4-patrick.roy@campus.lmu.de> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Precedence: bulk X-Mailing-List: linux-kselftest@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Add a no-op stub for kvm_arch_gmem_invalidate if=0A= CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=3Dn. This allows defining=0A= kvm_gmem_free_folio without ifdef-ery, which allows more cleanly using=0A= guest_memfd's free_folio callback for non-arch-invalidation related=0A= code.=0A= =0A= Signed-off-by: Patrick Roy =0A= ---=0A= include/linux/kvm_host.h | 2 ++=0A= virt/kvm/guest_memfd.c | 4 ----=0A= 2 files changed, 2 insertions(+), 4 deletions(-)=0A= =0A= diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h=0A= index 8b47891adca1..1d0585616aa3 100644=0A= --- a/include/linux/kvm_host.h=0A= +++ b/include/linux/kvm_host.h=0A= @@ -2573,6 +2573,8 @@ long kvm_gmem_populate(struct kvm *kvm, gfn_t gfn, vo= id __user *src, long npages=0A= =0A= #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=0A= void kvm_arch_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end);=0A= +#else=0A= +static inline void kvm_arch_gmem_invalidate(kvm_pfn_t start, kvm_pfn_t end= ) { }=0A= #endif=0A= =0A= #ifdef CONFIG_KVM_GENERIC_PRE_FAULT_MEMORY=0A= diff --git a/virt/kvm/guest_memfd.c b/virt/kvm/guest_memfd.c=0A= index 08a6bc7d25b6..55b8d739779f 100644=0A= --- a/virt/kvm/guest_memfd.c=0A= +++ b/virt/kvm/guest_memfd.c=0A= @@ -429,7 +429,6 @@ static int kvm_gmem_error_folio(struct address_space *m= apping, struct folio *fol=0A= return MF_DELAYED;=0A= }=0A= =0A= -#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=0A= static void kvm_gmem_free_folio(struct folio *folio)=0A= {=0A= struct page *page =3D folio_page(folio, 0);=0A= @@ -438,15 +437,12 @@ static void kvm_gmem_free_folio(struct folio *folio)= =0A= =0A= kvm_arch_gmem_invalidate(pfn, pfn + (1ul << order));=0A= }=0A= -#endif=0A= =0A= static const struct address_space_operations kvm_gmem_aops =3D {=0A= .dirty_folio =3D noop_dirty_folio,=0A= .migrate_folio =3D kvm_gmem_migrate_folio,=0A= .error_remove_folio =3D kvm_gmem_error_folio,=0A= -#ifdef CONFIG_HAVE_KVM_ARCH_GMEM_INVALIDATE=0A= .free_folio =3D kvm_gmem_free_folio,=0A= -#endif=0A= };=0A= =0A= static int kvm_gmem_setattr(struct mnt_idmap *idmap, struct dentry *dentry= ,=0A= -- =0A= 2.51.0=0A= =0A=