AuxXxilium/linux_dsm_epyc7002
1
0
Fork 0
mirror of https://github.com/AuxXxilium/linux_dsm_epyc7002.git synced 2024-11-24 14:20:55 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

mm, swap: don't use VMA based swap readahead if HDD is used as swap

Browse Source 
VMA based swap readahead will readahead the virtual pages that is
continuous in the virtual address space.  While the original swap
readahead will readahead the swap slots that is continuous in the swap
device.  Although VMA based swap readahead is more correct for the swap
slots to be readahead, it will trigger more small random readings, which
may cause the performance of HDD (hard disk) to degrade heavily, and may
finally exceed the benefit.

To avoid the issue, in this patch, if the HDD is used as swap, the VMA
based swap readahead will be disabled, and the original swap readahead
will be used instead.

Link: http://lkml.kernel.org/r/20170807054038.1843-6-ying.huang@intel.com
Signed-off-by: "Huang, Ying" <ying.huang@intel.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Minchan Kim <minchan@kernel.org>
Cc: Rik van Riel <riel@redhat.com>
Cc: Shaohua Li <shli@kernel.org>
Cc: Hugh Dickins <hughd@google.com>
Cc: Fengguang Wu <fengguang.wu@intel.com>
Cc: Tim Chen <tim.c.chen@intel.com>
Cc: Dave Hansen <dave.hansen@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Huang Ying 2017-09-06 16:24:43 -07:00 committed by Linus Torvalds
parent d9bfcfdc41
commit 81a0298bdf
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/linux/swap.h
View File

@ -400,16 +400,17 @@ extern struct page *do_swap_page_readahead(swp_entry_t fentry, gfp_t gfp_mask,
struct vm_fault *vmf, struct vm_fault *vmf,
struct vma_swap_readahead *swap_ra); struct vma_swap_readahead *swap_ra);
static inline bool swap_use_vma_readahead(void)
{
return READ_ONCE(swap_vma_readahead);
}
/* linux/mm/swapfile.c */ /* linux/mm/swapfile.c */
extern atomic_long_t nr_swap_pages; extern atomic_long_t nr_swap_pages;
extern long total_swap_pages; extern long total_swap_pages;
extern atomic_t nr_rotate_swap;
extern bool has_usable_swap(void); extern bool has_usable_swap(void);
static inline bool swap_use_vma_readahead(void)
{
return READ_ONCE(swap_vma_readahead) && !atomic_read(&nr_rotate_swap);
}
/* Swap 50% full? Release swapcache more aggressively.. */ /* Swap 50% full? Release swapcache more aggressively.. */
static inline bool vm_swap_full(void) static inline bool vm_swap_full(void)
{ {

8
mm/swapfile.c
View File

@ -96,6 +96,8 @@ static DECLARE_WAIT_QUEUE_HEAD(proc_poll_wait);
/* Activity counter to indicate that a swapon or swapoff has occurred */ /* Activity counter to indicate that a swapon or swapoff has occurred */
static atomic_t proc_poll_event = ATOMIC_INIT(0); static atomic_t proc_poll_event = ATOMIC_INIT(0);
atomic_t nr_rotate_swap = ATOMIC_INIT(0);
static inline unsigned char swap_count(unsigned char ent) static inline unsigned char swap_count(unsigned char ent)
{ {
return ent & ~SWAP_HAS_CACHE; /* may include SWAP_HAS_CONT flag */ return ent & ~SWAP_HAS_CACHE; /* may include SWAP_HAS_CONT flag */
@ -2569,6 +2571,9 @@ SYSCALL_DEFINE1(swapoff, const char __user *, specialfile)
if (p->flags & SWP_CONTINUED) if (p->flags & SWP_CONTINUED)
free_swap_count_continuations(p); free_swap_count_continuations(p);
if (!p->bdev || !blk_queue_nonrot(bdev_get_queue(p->bdev)))
atomic_dec(&nr_rotate_swap);
mutex_lock(&swapon_mutex); mutex_lock(&swapon_mutex);
spin_lock(&swap_lock); spin_lock(&swap_lock);
spin_lock(&p->lock); spin_lock(&p->lock);
@ -3145,7 +3150,8 @@ SYSCALL_DEFINE2(swapon, const char __user *, specialfile, int, swap_flags)
cluster = per_cpu_ptr(p->percpu_cluster, cpu); cluster = per_cpu_ptr(p->percpu_cluster, cpu);
cluster_set_null(&cluster->index); cluster_set_null(&cluster->index);
} }
} } else
atomic_inc(&nr_rotate_swap);
error = swap_cgroup_swapon(p->type, maxpages); error = swap_cgroup_swapon(p->type, maxpages);
if (error) if (error)