Commit c61264f9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen 

* 'upstream/xen-tracing2' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen:
  xen/trace: use class for multicall trace
  xen/trace: convert mmu events to use DECLARE_EVENT_CLASS()/DEFINE_EVENT()
  xen/multicall: move *idx fields to start of mc_buffer
  xen/multicall: special-case singleton hypercalls
  xen/multicalls: add unlikely around slowpath in __xen_mc_entry()
  xen/multicalls: disable MC_DEBUG
  xen/mmu: tune pgtable alloc/release
  xen/mmu: use extend_args for more mmuext updates
  xen/trace: add tlb flush tracepoints
  xen/trace: add segment desc tracing
  xen/trace: add xen_pgd_(un)pin tracepoints
  xen/trace: add ptpage alloc/release tracepoints
  xen/trace: add mmu tracepoints
  xen/trace: add multicall tracing
  xen/trace: set up tracepoint skeleton
  xen/multicalls: remove debugfs stats
  trace/xen: add skeleton for Xen trace events
parents a23a334b bd9ddc87

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

+22 −0
Original line number Diff line number Diff line
@@ -39,6 +39,8 @@ 
#include <linux/string.h>

#include <linux/types.h>



#include <trace/events/xen.h>



#include <asm/page.h>

#include <asm/pgtable.h>
@@ -459,6 +461,8 @@ MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set) 
{

	mcl->op = __HYPERVISOR_fpu_taskswitch;

	mcl->args[0] = set;



	trace_xen_mc_entry(mcl, 1);

}



static inline void
@@ -475,6 +479,8 @@ MULTI_update_va_mapping(struct multicall_entry *mcl, unsigned long va, 
		mcl->args[2] = new_val.pte >> 32;

		mcl->args[3] = flags;

	}



	trace_xen_mc_entry(mcl, sizeof(new_val) == sizeof(long) ? 3 : 4);

}



static inline void
@@ -485,6 +491,8 @@ MULTI_grant_table_op(struct multicall_entry *mcl, unsigned int cmd, 
	mcl->args[0] = cmd;

	mcl->args[1] = (unsigned long)uop;

	mcl->args[2] = count;



	trace_xen_mc_entry(mcl, 3);

}



static inline void
@@ -504,6 +512,8 @@ MULTI_update_va_mapping_otherdomain(struct multicall_entry *mcl, unsigned long v 
		mcl->args[3] = flags;

		mcl->args[4] = domid;

	}



	trace_xen_mc_entry(mcl, sizeof(new_val) == sizeof(long) ? 4 : 5);

}



static inline void
@@ -520,6 +530,8 @@ MULTI_update_descriptor(struct multicall_entry *mcl, u64 maddr, 
		mcl->args[2] = desc.a;

		mcl->args[3] = desc.b;

	}



	trace_xen_mc_entry(mcl, sizeof(maddr) == sizeof(long) ? 2 : 4);

}



static inline void
@@ -528,6 +540,8 @@ MULTI_memory_op(struct multicall_entry *mcl, unsigned int cmd, void *arg) 
	mcl->op = __HYPERVISOR_memory_op;

	mcl->args[0] = cmd;

	mcl->args[1] = (unsigned long)arg;



	trace_xen_mc_entry(mcl, 2);

}



static inline void
@@ -539,6 +553,8 @@ MULTI_mmu_update(struct multicall_entry *mcl, struct mmu_update *req, 
	mcl->args[1] = count;

	mcl->args[2] = (unsigned long)success_count;

	mcl->args[3] = domid;



	trace_xen_mc_entry(mcl, 4);

}



static inline void
@@ -550,6 +566,8 @@ MULTI_mmuext_op(struct multicall_entry *mcl, struct mmuext_op *op, int count, 
	mcl->args[1] = count;

	mcl->args[2] = (unsigned long)success_count;

	mcl->args[3] = domid;



	trace_xen_mc_entry(mcl, 4);

}



