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

Commit f7750a79 authored by Tom Lendacky's avatar Tom Lendacky Committed by Ingo Molnar
Browse files

x86, mpparse, x86/acpi, x86/PCI, x86/dmi, SFI: Use memremap() for RAM mappings 



The ioremap() function is intended for mapping MMIO. For RAM, the
memremap() function should be used. Convert calls from ioremap() to
memremap() when re-mapping RAM.

This will be used later by SME to control how the encryption mask is
applied to memory mappings, with certain memory locations being mapped
decrypted vs encrypted.

Signed-off-by: default avatarTom Lendacky <thomas.lendacky@amd.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarBorislav Petkov <bp@suse.de>
Cc: Alexander Potapenko <glider@google.com>
Cc: Andrey Ryabinin <aryabinin@virtuozzo.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Brijesh Singh <brijesh.singh@amd.com>
Cc: Dave Young <dyoung@redhat.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Larry Woodman <lwoodman@redhat.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Michael S. Tsirkin <mst@redhat.com>
Cc: Paolo Bonzini <pbonzini@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Radim Krčmář <rkrcmar@redhat.com>
Cc: Rik van Riel <riel@redhat.com>
Cc: Toshimitsu Kani <toshi.kani@hpe.com>
Cc: kasan-dev@googlegroups.com
Cc: kvm@vger.kernel.org
Cc: linux-arch@vger.kernel.org
Cc: linux-doc@vger.kernel.org
Cc: linux-efi@vger.kernel.org
Cc: linux-mm@kvack.org
Link: http://lkml.kernel.org/r/b13fccb9abbd547a7eef7b1fdfc223431b211c88.1500319216.git.thomas.lendacky@amd.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent aac7b79e

arch/x86/include/asm/dmi.h

+4 −4
Original line number Diff line number Diff line
@@ -13,9 +13,9 @@ static __always_inline __init void *dmi_alloc(unsigned len) 
}



/* Use early IO mappings for DMI because it's initialized early */

#define dmi_early_remap		early_ioremap

#define dmi_early_unmap		early_iounmap

#define dmi_remap		ioremap_cache

#define dmi_unmap		iounmap

#define dmi_early_remap		early_memremap

#define dmi_early_unmap		early_memunmap

#define dmi_remap(_x, _l)	memremap(_x, _l, MEMREMAP_WB)

#define dmi_unmap(_x)		memunmap(_x)



#endif /* _ASM_X86_DMI_H */

arch/x86/kernel/acpi/boot.c

+3 −3
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ static u32 isa_irq_to_gsi[NR_IRQS_LEGACY] __read_mostly = { 
#define	ACPI_INVALID_GSI		INT_MIN



/*

 * This is just a simple wrapper around early_ioremap(),

 * This is just a simple wrapper around early_memremap(),

 * with sanity checks for phys == 0 and size == 0.

 */

char *__init __acpi_map_table(unsigned long phys, unsigned long size)
@@ -124,7 +124,7 @@ char *__init __acpi_map_table(unsigned long phys, unsigned long size) 
	if (!phys || !size)

		return NULL;



	return early_ioremap(phys, size);

	return early_memremap(phys, size);

}



void __init __acpi_unmap_table(char *map, unsigned long size)
@@ -132,7 +132,7 @@ void __init __acpi_unmap_table(char *map, unsigned long size) 
	if (!map || !size)

		return;



	early_iounmap(map, size);

	early_memunmap(map, size);

}



#ifdef CONFIG_X86_LOCAL_APIC

arch/x86/kernel/kdebugfs.c

+11 −23
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ static ssize_t setup_data_read(struct file *file, char __user *user_buf, 
	struct setup_data_node *node = file->private_data;

	unsigned long remain;

	loff_t pos = *ppos;

	struct page *pg;

	void *p;

	u64 pa;
@@ -47,18 +46,13 @@ static ssize_t setup_data_read(struct file *file, char __user *user_buf, 
		count = node->len - pos;



	pa = node->paddr + sizeof(struct setup_data) + pos;

	pg = pfn_to_page((pa + count - 1) >> PAGE_SHIFT);

	if (PageHighMem(pg)) {

		p = ioremap_cache(pa, count);

	p = memremap(pa, count, MEMREMAP_WB);

	if (!p)

			return -ENXIO;

	} else

		p = __va(pa);

		return -ENOMEM;



	remain = copy_to_user(user_buf, p, count);



	if (PageHighMem(pg))

		iounmap(p);

	memunmap(p);



	if (remain)

		return -EFAULT;
@@ -109,7 +103,6 @@ static int __init create_setup_data_nodes(struct dentry *parent) 
	struct setup_data *data;

	int error;

	struct dentry *d;

	struct page *pg;

	u64 pa_data;

	int no = 0;
@@ -126,16 +119,12 @@ static int __init create_setup_data_nodes(struct dentry *parent) 
			goto err_dir;

		}



		pg = pfn_to_page((pa_data+sizeof(*data)-1) >> PAGE_SHIFT);

		if (PageHighMem(pg)) {

			data = ioremap_cache(pa_data, sizeof(*data));

		data = memremap(pa_data, sizeof(*data), MEMREMAP_WB);

		if (!data) {

			kfree(node);

				error = -ENXIO;

			error = -ENOMEM;

			goto err_dir;

		}

		} else

			data = __va(pa_data);



		node->paddr = pa_data;

		node->type = data->type;
@@ -143,8 +132,7 @@ static int __init create_setup_data_nodes(struct dentry *parent) 
		error = create_setup_data_node(d, no, node);

		pa_data = data->next;



		if (PageHighMem(pg))

			iounmap(data);

		memunmap(data);

		if (error)

			goto err_dir;

		no++;

arch/x86/kernel/ksysfs.c

+14 −14
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
#include <linux/stat.h>

#include <linux/slab.h>

#include <linux/mm.h>

#include <linux/io.h>



#include <asm/io.h>

#include <asm/setup.h>



static ssize_t version_show(struct kobject *kobj,
@@ -79,12 +79,12 @@ static int get_setup_data_paddr(int nr, u64 *paddr) 
			*paddr = pa_data;

			return 0;

		}

		data = ioremap_cache(pa_data, sizeof(*data));

		data = memremap(pa_data, sizeof(*data), MEMREMAP_WB);

		if (!data)

			return -ENOMEM;



		pa_data = data->next;

		iounmap(data);

		memunmap(data);

		i++;

	}

	return -EINVAL;
