mirror of
https://github.com/Fishwaldo/Star64_linux.git
synced 2025-06-20 21:51:05 +00:00
mm: swap: SWP_SYNCHRONOUS_IO: skip swapcache only if swapped page has no other reference
When SWP_SYNCHRONOUS_IO swapped-in pages are shared by several processes, it can cause unnecessary memory wastage by skipping swap cache. Because, with swapin fault by read, they could share a page if the page were in swap cache. Thus, it avoids allocating same content new pages. This patch makes the swapcache skipping work only if the swap pte is non-sharable. [akpm@linux-foundation.org: coding-style fixes] Link: http://lkml.kernel.org/r/1507620825-5537-1-git-send-email-minchan@kernel.org Signed-off-by: Minchan Kim <minchan@kernel.org> Cc: Dan Williams <dan.j.williams@intel.com> Cc: Ross Zwisler <ross.zwisler@linux.intel.com> Cc: Hugh Dickins <hughd@google.com> Cc: Christoph Hellwig <hch@lst.de> Cc: Ilya Dryomov <idryomov@gmail.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Cc: Huang Ying <ying.huang@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:
parent
0bcac06f27
commit
aa8d22a11d
3 changed files with 23 additions and 9 deletions
19
mm/memory.c
19
mm/memory.c
|
@ -2890,15 +2890,8 @@ int do_swap_page(struct vm_fault *vmf)
|
|||
if (!page) {
|
||||
struct swap_info_struct *si = swp_swap_info(entry);
|
||||
|
||||
if (!(si->flags & SWP_SYNCHRONOUS_IO)) {
|
||||
if (vma_readahead)
|
||||
page = do_swap_page_readahead(entry,
|
||||
GFP_HIGHUSER_MOVABLE, vmf, &swap_ra);
|
||||
else
|
||||
page = swapin_readahead(entry,
|
||||
GFP_HIGHUSER_MOVABLE, vma, vmf->address);
|
||||
swapcache = page;
|
||||
} else {
|
||||
if (si->flags & SWP_SYNCHRONOUS_IO &&
|
||||
__swap_count(si, entry) == 1) {
|
||||
/* skip swapcache */
|
||||
page = alloc_page_vma(GFP_HIGHUSER_MOVABLE, vma, vmf->address);
|
||||
if (page) {
|
||||
|
@ -2908,6 +2901,14 @@ int do_swap_page(struct vm_fault *vmf)
|
|||
lru_cache_add_anon(page);
|
||||
swap_readpage(page, true);
|
||||
}
|
||||
} else {
|
||||
if (vma_readahead)
|
||||
page = do_swap_page_readahead(entry,
|
||||
GFP_HIGHUSER_MOVABLE, vmf, &swap_ra);
|
||||
else
|
||||
page = swapin_readahead(entry,
|
||||
GFP_HIGHUSER_MOVABLE, vma, vmf->address);
|
||||
swapcache = page;
|
||||
}
|
||||
|
||||
if (!page) {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue