From patchwork Fri Mar 21 21:17:31 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Stultz X-Patchwork-Id: 26880 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f69.google.com (mail-yh0-f69.google.com [209.85.213.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 94FD4203AB for ; Fri, 21 Mar 2014 21:17:55 +0000 (UTC) Received: by mail-yh0-f69.google.com with SMTP id b6sf7435599yha.0 for ; Fri, 21 Mar 2014 14:17:55 -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=3rXkQCBXt8CSEwnkW3x3bYepQN3T3IOBC8t4l4OOs8o=; b=d4J8mH9JE5nVU82oVjtxA/UKAD4K0IQ85pTxzqv3omT/EOyapgS9zw88j5Je6YrReX d7YNEw6h+jfPQC2r5uDFBdXPSZywVbsOA1Hlctps0H82Ohsa5UgGe9GAFJI4xGJMeMWT n4IoRj9/ZzOdWPVSRCVz3nQQU1gNW9sN5kf59789iRDTfof98W6d/OOgK12l0Np2R579 MUjq5b2eiUlcBGGhPakIdBqae/s6fYoe3/+dtiZUKk/2JrOUG8APKqDw/uXrgRov7D7D i+XeyIiD55QSYL0DdQHVNOAv/X+enGxSNE/N3hXM368KtvTSaaUUNqcpkB5lIC0+ZjNJ SLvg== X-Gm-Message-State: ALoCoQm4XlSZ0w988DMUcYXQS3NRUZCmootFN9KyXnCvONYDl4BnJ7TvEoNSKIHD9pZMHJvVPNLo X-Received: by 10.58.111.202 with SMTP id ik10mr10716265veb.4.1395436675349; Fri, 21 Mar 2014 14:17:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.102.184 with SMTP id w53ls796693qge.45.gmail; Fri, 21 Mar 2014 14:17:55 -0700 (PDT) X-Received: by 10.52.108.164 with SMTP id hl4mr10575235vdb.25.1395436675196; Fri, 21 Mar 2014 14:17:55 -0700 (PDT) Received: from mail-vc0-f182.google.com (mail-vc0-f182.google.com [209.85.220.182]) by mx.google.com with ESMTPS id t18si1398644vct.86.2014.03.21.14.17.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 14:17:55 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.182 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.182; Received: by mail-vc0-f182.google.com with SMTP id ks9so3308930vcb.27 for ; Fri, 21 Mar 2014 14:17:55 -0700 (PDT) X-Received: by 10.52.65.132 with SMTP id x4mr8022194vds.36.1395436675081; Fri, 21 Mar 2014 14:17:55 -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 i9csp59688vck; Fri, 21 Mar 2014 14:17:54 -0700 (PDT) X-Received: by 10.66.139.100 with SMTP id qx4mr34643425pab.141.1395436673676; Fri, 21 Mar 2014 14:17:53 -0700 (PDT) Received: from mail-pa0-f42.google.com (mail-pa0-f42.google.com [209.85.220.42]) by mx.google.com with ESMTPS id il2si4383298pbc.177.2014.03.21.14.17.53 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 14:17:53 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.42 is neither permitted nor denied by best guess record for domain of john.stultz@linaro.org) client-ip=209.85.220.42; Received: by mail-pa0-f42.google.com with SMTP id fb1so2910468pad.15 for ; Fri, 21 Mar 2014 14:17:53 -0700 (PDT) X-Received: by 10.68.37.42 with SMTP id v10mr39264821pbj.127.1395436673250; Fri, 21 Mar 2014 14:17:53 -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 os1sm31409893pac.20.2014.03.21.14.17.51 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 21 Mar 2014 14:17:52 -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 , "linux-mm@kvack.org" Subject: [PATCH 1/5] vrange: Add vrange syscall and handle splitting/merging and marking vmas Date: Fri, 21 Mar 2014 14:17:31 -0700 Message-Id: <1395436655-21670-2-git-send-email-john.stultz@linaro.org> X-Mailer: git-send-email 1.8.3.2 In-Reply-To: <1395436655-21670-1-git-send-email-john.stultz@linaro.org> References: <1395436655-21670-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.182 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: , This patch introduces the vrange() syscall, which allows for specifying ranges of memory as volatile, and able to be discarded by the system. This initial patch simply adds the syscall, and the vma handling, splitting and merging the vmas as needed, and marking them with VM_VOLATILE. No purging or discarding of volatile ranges is done at this point. Example man page: NAME vrange - Mark or unmark range of memory as volatile SYNOPSIS ssize_t vrange(unsigned_long start, size_t length, unsigned_long mode, unsigned_long flags, int *purged); DESCRIPTION Applications can use vrange(2) to advise kernel that pages of anonymous mapping in the given VM area can be reclaimed without swapping (or can no longer be reclaimed without swapping). The idea is that application can help kernel with page reclaim under memory pressure by specifying data it can easily regenerate and thus kernel can discard the data if needed. mode: VRANGE_VOLATILE Informs the kernel that the VM can discard in pages in the specified range when under memory pressure. VRANGE_NONVOLATILE Informs the kernel that the VM can no longer discard pages in this range. flags: Currently no flags are supported. purged: Pointer to an integer which will return 1 if mode == VRANGE_NONVOLATILE and any page in the affected range was purged. If purged returns zero during a mode == VRANGE_NONVOLATILE call, it means all of the pages in the range are intact. If a process accesses volatile memory which has been purged, and was not set as non volatile via a VRANGE_NONVOLATILE call, it will recieve a SIGBUS. RETURN VALUE On success vrange returns the number of bytes marked or unmarked. Similar to write(), it may return fewer bytes then specified if it ran into a problem. When using VRANGE_NON_VOLATILE, if the return value is smaller then the specified length, then the value specified by the purged pointer will be set to 1 if any of the pages specified in the return value as successfully marked non-volatile had been purged. If an error is returned, no changes were made. ERRORS EINVAL This error can occur for the following reasons: * The value length is negative or not page size units. * addr is not page-aligned * mode not a valid value. * flags is not a valid value. ENOMEM Not enough memory ENOMEM Addresses in the specified range are not currently mapped, or are outside the address space of the process. EFAULT Purged pointer is invalid This a simplified implementation which reuses some of the 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: linux-mm@kvack.org Signed-off-by: John Stultz --- arch/x86/syscalls/syscall_64.tbl | 1 + include/linux/mm.h | 1 + include/linux/vrange.h | 8 ++ mm/Makefile | 2 +- mm/vrange.c | 173 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 include/linux/vrange.h create mode 100644 mm/vrange.c diff --git a/arch/x86/syscalls/syscall_64.tbl b/arch/x86/syscalls/syscall_64.tbl index a12bddc..7ae3940 100644 --- a/arch/x86/syscalls/syscall_64.tbl +++ b/arch/x86/syscalls/syscall_64.tbl @@ -322,6 +322,7 @@ 313 common finit_module sys_finit_module 314 common sched_setattr sys_sched_setattr 315 common sched_getattr sys_sched_getattr +316 common vrange sys_vrange # # x32-specific system call numbers start at 512 to avoid cache impact diff --git a/include/linux/mm.h b/include/linux/mm.h index c1b7414..a1f11da 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -117,6 +117,7 @@ extern unsigned int kobjsize(const void *objp); #define VM_IO 0x00004000 /* Memory mapped I/O or similar */ /* Used by sys_madvise() */ +#define VM_VOLATILE 0x00001000 /* VMA is volatile */ #define VM_SEQ_READ 0x00008000 /* App will access data sequentially */ #define VM_RAND_READ 0x00010000 /* App will not benefit from clustered reads */ diff --git a/include/linux/vrange.h b/include/linux/vrange.h new file mode 100644 index 0000000..6e5331e --- /dev/null +++ b/include/linux/vrange.h @@ -0,0 +1,8 @@ +#ifndef _LINUX_VRANGE_H +#define _LINUX_VRANGE_H + +#define VRANGE_NONVOLATILE 0 +#define VRANGE_VOLATILE 1 +#define VRANGE_VALID_FLAGS (0) /* Don't yet support any flags */ + +#endif /* _LINUX_VRANGE_H */ diff --git a/mm/Makefile b/mm/Makefile index 310c90a..20229e2 100644 --- a/mm/Makefile +++ b/mm/Makefile @@ -16,7 +16,7 @@ obj-y := filemap.o mempool.o oom_kill.o fadvise.o \ readahead.o swap.o truncate.o vmscan.o shmem.o \ util.o mmzone.o vmstat.o backing-dev.o \ mm_init.o mmu_context.o percpu.o slab_common.o \ - compaction.o balloon_compaction.o \ + compaction.o balloon_compaction.o vrange.o \ interval_tree.o list_lru.o $(mmu-y) obj-y += init-mm.o diff --git a/mm/vrange.c b/mm/vrange.c new file mode 100644 index 0000000..2f8e2ce --- /dev/null +++ b/mm/vrange.c @@ -0,0 +1,173 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include "internal.h" + + +/** + * do_vrange - Marks or clears VMAs in the range (start-end) as VM_VOLATILE + * + * Core logic of sys_volatile. Iterates over the VMAs in the specified + * range, and marks or clears them as VM_VOLATILE, splitting or merging them + * as needed. + * + * Returns the number of bytes successfully modified. + * + * Returns error only if no bytes were modified. + */ +static ssize_t do_vrange(struct mm_struct *mm, unsigned long start, + unsigned long end, unsigned long mode, + unsigned long flags, int *purged) +{ + struct vm_area_struct *vma, *prev; + unsigned long orig_start = start; + ssize_t count = 0, ret = 0; + + down_read(&mm->mmap_sem); + + vma = find_vma_prev(mm, start, &prev); + if (vma && start > vma->vm_start) + prev = vma; + + for (;;) { + unsigned long new_flags; + pgoff_t pgoff; + unsigned long tmp; + + if (!vma) + goto out; + + if (vma->vm_flags & (VM_SPECIAL|VM_LOCKED|VM_MIXEDMAP| + VM_HUGETLB)) + goto out; + + /* We don't support volatility on files for now */ + if (vma->vm_file) { + ret = -EINVAL; + goto out; + } + + /* return ENOMEM if we're trying to mark unmapped pages */ + if (start < vma->vm_start) { + ret = -ENOMEM; + goto out; + } + + new_flags = vma->vm_flags; + + tmp = vma->vm_end; + if (end < tmp) + tmp = end; + + switch (mode) { + case VRANGE_VOLATILE: + new_flags |= VM_VOLATILE; + break; + case VRANGE_NONVOLATILE: + new_flags &= ~VM_VOLATILE; + } + + pgoff = vma->vm_pgoff + ((start - vma->vm_start) >> PAGE_SHIFT); + prev = vma_merge(mm, prev, start, tmp, new_flags, + vma->anon_vma, vma->vm_file, pgoff, + vma_policy(vma)); + if (prev) + goto success; + + if (start != vma->vm_start) { + ret = split_vma(mm, vma, start, 1); + if (ret) + goto out; + } + + if (tmp != vma->vm_end) { + ret = split_vma(mm, vma, tmp, 0); + if (ret) + goto out; + } + + prev = vma; +success: + vma->vm_flags = new_flags; + + /* update count to distance covered so far*/ + count = tmp - orig_start; + + start = tmp; + if (start < prev->vm_end) + start = prev->vm_end; + if (start >= end) + goto out; + vma = prev->vm_next; + } +out: + up_read(&mm->mmap_sem); + + /* report bytes successfully marked, even if we're exiting on error */ + if (count) + return count; + + return ret; +} + + +/** + * sys_vrange - Marks specified range as volatile or non-volatile. + * + * Validates the syscall inputs and calls do_vrange(), then copies the + * purged flag back out to userspace. + * + * Returns the number of bytes successfully modified. + * Returns error only if no bytes were modified. + */ +SYSCALL_DEFINE5(vrange, unsigned long, start, size_t, len, unsigned long, mode, + unsigned long, flags, int __user *, purged) +{ + unsigned long end; + struct mm_struct *mm = current->mm; + ssize_t ret = -EINVAL; + int p = 0; + + if (flags & ~VRANGE_VALID_FLAGS) + goto out; + + if (start & ~PAGE_MASK) + goto out; + + len &= PAGE_MASK; + if (!len) + goto out; + + end = start + len; + if (end < start) + goto out; + + if (start >= TASK_SIZE) + goto out; + + if (purged) { + /* Test pointer is valid before making any changes */ + if (put_user(p, purged)) + return -EFAULT; + } + + ret = do_vrange(mm, start, end, mode, flags, &p); + + if (purged) { + if (put_user(p, purged)) { + /* + * This would be bad, since we've modified volatilty + * and the change in purged state would be lost. + */ + WARN_ONCE(1, "vrange: purge state possibly lost\n"); + } + } + +out: + return ret; +}