Commit 395102db authored by Daniel Jordan's avatar Daniel Jordan Committed by David S. Miller
Browse files

sparc64: Use LOCKDEP_SMALL, not PROVE_LOCKING_SMALL 



CONFIG_PROVE_LOCKING_SMALL shrinks the memory usage of lockdep so the
kernel text, data, and bss fit in the required 32MB limit, but this
option is not set for every config that enables lockdep.

A 4.10 kernel fails to boot with the console output

    Kernel: Using 8 locked TLB entries for main kernel image.
    hypervisor_tlb_lock[2000000:0:8000000071c007c3:1]: errors with f
    Program terminated

with these config options

    CONFIG_LOCKDEP=y
    CONFIG_LOCK_STAT=y
    CONFIG_PROVE_LOCKING=n

To fix, rename CONFIG_PROVE_LOCKING_SMALL to CONFIG_LOCKDEP_SMALL, and
enable this option with CONFIG_LOCKDEP=y so we get the reduced memory
usage every time lockdep is turned on.

Tested that CONFIG_LOCKDEP_SMALL is set to 'y' if and only if
CONFIG_LOCKDEP is set to 'y'.  When other lockdep-related config options
that select CONFIG_LOCKDEP are enabled (e.g. CONFIG_LOCK_STAT or
CONFIG_PROVE_LOCKING), verified that CONFIG_LOCKDEP_SMALL is also
enabled.

Fixes: e6b5f1be ("config: Adding the new config parameter CONFIG_PROVE_LOCKING_SMALL for sparc")
Signed-off-by: default avatarDaniel Jordan <daniel.m.jordan@oracle.com>
Reviewed-by: default avatarBabu Moger <babu.moger@oracle.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent fb5e2154

arch/sparc/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,7 @@ config SPARC 
	select ARCH_HAS_SG_CHAIN

	select ARCH_HAS_SG_CHAIN

	select CPU_NO_EFFICIENT_FFS

	select CPU_NO_EFFICIENT_FFS

	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_ARCH_HARDENED_USERCOPY

	select PROVE_LOCKING_SMALL if PROVE_LOCKING

	select LOCKDEP_SMALL if LOCKDEP

	select ARCH_WANT_RELAX_ORDER

	select ARCH_WANT_RELAX_ORDER





config SPARC32

config SPARC32

kernel/locking/lockdep_internals.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -46,13 +46,13 @@ enum { 
		(LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)

		(LOCKF_USED_IN_HARDIRQ_READ | LOCKF_USED_IN_SOFTIRQ_READ)





/*

/*

 * CONFIG_PROVE_LOCKING_SMALL is defined for sparc. Sparc requires .text,

 * CONFIG_LOCKDEP_SMALL is defined for sparc. Sparc requires .text,

 * .data and .bss to fit in required 32MB limit for the kernel. With

 * .data and .bss to fit in required 32MB limit for the kernel. With

 * PROVE_LOCKING we could go over this limit and cause system boot-up problems.

 * CONFIG_LOCKDEP we could go over this limit and cause system boot-up problems.

 * So, reduce the static allocations for lockdeps related structures so that

 * So, reduce the static allocations for lockdeps related structures so that

 * everything fits in current required size limit.

 * everything fits in current required size limit.

 */

 */

#ifdef CONFIG_PROVE_LOCKING_SMALL

#ifdef CONFIG_LOCKDEP_SMALL

/*

/*

 * MAX_LOCKDEP_ENTRIES is the maximum number of lock dependencies

 * MAX_LOCKDEP_ENTRIES is the maximum number of lock dependencies

 * we track.

 * we track.

lib/Kconfig.debug

+3 −3
Original line number Original line Diff line number Diff line
@@ -1103,9 +1103,6 @@ config PROVE_LOCKING 




	 For more details, see Documentation/locking/lockdep-design.txt.

	 For more details, see Documentation/locking/lockdep-design.txt.





config PROVE_LOCKING_SMALL

	bool



config LOCKDEP

config LOCKDEP

	bool

	bool

	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT

	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT
@@ -1114,6 +1111,9 @@ config LOCKDEP 
	select KALLSYMS

	select KALLSYMS

	select KALLSYMS_ALL

	select KALLSYMS_ALL





config LOCKDEP_SMALL

	bool



config LOCK_STAT

config LOCK_STAT

	bool "Lock usage statistics"

	bool "Lock usage statistics"

	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT

	depends on DEBUG_KERNEL && TRACE_IRQFLAGS_SUPPORT && STACKTRACE_SUPPORT && LOCKDEP_SUPPORT

CRA Git | Maintained and supported by SUSTech CRA and CCSE