From patchwork Mon Jun 13 19:44:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Topi Miettinen X-Patchwork-Id: 9174211 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A25816044F for ; Mon, 13 Jun 2016 19:48:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 92A3520499 for ; Mon, 13 Jun 2016 19:48:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 870A0262AE; Mon, 13 Jun 2016 19:48:18 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F4FD20499 for ; Mon, 13 Jun 2016 19:48:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1423494AbcFMTrF (ORCPT ); Mon, 13 Jun 2016 15:47:05 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:34101 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965248AbcFMTrC (ORCPT ); Mon, 13 Jun 2016 15:47:02 -0400 Received: by mail-wm0-f66.google.com with SMTP id n184so17320643wmn.1; Mon, 13 Jun 2016 12:47:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qOlbhEmlV3EH0Mfl8CoDqYWLfuFS7M48jqO9+7z1JTU=; b=Cfk4uFJG/Edgixsyj/Cd4n+RGtDRrrGtX5wfFP0hEtLnrJuPfb3+8ph9lfvhrkfR6R 88gkgEeSrMoC5x4qvir993wvOxEch4ZpgmswPoolZhM6/qDKCloyGX1Ef6tHdkMGX8GN yudsLc3Q16lQF8ln3H6NRvYcPqzwAJMXNCEn3jjbPC+RNC5Vv2CivYvpes7KPxho2unH 1ff3ItGrEdxmiD0JlPo18zimOIES36XSF1R2ZgXdfGwNRVfH8TT/17dAK4JUD7IV2rWp d4r3BU+DSYDxxxVnzryy0mMrIBrrX/qtxJXWSW4FMqXLxIRAHYaA6xBbHStRqKZbBIzO jAYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qOlbhEmlV3EH0Mfl8CoDqYWLfuFS7M48jqO9+7z1JTU=; b=UOvFB6+dqm8g2lwPEqfV5AdzoRP5SQsOjB0UuHLvJbq1Cpd2O93kaRSDE9UzNKmLxk BDDuElOL/+7qNCqBDZPAYjjWLTo9pavMJ0j6eGpY1SzTL/XR+gu/r0/AuYd32hPP4hDd FeVtqnrXTqhLmzIcnY9MTNKM2ewPyciLcyP2WKRyHny1k/WaLRjv+KP0SDJbn7L/3ewE +ngGeyw1iVCWFo2NGRBi+Zs65kA0EWcYt0c482PGIbqt/AQioA9mnFnCFKeD4tb3OmK2 r1Va6qE2canttB/wS/CgR4KO8Nvc7PjMUYR5eD3IjHz1jl6w58Ui8+1SIxU2LScWZ2Ov S+NQ== X-Gm-Message-State: ALyK8tLwwcjlDck9U/tB3QQJTzKgxOE/e1SULsl9KrmYfB4VfSw+04gtI+Zz/lkRgn3IAw== X-Received: by 10.194.83.202 with SMTP id s10mr2609051wjy.17.1465847215983; Mon, 13 Jun 2016 12:46:55 -0700 (PDT) Received: from localhost.localdomain ([2001:2003:f54a:b700:2ab2:bdff:fe10:799e]) by smtp.gmail.com with ESMTPSA id c9sm29135737wjh.49.2016.06.13.12.46.53 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jun 2016 12:46:55 -0700 (PDT) From: Topi Miettinen To: linux-kernel@vger.kernel.org Cc: Topi Miettinen , Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org (maintainer:X86 ARCHITECTURE (32-BIT AND 64-BIT)), Alexander Viro , Michal Hocko , Andrew Morton , Vlastimil Babka , Cyrill Gorcunov , "Eric W. Biederman" , Mateusz Guzik , John Stultz , Ben Segall , Alexey Dobriyan , "Kirill A. Shutemov" , Oleg Nesterov , Chen Gang , Konstantin Khlebnikov , Andrea Arcangeli , Andrey Ryabinin , linux-fsdevel@vger.kernel.org (open list:FILESYSTEMS (VFS and infrastructure)), linux-mm@kvack.org (open list:MEMORY MANAGEMENT) Subject: [RFC 08/18] limits: track RLIMIT_DATA actual max Date: Mon, 13 Jun 2016 22:44:15 +0300 Message-Id: <1465847065-3577-9-git-send-email-toiwoton@gmail.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1465847065-3577-1-git-send-email-toiwoton@gmail.com> References: <1465847065-3577-1-git-send-email-toiwoton@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Track maximum size of data VM, presented in /proc/self/limits. Signed-off-by: Topi Miettinen --- arch/x86/ia32/ia32_aout.c | 1 + fs/binfmt_aout.c | 1 + fs/binfmt_flat.c | 1 + kernel/sys.c | 2 ++ mm/mmap.c | 6 +++++- 5 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/x86/ia32/ia32_aout.c b/arch/x86/ia32/ia32_aout.c index cb26f18..8a7d502 100644 --- a/arch/x86/ia32/ia32_aout.c +++ b/arch/x86/ia32/ia32_aout.c @@ -398,6 +398,7 @@ beyond_if: regs->r8 = regs->r9 = regs->r10 = regs->r11 = regs->r12 = regs->r13 = regs->r14 = regs->r15 = 0; set_fs(USER_DS); + bump_limit(RLIMIT_DATA, ex.a_data + ex.a_bss); return 0; } diff --git a/fs/binfmt_aout.c b/fs/binfmt_aout.c index ae1b540..86c6548 100644 --- a/fs/binfmt_aout.c +++ b/fs/binfmt_aout.c @@ -330,6 +330,7 @@ beyond_if: regs->gp = ex.a_gpvalue; #endif start_thread(regs, ex.a_entry, current->mm->start_stack); + bump_limit(RLIMIT_DATA, ex.a_data + ex.a_bss); return 0; } diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index caf9e39..e309dad 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -792,6 +792,7 @@ static int load_flat_file(struct linux_binprm * bprm, libinfo->lib_list[id].start_brk) + /* start brk */ stack_len); + bump_limit(RLIMIT_DATA, data_len + bss_len); return 0; err: return ret; diff --git a/kernel/sys.c b/kernel/sys.c index 89d5be4..6629f6f 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1896,6 +1896,8 @@ static int prctl_set_mm_map(int opt, const void __user *addr, unsigned long data if (prctl_map.auxv_size) memcpy(mm->saved_auxv, user_auxv, sizeof(user_auxv)); + bump_limit(RLIMIT_DATA, mm->end_data - mm->start_data); + up_write(&mm->mmap_sem); return 0; } diff --git a/mm/mmap.c b/mm/mmap.c index de2c176..61867de 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -228,6 +228,8 @@ SYSCALL_DEFINE1(brk, unsigned long, brk) goto out; set_brk: + bump_rlimit(RLIMIT_DATA, (brk - mm->start_brk) + + (mm->end_data - mm->start_data)); mm->brk = brk; populate = newbrk > oldbrk && (mm->def_flags & VM_LOCKED) != 0; up_write(&mm->mmap_sem); @@ -2924,8 +2926,10 @@ void vm_stat_account(struct mm_struct *mm, vm_flags_t flags, long npages) mm->exec_vm += npages; else if (is_stack_mapping(flags)) mm->stack_vm += npages; - else if (is_data_mapping(flags)) + else if (is_data_mapping(flags)) { mm->data_vm += npages; + bump_rlimit(RLIMIT_DATA, mm->data_vm << PAGE_SHIFT); + } } static int special_mapping_fault(struct vm_area_struct *vma,