Merge branch 'akpm' (patches from Andrew)

33e247c7 · Linus Torvalds <[email protected]> · 2015-09-10 18:19:42 -07:00

Merge third patch-bomb from Andrew Morton:

 - even more of the rest of MM

 - lib/ updates

 - checkpatch updates

 - small changes to a few scruffy filesystems

 - kmod fixes/cleanups

 - kexec updates

 - a dma-mapping cleanup series from hch

* emailed patches from Andrew Morton <[email protected]>: (81 commits)
  dma-mapping: consolidate dma_set_mask
  dma-mapping: consolidate dma_supported
  dma-mapping: cosolidate dma_mapping_error
  dma-mapping: consolidate dma_{alloc,free}_noncoherent
  dma-mapping: consolidate dma_{alloc,free}_{attrs,coherent}
  mm: use vma_is_anonymous() in create_huge_pmd() and wp_huge_pmd()
  mm: make sure all file VMAs have ->vm_ops set
  mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
  mm: mark most vm_operations_struct const
  namei: fix warning while make xmldocs caused by namei.c
  ipc: convert invalid scenarios to use WARN_ON
  zlib_deflate/deftree: remove bi_reverse()
  lib/decompress_unlzma: Do a NULL check for pointer
  lib/decompressors: use real out buf size for gunzip with kernel
  fs/affs: make root lookup from blkdev logical size
  sysctl: fix int -> unsigned long assignments in INT_MIN case
  kexec: export KERNEL_IMAGE_SIZE to vmcoreinfo
  kexec: align crash_notes allocation to make it be inside one physical page
  kexec: remove unnecessary test in kimage_alloc_crash_control_pages()
  kexec: split kexec_load syscall from kexec core code
  ...

Commit: 33e247c7e58d335d70ecb84fd869091e2e4b8dcb
Parents: d71fc239 · 452e06af

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

Changes

165 files changed · +4886 −4471

