Linux 3.14.21
Greg KH
maintainerI'm announcing the release of the 3.14.21 kernel.
All users of the 3.14 kernel series must upgrade.
The updated 3.14.y git tree can be found at:
git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git linux-3.14.y
and can be browsed at the normal kernel.org git web browser:
http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=summary
thanks,
greg k-h
------------
Makefile | 2 arch/unicore32/include/asm/mmu_context.h | 4 drivers/block/drbd/drbd_nl.c | 6 drivers/cpufreq/integrator-cpufreq.c | 4 drivers/gpu/drm/i915/i915_gem_gtt.c | 14 + drivers/md/raid5.c | 18 ++ drivers/media/v4l2-core/videobuf2-core.c | 15 +- fs/cifs/cifsglob.h | 2 fs/cifs/file.c | 2 fs/cifs/readdir.c | 2 fs/cifs/smb1ops.c | 9 + fs/cifs/smb2maperror.c | 4 fs/cifs/smb2ops.c | 9 + fs/cifs/smb2pdu.c | 9 - fs/exec.c | 5 fs/hugetlbfs/inode.c | 5 fs/proc/task_mmu.c | 3 fs/udf/inode.c | 35 ++-- include/linux/cpuset.h | 27 +-- include/linux/hugetlb.h | 10 + include/linux/jiffies.h | 12 - include/linux/mm_types.h | 4 include/linux/plist.h | 45 ++++++ include/linux/sched.h | 7 include/linux/swap.h | 8 - include/linux/swapfile.h | 2 include/linux/vmacache.h | 38 +++++ include/media/videobuf2-core.h | 4 init/Kconfig | 1 kernel/cpuset.c | 2 kernel/debug/debug_core.c | 14 + kernel/events/core.c | 4 kernel/fork.c | 12 + kernel/time.c | 54 ++++--- kernel/trace/ring_buffer.c | 2 lib/plist.c | 52 +++++++ mm/Makefile | 2 mm/compaction.c | 94 ++++++------- mm/filemap.c | 10 - mm/frontswap.c | 13 - mm/huge_memory.c | 11 - mm/hugetlb.c | 17 ++ mm/mempolicy.c | 12 - mm/migrate.c | 5 mm/mmap.c | 55 ++++--- mm/nommu.c | 24 ++- mm/page_alloc.c | 13 - mm/readahead.c | 4 mm/slab.c | 4 mm/slub.c | 16 -- mm/swapfile.c | 224 ++++++++++++++++--------------- mm/vmacache.c | 114 +++++++++++++++ mm/vmscan.c | 32 ++-- 53 files changed, 749 insertions(+), 347 deletions(-)
Andrew Hunter (1):
jiffies: Fix timeval conversion to jiffies
Arnd Bergmann (1):
cpufreq: integrator: fix integrator_cpufreq_remove return type
Chris Wilson (1):
drm/i915: Flush the PTEs after updating them before suspend
Christoph Lameter (1):
vmscan: reclaim_clean_pages_from_list() must use mod_zone_page_state()
Dan Streetman (4):
swap: change swap_info singly-linked list to list_head lib/plist: add helper functions
lib/plist: add plist_requeue
swap: change swap_list_head to plist, add swap_avail_head
David Rientjes (3):
mm, compaction: avoid isolating pinned pages
mm, compaction: determine isolation mode only once
mm, compaction: ignore pageblock skip when manually invoking compaction
Davidlohr Bueso (1):
mm: per-thread vma caching
Greg Kroah-Hartman (1):
Linux 3.14.21
Hans Verkuil (1):
media: vb2: fix VBI/poll regression
Jan Kara (1):
udf: Avoid infinite loop when processing indirect ICBs
Jens Axboe (1):
mm/filemap.c: avoid always dirtying mapping->flags on O_DIRECT
Joonsoo Kim (5):
mm/compaction: disallow high-order page for migration target mm/compaction: do not call suitable_migration_target() on every page mm/compaction: change the timing to check to drop the spinlock mm/compaction: check pageblock suitability once per pageblock mm/compaction: clean-up code on success of ballon isolation
Josh Triplett (1):
init/Kconfig: Fix HAVE_FUTEX_CMPXCHG to not break up the EXPERT menu
Lars Ellenberg (1):
drbd: fix regression 'out of mem, failed to invoke fence-peer helper'
Linus Torvalds (1):
mm: don't pointlessly use BUG_ON() for sanity check
Mel Gorman (3):
mm: migrate: Close race between migration completion and mprotect
mm: numa: Do not mark PTEs pte_numa when splitting huge pages
mm: optimize put_mems_allowed() usage
Michal Hocko (1):
mm: exclude memoryless nodes from zone_reclaim
NeilBrown (1):
md/raid5: disable 'DISCARD' by default due to safety concerns.
Nishanth Aravamudan (1):
hugetlb: ensure hugepage access is denied if hugepages are not supported
Pavel Shilovsky (1):
CIFS: Fix SMB2 readdir error handling
Peter Zijlstra (1):
perf: fix perf bug in fork()
Raghavendra K T (1):
mm/readahead.c: fix readahead failure for memoryless NUMA nodes and limit readahead pages
Steve French (1):
Fix problem recognizing symlinks
Steven Rostedt (Red Hat) (1):
ring-buffer: Fix infinite spin in reading buffer
Vladimir Davydov (2):
mm: vmscan: respect NUMA policy mask when shrinking slab on direct reclaim
mm: vmscan: shrink_slab: rename max_pass -> freeable
Waiman Long (1):
mm, thp: move invariant bug check out of loop in __split_huge_page_map
Greg KH
maintainerMakefile +1 -1
@@ -1,6 +1,6 @@ VERSION = 3 PATCHLEVEL = 14 -SUBLEVEL = 20 +SUBLEVEL = 21 EXTRAVERSION = NAME = Remembering Coco
arch/unicore32/include/asm/mmu_context.h +3 -1
@@ -14,6 +14,8 @@#include <linux/compiler.h> #include <linux/sched.h> +#include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/io.h> #include <asm/cacheflush.h>
@@ -73,7 +75,7 @@ do { \else \ mm->mmap =NULL ; \rb_erase (&high_vma->vm_rb, &mm->mm_rb); \ - mm->mmap_cache =NULL ; \ +vmacache_invalidate (mm); \ mm->map_count--; \remove_vma (high_vma); \ } \
drivers/block/drbd/drbd_nl.c +6 -0
@@ -525,6 +525,12 @@ void conn_try_outdate_peer_async(struct drbd_tconn *tconn)struct task_struct *opa;kref_get (&tconn->kref); +/* We may just have force_sig()'ed this thread +* to get it out of some blocking network function. +* Clear signals; otherwise kthread_run(), which internally uses +* wait_on_completion_killable(), will mistake our pending signal +* for a new fatal signal and fail. */ +flush_signals (current); opa =kthread_run (_try_outdate_peer_async, tconn,"drbd_async_h" );if (IS_ERR (opa)) {conn_err (tconn,"out of mem, failed to invoke fence-peer helper\n" );
drivers/cpufreq/integrator-cpufreq.c +2 -2
@@ -213,9 +213,9 @@ static int __init integrator_cpufreq_probe(struct platform_device *pdev)return cpufreq_register_driver (&integrator_driver); } -static void __exit integrator_cpufreq_remove(struct platform_device *pdev) +static int __exit integrator_cpufreq_remove(struct platform_device *pdev) { -cpufreq_unregister_driver (&integrator_driver); +return cpufreq_unregister_driver (&integrator_driver); }static const struct of_device_id integrator_cpufreq_match[] = {
drivers/gpu/drm/i915/i915_gem_gtt.c +13 -1
@@ -827,6 +827,16 @@ void i915_check_and_clear_faults(struct drm_device *dev)POSTING_READ (RING_FAULT_REG (&dev_priv->ring[RCS ])); } +static void i915_ggtt_flush (struct drm_i915_private *dev_priv) +{ +if (INTEL_INFO (dev_priv->dev)->gen <6 ) { +intel_gtt_chipset_flush (); + }else { +I915_WRITE (GFX_FLSH_CNTL_GEN6 ,GFX_FLSH_CNTL_EN ); +POSTING_READ (GFX_FLSH_CNTL_GEN6 ); + } +} +void i915_gem_suspend_gtt_mappings (struct drm_device *dev) {struct drm_i915_private *dev_priv = dev->dev_private;
@@ -843,6 +853,8 @@ void i915_gem_suspend_gtt_mappings(struct drm_device *dev) dev_priv->gtt.base.start /PAGE_SIZE , dev_priv->gtt.base.total /PAGE_SIZE , true); + +i915_ggtt_flush (dev_priv); }void i915_gem_restore_gtt_mappings (struct drm_device *dev)
@@ -863,7 +875,7 @@ void i915_gem_restore_gtt_mappings(struct drm_device *dev)i915_gem_gtt_bind_object (obj, obj->cache_level); } -i915_gem_chipset_flush (dev); +i915_ggtt_flush (dev_priv); }int i915_gem_gtt_prepare_object (struct drm_i915_gem_object *obj)
drivers/md/raid5.c +17 -1
@@ -64,6 +64,10 @@#define cpu_to_group (cpu) cpu_to_node(cpu)#define ANY_GROUP NUMA_NO_NODE +static bool devices_handle_discard_safely = false; +module_param (devices_handle_discard_safely, bool,0644 ); +MODULE_PARM_DESC (devices_handle_discard_safely, +"Set to Y if all devices in each array reliably return zeroes on reads from discarded regions" );static struct workqueue_struct *raid5_wq;/* * Stripe cache
@@ -6117,7 +6121,7 @@ static int run(struct mddev *mddev) mddev->queue->limits.discard_granularity = stripe;/* * unaligned part of discard request will be ignored, so can't -* guarantee discard_zerors_data +* guarantee discard_zeroes_data */ mddev->queue->limits.discard_zeroes_data =0 ;
@@ -6142,6 +6146,18 @@ static int run(struct mddev *mddev) !bdev_get_queue(rdev->bdev)-> limits.discard_zeroes_data) discard_supported = false; +/* Unfortunately, discard_zeroes_data is not currently +* a guarantee - just a hint. So we only allow DISCARD +* if the sysadmin has confirmed that only safe devices +* are in use by setting a module parameter. +*/ +if (!devices_handle_discard_safely) { +if (discard_supported) { +pr_info ("md/raid456: discard support disabled due to uncertainty.\n" ); +pr_info ("Set raid456.devices_handle_discard_safely=Y to override.\n" ); + } + discard_supported = false; + } } if (discard_supported &&
drivers/media/v4l2-core/videobuf2-core.c +13 -2
@@ -745,6 +745,7 @@ static int __reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req)* to the userspace. */ req->count = allocated_buffers; + q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT (q->type);return 0 ; }
@@ -793,6 +794,7 @@ static int __create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *creatememset (q->plane_sizes,0 ,sizeof (q->plane_sizes));memset (q->alloc_ctx,0 ,sizeof (q->alloc_ctx)); q->memory = create->memory; + q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT (q->type); } num_buffers =min (create->count,VIDEO_MAX_FRAME - q->num_buffers);
@@ -1447,6 +1449,7 @@ static int vb2_internal_qbuf(struct vb2_queue *q, struct v4l2_buffer *b)* dequeued in dqbuf. */ list_add_tail (&vb->queued_entry, &q->queued_list); + q->waiting_for_buffers = false; vb->state =VB2_BUF_STATE_QUEUED ;/*
@@ -1841,6 +1844,7 @@ static int vb2_internal_streamoff(struct vb2_queue *q, enum v4l2_buf_type type)* and videobuf, effectively returning control over them to userspace. */ __vb2_queue_cancel (q); + q->waiting_for_buffers = !V4L2_TYPE_IS_OUTPUT (q->type);dprintk (3 ,"Streamoff successful\n" );return 0 ;
@@ -2150,9 +2154,16 @@ unsigned int vb2_poll(struct vb2_queue *q, struct file *file, poll_table *wait) }/* -* There is nothing to wait for if no buffers have already been queued. +* There is nothing to wait for if the queue isn't streaming. */ -if (list_empty (&q->queued_list)) +if (!vb2_is_streaming (q)) +return res |POLLERR ; +/* +* For compatibility with vb1: if QBUF hasn't been called yet, then +* return POLLERR as well. This only affects capture queues, output +* queues will always initialize waiting_for_buffers to false. +*/ +if (q->waiting_for_buffers)return res |POLLERR ;if (list_empty (&q->done_list))
fs/cifs/cifsglob.h +2 -0
@@ -399,6 +399,8 @@ struct smb_version_operations { const struct cifs_fid *, u32 *);int (*set_acl)(struct cifs_ntsd *,__u32 ,struct inode *,const char *,int ); +/* check if we need to issue closedir */ +bool (*dir_needs_close)(struct cifsFileInfo *); };struct smb_version_values {
fs/cifs/file.c +1 -1
@@ -762,7 +762,7 @@ int cifs_closedir(struct inode *inode, struct file *file)cifs_dbg (FYI ,"Freeing private data in close dir\n" );spin_lock (&cifs_file_list_lock); -if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) { +if (server->ops->dir_needs_close (cfile)) { cfile->invalidHandle = true;spin_unlock (&cifs_file_list_lock);if (server->ops->close_dir)
fs/cifs/readdir.c +1 -1
@@ -593,7 +593,7 @@ find_cifs_entry(const unsigned int xid, struct cifs_tcon *tcon, loff_t pos,/* close and restart search */ cifs_dbg (FYI ,"search backing up - close and restart search\n" );spin_lock (&cifs_file_list_lock); -if (!cfile->srch_inf.endOfSearch && !cfile->invalidHandle) { +if (server->ops->dir_needs_close (cfile)) { cfile->invalidHandle = true;spin_unlock (&cifs_file_list_lock);if (server->ops->close_dir)
fs/cifs/smb1ops.c +8 -1
@@ -586,7 +586,7 @@ cifs_query_path_info(const unsigned int xid, struct cifs_tcon *tcon, tmprc =CIFS_open (xid, &oparms, &oplock,NULL );if (tmprc == -EOPNOTSUPP ) *symlink = true; -else +else if (tmprc ==0 )CIFSSMBClose (xid, tcon, fid.netfid); }
@@ -1009,6 +1009,12 @@ cifs_is_read_op(__u32 oplock)return oplock ==OPLOCK_READ ; } +static bool +cifs_dir_needs_close (struct cifsFileInfo *cfile) +{ +return !cfile->srch_inf.endOfSearch && !cfile->invalidHandle; +} +struct smb_version_operations smb1_operations = { .send_cancel = send_nt_cancel, .compare_fids = cifs_compare_fids,
@@ -1078,6 +1084,7 @@ struct smb_version_operations smb1_operations = { .query_mf_symlink = cifs_query_mf_symlink, .create_mf_symlink = cifs_create_mf_symlink, .is_read_op = cifs_is_read_op, + .dir_needs_close = cifs_dir_needs_close, #ifdef CONFIG_CIFS_XATTR .query_all_EAs = CIFSSMBQAllEAs, .set_EA = CIFSSMBSetEA,
fs/cifs/smb2maperror.c +3 -1
@@ -214,7 +214,7 @@ static const struct status_to_posix_error smb2_error_map_table[] = { {STATUS_BREAKPOINT, -EIO, "STATUS_BREAKPOINT"}, {STATUS_SINGLE_STEP, -EIO, "STATUS_SINGLE_STEP"}, {STATUS_BUFFER_OVERFLOW, -EIO, "STATUS_BUFFER_OVERFLOW"}, - {STATUS_NO_MORE_FILES, -EIO, "STATUS_NO_MORE_FILES"}, + {STATUS_NO_MORE_FILES, -ENODATA, "STATUS_NO_MORE_FILES"}, {STATUS_WAKE_SYSTEM_DEBUGGER, -EIO, "STATUS_WAKE_SYSTEM_DEBUGGER"}, {STATUS_HANDLES_CLOSED, -EIO, "STATUS_HANDLES_CLOSED"}, {STATUS_NO_INHERITANCE, -EIO, "STATUS_NO_INHERITANCE"},
@@ -256,6 +256,8 @@ static const struct status_to_posix_error smb2_error_map_table[] = { {STATUS_DLL_MIGHT_BE_INCOMPATIBLE , -EIO , "STATUS_DLL_MIGHT_BE_INCOMPATIBLE"}, {STATUS_STOPPED_ON_SYMLINK, -EOPNOTSUPP, "STATUS_STOPPED_ON_SYMLINK"}, + {STATUS_IO_REPARSE_TAG_NOT_HANDLED, -EOPNOTSUPP, + "STATUS_REPARSE_NOT_HANDLED"}, {STATUS_DEVICE_REQUIRES_CLEANING, -EIO, "STATUS_DEVICE_REQUIRES_CLEANING"}, {STATUS_DEVICE_DOOR_OPEN, -EIO, "STATUS_DEVICE_DOOR_OPEN"},
fs/cifs/smb2ops.c +9 -0
@@ -1102,6 +1102,12 @@ smb3_parse_lease_buf(void *buf, unsigned int *epoch)return le32_to_cpu (lc->lcontext.LeaseState); } +static bool +smb2_dir_needs_close (struct cifsFileInfo *cfile) +{ +return !cfile->invalidHandle; +} +struct smb_version_operations smb20_operations = { .compare_fids = smb2_compare_fids, .setup_request = smb2_setup_request,
@@ -1175,6 +1181,7 @@ struct smb_version_operations smb20_operations = { .create_lease_buf = smb2_create_lease_buf, .parse_lease_buf = smb2_parse_lease_buf, .clone_range = smb2_clone_range, + .dir_needs_close = smb2_dir_needs_close, };struct smb_version_operations smb21_operations = {
@@ -1250,6 +1257,7 @@ struct smb_version_operations smb21_operations = { .create_lease_buf = smb2_create_lease_buf, .parse_lease_buf = smb2_parse_lease_buf, .clone_range = smb2_clone_range, + .dir_needs_close = smb2_dir_needs_close, };struct smb_version_operations smb30_operations = {
@@ -1328,6 +1336,7 @@ struct smb_version_operations smb30_operations = { .parse_lease_buf = smb3_parse_lease_buf, .clone_range = smb2_clone_range, .validate_negotiate = smb3_validate_negotiate, + .dir_needs_close = smb2_dir_needs_close, };struct smb_version_values smb20_values = {
fs/cifs/smb2pdu.c +4 -5
@@ -2136,6 +2136,10 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon, rsp = (struct smb2_query_directory_rsp *)iov[0 ].iov_base;if (rc) { +if (rc == -ENODATA && rsp->hdr.Status ==STATUS_NO_MORE_FILES ) { + srch_inf->endOfSearch = true; + rc =0 ; + }cifs_stats_fail_inc (tcon,SMB2_QUERY_DIRECTORY_HE ); goto qdir_exit; }
@@ -2173,11 +2177,6 @@ SMB2_query_directory(const unsigned int xid, struct cifs_tcon *tcon,else cifs_dbg (VFS ,"illegal search buffer type\n" ); -if (rsp->hdr.Status ==STATUS_NO_MORE_FILES ) - srch_inf->endOfSearch =1 ; -else - srch_inf->endOfSearch =0 ; -return rc; qdir_exit:
fs/exec.c +4 -1
@@ -26,6 +26,7 @@#include <linux/file.h> #include <linux/fdtable.h> #include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/stat.h> #include <linux/fcntl.h> #include <linux/swap.h>
@@ -820,7 +821,7 @@ EXPORT_SYMBOL(read_code);static int exec_mmap (struct mm_struct *mm) {struct task_struct *tsk; -struct mm_struct * old_mm, *active_mm; +struct mm_struct *old_mm, *active_mm;/* Notify parent that we're no longer interested in the old VM */ tsk = current;
@@ -846,6 +847,8 @@ static int exec_mmap(struct mm_struct *mm) tsk->mm = mm; tsk->active_mm = mm;activate_mm (active_mm, mm); + tsk->mm->vmacache_seqnum =0 ; +vmacache_flush (tsk);task_unlock (tsk);if (old_mm) {up_read (&old_mm->mmap_sem);
fs/hugetlbfs/inode.c +5 -0
@@ -1017,6 +1017,11 @@ static int __init init_hugetlbfs_fs(void)int error;int i; +if (!hugepages_supported ()) { +pr_info ("hugetlbfs: disabling because there are no supported hugepage sizes\n" ); +return -ENOTSUPP ; + } + error =bdi_init (&hugetlbfs_backing_dev_info);if (error)return error;
fs/proc/task_mmu.c +2 -1
@@ -1,4 +1,5 @@#include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/hugetlb.h> #include <linux/huge_mm.h> #include <linux/mount.h>
@@ -152,7 +153,7 @@ static void *m_start(struct seq_file *m, loff_t *pos)/* * We remember last_addr rather than next_addr to hit with -* mmap_cache most of the time. We have zero last_addr at +* vmacache most of the time. We have zero last_addr at * the beginning and also after lseek. We will have -1 last_addr * after the end of the vmas. */
fs/udf/inode.c +21 -14
@@ -1271,13 +1271,22 @@ update_time:return 0 ; } +/* +* Maximum length of linked list formed by ICB hierarchy. The chosen number is +* arbitrary - just that we hopefully don't limit any real use of rewritten +* inode on write-once media but avoid looping for too long on corrupted media. +*/ +#define UDF_MAX_ICB_NESTING 1024 +static void __udf_read_inode (struct inode *inode) {struct buffer_head *bh =NULL ;struct fileEntry *fe;uint16_t ident;struct udf_inode_info *iinfo =UDF_I (inode); +unsigned int indirections =0 ; +reread:/* * Set defaults, but the inode is still incomplete! * Note: get_new_inode() sets the following on a new inode:
@@ -1314,28 +1323,26 @@ static void __udf_read_inode(struct inode *inode) ibh =udf_read_ptagged (inode->i_sb, &iinfo->i_location,1 , &ident);if (ident ==TAG_IDENT_IE && ibh) { -struct buffer_head *nbh =NULL ;struct kernel_lb_addr loc;struct indirectEntry *ie; ie = (struct indirectEntry *)ibh->b_data; loc =lelb_to_cpu (ie->indirectICB.extLocation); -if (ie->indirectICB.extLength && - (nbh =udf_read_ptagged (inode->i_sb, &loc,0 , - &ident))) { -if (ident ==TAG_IDENT_FE || - ident ==TAG_IDENT_EFE ) { -memcpy (&iinfo->i_location, - &loc, -sizeof (struct kernel_lb_addr )); -brelse (bh); -brelse (ibh); -brelse (nbh); -__udf_read_inode (inode); +if (ie->indirectICB.extLength) { +brelse (bh); +brelse (ibh); +memcpy (&iinfo->i_location, &loc, +sizeof (struct kernel_lb_addr )); +if (++indirections >UDF_MAX_ICB_NESTING ) { +udf_err (inode->i_sb, +"too many ICBs in ICB hierarchy" +" (max %d supported)\n" , +UDF_MAX_ICB_NESTING ); +make_bad_inode (inode);return ; } -brelse (nbh); + goto reread; } }brelse (ibh);
include/linux/cpuset.h +14 -13
@@ -87,25 +87,26 @@ extern void rebuild_sched_domains(void);extern void cpuset_print_task_mems_allowed (struct task_struct *p);/* -* get_mems_allowed is required when making decisions involving mems_allowed -* such as during page allocation. mems_allowed can be updated in parallel -* and depending on the new value an operation can fail potentially causing -* process failure. A retry loop with get_mems_allowed and put_mems_allowed -* prevents these artificial failures. +* read_mems_allowed_begin is required when making decisions involving +* mems_allowed such as during page allocation. mems_allowed can be updated in +* parallel and depending on the new value an operation can fail potentially +* causing process failure. A retry loop with read_mems_allowed_begin and +* read_mems_allowed_retry prevents these artificial failures. */ -static inline unsigned int get_mems_allowed (void ) +static inline unsigned int read_mems_allowed_begin (void ) {return read_seqcount_begin (¤t->mems_allowed_seq); }/* -* If this returns false, the operation that took place after get_mems_allowed -* may have failed. It is up to the caller to retry the operation if +* If this returns true, the operation that took place after +* read_mems_allowed_begin may have failed artificially due to a concurrent +* update of mems_allowed. It is up to the caller to retry the operation if * appropriate. */ -static inline bool put_mems_allowed (unsigned int seq) +static inline bool read_mems_allowed_retry (unsigned int seq) { -return !read_seqcount_retry (¤t->mems_allowed_seq, seq); +return read_seqcount_retry (¤t->mems_allowed_seq, seq); }static inline void set_mems_allowed (nodemask_t nodemask)
@@ -225,14 +226,14 @@ static inline void set_mems_allowed(nodemask_t nodemask) { } -static inline unsigned int get_mems_allowed (void ) +static inline unsigned int read_mems_allowed_begin (void ) {return 0 ; } -static inline bool put_mems_allowed (unsigned int seq) +static inline bool read_mems_allowed_retry (unsigned int seq) { -return true; +return false; }#endif /* !CONFIG_CPUSETS */
include/linux/hugetlb.h +10 -0
@@ -400,6 +400,16 @@ static inline spinlock_t *huge_pte_lockptr(struct hstate *h, return &mm->page_table_lock; } +static inline bool hugepages_supported (void ) +{ +/* +* Some platform decide whether they support huge pages at boot +* time. On these, such as powerpc, HPAGE_SHIFT is set to 0 when +* there is no such support +*/ +return HPAGE_SHIFT !=0 ; +} +#else /* CONFIG_HUGETLB_PAGE */ struct hstate {};#define alloc_huge_page_node (h, nid) NULL
include/linux/jiffies.h +0 -12
@@ -258,23 +258,11 @@ extern unsigned long preset_lpj;#define SEC_JIFFIE_SC (32 - SHIFT_HZ)#endif #define NSEC_JIFFIE_SC (SEC_JIFFIE_SC + 29) -#define USEC_JIFFIE_SC (SEC_JIFFIE_SC + 19)#define SEC_CONVERSION ((unsigned long)((((u64)NSEC_PER_SEC << SEC_JIFFIE_SC) +\ TICK_NSEC -1) / (u64)TICK_NSEC))#define NSEC_CONVERSION ((unsigned long)((((u64)1 << NSEC_JIFFIE_SC) +\ TICK_NSEC -1) / (u64)TICK_NSEC)) -#define USEC_CONVERSION \ - ((unsigned long)((((u64)NSEC_PER_USEC << USEC_JIFFIE_SC) +\ - TICK_NSEC -1) / (u64)TICK_NSEC)) -/* -* USEC_ROUND is used in the timeval to jiffie conversion. See there -* for more details. It is the scaled resolution rounding value. Note -* that it is a 64-bit value. Since, when it is applied, we are already -* in jiffies (albit scaled), it is nothing but the bits we will shift -* off. -*/ -#define USEC_ROUND (u64)(((u64)1 << USEC_JIFFIE_SC) - 1)/* * The maximum jiffie value is (MAX_INT >> 1). Here we translate that * into seconds. The 64-bit case will overflow if we are not careful,
include/linux/mm_types.h +2 -2
@@ -342,9 +342,9 @@ struct mm_rss_stat {struct kioctx_table ;struct mm_struct { -struct vm_area_struct * mmap;/* list of VMAs */ +struct vm_area_struct *mmap;/* list of VMAs */ struct rb_root mm_rb; -struct vm_area_struct * mmap_cache;/* last find_vma result */ +u32 vmacache_seqnum;/* per-thread vmacache */ #ifdef CONFIG_MMU unsigned long (*get_unmapped_area) (struct file *filp, unsigned long addr, unsigned long len,
include/linux/plist.h +45 -0
75 lines not on this page · raw message
include/linux/sched.h +7 -0
@@ -59,6 +59,10 @@ struct sched_param {#define SCHED_ATTR_SIZE_VER0 48/* sizeof first published struct */ +#define VMACACHE_BITS 2 +#define VMACACHE_SIZE (1U << VMACACHE_BITS) +#define VMACACHE_MASK (VMACACHE_SIZE - 1) +/* * Extended scheduling parameters data structure. *
@@ -1228,6 +1232,9 @@ struct task_struct {#ifdef CONFIG_COMPAT_BRK unsigned brk_randomized:1;#endif +/* per-thread vma caching */ +u32 vmacache_seqnum; +struct vm_area_struct *vmacache[VMACACHE_SIZE ];#if defined(SPLIT_RSS_COUNTING )struct task_rss_stat rss_stat;#endif
include/linux/swap.h +2 -6
@@ -214,8 +214,9 @@ struct percpu_cluster {struct swap_info_struct {unsigned long flags;/* SWP_USED etc: see above */ signed short prio;/* swap priority of this type */ +struct plist_node list;/* entry in swap_active_head */ +struct plist_node avail_list;/* entry in swap_avail_head */ signed char type;/* strange name for an index */ -signed char next;/* next type on the swap list */ unsigned int max;/* extent of the swap_map */ unsigned char *swap_map;/* vmalloc'ed array of usage counts */ struct swap_cluster_info *cluster_info;/* cluster info. Only for SSD */
@@ -255,11 +256,6 @@ struct swap_info_struct {struct swap_cluster_info discard_cluster_tail;/* list tail of discard clusters */ }; -struct swap_list_t { -int head;/* head of priority-ordered swapfile list */ -int next;/* swapfile to be used next */ -}; -/* linux/mm/page_alloc.c */ extern unsigned long totalram_pages;extern unsigned long totalreserve_pages;
include/linux/swapfile.h +1 -1
@@ -6,7 +6,7 @@* want to expose them to the dozens of source files that include swap.h */ extern spinlock_t swap_lock; -extern struct swap_list_t swap_list; +extern struct plist_head swap_active_head;extern struct swap_info_struct *swap_info[];extern int try_to_unuse (unsigned int ,bool ,unsigned long );
include/linux/vmacache.h new file +38 -0
@@ -0,0 +1,38 @@ +#ifndef __LINUX_VMACACHE_H +#define __LINUX_VMACACHE_H + +#include <linux/sched.h> +#include <linux/mm.h> + +/* +* Hash based on the page number. Provides a good hit rate for +* workloads with good locality and those with random accesses as well. +*/ +#define VMACACHE_HASH (addr) ((addr >> PAGE_SHIFT) & VMACACHE_MASK) + +static inline void vmacache_flush (struct task_struct *tsk) +{ +memset (tsk->vmacache,0 ,sizeof (tsk->vmacache)); +} + +extern void vmacache_flush_all (struct mm_struct *mm); +extern void vmacache_update (unsigned long addr,struct vm_area_struct *newvma); +extern struct vm_area_struct *vmacache_find (struct mm_struct *mm, +unsigned long addr); + +#ifndef CONFIG_MMU +extern struct vm_area_struct *vmacache_find_exact (struct mm_struct *mm, +unsigned long start, +unsigned long end); +#endif + +static inline void vmacache_invalidate (struct mm_struct *mm) +{ + mm->vmacache_seqnum++; + +/* deal with overflows */ +if (unlikely (mm->vmacache_seqnum ==0 )) +vmacache_flush_all (mm); +} + +#endif /* __LINUX_VMACACHE_H */
include/media/videobuf2-core.h +4 -0
@@ -329,6 +329,9 @@ struct v4l2_fh;* @retry_start_streaming: start_streaming() was called, but there were not enough * buffers queued. If set, then retry calling start_streaming when * queuing a new buffer. +* @waiting_for_buffers: used in poll() to check if vb2 is still waiting for +* buffers. Only set for capture queues if qbuf has not yet been +* called since poll() needs to return POLLERR in that situation. * @fileio: file io emulator internal data, used only if emulator is active */ struct vb2_queue {
@@ -362,6 +365,7 @@ struct vb2_queue { unsigned int streaming:1; unsigned int retry_start_streaming:1; + unsigned int waiting_for_buffers:1;struct vb2_fileio_data *fileio; };
init/Kconfig +1 -0
@@ -1389,6 +1389,7 @@ config FUTEX config HAVE_FUTEX_CMPXCHG bool + depends on FUTEX help Architectures should select this if futex_atomic_cmpxchg_inatomic() is implemented and always working. This removes a couple of runtime
kernel/cpuset.c +1 -1
@@ -1022,7 +1022,7 @@ static void cpuset_change_task_nodemask(struct task_struct *tsk,task_lock (tsk);/* * Determine if a loop is necessary if another thread is doing -* get_mems_allowed(). If at least one node remains unchanged and +* read_mems_allowed_begin(). If at least one node remains unchanged and * tsk does not have a mempolicy, then an empty nodemask will not be * possible when mems_allowed is larger than a word. */
kernel/debug/debug_core.c +11 -3
@@ -49,6 +49,7 @@#include <linux/pid.h> #include <linux/smp.h> #include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/rcupdate.h> #include <asm/cacheflush.h>
@@ -224,10 +225,17 @@ static void kgdb_flush_swbreak_addr(unsigned long addr)if (!CACHE_FLUSH_IS_SAFE )return ; -if (current->mm && current->mm->mmap_cache) { -flush_cache_range (current->mm->mmap_cache, - addr, addr +BREAK_INSTR_SIZE ); +if (current->mm) { +int i; + +for (i =0 ; i <VMACACHE_SIZE ; i++) { +if (!current->vmacache[i]) +continue ; +flush_cache_range (current->vmacache[i], + addr, addr +BREAK_INSTR_SIZE ); + } } +/* Force flush instruction cache if it was outside the mm */ flush_icache_range (addr, addr +BREAK_INSTR_SIZE ); }
kernel/events/core.c +3 -1
@@ -7836,8 +7836,10 @@ int perf_event_init_task(struct task_struct *child)for_each_task_context_nr (ctxn) { ret =perf_event_init_context (child, ctxn); -if (ret) +if (ret) { +perf_event_free_task (child);return ret; + } }return 0 ;
kernel/fork.c +9 -3
@@ -28,6 +28,8 @@#include <linux/mman.h> #include <linux/mmu_notifier.h> #include <linux/fs.h> +#include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/nsproxy.h> #include <linux/capability.h> #include <linux/cpu.h>
@@ -363,7 +365,7 @@ static int dup_mmap(struct mm_struct *mm, struct mm_struct *oldmm) mm->locked_vm =0 ; mm->mmap =NULL ; - mm->mmap_cache =NULL ; + mm->vmacache_seqnum =0 ; mm->map_count =0 ;cpumask_clear (mm_cpumask (mm)); mm->mm_rb =RB_ROOT ;
@@ -876,6 +878,9 @@ static int copy_mm(unsigned long clone_flags, struct task_struct *tsk)if (!oldmm)return 0 ; +/* initialize the new vmacache entries */ +vmacache_flush (tsk); +if (clone_flags &CLONE_VM ) {atomic_inc (&oldmm->mm_users); mm = oldmm;
@@ -1323,7 +1328,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, goto bad_fork_cleanup_policy; retval =audit_alloc (p);if (retval) - goto bad_fork_cleanup_policy; + goto bad_fork_cleanup_perf;/* copy all the process information */ retval =copy_semundo (clone_flags, p);if (retval)
@@ -1522,8 +1527,9 @@ bad_fork_cleanup_semundo:exit_sem (p); bad_fork_cleanup_audit:audit_free (p); -bad_fork_cleanup_policy: +bad_fork_cleanup_perf:perf_event_free_task (p); +bad_fork_cleanup_policy:#ifdef CONFIG_NUMA mpol_put (p->mempolicy); bad_fork_cleanup_cgroup:
kernel/time.c +30 -24
84 lines not on this page · raw message
kernel/trace/ring_buffer.c +1 -1
@@ -3372,7 +3372,7 @@ static void rb_iter_reset(struct ring_buffer_iter *iter) iter->head = cpu_buffer->reader_page->read; iter->cache_reader_page = iter->head_page; - iter->cache_read = iter->head; + iter->cache_read = cpu_buffer->read;if (iter->head) iter->read_stamp = cpu_buffer->read_stamp;
lib/plist.c +52 -0
70 lines not on this page · raw message
mm/Makefile +1 -1
@@ -16,7 +16,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ readahead.o swap.o truncate.o vmscan.o shmem.o \ util.o mmzone.o vmstat.o backing-dev.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ - compaction.o balloon_compaction.o \ + compaction.o balloon_compaction.o vmacache.o \ interval_tree.o list_lru.o $(mmu-y) obj-y += init-mm.o
mm/compaction.c +50 -44
185 lines not on this page · raw message
mm/filemap.c +6 -4
@@ -192,9 +192,11 @@ static int filemap_check_errors(struct address_space *mapping) {int ret =0 ;/* Check for outstanding write errors */ -if (test_and_clear_bit (AS_ENOSPC , &mapping->flags)) +if (test_bit (AS_ENOSPC , &mapping->flags) && +test_and_clear_bit (AS_ENOSPC , &mapping->flags)) ret = -ENOSPC ; -if (test_and_clear_bit (AS_EIO , &mapping->flags)) +if (test_bit (AS_EIO , &mapping->flags) && +test_and_clear_bit (AS_EIO , &mapping->flags)) ret = -EIO ;return ret; }
@@ -520,10 +522,10 @@ struct page *__page_cache_alloc(gfp_t gfp)if (cpuset_do_page_mem_spread ()) {unsigned int cpuset_mems_cookie;do { - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin (); n =cpuset_mem_spread_node (); page =alloc_pages_exact_node (n, gfp,0 ); - }while (!put_mems_allowed (cpuset_mems_cookie) && !page); + }while (!page &&read_mems_allowed_retry (cpuset_mems_cookie));return page; }
mm/frontswap.c +4 -9
@@ -327,15 +327,12 @@ EXPORT_SYMBOL(__frontswap_invalidate_area);static unsigned long __frontswap_curr_pages (void ) { -int type;unsigned long totalpages =0 ;struct swap_info_struct *si =NULL ;assert_spin_locked (&swap_lock); -for (type = swap_list.head; type >=0 ; type = si->next) { - si = swap_info[type]; +plist_for_each_entry (si, &swap_active_head, list) totalpages +=atomic_read (&si->frontswap_pages); - }return totalpages; }
@@ -347,11 +344,9 @@ static int __frontswap_unuse_pages(unsigned long total, unsigned long *unused,int si_frontswap_pages;unsigned long total_pages_to_unuse = total;unsigned long pages =0 , pages_to_unuse =0 ; -int type;assert_spin_locked (&swap_lock); -for (type = swap_list.head; type >=0 ; type = si->next) { - si = swap_info[type]; +plist_for_each_entry (si, &swap_active_head, list) { si_frontswap_pages =atomic_read (&si->frontswap_pages);if (total_pages_to_unuse < si_frontswap_pages) { pages = pages_to_unuse = total_pages_to_unuse;
@@ -366,7 +361,7 @@ static int __frontswap_unuse_pages(unsigned long total, unsigned long *unused, }vm_unacct_memory (pages); *unused = pages_to_unuse; - *swapid = type; + *swapid = si->type; ret =0 ;break ; }
@@ -413,7 +408,7 @@ void frontswap_shrink(unsigned long target_pages)/* * we don't want to hold swap_lock while doing a very * lengthy try_to_unuse, but swap_list may change -* so restart scan from swap_list.head each time +* so restart scan from swap_active_head each time */ spin_lock (&swap_lock); ret =__frontswap_shrink (target_pages, &pages_to_unuse, &type);
mm/huge_memory.c +7 -4
@@ -1819,21 +1819,24 @@ static int __split_huge_page_map(struct page *page,if (pmd) { pgtable =pgtable_trans_huge_withdraw (mm, pmd);pmd_populate (mm, &_pmd, pgtable); +if (pmd_write (*pmd)) +BUG_ON (page_mapcount (page) !=1 ); haddr = address;for (i =0 ; i <HPAGE_PMD_NR ; i++, haddr +=PAGE_SIZE ) {pte_t *pte, entry;BUG_ON (PageCompound (page+i)); +/* +* Note that pmd_numa is not transferred deliberately +* to avoid any possibility that pte_numa leaks to +* a PROT_NONE VMA by accident. +*/ entry =mk_pte (page + i, vma->vm_page_prot); entry =maybe_mkwrite (pte_mkdirty (entry), vma);if (!pmd_write (*pmd)) entry =pte_wrprotect (entry); -else -BUG_ON (page_mapcount (page) !=1 );if (!pmd_young (*pmd)) entry =pte_mkold (entry); -if (pmd_numa (*pmd)) - entry =pte_mknuma (entry); pte =pte_offset_map (&_pmd, haddr);BUG_ON (!pte_none (*pte));set_pte_at (mm, haddr, pte, entry);
mm/hugetlb.c +15 -2
@@ -540,7 +540,7 @@ static struct page *dequeue_huge_page_vma(struct hstate *h, goto err; retry_cpuset: - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin (); zonelist =huge_zonelist (vma, address,htlb_alloc_mask (h), &mpol, &nodemask);
@@ -562,7 +562,7 @@ retry_cpuset: }mpol_cond_put (mpol); -if (unlikely (!put_mems_allowed (cpuset_mems_cookie) && !page)) +if (unlikely (!page &&read_mems_allowed_retry (cpuset_mems_cookie))) goto retry_cpuset;return page;
@@ -2071,6 +2071,9 @@ static int hugetlb_sysctl_handler_common(bool obey_mempolicy,unsigned long tmp;int ret; +if (!hugepages_supported ()) +return -ENOTSUPP ; + tmp = h->max_huge_pages;if (write && h->order >=MAX_ORDER )
@@ -2124,6 +2127,9 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,unsigned long tmp;int ret; +if (!hugepages_supported ()) +return -ENOTSUPP ; + tmp = h->nr_overcommit_huge_pages;if (write && h->order >=MAX_ORDER )
@@ -2149,6 +2155,8 @@ out:void hugetlb_report_meminfo (struct seq_file *m) {struct hstate *h = &default_hstate; +if (!hugepages_supported ()) +return ;seq_printf (m,"HugePages_Total: %5lu\n" "HugePages_Free: %5lu\n"
@@ -2165,6 +2173,8 @@ void hugetlb_report_meminfo(struct seq_file *m)int hugetlb_report_node_meminfo (int nid,char *buf) {struct hstate *h = &default_hstate; +if (!hugepages_supported ()) +return 0 ;return sprintf (buf,"Node %d HugePages_Total: %5u\n" "Node %d HugePages_Free: %5u\n"
@@ -2179,6 +2189,9 @@ void hugetlb_show_meminfo(void)struct hstate *h;int nid; +if (!hugepages_supported ()) +return ; +for_each_node_state (nid,N_MEMORY )for_each_hstate (h) pr_info("Node %d hugepages_total=%u hugepages_free=%u hugepages_surp=%u hugepages_size=%lukB\n",
mm/mempolicy.c +6 -6
@@ -1897,7 +1897,7 @@ int node_random(const nodemask_t *maskp)* If the effective policy is 'BIND, returns a pointer to the mempolicy's * @nodemask for filtering the zonelist. * -* Must be protected by get_mems_allowed() +* Must be protected by read_mems_allowed_begin() */ struct zonelist *huge_zonelist(struct vm_area_struct *vma, unsigned long addr, gfp_t gfp_flags, struct mempolicy **mpol,
@@ -2061,7 +2061,7 @@ alloc_pages_vma(gfp_t gfp, int order, struct vm_area_struct *vma, retry_cpuset: pol =get_vma_policy (current, vma, addr); - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin ();if (unlikely (pol->mode ==MPOL_INTERLEAVE )) {unsigned nid;
@@ -2069,7 +2069,7 @@ retry_cpuset: nid =interleave_nid (pol, vma, addr,PAGE_SHIFT + order);mpol_cond_put (pol); page =alloc_page_interleave (gfp, order, nid); -if (unlikely (!put_mems_allowed (cpuset_mems_cookie) && !page)) +if (unlikely (!page &&read_mems_allowed_retry (cpuset_mems_cookie))) goto retry_cpuset;return page;
@@ -2079,7 +2079,7 @@ retry_cpuset: policy_nodemask(gfp, pol));if (unlikely (mpol_needs_cond_ref (pol)))__mpol_put (pol); -if (unlikely (!put_mems_allowed (cpuset_mems_cookie) && !page)) +if (unlikely (!page &&read_mems_allowed_retry (cpuset_mems_cookie))) goto retry_cpuset;return page; }
@@ -2113,7 +2113,7 @@ struct page *alloc_pages_current(gfp_t gfp, unsigned order) pol = &default_policy; retry_cpuset: - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin ();/* * No reference counting needed for current->mempolicy
@@ -2126,7 +2126,7 @@ retry_cpuset:policy_zonelist (gfp, pol,numa_node_id ()), policy_nodemask(gfp, pol)); -if (unlikely (!put_mems_allowed (cpuset_mems_cookie) && !page)) +if (unlikely (!page &&read_mems_allowed_retry (cpuset_mems_cookie))) goto retry_cpuset;return page;
mm/migrate.c +4 -1
@@ -148,8 +148,11 @@ static int remove_migration_pte(struct page *new, struct vm_area_struct *vma, pte =pte_mkold (mk_pte (new, vma->vm_page_prot));if (pte_swp_soft_dirty (*ptep)) pte =pte_mksoft_dirty (pte); + +/* Recheck VMA as permissions can change since migration started */ if (is_write_migration_entry (entry)) - pte =pte_mkwrite (pte); + pte =maybe_mkwrite (pte, vma); +#ifdef CONFIG_HUGETLB_PAGE if (PageHuge (new)) { pte =pte_mkhuge (pte);
mm/mmap.c +29 -26
84 lines not on this page · raw message
mm/nommu.c +16 -8
@@ -15,6 +15,7 @@#include <linux/export.h> #include <linux/mm.h> +#include <linux/vmacache.h> #include <linux/mman.h> #include <linux/swap.h> #include <linux/file.h>
@@ -768,16 +769,23 @@ static void add_vma_to_mm(struct mm_struct *mm, struct vm_area_struct *vma)*/ static void delete_vma_from_mm (struct vm_area_struct *vma) { +int i;struct address_space *mapping;struct mm_struct *mm = vma->vm_mm; +struct task_struct *curr = current;kenter ("%p" , vma);protect_vma (vma,0 ); mm->map_count--; -if (mm->mmap_cache == vma) - mm->mmap_cache =NULL ; +for (i =0 ; i <VMACACHE_SIZE ; i++) { +/* if the vma is cached, invalidate the entire cache */ +if (curr->vmacache[i] == vma) { +vmacache_invalidate (curr->mm); +break ; + } + }/* remove the VMA from the mapping */ if (vma->vm_file) {
@@ -825,8 +833,8 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)struct vm_area_struct *vma;/* check the cache first */ - vma =ACCESS_ONCE (mm->mmap_cache); -if (vma && vma->vm_start <= addr && vma->vm_end > addr) + vma =vmacache_find (mm, addr); +if (likely (vma))return vma;/* trawl the list (there may be multiple mappings in which addr
@@ -835,7 +843,7 @@ struct vm_area_struct *find_vma(struct mm_struct *mm, unsigned long addr)if (vma->vm_start > addr)return NULL ;if (vma->vm_end > addr) { - mm->mmap_cache = vma; +vmacache_update (addr, vma);return vma; } }
@@ -874,8 +882,8 @@ static struct vm_area_struct *find_vma_exact(struct mm_struct *mm,unsigned long end = addr + len;/* check the cache first */ - vma = mm->mmap_cache; -if (vma && vma->vm_start == addr && vma->vm_end == end) + vma =vmacache_find_exact (mm, addr, end); +if (vma)return vma;/* trawl the list (there may be multiple mappings in which addr
@@ -886,7 +894,7 @@ static struct vm_area_struct *find_vma_exact(struct mm_struct *mm,if (vma->vm_start > addr)return NULL ;if (vma->vm_end == end) { - mm->mmap_cache = vma; +vmacache_update (addr, vma);return vma; } }
mm/page_alloc.c +7 -6
@@ -1869,7 +1869,7 @@ static void __paginginit init_zone_allows_reclaim(int nid) {int i; -for_each_online_node (i) +for_each_node_state (i,N_MEMORY )if (node_distance (nid, i) <=RECLAIM_DISTANCE )node_set (i,NODE_DATA (nid)->reclaim_nodes);else
@@ -2736,7 +2736,7 @@ __alloc_pages_nodemask(gfp_t gfp_mask, unsigned int order,return NULL ; retry_cpuset: - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin ();/* The preferred zone is used for statistics later */ first_zones_zonelist(zonelist, high_zoneidx,
@@ -2791,7 +2791,7 @@ out:* the mask is being updated. If a page allocation is about to fail, * check if the cpuset changed during allocation and if so, retry. */ -if (unlikely (!put_mems_allowed (cpuset_mems_cookie) && !page)) +if (unlikely (!page &&read_mems_allowed_retry (cpuset_mems_cookie))) goto retry_cpuset;memcg_kmem_commit_charge (page, memcg, order);
@@ -3059,9 +3059,9 @@ bool skip_free_areas_node(unsigned int flags, int nid) goto out;do { - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin (); ret = !node_isset (nid, cpuset_current_mems_allowed); - }while (!put_mems_allowed (cpuset_mems_cookie)); + }while (read_mems_allowed_retry (cpuset_mems_cookie)); out:return ret; }
@@ -4933,7 +4933,8 @@ void __paginginit free_area_init_node(int nid, unsigned long *zones_size, pgdat->node_id = nid; pgdat->node_start_pfn = node_start_pfn; -init_zone_allows_reclaim (nid); +if (node_state (nid,N_MEMORY )) +init_zone_allows_reclaim (nid);#ifdef CONFIG_HAVE_MEMBLOCK_NODE_MAP get_pfn_range_for_nid (nid, &start_pfn, &end_pfn);#endif
mm/readahead.c +2 -2
@@ -233,14 +233,14 @@ int force_page_cache_readahead(struct address_space *mapping, struct file *filp,return 0 ; } +#define MAX_READAHEAD ((512*4096)/PAGE_CACHE_SIZE)/* * Given a desired number of PAGE_CACHE_SIZE readahead pages, return a * sensible upper limit. */ unsigned long max_sane_readahead (unsigned long nr) { -return min (nr, (node_page_state (numa_node_id (),NR_INACTIVE_FILE ) - +node_page_state (numa_node_id (),NR_FREE_PAGES )) /2 ); +return min (nr,MAX_READAHEAD ); }/*
mm/slab.c +2 -2
@@ -3122,7 +3122,7 @@ static void *fallback_alloc(struct kmem_cache *cache, gfp_t flags) local_flags = flags & (GFP_CONSTRAINT_MASK |GFP_RECLAIM_MASK ); retry_cpuset: - cpuset_mems_cookie =get_mems_allowed (); + cpuset_mems_cookie =read_mems_allowed_begin (); zonelist =node_zonelist (slab_node (), flags); retry:
@@ -3180,7 +3180,7 @@ retry: } } -if (unlikely (!put_mems_allowed (cpuset_mems_cookie) && !obj)) +if (unlikely (!obj &&read_mems_allowed_retry (cpuset_mems_cookie))) goto retry_cpuset;return obj; }
mm/slub.c +7 -9
@@ -1684,7 +1684,7 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags,return NULL ; do { - cpuset_mems_cookie = get_mems_allowed(); + cpuset_mems_cookie = read_mems_allowed_begin(); zonelist = node_zonelist(slab_node(), flags); for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) { struct kmem_cache_node *n;
@@ -1696,19 +1696,17 @@ static void *get_any_partial(struct kmem_cache *s, gfp_t flags, object =get_partial_node (s, n, c, flags);if (object) {/* -* Return the object even if -* put_mems_allowed indicated that -* the cpuset mems_allowed was -* updated in parallel. It's a -* harmless race between the alloc -* and the cpuset update. +* Don't check read_mems_allowed_retry() +* here - if mems_allowed was updated in +* parallel, that was a harmless race +* between allocation and the cpuset +* update */ -put_mems_allowed (cpuset_mems_cookie);return object; } } } - }while (!put_mems_allowed (cpuset_mems_cookie)); + }while (read_mems_allowed_retry (cpuset_mems_cookie));#endif return NULL ; }
mm/swapfile.c +117 -107
348 lines not on this page · raw message
mm/vmacache.c new file +114 -0
114 lines not on this page · raw message
mm/vmscan.c +16 -16
@@ -224,15 +224,15 @@ shrink_slab_node(struct shrink_control *shrinkctl, struct shrinker *shrinker,unsigned long freed =0 ;unsigned long long delta;long total_scan; -long max_pass; +long freeable;long nr;long new_nr;int nid = shrinkctl->nid;long batch_size = shrinker->batch ? shrinker->batch :SHRINK_BATCH ; - max_pass = shrinker->count_objects (shrinker, shrinkctl); -if (max_pass ==0 ) + freeable = shrinker->count_objects (shrinker, shrinkctl); +if (freeable ==0 )return 0 ;/*
@@ -244,14 +244,14 @@ shrink_slab_node(struct shrink_control *shrinkctl, struct shrinker *shrinker, total_scan = nr; delta = (4 * nr_pages_scanned) / shrinker->seeks; - delta *= max_pass; + delta *= freeable;do_div (delta, lru_pages +1 ); total_scan += delta;if (total_scan <0 ) {printk (KERN_ERR "shrink_slab: %pF negative objects to delete nr=%ld\n" , shrinker->scan_objects, total_scan); - total_scan = max_pass; + total_scan = freeable; }/*
@@ -260,26 +260,26 @@ shrink_slab_node(struct shrink_control *shrinkctl, struct shrinker *shrinker,* shrinkers to return -1 all the time. This results in a large * nr being built up so when a shrink that can do some work * comes along it empties the entire cache due to nr >>> -* max_pass. This is bad for sustaining a working set in +* freeable. This is bad for sustaining a working set in * memory. * * Hence only allow the shrinker to scan the entire cache when * a large delta change is calculated directly. */ -if (delta < max_pass /4 ) - total_scan =min (total_scan, max_pass /2 ); +if (delta < freeable /4 ) + total_scan =min (total_scan, freeable /2 );/* * Avoid risking looping forever due to too large nr value: * never try to free more than twice the estimate number of * freeable entries. */ -if (total_scan > max_pass *2 ) - total_scan = max_pass *2 ; +if (total_scan > freeable *2 ) + total_scan = freeable *2 ;trace_mm_shrink_slab_start (shrinker, shrinkctl, nr, nr_pages_scanned, lru_pages, - max_pass, delta, total_scan); + freeable, delta, total_scan);/* * Normally, we should not scan less than batch_size objects in one
@@ -292,12 +292,12 @@ shrink_slab_node(struct shrink_control *shrinkctl, struct shrinker *shrinker,* * We detect the "tight on memory" situations by looking at the total * number of objects we want to scan (total_scan). If it is greater -* than the total number of objects on slab (max_pass), we must be +* than the total number of objects on slab (freeable), we must be * scanning at high prio and therefore should try to reclaim as much as * possible. */ while (total_scan >= batch_size || - total_scan >= max_pass) { + total_scan >= freeable) {unsigned long ret;unsigned long nr_to_scan =min (batch_size, total_scan);
@@ -1144,7 +1144,7 @@ unsigned long reclaim_clean_pages_from_list(struct zone *zone,TTU_UNMAP |TTU_IGNORE_ACCESS , &dummy1, &dummy2, &dummy3, &dummy4, &dummy5, true);list_splice (&clean_pages, page_list); -__mod_zone_page_state (zone,NR_ISOLATED_FILE , -ret); +mod_zone_page_state (zone,NR_ISOLATED_FILE , -ret);return ret; }
@@ -2424,8 +2424,8 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,unsigned long lru_pages =0 ;nodes_clear (shrink->nodes_to_scan); -for_each_zone_zonelist (zone, z, zonelist, -gfp_zone (sc->gfp_mask)) { +for_each_zone_zonelist_nodemask (zone, z, zonelist, +gfp_zone (sc->gfp_mask), sc->nodemask) {if (!cpuset_zone_allowed_hardwall (zone,GFP_KERNEL ))continue ;