@@ -97,17 +97,17 @@ static int __init get_setup_data_size(int nr, size_t *size) 
	u64 pa_data = boot_params.hdr.setup_data;



	while (pa_data) {

		data = ioremap_cache(pa_data, sizeof(*data));

		data = memremap(pa_data, sizeof(*data), MEMREMAP_WB);

		if (!data)

			return -ENOMEM;

		if (nr == i) {

			*size = data->len;

			iounmap(data);

			memunmap(data);

			return 0;

		}



		pa_data = data->next;

		iounmap(data);

		memunmap(data);

		i++;

	}

	return -EINVAL;
@@ -127,12 +127,12 @@ static ssize_t type_show(struct kobject *kobj, 
	ret = get_setup_data_paddr(nr, &paddr);

	if (ret)

		return ret;

	data = ioremap_cache(paddr, sizeof(*data));

	data = memremap(paddr, sizeof(*data), MEMREMAP_WB);

	if (!data)

		return -ENOMEM;



	ret = sprintf(buf, "0x%x\n", data->type);

	iounmap(data);

	memunmap(data);

	return ret;

}
@@ -154,7 +154,7 @@ static ssize_t setup_data_data_read(struct file *fp, 
	ret = get_setup_data_paddr(nr, &paddr);

	if (ret)

		return ret;

	data = ioremap_cache(paddr, sizeof(*data));

	data = memremap(paddr, sizeof(*data), MEMREMAP_WB);

	if (!data)

		return -ENOMEM;
@@ -170,15 +170,15 @@ static ssize_t setup_data_data_read(struct file *fp, 
		goto out;



	ret = count;

	p = ioremap_cache(paddr + sizeof(*data), data->len);

	p = memremap(paddr + sizeof(*data), data->len, MEMREMAP_WB);

	if (!p) {

		ret = -ENOMEM;

		goto out;

	}

	memcpy(buf, p + off, count);

	iounmap(p);

	memunmap(p);

out:

	iounmap(data);

	memunmap(data);

	return ret;

}
@@ -250,13 +250,13 @@ static int __init get_setup_data_total_num(u64 pa_data, int *nr) 
	*nr = 0;

	while (pa_data) {

		*nr += 1;

		data = ioremap_cache(pa_data, sizeof(*data));

		data = memremap(pa_data, sizeof(*data), MEMREMAP_WB);

		if (!data) {

			ret = -ENOMEM;

			goto out;

		}

		pa_data = data->next;

		iounmap(data);

		memunmap(data);

	}



out:

arch/x86/kernel/mpparse.c

+5 −5
Original line number Diff line number Diff line
@@ -436,9 +436,9 @@ static unsigned long __init get_mpc_size(unsigned long physptr) 
	struct mpc_table *mpc;

	unsigned long size;



	mpc = early_ioremap(physptr, PAGE_SIZE);

	mpc = early_memremap(physptr, PAGE_SIZE);

	size = mpc->length;

	early_iounmap(mpc, PAGE_SIZE);

	early_memunmap(mpc, PAGE_SIZE);

	apic_printk(APIC_VERBOSE, "  mpc: %lx-%lx\n", physptr, physptr + size);



	return size;
@@ -450,7 +450,7 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early) 
	unsigned long size;



	size = get_mpc_size(mpf->physptr);

	mpc = early_ioremap(mpf->physptr, size);

	mpc = early_memremap(mpf->physptr, size);

	/*

	 * Read the physical hardware table.  Anything here will

	 * override the defaults.
@@ -461,10 +461,10 @@ static int __init check_physptr(struct mpf_intel *mpf, unsigned int early) 
#endif

		pr_err("BIOS bug, MP table errors detected!...\n");

		pr_cont("... disabling SMP support. (tell your hw vendor)\n");

		early_iounmap(mpc, size);

		early_memunmap(mpc, size);

		return -1;

	}

	early_iounmap(mpc, size);

	early_memunmap(mpc, size);



	if (early)

		return -1;