Commit 606c61a0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (patches from Andrew) 

Merge fourth patch-bomb from Andrew Morton:
 "A lot more stuff than expected, sorry.  A bunch of ocfs2 reviewing was
  finished off.

   - mhocko's oom-reaper out-of-memory-handler changes

   - ocfs2 fixes and features

   - KASAN feature work

   - various fixes"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (42 commits)
  thp: fix typo in khugepaged_scan_pmd()
  MAINTAINERS: fill entries for KASAN
  mm/filemap: generic_file_read_iter(): check for zero reads unconditionally
  kasan: test fix: warn if the UAF could not be detected in kmalloc_uaf2
  mm, kasan: stackdepot implementation. Enable stackdepot for SLAB
  arch, ftrace: for KASAN put hard/soft IRQ entries into separate sections
  mm, kasan: add GFP flags to KASAN API
  mm, kasan: SLAB support
  kasan: modify kmalloc_large_oob_right(), add kmalloc_pagealloc_oob_right()
  include/linux/oom.h: remove undefined oom_kills_count()/note_oom_kill()
  mm/page_alloc: prevent merging between isolated and other pageblocks
  drivers/memstick/host/r592.c: avoid gcc-6 warning
  ocfs2: extend enough credits for freeing one truncate record while replaying truncate records
  ocfs2: extend transaction for ocfs2_remove_rightmost_path() and ocfs2_update_edge_lengths() before to avoid inconsistency between inode and et
  ocfs2/dlm: move lock to the tail of grant queue while doing in-place convert
  ocfs2: solve a problem of crossing the boundary in updating backups
  ocfs2: fix occurring deadlock by changing ocfs2_wq from global to local
  ocfs2/dlm: fix BUG in dlm_move_lockres_to_recovery_list
  ocfs2/dlm: fix race between convert and recovery
  ocfs2: fix a deadlock issue in ocfs2_dio_end_io_write()
  ...
parents 15dbc136 0fda2788

Documentation/kasan.txt

+2 −3
Original line number Diff line number Diff line
@@ -12,8 +12,7 @@ KASAN uses compile-time instrumentation for checking every memory access, 
therefore you will need a GCC version 4.9.2 or later. GCC 5.0 or later is

required for detection of out-of-bounds accesses to stack or global variables.



Currently KASAN is supported only for x86_64 architecture and requires the

kernel to be built with the SLUB allocator.

Currently KASAN is supported only for x86_64 architecture.



1. Usage

========
@@ -27,7 +26,7 @@ inline are compiler instrumentation types. The former produces smaller binary 
the latter is 1.1 - 2 times faster. Inline instrumentation requires a GCC

version 5.0 or later.



Currently KASAN works only with the SLUB memory allocator.

KASAN works with both SLUB and SLAB memory allocators.

For better bug detection and nicer reporting, enable CONFIG_STACKTRACE.



To disable instrumentation for specific files or directories, add a line

MAINTAINERS

+14 −0
Original line number Diff line number Diff line
@@ -6165,6 +6165,20 @@ S: Maintained 
F:	Documentation/hwmon/k8temp

F:	drivers/hwmon/k8temp.c



KASAN

M:	Andrey Ryabinin <aryabinin@virtuozzo.com>

R:	Alexander Potapenko <glider@google.com>

R:	Dmitry Vyukov <dvyukov@google.com>

L:	kasan-dev@googlegroups.com

S:	Maintained

F:	arch/*/include/asm/kasan.h

F:	arch/*/mm/kasan_init*

F:	Documentation/kasan.txt

F:	include/linux/kasan.h

F:	lib/test_kasan.c

F:	mm/kasan/

F:	scripts/Makefile.kasan



KCONFIG

M:	"Yann E. MORIN" <yann.morin.1998@free.fr>

L:	linux-kbuild@vger.kernel.org

arch/arm/include/asm/exception.h

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 
#ifndef __ASM_ARM_EXCEPTION_H

#define __ASM_ARM_EXCEPTION_H



#include <linux/ftrace.h>

#include <linux/interrupt.h>



#define __exception	__attribute__((section(".exception.text")))

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

arch/arm/kernel/vmlinux.lds.S

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ SECTIONS 
			*(.exception.text)

			__exception_text_end = .;

			IRQENTRY_TEXT

			SOFTIRQENTRY_TEXT

			TEXT_TEXT

			SCHED_TEXT

			LOCK_TEXT

arch/arm64/include/asm/exception.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#ifndef __ASM_EXCEPTION_H

#define __ASM_EXCEPTION_H



#include <linux/ftrace.h>

#include <linux/interrupt.h>



#define __exception	__attribute__((section(".exception.text")))

#ifdef CONFIG_FUNCTION_GRAPH_TRACER

CRA Git | Maintained and supported by SUSTech CRA and CCSE