File	Status	Add	Del	Content
CREDITS	modified	+4	−0	View file
Documentation/vm/00-INDEX	modified	+2	−0	View file
Documentation/vm/idle_page_tracking.txt	added	+98	−0	View file
Documentation/vm/pagemap.txt	modified	+12	−1	View file
Documentation/vm/zswap.txt	modified	+28	−8	View file
MAINTAINERS	modified	+1	−2	View file
arch/Kconfig	modified	+3	−0	View file
arch/alpha/include/asm/dma-mapping.h	modified	+0	−36	View file
arch/alpha/kernel/pci-noop.c	modified	+0	−10	View file
arch/alpha/kernel/pci_iommu.c	modified	+0	−11	View file
arch/arm/Kconfig	modified	+1	−0	View file
arch/arm/boot/compressed/decompress.c	modified	+1	−1	View file
arch/arm/include/asm/dma-mapping.h	modified	+8	−60	View file
arch/arm/mm/dma-mapping.c	modified	+0	−12	View file
arch/arm64/include/asm/dma-mapping.h	modified	+0	−69	View file
arch/h8300/boot/compressed/misc.c	modified	+1	−1	View file
arch/h8300/include/asm/dma-mapping.h	modified	+0	−44	View file
arch/hexagon/include/asm/dma-mapping.h	modified	+2	−47	View file
arch/hexagon/kernel/dma.c	modified	+0	−11	View file
arch/ia64/Kconfig	modified	+1	−0	View file
arch/ia64/include/asm/dma-mapping.h	modified	+0	−50	View file
arch/m32r/boot/compressed/misc.c	modified	+2	−1	View file
arch/m68k/Kconfig	modified	+1	−0	View file
arch/microblaze/include/asm/dma-mapping.h	modified	+0	−70	View file
arch/mips/Kconfig	modified	+1	−0	View file
arch/mips/boot/compressed/decompress.c	modified	+2	−2	View file
arch/mips/cavium-octeon/dma-octeon.c	modified	+0	−8	View file
arch/mips/include/asm/dma-mapping.h	modified	+0	−67	View file
arch/mips/loongson64/common/dma-swiotlb.c	modified	+3	−8	View file
arch/mips/mm/dma-default.c	modified	+12	−9	View file
arch/mips/netlogic/common/nlm-dma.c	modified	+0	−10	View file
arch/openrisc/include/asm/dma-mapping.h	modified	+2	−65	View file
arch/powerpc/Kconfig	modified	+1	−0	View file
arch/powerpc/include/asm/dma-mapping.h	modified	+5	−63	View file
arch/s390/Kconfig	modified	+1	−0	View file
arch/s390/boot/compressed/misc.c	modified	+1	−1	View file
arch/s390/include/asm/dma-mapping.h	modified	+0	−55	View file
arch/s390/pci/pci_dma.c	modified	+0	−10	View file
arch/sh/Kconfig	modified	+1	−0	View file
arch/sh/boot/compressed/misc.c	modified	+1	−1	View file
arch/sh/include/asm/dma-mapping.h	modified	+2	−75	View file
arch/sparc/include/asm/dma-mapping.h	modified	+4	−36	View file
arch/tile/Kconfig	modified	+1	−0	View file
arch/tile/include/asm/dma-mapping.h	modified	+2	−43	View file
arch/unicore32/boot/compressed/misc.c	modified	+2	−2	View file
arch/unicore32/include/asm/dma-mapping.h	modified	+0	−57	View file
arch/x86/Kconfig	modified	+2	−1	View file
arch/x86/boot/compressed/misc.c	modified	+2	−1	View file
arch/x86/boot/header.S	modified	+1	−1	View file
arch/x86/entry/vsyscall/vsyscall_64.c	modified	+1	−1	View file
arch/x86/include/asm/dma-mapping.h	modified	+5	−29	View file
arch/x86/include/asm/kdebug.h	modified	+1	−1	View file
arch/x86/kernel/Makefile	modified	+2	−2	View file
arch/x86/kernel/kvmclock.c	modified	+2	−2	View file
arch/x86/kernel/pci-dma.c	modified	+9	−51	View file
arch/x86/kernel/reboot.c	modified	+2	−2	View file
arch/x86/kernel/setup.c	modified	+1	−1	View file
arch/x86/kernel/vmlinux.lds.S	modified	+1	−1	View file
arch/x86/kvm/vmx.c	modified	+4	−4	View file
arch/x86/mm/mpx.c	modified	+7	−44	View file
arch/x86/platform/efi/efi.c	modified	+2	−2	View file
arch/x86/platform/uv/uv_nmi.c	modified	+3	−3	View file
arch/xtensa/include/asm/dma-mapping.h	modified	+0	−60	View file
drivers/android/binder.c	modified	+1	−1	View file
drivers/crypto/qat/qat_common/adf_transport_debug.c	modified	+2	−14	View file
drivers/firmware/efi/Kconfig	modified	+1	−1	View file
drivers/gpu/drm/vgem/vgem_drv.c	modified	+1	−1	View file
drivers/hsi/clients/cmt_speech.c	modified	+1	−1	View file
drivers/infiniband/hw/qib/qib_file_ops.c	modified	+1	−1	View file
drivers/infiniband/hw/qib/qib_mmap.c	modified	+1	−1	View file
drivers/media/platform/omap/omap_vout.c	modified	+1	−1	View file
drivers/misc/genwqe/card_dev.c	modified	+1	−1	View file
drivers/net/wireless/ath/wil6210/debugfs.c	modified	+7	−28	View file
drivers/parisc/ccio-dma.c	modified	+3	−10	View file
drivers/parisc/sba_iommu.c	modified	+2	−7	View file
drivers/pci/pci-driver.c	modified	+1	−1	View file
drivers/s390/crypto/zcrypt_api.c	modified	+1	−9	View file
drivers/staging/android/ion/ion.c	modified	+1	−1	View file
drivers/staging/comedi/comedi_fops.c	modified	+1	−1	View file
drivers/video/fbdev/omap2/omapfb/omapfb-main.c	modified	+1	−1	View file
drivers/xen/gntalloc.c	modified	+1	−1	View file
drivers/xen/gntdev.c	modified	+1	−1	View file
drivers/xen/privcmd.c	modified	+2	−2	View file
drivers/xen/swiotlb-xen.c	modified	+0	−6	View file
fs/affs/super.c	modified	+5	−3	View file
fs/ceph/addr.c	modified	+1	−1	View file
fs/cifs/file.c	modified	+1	−1	View file
fs/coda/upcall.c	modified	+3	−3	View file
fs/coredump.c	modified	+38	−8	View file
fs/hfs/bnode.c	modified	+4	−5	View file
fs/hfs/brec.c	modified	+11	−9	View file
fs/hfsplus/bnode.c	modified	+0	−3	View file
fs/namei.c	modified	+1	−1	View file
fs/proc/base.c	modified	+45	−68	View file
fs/proc/generic.c	modified	+22	−22	View file
fs/proc/page.c	modified	+65	−0	View file
fs/proc/task_mmu.c	modified	+4	−1	View file
fs/seq_file.c	modified	+42	−0	View file
include/asm-generic/dma-mapping-common.h	modified	+118	−0	View file
include/linux/kexec.h	modified	+14	−3	View file
include/linux/kmod.h	modified	+0	−2	View file
include/linux/memcontrol.h	modified	+2	−8	View file
include/linux/mm.h	modified	+10	−2	View file
include/linux/mmu_notifier.h	modified	+46	−0	View file
include/linux/page-flags.h	modified	+11	−0	View file
include/linux/page_ext.h	modified	+4	−0	View file
include/linux/page_idle.h	added	+110	−0	View file
include/linux/poison.h	modified	+2	−9	View file
include/linux/printk.h	modified	+10	−4	View file
include/linux/seq_file.h	modified	+4	−0	View file
include/linux/string_helpers.h	modified	+7	−7	View file
include/linux/zpool.h	modified	+2	−0	View file
include/uapi/linux/kernel-page-flags.h	modified	+1	−0	View file
init/initramfs.c	modified	+2	−2	View file
init/main.c	modified	+0	−1	View file
ipc/msgutil.c	modified	+1	−1	View file
ipc/shm.c	modified	+2	−2	View file
kernel/Makefile	modified	+2	−0	View file
kernel/cred.c	modified	+9	−4	View file
kernel/events/core.c	modified	+1	−1	View file
kernel/extable.c	modified	+0	−1	View file
kernel/kexec.c	modified	+121	−2646	View file
kernel/kexec_core.c	added	+1534	−0	View file
kernel/kexec_file.c	added	+1045	−0	View file
kernel/kexec_internal.h	added	+22	−0	View file
kernel/kmod.c	modified	+54	−46	View file
kernel/ksysfs.c	modified	+3	−3	View file
kernel/printk/printk.c	modified	+1	−1	View file
kernel/reboot.c	modified	+1	−1	View file
kernel/sysctl.c	modified	+6	−6	View file
lib/bitmap.c	modified	+26	−17	View file
lib/decompress_bunzip2.c	modified	+3	−3	View file
lib/decompress_inflate.c	modified	+26	−5	View file
lib/decompress_unlz4.c	modified	+3	−3	View file
lib/decompress_unlzma.c	modified	+4	−5	View file
lib/decompress_unlzo.c	modified	+12	−1	View file
lib/decompress_unxz.c	modified	+11	−1	View file
lib/kstrtox.c	modified	+1	−1	View file
lib/string_helpers.c	modified	+11	−9	View file
lib/test-kstrtox.c	modified	+1	−5	View file
lib/test_kasan.c	modified	+3	−3	View file
lib/zlib_deflate/deftree.c	modified	+3	−3	View file
lib/zlib_deflate/defutil.h	modified	+0	−16	View file
mm/Kconfig	modified	+12	−0	View file
mm/Makefile	modified	+1	−0	View file
mm/debug.c	modified	+4	−0	View file
mm/huge_memory.c	modified	+10	−2	View file
mm/hwpoison-inject.c	modified	+1	−4	View file
mm/kmemleak.c	modified	+6	−15	View file
mm/memcontrol.c	modified	+40	−36	View file
mm/memory-failure.c	modified	+2	−14	View file
mm/memory.c	modified	+2	−2	View file
mm/migrate.c	modified	+6	−0	View file
mm/mmap.c	modified	+12	−6	View file
mm/mmu_notifier.c	modified	+17	−0	View file
mm/nommu.c	modified	+10	−9	View file
mm/page_ext.c	modified	+4	−0	View file
mm/page_idle.c	added	+232	−0	View file
mm/rmap.c	modified	+6	−0	View file
mm/swap.c	modified	+3	−0	View file
mm/zpool.c	modified	+33	−0	View file
mm/zswap.c	modified	+533	−155	View file
scripts/checkpatch.pl	modified	+147	−38	View file
security/selinux/selinuxfs.c	modified	+1	−1	View file
virt/kvm/kvm_main.c	modified	+31	−0	View file

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

CREDITS

View file

diff --git a/CREDITS b/CREDITS
index bcb8efa..8207cc6 100644
--- a/CREDITS
+++ b/CREDITS
@@ -2992,6 +2992,10 @@ S: 2200 Mission College Blvd
 S: Santa Clara, CA 95052
 S: USA
 
+N: Anil Ravindranath
+E: [email protected]
+D: PMC-Sierra MaxRAID driver
+
 N: Eric S. Raymond
 E: [email protected]
 W: http://www.tuxedo.org/~esr/

Documentation/vm/00-INDEX

View file

diff --git a/Documentation/vm/00-INDEX b/Documentation/vm/00-INDEX
index 081c497..6a5e2a1 100644
--- a/Documentation/vm/00-INDEX
+++ b/Documentation/vm/00-INDEX
@@ -14,6 +14,8 @@ hugetlbpage.txt
 	- a brief summary of hugetlbpage support in the Linux kernel.
 hwpoison.txt
 	- explains what hwpoison is
+idle_page_tracking.txt
+	- description of the idle page tracking feature.
 ksm.txt
 	- how to use the Kernel Samepage Merging feature.
 numa

Documentation/vm/idle_page_tracking.txt

View file

diff --git a/Documentation/vm/idle_page_tracking.txt b/Documentation/vm/idle_page_tracking.txt
new file mode 100644
index 0000000..85dcc3b
--- /dev/null
+++ b/Documentation/vm/idle_page_tracking.txt
@@ -0,0 +1,98 @@
+MOTIVATION
+
+The idle page tracking feature allows to track which memory pages are being
+accessed by a workload and which are idle. This information can be useful for
+estimating the workload's working set size, which, in turn, can be taken into
+account when configuring the workload parameters, setting memory cgroup limits,
+or deciding where to place the workload within a compute cluster.
+
+It is enabled by CONFIG_IDLE_PAGE_TRACKING=y.
+
+USER API
+
+The idle page tracking API is located at /sys/kernel/mm/page_idle. Currently,
+it consists of the only read-write file, /sys/kernel/mm/page_idle/bitmap.
+
+The file implements a bitmap where each bit corresponds to a memory page. The
+bitmap is represented by an array of 8-byte integers, and the page at PFN #i is
+mapped to bit #i%64 of array element #i/64, byte order is native. When a bit is
+set, the corresponding page is idle.
+
+A page is considered idle if it has not been accessed since it was marked idle
+(for more details on what "accessed" actually means see the IMPLEMENTATION
+DETAILS section). To mark a page idle one has to set the bit corresponding to
+the page by writing to the file. A value written to the file is OR-ed with the
+current bitmap value.
+
+Only accesses to user memory pages are tracked. These are pages mapped to a
+process address space, page cache and buffer pages, swap cache pages. For other
+page types (e.g. SLAB pages) an attempt to mark a page idle is silently ignored,
+and hence such pages are never reported idle.
+
+For huge pages the idle flag is set only on the head page, so one has to read
+/proc/kpageflags in order to correctly count idle huge pages.
+
+Reading from or writing to /sys/kernel/mm/page_idle/bitmap will return
+-EINVAL if you are not starting the read/write on an 8-byte boundary, or
+if the size of the read/write is not a multiple of 8 bytes. Writing to
+this file beyond max PFN will return -ENXIO.
+
+That said, in order to estimate the amount of pages that are not used by a
+workload one should:
+
+ 1. Mark all the workload's pages as idle by setting corresponding bits in
+    /sys/kernel/mm/page_idle/bitmap. The pages can be found by reading
+    /proc/pid/pagemap if the workload is represented by a process, or by
+    filtering out alien pages using /proc/kpagecgroup in case the workload is
+    placed in a memory cgroup.
+
+ 2. Wait until the workload accesses its working set.
+
+ 3. Read /sys/kernel/mm/page_idle/bitmap and count the number of bits set. If
+    one wants to ignore certain types of pages, e.g. mlocked pages since they
+    are not reclaimable, he or she can filter them out using /proc/kpageflags.
+
+See Documentation/vm/pagemap.txt for more information about /proc/pid/pagemap,
+/proc/kpageflags, and /proc/kpagecgroup.
+
+IMPLEMENTATION DETAILS
+
+The kernel internally keeps track of accesses to user memory pages in order to
+reclaim unreferenced pages first on memory shortage conditions. A page is
+considered referenced if it has been recently accessed via a process address
+space, in which case one or more PTEs it is mapped to will have the Accessed bit
+set, or marked accessed explicitly by the kernel (see mark_page_accessed()). The
+latter happens when:
+
+ - a userspace process reads or writes a page using a system call (e.g. read(2)
+   or write(2))
+
+ - a page that is used for storing filesystem buffers is read or written,
+   because a process needs filesystem metadata stored in it (e.g. lists a
+   directory tree)
+
+ - a page is accessed by a device driver using get_user_pages()
+
+When a dirty page is written to swap or disk as a result of memory reclaim or
+exceeding the dirty memory limit, it is not marked referenced.
+
+The idle memory tracking feature adds a new page flag, the Idle flag. This flag
+is set manually, by writing to /sys/kernel/mm/page_idle/bitmap (see the USER API
+section), and cleared automatically whenever a page is referenced as defined
+above.
+
+When a page is marked idle, the Accessed bit must be cleared in all PTEs it is
+mapped to, otherwise we will not be able to detect accesses to the page coming
+from a process address space. To avoid interference with the reclaimer, which,
+as noted above, uses the Accessed bit to promote actively referenced pages, one
+more page flag is introduced, the Young flag. When the PTE Accessed bit is
+cleared as a result of setting or updating a page's Idle flag, the Young flag
+is set on the page. The reclaimer treats the Young flag as an extra PTE
+Accessed bit and therefore will consider such a page as referenced.
+
+Since the idle memory tracking feature is based on the memory reclaimer logic,
+it only works with pages that are on an LRU list, other pages are silently
+ignored. That means it will ignore a user memory page if it is isolated, but
+since there are usually not many of them, it should not affect the overall
+result noticeably. In order not to stall scanning of the idle page bitmap,
+locked pages may be skipped too.

Documentation/vm/pagemap.txt

View file

diff --git a/Documentation/vm/pagemap.txt b/Documentation/vm/pagemap.txt
index 3cd3843..0e1e555 100644
--- a/Documentation/vm/pagemap.txt
+++ b/Documentation/vm/pagemap.txt
@@ -5,7 +5,7 @@ pagemap is a new (as of 2.6.25) set of interfaces in the kernel that allow
 userspace programs to examine the page tables and related information by
 reading files in /proc.
 
-There are three components to pagemap:
+There are four components to pagemap:
 
  * /proc/pid/pagemap.  This file lets a userspace process find out which
    physical frame each virtual page is mapped to.  It contains one 64-bit
@@ -70,6 +70,11 @@ There are three components to pagemap:
     22. THP
     23. BALLOON
     24. ZERO_PAGE
+    25. IDLE
+
+ * /proc/kpagecgroup.  This file contains a 64-bit inode number of the
+   memory cgroup each page is charged to, indexed by PFN. Only available when
+   CONFIG_MEMCG is set.
 
 Short descriptions to the page flags:
 
@@ -116,6 +121,12 @@ Short descriptions to the page flags:
 24. ZERO_PAGE
     zero page for pfn_zero or huge_zero page
 
+25. IDLE
+    page has not been accessed since it was marked idle (see
+    Documentation/vm/idle_page_tracking.txt). Note that this flag may be
+    stale in case the page was accessed via a PTE. To make sure the flag
+    is up-to-date one has to read /sys/kernel/mm/page_idle/bitmap first.
+
     [IO related page flags]
  1. ERROR     IO error occurred
  3. UPTODATE  page has up-to-date data

Documentation/vm/zswap.txt

View file

diff --git a/Documentation/vm/zswap.txt b/Documentation/vm/zswap.txt
index 8458c08..89fff7d 100644
--- a/Documentation/vm/zswap.txt
+++ b/Documentation/vm/zswap.txt
@@ -32,7 +32,7 @@ can also be enabled and disabled at runtime using the sysfs interface.
 An example command to enable zswap at runtime, assuming sysfs is mounted
 at /sys, is:
 
-echo 1 > /sys/modules/zswap/parameters/enabled
+echo 1 > /sys/module/zswap/parameters/enabled
 
 When zswap is disabled at runtime it will stop storing pages that are
 being swapped out.  However, it will _not_ immediately write out or fault
@@ -49,14 +49,26 @@ Zswap receives pages for compression through the Frontswap API and is able to
 evict pages from its own compressed pool on an LRU basis and write them back to
 the backing swap device in the case that the compressed pool is full.
 
-Zswap makes use of zbud for the managing the compressed memory pool.  Each
-allocation in zbud is not directly accessible by address.  Rather, a handle is
+Zswap makes use of zpool for the managing the compressed memory pool.  Each
+allocation in zpool is not directly accessible by address.  Rather, a handle is
 returned by the allocation routine and that handle must be mapped before being
 accessed.  The compressed memory pool grows on demand and shrinks as compressed
-pages are freed.  The pool is not preallocated.
+pages are freed.  The pool is not preallocated.  By default, a zpool of type
+zbud is created, but it can be selected at boot time by setting the "zpool"
+attribute, e.g. zswap.zpool=zbud.  It can also be changed at runtime using the
+sysfs "zpool" attribute, e.g.
+
+echo zbud > /sys/module/zswap/parameters/zpool
+
+The zbud type zpool allocates exactly 1 page to store 2 compressed pages, which
+means the compression ratio will always be 2:1 or worse (because of half-full
+zbud pages).  The zsmalloc type zpool has a more complex compressed page
+storage method, and it can achieve greater storage densities.  However,
+zsmalloc does not implement compressed page eviction, so once zswap fills it
+cannot evict the oldest page, it can only reject new pages.
 
 When a swap page is passed from frontswap to zswap, zswap maintains a mapping
-of the swap entry, a combination of the swap type and swap offset, to the zbud
+of the swap entry, a combination of the swap type and swap offset, to the zpool
 handle that references that compressed swap page.  This mapping is achieved
 with a red-black tree per swap type.  The swap offset is the search key for the
 tree nodes.
@@ -74,9 +86,17 @@ controlled policy:
 * max_pool_percent - The maximum percentage of memory that the compressed
     pool can occupy.
 
-Zswap allows the compressor to be selected at kernel boot time by setting the
-“compressor” attribute.  The default compressor is lzo.  e.g.
-zswap.compressor=deflate
+The default compressor is lzo, but it can be selected at boot time by setting
+the “compressor” attribute, e.g. zswap.compressor=lzo.  It can also be changed
+at runtime using the sysfs "compressor" attribute, e.g.
+
+echo lzo > /sys/module/zswap/parameters/compressor
+
+When the zpool and/or compressor parameter is changed at runtime, any existing
+compressed pages are not modified; they are left in their own zpool.  When a
+request is made for a page in an old zpool, it is uncompressed using its
+original compressor.  Once all pages are removed from an old zpool, the zpool
+and its compressor are freed.
 
 A debugfs interface is provided for various statistic about pool size, number
 of pages stored, and various counters for the reasons pages are rejected.

MAINTAINERS

View file

diff --git a/MAINTAINERS b/MAINTAINERS
index 67a4443..310da42 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8199,10 +8199,9 @@ F:	drivers/hwmon/pmbus/
 F:	include/linux/i2c/pmbus.h
 
 PMC SIERRA MaxRAID DRIVER
-M:	Anil Ravindranath <[email protected]>
 L:	[email protected]
 W:	http://www.pmc-sierra.com/
-S:	Supported
+S:	Orphan
 F:	drivers/scsi/pmcraid.*
 
 PMC SIERRA PM8001 DRIVER

arch/Kconfig

View file

diff --git a/arch/Kconfig b/arch/Kconfig
index 8f35649..4e949e5 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -2,6 +2,9 @@
 # General architecture dependent options
 #
 
+config KEXEC_CORE
+	bool
+
 config OPROFILE
 	tristate "OProfile system profiling"
 	depends on PROFILING

arch/alpha/include/asm/dma-mapping.h

View file

diff --git a/arch/alpha/include/asm/dma-mapping.h b/arch/alpha/include/asm/dma-mapping.h
index dfa32f0..72a8ca7 100644
--- a/arch/alpha/include/asm/dma-mapping.h
+++ b/arch/alpha/include/asm/dma-mapping.h
@@ -12,42 +12,6 @@ static inline struct dma_map_ops *get_dma_ops(struct device *dev)
 
 #include <asm-generic/dma-mapping-common.h>
 
-#define dma_alloc_coherent(d,s,h,f)	dma_alloc_attrs(d,s,h,f,NULL)
-
-static inline void *dma_alloc_attrs(struct device *dev, size_t size,
-				    dma_addr_t *dma_handle, gfp_t gfp,
-				    struct dma_attrs *attrs)
-{
-	return get_dma_ops(dev)->alloc(dev, size, dma_handle, gfp, attrs);
-}
-
-#define dma_free_coherent(d,s,c,h) dma_free_attrs(d,s,c,h,NULL)
-
-static inline void dma_free_attrs(struct device *dev, size_t size,
-				  void *vaddr, dma_addr_t dma_handle,
-				  struct dma_attrs *attrs)
-{
-	get_dma_ops(dev)->free(dev, size, vaddr, dma_handle, attrs);
-}
-
-static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-	return get_dma_ops(dev)->mapping_error(dev, dma_addr);
-}
-
-static inline int dma_supported(struct device *dev, u64 mask)
-{
-	return get_dma_ops(dev)->dma_supported(dev, mask);
-}
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-	return get_dma_ops(dev)->set_dma_mask(dev, mask);
-}
-
-#define dma_alloc_noncoherent(d, s, h, f)	dma_alloc_coherent(d, s, h, f)
-#define dma_free_noncoherent(d, s, v, h)	dma_free_coherent(d, s, v, h)
-
 #define dma_cache_sync(dev, va, size, dir)		  ((void)0)
 
 #endif	/* _ALPHA_DMA_MAPPING_H */

arch/alpha/kernel/pci-noop.c

View file

diff --git a/arch/alpha/kernel/pci-noop.c b/arch/alpha/kernel/pci-noop.c
index df24b76..2b1f4a1 100644
--- a/arch/alpha/kernel/pci-noop.c
+++ b/arch/alpha/kernel/pci-noop.c
@@ -166,15 +166,6 @@ static int alpha_noop_supported(struct device *dev, u64 mask)
 	return mask < 0x00ffffffUL ? 0 : 1;
 }
 
-static int alpha_noop_set_mask(struct device *dev, u64 mask)
-{
-	if (!dev->dma_mask || !dma_supported(dev, mask))
-		return -EIO;
-
-	*dev->dma_mask = mask;
-	return 0;
-}
-
 struct dma_map_ops alpha_noop_ops = {
 	.alloc			= alpha_noop_alloc_coherent,
 	.free			= alpha_noop_free_coherent,
@@ -182,7 +173,6 @@ struct dma_map_ops alpha_noop_ops = {
 	.map_sg			= alpha_noop_map_sg,
 	.mapping_error		= alpha_noop_mapping_error,
 	.dma_supported		= alpha_noop_supported,
-	.set_dma_mask		= alpha_noop_set_mask,
 };
 
 struct dma_map_ops *dma_ops = &alpha_noop_ops;

arch/alpha/kernel/pci_iommu.c

View file

diff --git a/arch/alpha/kernel/pci_iommu.c b/arch/alpha/kernel/pci_iommu.c
index eddee77..8969bf2 100644
--- a/arch/alpha/kernel/pci_iommu.c
+++ b/arch/alpha/kernel/pci_iommu.c
@@ -939,16 +939,6 @@ static int alpha_pci_mapping_error(struct device *dev, dma_addr_t dma_addr)
 	return dma_addr == 0;
 }
 
