Hugh Dickins
62b61f611e
ksm: memory hotremove migration only ...
The previous patch enables page migration of ksm pages, but that soon gets
into trouble: not surprising, since we're using the ksm page lock to lock
operations on its stable_node, but page migration switches the page whose
lock is to be used for that. Another layer of locking would fix it, but
do we need that yet?
Do we actually need page migration of ksm pages? Yes, memory hotremove
needs to offline sections of memory: and since we stopped allocating ksm
pages with GFP_HIGHUSER, they will tend to be GFP_HIGHUSER_MOVABLE
candidates for migration.
But KSM is currently unconscious of NUMA issues, happily merging pages
from different NUMA nodes: at present the rule must be, not to use
MADV_MERGEABLE where you care about NUMA. So no, NUMA page migration of
ksm pages does not make sense yet.
So, to complete support for ksm swapping we need to make hotremove safe.
ksm_memory_callback() take ksm_thread_mutex when MEM_GOING_OFFLINE and
release it when MEM_OFFLINE or MEM_CANCEL_OFFLINE. But if mapped pages
are freed before migration reaches them, stable_nodes may be left still
pointing to struct pages which have been removed from the system: the
stable_node needs to identify a page by pfn rather than page pointer, then
it can safely prune them when MEM_OFFLINE.
And make NUMA migration skip PageKsm pages where it skips PageReserved.
But it's only when we reach unmap_and_move() that the page lock is taken
and we can be sure that raised pagecount has prevented a PageAnon from
being upgraded: so add offlining arg to migrate_pages(), to migrate ksm
page when offlining (has sufficient locking) but reject it otherwise.
Signed-off-by: Hugh Dickins <hugh.dickins@tiscali.co.uk>
Cc: Izik Eidus <ieidus@redhat.com>
Cc: Andrea Arcangeli <aarcange@redhat.com>
Cc: Chris Wright <chrisw@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2009-12-15 08:53:20 -08:00
mfd: Add twl6030 regulator subdevices
2009-12-14 00:26:26 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2009-12-09 19:52:01 -08:00
mfd: Remove ezx-pcap defines for custom led gpio encoding
2009-12-13 19:21:56 +01:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kaber/nf-next-2.6
2009-12-03 13:23:12 -08:00
md: remove sparse warning:symbol XXX was not declared.
2009-12-14 12:49:47 +11:00
Merge branch 'next-spi' of git://git.secretlab.ca/git/linux-2.6
2009-12-14 10:22:11 -08:00
SUNRPC: Allow RPCs to fail quickly if the server is unreachable
2009-12-03 15:58:56 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6
2009-12-11 15:34:40 -08:00
libata: Clarify ata_set_lba_range_entries function
2009-12-03 18:01:23 -05:00
block: add helpers to run flush_dcache_page() against a bio and a request's pages
2009-11-26 09:16:19 +01:00
block: Allow devices to indicate whether discarded blocks are zeroed
2009-12-03 09:24:48 +01:00
tree-wide: fix misspelling of "definition" in comments
2009-12-04 23:41:47 +01:00
blkio: Introduce blkio controller cgroup interface
2009-12-03 19:28:51 +01:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Merge branch 'timers-for-linus-urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 19:28:09 -08:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:32:03 -08:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 15:32:03 -08:00
powerpc/pseries: Serialize cpu hotplug operations during deactivate Vs deallocate
2009-12-09 17:09:36 +11:00
sched: Fix balance vs hotplug race
2009-12-06 21:10:56 +01:00
TCPCT part 1b: generate Responder Cookie secret
2009-12-02 22:07:23 -08:00
Driver Core: devtmpfs: use sys_mount()
2009-12-11 11:24:51 -08:00
Merge branch 'timers-for-linus-hpet' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 19:26:55 -08:00
tg3: Add some VPD preprocessor constants
2009-12-03 13:18:04 -08:00
ext2: Explicitly assign values to on-disk enum of filetypes
2009-12-10 15:02:51 +01:00
ext3: Unify log messages in ext3
2009-12-10 15:02:53 +01:00
Merge branch 'xen/fbdev' of git://git.kernel.org/pub/scm/linux/kernel/git/jeremy/xen
2009-12-10 09:34:40 -08:00
net 03/05: fib_rules: add oif classification
2009-12-03 12:14:36 -08:00
firmware_class: make request_firmware_nowait more useful
2009-12-11 11:24:52 -08:00
kill wait_on_page_writeback_range
2009-12-10 15:02:50 +01:00
tracing: Buffer the output of seq_file in case of filled buffer
2009-12-09 13:55:26 -05:00
GFS2: Tag all metadata with jid
2009-12-03 11:58:47 +00:00
gigaset: documentation amendments
2009-12-08 20:30:41 -08:00
hrtimer: move timer stats helper functions to hrtimer.c
2009-12-10 13:08:11 +01:00
hugetlb: derive huge pages nodes allowed from task mempolicy
2009-12-15 08:53:12 -08:00
FRV: Fix no-hardware-breakpoint case
2009-12-14 10:10:55 -08:00
hwrng: core - Replace u32 in driver API with byte array
2009-12-01 14:47:32 +08:00
i2c: Get rid of I2C_CLIENT_MODULE_PARM
2009-12-14 21:17:29 +01:00
ide: Increase WAIT_DRQ to accomodate some CF cards and SSD drives.
2009-12-02 21:58:33 -08:00
nl80211: PMKSA caching support
2009-11-28 15:05:05 -05:00
include/linux/if_ether.h: Remove unused defines MAC_BUF_SIZE and DECLARE_MAC_BUF
2009-12-08 20:42:28 -08:00
macvlan: export macvlan mode through netlink
2009-11-26 15:53:10 -08:00
vlan: support "loose binding" to the underlying network device
2009-11-26 16:00:36 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
ipv4 05/05: add sysctl to accept packets with local source addresses
2009-12-03 12:14:38 -08:00
Merge commit 'v2.6.32' into next
2009-12-02 23:38:13 -08:00
block: Fix io_context leak after failure of clone with CLONE_IO
2009-12-04 16:36:18 +01:00
doc: Fix IRQ chip docs
2009-12-04 15:39:57 +01:00
tty: isicom: sort out the board init logic
2009-12-11 15:18:07 -08:00
sched, time: Define nsecs_to_jiffies()
2009-11-26 12:59:20 +01:00
tty: esp: remove broken driver
2009-12-11 15:18:03 -08:00
Merge branch 'core-printk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-05 09:50:22 -08:00
ksm: rmap_walk to remove_migation_ptes
2009-12-15 08:53:20 -08:00
Merge commit 'origin/master' into next
2009-12-09 17:14:38 +11:00
KVM: introduce kvm_vcpu_on_spin
2009-12-03 09:32:17 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6
2009-12-09 19:42:25 -08:00
hugetlb: derive huge pages nodes allowed from task mempolicy
2009-12-15 08:53:12 -08:00
ksm: memory hotremove migration only
2009-12-15 08:53:20 -08:00
mm: define PAGE_MAPPING_FLAGS
2009-12-15 08:53:17 -08:00
sysfs: Propagate renames to the vfs on demand
2009-12-11 11:24:54 -08:00
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
2009-12-05 15:22:26 -08:00
netdevice: provide common routine for macvlan and vlan operstate management
2009-12-03 15:59:22 -08:00
nfs41: RECLAIM_COMPLETE XDR functionality
2009-12-05 16:08:40 -05:00
nfs41: nfs41: fix state manager deadlock in session reset
2009-12-04 15:55:38 -05:00
nfs41: RECLAIM_COMPLETE XDR functionality
2009-12-05 16:08:40 -05:00
nl80211: PMKSA caching support
2009-11-28 15:05:05 -05:00
hugetlb: offload per node attribute registrations
2009-12-15 08:53:13 -08:00
mm: add gfp flags for NODEMASK_ALLOC slab allocations
2009-12-15 08:53:13 -08:00
net: NETDEV_UNREGISTER_PERNET -> NETDEV_UNREGISTER_BATCH
2009-12-01 16:15:50 -08:00
hugetlb: add generic definition of NUMA_NO_NODE
2009-12-15 08:53:12 -08:00
OMAP: DSS2: omapfb driver
2009-12-09 12:12:44 +02:00
mm: CONFIG_MMU for PG_mlocked
2009-12-15 08:53:17 -08:00
PCI: Global variable decls must match the defs in section attributes
2009-12-14 10:11:34 -08:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
2009-12-12 14:27:24 -08:00
PCI: portdrv: remove unnecessary struct pcie_port_data
2009-12-04 15:56:19 -08:00
Merge branch 'for-linus' into for-next
2009-12-08 10:02:12 +09:00
hw-breakpoints: Modify breakpoints without unregistering them
2009-12-09 09:48:20 +01:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
Driver Core: Early platform driver buffer
2009-12-11 11:24:55 -08:00
PM: Add flag for devices capable of generating run-time wake-up events
2009-12-06 16:17:57 +01:00
PM: Add flag for devices capable of generating run-time wake-up events
2009-12-06 16:17:57 +01:00
VFS: Add forget_all_cached_acls()
2009-12-03 11:43:23 +00:00
sched: Revert 498657a478
2009-12-02 09:55:33 +01:00
quota: Implement quota format with 64-bit space and inode limits
2009-12-10 15:02:54 +01:00
ksm: rmap_walk to remove_migation_ptes
2009-12-15 08:53:20 -08:00
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-12 11:34:10 -08:00
tree-wide: fix assorted typos all over the place
2009-12-04 15:39:55 +01:00
sh: Break out SuperH PFC code
2009-11-30 12:02:53 +09:00
skbuff: remove skb_dma_map/unmap
2009-12-02 19:57:15 -08:00
tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING
2009-12-11 09:17:02 +01:00
SLOW_WORK: Move slow_work's proc file to debugfs
2009-12-01 08:20:31 -08:00
tracing, slab: Define kmem_cache_alloc_notrace ifdef CONFIG_TRACING
2009-12-11 09:17:02 +01:00
swap: rework map_swap_page() again
2009-12-15 08:53:16 -08:00
Unify sys_mmap*
2009-12-11 06:44:29 -05:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2009-12-09 19:43:33 -08:00
TCPCT part 1d: define TCP cookie option, extend existing struct's
2009-12-02 22:07:25 -08:00
Merge branches 'timers-for-linus-ntp' and 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
2009-12-08 19:30:19 -08:00
tracing: Add full state to trace_seq
2009-12-09 14:05:49 -05:00
events: Rename TRACE_EVENT_TEMPLATE() to DECLARE_EVENT_CLASS()
2009-11-26 09:04:55 +01:00
tty: push the BKL down into the handlers a bit
2009-12-11 15:18:08 -08:00
USB: Refactor code to find alternate interface settings.
2009-12-11 11:55:27 -08:00
USB: usb-storage: add BAD_SENSE flag
2009-12-11 11:55:26 -08:00
usbdevfs: move compat_ioctl handling to devio.c
2009-12-10 22:55:37 +01:00
core: Fix user return notifier on fork()
2009-11-29 22:03:04 +01:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
2009-12-09 19:50:49 -08:00
vmscan: stop kswapd waiting on congestion when the min watermark is not being met
2009-12-15 08:53:16 -08:00
writeback: introduce wbc.for_background
2009-12-03 13:54:25 +01:00
xfrm: Define new XFRM netlink auth attribute with specified truncation bits
2009-11-25 15:48:37 -08:00
