Merge branch 'akpm' (patches from Andrew)

eae21770 · Linus Torvalds <[email protected]> · 2016-01-21 12:32:08 -08:00

Merge third patch-bomb from Andrew Morton:
 "I'm pretty much done for -rc1 now:

   - the rest of MM, basically

   - lib/ updates

   - checkpatch, epoll, hfs, fatfs, ptrace, coredump, exit

   - cpu_mask simplifications

   - kexec, rapidio, MAINTAINERS etc, etc.

   - more dma-mapping cleanups/simplifications from hch"

* emailed patches from Andrew Morton <[email protected]>: (109 commits)
  MAINTAINERS: add/fix git URLs for various subsystems
  mm: memcontrol: add "sock" to cgroup2 memory.stat
  mm: memcontrol: basic memory statistics in cgroup2 memory controller
  mm: memcontrol: do not uncharge old page in page cache replacement
  Documentation: cgroup: add memory.swap.{current,max} description
  mm: free swap cache aggressively if memcg swap is full
  mm: vmscan: do not scan anon pages if memcg swap limit is hit
  swap.h: move memcg related stuff to the end of the file
  mm: memcontrol: replace mem_cgroup_lruvec_online with mem_cgroup_online
  mm: vmscan: pass memcg to get_scan_count()
  mm: memcontrol: charge swap to cgroup2
  mm: memcontrol: clean up alloc, online, offline, free functions
  mm: memcontrol: flatten struct cg_proto
  mm: memcontrol: rein in the CONFIG space madness
  net: drop tcp_memcontrol.c
  mm: memcontrol: introduce CONFIG_MEMCG_LEGACY_KMEM
  mm: memcontrol: allow to disable kmem accounting for cgroup2
  mm: memcontrol: account "kmem" consumers in cgroup2 memory controller
  mm: memcontrol: move kmem accounting code to CONFIG_MEMCG
  mm: memcontrol: separate kmem code from legacy tcp accounting code
  ...

Commit: eae21770b4fed5597623aad0d618190fa60426ff
Parents: e9f57ebc · 9f273c24

Merge commit. Changes below are compared with the first parent: e9f57ebc.

Changes

203 files changed · +3642 −3991

