chore: update patch series to v17

resources/hiding_ci/kernel_commit_hash

@@ -1 +1 @@
-347e9f5043c89695b01e66b3ed111755afcf1911
+beafd7ecf2255e8b62a42dc04f54843033db3d24

resources/hiding_ci/linux_patches/05-mmap-support/0001-KVM-Rename-CONFIG_KVM_PRIVATE_MEM-to-CONFIG_KVM_GMEM.patch → resources/hiding_ci/linux_patches/05-mmap-support/0001-KVM-Rename-CONFIG_KVM_PRIVATE_MEM-to-CONFIG_KVM_GUES.patch

@@ -1,27 +1,30 @@
-From 000264f8823f76fb6cf91dc40ace84a29a0fa089 Mon Sep 17 00:00:00 2001
+From 83ed02c1c583b5b831e7827453845fe4fd7b4c80 Mon Sep 17 00:00:00 2001
 From: Fuad Tabba <[email protected]>
-Date: Tue, 15 Jul 2025 10:33:30 +0100
-Subject: [PATCH 01/46] KVM: Rename CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GMEM
+Date: Tue, 29 Jul 2025 15:54:32 -0700
+Subject: [PATCH 01/49] KVM: Rename CONFIG_KVM_PRIVATE_MEM to
+ CONFIG_KVM_GUEST_MEMFD
 
-Rename the Kconfig option CONFIG_KVM_PRIVATE_MEM to CONFIG_KVM_GMEM. The
-original name implied that the feature only supported "private" memory.
-However, CONFIG_KVM_PRIVATE_MEM enables guest_memfd in general, which is
-not exclusively for private memory. Subsequent patches in this series
-will add guest_memfd support for non-CoCo VMs, whose memory is not
-private.
+Rename the Kconfig option CONFIG_KVM_PRIVATE_MEM to
+CONFIG_KVM_GUEST_MEMFD. The original name implied that the feature only
+supported "private" memory. However, CONFIG_KVM_PRIVATE_MEM enables
+guest_memfd in general, which is not exclusively for private memory.
+Subsequent patches in this series will add guest_memfd support for
+non-CoCo VMs, whose memory is not private.
 
-Renaming the Kconfig option to CONFIG_KVM_GMEM more accurately reflects
-its broader scope as the main Kconfig option for all guest_memfd-backed
-memory. This provides clearer semantics for the option and avoids
-confusion as new features are introduced.
+Renaming the Kconfig option to CONFIG_KVM_GUEST_MEMFD more accurately
+reflects its broader scope as the main Kconfig option for all
+guest_memfd-backed memory. This provides clearer semantics for the
+option and avoids confusion as new features are introduced.
 
 Reviewed-by: Ira Weiny <[email protected]>
 Reviewed-by: Gavin Shan <[email protected]>
 Reviewed-by: Shivank Garg <[email protected]>
 Reviewed-by: Vlastimil Babka <[email protected]>
+Reviewed-by: Xiaoyao Li <[email protected]>
 Co-developed-by: David Hildenbrand <[email protected]>
 Signed-off-by: David Hildenbrand <[email protected]>
 Signed-off-by: Fuad Tabba <[email protected]>
+Signed-off-by: Sean Christopherson <[email protected]>
 ---
  arch/x86/include/asm/kvm_host.h |  2 +-
  include/linux/kvm_host.h        | 14 +++++++-------
@@ -32,32 +35,32 @@ Signed-off-by: Fuad Tabba <[email protected]>
  6 files changed, 17 insertions(+), 17 deletions(-)
 
 diff --git a/arch/x86/include/asm/kvm_host.h b/arch/x86/include/asm/kvm_host.h
-index f7af967aa16f..acb25f935d84 100644
+index f19a76d3ca0e..7b0f2b3e492d 100644
 --- a/arch/x86/include/asm/kvm_host.h
 +++ b/arch/x86/include/asm/kvm_host.h
-@@ -2275,7 +2275,7 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level,
+@@ -2276,7 +2276,7 @@ void kvm_configure_mmu(bool enable_tdp, int tdp_forced_root_level,
  		       int tdp_max_root_level, int tdp_huge_page_level);
 
 
 -#ifdef CONFIG_KVM_PRIVATE_MEM
-+#ifdef CONFIG_KVM_GMEM
++#ifdef CONFIG_KVM_GUEST_MEMFD
  #define kvm_arch_has_private_mem(kvm) ((kvm)->arch.has_private_mem)
  #else
  #define kvm_arch_has_private_mem(kvm) false
 diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
