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

Commit 7c934d39 authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

x86, 64-bit: create small vmemmap mappings if PSE not available 



If PSE is not available, then fall back to 4k page mappings for the
vmemmap area.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: xen-devel <xen-devel@lists.xensource.com>
Cc: Stephen Tweedie <sct@redhat.com>
Cc: Eduardo Habkost <ehabkost@redhat.com>
Cc: Mark McLoughlin <markmc@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4f9c11dd

arch/x86/mm/init_64.c

+40 −22
Original line number Original line Diff line number Diff line
@@ -988,7 +988,7 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) 
	pmd_t *pmd;

	pmd_t *pmd;





	for (; addr < end; addr = next) {

	for (; addr < end; addr = next) {

		next = pmd_addr_end(addr, end);

		void *p = NULL;





		pgd = vmemmap_pgd_populate(addr, node);

		pgd = vmemmap_pgd_populate(addr, node);

		if (!pgd)

		if (!pgd)
@@ -998,10 +998,26 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) 
		if (!pud)

		if (!pud)

			return -ENOMEM;

			return -ENOMEM;





		if (!cpu_has_pse) {

			next = (addr + PAGE_SIZE) & PAGE_MASK;

			pmd = vmemmap_pmd_populate(pud, addr, node);



			if (!pmd)

				return -ENOMEM;



			p = vmemmap_pte_populate(pmd, addr, node);



			if (!p)

				return -ENOMEM;



			addr_end = addr + PAGE_SIZE;

			p_end = p + PAGE_SIZE;

		} else {

			next = pmd_addr_end(addr, end);



			pmd = pmd_offset(pud, addr);

			pmd = pmd_offset(pud, addr);

			if (pmd_none(*pmd)) {

			if (pmd_none(*pmd)) {

				pte_t entry;

				pte_t entry;

			void *p;





				p = vmemmap_alloc_block(PMD_SIZE, node);

				p = vmemmap_alloc_block(PMD_SIZE, node);

				if (!p)

				if (!p)
@@ -1011,6 +1027,9 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) 
						PAGE_KERNEL_LARGE);

						PAGE_KERNEL_LARGE);

				set_pmd(pmd, __pmd(pte_val(entry)));

				set_pmd(pmd, __pmd(pte_val(entry)));





				addr_end = addr + PMD_SIZE;

				p_end = p + PMD_SIZE;



				/* check to see if we have contiguous blocks */

				/* check to see if we have contiguous blocks */

				if (p_end != p || node_start != node) {

				if (p_end != p || node_start != node) {

					if (p_start)

					if (p_start)
@@ -1020,11 +1039,10 @@ vmemmap_populate(struct page *start_page, unsigned long size, int node) 
					node_start = node;

					node_start = node;

					p_start = p;

					p_start = p;

				}

				}

			addr_end = addr + PMD_SIZE;

			} else

			p_end = p + PMD_SIZE;

		} else {

				vmemmap_verify((pte_t *)pmd, node, addr, next);

				vmemmap_verify((pte_t *)pmd, node, addr, next);

		}

		}



	}

	}

	return 0;

	return 0;

}

}