mm: remove the HMM config option

All the mm/hmm.c code is better keyed off HMM_MIRROR.  Also let nouveau
depend on it instead of the mix of a dummy dependency symbol plus the
actually selected one.  Drop various odd dependencies, as the code is
pretty portable.

Signed-off-by: Christoph Hellwig <[email protected]>
Reviewed-by: Ira Weiny <[email protected]>
Reviewed-by: Jason Gunthorpe <[email protected]>
Reviewed-by: Dan Williams <[email protected]>
Signed-off-by: Jason Gunthorpe <[email protected]>

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 6303d203ab1da2a544bf6f25058052858d613038..66c839d8e9d16c5924c4af1db8b0bbcdf20d8442 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -84,11 +84,10 @@ config DRM_NOUVEAU_BACKLIGHT
 
 config DRM_NOUVEAU_SVM
        bool "(EXPERIMENTAL) Enable SVM (Shared Virtual Memory) support"
-       depends on ARCH_HAS_HMM
        depends on DEVICE_PRIVATE
        depends on DRM_NOUVEAU
+       depends on HMM_MIRROR
        depends on STAGING
-       select HMM_MIRROR
        default n
        help
          Say Y here if you want to enable experimental support for

diff --git a/include/linux/hmm.h b/include/linux/hmm.h
index 3d00e9550e77195245b4d9d597674b027334f932..b697496e85ba172eab4b3c6f79b32916eee2179d 100644 (file)
--- a/include/linux/hmm.h
+++ b/include/linux/hmm.h
@@ -62,7 +62,7 @@
 #include <linux/kconfig.h>
 #include <asm/pgtable.h>
 
-#if IS_ENABLED(CONFIG_HMM)
+#ifdef CONFIG_HMM_MIRROR
 
 #include <linux/device.h>
 #include <linux/migrate.h>
@@ -332,9 +332,6 @@ static inline uint64_t hmm_pfn_from_pfn(const struct hmm_range *range,
        return hmm_device_entry_from_pfn(range, pfn);
 }
 
-
-
-#if IS_ENABLED(CONFIG_HMM_MIRROR)
 /*
  * Mirroring: how to synchronize device page table with CPU page table.
  *

diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h
index f33a1289c1012c82d31049b81d931d3c0415355c..8d37182f8dbe515962ca01bd17be706ad2583c9f 100644 (file)
--- a/include/linux/mm_types.h
+++ b/include/linux/mm_types.h
@@ -501,7 +501,7 @@ struct mm_struct {
 #endif
                struct work_struct async_put_work;
 
-#if IS_ENABLED(CONFIG_HMM)
+#ifdef CONFIG_HMM_MIRROR
                /* HMM needs to track a few things per mm */
                struct hmm *hmm;
 #endif

diff --git a/mm/Kconfig b/mm/Kconfig
index eecf037a54b39fb361af9f98131b34abc0e2afa9..1e426c26b1d6508933333b96918f11d46a8d3775 100644 (file)
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -669,37 +669,18 @@ config ZONE_DEVICE
 
          If FS_DAX is enabled, then say Y.
 
-config ARCH_HAS_HMM_MIRROR
-       bool
-       default y
-       depends on (X86_64 || PPC64)
-       depends on MMU && 64BIT
-
-config ARCH_HAS_HMM
-       bool
-       depends on (X86_64 || PPC64)
-       depends on ZONE_DEVICE
-       depends on MMU && 64BIT
-       depends on MEMORY_HOTPLUG
-       depends on MEMORY_HOTREMOVE
-       depends on SPARSEMEM_VMEMMAP
-       default y
-
 config MIGRATE_VMA_HELPER
        bool
 
 config DEV_PAGEMAP_OPS
        bool
 
-config HMM
-       bool
-       select MMU_NOTIFIER
-       select MIGRATE_VMA_HELPER
-
 config HMM_MIRROR
        bool "HMM mirror CPU page table into a device page table"
-       depends on ARCH_HAS_HMM
-       select HMM
+       depends on (X86_64 || PPC64)
+       depends on MMU && 64BIT
+       select MMU_NOTIFIER
+       select MIGRATE_VMA_HELPER
        help
          Select HMM_MIRROR if you want to mirror range of the CPU page table of a
          process into a device page table. Here, mirror means "keep synchronized".

diff --git a/mm/Makefile b/mm/Makefile
index ac5e5ba78874661445a3cd8854f7c15844904914..91c99040065c8fa54fcc2dad5e0c8babbd8c49ab 100644 (file)
--- a/mm/Makefile
+++ b/mm/Makefile
@@ -102,5 +102,5 @@ obj-$(CONFIG_FRAME_VECTOR) += frame_vector.o
 obj-$(CONFIG_DEBUG_PAGE_REF) += debug_page_ref.o
 obj-$(CONFIG_HARDENED_USERCOPY) += usercopy.o
 obj-$(CONFIG_PERCPU_STATS) += percpu-stats.o
-obj-$(CONFIG_HMM) += hmm.o
+obj-$(CONFIG_HMM_MIRROR) += hmm.o
 obj-$(CONFIG_MEMFD_CREATE) += memfd.o

diff --git a/mm/hmm.c b/mm/hmm.c
index 90ca0cdab9dbb3f76045dcb52ad425a4ffa37dbf..d62ce64d6bcaa819afc23466fac3a40bf50774f9 100644 (file)
--- a/mm/hmm.c
+++ b/mm/hmm.c
@@ -25,7 +25,6 @@
 #include <linux/mmu_notifier.h>
 #include <linux/memory_hotplug.h>
 
-#if IS_ENABLED(CONFIG_HMM_MIRROR)
 static const struct mmu_notifier_ops hmm_mmu_notifier_ops;
 
 static inline struct hmm *mm_get_hmm(struct mm_struct *mm)
@@ -1326,4 +1325,3 @@ long hmm_range_dma_unmap(struct hmm_range *range,
        return cpages;
 }
 EXPORT_SYMBOL(hmm_range_dma_unmap);
-#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */