From patchwork Tue Apr 26 14:44:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zach O'Keefe X-Patchwork-Id: 12827329 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id A29E7C433EF for ; Tue, 26 Apr 2022 14:44:39 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A7EF06B0083; Tue, 26 Apr 2022 10:44:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A2AB76B0085; Tue, 26 Apr 2022 10:44:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8F5506B0087; Tue, 26 Apr 2022 10:44:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.28]) by kanga.kvack.org (Postfix) with ESMTP id 81B5B6B0083 for ; Tue, 26 Apr 2022 10:44:38 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay11.hostedemail.com (Postfix) with ESMTP id 4D6B180832 for ; Tue, 26 Apr 2022 14:44:38 +0000 (UTC) X-FDA: 79399301436.14.2D97308 Received: from mail-pl1-f202.google.com (mail-pl1-f202.google.com [209.85.214.202]) by imf07.hostedemail.com (Postfix) with ESMTP id EA0094004B for ; Tue, 26 Apr 2022 14:44:35 +0000 (UTC) Received: by mail-pl1-f202.google.com with SMTP id a3-20020a1709027d8300b0015a4eccd6e4so10095693plm.13 for ; Tue, 26 Apr 2022 07:44:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=lKv9V4yTi4bWvH77oSgKL9Tk3beoanopD81y4dLGnnY=; b=N4HiqvoPvC4RTwf54SlGk0AKRUhItRZA2B7DeirAY3qb3B9JM2SHffQ8xTA1EcEFXr tgHBQYEr2OwL+v9Ht25PWM06ykaxwkofy2/ywZwpgUq2c390bdTKjYgxoTFz3dObjqkO r8UHKchyF5XolC33b7FxrybnAp4D33dkqnUyAJVaa8Mqy0QO0nl/B36Rrli/+MIkhhvM FDYnRGyo2a4HMUjtp8ytg5OF4EA442xID7f34MtUO9DrJN/JvnBofWrxr1CysX+yTlRP po/8jnaRA05iB55+DperApvdtlcG5BV3PaNp6tU/rCg4tWAIzjFXP2ugAGZNwE8JRdoy VF7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=lKv9V4yTi4bWvH77oSgKL9Tk3beoanopD81y4dLGnnY=; b=FMjpF/ZXOdkV5Src/p4eGeP1hjySYc1p3v657J94G0Z6Pr5si4o0x5R5QEst/2Aufc C9XridZIdWNDA+W50UCxvzx7fw/lYAVron9H+gR1/oPqssHq6rOaEWQXcqs9+nv8fpUJ Lm1ZCC3uZyHLAGaBmDom6n1WpwwHl2kxJH+wNBiCyvHHJyQktvAgB2PAbyCUqYpRnYPq eboLtMnpLBFAwNDlGAPM+fLMOFuViRGwgbLAH+hVOy7GMtuMnUcihxOM0ZaLxWLyU+00 VZK2KV4JsjfA+FArX89HiOJPyjkjEuLvXoLCcN76h/CDEuuywcOeKzvZUnLUP/bNE37U mf1A== X-Gm-Message-State: AOAM530Hs7BPgXyAxyLLpcYBfgsvP1DfSSXK8sJY5wu+GIVMqtG9mADE NQ95bC1CeMdXN8jW1LPAgedTJBOrD5ZU X-Google-Smtp-Source: ABdhPJwG3C8E+2LS6ibuY6YZGTS9jP8m3v/Z1ihn168+ggqK32MQkUZF+810XaNMc8NuJvotkDZmiZEFF1jz X-Received: from zokeefe3.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:1b6]) (user=zokeefe job=sendgmr) by 2002:aa7:8241:0:b0:509:979d:c760 with SMTP id e1-20020aa78241000000b00509979dc760mr24815738pfn.84.1650984276772; Tue, 26 Apr 2022 07:44:36 -0700 (PDT) Date: Tue, 26 Apr 2022 07:44:09 -0700 In-Reply-To: <20220426144412.742113-1-zokeefe@google.com> Message-Id: <20220426144412.742113-10-zokeefe@google.com> Mime-Version: 1.0 References: <20220426144412.742113-1-zokeefe@google.com> X-Mailer: git-send-email 2.36.0.rc2.479.g8af0fa9b8e-goog Subject: [PATCH v3 09/12] mm/madvise: add MADV_COLLAPSE to process_madvise() From: "Zach O'Keefe" To: Alex Shi , David Hildenbrand , David Rientjes , Matthew Wilcox , Michal Hocko , Pasha Tatashin , Peter Xu , SeongJae Park , Song Liu , Vlastimil Babka , Yang Shi , Zi Yan , linux-mm@kvack.org Cc: Andrea Arcangeli , Andrew Morton , Arnd Bergmann , Axel Rasmussen , Chris Kennelly , Chris Zankel , Helge Deller , Hugh Dickins , Ivan Kokshaysky , "James E.J. Bottomley" , Jens Axboe , "Kirill A. Shutemov" , Matt Turner , Max Filippov , Miaohe Lin , Minchan Kim , Patrick Xia , Pavel Begunkov , Thomas Bogendoerfer , "Zach O'Keefe" X-Stat-Signature: zgb8do4y5bsxb4ez7tarpbxc79s1ygsb Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=N4HiqvoP; spf=pass (imf07.hostedemail.com: domain of 3VAVoYgcKCBkOD933435DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--zokeefe.bounces.google.com designates 209.85.214.202 as permitted sender) smtp.mailfrom=3VAVoYgcKCBkOD933435DD5A3.1DBA7CJM-BB9Kz19.DG5@flex--zokeefe.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com X-Rspam-User: X-Rspamd-Server: rspam01 X-Rspamd-Queue-Id: EA0094004B X-HE-Tag: 1650984275-488620 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: Allow MADV_COLLAPSE behavior for process_madvise(2) if caller has CAP_SYS_ADMIN or is requesting collapse of it's own memory. Signed-off-by: Zach O'Keefe --- mm/madvise.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 638517952bd2..08c11217025a 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -1168,13 +1168,15 @@ madvise_behavior_valid(int behavior) } static bool -process_madvise_behavior_valid(int behavior) +process_madvise_behavior_valid(int behavior, struct task_struct *task) { switch (behavior) { case MADV_COLD: case MADV_PAGEOUT: case MADV_WILLNEED: return true; + case MADV_COLLAPSE: + return task == current || capable(CAP_SYS_ADMIN); default: return false; } @@ -1452,7 +1454,7 @@ SYSCALL_DEFINE5(process_madvise, int, pidfd, const struct iovec __user *, vec, goto free_iov; } - if (!process_madvise_behavior_valid(behavior)) { + if (!process_madvise_behavior_valid(behavior, task)) { ret = -EINVAL; goto release_task; }