-static int alpha_pci_set_mask(struct device *dev, u64 mask)
-{
-	if (!dev->dma_mask ||
-	    !pci_dma_supported(alpha_gendev_to_pci(dev), mask))
-		return -EIO;
-
-	*dev->dma_mask = mask;
-	return 0;
-}
-
 struct dma_map_ops alpha_pci_ops = {
 	.alloc			= alpha_pci_alloc_coherent,
 	.free			= alpha_pci_free_coherent,
@@ -958,7 +948,6 @@ struct dma_map_ops alpha_pci_ops = {
 	.unmap_sg		= alpha_pci_unmap_sg,
 	.mapping_error		= alpha_pci_mapping_error,
 	.dma_supported		= alpha_pci_supported,
-	.set_dma_mask		= alpha_pci_set_mask,
 };
 
 struct dma_map_ops *dma_ops = &alpha_pci_ops;

arch/arm/Kconfig

View file

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 0d1b717..72ad724 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2020,6 +2020,7 @@ config KEXEC
 	bool "Kexec system call (EXPERIMENTAL)"
 	depends on (!SMP || PM_SLEEP_SMP)
 	depends on !CPU_V7M
+	select KEXEC_CORE
 	help
 	  kexec is a system call that implements the ability to shutdown your
 	  current kernel, and to start another kernel.  It is like a reboot

arch/arm/boot/compressed/decompress.c

View file

diff --git a/arch/arm/boot/compressed/decompress.c b/arch/arm/boot/compressed/decompress.c
index bd245d3..a0765e7 100644
--- a/arch/arm/boot/compressed/decompress.c
+++ b/arch/arm/boot/compressed/decompress.c
@@ -57,5 +57,5 @@ extern char * strstr(const char * s1, const char *s2);
 
 int do_decompress(u8 *input, int len, u8 *output, void (*error)(char *x))
 {
-	return decompress(input, len, NULL, NULL, output, NULL, error);
+	return __decompress(input, len, NULL, NULL, output, 0, NULL, error);
 }

arch/arm/include/asm/dma-mapping.h

View file

diff --git a/arch/arm/include/asm/dma-mapping.h b/arch/arm/include/asm/dma-mapping.h
index a68b9d8..ccb3aa6 100644
--- a/arch/arm/include/asm/dma-mapping.h
+++ b/arch/arm/include/asm/dma-mapping.h
@@ -8,7 +8,6 @@
 #include <linux/dma-attrs.h>
 #include <linux/dma-debug.h>
 
-#include <asm-generic/dma-coherent.h>
 #include <asm/memory.h>
 
 #include <xen/xen.h>
@@ -39,12 +38,15 @@ static inline void set_dma_ops(struct device *dev, struct dma_map_ops *ops)
 	dev->archdata.dma_ops = ops;
 }
 
-#include <asm-generic/dma-mapping-common.h>
+#define HAVE_ARCH_DMA_SUPPORTED 1
+extern int dma_supported(struct device *dev, u64 mask);
 
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-	return get_dma_ops(dev)->set_dma_mask(dev, mask);
-}
+/*
+ * Note that while the generic code provides dummy dma_{alloc,free}_noncoherent
+ * implementations, we don't provide a dma_cache_sync function so drivers using
+ * this API are highlighted with build warnings.
+ */
+#include <asm-generic/dma-mapping-common.h>
 
 #ifdef __arch_page_to_dma
 #error Please update to __arch_pfn_to_dma
@@ -167,32 +169,6 @@ static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 
 static inline void dma_mark_clean(void *addr, size_t size) { }
 
