Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ee07ef6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux 

Pull s390 updates from Martin Schwidefsky:
 "This patch set contains the main portion of the changes for 3.18 in
  regard to the s390 architecture.  It is a bit bigger than usual,
  mainly because of a new driver and the vector extension patches.

  The interesting bits are:
   - Quite a bit of work on the tracing front.  Uprobes is enabled and
     the ftrace code is reworked to get some of the lost performance
     back if CONFIG_FTRACE is enabled.
   - To improve boot time with CONFIG_DEBIG_PAGEALLOC, support for the
     IPTE range facility is added.
   - The rwlock code is re-factored to improve writer fairness and to be
     able to use the interlocked-access instructions.
   - The kernel part for the support of the vector extension is added.
   - The device driver to access the CD/DVD on the HMC is added, this
     will hopefully come in handy to improve the installation process.
   - Add support for control-unit initiated reconfiguration.
   - The crypto device driver is enhanced to enable the additional AP
     domains and to allow the new crypto hardware to be used.
   - Bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: (39 commits)
  s390/ftrace: simplify enabling/disabling of ftrace_graph_caller
  s390/ftrace: remove 31 bit ftrace support
  s390/kdump: add support for vector extension
  s390/disassembler: add vector instructions
  s390: add support for vector extension
  s390/zcrypt: Toleration of new crypto hardware
  s390/idle: consolidate idle functions and definitions
  s390/nohz: use a per-cpu flag for arch_needs_cpu
  s390/vtime: do not reset idle data on CPU hotplug
  s390/dasd: add support for control unit initiated reconfiguration
  s390/dasd: fix infinite loop during format
  s390/mm: make use of ipte range facility
  s390/setup: correct 4-level kernel page table detection
  s390/topology: call set_sched_topology early
  s390/uprobes: architecture backend for uprobes
  s390/uprobes: common library for kprobes and uprobes
  s390/rwlock: use the interlocked-access facility 1 instructions
  s390/rwlock: improve writer fairness
  s390/rwlock: remove interrupt-enabling rwlock variant.
  s390/mm: remove change bit override support
  ...
parents 77654908 0cccdda8

Documentation/kprobes.txt

+1 −0
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ architectures: 
- arm

- ppc

- mips

- s390



3. Configuring Kprobes

arch/s390/Kconfig

+8 −3
Original line number Diff line number Diff line
@@ -58,6 +58,9 @@ config NO_IOPORT_MAP 
config PCI_QUIRKS

	def_bool n



config ARCH_SUPPORTS_UPROBES

	def_bool 64BIT



config S390

	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE
@@ -97,6 +100,7 @@ config S390 
	select ARCH_WANT_IPC_PARSE_VERSION

	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS2

	select DYNAMIC_FTRACE if FUNCTION_TRACER

	select GENERIC_CLOCKEVENTS

	select GENERIC_CPU_DEVICES if !SMP

	select GENERIC_FIND_FIRST_BIT
@@ -113,10 +117,11 @@ config S390 
	select HAVE_CMPXCHG_LOCAL

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DYNAMIC_FTRACE

	select HAVE_DYNAMIC_FTRACE if 64BIT

	select HAVE_DYNAMIC_FTRACE_WITH_REGS if 64BIT

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER if 64BIT

	select HAVE_FUNCTION_TRACER if 64BIT

	select HAVE_FUTEX_CMPXCHG if FUTEX

	select HAVE_KERNEL_BZIP2

	select HAVE_KERNEL_GZIP

arch/s390/Makefile

+10 −7
Original line number Diff line number Diff line
@@ -35,13 +35,16 @@ endif 


export LD_BFD



cflags-$(CONFIG_MARCH_G5)     += -march=g5

cflags-$(CONFIG_MARCH_Z900)   += -march=z900

cflags-$(CONFIG_MARCH_Z990)   += -march=z990

cflags-$(CONFIG_MARCH_Z9_109) += -march=z9-109

cflags-$(CONFIG_MARCH_Z10)    += -march=z10

cflags-$(CONFIG_MARCH_Z196)   += -march=z196

cflags-$(CONFIG_MARCH_ZEC12)  += -march=zEC12

mflags-$(CONFIG_MARCH_G5)     := -march=g5

mflags-$(CONFIG_MARCH_Z900)   := -march=z900

mflags-$(CONFIG_MARCH_Z990)   := -march=z990

mflags-$(CONFIG_MARCH_Z9_109) := -march=z9-109

mflags-$(CONFIG_MARCH_Z10)    := -march=z10

mflags-$(CONFIG_MARCH_Z196)   := -march=z196

mflags-$(CONFIG_MARCH_ZEC12)  := -march=zEC12



aflags-y += $(mflags-y)

cflags-y += $(mflags-y)



cflags-$(CONFIG_MARCH_G5_TUNE)		+= -mtune=g5

cflags-$(CONFIG_MARCH_Z900_TUNE)	+= -mtune=z900

arch/s390/include/asm/barrier.h

+4 −2
Original line number Diff line number Diff line
@@ -15,11 +15,13 @@ 


#ifdef CONFIG_HAVE_MARCH_Z196_FEATURES

/* Fast-BCR without checkpoint synchronization */

#define mb() do {  asm volatile("bcr 14,0" : : : "memory"); } while (0)

#define __ASM_BARRIER "bcr 14,0\n"

#else

#define mb() do {  asm volatile("bcr 15,0" : : : "memory"); } while (0)

#define __ASM_BARRIER "bcr 15,0\n"

#endif



#define mb() do {  asm volatile(__ASM_BARRIER : : : "memory"); } while (0)



#define rmb()				mb()

#define wmb()				mb()

#define read_barrier_depends()		do { } while(0)

arch/s390/include/asm/cputime.h

+2 −24
Original line number Diff line number Diff line
@@ -8,8 +8,6 @@ 
#define _S390_CPUTIME_H



#include <linux/types.h>

#include <linux/percpu.h>

#include <linux/spinlock.h>

#include <asm/div64.h>
@@ -167,28 +165,8 @@ static inline clock_t cputime64_to_clock_t(cputime64_t cputime) 
	return clock;

}



struct s390_idle_data {

	int nohz_delay;

	unsigned int sequence;

	unsigned long long idle_count;

	unsigned long long idle_time;

	unsigned long long clock_idle_enter;

	unsigned long long clock_idle_exit;

	unsigned long long timer_idle_enter;

	unsigned long long timer_idle_exit;

};

cputime64_t arch_cpu_idle_time(int cpu);



DECLARE_PER_CPU(struct s390_idle_data, s390_idle);



cputime64_t s390_get_idle_time(int cpu);



#define arch_idle_time(cpu) s390_get_idle_time(cpu)



static inline int s390_nohz_delay(int cpu)

{

	return __get_cpu_var(s390_idle).nohz_delay != 0;

}



#define arch_needs_cpu(cpu) s390_nohz_delay(cpu)

#define arch_idle_time(cpu) arch_cpu_idle_time(cpu)



#endif /* _S390_CPUTIME_H */