Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6b368cd4 authored by Jérôme Glisse's avatar Jérôme Glisse Committed by Linus Torvalds
Browse files

mm/hmm: avoid bloating arch that do not make use of HMM 

This moves all new code including new page migration helper behind kernel
Kconfig option so that there is no codee bloat for arch or user that do
not want to use HMM or any of its associated features.

arm allyesconfig (without all the patchset, then with and this patch):
   text	   data	    bss	    dec	    hex	filename
83721896	46511131	27582964	157815991	96814b7	../without/vmlinux
83722364	46511131	27582964	157816459	968168b	vmlinux

[jglisse@redhat.com: struct hmm is only use by HMM mirror functionality]
  Link: http://lkml.kernel.org/r/20170825213133.27286-1-jglisse@redhat.com
[sfr@canb.auug.org.au: fix build (arm multi_v7_defconfig)]
  Link: http://lkml.kernel.org/r/20170828181849.323ab81b@canb.auug.org.au
Link: http://lkml.kernel.org/r/20170818032858.7447-1-jglisse@redhat.com


Signed-off-by: default avatarJérôme Glisse <jglisse@redhat.com>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d3df0a42

include/linux/hmm.h

+6 −3
Original line number Diff line number Diff line
@@ -501,18 +501,21 @@ void hmm_device_put(struct hmm_device *hmm_device); 




/* Below are for HMM internal use only! Not to be used by device driver! */

#if IS_ENABLED(CONFIG_HMM_MIRROR)

void hmm_mm_destroy(struct mm_struct *mm);



static inline void hmm_mm_init(struct mm_struct *mm)

{

	mm->hmm = NULL;

}

#else /* IS_ENABLED(CONFIG_HMM_MIRROR) */

static inline void hmm_mm_destroy(struct mm_struct *mm) {}

static inline void hmm_mm_init(struct mm_struct *mm) {}

#endif /* IS_ENABLED(CONFIG_HMM_MIRROR) */



#else /* IS_ENABLED(CONFIG_HMM) */



/* Below are for HMM internal use only! Not to be used by device driver! */

#else /* IS_ENABLED(CONFIG_HMM) */

static inline void hmm_mm_destroy(struct mm_struct *mm) {}

static inline void hmm_mm_init(struct mm_struct *mm) {}



#endif /* IS_ENABLED(CONFIG_HMM) */

#endif /* LINUX_HMM_H */

include/linux/memremap.h

+7 −15
Original line number Diff line number Diff line
@@ -138,18 +138,6 @@ void *devm_memremap_pages(struct device *dev, struct resource *res, 
struct dev_pagemap *find_dev_pagemap(resource_size_t phys);



static inline bool is_zone_device_page(const struct page *page);



static inline bool is_device_private_page(const struct page *page)

{

	return is_zone_device_page(page) &&

		page->pgmap->type == MEMORY_DEVICE_PRIVATE;

}



static inline bool is_device_public_page(const struct page *page)

{

	return is_zone_device_page(page) &&

		page->pgmap->type == MEMORY_DEVICE_PUBLIC;

}

#else

static inline void *devm_memremap_pages(struct device *dev,

		struct resource *res, struct percpu_ref *ref,
@@ -168,17 +156,21 @@ static inline struct dev_pagemap *find_dev_pagemap(resource_size_t phys) 
{

	return NULL;

}

#endif



#if defined(CONFIG_DEVICE_PRIVATE) || defined(CONFIG_DEVICE_PUBLIC)

static inline bool is_device_private_page(const struct page *page)

{

	return false;

	return is_zone_device_page(page) &&

		page->pgmap->type == MEMORY_DEVICE_PRIVATE;

}



static inline bool is_device_public_page(const struct page *page)

{

	return false;

	return is_zone_device_page(page) &&

		page->pgmap->type == MEMORY_DEVICE_PUBLIC;

}

#endif

#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */



/**

 * get_dev_pagemap() - take a new live reference on the dev_pagemap for @pfn

include/linux/migrate.h

+13 −0
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ struct migrate_vma_ops { 
				 void *private);

};



#if defined(CONFIG_MIGRATE_VMA_HELPER)

int migrate_vma(const struct migrate_vma_ops *ops,

		struct vm_area_struct *vma,

		unsigned long start,
@@ -272,6 +273,18 @@ int migrate_vma(const struct migrate_vma_ops *ops, 
		unsigned long *src,

		unsigned long *dst,

		void *private);

#else

static inline int migrate_vma(const struct migrate_vma_ops *ops,

			      struct vm_area_struct *vma,

			      unsigned long start,

			      unsigned long end,

			      unsigned long *src,

			      unsigned long *dst,

			      void *private)

{

	return -EINVAL;

}

#endif /* IS_ENABLED(CONFIG_MIGRATE_VMA_HELPER) */



#endif /* CONFIG_MIGRATION */

include/linux/mm.h

+17 −9
Original line number Diff line number Diff line
@@ -800,18 +800,27 @@ static inline bool is_zone_device_page(const struct page *page) 
}

#endif



#if IS_ENABLED(CONFIG_DEVICE_PRIVATE) ||  IS_ENABLED(CONFIG_DEVICE_PUBLIC)

#if defined(CONFIG_DEVICE_PRIVATE) || defined(CONFIG_DEVICE_PUBLIC)

void put_zone_device_private_or_public_page(struct page *page);

#else

DECLARE_STATIC_KEY_FALSE(device_private_key);

#define IS_HMM_ENABLED static_branch_unlikely(&device_private_key)

static inline bool is_device_private_page(const struct page *page);

static inline bool is_device_public_page(const struct page *page);

#else /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */

static inline void put_zone_device_private_or_public_page(struct page *page)

{

}

#define IS_HMM_ENABLED 0

static inline bool is_device_private_page(const struct page *page)

{

	return false;

}

static inline bool is_device_public_page(const struct page *page)

{

	return false;

}

#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */



static inline bool is_device_private_page(const struct page *page);

static inline bool is_device_public_page(const struct page *page);



DECLARE_STATIC_KEY_FALSE(device_private_key);



static inline void get_page(struct page *page)

{
@@ -834,9 +843,8 @@ static inline void put_page(struct page *page) 
	 * free and we need to inform the device driver through callback. See

	 * include/linux/memremap.h and HMM for details.

	 */

	if (static_branch_unlikely(&device_private_key) &&

	    unlikely(is_device_private_page(page) ||

		     is_device_public_page(page))) {

	if (IS_HMM_ENABLED && unlikely(is_device_private_page(page) ||

	    unlikely(is_device_public_page(page)))) {

		put_zone_device_private_or_public_page(page);

		return;

	}

mm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -702,8 +702,12 @@ config ARCH_HAS_HMM 
	depends on MEMORY_HOTREMOVE

	depends on SPARSEMEM_VMEMMAP



config MIGRATE_VMA_HELPER

	bool



config HMM

	bool

	select MIGRATE_VMA_HELPER



config HMM_MIRROR

	bool "HMM mirror CPU page table into a device page table"