static inline void
@@ -558,6 +576,8 @@ MULTI_set_gdt(struct multicall_entry *mcl, unsigned long *frames, int entries) 
	mcl->op = __HYPERVISOR_set_gdt;

	mcl->args[0] = (unsigned long)frames;

	mcl->args[1] = entries;



	trace_xen_mc_entry(mcl, 2);

}



static inline void
@@ -567,6 +587,8 @@ MULTI_stack_switch(struct multicall_entry *mcl, 
	mcl->op = __HYPERVISOR_stack_switch;

	mcl->args[0] = ss;

	mcl->args[1] = esp;



	trace_xen_mc_entry(mcl, 2);

}



#endif /* _ASM_X86_XEN_HYPERCALL_H */

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

0 → 100644
+18 −0
Original line number Diff line number Diff line 
#ifndef _ASM_XEN_TRACE_TYPES_H

#define _ASM_XEN_TRACE_TYPES_H



enum xen_mc_flush_reason {

	XEN_MC_FL_NONE,		/* explicit flush */

	XEN_MC_FL_BATCH,	/* out of hypercall space */

	XEN_MC_FL_ARGS,		/* out of argument space */

	XEN_MC_FL_CALLBACK,	/* out of callback space */

};



enum xen_mc_extend_args {

	XEN_MC_XE_OK,

	XEN_MC_XE_BAD_OP,

	XEN_MC_XE_NO_SPACE

};

typedef void (*xen_mc_callback_fn_t)(void *);



#endif	/* _ASM_XEN_TRACE_TYPES_H */

arch/x86/xen/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ CFLAGS_mmu.o := $(nostackp) 
obj-y		:= enlighten.o setup.o multicalls.o mmu.o irq.o \

			time.o xen-asm.o xen-asm_$(BITS).o \

			grant-table.o suspend.o platform-pci-unplug.o \

			p2m.o

			p2m.o trace.o



obj-$(CONFIG_SMP)		+= smp.o

obj-$(CONFIG_PARAVIRT_SPINLOCKS)+= spinlock.o

arch/x86/xen/enlighten.c

+15 −1
Original line number Diff line number Diff line
@@ -341,6 +341,8 @@ static void xen_set_ldt(const void *addr, unsigned entries) 
	struct mmuext_op *op;

	struct multicall_space mcs = xen_mc_entry(sizeof(*op));



	trace_xen_cpu_set_ldt(addr, entries);



	op = mcs.args;

	op->cmd = MMUEXT_SET_LDT;

	op->arg1.linear_addr = (unsigned long)addr;
