Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-07 13:43:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

KVM: Support mixed endian machines

Browse Source 
Currently kvmtrace is not portable. This will prevent from copying a
trace file from big-endian target to little-endian workstation for analysis.
In the patch, kernel outputs metadata containing a magic number to trace
log, and changes 64-bit words to be u64 instead of a pair of u32s.

Signed-off-by: Tan Li <li.tan@intel.com>
Acked-by: Jerone Young <jyoung5@us.ibm.com>
Acked-by: Hollis Blanchard <hollisb@us.ibm.com>
Signed-off-by: Avi Kivity <avi@qumranet.com>
This commit is contained in:
Tan, Li 2008-05-23 14:54:09 +08:00 committed by Avi Kivity
parent 25be46080f
commit 9ef621d3be
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/kvm.h
View File

@ -318,14 +318,14 @@ struct kvm_trace_rec {
__u32 vcpu_id; __u32 vcpu_id;
union { union {
struct { struct {
__u32 cycle_lo, cycle_hi; __u64 cycle_u64;
__u32 extra_u32[KVM_TRC_EXTRA_MAX]; __u32 extra_u32[KVM_TRC_EXTRA_MAX];
} cycle; } cycle;
struct { struct {
__u32 extra_u32[KVM_TRC_EXTRA_MAX]; __u32 extra_u32[KVM_TRC_EXTRA_MAX];
} nocycle; } nocycle;
} u; } u;
}; } __attribute__((packed));
#define KVMIO 0xAE #define KVMIO 0xAE

18
virt/kvm/kvm_trace.c
View File

@ -72,11 +72,7 @@ static void kvm_add_trace(void *probe_private, void *call_data,
rec.cycle_in = p->cycle_in; rec.cycle_in = p->cycle_in;
if (rec.cycle_in) { if (rec.cycle_in) {
u64 cycle = 0; rec.u.cycle.cycle_u64 = get_cycles();
cycle = get_cycles();
rec.u.cycle.cycle_lo = (u32)cycle;
rec.u.cycle.cycle_hi = (u32)(cycle >> 32);
for (i = 0; i < rec.extra_u32; i++) for (i = 0; i < rec.extra_u32; i++)
rec.u.cycle.extra_u32[i] = va_arg(*args, u32); rec.u.cycle.extra_u32[i] = va_arg(*args, u32);
@ -114,8 +110,18 @@ static int kvm_subbuf_start_callback(struct rchan_buf *buf, void *subbuf,
{ {
struct kvm_trace *kt; struct kvm_trace *kt;
if (!relay_buf_full(buf)) if (!relay_buf_full(buf)) {
if (!prev_subbuf) {
/*
* executed only once when the channel is opened
* save metadata as first record
*/
subbuf_start_reserve(buf, sizeof(u32));
*(u32 *)subbuf = 0x12345678;
}
return 1; return 1;
}
kt = buf->chan->private_data; kt = buf->chan->private_data;
atomic_inc(&kt->lost_records); atomic_inc(&kt->lost_records);