linux-stable.git/mm/memory_hotplug.c, branch v3.11.2

mm/memory_hotplug.c: fix return value of online_pages()

2013-07-09T17:33:25+00:00

online_pages() is called from memory_block_action() when a user requests
to online a memory block via sysfs.  This function needs to return a
proper error value in case of error.

Signed-off-by: Toshi Kani 
Cc: Yasuaki Ishimatsu 
Cc: Tang Chen 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm/memory_hotplug.c: fix a comment typo in register_page_bootmem_info_node()

2013-07-09T17:33:23+00:00

Signed-off-by: Tang Chen 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

Merge branch 'akpm' (updates from Andrew Morton)

2013-07-04T00:12:13+00:00

Merge first patch-bomb from Andrew Morton:
 - various misc bits
 - I'm been patchmonkeying ocfs2 for a while, as Joel and Mark have been
   distracted.  There has been quite a bit of activity.
 - About half the MM queue
 - Some backlight bits
 - Various lib/ updates
 - checkpatch updates
 - zillions more little rtc patches
 - ptrace
 - signals
 - exec
 - procfs
 - rapidio
 - nbd
 - aoe
 - pps
 - memstick
 - tools/testing/selftests updates

* emailed patches from Andrew Morton : (445 commits)
  tools/testing/selftests: don't assume the x bit is set on scripts
  selftests: add .gitignore for kcmp
  selftests: fix clean target in kcmp Makefile
  selftests: add .gitignore for vm
  selftests: add hugetlbfstest
  self-test: fix make clean
  selftests: exit 1 on failure
  kernel/resource.c: remove the unneeded assignment in function __find_resource
  aio: fix wrong comment in aio_complete()
  drivers/w1/slaves/w1_ds2408.c: add magic sequence to disable P0 test mode
  drivers/memstick/host/r592.c: convert to module_pci_driver
  drivers/memstick/host/jmb38x_ms: convert to module_pci_driver
  pps-gpio: add device-tree binding and support
  drivers/pps/clients/pps-gpio.c: convert to module_platform_driver
  drivers/pps/clients/pps-gpio.c: convert to devm_* helpers
  drivers/parport/share.c: use kzalloc
  Documentation/accounting/getdelays.c: avoid strncpy in accounting tool
  aoe: update internal version number to v83
  aoe: update copyright date
  aoe: perform I/O completions in parallel
  ...

mm/hotplug: prepare for removing num_physpages

2013-07-03T23:07:35+00:00

Prepare for removing num_physpages.

Signed-off-by: Jiang Liu 
Cc: Wen Congyang 
Cc: Tang Chen 
Cc: Yasuaki Ishimatsu 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: correctly update zone->managed_pages

2013-07-03T23:07:33+00:00

Enhance adjust_managed_page_count() to adjust totalhigh_pages for
highmem pages.  And change code which directly adjusts totalram_pages to
use adjust_managed_page_count() because it adjusts totalram_pages,
totalhigh_pages and zone->managed_pages altogether in a safe way.

Remove inc_totalhigh_pages() and dec_totalhigh_pages() from xen/balloon
driver bacause adjust_managed_page_count() has already adjusted
totalhigh_pages.

This patch also fixes two bugs:

1) enhances virtio_balloon driver to adjust totalhigh_pages when
   reserve/unreserve pages.
2) enhance memory_hotplug.c to adjust totalhigh_pages when hot-removing
   memory.

We still need to deal with modifications of totalram_pages in file
arch/powerpc/platforms/pseries/cmm.c, but need help from PPC experts.

[akpm@linux-foundation.org: remove ifdef, per Wanpeng Li, virtio_balloon.c cleanup, per Sergei]
[akpm@linux-foundation.org: export adjust_managed_page_count() to modules, for drivers/virtio/virtio_balloon.c]
Signed-off-by: Jiang Liu 
Cc: Chris Metcalf 
Cc: Rusty Russell 
Cc: "Michael S. Tsirkin" 
Cc: Konrad Rzeszutek Wilk 
Cc: Jeremy Fitzhardinge 
Cc: Wen Congyang 
Cc: Tang Chen 
Cc: Yasuaki Ishimatsu 
Cc: Mel Gorman 
Cc: Minchan Kim 
Cc: "H. Peter Anvin" 
Cc: 
Cc: Arnd Bergmann 
Cc: Catalin Marinas 
Cc: David Howells 
Cc: Geert Uytterhoeven 
Cc: Ingo Molnar 
Cc: Jianguo Wu 
Cc: Joonsoo Kim 
Cc: Kamezawa Hiroyuki 
Cc: Marek Szyprowski 
Cc: Michel Lespinasse 
Cc: Rik van Riel 
Cc: Tejun Heo 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yinghai Lu 
Cc: Russell King 
Cc: Sergei Shtylyov 
Cc: Wu Fengguang 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: make __free_pages_bootmem() only available at boot time