@@ -496,6 +498,8 @@ static void xen_write_ldt_entry(struct desc_struct *dt, int entrynum, 
	xmaddr_t mach_lp = arbitrary_virt_to_machine(&dt[entrynum]);

	u64 entry = *(u64 *)ptr;



	trace_xen_cpu_write_ldt_entry(dt, entrynum, entry);



	preempt_disable();



	xen_mc_flush();
@@ -565,6 +569,8 @@ static void xen_write_idt_entry(gate_desc *dt, int entrynum, const gate_desc *g) 
	unsigned long p = (unsigned long)&dt[entrynum];

	unsigned long start, end;



	trace_xen_cpu_write_idt_entry(dt, entrynum, g);



	preempt_disable();



	start = __this_cpu_read(idt_desc.address);
@@ -619,6 +625,8 @@ static void xen_load_idt(const struct desc_ptr *desc) 
	static DEFINE_SPINLOCK(lock);

	static struct trap_info traps[257];



	trace_xen_cpu_load_idt(desc);



	spin_lock(&lock);



	__get_cpu_var(idt_desc) = *desc;
@@ -637,6 +645,8 @@ static void xen_load_idt(const struct desc_ptr *desc) 
static void xen_write_gdt_entry(struct desc_struct *dt, int entry,

				const void *desc, int type)

{

	trace_xen_cpu_write_gdt_entry(dt, entry, desc, type);



	preempt_disable();



	switch (type) {
@@ -665,6 +675,8 @@ static void xen_write_gdt_entry(struct desc_struct *dt, int entry, 
static void __init xen_write_gdt_entry_boot(struct desc_struct *dt, int entry,

					    const void *desc, int type)

{

	trace_xen_cpu_write_gdt_entry(dt, entry, desc, type);



	switch (type) {

	case DESC_LDT:

	case DESC_TSS:
@@ -684,7 +696,9 @@ static void __init xen_write_gdt_entry_boot(struct desc_struct *dt, int entry, 
static void xen_load_sp0(struct tss_struct *tss,

			 struct thread_struct *thread)

{

	struct multicall_space mcs = xen_mc_entry(0);

	struct multicall_space mcs;



	mcs = xen_mc_entry(0);

	MULTI_stack_switch(mcs.mc, __KERNEL_DS, thread->sp0);

	xen_mc_issue(PARAVIRT_LAZY_CPU);

}

arch/x86/xen/mmu.c

+113 −26
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ 
#include <linux/memblock.h>

#include <linux/seq_file.h>



#include <trace/events/xen.h>



#include <asm/pgtable.h>

#include <asm/tlbflush.h>

#include <asm/fixmap.h>
@@ -194,6 +196,8 @@ void xen_set_domain_pte(pte_t *ptep, pte_t pteval, unsigned domid) 
	struct multicall_space mcs;

	struct mmu_update *u;



	trace_xen_mmu_set_domain_pte(ptep, pteval, domid);



	mcs = xen_mc_entry(sizeof(*u));

	u = mcs.args;
@@ -225,6 +229,24 @@ static void xen_extend_mmu_update(const struct mmu_update *update) 
	*u = *update;

}



static void xen_extend_mmuext_op(const struct mmuext_op *op)

{

	struct multicall_space mcs;

	struct mmuext_op *u;



	mcs = xen_mc_extend_args(__HYPERVISOR_mmuext_op, sizeof(*u));



	if (mcs.mc != NULL) {

		mcs.mc->args[1]++;

	} else {

		mcs = __xen_mc_entry(sizeof(*u));

		MULTI_mmuext_op(mcs.mc, mcs.args, 1, NULL, DOMID_SELF);

	}



	u = mcs.args;

	*u = *op;

}



static void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val)

{

	struct mmu_update u;
@@ -245,6 +267,8 @@ static void xen_set_pmd_hyper(pmd_t *ptr, pmd_t val) 


static void xen_set_pmd(pmd_t *ptr, pmd_t val)

{

	trace_xen_mmu_set_pmd(ptr, val);



	/* If page is not pinned, we can just update the entry

	   directly */

	if (!xen_page_pinned(ptr)) {
@@ -282,22 +306,30 @@ static bool xen_batched_set_pte(pte_t *ptep, pte_t pteval) 
	return true;

}



static void xen_set_pte(pte_t *ptep, pte_t pteval)

static inline void __xen_set_pte(pte_t *ptep, pte_t pteval)

{

	if (!xen_batched_set_pte(ptep, pteval))

		native_set_pte(ptep, pteval);

}



static void xen_set_pte(pte_t *ptep, pte_t pteval)

{

	trace_xen_mmu_set_pte(ptep, pteval);

	__xen_set_pte(ptep, pteval);

}



static void xen_set_pte_at(struct mm_struct *mm, unsigned long addr,

		    pte_t *ptep, pte_t pteval)

{

	xen_set_pte(ptep, pteval);

	trace_xen_mmu_set_pte_at(mm, addr, ptep, pteval);

	__xen_set_pte(ptep, pteval);

}



pte_t xen_ptep_modify_prot_start(struct mm_struct *mm,

				 unsigned long addr, pte_t *ptep)

{

	/* Just return the pte as-is.  We preserve the bits on commit */

	trace_xen_mmu_ptep_modify_prot_start(mm, addr, ptep, *ptep);

	return *ptep;

}
@@ -306,6 +338,7 @@ void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, 
{

	struct mmu_update u;



	trace_xen_mmu_ptep_modify_prot_commit(mm, addr, ptep, pte);

	xen_mc_batch();



	u.ptr = virt_to_machine(ptep).maddr | MMU_PT_UPDATE_PRESERVE_AD;
@@ -530,6 +563,8 @@ static void xen_set_pud_hyper(pud_t *ptr, pud_t val) 


static void xen_set_pud(pud_t *ptr, pud_t val)

{

	trace_xen_mmu_set_pud(ptr, val);



	/* If page is not pinned, we can just update the entry

	   directly */

	if (!xen_page_pinned(ptr)) {
@@ -543,17 +578,20 @@ static void xen_set_pud(pud_t *ptr, pud_t val) 
#ifdef CONFIG_X86_PAE

static void xen_set_pte_atomic(pte_t *ptep, pte_t pte)

{

	trace_xen_mmu_set_pte_atomic(ptep, pte);

	set_64bit((u64 *)ptep, native_pte_val(pte));

}



static void xen_pte_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)

{

	trace_xen_mmu_pte_clear(mm, addr, ptep);

	if (!xen_batched_set_pte(ptep, native_make_pte(0)))

		native_pte_clear(mm, addr, ptep);

}



static void xen_pmd_clear(pmd_t *pmdp)

{

	trace_xen_mmu_pmd_clear(pmdp);

	set_pmd(pmdp, __pmd(0));

}

#endif	/* CONFIG_X86_PAE */
@@ -629,6 +667,8 @@ static void xen_set_pgd(pgd_t *ptr, pgd_t val) 
{

	pgd_t *user_ptr = xen_get_user_pgd(ptr);



	trace_xen_mmu_set_pgd(ptr, user_ptr, val);



	/* If page is not pinned, we can just update the entry

	   directly */

	if (!xen_page_pinned(ptr)) {
@@ -788,14 +828,12 @@ static void xen_pte_unlock(void *v) 


static void xen_do_pin(unsigned level, unsigned long pfn)

{

	struct mmuext_op *op;

	struct multicall_space mcs;

	struct mmuext_op op;



	mcs = __xen_mc_entry(sizeof(*op));

	op = mcs.args;

	op->cmd = level;

	op->arg1.mfn = pfn_to_mfn(pfn);

	MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);

	op.cmd = level;

	op.arg1.mfn = pfn_to_mfn(pfn);



	xen_extend_mmuext_op(&op);

}



static int xen_pin_page(struct mm_struct *mm, struct page *page,
@@ -863,6 +901,8 @@ static int xen_pin_page(struct mm_struct *mm, struct page *page, 
   read-only, and can be pinned. */

static void __xen_pgd_pin(struct mm_struct *mm, pgd_t *pgd)

{

	trace_xen_mmu_pgd_pin(mm, pgd);



	xen_mc_batch();



	if (__xen_pgd_walk(mm, pgd, xen_pin_page, USER_LIMIT)) {
@@ -988,6 +1028,8 @@ static int xen_unpin_page(struct mm_struct *mm, struct page *page, 
/* Release a pagetables pages back as normal RW */

static void __xen_pgd_unpin(struct mm_struct *mm, pgd_t *pgd)

{

	trace_xen_mmu_pgd_unpin(mm, pgd);



	xen_mc_batch();



	xen_do_pin(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd)));
@@ -1196,6 +1238,8 @@ static void xen_flush_tlb(void) 
	struct mmuext_op *op;

	struct multicall_space mcs;



	trace_xen_mmu_flush_tlb(0);



	preempt_disable();



	mcs = xen_mc_entry(sizeof(*op));
@@ -1214,6 +1258,8 @@ static void xen_flush_tlb_single(unsigned long addr) 
	struct mmuext_op *op;

	struct multicall_space mcs;



	trace_xen_mmu_flush_tlb_single(addr);



	preempt_disable();



	mcs = xen_mc_entry(sizeof(*op));
@@ -1240,6 +1286,8 @@ static void xen_flush_tlb_others(const struct cpumask *cpus, 
	} *args;

	struct multicall_space mcs;



	trace_xen_mmu_flush_tlb_others(cpus, mm, va);



	if (cpumask_empty(cpus))

		return;		/* nothing to do */
@@ -1275,10 +1323,11 @@ static void set_current_cr3(void *v) 


static void __xen_write_cr3(bool kernel, unsigned long cr3)

{

	struct mmuext_op *op;

	struct multicall_space mcs;

	struct mmuext_op op;

	unsigned long mfn;



	trace_xen_mmu_write_cr3(kernel, cr3);



	if (cr3)

		mfn = pfn_to_mfn(PFN_DOWN(cr3));

	else
@@ -1286,13 +1335,10 @@ static void __xen_write_cr3(bool kernel, unsigned long cr3) 


	WARN_ON(mfn == 0 && kernel);



	mcs = __xen_mc_entry(sizeof(*op));



	op = mcs.args;

	op->cmd = kernel ? MMUEXT_NEW_BASEPTR : MMUEXT_NEW_USER_BASEPTR;

	op->arg1.mfn = mfn;

	op.cmd = kernel ? MMUEXT_NEW_BASEPTR : MMUEXT_NEW_USER_BASEPTR;

	op.arg1.mfn = mfn;



	MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF);

	xen_extend_mmuext_op(&op);



	if (kernel) {

		percpu_write(xen_cr3, cr3);
@@ -1451,19 +1497,52 @@ static void __init xen_release_pmd_init(unsigned long pfn) 
	make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));

}



static inline void __pin_pagetable_pfn(unsigned cmd, unsigned long pfn)

{

	struct multicall_space mcs;

	struct mmuext_op *op;



	mcs = __xen_mc_entry(sizeof(*op));

	op = mcs.args;

	op->cmd = cmd;

	op->arg1.mfn = pfn_to_mfn(pfn);



	MULTI_mmuext_op(mcs.mc, mcs.args, 1, NULL, DOMID_SELF);

}



static inline void __set_pfn_prot(unsigned long pfn, pgprot_t prot)

{

	struct multicall_space mcs;

	unsigned long addr = (unsigned long)__va(pfn << PAGE_SHIFT);



	mcs = __xen_mc_entry(0);

	MULTI_update_va_mapping(mcs.mc, (unsigned long)addr,

				pfn_pte(pfn, prot), 0);

}



/* This needs to make sure the new pte page is pinned iff its being

   attached to a pinned pagetable. */

static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn, unsigned level)

static inline void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn,

				    unsigned level)

{

	bool pinned = PagePinned(virt_to_page(mm->pgd));



	trace_xen_mmu_alloc_ptpage(mm, pfn, level, pinned);



	if (pinned) {

		struct page *page = pfn_to_page(pfn);



	if (PagePinned(virt_to_page(mm->pgd))) {

		SetPagePinned(page);



		if (!PageHighMem(page)) {

			make_lowmem_page_readonly(__va(PFN_PHYS((unsigned long)pfn)));

			xen_mc_batch();



			__set_pfn_prot(pfn, PAGE_KERNEL_RO);



			if (level == PT_PTE && USE_SPLIT_PTLOCKS)

				pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn);

				__pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn);



			xen_mc_issue(PARAVIRT_LAZY_MMU);

		} else {

			/* make sure there are no stray mappings of

			   this page */
@@ -1483,15 +1562,23 @@ static void xen_alloc_pmd(struct mm_struct *mm, unsigned long pfn) 
}



/* This should never happen until we're OK to use struct page */

static void xen_release_ptpage(unsigned long pfn, unsigned level)

static inline void xen_release_ptpage(unsigned long pfn, unsigned level)

{

	struct page *page = pfn_to_page(pfn);

	bool pinned = PagePinned(page);



	trace_xen_mmu_release_ptpage(pfn, level, pinned);



	if (PagePinned(page)) {

	if (pinned) {

		if (!PageHighMem(page)) {

			xen_mc_batch();



			if (level == PT_PTE && USE_SPLIT_PTLOCKS)

				pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn);

			make_lowmem_page_readwrite(__va(PFN_PHYS(pfn)));

				__pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn);



			__set_pfn_prot(pfn, PAGE_KERNEL);



			xen_mc_issue(PARAVIRT_LAZY_MMU);

		}

		ClearPagePinned(page);

	}

CRA Git | Maintained and supported by SUSTech CRA and CCSE