From patchwork Tue Apr 29 21:21:23 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 29378 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f71.google.com (mail-qa0-f71.google.com [209.85.216.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 99C5A202DD for ; Tue, 29 Apr 2014 21:21:49 +0000 (UTC) Received: by mail-qa0-f71.google.com with SMTP id ih12sf2089738qab.6 for ; Tue, 29 Apr 2014 14:21:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=15lOWipKL0N3oxo2bGZXZYTEXax+O3qS8olf4QlrkWQ=; b=aGyk8Uhl2JlBeL7boNxgBYfpp9e4huBBVrXI2fQ9lk0UWLrLOGxAEm3jehjTx89QCB RFjPhqKX3mZP2JbQg0/x3MVvi/UqBotHFQ+rIN0GEeR4b8rEVUD4pzPXbpU40T7/HkgK a57/dRgbXlWB42yvBrLF4ymhq/1lohJcQ8r4iCLLD+7P6yDN+LXIIqOkB83CNNfJguY4 LSekO4K3Cs066CmzjTwnNYJ4Vqp9opAZrVcKkMLPSLpRZP1/XxW1CE+V4a8g3waqR6g4 3xIqc1/mNTWZ3M7jigFLlsyuetJBfbpr3w1XF/M8wTtUFaoFPGLtqSR8qXKl/nN7hKK9 2sKw== X-Gm-Message-State: ALoCoQlKcwv2qp8gf+b0J+iJZ69VYXk0jtzBQ1UAk9pXVkaZ9OkwluzJb0dPR1s+xVxYkPKppW4Y X-Received: by 10.236.69.74 with SMTP id m50mr211324yhd.0.1398806509293; Tue, 29 Apr 2014 14:21:49 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.80.145 with SMTP id c17ls320876qgd.60.gmail; Tue, 29 Apr 2014 14:21:49 -0700 (PDT) X-Received: by 10.52.6.162 with SMTP id c2mr169398vda.6.1398806509171; Tue, 29 Apr 2014 14:21:49 -0700 (PDT) Received: from mail-ve0-f179.google.com (mail-ve0-f179.google.com [209.85.128.179]) by mx.google.com with ESMTPS id sl10si2011130vdc.75.2014.04.29.14.21.49 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 14:21:49 -0700 (PDT) Received-SPF: none (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) client-ip=209.85.128.179; Received: by mail-ve0-f179.google.com with SMTP id db12so1066164veb.10 for ; Tue, 29 Apr 2014 14:21:49 -0700 (PDT) X-Received: by 10.52.108.164 with SMTP id hl4mr99680vdb.25.1398806509066; Tue, 29 Apr 2014 14:21:49 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp228825vcb; Tue, 29 Apr 2014 14:21:48 -0700 (PDT) X-Received: by 10.66.230.193 with SMTP id ta1mr450706pac.29.1398806502520; Tue, 29 Apr 2014 14:21:42 -0700 (PDT) Received: from mail-pa0-f41.google.com (mail-pa0-f41.google.com [209.85.220.41]) by mx.google.com with ESMTPS id xy8si14287167pab.365.2014.04.29.14.21.42 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 29 Apr 2014 14:21:42 -0700 (PDT) Received-SPF: none (google.com: john.stultz@linaro.org does not designate permitted sender hosts) client-ip=209.85.220.41; Received: by mail-pa0-f41.google.com with SMTP id kp14so840683pab.0 for ; Tue, 29 Apr 2014 14:21:42 -0700 (PDT) X-Received: by 10.66.148.70 with SMTP id tq6mr688277pab.56.1398806501910; Tue, 29 Apr 2014 14:21:41 -0700 (PDT) Received: from localhost.localdomain (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id yv7sm118814095pac.33.2014.04.29.14.21.40 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 29 Apr 2014 14:21:41 -0700 (PDT) From: John Stultz To: LKML Cc: John Stultz , Andrew Morton , Android Kernel Team , Johannes Weiner , Robert Love , Mel Gorman , Hugh Dickins , Dave Hansen , Rik van Riel , Dmitry Adamushko , Neil Brown , Andrea Arcangeli , Mike Hommey , Taras Glek , Jan Kara , KOSAKI Motohiro , Michel Lespinasse , Minchan Kim , Keith Packard , "linux-mm@kvack.org" Subject: [PATCH 4/4] MADV_VOLATILE: Add page purging logic & SIGBUS trap Date: Tue, 29 Apr 2014 14:21:23 -0700 Message-Id: <1398806483-19122-5-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1398806483-19122-1-git-send-email-john.stultz@linaro.org> References: <1398806483-19122-1-git-send-email-john.stultz@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: john.stultz@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: patch+caf_=patchwork-forward=linaro.org@linaro.org does not designate permitted sender hosts) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , This patch adds the hooks in the vmscan logic to purge volatile pages and mark their pte as purged. With this, volatile pages will be purged under pressure, and their ptes swap entry's marked. If the purged pages are accessed before being marked non-volatile, we catch this and send a SIGBUS. This is a simplified implementation that uses logic from Minchan's earlier efforts, so credit to Minchan for his work. Cc: Andrew Morton Cc: Android Kernel Team Cc: Johannes Weiner Cc: Robert Love Cc: Mel Gorman Cc: Hugh Dickins Cc: Dave Hansen Cc: Rik van Riel Cc: Dmitry Adamushko Cc: Neil Brown Cc: Andrea Arcangeli Cc: Mike Hommey Cc: Taras Glek Cc: Jan Kara Cc: KOSAKI Motohiro Cc: Michel Lespinasse Cc: Minchan Kim Cc: Keith Packard Cc: linux-mm@kvack.org Signed-off-by: John Stultz --- include/linux/mvolatile.h | 1 + mm/internal.h | 2 - mm/memory.c | 7 +++ mm/mvolatile.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++ mm/rmap.c | 5 ++ mm/vmscan.c | 12 +++++ 6 files changed, 144 insertions(+), 2 deletions(-) diff --git a/include/linux/mvolatile.h b/include/linux/mvolatile.h index f53396b..8b797b7 100644 --- a/include/linux/mvolatile.h +++ b/include/linux/mvolatile.h @@ -2,5 +2,6 @@ #define _LINUX_MVOLATILE_H int madvise_volatile(int bhv, unsigned long start, unsigned long end); +extern int purge_volatile_page(struct page *page); #endif /* _LINUX_MVOLATILE_H */ diff --git a/mm/internal.h b/mm/internal.h index 07b6736..2213055 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -240,10 +240,8 @@ static inline void mlock_migrate_page(struct page *newpage, struct page *page) extern pmd_t maybe_pmd_mkwrite(pmd_t pmd, struct vm_area_struct *vma); -#ifdef CONFIG_TRANSPARENT_HUGEPAGE extern unsigned long vma_address(struct page *page, struct vm_area_struct *vma); -#endif #else /* !CONFIG_MMU */ static inline int mlocked_vma_newpage(struct vm_area_struct *v, struct page *p) { diff --git a/mm/memory.c b/mm/memory.c index 037b812..cf024bd 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -61,6 +61,7 @@ #include #include #include +#include #include #include @@ -3067,6 +3068,12 @@ static int do_swap_page(struct mm_struct *mm, struct vm_area_struct *vma, migration_entry_wait(mm, pmd, address); } else if (is_hwpoison_entry(entry)) { ret = VM_FAULT_HWPOISON; + } else if (is_purged_entry(entry)) { + page_table = pte_offset_map_lock(mm, pmd, address, + &ptl); + if (likely(pte_same(*page_table, orig_pte))) + ret = VM_FAULT_SIGBUS; + goto unlock; } else { print_bad_pte(vma, address, orig_pte, NULL); ret = VM_FAULT_SIGBUS; diff --git a/mm/mvolatile.c b/mm/mvolatile.c index 555d5c4..a7831d3 100644 --- a/mm/mvolatile.c +++ b/mm/mvolatile.c @@ -232,3 +232,122 @@ out: return ret; } + + +/** + * try_to_purge_one - Purge a volatile page from a vma + * @page: page to purge + * @vma: vma to purge page from + * + * Finds the pte for a page in a vma, marks the pte as purged + * and release the page. + */ +static void try_to_purge_one(struct page *page, struct vm_area_struct *vma) +{ + struct mm_struct *mm = vma->vm_mm; + pte_t *pte; + pte_t pteval; + spinlock_t *ptl; + unsigned long addr; + + VM_BUG_ON(!PageLocked(page)); + + addr = vma_address(page, vma); + pte = page_check_address(page, mm, addr, &ptl, 0); + if (!pte) + return; + + BUG_ON(vma->vm_flags & (VM_SPECIAL|VM_LOCKED|VM_MIXEDMAP|VM_HUGETLB)); + + flush_cache_page(vma, addr, page_to_pfn(page)); + pteval = ptep_clear_flush(vma, addr, pte); + + update_hiwater_rss(mm); + if (PageAnon(page)) + dec_mm_counter(mm, MM_ANONPAGES); + else + dec_mm_counter(mm, MM_FILEPAGES); + + page_remove_rmap(page); + page_cache_release(page); + + set_pte_at(mm, addr, pte, swp_entry_to_pte(make_purged_entry())); + + pte_unmap_unlock(pte, ptl); + mmu_notifier_invalidate_page(mm, addr); +} + + +/** + * try_to_purge_vpage - check vma chain and purge from vmas marked volatile + * @page: page to purge + * + * Goes over all the vmas that hold a page, and where the vmas are volatile, + * purge the page from the vma. + * + * Returns 0 on success, -1 on error. + */ +static int try_to_purge_vpage(struct page *page) +{ + struct anon_vma *anon_vma; + struct anon_vma_chain *avc; + pgoff_t pgoff; + int ret = 0; + + anon_vma = page_lock_anon_vma_read(page); + if (!anon_vma) + return -1; + + pgoff = page->index << (PAGE_CACHE_SHIFT - PAGE_SHIFT); + /* + * During interating the loop, some processes could see a page as + * purged while others could see a page as not-purged because we have + * no global lock between parent and child for protecting mvolatile + * system call during this loop. But it's not a problem because the + * page is not *SHARED* page but *COW* page so parent and child can + * see other data anytime. The worst case by this race is a page was + * purged but couldn't be discarded so it makes unnecessary pagefault + * but it wouldn't be severe. + */ + anon_vma_interval_tree_foreach(avc, &anon_vma->rb_root, pgoff, pgoff) { + struct vm_area_struct *vma = avc->vma; + + if (!(vma->vm_flags & VM_VOLATILE)) { + ret = -1; + break; + } + try_to_purge_one(page, vma); + } + page_unlock_anon_vma_read(anon_vma); + return ret; +} + + +/** + * purge_volatile_page - If possible, purge the specified volatile page + * @page: page to purge + * + * Attempts to purge a volatile page, and if needed frees the swap page + * + * Returns 0 on success, -1 on error. + */ +int purge_volatile_page(struct page *page) +{ + VM_BUG_ON(!PageLocked(page)); + VM_BUG_ON(PageLRU(page)); + + /* XXX - for now we only support anonymous volatile pages */ + if (!PageAnon(page)) + return -1; + + if (!try_to_purge_vpage(page)) { + if (PageSwapCache(page)) + try_to_free_swap(page); + + if (page_freeze_refs(page, 1)) { + unlock_page(page); + return 0; + } + } + return -1; +} diff --git a/mm/rmap.c b/mm/rmap.c index 9c3e773..efb5c61 100644 --- a/mm/rmap.c +++ b/mm/rmap.c @@ -728,6 +728,11 @@ int page_referenced_one(struct page *page, struct vm_area_struct *vma, referenced++; } pte_unmap_unlock(pte, ptl); + if (vma->vm_flags & VM_VOLATILE) { + pra->mapcount = 0; + pra->vm_flags |= VM_VOLATILE; + return SWAP_FAIL; + } } if (referenced) { diff --git a/mm/vmscan.c b/mm/vmscan.c index 3f56c8d..a267926 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -697,6 +698,7 @@ enum page_references { PAGEREF_RECLAIM, PAGEREF_RECLAIM_CLEAN, PAGEREF_KEEP, + PAGEREF_PURGE, PAGEREF_ACTIVATE, }; @@ -717,6 +719,13 @@ static enum page_references page_check_references(struct page *page, if (vm_flags & VM_LOCKED) return PAGEREF_RECLAIM; + /* + * If volatile page is reached on LRU's tail, we discard the + * page without considering recycle the page. + */ + if (vm_flags & VM_VOLATILE) + return PAGEREF_PURGE; + if (referenced_ptes) { if (PageSwapBacked(page)) return PAGEREF_ACTIVATE; @@ -944,6 +953,9 @@ static unsigned long shrink_page_list(struct list_head *page_list, switch (references) { case PAGEREF_ACTIVATE: goto activate_locked; + case PAGEREF_PURGE: + if (!purge_volatile_page(page)) + goto free_it; case PAGEREF_KEEP: goto keep_locked; case PAGEREF_RECLAIM: