Files linux-2.6.8.1-vs1.9.2.20.3/include/linux/.vs_context.h.swp and linux-2.6.8.1-vs1.9.2.20.4/include/linux/.vs_context.h.swp differ diff -NurpP --minimal linux-2.6.8.1-vs1.9.2.20.3/include/linux/vs_context.h linux-2.6.8.1-vs1.9.2.20.4/include/linux/vs_context.h --- linux-2.6.8.1-vs1.9.2.20.3/include/linux/vs_context.h 2004-08-24 02:48:57.000000000 +0200 +++ linux-2.6.8.1-vs1.9.2.20.4/include/linux/vs_context.h 2004-08-24 04:51:10.000000000 +0200 @@ -23,6 +23,7 @@ static inline struct vx_info *__get_vx_i vxlprintk(VXD_CBIT(xid, 2), "get_vx_info(%p[#%d.%d])", vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0, _file, _line); + vxh_get_vx_info(vxi); atomic_inc(&vxi->vx_usecnt); return vxi; } @@ -40,6 +41,7 @@ static inline void __put_vx_info(struct vxlprintk(VXD_CBIT(xid, 2), "put_vx_info(%p[#%d.%d])", vxi, vxi?vxi->vx_id:0, vxi?atomic_read(&vxi->vx_usecnt):0, _file, _line); + vxh_put_vx_info(vxi); if (atomic_dec_and_test(&vxi->vx_usecnt)) free_vx_info(vxi); } diff -NurpP --minimal linux-2.6.8.1-vs1.9.2.20.3/include/linux/vserver/debug.h linux-2.6.8.1-vs1.9.2.20.4/include/linux/vserver/debug.h --- linux-2.6.8.1-vs1.9.2.20.3/include/linux/vserver/debug.h 2004-08-21 23:32:54.000000000 +0200 +++ linux-2.6.8.1-vs1.9.2.20.4/include/linux/vserver/debug.h 2004-08-24 05:38:32.000000000 +0200 @@ -42,5 +42,59 @@ extern unsigned int vx_debug_cvirt; #endif +/* history stuff */ + +struct _vxhe_get_put { + struct vx_info *vxi; + unsigned usecnt; + unsigned refcnt; + unsigned xid; + void *data; +}; + +enum { + VXH_GET_VX_INFO=1, + VXH_PUT_VX_INFO, +}; + +struct _vx_hist_entry { + void *loc; + unsigned short seq; + unsigned short type; + union { + struct _vxhe_get_put gp; + }; +}; + +struct _vx_hist_entry *vxh_advance(void *loc); + +#define VXH_HERE() \ + ({ __label__ here; \ + here:; \ + &&here; }) + + + +static inline void vxh_get_vx_info(struct vx_info *vxi) +{ + struct _vx_hist_entry *entry = vxh_advance(VXH_HERE()); + + entry->gp.vxi = vxi; + entry->gp.usecnt = atomic_read(&vxi->vx_usecnt); + entry->gp.refcnt = atomic_read(&vxi->vx_refcnt); + entry->gp.xid = vxi->vx_id; + entry->type = VXH_GET_VX_INFO; +} + +static inline void vxh_put_vx_info(struct vx_info *vxi) +{ + struct _vx_hist_entry *entry = vxh_advance(VXH_HERE()); + + entry->gp.vxi = vxi; + entry->gp.usecnt = atomic_read(&vxi->vx_usecnt); + entry->gp.refcnt = atomic_read(&vxi->vx_refcnt); + entry->type = VXH_PUT_VX_INFO; +} + #endif /* _VX_DEBUG_H */ diff -NurpP --minimal linux-2.6.8.1-vs1.9.2.20.3/kernel/vserver/Makefile linux-2.6.8.1-vs1.9.2.20.4/kernel/vserver/Makefile --- linux-2.6.8.1-vs1.9.2.20.3/kernel/vserver/Makefile 2004-08-21 04:42:00.000000000 +0200 +++ linux-2.6.8.1-vs1.9.2.20.4/kernel/vserver/Makefile 2004-08-24 04:44:51.000000000 +0200 @@ -6,7 +6,8 @@ obj-y += vserver.o vserver-y := switch.o context.o namespace.o sched.o network.o inode.o \ - limit.o cvirt.o signal.o proc.o helper.o init.o dlimit.o + limit.o cvirt.o signal.o proc.o helper.o init.o dlimit.o \ + debug.o vserver-$(CONFIG_VSERVER_DEBUG) += sysctl.o vserver-$(CONFIG_VSERVER_LEGACY) += legacy.o diff -NurpP --minimal linux-2.6.8.1-vs1.9.2.20.3/kernel/vserver/debug.c linux-2.6.8.1-vs1.9.2.20.4/kernel/vserver/debug.c --- linux-2.6.8.1-vs1.9.2.20.3/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 +++ linux-2.6.8.1-vs1.9.2.20.4/kernel/vserver/debug.c 2004-08-24 05:39:27.000000000 +0200 @@ -0,0 +1,81 @@ +/* + * kernel/vserver/debug.c + * + * Virtual Context Support + * + * Copyright (C) 2004 Herbert Pötzl + * + * V0.01 basic structure + * + */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +#include + + +#define VXH_SIZE 64 + +struct _vx_history { + unsigned int counter; + + struct _vx_hist_entry entry[VXH_SIZE]; +}; + +DEFINE_PER_CPU(struct _vx_history, vx_history_buffer); + +static atomic_t sequence = ATOMIC_INIT(0); + + +struct _vx_hist_entry *vxh_advance(void *loc) +{ + unsigned int cpu = smp_processor_id(); + struct _vx_history *hist = &per_cpu(vx_history_buffer, cpu); + unsigned int index = (hist->counter++ % VXH_SIZE); + struct _vx_hist_entry *entry = &hist->entry[index]; + + atomic_inc(&sequence); + entry->seq = atomic_read(&sequence); + entry->loc = loc; + return entry; +} + +void vxh_dump_entry(struct _vx_hist_entry *e, unsigned cpu) +{ + switch (e->type) { + case VXH_GET_VX_INFO: + case VXH_PUT_VX_INFO: + printk(" - %p: %s_vx_info %p[#%d,%d.%d] (#%04x,*%d)\n", e->loc, + (e->type==VXH_GET_VX_INFO)?"get":"put", + e->gp.vxi, e->gp.xid, e->gp.usecnt, e->gp.refcnt, + e->seq, cpu); + break; + } +} + +void vxh_backtrace(void) +{ + unsigned int i,j; + + smp_send_stop(); + + for (i=0; i < VXH_SIZE; i++) { + for (j=0; j < NR_CPUS; j++) { + struct _vx_history *hist = + &per_cpu(vx_history_buffer, j); + unsigned int index = (hist->counter-i) % VXH_SIZE; + struct _vx_hist_entry *entry = &hist->entry[index]; + + vxh_dump_entry(entry, j); + } + } +} + diff -NurpP --minimal linux-2.6.8.1-vs1.9.2.20.3/kernel/vserver/switch.c linux-2.6.8.1-vs1.9.2.20.4/kernel/vserver/switch.c --- linux-2.6.8.1-vs1.9.2.20.3/kernel/vserver/switch.c 2004-08-23 19:41:38.000000000 +0200 +++ linux-2.6.8.1-vs1.9.2.20.4/kernel/vserver/switch.c 2004-08-24 05:27:36.000000000 +0200 @@ -154,6 +154,7 @@ sys_vserver(uint32_t cmd, uint32_t id, v return vc_set_iattr(id, data); case VCMD_enter_namespace: + vxh_backtrace(); return vc_enter_namespace(id, data); case VCMD_ctx_create: