From patchwork Thu Mar 13 22:21:09 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 26218 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f197.google.com (mail-ie0-f197.google.com [209.85.223.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 37396203AC for ; Thu, 13 Mar 2014 22:21:19 +0000 (UTC) Received: by mail-ie0-f197.google.com with SMTP id rd18sf5692556iec.0 for ; Thu, 13 Mar 2014 15:21:18 -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=//iV7s4tKB52LaSkz3ofDeklKny33oh+97ScGKkEHqk=; b=jOZ2SJtq0zHZ38jnoxa9hO9PB8VljnZG+MO5s2MPYsyNg4lumYob0JF0rsdAiQAYZC B5cWP15/wqDWWzXKYUW4L4IZ1hoo61q6OeJ1gnzztmHeuvcq62V03HVF6WfIN8xqSmtD u6KAOYxkXGAr64KWzEalwRL2t9sAoo+UN3CN5mLvYEKkgsPFEybD2Y2PdfcB6/w6jpZT JfNCEc8sESPFMJTnA0PFp2BKofyH/+8DeAzsMrHYl8vxMT54BIQGEu84IiIySEydJzbb 9GdR2MEpmlOUEfgxaT0W7IpFbdm+CtBsFguWwvAApp0lUFgfQUiNAxRn/byEc5pKANJP TTgw== X-Gm-Message-State: ALoCoQlTQxMFaWLhKvZ9YgpcGrfeU232ZIItdxD47ExigZ13pWUVUVUArYx06t7bufuFJ5X+NQXS X-Received: by 10.51.16.65 with SMTP id fu1mr1727480igd.3.1394749278722; Thu, 13 Mar 2014 15:21:18 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.49.113 with SMTP id p104ls536647qga.41.gmail; Thu, 13 Mar 2014 15:21:18 -0700 (PDT) X-Received: by 10.221.55.133 with SMTP id vy5mr3364699vcb.17.1394749278636; Thu, 13 Mar 2014 15:21:18 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id tr5si1376156vdc.26.2014.03.13.15.21.18 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:21:18 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id lf12so1842231vcb.39 for ; Thu, 13 Mar 2014 15:21:18 -0700 (PDT) X-Received: by 10.52.251.199 with SMTP id zm7mr2889855vdc.21.1394749278502; Thu, 13 Mar 2014 15:21:18 -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.78.9 with SMTP id i9csp8833vck; Thu, 13 Mar 2014 15:21:18 -0700 (PDT) X-Received: by 10.68.40.138 with SMTP id x10mr5342452pbk.8.1394749277352; Thu, 13 Mar 2014 15:21:17 -0700 (PDT) Received: from mail-pb0-f53.google.com (mail-pb0-f53.google.com [209.85.160.53]) by mx.google.com with ESMTPS id mp8si3590326pbc.202.2014.03.13.15.21.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:21:17 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.160.53 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.160.53; Received: by mail-pb0-f53.google.com with SMTP id rp16so1709217pbb.26 for ; Thu, 13 Mar 2014 15:21:17 -0700 (PDT) X-Received: by 10.68.245.162 with SMTP id xp2mr5110528pbc.69.1394749276965; Thu, 13 Mar 2014 15:21:16 -0700 (PDT) Received: from buildbox.hsd1.or.comcast.net (c-67-170-153-23.hsd1.or.comcast.net. [67.170.153.23]) by mx.google.com with ESMTPSA id zb2sm10243072pbc.30.2014.03.13.15.21.15 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:21:16 -0700 (PDT) From: John Stultz To: Dave Hansen Cc: John Stultz Subject: [PATCH 2/3] vrange: Add purged page detection on setting memory non-volatile Date: Thu, 13 Mar 2014 15:21:09 -0700 Message-Id: <1394749270-24750-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394749270-24750-1-git-send-email-john.stultz@linaro.org> References: <1394749270-24750-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: 209.85.220.180 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) 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: , Users of volatile ranges will need to know if memory was discarded. This patch adds the purged state tracking required to inform userland when it marks memory as non-volatile that some memory in that range was purged and needs to be regenerated. This simplified implementation which uses some of the logic from Minchan's earlier efforts, so credit to Minchan for his work. Signed-off-by: John Stultz --- include/linux/swap.h | 15 ++++++++++++-- include/linux/vrange.h | 13 ++++++++++++ mm/vrange.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 82 insertions(+), 2 deletions(-) diff --git a/include/linux/swap.h b/include/linux/swap.h index 46ba0c6..18c12f9 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h @@ -70,8 +70,19 @@ static inline int current_is_kswapd(void) #define SWP_HWPOISON_NUM 0 #endif -#define MAX_SWAPFILES \ - ((1 << MAX_SWAPFILES_SHIFT) - SWP_MIGRATION_NUM - SWP_HWPOISON_NUM) + +/* + * Purged volatile range pages + */ +#define SWP_VRANGE_PURGED_NUM 1 +#define SWP_VRANGE_PURGED (MAX_SWAPFILES + SWP_HWPOISON_NUM + SWP_MIGRATION_NUM) + + +#define MAX_SWAPFILES ((1 << MAX_SWAPFILES_SHIFT) \ + - SWP_MIGRATION_NUM \ + - SWP_HWPOISON_NUM \ + - SWP_VRANGE_PURGED_NUM \ + ) /* * Magic header for a swap area. The first part of the union is diff --git a/include/linux/vrange.h b/include/linux/vrange.h index 652396b..c4a1616 100644 --- a/include/linux/vrange.h +++ b/include/linux/vrange.h @@ -1,7 +1,20 @@ #ifndef _LINUX_VRANGE_H #define _LINUX_VRANGE_H +#include +#include + #define VRANGE_NONVOLATILE 0 #define VRANGE_VOLATILE 1 +static inline swp_entry_t swp_entry_mk_vrange_purged(void) +{ + return swp_entry(SWP_VRANGE_PURGED, 0); +} + +static inline int entry_is_vrange_purged(swp_entry_t entry) +{ + return swp_type(entry) == SWP_VRANGE_PURGED; +} + #endif /* _LINUX_VRANGE_H */ diff --git a/mm/vrange.c b/mm/vrange.c index d9116b1..0214076 100644 --- a/mm/vrange.c +++ b/mm/vrange.c @@ -8,6 +8,59 @@ #include #include "internal.h" +struct vrange_walker { + struct vm_area_struct *vma; + int pages_purged; +}; + +static int vrange_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, + struct mm_walk *walk) +{ + struct vrange_walker *vw = walk->private; + struct vm_area_struct *uninitialized_var(vma); + pte_t *pte; + spinlock_t *ptl; + + vma = vw->vma; + split_huge_page_pmd(vma, addr, pmd); + if (pmd_trans_unstable(pmd)) + return 0; + + pte = pte_offset_map_lock(walk->mm, pmd, addr, &ptl); + for (; addr != end; pte++, addr += PAGE_SIZE) { + if (!pte_present(*pte)) { + swp_entry_t vrange_entry = pte_to_swp_entry(*pte); + + if (unlikely(entry_is_vrange_purged(vrange_entry))) + vw->pages_purged = 1; + } + } + pte_unmap_unlock(pte - 1, ptl); + cond_resched(); + + return 0; +} + +static unsigned long vrange_check_purged(struct mm_struct *mm, + struct vm_area_struct *vma, + unsigned long start, + unsigned long end) +{ + struct vrange_walker vw; + struct mm_walk vrange_walk = { + .pmd_entry = vrange_pte_range, + .mm = vma->vm_mm, + .private = &vw, + }; + vw.pages_purged = 0; + vw.vma = vma; + + walk_page_range(start, end, &vrange_walk); + + return vw.pages_purged; + +} + static ssize_t do_vrange(struct mm_struct *mm, unsigned long start, unsigned long end, int mode, int *purged) { @@ -57,6 +110,9 @@ static ssize_t do_vrange(struct mm_struct *mm, unsigned long start, break; case VRANGE_NONVOLATILE: new_flags &= ~VM_VOLATILE; + lpurged |= vrange_check_purged(mm, vma, + vma->vm_start, + vma->vm_end); } pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT);