From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from e33.co.us.ibm.com (e33.co.us.ibm.com [32.97.110.151]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e33.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTP id 4E048679FC for ; Fri, 23 Jun 2006 08:58:41 +1000 (EST) Received: from d03relay04.boulder.ibm.com (d03relay04.boulder.ibm.com [9.17.195.106]) by e33.co.us.ibm.com (8.12.11.20060308/8.12.11) with ESMTP id k5MMwct7023321 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=FAIL) for ; Thu, 22 Jun 2006 18:58:38 -0400 Received: from d03av03.boulder.ibm.com (d03av03.boulder.ibm.com [9.17.195.169]) by d03relay04.boulder.ibm.com (8.13.6/NCO/VER7.0) with ESMTP id k5MMwnxQ080622 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 22 Jun 2006 16:58:49 -0600 Received: from d03av03.boulder.ibm.com (loopback [127.0.0.1]) by d03av03.boulder.ibm.com (8.12.11.20060308/8.13.3) with ESMTP id k5MMwbdQ022816 for ; Thu, 22 Jun 2006 16:58:37 -0600 Date: Thu, 22 Jun 2006 15:58:53 -0700 From: Mike Kravetz To: linuxppc-dev@ozlabs.org Subject: [PATCH 2/3] powerpc: Instrument Hypervisor Calls: add wrappers Message-ID: <20060622225853.GC4877@w-mikek2.ibm.com> References: <20060622225609.GA4877@w-mikek2.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii In-Reply-To: <20060622225609.GA4877@w-mikek2.ibm.com> Cc: Bryan Rosenburg , Christopher Yeoh , Nathan Lynch , Arnd Bergmann List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Add wrappers which perform the actual hypervisor call instrumentation. -- Signed-off-by: Mike Kravetz diff -Naupr linux-2.6.17.1/arch/powerpc/Kconfig.debug linux-2.6.17.1.work/arch/powerpc/Kconfig.debug --- linux-2.6.17.1/arch/powerpc/Kconfig.debug 2006-06-20 09:31:55.000000000 +0000 +++ linux-2.6.17.1.work/arch/powerpc/Kconfig.debug 2006-06-22 22:58:58.000000000 +0000 @@ -18,6 +18,19 @@ config DEBUG_STACK_USAGE This option will slow down process creation somewhat. +config HCALL_STATS + bool "Hypervisor call instrumentation" + depends on PPC_PSERIES && DEBUG_FS + help + Adds code to keep track of the number of hypervisor calls made and + the amount of time spent in hypervisor calls. A directory named + hcall_inst is added at the root of the debugfs filesystem. Within + the hcall_inst directory are files that contain CPU specific call + statistics. + + This option will add a small amount of overhead to all hypervisor + calls. + config DEBUGGER bool "Enable debugger hooks" depends on DEBUG_KERNEL diff -Naupr linux-2.6.17.1/arch/powerpc/platforms/pseries/Makefile linux-2.6.17.1.work/arch/powerpc/platforms/pseries/Makefile --- linux-2.6.17.1/arch/powerpc/platforms/pseries/Makefile 2006-06-20 09:31:55.000000000 +0000 +++ linux-2.6.17.1.work/arch/powerpc/platforms/pseries/Makefile 2006-06-22 22:58:58.000000000 +0000 @@ -9,3 +9,4 @@ obj-$(CONFIG_EEH) += eeh.o eeh_cache.o e obj-$(CONFIG_HVC_CONSOLE) += hvconsole.o obj-$(CONFIG_HVCS) += hvcserver.o +obj-$(CONFIG_HCALL_STATS) += hvCall_inst.o diff -Naupr linux-2.6.17.1/arch/powerpc/platforms/pseries/hvCall.S linux-2.6.17.1.work/arch/powerpc/platforms/pseries/hvCall.S --- linux-2.6.17.1/arch/powerpc/platforms/pseries/hvCall.S 2006-06-20 09:31:55.000000000 +0000 +++ linux-2.6.17.1.work/arch/powerpc/platforms/pseries/hvCall.S 2006-06-22 22:58:58.000000000 +0000 @@ -25,7 +25,11 @@ unsigned long *out2, R9 unsigned long *out3); R10 */ +#ifdef CONFIG_HCALL_STATS +_GLOBAL(plpar_hcall_base) +#else _GLOBAL(plpar_hcall) +#endif HMT_MEDIUM mfcr r0 @@ -52,7 +56,19 @@ _GLOBAL(plpar_hcall) /* Simple interface with no output values (other than status) */ +#ifdef CONFIG_HCALL_STATS +/* + * A special 'indirect' call to a C based wrapper if statistics are desired. + * See plpar_hcall_norets_C function header for more details. + */ +_GLOBAL(plpar_hcall_norets) + b plpar_hcall_norets_C + + +_GLOBAL(plpar_hcall_norets_base) +#else _GLOBAL(plpar_hcall_norets) +#endif HMT_MEDIUM mfcr r0 @@ -76,7 +92,11 @@ _GLOBAL(plpar_hcall_norets) unsigned long arg8, 112(R1) unsigned long *out1); 120(R1) */ +#ifdef CONFIG_HCALL_STATS +_GLOBAL(plpar_hcall_8arg_2ret_base) +#else _GLOBAL(plpar_hcall_8arg_2ret) +#endif HMT_MEDIUM mfcr r0 @@ -102,7 +122,11 @@ _GLOBAL(plpar_hcall_8arg_2ret) unsigned long *out3, R10 unsigned long *out4); 112(R1) */ +#ifdef CONFIG_HCALL_STATS +_GLOBAL(plpar_hcall_4out_base) +#else _GLOBAL(plpar_hcall_4out) +#endif HMT_MEDIUM mfcr r0 @@ -144,7 +168,11 @@ _GLOBAL(plpar_hcall_4out) unsigned long *out6, 102(R1) unsigned long *out7); 100(R1) */ +#ifdef CONFIG_HCALL_STATS +_GLOBAL(plpar_hcall_7arg_7ret_base) +#else _GLOBAL(plpar_hcall_7arg_7ret) +#endif HMT_MEDIUM mfcr r0 @@ -193,7 +221,11 @@ _GLOBAL(plpar_hcall_7arg_7ret) unsigned long *out8, 94(R1) unsigned long *out9, 92(R1) */ +#ifdef CONFIG_HCALL_STATS +_GLOBAL(plpar_hcall_9arg_9ret_base) +#else _GLOBAL(plpar_hcall_9arg_9ret) +#endif HMT_MEDIUM mfcr r0 diff -Naupr linux-2.6.17.1/arch/powerpc/platforms/pseries/hvCall_inst.c linux-2.6.17.1.work/arch/powerpc/platforms/pseries/hvCall_inst.c --- linux-2.6.17.1/arch/powerpc/platforms/pseries/hvCall_inst.c 1970-01-01 00:00:00.000000000 +0000 +++ linux-2.6.17.1.work/arch/powerpc/platforms/pseries/hvCall_inst.c 2006-06-22 23:00:47.000000000 +0000 @@ -0,0 +1,219 @@ +/* + * Copyright (C) 2006 Mike Kravetz IBM Corporation + * + * Hypervisor Call Instrumentation + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include +#include +#include +#include +#include +#include +#include + +DEFINE_PER_CPU(struct hcall_stats[MAX_HCALL_OPCODES+1], hcall_stats); + +/* + * Common update of the per-CPU/per-hcall statistics + */ +static inline void update_stats(unsigned long opcode, unsigned long t_before) +{ + unsigned long op_index = opcode >> 2; + struct hcall_stats *hs = &__get_cpu_var(hcall_stats[op_index]); + + hs->total_time += (mfspr(SPRN_PURR) - t_before); + hs->num_calls++; +} + +/* + * plpar_hcall wrapper + */ +long plpar_hcall(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3) +{ + long rc; + unsigned long t_before; + + preempt_disable(); + t_before = mfspr(SPRN_PURR); + rc = plpar_hcall_base(opcode, arg1, arg2, arg3, arg4, out1, out2, out3); + + update_stats(opcode, t_before); + preempt_enable(); + return rc; +} + +/* + * A C based wrapper for plpar_hcall_norets + * The wrapper for plpar_hcall_norets is a special case because the function + * takes a variable number of arguments. It is almost impossible to write a + * wrapper for a function that takes a variable number of arguments in C. + * Therefore, there is an assembly routine in hvCall.S that simply branches + * to this C wrapper. This 'indirection' takes care of the variable arguments + * issue. This C wrapper has a fixed maximum number of arguments. + */ +long plpar_hcall_norets_C(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6) +{ + long rc; + unsigned long t_before; + + preempt_disable(); + t_before = mfspr(SPRN_PURR); + rc = plpar_hcall_norets_base(opcode, arg1, arg2, arg3, arg4, arg5, + arg6); + + update_stats(opcode, t_before); + preempt_enable(); + return rc; +} + +/* + * plpar_hcall_8arg_2ret wrapper + */ +long plpar_hcall_8arg_2ret(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6, + unsigned long arg7, + unsigned long arg8, + unsigned long *out1) +{ + long rc; + unsigned long t_before; + + preempt_disable(); + t_before = mfspr(SPRN_PURR); + rc = plpar_hcall_8arg_2ret_base(opcode, arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8, out1); + + update_stats(opcode, t_before); + preempt_enable(); + return rc; +} + +/* + * plpar_hcall_4out wrapper + */ +long plpar_hcall_4out(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3, + unsigned long *out4) +{ + long rc; + unsigned long t_before; + + preempt_disable(); + t_before = mfspr(SPRN_PURR); + rc = plpar_hcall_4out_base(opcode, arg1, arg2, arg3, arg4, out1, + out2, out3, out4); + + update_stats(opcode, t_before); + preempt_enable(); + return rc; +} + +/* + * plpar_hcall_7arg_7ret wrapper + */ +long plpar_hcall_7arg_7ret(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6, + unsigned long arg7, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3, + unsigned long *out4, + unsigned long *out5, + unsigned long *out6, + unsigned long *out7) +{ + long rc; + unsigned long t_before; + + preempt_disable(); + t_before = mfspr(SPRN_PURR); + rc = plpar_hcall_7arg_7ret_base(opcode, arg1, arg2, arg3, arg4, arg5, + arg6, arg7, out1, out2, out3, out4, + out5, out6, out7); + + update_stats(opcode, t_before); + preempt_enable(); + return rc; +} + +/* + * plpar_hcall_9arg_9ret wrapper + */ +long plpar_hcall_9arg_9ret(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6, + unsigned long arg7, + unsigned long arg8, + unsigned long arg9, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3, + unsigned long *out4, + unsigned long *out5, + unsigned long *out6, + unsigned long *out7, + unsigned long *out8, + unsigned long *out9) +{ + long rc; + unsigned long t_before; + + preempt_disable(); + t_before = mfspr(SPRN_PURR); + rc = plpar_hcall_9arg_9ret_base(opcode, arg1, arg2, arg3, arg4, arg5, + arg6, arg7, arg8, arg9, out1, out2, + out3, out4, out5, out6, out7, out8, + out9); + + update_stats(opcode, t_before); + preempt_enable(); + return rc; +} diff -Naupr linux-2.6.17.1/include/asm-powerpc/hvcall.h linux-2.6.17.1.work/include/asm-powerpc/hvcall.h --- linux-2.6.17.1/include/asm-powerpc/hvcall.h 2006-06-22 22:56:46.000000000 +0000 +++ linux-2.6.17.1.work/include/asm-powerpc/hvcall.h 2006-06-22 22:58:58.000000000 +0000 @@ -292,6 +292,86 @@ long plpar_hcall_9arg_9ret(unsigned long unsigned long *out8, unsigned long *out9); + +/* For hcall instrumentation. One structure per-hcall, per-CPU */ +struct hcall_stats { + unsigned long num_calls; /* number of calls (on this CPU) */ + unsigned long total_time; /* total cputime (PURR) of calls. */ +}; + +/* If Hypervisor call instrumentation is enabled, the assembly routine + * names are changed from 'plpar_hcall*' to 'plpar_hcall*_base' and + * 'plpar_hcall*' routines become instrumented wrappers. The following + * are declarations for the renamed 'plpar_hcall*_base' routines. + */ +long plpar_hcall_base (unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3); + +long plpar_hcall_norets_base(unsigned long opcode, ...); + +long plpar_hcall_8arg_2ret_base(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6, + unsigned long arg7, + unsigned long arg8, + unsigned long *out1); + +long plpar_hcall_4out_base(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3, + unsigned long *out4); + +long plpar_hcall_7arg_7ret_base(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6, + unsigned long arg7, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3, + unsigned long *out4, + unsigned long *out5, + unsigned long *out6, + unsigned long *out7); + +long plpar_hcall_9arg_9ret_base(unsigned long opcode, + unsigned long arg1, + unsigned long arg2, + unsigned long arg3, + unsigned long arg4, + unsigned long arg5, + unsigned long arg6, + unsigned long arg7, + unsigned long arg8, + unsigned long arg9, + unsigned long *out1, + unsigned long *out2, + unsigned long *out3, + unsigned long *out4, + unsigned long *out5, + unsigned long *out6, + unsigned long *out7, + unsigned long *out8, + unsigned long *out9); + #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ #endif /* _ASM_POWERPC_HVCALL_H */