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

Commit 9976b39b authored by Jeremy Fitzhardinge's avatar Jeremy Fitzhardinge Committed by Ingo Molnar
Browse files

xen: deal with virtually mapped percpu data 



The virtually mapped percpu space causes us two problems:

 - for hypercalls which take an mfn, we need to do a full pagetable
   walk to convert the percpu va into an mfn, and

 - when a hypercall requires a page to be mapped RO via all its aliases,
   we need to make sure its RO in both the percpu mapping and in the
   linear mapping

This primarily affects the gdt and the vcpu info structure.

Signed-off-by: default avatarJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Xen-devel <xen-devel@lists.xensource.com>
Cc: Gerd Hoffmann <kraxel@redhat.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Tejun Heo <htejun@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent d0c4f570

arch/x86/include/asm/xen/page.h

+1 −0
Original line number Diff line number Diff line
@@ -164,6 +164,7 @@ static inline pte_t __pte_ma(pteval_t x) 




xmaddr_t arbitrary_virt_to_machine(void *address);

unsigned long arbitrary_virt_to_mfn(void *vaddr);

void make_lowmem_page_readonly(void *vaddr);

void make_lowmem_page_readwrite(void *vaddr);

arch/x86/xen/enlighten.c

+6 −4
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static void xen_vcpu_setup(int cpu) 


	vcpup = &per_cpu(xen_vcpu_info, cpu);



	info.mfn = virt_to_mfn(vcpup);

	info.mfn = arbitrary_virt_to_mfn(vcpup);

	info.offset = offset_in_page(vcpup);



	printk(KERN_DEBUG "trying to map vcpu_info %d at %p, mfn %llx, offset %d\n",
@@ -301,8 +301,10 @@ static void xen_load_gdt(const struct desc_ptr *dtr) 
	frames = mcs.args;



	for (f = 0; va < dtr->address + size; va += PAGE_SIZE, f++) {

		frames[f] = virt_to_mfn(va);

		frames[f] = arbitrary_virt_to_mfn((void *)va);



		make_lowmem_page_readonly((void *)va);

		make_lowmem_page_readonly(mfn_to_virt(frames[f]));

	}



	MULTI_set_gdt(mcs.mc, frames, size / sizeof(struct desc_struct));
@@ -314,7 +316,7 @@ static void load_TLS_descriptor(struct thread_struct *t, 
				unsigned int cpu, unsigned int i)

{

	struct desc_struct *gdt = get_cpu_gdt_table(cpu);

	xmaddr_t maddr = virt_to_machine(&gdt[GDT_ENTRY_TLS_MIN+i]);

	xmaddr_t maddr = arbitrary_virt_to_machine(&gdt[GDT_ENTRY_TLS_MIN+i]);

	struct multicall_space mc = __xen_mc_entry(0);



	MULTI_update_descriptor(mc.mc, maddr.maddr, t->tls_array[i]);
@@ -488,7 +490,7 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry, 
		break;



	default: {

		xmaddr_t maddr = virt_to_machine(&dt[entry]);

		xmaddr_t maddr = arbitrary_virt_to_machine(&dt[entry]);



		xen_mc_flush();

		if (HYPERVISOR_update_descriptor(maddr.maddr, *(u64 *)desc))

arch/x86/xen/mmu.c

+7 −0
Original line number Diff line number Diff line
@@ -276,6 +276,13 @@ void set_phys_to_machine(unsigned long pfn, unsigned long mfn) 
	p2m_top[topidx][idx] = mfn;

}



unsigned long arbitrary_virt_to_mfn(void *vaddr)

{

	xmaddr_t maddr = arbitrary_virt_to_machine(vaddr);



	return PFN_DOWN(maddr.maddr);

}



xmaddr_t arbitrary_virt_to_machine(void *vaddr)

{

	unsigned long address = (unsigned long)vaddr;

arch/x86/xen/smp.c

+5 −1
Original line number Diff line number Diff line
@@ -219,6 +219,7 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
{

	struct vcpu_guest_context *ctxt;

	struct desc_struct *gdt;

	unsigned long gdt_mfn;



	if (cpumask_test_and_set_cpu(cpu, xen_cpu_initialized_map))

		return 0;
@@ -248,9 +249,12 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) 
	ctxt->ldt_ents = 0;



	BUG_ON((unsigned long)gdt & ~PAGE_MASK);



	gdt_mfn = arbitrary_virt_to_mfn(gdt);

	make_lowmem_page_readonly(gdt);

	make_lowmem_page_readonly(mfn_to_virt(gdt_mfn));



	ctxt->gdt_frames[0] = virt_to_mfn(gdt);

	ctxt->gdt_frames[0] = gdt_mfn;

	ctxt->gdt_ents      = GDT_ENTRIES;



	ctxt->user_regs.cs = __KERNEL_CS;