From patchwork Thu Mar 13 22:30:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 26221 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id F1C1C203AC for ; Thu, 13 Mar 2014 22:30:35 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id i8sf3662535qcq.0 for ; Thu, 13 Mar 2014 15:30:35 -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=KE6MC4NddUIbov4umDYGVtELZminT0QlzuaKxJqxUIwf/6bxH6Uwl1CPXUIfQasOFn RsVTVfy/FWt7iNjkPyOqTDioaRXR/vQqGaPj+z4g27T7xEy8EqQUOIDTzMCr3j+duRaB awWRKXwAwWOriw5z5RKScguaHUnhsoNZZYIAMPh/jpEliavqHlcWTgjPKltePgT4SuN3 h/h/q7/iVl4ny5iFzhkanKwxHruuEKGFi08Ui4CsvArvcp0KIkfRFDPGRE3SPLVWpREQ V+IVFt2H1wN1dxobWSZfgak3hCOAUwSw+ebATt8fe2LMiW4hLonk36RneKAFW+3uKvZc jPEA== X-Gm-Message-State: ALoCoQlGs4a05xrxECuBBUhYj/DsoQYGiRL62CF1HVOV0s6be53s6Pp7CjwrlxMgABexJhTBf3Q0 X-Received: by 10.58.170.6 with SMTP id ai6mr1782638vec.7.1394749835726; Thu, 13 Mar 2014 15:30:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.85.35 with SMTP id m32ls478355qgd.81.gmail; Thu, 13 Mar 2014 15:30:35 -0700 (PDT) X-Received: by 10.58.188.78 with SMTP id fy14mr3501123vec.23.1394749835669; Thu, 13 Mar 2014 15:30:35 -0700 (PDT) Received: from mail-ve0-f181.google.com (mail-ve0-f181.google.com [209.85.128.181]) by mx.google.com with ESMTPS id p9si1378922vdv.70.2014.03.13.15.30.35 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:30:35 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.128.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.128.181; Received: by mail-ve0-f181.google.com with SMTP id oy12so1807610veb.26 for ; Thu, 13 Mar 2014 15:30:35 -0700 (PDT) X-Received: by 10.58.91.101 with SMTP id cd5mr3415726veb.5.1394749835581; Thu, 13 Mar 2014 15:30:35 -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 i9csp9302vck; Thu, 13 Mar 2014 15:30:35 -0700 (PDT) X-Received: by 10.66.66.135 with SMTP id f7mr5350403pat.22.1394749834748; Thu, 13 Mar 2014 15:30:34 -0700 (PDT) Received: from mail-pd0-f181.google.com (mail-pd0-f181.google.com [209.85.192.181]) by mx.google.com with ESMTPS id hh1si2336093pac.464.2014.03.13.15.30.34 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:30:34 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.192.181 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.192.181; Received: by mail-pd0-f181.google.com with SMTP id p10so1671817pdj.40 for ; Thu, 13 Mar 2014 15:30:34 -0700 (PDT) X-Received: by 10.66.8.169 with SMTP id s9mr5243116paa.101.1394749834310; Thu, 13 Mar 2014 15:30:34 -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 yx3sm10310059pbb.6.2014.03.13.15.30.33 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 13 Mar 2014 15:30:33 -0700 (PDT) From: John Stultz To: dave@sr71.net Cc: John Stultz Subject: [PATCH 2/3] vrange: Add purged page detection on setting memory non-volatile Date: Thu, 13 Mar 2014 15:30:25 -0700 Message-Id: <1394749826-25019-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1394749826-25019-1-git-send-email-john.stultz@linaro.org> References: <1394749826-25019-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.128.181 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);