File	Status	Add	Del	Content
CREDITS	modified	+10	−0	View file
Documentation/DMA-API-HOWTO.txt	modified	+0	−10	View file
Documentation/cgroup-v2.txt	modified	+89	−0	View file
Documentation/features/io/dma_map_attrs/arch-support.txt	deleted	+0	−40	View before deletion
Documentation/filesystems/vfat.txt	modified	+10	−0	View file
Documentation/kernel-parameters.txt	modified	+1	−0	View file
Documentation/sysctl/kernel.txt	modified	+7	−8	View file
Documentation/ubsan.txt	added	+84	−0	View file
MAINTAINERS	modified	+42	−11	View file
Makefile	modified	+2	−1	View file
arch/Kconfig	modified	+3	−3	View file
arch/alpha/Kconfig	modified	+0	−1	View file
arch/alpha/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/alpha/include/uapi/asm/mman.h	modified	+0	−1	View file
arch/arc/include/asm/dma-mapping.h	modified	+3	−184	View file
arch/arc/mm/dma.c	modified	+105	−47	View file
arch/arm/Kconfig	modified	+0	−1	View file
arch/arm/include/asm/dma-mapping.h	modified	+0	−7	View file
arch/arm64/Kconfig	modified	+0	−1	View file
arch/arm64/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/avr32/include/asm/dma-mapping.h	modified	+3	−339	View file
arch/avr32/mm/dma-coherent.c	modified	+80	−35	View file
arch/blackfin/include/asm/dma-mapping.h	modified	+3	−124	View file
arch/blackfin/kernel/dma-mapping.c	modified	+38	−14	View file
arch/c6x/Kconfig	modified	+1	−0	View file
arch/c6x/include/asm/dma-mapping.h	modified	+8	−90	View file
arch/c6x/kernel/dma.c	modified	+43	−52	View file
arch/c6x/mm/dma-coherent.c	modified	+4	−6	View file
arch/cris/arch-v32/drivers/pci/dma.c	modified	+42	−12	View file
arch/cris/include/asm/dma-mapping.h	modified	+7	−154	View file
arch/frv/Kconfig	modified	+1	−0	View file
arch/frv/include/asm/dma-mapping.h	modified	+3	−129	View file
arch/frv/include/asm/io.h	modified	+14	−3	View file
arch/frv/mb93090-mb00/pci-dma-nommu.c	modified	+47	−25	View file
arch/frv/mb93090-mb00/pci-dma.c	modified	+48	−26	View file
arch/h8300/Kconfig	modified	+0	−1	View file
arch/h8300/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/hexagon/Kconfig	modified	+0	−1	View file
arch/hexagon/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/ia64/Kconfig	modified	+0	−1	View file
arch/ia64/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/m68k/include/asm/dma-mapping.h	modified	+3	−109	View file
arch/m68k/kernel/dma.c	modified	+27	−34	View file
arch/metag/include/asm/dma-mapping.h	modified	+3	−176	View file
arch/metag/kernel/dma.c	modified	+112	−34	View file
arch/microblaze/Kconfig	modified	+0	−1	View file
arch/microblaze/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/mips/Kconfig	modified	+0	−1	View file
arch/mips/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/mips/include/uapi/asm/mman.h	modified	+0	−1	View file
arch/mn10300/Kconfig	modified	+1	−0	View file
arch/mn10300/include/asm/dma-mapping.h	modified	+3	−158	View file
arch/mn10300/mm/dma-alloc.c	modified	+61	−6	View file
arch/nios2/include/asm/dma-mapping.h	modified	+6	−117	View file
arch/nios2/mm/dma-mapping.c	modified	+80	−69	View file
arch/openrisc/Kconfig	modified	+0	−3	View file
arch/openrisc/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/parisc/Kconfig	modified	+1	−0	View file
arch/parisc/include/asm/dma-mapping.h	modified	+8	−181	View file
arch/parisc/include/uapi/asm/mman.h	modified	+0	−1	View file
arch/parisc/kernel/drivers.c	modified	+1	−1	View file
arch/parisc/kernel/pci-dma.c	modified	+52	−40	View file
arch/powerpc/Kconfig	modified	+1	−1	View file
arch/powerpc/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/powerpc/include/asm/fadump.h	modified	+1	−1	View file
arch/powerpc/kernel/Makefile	modified	+7	−1	View file
arch/powerpc/kernel/fadump.c	modified	+2	−2	View file
arch/powerpc/kernel/vdso32/Makefile	modified	+1	−0	View file
arch/powerpc/kernel/vdso64/Makefile	modified	+1	−0	View file
arch/powerpc/xmon/Makefile	modified	+1	−0	View file
arch/s390/Kconfig	modified	+0	−1	View file
arch/s390/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/sh/Kconfig	modified	+0	−1	View file
arch/sh/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/sparc/Kconfig	modified	+0	−1	View file
arch/sparc/include/asm/dma-mapping.h	modified	+0	−17	View file
arch/tile/Kconfig	modified	+0	−1	View file
arch/tile/include/asm/dma-mapping.h	modified	+1	−31	View file
arch/tile/kernel/pci-dma.c	modified	+29	−0	View file
arch/unicore32/Kconfig	modified	+0	−1	View file
arch/unicore32/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/x86/Kconfig	modified	+1	−1	View file
arch/x86/boot/Makefile	modified	+1	−0	View file
arch/x86/boot/compressed/Makefile	modified	+1	−0	View file
arch/x86/entry/vdso/Makefile	modified	+1	−0	View file
arch/x86/include/asm/dma-mapping.h	modified	+0	−2	View file
arch/x86/kernel/machine_kexec_64.c	modified	+2	−0	View file
arch/x86/realmode/rm/Makefile	modified	+1	−0	View file
arch/xtensa/Kconfig	modified	+0	−1	View file
arch/xtensa/include/asm/dma-mapping.h	modified	+0	−4	View file
arch/xtensa/include/uapi/asm/mman.h	modified	+0	−1	View file
drivers/base/cpu.c	modified	+5	−5	View file
drivers/base/dma-mapping.c	modified	+3	−4	View file
drivers/firmware/broadcom/bcm47xx_nvram.c	modified	+3	−8	View file
drivers/firmware/efi/libstub/Makefile	modified	+1	−0	View file
drivers/gpu/drm/Kconfig	modified	+2	−2	View file
drivers/gpu/drm/imx/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/rcar-du/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/shmobile/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/sti/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/tilcdc/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/vc4/Kconfig	modified	+1	−1	View file
drivers/iio/industrialio-sw-trigger.c	modified	+1	−3	View file
drivers/media/platform/Kconfig	modified	+0	−1	View file
drivers/memstick/core/ms_block.c	modified	+1	−1	View file
drivers/misc/Kconfig	modified	+1	−0	View file
drivers/parisc/ccio-dma.c	modified	+31	−26	View file
drivers/parisc/sba_iommu.c	modified	+29	−23	View file
drivers/rapidio/rio-sysfs.c	modified	+2	−4	View file
drivers/soc/qcom/smd.c	modified	+4	−9	View file
fs/adfs/adfs.h	modified	+14	−14	View file
fs/coredump.c	modified	+20	−0	View file
fs/eventpoll.c	modified	+21	−3	View file
fs/fat/cache.c	modified	+54	−25	View file
fs/fat/dir.c	modified	+1	−1	View file
fs/fat/fat.h	modified	+6	−2	View file
fs/fat/fatent.c	modified	+12	−12	View file
fs/fat/file.c	modified	+61	−0	View file
fs/fat/inode.c	modified	+96	−8	View file
fs/hfs/catalog.c	modified	+2	−4	View file
fs/overlayfs/super.c	modified	+1	−0	View file
fs/proc/array.c	modified	+1	−1	View file
fs/proc/base.c	modified	+21	−13	View file
fs/proc/namespaces.c	modified	+2	−2	View file
fs/proc/task_mmu.c	modified	+1	−1	View file
include/asm-generic/dma-coherent.h	deleted	+0	−32	View before deletion
include/asm-generic/dma-mapping-broken.h	deleted	+0	−95	View before deletion
include/asm-generic/dma-mapping-common.h	deleted	+0	−358	View before deletion
include/linux/cpumask.h	modified	+47	−8	View file
include/linux/dma-attrs.h	modified	+0	−10	View file
include/linux/dma-mapping.h	modified	+388	−23	View file
include/linux/io.h	modified	+1	−0	View file
include/linux/kexec.h	modified	+25	−37	View file
include/linux/list_lru.h	modified	+2	−2	View file
include/linux/lz4.h	modified	+2	−2	View file
include/linux/memcontrol.h	modified	+40	−46	View file
include/linux/ptrace.h	modified	+23	−1	View file
include/linux/radix-tree.h	modified	+1	−1	View file
include/linux/rbtree.h	modified	+1	−1	View file
include/linux/sched.h	modified	+5	−2	View file
include/linux/shm.h	modified	+3	−3	View file
include/linux/slab.h	modified	+1	−1	View file
include/linux/slab_def.h	modified	+2	−1	View file
include/linux/slub_def.h	modified	+1	−1	View file
include/linux/swap.h	modified	+50	−26	View file
include/net/tcp_memcontrol.h	deleted	+0	−9	View before deletion
include/uapi/linux/eventpoll.h	modified	+3	−0	View file
init/Kconfig	modified	+8	−15	View file
init/do_mounts.h	modified	+2	−2	View file
init/do_mounts_initrd.c	modified	+3	−3	View file
init/main.c	modified	+5	−5	View file
ipc/shm.c	modified	+1	−1	View file
kernel/cpu.c	modified	+13	−51	View file
kernel/events/core.c	modified	+1	−1	View file
kernel/exit.c	modified	+1	−4	View file
kernel/futex.c	modified	+1	−1	View file
kernel/futex_compat.c	modified	+1	−1	View file
kernel/kcmp.c	modified	+2	−2	View file
kernel/kexec.c	modified	+5	−5	View file
kernel/kexec_core.c	modified	+2	−5	View file
kernel/kexec_file.c	modified	+2	−0	View file
kernel/kexec_internal.h	modified	+21	−0	View file
kernel/printk/printk.c	modified	+5	−5	View file
kernel/ptrace.c	modified	+39	−10	View file
kernel/sys.c	modified	+10	−10	View file
kernel/sysctl.c	modified	+1	−1	View file
lib/Kconfig.debug	modified	+2	−0	View file
lib/Kconfig.ubsan	added	+29	−0	View file
lib/Makefile	modified	+5	−2	View file
lib/iomap_copy.c	modified	+21	−0	View file
lib/libcrc32c.c	modified	+1	−0	View file
lib/string_helpers.c	modified	+43	−20	View file
lib/test-hexdump.c → lib/test_hexdump.c	renamed	+102	−44	View file
lib/ubsan.c	added	+456	−0	View file
lib/ubsan.h	added	+84	−0	View file
mm/huge_memory.c	modified	+5	−4	View file
mm/kasan/Makefile	modified	+1	−0	View file
mm/list_lru.c	modified	+6	−6	View file
mm/memcontrol.c	modified	+508	−344	View file
mm/memory.c	modified	+2	−1	View file
mm/process_vm_access.c	modified	+1	−1	View file
mm/shmem.c	modified	+4	−0	View file
mm/slab.h	modified	+3	−3	View file
mm/slab_common.c	modified	+7	−7	View file
mm/slub.c	modified	+5	−5	View file
mm/swap_state.c	modified	+5	−0	View file
mm/swapfile.c	modified	+2	−4	View file
mm/util.c	modified	+12	−4	View file
mm/vmscan.c	modified	+12	−16	View file
mm/zsmalloc.c	modified	+13	−1	View file
net/ipv4/Makefile	modified	+0	−1	View file
net/ipv4/sysctl_net_ipv4.c	modified	+0	−1	View file
net/ipv4/tcp_ipv4.c	modified	+0	−1	View file
net/ipv4/tcp_memcontrol.c	deleted	+0	−200	View before deletion
net/ipv6/tcp_ipv6.c	modified	+0	−1	View file
net/mac80211/debugfs.c	modified	+2	−5	View file
scripts/Makefile.lib	modified	+6	−0	View file
scripts/Makefile.ubsan	added	+17	−0	View file
scripts/checkpatch.pl	modified	+46	−3	View file
scripts/get_maintainer.pl	modified	+4	−0	View file
security/commoncap.c	modified	+6	−1	View file
security/smack/smack_lsm.c	modified	+3	−5	View file
security/yama/yama_lsm.c	modified	+2	−2	View file