-index 3bde4fb5c6aa..755b09dcafce 100644
+index 15656b7fba6c..8cdc0b3cc1b1 100644
 --- a/include/linux/kvm_host.h
 +++ b/include/linux/kvm_host.h
-@@ -601,7 +601,7 @@ struct kvm_memory_slot {
+@@ -602,7 +602,7 @@ struct kvm_memory_slot {
  	short id;
  	u16 as_id;
 
 -#ifdef CONFIG_KVM_PRIVATE_MEM
-+#ifdef CONFIG_KVM_GMEM
++#ifdef CONFIG_KVM_GUEST_MEMFD
  	struct {
  		/*
  		 * Writes protected by kvm->slots_lock.  Acquiring a
-@@ -719,10 +719,10 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu)
+@@ -720,10 +720,10 @@ static inline int kvm_arch_vcpu_memslots_id(struct kvm_vcpu *vcpu)
  #endif
 
  /*
@@ -67,107 +70,107 @@ index 3bde4fb5c6aa..755b09dcafce 100644
 + * enabled.
   */
 -#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_PRIVATE_MEM)
-+#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GMEM)
++#if !defined(kvm_arch_has_private_mem) && !IS_ENABLED(CONFIG_KVM_GUEST_MEMFD)
  static inline bool kvm_arch_has_private_mem(struct kvm *kvm)
  {
  	return false;
-@@ -2527,7 +2527,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm,
+@@ -2505,7 +2505,7 @@ bool kvm_arch_post_set_memory_attributes(struct kvm *kvm,
 
  static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)
  {
 -	return IS_ENABLED(CONFIG_KVM_PRIVATE_MEM) &&
-+	return IS_ENABLED(CONFIG_KVM_GMEM) &&
++	return IS_ENABLED(CONFIG_KVM_GUEST_MEMFD) &&
  	       kvm_get_memory_attributes(kvm, gfn) & KVM_MEMORY_ATTRIBUTE_PRIVATE;
  }
  #else
-@@ -2537,7 +2537,7 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)
+@@ -2515,7 +2515,7 @@ static inline bool kvm_mem_is_private(struct kvm *kvm, gfn_t gfn)
  }
  #endif /* CONFIG_KVM_GENERIC_MEMORY_ATTRIBUTES */
 
 -#ifdef CONFIG_KVM_PRIVATE_MEM
-+#ifdef CONFIG_KVM_GMEM
++#ifdef CONFIG_KVM_GUEST_MEMFD
  int kvm_gmem_get_pfn(struct kvm *kvm, struct kvm_memory_slot *slot,
  		     gfn_t gfn, kvm_pfn_t *pfn, struct page **page,
  		     int *max_order);
-@@ -2550,7 +2550,7 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm,
+@@ -2528,7 +2528,7 @@ static inline int kvm_gmem_get_pfn(struct kvm *kvm,
  	KVM_BUG_ON(1, kvm);
  	return -EIO;
  }
 -#endif /* CONFIG_KVM_PRIVATE_MEM */
-+#endif /* CONFIG_KVM_GMEM */
++#endif /* CONFIG_KVM_GUEST_MEMFD */
 
  #ifdef CONFIG_HAVE_KVM_ARCH_GMEM_PREPARE
  int kvm_arch_gmem_prepare(struct kvm *kvm, gfn_t gfn, kvm_pfn_t pfn, int max_order);
 diff --git a/virt/kvm/Kconfig b/virt/kvm/Kconfig
-index 727b542074e7..49df4e32bff7 100644
+index 727b542074e7..e4b400feff94 100644
 --- a/virt/kvm/Kconfig
 +++ b/virt/kvm/Kconfig
 @@ -112,19 +112,19 @@ config KVM_GENERIC_MEMORY_ATTRIBUTES
         depends on KVM_GENERIC_MMU_NOTIFIER
         bool
 
 -config KVM_PRIVATE_MEM
-+config KVM_GMEM
++config KVM_GUEST_MEMFD
         select XARRAY_MULTI
         bool
 
  config KVM_GENERIC_PRIVATE_MEM
         select KVM_GENERIC_MEMORY_ATTRIBUTES
 -       select KVM_PRIVATE_MEM
-+       select KVM_GMEM
++       select KVM_GUEST_MEMFD
         bool
 
  config HAVE_KVM_ARCH_GMEM_PREPARE
         bool
 -       depends on KVM_PRIVATE_MEM
-+       depends on KVM_GMEM
++       depends on KVM_GUEST_MEMFD
 
  config HAVE_KVM_ARCH_GMEM_INVALIDATE
         bool
 -       depends on KVM_PRIVATE_MEM
-+       depends on KVM_GMEM
++       depends on KVM_GUEST_MEMFD
 diff --git a/virt/kvm/Makefile.kvm b/virt/kvm/Makefile.kvm
-index 724c89af78af..8d00918d4c8b 100644
+index 724c89af78af..d047d4cf58c9 100644
 --- a/virt/kvm/Makefile.kvm
 +++ b/virt/kvm/Makefile.kvm
 @@ -12,4 +12,4 @@ kvm-$(CONFIG_KVM_ASYNC_PF) += $(KVM)/async_pf.o
  kvm-$(CONFIG_HAVE_KVM_IRQ_ROUTING) += $(KVM)/irqchip.o
  kvm-$(CONFIG_HAVE_KVM_DIRTY_RING) += $(KVM)/dirty_ring.o
  kvm-$(CONFIG_HAVE_KVM_PFNCACHE) += $(KVM)/pfncache.o
 -kvm-$(CONFIG_KVM_PRIVATE_MEM) += $(KVM)/guest_memfd.o
-+kvm-$(CONFIG_KVM_GMEM) += $(KVM)/guest_memfd.o
++kvm-$(CONFIG_KVM_GUEST_MEMFD) += $(KVM)/guest_memfd.o
 diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
-index 222f0e894a0c..d5f0ec2d321f 100644
+index 6c07dd423458..25a94eed75fd 100644
 --- a/virt/kvm/kvm_main.c
 +++ b/virt/kvm/kvm_main.c
-@@ -4913,7 +4913,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
+@@ -4915,7 +4915,7 @@ static int kvm_vm_ioctl_check_extension_generic(struct kvm *kvm, long arg)
  	case KVM_CAP_MEMORY_ATTRIBUTES:
  		return kvm_supported_mem_attributes(kvm);
  #endif
 -#ifdef CONFIG_KVM_PRIVATE_MEM
-+#ifdef CONFIG_KVM_GMEM
++#ifdef CONFIG_KVM_GUEST_MEMFD
  	case KVM_CAP_GUEST_MEMFD:
  		return !kvm || kvm_arch_has_private_mem(kvm);
  #endif
-@@ -5347,7 +5347,7 @@ static long kvm_vm_ioctl(struct file *filp,
+@@ -5352,7 +5352,7 @@ static long kvm_vm_ioctl(struct file *filp,
  	case KVM_GET_STATS_FD:
  		r = kvm_vm_ioctl_get_stats_fd(kvm);
  		break;
 -#ifdef CONFIG_KVM_PRIVATE_MEM
-+#ifdef CONFIG_KVM_GMEM
++#ifdef CONFIG_KVM_GUEST_MEMFD
  	case KVM_CREATE_GUEST_MEMFD: {
  		struct kvm_create_guest_memfd guest_memfd;
 
 diff --git a/virt/kvm/kvm_mm.h b/virt/kvm/kvm_mm.h
-index acef3f5c582a..ec311c0d6718 100644
+index acef3f5c582a..31defb08ccba 100644
 --- a/virt/kvm/kvm_mm.h
 +++ b/virt/kvm/kvm_mm.h
 @@ -67,7 +67,7 @@ static inline void gfn_to_pfn_cache_invalidate_start(struct kvm *kvm,
  }
  #endif /* HAVE_KVM_PFNCACHE */
 
 -#ifdef CONFIG_KVM_PRIVATE_MEM
-+#ifdef CONFIG_KVM_GMEM
++#ifdef CONFIG_KVM_GUEST_MEMFD
  void kvm_gmem_init(struct module *module);
  int kvm_gmem_create(struct kvm *kvm, struct kvm_create_guest_memfd *args);
  int kvm_gmem_bind(struct kvm *kvm, struct kvm_memory_slot *slot,
@@ -176,7 +179,7 @@ index acef3f5c582a..ec311c0d6718 100644
  	WARN_ON_ONCE(1);
  }
 -#endif /* CONFIG_KVM_PRIVATE_MEM */
-+#endif /* CONFIG_KVM_GMEM */
++#endif /* CONFIG_KVM_GUEST_MEMFD */
 
  #endif /* __KVM_MM_H__ */
 --