Commit 25b2995a authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jason Gunthorpe
Browse files

mm: remove MEMORY_DEVICE_PUBLIC support 



The code hasn't been used since it was added to the tree, and doesn't
appear to actually be usable.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJason Gunthorpe <jgg@mellanox.com>
Acked-by: default avatarMichal Hocko <mhocko@suse.com>
Reviewed-by: default avatarDan Williams <dan.j.williams@intel.com>
Tested-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parent 07ec3891

fs/proc/task_mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -1279,7 +1279,7 @@ static pagemap_entry_t pte_to_pagemap_entry(struct pagemapread *pm, 
		if (pm->show_pfn)

			frame = pte_pfn(pte);

		flags |= PM_PRESENT;

		page = _vm_normal_page(vma, addr, pte, true);

		page = vm_normal_page(vma, addr, pte);

		if (pte_soft_dirty(pte))

			flags |= PM_SOFT_DIRTY;

	} else if (is_swap_pte(pte)) {

include/linux/hmm.h

+2 −5
Original line number Diff line number Diff line
@@ -584,7 +584,7 @@ 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) */



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

#if IS_ENABLED(CONFIG_DEVICE_PRIVATE)

struct hmm_devmem;



struct page *hmm_vma_alloc_locked_page(struct vm_area_struct *vma,
@@ -722,9 +722,6 @@ struct hmm_devmem { 
struct hmm_devmem *hmm_devmem_add(const struct hmm_devmem_ops *ops,

				  struct device *device,

				  unsigned long size);

struct hmm_devmem *hmm_devmem_add_resource(const struct hmm_devmem_ops *ops,

					   struct device *device,

					   struct resource *res);



/*

 * hmm_devmem_page_set_drvdata - set per-page driver data field
@@ -751,7 +748,7 @@ static inline unsigned long hmm_devmem_page_get_drvdata(const struct page *page) 
{

	return page->hmm_data;

}

#endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */

#endif /* CONFIG_DEVICE_PRIVATE */

#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) {}

include/linux/ioport.h

+0 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ enum { 
	IORES_DESC_PERSISTENT_MEMORY		= 4,

	IORES_DESC_PERSISTENT_MEMORY_LEGACY	= 5,

	IORES_DESC_DEVICE_PRIVATE_MEMORY	= 6,

	IORES_DESC_DEVICE_PUBLIC_MEMORY		= 7,

};



/* helpers to define resources */

include/linux/memremap.h

+0 −8
Original line number Diff line number Diff line
@@ -37,13 +37,6 @@ struct vmem_altmap { 
 * A more complete discussion of unaddressable memory may be found in

 * include/linux/hmm.h and Documentation/vm/hmm.rst.

 *

 * MEMORY_DEVICE_PUBLIC:

 * Device memory that is cache coherent from device and CPU point of view. This

 * is use on platform that have an advance system bus (like CAPI or CCIX). A

 * driver can hotplug the device memory using ZONE_DEVICE and with that memory

 * type. Any page of a process can be migrated to such memory. However no one

 * should be allow to pin such memory so that it can always be evicted.

 *

 * MEMORY_DEVICE_FS_DAX:

 * Host memory that has similar access semantics as System RAM i.e. DMA

 * coherent and supports page pinning. In support of coordinating page
@@ -58,7 +51,6 @@ struct vmem_altmap { 
 */

enum memory_type {

	MEMORY_DEVICE_PRIVATE = 1,

	MEMORY_DEVICE_PUBLIC,

	MEMORY_DEVICE_FS_DAX,

	MEMORY_DEVICE_PCI_P2PDMA,

};

include/linux/mm.h

+2 −16
Original line number Diff line number Diff line
@@ -944,7 +944,6 @@ static inline bool put_devmap_managed_page(struct page *page) 
		return false;

	switch (page->pgmap->type) {

	case MEMORY_DEVICE_PRIVATE:

	case MEMORY_DEVICE_PUBLIC:

	case MEMORY_DEVICE_FS_DAX:

		__put_devmap_managed_page(page);

		return true;
@@ -960,12 +959,6 @@ static inline bool is_device_private_page(const struct 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;

}



#ifdef CONFIG_PCI_P2PDMA

static inline bool is_pci_p2pdma_page(const struct page *page)

{
@@ -998,11 +991,6 @@ 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;

}



static inline bool is_pci_p2pdma_page(const struct page *page)

{

	return false;
@@ -1431,10 +1419,8 @@ struct zap_details { 
	pgoff_t last_index;			/* Highest page->index to unmap */

};



struct page *_vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

			     pte_t pte, bool with_public_device);

#define vm_normal_page(vma, addr, pte) _vm_normal_page(vma, addr, pte, false)



struct page *vm_normal_page(struct vm_area_struct *vma, unsigned long addr,

			     pte_t pte);

struct page *vm_normal_page_pmd(struct vm_area_struct *vma, unsigned long addr,

				pmd_t pmd);

CRA Git | Maintained and supported by SUSTech CRA and CCSE