2013-07-03T23:07:33+00:00

In order to simpilify management of totalram_pages and
zone->managed_pages, make __free_pages_bootmem() only available at boot
time.  With this change applied, __free_pages_bootmem() will only be
used by bootmem.c and nobootmem.c at boot time, so mark it as __init.
Other callers of __free_pages_bootmem() have been converted to use
free_reserved_page(), which handles totalram_pages and
zone->managed_pages in a safer way.

This patch also fix a bug in free_pagetable() for x86_64, which should
increase zone->managed_pages instead of zone->present_pages when freeing
reserved pages.

And now we have managed_pages_count_lock to protect totalram_pages and
zone->managed_pages, so remove the redundant ppb_lock lock in
put_page_bootmem().  This greatly simplifies the locking rules.

Signed-off-by: Jiang Liu 
Cc: Thomas Gleixner 
Cc: Ingo Molnar 
Cc: "H. Peter Anvin" 
Cc: Yinghai Lu 
Cc: Wen Congyang 
Cc: Tang Chen 
Cc: Yasuaki Ishimatsu 
Cc: Mel Gorman 
Cc: Minchan Kim 
Cc: "Michael S. Tsirkin" 
Cc: 
Cc: Arnd Bergmann 
Cc: Catalin Marinas 
Cc: Chris Metcalf 
Cc: David Howells 
Cc: Geert Uytterhoeven 
Cc: Jeremy Fitzhardinge 
Cc: Jianguo Wu 
Cc: Joonsoo Kim 
Cc: Kamezawa Hiroyuki 
Cc: Konrad Rzeszutek Wilk 
Cc: Marek Szyprowski 
Cc: Michel Lespinasse 
Cc: Rik van Riel 
Cc: Rusty Russell 
Cc: Tejun Heo 
Cc: Will Deacon 
Cc: Russell King 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm: fix some trivial typos in comments

2013-07-03T23:07:33+00:00

Fix some trivial typos in comments.

Signed-off-by: Jiang Liu 
Cc: Wen Congyang 
Cc: Tang Chen 
Cc: Yasuaki Ishimatsu 
Cc: Mel Gorman 
Cc: Minchan Kim 
Cc: Marek Szyprowski 
Cc: "H. Peter Anvin" 
Cc: "Michael S. Tsirkin" 
Cc: 
Cc: Arnd Bergmann 
Cc: Catalin Marinas 
Cc: Chris Metcalf 
Cc: David Howells 
Cc: Geert Uytterhoeven 
Cc: Ingo Molnar 
Cc: Jeremy Fitzhardinge 
Cc: Jianguo Wu 
Cc: Joonsoo Kim 
Cc: Kamezawa Hiroyuki 
Cc: Konrad Rzeszutek Wilk 
Cc: Michel Lespinasse 
Cc: Rik van Riel 
Cc: Rusty Russell 
Cc: Tejun Heo 
Cc: Thomas Gleixner 
Cc: Will Deacon 
Cc: Yinghai Lu 
Cc: Russell King 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

mm/memory_hotplug.c: change normal message to use pr_debug

2013-07-03T23:07:31+00:00

During early boot-up, iomem_resource is set up from the boot descriptor
table, such as EFI Memory Table and e820.  Later,
acpi_memory_device_add() calls add_memory() for each ACPI memory device
object as it enumerates ACPI namespace.  This add_memory() call is
expected to fail in register_memory_resource() at boot since
iomem_resource has been set up from EFI/e820.  As a result, add_memory()
returns -EEXIST, which acpi_memory_device_add() handles as the normal
case.

This scheme works fine, but the following error message is logged for
every ACPI memory device object during boot-up.

  "System RAM resource %pR cannot be added\n"

This patch changes register_memory_resource() to use pr_debug() for the
message as it shows up under the normal case.

Signed-off-by: Toshi Kani 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memory_hotplug: use pgdat_resize_lock() in __offline_pages()

2013-07-03T23:07:29+00:00

mmzone.h documents node_size_lock (which pgdat_resize_lock() locks) as
follows:

        * Must be held any time you expect node_start_pfn, node_present_pages
        * or node_spanned_pages stay constant.  [...]

So actually hold it when we update node_present_pages in __offline_pages().

[akpm@linux-foundation.org: fix build]
Signed-off-by: Cody P Schafer 
Cc: David Rientjes 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

memory_hotplug: use pgdat_resize_lock() in online_pages()

2013-07-03T23:07:29+00:00

mmzone.h documents node_size_lock (which pgdat_resize_lock() locks) as
follows:

        * Must be held any time you expect node_start_pfn, node_present_pages
        * or node_spanned_pages stay constant.  [...]

So actually hold it when we update node_present_pages in online_pages().

Signed-off-by: Cody P Schafer 
Cc: David Rientjes 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds