Commit c185b783 authored by Martin Schwidefsky's avatar Martin Schwidefsky
Browse files

[S390] Remove config options. 



On s390 we always want to run with precise cputime accounting.
Remove the config options VIRT_TIMER and VIRT_CPU_ACCOUNTING.

Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 349f1b67

arch/s390/Kconfig

+4 −14
Original line number Diff line number Diff line
@@ -69,6 +69,9 @@ config PGSTE 
	bool

	default y if KVM



config VIRT_CPU_ACCOUNTING

	def_bool y



mainmenu "Linux Kernel Configuration"



config S390
@@ -469,22 +472,9 @@ config PAGE_STATES 
	  hypervisor. The ESSA instruction is used to do the states

	  changes between a page that has content and the unused state.



config VIRT_TIMER

	bool "Virtual CPU timer support"

	help

	  This provides a kernel interface for virtual CPU timers.

	  Default is disabled.



config VIRT_CPU_ACCOUNTING

	bool "Base user process accounting on virtual cpu timer"

	depends on VIRT_TIMER

	help

	  Select this option to use CPU timer deltas to do user

	  process accounting.



config APPLDATA_BASE

	bool "Linux - VM Monitor Stream, base infrastructure"

	depends on PROC_FS && VIRT_TIMER=y

	depends on PROC_FS

	help

	  This provides a kernel interface for creating and updating z/VM APPLDATA

	  monitor records. The monitor records are updated at certain time

arch/s390/include/asm/system.h

+0 −4
Original line number Diff line number Diff line
@@ -99,13 +99,9 @@ static inline void restore_access_regs(unsigned int *acrs) 
	prev = __switch_to(prev,next);					     \

} while (0)



#ifdef CONFIG_VIRT_CPU_ACCOUNTING

extern void account_vtime(struct task_struct *);

extern void account_tick_vtime(struct task_struct *);

extern void account_system_vtime(struct task_struct *);

#else

#define account_vtime(x) do { /* empty */ } while (0)

#endif



#ifdef CONFIG_PFAULT

extern void pfault_irq_init(void);

arch/s390/include/asm/timer.h

+0 −9
Original line number Diff line number Diff line
@@ -48,18 +48,9 @@ extern int del_virt_timer(struct vtimer_list *timer); 
extern void init_cpu_vtimer(void);

extern void vtime_init(void);



#ifdef CONFIG_VIRT_TIMER



extern void vtime_start_cpu_timer(void);

extern void vtime_stop_cpu_timer(void);



#else



static inline void vtime_start_cpu_timer(void) { }

static inline void vtime_stop_cpu_timer(void) { }



#endif /* CONFIG_VIRT_TIMER */



#endif /* __KERNEL__ */



#endif /* _ASM_S390_TIMER_H */

arch/s390/kernel/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' 
obj-y	:=  bitmap.o traps.o time.o process.o base.o early.o \

            setup.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o \

	    s390_ext.o debug.o irq.o ipl.o dis.o diag.o mem_detect.o \

	    vdso.o

	    vdso.o vtime.o



obj-y	+= $(if $(CONFIG_64BIT),entry64.o,entry.o)

obj-y	+= $(if $(CONFIG_64BIT),reipl64.o,reipl.o)
@@ -36,7 +36,6 @@ obj-$(CONFIG_COMPAT) += compat_linux.o compat_signal.o \ 
					compat_wrapper.o compat_exec_domain.o \

					$(compat-obj-y)



obj-$(CONFIG_VIRT_TIMER)	+= vtime.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_FUNCTION_TRACER)	+= mcount.o

arch/s390/kernel/entry.S

+7 −49
Original line number Diff line number Diff line
@@ -109,13 +109,6 @@ STACK_SIZE = 1 << STACK_SHIFT 
 *    R15 - kernel stack pointer

 */



	.macro	STORE_TIMER lc_offset

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	stpt	\lc_offset

#endif

	.endm



#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	.macro	UPDATE_VTIME lc_from,lc_to,lc_sum

	lm	%r10,%r11,\lc_from

	sl	%r10,\lc_to
@@ -128,7 +121,6 @@ STACK_SIZE = 1 << STACK_SHIFT 
	al	%r10,BASED(.Lc_1)

1:	stm	%r10,%r11,\lc_sum

	.endm

#endif



	.macro	SAVE_ALL_BASE savearea

	stm	%r12,%r15,\savearea
@@ -198,7 +190,7 @@ STACK_SIZE = 1 << STACK_SHIFT 
	ni	\psworg+1,0xfd		# clear wait state bit

	.endif

	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15 of user

	STORE_TIMER __LC_EXIT_TIMER

	stpt	__LC_EXIT_TIMER

	lpsw	\psworg			# back to caller

	.endm
@@ -247,20 +239,18 @@ __critical_start: 


	.globl	system_call

system_call:

	STORE_TIMER __LC_SYNC_ENTER_TIMER

	stpt	__LC_SYNC_ENTER_TIMER

sysc_saveall:

	SAVE_ALL_BASE __LC_SAVE_AREA

	SAVE_ALL_SVC __LC_SVC_OLD_PSW,__LC_SAVE_AREA

	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA

	lh	%r7,0x8a	  # get svc number from lowcore

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

sysc_vtime:

	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER

sysc_stime:

	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

sysc_update:

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

#endif

sysc_do_svc:

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	ltr	%r7,%r7			# test for svc 0
@@ -490,20 +480,18 @@ pgm_check_handler: 
 * we just ignore the PER event (FIXME: is there anything we have to do

 * for LPSW?).

 */

	STORE_TIMER __LC_SYNC_ENTER_TIMER

	stpt	__LC_SYNC_ENTER_TIMER

	SAVE_ALL_BASE __LC_SAVE_AREA

	tm	__LC_PGM_INT_CODE+1,0x80 # check whether we got a per exception

	bnz	BASED(pgm_per)		# got per exception -> special case

	SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA

	CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?

	bz	BASED(pgm_no_vtime)

	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER

	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

pgm_no_vtime:

#endif

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	TRACE_IRQS_OFF

	l	%r3,__LC_PGM_ILC	# load program interruption code
@@ -536,14 +524,12 @@ pgm_per: 
pgm_per_std:

	SAVE_ALL_SYNC __LC_PGM_OLD_PSW,__LC_SAVE_AREA

	CREATE_STACK_FRAME __LC_PGM_OLD_PSW,__LC_SAVE_AREA

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?

	bz	BASED(pgm_no_vtime2)

	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER

	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

pgm_no_vtime2:

#endif

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	TRACE_IRQS_OFF

	l	%r1,__TI_task(%r9)
@@ -565,11 +551,9 @@ pgm_no_vtime2: 
pgm_svcper:

	SAVE_ALL_SYNC __LC_SVC_OLD_PSW,__LC_SAVE_AREA

	CREATE_STACK_FRAME __LC_SVC_OLD_PSW,__LC_SAVE_AREA

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	UPDATE_VTIME __LC_EXIT_TIMER,__LC_SYNC_ENTER_TIMER,__LC_USER_TIMER

	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

#endif

	lh	%r7,0x8a		# get svc number from lowcore

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	TRACE_IRQS_OFF
@@ -599,19 +583,17 @@ kernel_per: 


	.globl io_int_handler

io_int_handler:

	STORE_TIMER __LC_ASYNC_ENTER_TIMER

	stpt	__LC_ASYNC_ENTER_TIMER

	stck	__LC_INT_CLOCK

	SAVE_ALL_BASE __LC_SAVE_AREA+16

	SAVE_ALL_ASYNC __LC_IO_OLD_PSW,__LC_SAVE_AREA+16

	CREATE_STACK_FRAME __LC_IO_OLD_PSW,__LC_SAVE_AREA+16

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?

	bz	BASED(io_no_vtime)

	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER

	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER

io_no_vtime:

#endif

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	TRACE_IRQS_OFF

	l	%r1,BASED(.Ldo_IRQ)	# load address of do_IRQ
@@ -741,19 +723,17 @@ io_notify_resume: 


	.globl	ext_int_handler

ext_int_handler:

	STORE_TIMER __LC_ASYNC_ENTER_TIMER

	stpt	__LC_ASYNC_ENTER_TIMER

	stck	__LC_INT_CLOCK

	SAVE_ALL_BASE __LC_SAVE_AREA+16

	SAVE_ALL_ASYNC __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16

	CREATE_STACK_FRAME __LC_EXT_OLD_PSW,__LC_SAVE_AREA+16

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?

	bz	BASED(ext_no_vtime)

	UPDATE_VTIME __LC_EXIT_TIMER,__LC_ASYNC_ENTER_TIMER,__LC_USER_TIMER

	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER

ext_no_vtime:

#endif

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	TRACE_IRQS_OFF

	la	%r2,SP_PTREGS(%r15)	# address of register-save area
@@ -776,7 +756,6 @@ mcck_int_handler: 
	la	%r12,__LC_MCK_OLD_PSW

	tm	__LC_MCCK_CODE,0x80	# system damage?

	bo	BASED(mcck_int_main)	# yes -> rest of mcck code invalid

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	mvc	__LC_SAVE_AREA+52(8),__LC_ASYNC_ENTER_TIMER

	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_CPU_TIMER_SAVE_AREA

	tm	__LC_MCCK_CODE+5,0x02	# stored cpu timer value valid?
@@ -793,9 +772,7 @@ mcck_int_handler: 
	la	%r14,__LC_LAST_UPDATE_TIMER

0:	spt	0(%r14)

	mvc	__LC_ASYNC_ENTER_TIMER(8),0(%r14)

1:

#endif

	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?

1:	tm	__LC_MCCK_CODE+2,0x09	# mwp + ia of old psw valid?

	bno	BASED(mcck_int_main)	# no -> skip cleanup critical

	tm	__LC_MCK_OLD_PSW+1,0x01	# test problem state bit

	bnz	BASED(mcck_int_main)	# from user -> load async stack
@@ -812,7 +789,6 @@ mcck_int_main: 
	be	BASED(0f)

	l	%r15,__LC_PANIC_STACK	# load panic stack

0:	CREATE_STACK_FRAME __LC_MCK_OLD_PSW,__LC_SAVE_AREA+32

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	tm	__LC_MCCK_CODE+2,0x08	# mwp of old psw valid?

	bno	BASED(mcck_no_vtime)	# no -> skip cleanup critical

	tm	SP_PSW+1(%r15),0x01	# interrupting from user ?
@@ -821,7 +797,6 @@ mcck_int_main: 
	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_ASYNC_ENTER_TIMER

mcck_no_vtime:

#endif

	l	%r9,__LC_THREAD_INFO	# load pointer to thread_info struct

	la	%r2,SP_PTREGS(%r15)	# load pt_regs

	l	%r1,BASED(.Ls390_mcck)
@@ -843,16 +818,13 @@ mcck_no_vtime: 
mcck_return:

	mvc	__LC_RETURN_MCCK_PSW(8),SP_PSW(%r15) # move return PSW

	ni	__LC_RETURN_MCCK_PSW+1,0xfd # clear wait state bit

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	mvc	__LC_ASYNC_ENTER_TIMER(8),__LC_SAVE_AREA+52

	tm	__LC_RETURN_MCCK_PSW+1,0x01 # returning to user ?

	bno	BASED(0f)

	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15

	stpt	__LC_EXIT_TIMER

	lpsw	__LC_RETURN_MCCK_PSW	# back to caller

0:

#endif

	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15

0:	lm	%r0,%r15,SP_R0(%r15)	# load gprs 0-15

	lpsw	__LC_RETURN_MCCK_PSW	# back to caller



	RESTORE_ALL __LC_RETURN_MCCK_PSW,0
@@ -976,13 +948,11 @@ cleanup_system_call: 
	b	BASED(1f)

0:	la	%r12,__LC_SAVE_AREA+32

1:

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+4)

	bh	BASED(0f)

	mvc	__LC_SYNC_ENTER_TIMER(8),__LC_ASYNC_ENTER_TIMER

0:	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+8)

	bhe	BASED(cleanup_vtime)

#endif

	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn)

	bh	BASED(0f)

	mvc	__LC_SAVE_AREA(16),0(%r12)
@@ -993,7 +963,6 @@ cleanup_system_call: 
	l	%r12,__LC_SAVE_AREA+48	# argh

	st	%r15,12(%r12)

	lh	%r7,0x8a

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

cleanup_vtime:

	clc	__LC_RETURN_PSW+4(4),BASED(cleanup_system_call_insn+12)

	bhe	BASED(cleanup_stime)
@@ -1004,18 +973,15 @@ cleanup_stime: 
	UPDATE_VTIME __LC_LAST_UPDATE_TIMER,__LC_EXIT_TIMER,__LC_SYSTEM_TIMER

cleanup_update:

	mvc	__LC_LAST_UPDATE_TIMER(8),__LC_SYNC_ENTER_TIMER

#endif

	mvc	__LC_RETURN_PSW+4(4),BASED(cleanup_table_system_call+4)

	la	%r12,__LC_RETURN_PSW

	br	%r14

cleanup_system_call_insn:

	.long	sysc_saveall + 0x80000000

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	.long	system_call + 0x80000000

	.long	sysc_vtime + 0x80000000

	.long	sysc_stime + 0x80000000

	.long	sysc_update + 0x80000000

#endif



cleanup_sysc_return:

	mvc	__LC_RETURN_PSW(4),0(%r12)
@@ -1026,11 +992,9 @@ cleanup_sysc_return: 
cleanup_sysc_leave:

	clc	4(4,%r12),BASED(cleanup_sysc_leave_insn)

	be	BASED(2f)

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	mvc	__LC_EXIT_TIMER(8),__LC_ASYNC_ENTER_TIMER

	clc	4(4,%r12),BASED(cleanup_sysc_leave_insn+4)

	be	BASED(2f)

#endif

	mvc	__LC_RETURN_PSW(8),SP_PSW(%r15)

	c	%r12,BASED(.Lmck_old_psw)

	bne	BASED(0f)
@@ -1043,9 +1007,7 @@ cleanup_sysc_leave: 
	br	%r14

cleanup_sysc_leave_insn:

	.long	sysc_done - 4 + 0x80000000

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	.long	sysc_done - 8 + 0x80000000

#endif



cleanup_io_return:

	mvc	__LC_RETURN_PSW(4),0(%r12)
@@ -1056,11 +1018,9 @@ cleanup_io_return: 
cleanup_io_leave:

	clc	4(4,%r12),BASED(cleanup_io_leave_insn)

	be	BASED(2f)

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	mvc	__LC_EXIT_TIMER(8),__LC_ASYNC_ENTER_TIMER

	clc	4(4,%r12),BASED(cleanup_io_leave_insn+4)

	be	BASED(2f)

#endif

	mvc	__LC_RETURN_PSW(8),SP_PSW(%r15)

	c	%r12,BASED(.Lmck_old_psw)

	bne	BASED(0f)
@@ -1073,9 +1033,7 @@ cleanup_io_leave: 
	br	%r14

cleanup_io_leave_insn:

	.long	io_done - 4 + 0x80000000

#ifdef CONFIG_VIRT_CPU_ACCOUNTING

	.long	io_done - 8 + 0x80000000

#endif



/*

 * Integer constants