xen/trace: add multicall tracing (c796f213) · Commits · e / devices / android_kernel_xiaomi_nabu

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

+22 −0

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

			#include <trace/events/xen.h>

	#include <asm/page.h>		#include <asm/page.h>
	#include <asm/pgtable.h>		#include <asm/pgtable.h>

	@@ -459,6 +461,8 @@ MULTI_fpu_taskswitch(struct multicall_entry *mcl, int set)
	{		{
	mcl->op = __HYPERVISOR_fpu_taskswitch;		mcl->op = __HYPERVISOR_fpu_taskswitch;
	mcl->args[0] = set;		mcl->args[0] = set;

			trace_xen_mc_entry(mcl, 1);
	}		}

	static inline void		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[2] = new_val.pte >> 32;
	mcl->args[3] = flags;		mcl->args[3] = flags;
	}		}

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

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

			trace_xen_mc_entry(mcl, 3);
	}		}

	static inline void		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[3] = flags;
	mcl->args[4] = domid;		mcl->args[4] = domid;
	}		}

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

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

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

	static inline void		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->op = __HYPERVISOR_memory_op;
	mcl->args[0] = cmd;		mcl->args[0] = cmd;
	mcl->args[1] = (unsigned long)arg;		mcl->args[1] = (unsigned long)arg;

			trace_xen_mc_entry(mcl, 2);
	}		}

	static inline void		static inline void
	@@ -539,6 +553,8 @@ MULTI_mmu_update(struct multicall_entry mcl, struct mmu_update req,
	mcl->args[1] = count;		mcl->args[1] = count;
	mcl->args[2] = (unsigned long)success_count;		mcl->args[2] = (unsigned long)success_count;
	mcl->args[3] = domid;		mcl->args[3] = domid;

			trace_xen_mc_entry(mcl, 4);
	}		}

	static inline void		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[1] = count;
	mcl->args[2] = (unsigned long)success_count;		mcl->args[2] = (unsigned long)success_count;
	mcl->args[3] = domid;		mcl->args[3] = domid;

			trace_xen_mc_entry(mcl, 4);
	}		}

	static inline void		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->op = __HYPERVISOR_set_gdt;
	mcl->args[0] = (unsigned long)frames;		mcl->args[0] = (unsigned long)frames;
	mcl->args[1] = entries;		mcl->args[1] = entries;

			trace_xen_mc_entry(mcl, 2);
	}		}

	static inline void		static inline void
	@@ -567,6 +587,8 @@ MULTI_stack_switch(struct multicall_entry *mcl,
	mcl->op = __HYPERVISOR_stack_switch;		mcl->op = __HYPERVISOR_stack_switch;
	mcl->args[0] = ss;		mcl->args[0] = ss;
	mcl->args[1] = esp;		mcl->args[1] = esp;

			trace_xen_mc_entry(mcl, 2);
	}		}

	#endif /* _ASM_X86_XEN_HYPERCALL_H */		#endif /* _ASM_X86_XEN_HYPERCALL_H */

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

0 → 100644

+18 −0

Original line number	Original line	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/multicalls.c

+23 −8