Only the first 600 diff lines are shown. Download the complete patch.

CREDITS

View file

diff --git a/CREDITS b/CREDITS
index 25133c5..a3887b5 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1856,6 +1856,16 @@ S: Korte Heul 95
 S: 1403 ND  BUSSUM
 S: The Netherlands
 
+N: Martin Kepplinger
+E: [email protected]
+E: [email protected]
+W: http://www.martinkepplinger.com
+D: mma8452 accelerators iio driver
+D: Kernel cleanups
+S: Garnisonstraße 26
+S: 4020 Linz
+S: Austria
+
 N: Karl Keyte
 E: [email protected]
 D: Disk usage statistics and modifications to line printer driver

Documentation/DMA-API-HOWTO.txt

View file

diff --git a/Documentation/DMA-API-HOWTO.txt b/Documentation/DMA-API-HOWTO.txt
index d69b3fc..781024e 100644
--- a/Documentation/DMA-API-HOWTO.txt
+++ b/Documentation/DMA-API-HOWTO.txt
@@ -951,16 +951,6 @@ to "Closing".
    alignment constraints (e.g. the alignment constraints about 64-bit
    objects).
 
-3) Supporting multiple types of IOMMUs
-
-   If your architecture needs to support multiple types of IOMMUs, you
-   can use include/linux/asm-generic/dma-mapping-common.h. It's a
-   library to support the DMA API with multiple types of IOMMUs. Lots
-   of architectures (x86, powerpc, sh, alpha, ia64, microblaze and
-   sparc) use it. Choose one to see how it can be used. If you need to
-   support multiple types of IOMMUs in a single system, the example of
-   x86 or powerpc helps.
-
 			   Closing
 
 This document, and the API itself, would not be in its current

Documentation/cgroup-v2.txt

View file

diff --git a/Documentation/cgroup-v2.txt b/Documentation/cgroup-v2.txt
index 31d1f7b..65b3eac 100644
--- a/Documentation/cgroup-v2.txt
+++ b/Documentation/cgroup-v2.txt
@@ -819,6 +819,78 @@ PAGE_SIZE multiple when read back.
 		the cgroup.  This may not exactly match the number of
 		processes killed but should generally be close.
 
+  memory.stat
+
+	A read-only flat-keyed file which exists on non-root cgroups.
+
+	This breaks down the cgroup's memory footprint into different
+	types of memory, type-specific details, and other information
+	on the state and past events of the memory management system.
+
+	All memory amounts are in bytes.
+
+	The entries are ordered to be human readable, and new entries
+	can show up in the middle. Don't rely on items remaining in a
+	fixed position; use the keys to look up specific values!
+
+	  anon
+
+		Amount of memory used in anonymous mappings such as
+		brk(), sbrk(), and mmap(MAP_ANONYMOUS)
+
+	  file
+
+		Amount of memory used to cache filesystem data,
+		including tmpfs and shared memory.
+
+	  file_mapped
+
+		Amount of cached filesystem data mapped with mmap()
+
+	  file_dirty
+
+		Amount of cached filesystem data that was modified but
+		not yet written back to disk
+
+	  file_writeback
+
+		Amount of cached filesystem data that was modified and
+		is currently being written back to disk
+
+	  inactive_anon
+	  active_anon
+	  inactive_file
+	  active_file
+	  unevictable
+
+		Amount of memory, swap-backed and filesystem-backed,
+		on the internal memory management lists used by the
+		page reclaim algorithm
+
+	  pgfault
+
+		Total number of page faults incurred
+
+	  pgmajfault
+
+		Number of major page faults incurred
+
+  memory.swap.current
+
+	A read-only single value file which exists on non-root
+	cgroups.
+
+	The total amount of swap currently being used by the cgroup
+	and its descendants.
+
+  memory.swap.max
+
+	A read-write single value file which exists on non-root
+	cgroups.  The default is "max".
+
+	Swap usage hard limit.  If a cgroup's swap usage reaches this
+	limit, anonymous meomry of the cgroup will not be swapped out.
+
 
 5-2-2. General Usage
 
@@ -1291,3 +1363,20 @@ allocation from the slack available in other groups or the rest of the
 system than killing the group.  Otherwise, memory.max is there to
 limit this type of spillover and ultimately contain buggy or even
 malicious applications.
+
+The combined memory+swap accounting and limiting is replaced by real
+control over swap space.
+
+The main argument for a combined memory+swap facility in the original
+cgroup design was that global or parental pressure would always be
+able to swap all anonymous memory of a child group, regardless of the
+child's own (possibly untrusted) configuration.  However, untrusted
+groups can sabotage swapping by other means - such as referencing its
+anonymous memory in a tight loop - and an admin can not assume full
+swappability when overcommitting untrusted jobs.
+
+For trusted jobs, on the other hand, a combined counter is not an
+intuitive userspace interface, and it flies in the face of the idea
+that cgroup controllers should account and limit specific physical
+resources.  Swap space is a resource like all others in the system,
+and that's why unified hierarchy allows distributing it separately.

Documentation/features/io/dma_map_attrs/arch-support.txt

View before deletion

diff --git a/Documentation/features/io/dma_map_attrs/arch-support.txt b/Documentation/features/io/dma_map_attrs/arch-support.txt
deleted file mode 100644
index 51d0f1c..0000000
--- a/Documentation/features/io/dma_map_attrs/arch-support.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-#
-# Feature name:          dma_map_attrs
-#         Kconfig:       HAVE_DMA_ATTRS
-#         description:   arch provides dma_*map*_attrs() APIs
-#
-    -----------------------
-    |         arch |status|
-    -----------------------
-    |       alpha: |  ok  |
-    |         arc: | TODO |
-    |         arm: |  ok  |
-    |       arm64: |  ok  |
-    |       avr32: | TODO |
-    |    blackfin: | TODO |
-    |         c6x: | TODO |
-    |        cris: | TODO |
-    |         frv: | TODO |
-    |       h8300: |  ok  |
-    |     hexagon: |  ok  |
-    |        ia64: |  ok  |
-    |        m32r: | TODO |
-    |        m68k: | TODO |
-    |       metag: | TODO |
-    |  microblaze: |  ok  |
-    |        mips: |  ok  |
-    |     mn10300: | TODO |
-    |       nios2: | TODO |
-    |    openrisc: |  ok  |
-    |      parisc: | TODO |
-    |     powerpc: |  ok  |
-    |        s390: |  ok  |
-    |       score: | TODO |
-    |          sh: |  ok  |
-    |       sparc: |  ok  |
-    |        tile: |  ok  |
-    |          um: | TODO |
-    |   unicore32: |  ok  |
-    |         x86: |  ok  |
-    |      xtensa: | TODO |
-    -----------------------

Documentation/filesystems/vfat.txt

View file

diff --git a/Documentation/filesystems/vfat.txt b/Documentation/filesystems/vfat.txt
index ce1126a..223c321 100644
--- a/Documentation/filesystems/vfat.txt
+++ b/Documentation/filesystems/vfat.txt
@@ -180,6 +180,16 @@ dos1xfloppy  -- If set, use a fallback default BIOS Parameter Block
 
 <bool>: 0,1,yes,no,true,false
 
+LIMITATION
+---------------------------------------------------------------------
+* The fallocated region of file is discarded at umount/evict time
+  when using fallocate with FALLOC_FL_KEEP_SIZE.
+  So, User should assume that fallocated region can be discarded at
+  last close if there is memory pressure resulting in eviction of
+  the inode from the memory. As a result, for any dependency on
+  the fallocated region, user should make sure to recheck fallocate
+  after reopening the file.
+
 TODO
 ----------------------------------------------------------------------
 * Need to get rid of the raw scanning stuff.  Instead, always use

Documentation/kernel-parameters.txt

View file

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 3ea869d..cfb2c0f 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -611,6 +611,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 	cgroup.memory=	[KNL] Pass options to the cgroup memory controller.
 			Format: <string>
 			nosocket -- Disable socket memory accounting.
+			nokmem -- Disable kernel memory accounting.
 
 	checkreqprot	[SELINUX] Set initial checkreqprot flag value.
 			Format: { "0" | "1" }

Documentation/sysctl/kernel.txt

View file

diff --git a/Documentation/sysctl/kernel.txt b/Documentation/sysctl/kernel.txt
index 73c6b1e..a93b414 100644
--- a/Documentation/sysctl/kernel.txt
+++ b/Documentation/sysctl/kernel.txt
@@ -825,14 +825,13 @@ via the /proc/sys interface:
        Each write syscall must fully contain the sysctl value to be
        written, and multiple writes on the same sysctl file descriptor
        will rewrite the sysctl value, regardless of file position.
-   0 - (default) Same behavior as above, but warn about processes that
-       perform writes to a sysctl file descriptor when the file position
-       is not 0.
-   1 - Respect file position when writing sysctl strings. Multiple writes
-       will append to the sysctl value buffer. Anything past the max length
-       of the sysctl value buffer will be ignored. Writes to numeric sysctl
-       entries must always be at file position 0 and the value must be
-       fully contained in the buffer sent in the write syscall.
+   0 - Same behavior as above, but warn about processes that perform writes
+       to a sysctl file descriptor when the file position is not 0.
+   1 - (default) Respect file position when writing sysctl strings. Multiple
+       writes will append to the sysctl value buffer. Anything past the max
+       length of the sysctl value buffer will be ignored. Writes to numeric
+       sysctl entries must always be at file position 0 and the value must
+       be fully contained in the buffer sent in the write syscall.
 
 ==============================================================
 

Documentation/ubsan.txt

View file

diff --git a/Documentation/ubsan.txt b/Documentation/ubsan.txt
new file mode 100644
index 0000000..f58215e
--- /dev/null
+++ b/Documentation/ubsan.txt
@@ -0,0 +1,84 @@
+Undefined Behavior Sanitizer - UBSAN
+
+Overview
+--------
+
+UBSAN is a runtime undefined behaviour checker.
+
+UBSAN uses compile-time instrumentation to catch undefined behavior (UB).
+Compiler inserts code that perform certain kinds of checks before operations
+that may cause UB. If check fails (i.e. UB detected) __ubsan_handle_*
+function called to print error message.
+
+GCC has that feature since 4.9.x [1] (see -fsanitize=undefined option and
+its suboptions). GCC 5.x has more checkers implemented [2].
+
+Report example
+---------------
+
+	 ================================================================================
+	 UBSAN: Undefined behaviour in ../include/linux/bitops.h:110:33
+	 shift exponent 32 is to large for 32-bit type 'unsigned int'
+	 CPU: 0 PID: 0 Comm: swapper Not tainted 4.4.0-rc1+ #26
+	  0000000000000000 ffffffff82403cc8 ffffffff815e6cd6 0000000000000001
+	  ffffffff82403cf8 ffffffff82403ce0 ffffffff8163a5ed 0000000000000020
+	  ffffffff82403d78 ffffffff8163ac2b ffffffff815f0001 0000000000000002
+	 Call Trace:
+	  [<ffffffff815e6cd6>] dump_stack+0x45/0x5f
+	  [<ffffffff8163a5ed>] ubsan_epilogue+0xd/0x40
+	  [<ffffffff8163ac2b>] __ubsan_handle_shift_out_of_bounds+0xeb/0x130
+	  [<ffffffff815f0001>] ? radix_tree_gang_lookup_slot+0x51/0x150
+	  [<ffffffff8173c586>] _mix_pool_bytes+0x1e6/0x480
+	  [<ffffffff83105653>] ? dmi_walk_early+0x48/0x5c
+	  [<ffffffff8173c881>] add_device_randomness+0x61/0x130
+	  [<ffffffff83105b35>] ? dmi_save_one_device+0xaa/0xaa
+	  [<ffffffff83105653>] dmi_walk_early+0x48/0x5c
+	  [<ffffffff831066ae>] dmi_scan_machine+0x278/0x4b4
+	  [<ffffffff8111d58a>] ? vprintk_default+0x1a/0x20
+	  [<ffffffff830ad120>] ? early_idt_handler_array+0x120/0x120
+	  [<ffffffff830b2240>] setup_arch+0x405/0xc2c
+	  [<ffffffff830ad120>] ? early_idt_handler_array+0x120/0x120
+	  [<ffffffff830ae053>] start_kernel+0x83/0x49a
+	  [<ffffffff830ad120>] ? early_idt_handler_array+0x120/0x120
+	  [<ffffffff830ad386>] x86_64_start_reservations+0x2a/0x2c
+	  [<ffffffff830ad4f3>] x86_64_start_kernel+0x16b/0x17a
+	 ================================================================================
+
+Usage
+-----
+
+To enable UBSAN configure kernel with:
+
+	CONFIG_UBSAN=y
+
+and to check the entire kernel:
+
+        CONFIG_UBSAN_SANITIZE_ALL=y
+
+To enable instrumentation for specific files or directories, add a line
+similar to the following to the respective kernel Makefile:
+
+        For a single file (e.g. main.o):
+                UBSAN_SANITIZE_main.o := y
+
+        For all files in one directory:
+                UBSAN_SANITIZE := y
+
+To exclude files from being instrumented even if
+CONFIG_UBSAN_SANITIZE_ALL=y, use:
+
+                UBSAN_SANITIZE_main.o := n
+        and:
+                UBSAN_SANITIZE := n
+
+Detection of unaligned accesses controlled through the separate option -
+CONFIG_UBSAN_ALIGNMENT. It's off by default on architectures that support
+unaligned accesses (CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y). One could
+still enable it in config, just note that it will produce a lot of UBSAN
+reports.
+
+References
+----------
+
+[1] - https://gcc.gnu.org/onlinedocs/gcc-4.9.0/gcc/Debugging-Options.html
+[2] - https://gcc.gnu.org/onlinedocs/gcc/Debugging-Options.html

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 84e08e6..45d2717 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -781,6 +781,7 @@ F:	sound/aoa/
 APM DRIVER
 M:	Jiri Kosina <[email protected]>
 S:	Odd fixes
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/apm.git
 F:	arch/x86/kernel/apm_32.c
 F:	include/linux/apm_bios.h
 F:	include/uapi/linux/apm_bios.h
@@ -946,6 +947,7 @@ M:	Alexandre Belloni <[email protected]>
 M:	Jean-Christophe Plagniol-Villard <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 W:	http://www.linux4sam.org
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nferre/linux-at91.git
 S:	Supported
 F:	arch/arm/mach-at91/
 F:	include/soc/at91/
@@ -1464,6 +1466,7 @@ ARM/Rockchip SoC support
 M:	Heiko Stuebner <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git
 S:	Maintained
 F:	arch/arm/boot/dts/rk3*
 F:	arch/arm/mach-rockchip/
@@ -1796,6 +1799,7 @@ ARM64 PORT (AARCH64 ARCHITECTURE)
 M:	Catalin Marinas <[email protected]>
 M:	Will Deacon <[email protected]>
 L:	[email protected] (moderated for non-subscribers)
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux.git
 S:	Maintained
 F:	arch/arm64/
 F:	Documentation/arm64/
@@ -1881,7 +1885,7 @@ ATHEROS ATH6KL WIRELESS DRIVER
 M:	Kalle Valo <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/ath6kl
-T:	git git://github.com/kvalo/ath.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 S:	Supported
 F:	drivers/net/wireless/ath/ath6kl/
 
@@ -2133,6 +2137,7 @@ F:	drivers/net/wireless/broadcom/b43legacy/
 BACKLIGHT CLASS/SUBSYSTEM
 M:	Jingoo Han <[email protected]>
 M:	Lee Jones <[email protected]>
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git
 S:	Maintained
 F:	drivers/video/backlight/
 F:	include/linux/backlight.h
@@ -2815,6 +2820,7 @@ F:	drivers/input/touchscreen/chipone_icn8318.c
 CHROME HARDWARE PLATFORM SUPPORT
 M:	Olof Johansson <[email protected]>
 S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/olof/chrome-platform.git
 F:	drivers/platform/chrome/
 
 CISCO VIC ETHERNET NIC DRIVER
@@ -3113,6 +3119,7 @@ M:	Mikael Starvik <[email protected]>
 M:	Jesper Nilsson <[email protected]>
 L:	[email protected]
 W:	http://developer.axis.com
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jesper/cris.git
 S:	Maintained
 F:	arch/cris/
 F:	drivers/tty/serial/crisv10.*
@@ -3121,6 +3128,7 @@ CRYPTO API
 M:	Herbert Xu <[email protected]>
 M:	"David S. Miller" <[email protected]>
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git
 S:	Maintained
 F:	Documentation/crypto/
@@ -3583,7 +3591,7 @@ M:	Christine Caulfield <[email protected]>
 M:	David Teigland <[email protected]>
 L:	[email protected]
 W:	http://sources.redhat.com/cluster/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git
 S:	Supported
 F:	fs/dlm/
 
@@ -3997,6 +4005,7 @@ M:	Tyler Hicks <[email protected]>
 L:	[email protected]
 W:	http://ecryptfs.org
 W:	https://launchpad.net/ecryptfs
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git
 S:	Supported
 F:	Documentation/filesystems/ecryptfs.txt
 F:	fs/ecryptfs/
@@ -4275,6 +4284,7 @@ M:	Andreas Dilger <[email protected]>
 L:	[email protected]
 W:	http://ext4.wiki.kernel.org
 Q:	http://patchwork.ozlabs.org/project/linux-ext4/list/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git
 S:	Maintained
 F:	Documentation/filesystems/ext4.txt
 F:	fs/ext4/
@@ -4957,6 +4967,7 @@ F:	include/linux/hw_random.h
 HARDWARE SPINLOCK CORE
 M:	Ohad Ben-Cohen <[email protected]>
 S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/ohad/hwspinlock.git
 F:	Documentation/hwspinlock.txt
 F:	drivers/hwspinlock/hwspinlock_*
 F:	include/linux/hwspinlock.h
@@ -5495,6 +5506,7 @@ M:	Dmitry Kasatkin <[email protected]>
 L:	[email protected]
 L:	[email protected]
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity.git
 S:	Supported
 F:	security/integrity/ima/
 
@@ -5750,11 +5762,11 @@ F:	include/linux/mic_bus.h
 F:	include/linux/scif.h
 F:	include/uapi/linux/mic_common.h
 F: 	include/uapi/linux/mic_ioctl.h
-F	include/uapi/linux/scif_ioctl.h
+F:	include/uapi/linux/scif_ioctl.h
 F:	drivers/misc/mic/
 F:	drivers/dma/mic_x100_dma.c
 F:	drivers/dma/mic_x100_dma.h
-F	Documentation/mic/
+F:	Documentation/mic/
 
 INTEL PMC/P-Unit IPC DRIVER
 M:	Zha Qipeng<[email protected]>
@@ -5835,6 +5847,8 @@ M:	Julian Anastasov <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Maintained
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git
 F:	Documentation/networking/ipvs-sysctl.txt
 F:	include/net/ip_vs.h
 F:	include/uapi/linux/ip_vs.h
@@ -6118,6 +6132,7 @@ M:	"J. Bruce Fields" <[email protected]>
 M:	Jeff Layton <[email protected]>
 L:	[email protected]
 W:	http://nfs.sourceforge.net/
+T:	git git://linux-nfs.org/~bfields/linux.git
 S:	Supported
 F:	fs/nfsd/
 F:	include/uapi/linux/nfsd/
@@ -6174,6 +6189,7 @@ M:	Christian Borntraeger <[email protected]>
 M:	Cornelia Huck <[email protected]>
 L:	[email protected]
 W:	http://www.ibm.com/developerworks/linux/linux390/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git
 S:	Supported
 F:	Documentation/s390/kvm.txt
 F:	arch/s390/include/asm/kvm*
@@ -6247,6 +6263,7 @@ KGDB / KDB /debug_core
 M:	Jason Wessel <[email protected]>
 W:	http://kgdb.wiki.kernel.org/
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jwessel/kgdb.git
 S:	Maintained
 F:	Documentation/DocBook/kgdb.tmpl
 F:	drivers/misc/kgdbts.c
@@ -6418,6 +6435,7 @@ LIBNVDIMM: NON-VOLATILE MEMORY DEVICE SUBSYSTEM
 M:	Dan Williams <[email protected]>
 L:	[email protected]
 Q:	https://patchwork.kernel.org/project/linux-nvdimm/list/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git
 S:	Supported
 F:	drivers/nvdimm/*
 F:	include/linux/nd.h
@@ -7087,6 +7105,7 @@ F:	Documentation/hwmon/menf21bmc
 METAG ARCHITECTURE
 M:	James Hogan <[email protected]>
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/jhogan/metag.git
 S:	Odd Fixes
 F:	arch/metag/
 F:	Documentation/metag/
@@ -7568,7 +7587,8 @@ NETWORKING DRIVERS (WIRELESS)
 M:	Kalle Valo <[email protected]>
 L:	[email protected]
 Q:	http://patchwork.kernel.org/project/linux-wireless/list/
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next.git
 S:	Maintained
 F:	drivers/net/wireless/
 
@@ -7974,6 +7994,7 @@ M:	Mark Rutland <[email protected]>
 M:	Ian Campbell <[email protected]>
 M:	Kumar Gala <[email protected]>
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git
 S:	Maintained
 F:	Documentation/devicetree/
 F:	arch/*/boot/dts/
@@ -8364,7 +8385,7 @@ PCMCIA SUBSYSTEM
 P:	Linux PCMCIA Team
 L:	[email protected]
 W:	http://lists.infradead.org/mailman/listinfo/linux-pcmcia
-T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia-2.6.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/pcmcia.git
 S:	Maintained
 F:	Documentation/pcmcia/
 F:	drivers/pcmcia/
@@ -8686,7 +8707,7 @@ M:	Colin Cross <[email protected]>
 M:	Kees Cook <[email protected]>
 M:	Tony Luck <[email protected]>
 S:	Maintained
-T:	git git://git.infradead.org/users/cbou/linux-pstore.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux.git
 F:	fs/pstore/
 F:	include/linux/pstore*
 F:	drivers/firmware/efi/efi-pstore.c
@@ -8895,13 +8916,14 @@ QUALCOMM ATHEROS ATH10K WIRELESS DRIVER
 M:	Kalle Valo <[email protected]>
 L:	[email protected]
 W:	http://wireless.kernel.org/en/users/Drivers/ath10k
-T:	git git://github.com/kvalo/ath.git
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git
 S:	Supported
 F:	drivers/net/wireless/ath/ath10k/
 
 QUALCOMM HEXAGON ARCHITECTURE
 M:	Richard Kuo <[email protected]>
 L:	[email protected]
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux-hexagon-kernel.git
 S:	Supported
 F:	arch/hexagon/
 
@@ -9100,6 +9122,7 @@ F:	drivers/phy/phy-rcar-gen3-usb2.c
 
 RESET CONTROLLER FRAMEWORK
 M:	Philipp Zabel <[email protected]>
+T:	git git://git.pengutronix.de/git/pza/linux
 S:	Maintained
 F:	drivers/reset/
 F:	Documentation/devicetree/bindings/reset/
@@ -9247,6 +9270,7 @@ M:	Martin Schwidefsky <[email protected]>
 M:	Heiko Carstens <[email protected]>
 L:	[email protected]
 W:	http://www.ibm.com/developerworks/linux/linux390/
+T:	git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git
 S:	Supported
 F:	arch/s390/
 F:	drivers/s390/
@@ -9439,7 +9463,7 @@ M:	Lukasz Majewski <[email protected]>
 L:	[email protected]
 L:	[email protected]
 S:	Supported
-T:	https://github.com/lmajewski/linux-samsung-thermal.git
+T:	git https://github.com/lmajewski/linux-samsung-thermal.git
 F:	drivers/thermal/samsung/
 
 SAMSUNG USB2 PHY DRIVER
@@ -10092,6 +10116,7 @@ F:	drivers/media/pci/solo6x10/