From: "Huang, Ying" <ying.huang@intel.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: tim.c.chen@intel.com, dave.hansen@intel.com, andi.kleen@intel.com, aaron.lu@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying <ying.huang@intel.com>, Hugh Dickins <hughd@google.com>, Shaohua Li <shli@kernel.org>, Minchan Kim <minchan@kernel.org>, Rik van Riel <riel@redhat.com>, Andrea Arcangeli <aarcange@redhat.com>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH -v3 07/10] mm, THP, swap: Support to add/delete THP to/from swap cache Date: Wed, 7 Sep 2016 09:46:06 -0700 [thread overview] Message-ID: <1473266769-2155-8-git-send-email-ying.huang@intel.com> (raw) In-Reply-To: <1473266769-2155-1-git-send-email-ying.huang@intel.com> From: Huang Ying <ying.huang@intel.com> With this patch, a THP (Transparent Huge Page) can be added/deleted to/from the swap cache as a set of sub-pages (512 on x86_64). This will be used for the THP (Transparent Huge Page) swap support. Where one THP may be added/delted to/from the swap cache. This will batch the swap cache operations to reduce the lock acquire/release times for the THP swap too. Cc: Hugh Dickins <hughd@google.com> Cc: Shaohua Li <shli@kernel.org> Cc: Minchan Kim <minchan@kernel.org> Cc: Rik van Riel <riel@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: "Huang, Ying" <ying.huang@intel.com> --- include/linux/page-flags.h | 2 +- mm/swap_state.c | 57 +++++++++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 74e4dda..f5bcbea 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -314,7 +314,7 @@ PAGEFLAG_FALSE(HighMem) #endif #ifdef CONFIG_SWAP -PAGEFLAG(SwapCache, swapcache, PF_NO_COMPOUND) +PAGEFLAG(SwapCache, swapcache, PF_NO_TAIL) #else PAGEFLAG_FALSE(SwapCache) #endif diff --git a/mm/swap_state.c b/mm/swap_state.c index c335251..db2299f 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -43,6 +43,7 @@ struct address_space swapper_spaces[MAX_SWAPFILES] = { }; #define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0) +#define ADD_CACHE_INFO(x, nr) do { swap_cache_info.x += (nr); } while (0) static struct { unsigned long add_total; @@ -80,25 +81,32 @@ void show_swap_cache_info(void) */ int __add_to_swap_cache(struct page *page, swp_entry_t entry) { - int error; + int error, i, nr = hpage_nr_pages(page); struct address_space *address_space; VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageSwapCache(page), page); VM_BUG_ON_PAGE(!PageSwapBacked(page), page); - get_page(page); + page_ref_add(page, nr); SetPageSwapCache(page); - set_page_private(page, entry.val); address_space = swap_address_space(entry); spin_lock_irq(&address_space->tree_lock); - error = radix_tree_insert(&address_space->page_tree, - entry.val, page); + for (i = 0; i < nr; i++) { + struct page *cur_page = page + i; + unsigned long index = entry.val + i; + + set_page_private(cur_page, index); + error = radix_tree_insert(&address_space->page_tree, + index, cur_page); + if (unlikely(error)) + break; + } if (likely(!error)) { - address_space->nrpages++; - __inc_node_page_state(page, NR_FILE_PAGES); - INC_CACHE_INFO(add_total); + address_space->nrpages += nr; + __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, nr); + ADD_CACHE_INFO(add_total, nr); } spin_unlock_irq(&address_space->tree_lock); @@ -109,9 +117,16 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry) * So add_to_swap_cache() doesn't returns -EEXIST. */ VM_BUG_ON(error == -EEXIST); - set_page_private(page, 0UL); ClearPageSwapCache(page); - put_page(page); + set_page_private(page + i, 0UL); + while (i--) { + struct page *cur_page = page + i; + unsigned long index = entry.val + i; + + set_page_private(cur_page, 0UL); + radix_tree_delete(&address_space->page_tree, index); + } + page_ref_sub(page, nr); } return error; @@ -122,7 +137,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask) { int error; - error = radix_tree_maybe_preload(gfp_mask); + error = radix_tree_maybe_preload_order(gfp_mask, compound_order(page)); if (!error) { error = __add_to_swap_cache(page, entry); radix_tree_preload_end(); @@ -138,6 +153,7 @@ void __delete_from_swap_cache(struct page *page) { swp_entry_t entry; struct address_space *address_space; + int i, nr = hpage_nr_pages(page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(!PageSwapCache(page), page); @@ -145,12 +161,17 @@ void __delete_from_swap_cache(struct page *page) entry.val = page_private(page); address_space = swap_address_space(entry); - radix_tree_delete(&address_space->page_tree, page_private(page)); - set_page_private(page, 0); ClearPageSwapCache(page); - address_space->nrpages--; - __dec_node_page_state(page, NR_FILE_PAGES); - INC_CACHE_INFO(del_total); + for (i = 0; i < nr; i++) { + struct page *cur_page = page + i; + + radix_tree_delete(&address_space->page_tree, + page_private(cur_page)); + set_page_private(cur_page, 0); + } + address_space->nrpages -= nr; + __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, -nr); + ADD_CACHE_INFO(del_total, nr); } /** @@ -227,8 +248,8 @@ void delete_from_swap_cache(struct page *page) __delete_from_swap_cache(page); spin_unlock_irq(&address_space->tree_lock); - swapcache_free(entry); - put_page(page); + __swapcache_free(entry, PageTransHuge(page)); + page_ref_sub(page, hpage_nr_pages(page)); } /* -- 2.8.1
WARNING: multiple messages have this Message-ID (diff)
From: "Huang, Ying" <ying.huang@intel.com> To: Andrew Morton <akpm@linux-foundation.org> Cc: tim.c.chen@intel.com, dave.hansen@intel.com, andi.kleen@intel.com, aaron.lu@intel.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, Huang Ying <ying.huang@intel.com>, Hugh Dickins <hughd@google.com>, Shaohua Li <shli@kernel.org>, Minchan Kim <minchan@kernel.org>, Rik van Riel <riel@redhat.com>, Andrea Arcangeli <aarcange@redhat.com>, "Kirill A . Shutemov" <kirill.shutemov@linux.intel.com> Subject: [PATCH -v3 07/10] mm, THP, swap: Support to add/delete THP to/from swap cache Date: Wed, 7 Sep 2016 09:46:06 -0700 [thread overview] Message-ID: <1473266769-2155-8-git-send-email-ying.huang@intel.com> (raw) In-Reply-To: <1473266769-2155-1-git-send-email-ying.huang@intel.com> From: Huang Ying <ying.huang@intel.com> With this patch, a THP (Transparent Huge Page) can be added/deleted to/from the swap cache as a set of sub-pages (512 on x86_64). This will be used for the THP (Transparent Huge Page) swap support. Where one THP may be added/delted to/from the swap cache. This will batch the swap cache operations to reduce the lock acquire/release times for the THP swap too. Cc: Hugh Dickins <hughd@google.com> Cc: Shaohua Li <shli@kernel.org> Cc: Minchan Kim <minchan@kernel.org> Cc: Rik van Riel <riel@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Signed-off-by: "Huang, Ying" <ying.huang@intel.com> --- include/linux/page-flags.h | 2 +- mm/swap_state.c | 57 +++++++++++++++++++++++++++++++--------------- 2 files changed, 40 insertions(+), 19 deletions(-) diff --git a/include/linux/page-flags.h b/include/linux/page-flags.h index 74e4dda..f5bcbea 100644 --- a/include/linux/page-flags.h +++ b/include/linux/page-flags.h @@ -314,7 +314,7 @@ PAGEFLAG_FALSE(HighMem) #endif #ifdef CONFIG_SWAP -PAGEFLAG(SwapCache, swapcache, PF_NO_COMPOUND) +PAGEFLAG(SwapCache, swapcache, PF_NO_TAIL) #else PAGEFLAG_FALSE(SwapCache) #endif diff --git a/mm/swap_state.c b/mm/swap_state.c index c335251..db2299f 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -43,6 +43,7 @@ struct address_space swapper_spaces[MAX_SWAPFILES] = { }; #define INC_CACHE_INFO(x) do { swap_cache_info.x++; } while (0) +#define ADD_CACHE_INFO(x, nr) do { swap_cache_info.x += (nr); } while (0) static struct { unsigned long add_total; @@ -80,25 +81,32 @@ void show_swap_cache_info(void) */ int __add_to_swap_cache(struct page *page, swp_entry_t entry) { - int error; + int error, i, nr = hpage_nr_pages(page); struct address_space *address_space; VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageSwapCache(page), page); VM_BUG_ON_PAGE(!PageSwapBacked(page), page); - get_page(page); + page_ref_add(page, nr); SetPageSwapCache(page); - set_page_private(page, entry.val); address_space = swap_address_space(entry); spin_lock_irq(&address_space->tree_lock); - error = radix_tree_insert(&address_space->page_tree, - entry.val, page); + for (i = 0; i < nr; i++) { + struct page *cur_page = page + i; + unsigned long index = entry.val + i; + + set_page_private(cur_page, index); + error = radix_tree_insert(&address_space->page_tree, + index, cur_page); + if (unlikely(error)) + break; + } if (likely(!error)) { - address_space->nrpages++; - __inc_node_page_state(page, NR_FILE_PAGES); - INC_CACHE_INFO(add_total); + address_space->nrpages += nr; + __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, nr); + ADD_CACHE_INFO(add_total, nr); } spin_unlock_irq(&address_space->tree_lock); @@ -109,9 +117,16 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry) * So add_to_swap_cache() doesn't returns -EEXIST. */ VM_BUG_ON(error == -EEXIST); - set_page_private(page, 0UL); ClearPageSwapCache(page); - put_page(page); + set_page_private(page + i, 0UL); + while (i--) { + struct page *cur_page = page + i; + unsigned long index = entry.val + i; + + set_page_private(cur_page, 0UL); + radix_tree_delete(&address_space->page_tree, index); + } + page_ref_sub(page, nr); } return error; @@ -122,7 +137,7 @@ int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask) { int error; - error = radix_tree_maybe_preload(gfp_mask); + error = radix_tree_maybe_preload_order(gfp_mask, compound_order(page)); if (!error) { error = __add_to_swap_cache(page, entry); radix_tree_preload_end(); @@ -138,6 +153,7 @@ void __delete_from_swap_cache(struct page *page) { swp_entry_t entry; struct address_space *address_space; + int i, nr = hpage_nr_pages(page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(!PageSwapCache(page), page); @@ -145,12 +161,17 @@ void __delete_from_swap_cache(struct page *page) entry.val = page_private(page); address_space = swap_address_space(entry); - radix_tree_delete(&address_space->page_tree, page_private(page)); - set_page_private(page, 0); ClearPageSwapCache(page); - address_space->nrpages--; - __dec_node_page_state(page, NR_FILE_PAGES); - INC_CACHE_INFO(del_total); + for (i = 0; i < nr; i++) { + struct page *cur_page = page + i; + + radix_tree_delete(&address_space->page_tree, + page_private(cur_page)); + set_page_private(cur_page, 0); + } + address_space->nrpages -= nr; + __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, -nr); + ADD_CACHE_INFO(del_total, nr); } /** @@ -227,8 +248,8 @@ void delete_from_swap_cache(struct page *page) __delete_from_swap_cache(page); spin_unlock_irq(&address_space->tree_lock); - swapcache_free(entry); - put_page(page); + __swapcache_free(entry, PageTransHuge(page)); + page_ref_sub(page, hpage_nr_pages(page)); } /* -- 2.8.1 -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2016-09-07 16:47 UTC|newest] Thread overview: 120+ messages / expand[flat|nested] mbox.gz Atom feed top 2016-09-07 16:45 [PATCH -v3 00/10] THP swap: Delay splitting THP during swapping out Huang, Ying 2016-09-07 16:45 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 01/10] mm, swap: Make swap cluster size same of THP size on x86_64 Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-08 5:45 ` Anshuman Khandual 2016-09-08 5:45 ` Anshuman Khandual 2016-09-08 18:07 ` Huang, Ying 2016-09-08 18:07 ` Huang, Ying 2016-09-19 17:09 ` Johannes Weiner 2016-09-19 17:09 ` Johannes Weiner 2016-09-20 2:01 ` Huang, Ying 2016-09-20 2:01 ` Huang, Ying 2016-09-22 19:25 ` Johannes Weiner 2016-09-22 19:25 ` Johannes Weiner 2016-09-23 8:47 ` Huang, Ying 2016-09-08 8:21 ` Anshuman Khandual 2016-09-08 8:21 ` Anshuman Khandual 2016-09-08 11:03 ` Kirill A. Shutemov 2016-09-08 11:03 ` Kirill A. Shutemov 2016-09-08 17:39 ` Huang, Ying 2016-09-08 17:39 ` Huang, Ying 2016-09-08 11:07 ` Kirill A. Shutemov 2016-09-08 11:07 ` Kirill A. Shutemov 2016-09-08 17:23 ` Huang, Ying 2016-09-08 17:23 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 02/10] mm, memcg: Add swap_cgroup_iter iterator Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 03/10] mm, memcg: Support to charge/uncharge multiple swap entries Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-08 5:46 ` Anshuman Khandual 2016-09-08 5:46 ` Anshuman Khandual 2016-09-08 8:28 ` Anshuman Khandual 2016-09-08 8:28 ` Anshuman Khandual 2016-09-08 18:15 ` Huang, Ying 2016-09-08 18:15 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 04/10] mm, THP, swap: Add swap cluster allocate/free functions Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-08 5:49 ` Anshuman Khandual 2016-09-08 5:49 ` Anshuman Khandual 2016-09-08 8:30 ` Anshuman Khandual 2016-09-08 8:30 ` Anshuman Khandual 2016-09-08 18:14 ` Huang, Ying 2016-09-08 18:14 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 05/10] mm, THP, swap: Add get_huge_swap_page() Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-08 11:13 ` Kirill A. Shutemov 2016-09-08 11:13 ` Kirill A. Shutemov 2016-09-08 17:22 ` Huang, Ying 2016-09-08 17:22 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 06/10] mm, THP, swap: Support to clear SWAP_HAS_CACHE for huge page Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-07 16:46 ` Huang, Ying [this message] 2016-09-07 16:46 ` [PATCH -v3 07/10] mm, THP, swap: Support to add/delete THP to/from swap cache Huang, Ying 2016-09-08 9:00 ` Anshuman Khandual 2016-09-08 9:00 ` Anshuman Khandual 2016-09-08 18:10 ` Huang, Ying 2016-09-08 18:10 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 08/10] mm, THP: Add can_split_huge_page() Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-08 11:17 ` Kirill A. Shutemov 2016-09-08 11:17 ` Kirill A. Shutemov 2016-09-08 17:02 ` Huang, Ying 2016-09-08 17:02 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 09/10] mm, THP, swap: Support to split THP in swap cache Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-07 16:46 ` [PATCH -v3 10/10] mm, THP, swap: Delay splitting THP during swap out Huang, Ying 2016-09-07 16:46 ` Huang, Ying 2016-09-09 5:43 ` [PATCH -v3 00/10] THP swap: Delay splitting THP during swapping out Minchan Kim 2016-09-09 5:43 ` Minchan Kim 2016-09-09 15:53 ` Tim Chen 2016-09-09 15:53 ` Tim Chen 2016-09-09 20:35 ` Huang, Ying 2016-09-09 20:35 ` Huang, Ying 2016-09-13 6:13 ` Minchan Kim 2016-09-13 6:13 ` Minchan Kim 2016-09-13 6:40 ` Huang, Ying 2016-09-13 6:40 ` Huang, Ying 2016-09-13 7:05 ` Minchan Kim 2016-09-13 7:05 ` Minchan Kim 2016-09-13 8:53 ` Huang, Ying 2016-09-13 8:53 ` Huang, Ying 2016-09-13 9:16 ` Minchan Kim 2016-09-13 9:16 ` Minchan Kim 2016-09-13 23:52 ` Chen, Tim C 2016-09-13 23:52 ` Chen, Tim C 2016-09-19 7:11 ` Minchan Kim 2016-09-19 7:11 ` Minchan Kim 2016-09-19 15:59 ` Tim Chen 2016-09-19 15:59 ` Tim Chen 2016-09-18 1:53 ` Huang, Ying 2016-09-18 1:53 ` Huang, Ying 2016-09-19 7:08 ` Minchan Kim 2016-09-19 7:08 ` Minchan Kim 2016-09-20 2:54 ` Huang, Ying 2016-09-20 2:54 ` Huang, Ying 2016-09-20 5:06 ` Minchan Kim 2016-09-20 5:06 ` Minchan Kim 2016-09-20 5:28 ` Huang, Ying 2016-09-20 5:28 ` Huang, Ying 2016-09-13 14:35 ` Andrea Arcangeli 2016-09-13 14:35 ` Andrea Arcangeli 2016-09-19 17:33 ` Hugh Dickins 2016-09-19 17:33 ` Hugh Dickins 2016-09-22 22:56 ` Shaohua Li 2016-09-22 22:56 ` Shaohua Li 2016-09-22 23:49 ` Chen, Tim C 2016-09-22 23:49 ` Chen, Tim C 2016-09-22 23:53 ` Andi Kleen 2016-09-22 23:53 ` Andi Kleen 2016-09-23 0:38 ` Rik van Riel 2016-09-23 2:32 ` Huang, Ying 2016-09-23 2:32 ` Huang, Ying 2016-09-25 19:18 ` Shaohua Li 2016-09-25 19:18 ` Shaohua Li 2016-09-26 1:06 ` Minchan Kim 2016-09-26 1:06 ` Minchan Kim 2016-09-26 3:25 ` Huang, Ying 2016-09-26 3:25 ` Huang, Ying 2016-09-23 2:12 ` Huang, Ying 2016-09-23 2:12 ` Huang, Ying
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1473266769-2155-8-git-send-email-ying.huang@intel.com \ --to=ying.huang@intel.com \ --cc=aarcange@redhat.com \ --cc=aaron.lu@intel.com \ --cc=akpm@linux-foundation.org \ --cc=andi.kleen@intel.com \ --cc=dave.hansen@intel.com \ --cc=hughd@google.com \ --cc=kirill.shutemov@linux.intel.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=minchan@kernel.org \ --cc=riel@redhat.com \ --cc=shli@kernel.org \ --cc=tim.c.chen@intel.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.