From patchwork Tue May 18 07:20:28 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 12263959 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.4 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 814EFC433ED for ; Tue, 18 May 2021 07:23:44 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0CCE161059 for ; Tue, 18 May 2021 07:23:44 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0CCE161059 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=55FED6HJ3JvcIGObKyjRzAJbLz83tSHAZ2kEPjNuVD4=; b=obPNyvMzpYXgLqWO9SLiXMzNE I1p6NqcYuxBWgOyYbgEJktXU5alHh5ieK97WYZF+rt9ZZWhWUbWebpQQoRWPT0djMY3Hf8G6VYQNZ ZB61B5yhOk2IMDFixsotlLKxcJZxeFgv83oD64LNUCpHOjYFWKBvYnhMnyw/AGxAeVfUZ8f/kMIDM nR9tjSNygQjb4QEEuyVtfGoLDokckyPDFA7dF7JkWSE4yHP2hWUnp5Ptv0UjRYFK3m1L1p0Y+5cWO hErYwzLdOp/zsqOczZwsj/TbQS3AjFQUouMAasMQZgbXqwyAf9ORxX5hhOvjon0EkFGgVuuDZuHIl FWHgLlinA==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1liu2f-00HIcN-6I; Tue, 18 May 2021 07:21:25 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liu2Q-00HIZT-U6; Tue, 18 May 2021 07:21:11 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=xlPv8bK+kYUHQ5KeZlE+cVBt7o0l6PJl4UCe9txHG6M=; b=5HB/xxhtZlaCqLz2JoX2WfSSg0 ABH2r5kTWCpXYatzJwJu9n1cSohX6i2S8/0jUWgl+Pc6flxb65GSKtYkPIahyrAViYA4u3FK0rFhK sNHVWkrcuoMgzWhGLiy3s0bKZOnIxl4A2CBJ6whZbRi3PfTk7rcToLDHiR+wrg+Tm0yIFWoYuX40O amPHdY+q4H0CqhFwiwhB2NBfTMVWMCbNKEE+7cZux8tZecJ2tHe81FYmjt5AkjZTlGpKQ0JOe+k1r /v8NKBD/I0ajFAb1Dofl87VPI9ZUliVUOuUNWHUu/eHt25B6GgiXRoKTxtJ0fw1XFSm2zhpfRwww1 ojuDtYFw==; Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1liu2I-00EP0c-O9; Tue, 18 May 2021 07:21:09 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id D22F961354; Tue, 18 May 2021 07:20:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1621322462; bh=md5mw3JUxzbtFFaaDyyGq19iUCguUIMuIFvGTOhePfw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=P3a06ZJvRz46kFMWg9pf/IOA57egQ4wI4Y69wTSENf0rhnnoM1Z1TFAYh++bdWLkO l37aYiW/A19EiugDX/o+LTgeqNGZkGfpYZ8dsPIo4w7OfAN3GOzpk39b+YUTbQOFFD bHM8C5jkExlpXHUfQyAYCDnuTkKf+0hH5Ia/huO48ztdE2CTC8xeFt/hOJ44BoBK2r suvk4iWxgOEuQIkvkNfZCJi1YFWTfWWhU4hhk+jrQRe0cbmxPzaasQqBdo0eE5MJs8 eDY5z1K7TwGmk5h3yoUPMEXy36XzNRB7ph+/3fCIokWZmcS+j+jB/l83bRiAFAb52m Fzfz3N3IoPG2Q== From: Mike Rapoport To: Andrew Morton Cc: Alexander Viro , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Catalin Marinas , Christopher Lameter , Dan Williams , Dave Hansen , David Hildenbrand , Elena Reshetova , "H. Peter Anvin" , Hagen Paul Pfeifer , Ingo Molnar , James Bottomley , James Bottomley , Kees Cook , "Kirill A. Shutemov" , Matthew Wilcox , Matthew Garrett , Mark Rutland , Michal Hocko , Mike Rapoport , Mike Rapoport , Michael Kerrisk , Palmer Dabbelt , Palmer Dabbelt , Paul Walmsley , Peter Zijlstra , "Rafael J. Wysocki" , Rick Edgecombe , Roman Gushchin , Shakeel Butt , Shuah Khan , Thomas Gleixner , Tycho Andersen , Will Deacon , Yury Norov , linux-api@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-nvdimm@lists.01.org, linux-riscv@lists.infradead.org, x86@kernel.org Subject: [PATCH v20 1/7] mmap: make mlock_future_check() global Date: Tue, 18 May 2021 10:20:28 +0300 Message-Id: <20210518072034.31572-2-rppt@kernel.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210518072034.31572-1-rppt@kernel.org> References: <20210518072034.31572-1-rppt@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210518_002102_868254_890A41F5 X-CRM114-Status: GOOD ( 16.53 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Mike Rapoport It will be used by the upcoming secret memory implementation. Signed-off-by: Mike Rapoport Reviewed-by: David Hildenbrand Acked-by: James Bottomley Cc: Alexander Viro Cc: Andy Lutomirski Cc: Arnd Bergmann Cc: Borislav Petkov Cc: Catalin Marinas Cc: Christopher Lameter Cc: Dan Williams Cc: Dave Hansen Cc: David Hildenbrand Cc: Elena Reshetova Cc: Hagen Paul Pfeifer Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: James Bottomley Cc: "Kirill A. Shutemov" Cc: Mark Rutland Cc: Matthew Wilcox Cc: Michael Kerrisk Cc: Palmer Dabbelt Cc: Palmer Dabbelt Cc: Paul Walmsley Cc: Peter Zijlstra Cc: Rick Edgecombe Cc: Roman Gushchin Cc: Shakeel Butt Cc: Shuah Khan Cc: Thomas Gleixner Cc: Tycho Andersen Cc: Will Deacon --- mm/internal.h | 3 +++ mm/mmap.c | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 54bd0dc2c23c..46eb82eaa195 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -373,6 +373,9 @@ static inline void munlock_vma_pages_all(struct vm_area_struct *vma) extern void mlock_vma_page(struct page *page); extern unsigned int munlock_vma_page(struct page *page); +extern int mlock_future_check(struct mm_struct *mm, unsigned long flags, + unsigned long len); + /* * Clear the page's PageMlocked(). This can be useful in a situation where * we want to unconditionally remove a page from the pagecache -- e.g., diff --git a/mm/mmap.c b/mm/mmap.c index 0584e540246e..81f5595a8490 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -1352,9 +1352,8 @@ static inline unsigned long round_hint_to_min(unsigned long hint) return hint; } -static inline int mlock_future_check(struct mm_struct *mm, - unsigned long flags, - unsigned long len) +int mlock_future_check(struct mm_struct *mm, unsigned long flags, + unsigned long len) { unsigned long locked, lock_limit;