From patchwork Tue Mar 22 21:42:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 12789120 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 C30AFC433EF for ; Tue, 22 Mar 2022 21:42:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5B3186B00C3; Tue, 22 Mar 2022 17:42:38 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 49E406B00C5; Tue, 22 Mar 2022 17:42:38 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 2F0496B00C6; Tue, 22 Mar 2022 17:42:38 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (relay.hostedemail.com [64.99.140.27]) by kanga.kvack.org (Postfix) with ESMTP id 1A4A76B00C3 for ; Tue, 22 Mar 2022 17:42:38 -0400 (EDT) Received: from smtpin14.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id E880B61885 for ; Tue, 22 Mar 2022 21:42:37 +0000 (UTC) X-FDA: 79273346754.14.B9BEF2A Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 83515180011 for ; Tue, 22 Mar 2022 21:42:37 +0000 (UTC) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id ED90761179; Tue, 22 Mar 2022 21:42:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B221EC340EE; Tue, 22 Mar 2022 21:42:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1647985356; bh=Hn/AIoQdeTw5O5kZZ7f+AVx97B+TM9hDMs/OwKX3LVQ=; h=Date:To:From:In-Reply-To:Subject:From; b=IPou8L9ZNHBCjwbnuaBc6PtXf3MRj5bX/sFfSQtSXYTb/e5HLIdpkfmORt+epFi1l drMhOv/MJSKjZdY6llZvHGNDsApFnQ7rqSEJkyd8o+8ph5sGIPeXmbkUjn0V1VsPW2 CBXrMcAGMsLXooMK0LWT4hlwD2oOFj0NBRQoMQYo= Date: Tue, 22 Mar 2022 14:42:36 -0700 To: vbabka@suse.cz,hughd@google.com,akpm@linux-foundation.org,patches@lists.linux.dev,linux-mm@kvack.org,mm-commits@vger.kernel.org,torvalds@linux-foundation.org,akpm@linux-foundation.org From: Andrew Morton In-Reply-To: <20220322143803.04a5e59a07e48284f196a2f9@linux-foundation.org> Subject: [patch 080/227] mm: _install_special_mapping() apply VM_LOCKED_CLEAR_MASK Message-Id: <20220322214236.B221EC340EE@smtp.kernel.org> Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b=IPou8L9Z; spf=pass (imf06.hostedemail.com: domain of akpm@linux-foundation.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none X-Stat-Signature: tiuhjyyz66csmm3r1habz9k7ktse9sga X-Rspam-User: X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 83515180011 X-HE-Tag: 1647985357-409415 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: From: Hugh Dickins Subject: mm: _install_special_mapping() apply VM_LOCKED_CLEAR_MASK _install_special_mapping() adds the VM_SPECIAL bit VM_DONTEXPAND (and never attempts to update locked_vm), so it ought to be consistent with mmap_region() and mlock_fixup(), making sure not to add VM_LOCKED or VM_LOCKONFAULT. I doubt that this fixes any problem in practice: just do it for consistency. Link: https://lkml.kernel.org/r/a85315a9-21d1-6133-c5fc-c89863dfb25b@google.com Signed-off-by: Hugh Dickins Cc: Vlastimil Babka Signed-off-by: Andrew Morton --- mm/mmap.c | 1 + 1 file changed, 1 insertion(+) --- a/mm/mmap.c~mm-_install_special_mapping-apply-vm_locked_clear_mask +++ a/mm/mmap.c @@ -3448,6 +3448,7 @@ static struct vm_area_struct *__install_ vma->vm_end = addr + len; vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY; + vma->vm_flags &= VM_LOCKED_CLEAR_MASK; vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); vma->vm_ops = ops;