Original line number	Original line	Diff line number	Diff line
	@@ -65,6 +65,8 @@ void xen_mc_flush(void)
	something in the middle */		something in the middle */
	local_irq_save(flags);		local_irq_save(flags);

			trace_xen_mc_flush(b->mcidx, b->argidx, b->cbidx);

	if (b->mcidx) {		if (b->mcidx) {
	#if MC_DEBUG		#if MC_DEBUG
	memcpy(b->debug, b->entries,		memcpy(b->debug, b->entries,
	@@ -116,11 +118,15 @@ struct multicall_space __xen_mc_entry(size_t args)
	struct multicall_space ret;		struct multicall_space ret;
	unsigned argidx = roundup(b->argidx, sizeof(u64));		unsigned argidx = roundup(b->argidx, sizeof(u64));

			trace_xen_mc_entry_alloc(args);

	BUG_ON(preemptible());		BUG_ON(preemptible());
	BUG_ON(b->argidx >= MC_ARGS);		BUG_ON(b->argidx >= MC_ARGS);

	if (b->mcidx == MC_BATCH \|\|		if (b->mcidx == MC_BATCH \|\|
	(argidx + args) >= MC_ARGS) {		(argidx + args) >= MC_ARGS) {
			trace_xen_mc_flush_reason((b->mcidx == MC_BATCH) ?
			XEN_MC_FL_BATCH : XEN_MC_FL_ARGS);
	xen_mc_flush();		xen_mc_flush();
	argidx = roundup(b->argidx, sizeof(u64));		argidx = roundup(b->argidx, sizeof(u64));
	}		}
	@@ -145,20 +151,25 @@ struct multicall_space xen_mc_extend_args(unsigned long op, size_t size)
	BUG_ON(preemptible());		BUG_ON(preemptible());
	BUG_ON(b->argidx >= MC_ARGS);		BUG_ON(b->argidx >= MC_ARGS);

	if (b->mcidx == 0)		if (unlikely(b->mcidx == 0 \|\|
	return ret;		b->entries[b->mcidx - 1].op != op)) {
			trace_xen_mc_extend_args(op, size, XEN_MC_XE_BAD_OP);
	if (b->entries[b->mcidx - 1].op != op)		goto out;
	return ret;		}

	if ((b->argidx + size) >= MC_ARGS)		if (unlikely((b->argidx + size) >= MC_ARGS)) {
	return ret;		trace_xen_mc_extend_args(op, size, XEN_MC_XE_NO_SPACE);
			goto out;
			}

	ret.mc = &b->entries[b->mcidx - 1];		ret.mc = &b->entries[b->mcidx - 1];
	ret.args = &b->args[b->argidx];		ret.args = &b->args[b->argidx];
	b->argidx += size;		b->argidx += size;

	BUG_ON(b->argidx >= MC_ARGS);		BUG_ON(b->argidx >= MC_ARGS);

			trace_xen_mc_extend_args(op, size, XEN_MC_XE_OK);
			out:
	return ret;		return ret;
	}		}

	@@ -167,8 +178,12 @@ void xen_mc_callback(void (fn)(void ), void *data)
	struct mc_buffer *b = &__get_cpu_var(mc_buffer);		struct mc_buffer *b = &__get_cpu_var(mc_buffer);
	struct callback *cb;		struct callback *cb;

	if (b->cbidx == MC_BATCH)		if (b->cbidx == MC_BATCH) {
			trace_xen_mc_flush_reason(XEN_MC_FL_CALLBACK);
	xen_mc_flush();		xen_mc_flush();
			}

			trace_xen_mc_callback(fn, data);

	cb = &b->callbacks[b->cbidx++];		cb = &b->callbacks[b->cbidx++];
	cb->fn = fn;		cb->fn = fn;

arch/x86/xen/multicalls.h

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -25,6 +25,7 @@ static inline void xen_mc_batch(void)

	/* need to disable interrupts until this entry is complete */		/* need to disable interrupts until this entry is complete */
	local_irq_save(flags);		local_irq_save(flags);
			trace_xen_mc_batch(paravirt_get_lazy_mode());
	__this_cpu_write(xen_mc_irq_flags, flags);		__this_cpu_write(xen_mc_irq_flags, flags);
	}		}

	@@ -40,6 +41,8 @@ void xen_mc_flush(void);
	/* Issue a multicall if we're not in a lazy mode */		/* Issue a multicall if we're not in a lazy mode */
	static inline void xen_mc_issue(unsigned mode)		static inline void xen_mc_issue(unsigned mode)
	{		{
			trace_xen_mc_issue(mode);

	if ((paravirt_get_lazy_mode() & mode) == 0)		if ((paravirt_get_lazy_mode() & mode) == 0)
	xen_mc_flush();		xen_mc_flush();

arch/x86/xen/trace.c

+57 −0

Original line number	Original line	Diff line number	Diff line
	#include <linux/ftrace.h>		#include <linux/ftrace.h>

			#define N(x) [__HYPERVISOR_##x] = "("#x")"
			static const char *xen_hypercall_names[] = {
			N(set_trap_table),
			N(mmu_update),
			N(set_gdt),
			N(stack_switch),
			N(set_callbacks),
			N(fpu_taskswitch),
			N(sched_op_compat),
			N(dom0_op),
			N(set_debugreg),
			N(get_debugreg),
			N(update_descriptor),
			N(memory_op),
			N(multicall),
			N(update_va_mapping),
			N(set_timer_op),
			N(event_channel_op_compat),
			N(xen_version),
			N(console_io),
			N(physdev_op_compat),
			N(grant_table_op),
			N(vm_assist),
			N(update_va_mapping_otherdomain),
			N(iret),
			N(vcpu_op),
			N(set_segment_base),
			N(mmuext_op),
			N(acm_op),
			N(nmi_op),
			N(sched_op),
			N(callback_op),
			N(xenoprof_op),
			N(event_channel_op),
			N(physdev_op),
			N(hvm_op),

			/* Architecture-specific hypercall definitions. */
			N(arch_0),
			N(arch_1),
			N(arch_2),
			N(arch_3),
			N(arch_4),
			N(arch_5),
			N(arch_6),
			N(arch_7),
			};
			#undef N

			static const char *xen_hypercall_name(unsigned op)
			{
			if (op < ARRAY_SIZE(xen_hypercall_names) && xen_hypercall_names[op] != NULL)
			return xen_hypercall_names[op];

			return "";
			}

	#define CREATE_TRACE_POINTS		#define CREATE_TRACE_POINTS
	#include <trace/events/xen.h>		#include <trace/events/xen.h>