-/*
- * DMA errors are defined by all-bits-set in the DMA address.
- */
-static inline int dma_mapping_error(struct device *dev, dma_addr_t dma_addr)
-{
-	debug_dma_mapping_error(dev, dma_addr);
-	return dma_addr == DMA_ERROR_CODE;
-}
-
-/*
- * Dummy noncoherent implementation.  We don't provide a dma_cache_sync
- * function so drivers using this API are highlighted with build warnings.
- */
-static inline void *dma_alloc_noncoherent(struct device *dev, size_t size,
-		dma_addr_t *handle, gfp_t gfp)
-{
-	return NULL;
-}
-
-static inline void dma_free_noncoherent(struct device *dev, size_t size,
-		void *cpu_addr, dma_addr_t handle)
-{
-}
-
-extern int dma_supported(struct device *dev, u64 mask);
-
 extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
 
 /**
@@ -209,21 +185,6 @@ extern int arm_dma_set_mask(struct device *dev, u64 dma_mask);
 extern void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 			   gfp_t gfp, struct dma_attrs *attrs);
 
-#define dma_alloc_coherent(d, s, h, f) dma_alloc_attrs(d, s, h, f, NULL)
-
-static inline void *dma_alloc_attrs(struct device *dev, size_t size,
-				       dma_addr_t *dma_handle, gfp_t flag,
-				       struct dma_attrs *attrs)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-	void *cpu_addr;
-	BUG_ON(!ops);
-
-	cpu_addr = ops->alloc(dev, size, dma_handle, flag, attrs);
-	debug_dma_alloc_coherent(dev, size, *dma_handle, cpu_addr);
-	return cpu_addr;
-}
-
 /**
  * arm_dma_free - free memory allocated by arm_dma_alloc
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
@@ -241,19 +202,6 @@ static inline void *dma_alloc_attrs(struct device *dev, size_t size,
 extern void arm_dma_free(struct device *dev, size_t size, void *cpu_addr,
 			 dma_addr_t handle, struct dma_attrs *attrs);
 
-#define dma_free_coherent(d, s, c, h) dma_free_attrs(d, s, c, h, NULL)
-
-static inline void dma_free_attrs(struct device *dev, size_t size,
-				     void *cpu_addr, dma_addr_t dma_handle,
-				     struct dma_attrs *attrs)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-	BUG_ON(!ops);
-
-	debug_dma_free_coherent(dev, size, cpu_addr, dma_handle);
-	ops->free(dev, size, cpu_addr, dma_handle, attrs);
-}
-
 /**
  * arm_dma_mmap - map a coherent DMA allocation into user space
  * @dev: valid struct device pointer, or NULL for ISA and EISA-like devices

arch/arm/mm/dma-mapping.c

View file

diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index bf35abc..e626043 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -676,10 +676,6 @@ void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 		    gfp_t gfp, struct dma_attrs *attrs)
 {
 	pgprot_t prot = __get_dma_pgprot(attrs, PAGE_KERNEL);
-	void *memory;
-
-	if (dma_alloc_from_coherent(dev, size, handle, &memory))
-		return memory;
 
 	return __dma_alloc(dev, size, handle, gfp, prot, false,
 			   attrs, __builtin_return_address(0));
@@ -688,11 +684,6 @@ void *arm_dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
 static void *arm_coherent_dma_alloc(struct device *dev, size_t size,
 	dma_addr_t *handle, gfp_t gfp, struct dma_attrs *attrs)
 {
-	void *memory;
-
-	if (dma_alloc_from_coherent(dev, size, handle, &memory))
-		return memory;
-
 	return __dma_alloc(dev, size, handle, gfp, PAGE_KERNEL, true,
 			   attrs, __builtin_return_address(0));
 }
@@ -752,9 +743,6 @@ static void __arm_dma_free(struct device *dev, size_t size, void *cpu_addr,
 	struct page *page = pfn_to_page(dma_to_pfn(dev, handle));
 	bool want_vaddr = !dma_get_attr(DMA_ATTR_NO_KERNEL_MAPPING, attrs);
 
-	if (dma_release_from_coherent(dev, get_order(size), cpu_addr))
-		return;
-
 	size = PAGE_ALIGN(size);
 
 	if (nommu()) {

arch/arm64/include/asm/dma-mapping.h

View file

diff --git a/arch/arm64/include/asm/dma-mapping.h b/arch/arm64/include/asm/dma-mapping.h
index f0d6d0b..cfdb34b 100644
--- a/arch/arm64/include/asm/dma-mapping.h
+++ b/arch/arm64/include/asm/dma-mapping.h
@@ -22,8 +22,6 @@
 #include <linux/types.h>
 #include <linux/vmalloc.h>
 
-#include <asm-generic/dma-coherent.h>
-
 #include <xen/xen.h>
 #include <asm/xen/hypervisor.h>
 
@@ -86,28 +84,6 @@ static inline phys_addr_t dma_to_phys(struct device *dev, dma_addr_t dev_addr)
 	return (phys_addr_t)dev_addr;
 }
 
-static inline int dma_mapping_error(struct device *dev, dma_addr_t dev_addr)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-	debug_dma_mapping_error(dev, dev_addr);
-	return ops->mapping_error(dev, dev_addr);
-}
-
-static inline int dma_supported(struct device *dev, u64 mask)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-	return ops->dma_supported(dev, mask);
-}
-
-static inline int dma_set_mask(struct device *dev, u64 mask)
-{
-	if (!dev->dma_mask || !dma_supported(dev, mask))
-		return -EIO;
-	*dev->dma_mask = mask;
-
-	return 0;
-}
-
 static inline bool dma_capable(struct device *dev, dma_addr_t addr, size_t size)
 {
 	if (!dev->dma_mask)
@@ -120,50 +96,5 @@ static inline void dma_mark_clean(void *addr, size_t size)
 {
 }
 
-#define dma_alloc_coherent(d, s, h, f)	dma_alloc_attrs(d, s, h, f, NULL)
-#define dma_free_coherent(d, s, h, f)	dma_free_attrs(d, s, h, f, NULL)
-
-static inline void *dma_alloc_attrs(struct device *dev, size_t size,
-				    dma_addr_t *dma_handle, gfp_t flags,
-				    struct dma_attrs *attrs)
-{
-	struct dma_map_ops *ops = get_dma_ops(dev);
-	void *vaddr;
-
-	if (dma_alloc_from_coherent(dev, size, dma_handle, &vaddr))
-		return vaddr;
-
-	vaddr = ops->alloc(dev, size, dma_handle, flags, attrs);
-	debug_dma_alloc_coherent(dev, size, *dma_handle, vaddr);
-	return vaddr;
-}