From mboxrd@z Thu Jan 1 00:00:00 1970 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 5372FC05027 for ; Thu, 26 Jan 2023 09:20:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id BC85E6B0071; Thu, 26 Jan 2023 04:20:37 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id B53E76B0075; Thu, 26 Jan 2023 04:20:37 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 97C9A6B0073; Thu, 26 Jan 2023 04:20:37 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 7D7836B0072 for ; Thu, 26 Jan 2023 04:20:37 -0500 (EST) Received: from smtpin24.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 555A914064F for ; Thu, 26 Jan 2023 09:20:37 +0000 (UTC) X-FDA: 80396404914.24.4E73877 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by imf12.hostedemail.com (Postfix) with ESMTP id 361EE4000F; Thu, 26 Jan 2023 09:20:34 +0000 (UTC) Authentication-Results: imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JmyjvNON; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674724835; a=rsa-sha256; cv=none; b=jDmIX8zoaeNrSSvWlEij/3GDr8+x1orp3G12BRMtoEf7jBui7t/iQcFsxsp0d3WcKlQq2k NM/fhD6qTIemcuorX1YvoiKyPLcFZG5qafrVANApMWPTTcqDSE+yrU8xvdQAiopdbHI8Uj vLPgq1f6eX+7+yTI7H2A2zeL4ve4f6k= ARC-Authentication-Results: i=1; imf12.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=JmyjvNON; spf=pass (imf12.hostedemail.com: domain of rppt@kernel.org designates 145.40.68.75 as permitted sender) smtp.mailfrom=rppt@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674724835; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=Nw0s+iOGwE5ewwKvFJLNs9mGXGEq6YMBUPCHPhGK/Xg=; b=0r82MEnMgAb6WwIo2db8ORRItxYuSb6TtWotozFwLEiOiXeUTmeTqGF8tJegL5E+3FYZkh gZi4c7JLrPYX2X/baspOTENTCLqM+eZGz5vQ7e2I2jmTOpiKG0mv1wk7fDMCHUH96WYUut f0HMOddEswCSktjs2DzU2CaV8ClKGcQ= 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 ams.source.kernel.org (Postfix) with ESMTPS id B276EB81CBE; Thu, 26 Jan 2023 09:20:33 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2F7DBC433D2; Thu, 26 Jan 2023 09:19:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674724832; bh=73aMcUob1WYX+/b4rggndOJ7N9caL088plxdfjSDDEQ=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=JmyjvNONg1SgIhjqFFggxa6D/d0DdvOOGuNt2dtDINzMuck9VRm1yrgcKsMjflpW+ SwTLsN9QAcAPFlEDt4IXaVuzKuvw/QTFDgiE6iXZrjCF1Dk77N344FV6FZLMxl/SIh YCzWCtWMyri2S/VxFa8w5izmma6QvGZR6W3LW+HhZQLDOEjS2QQ4+yWFtPAWXwzXjB 8sjW4u5olaD4DQ8+tTWSGydqMOF+S7T6bSIcqdA9DZQS+/0Qnjc5pNbohtILz6vsxE pH2w8v8IDyyC1JX/SGY55iAqC16GztTVGkZPd8qlGsAwBxzWAs0I60Xu7VFg5IVHwG yDtfzpUFPYi0Q== Date: Thu, 26 Jan 2023 11:19:37 +0200 From: Mike Rapoport To: Suren Baghdasaryan Cc: akpm@linux-foundation.org, michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, vbabka@suse.cz, hannes@cmpxchg.org, mgorman@techsingularity.net, dave@stgolabs.net, willy@infradead.org, liam.howlett@oracle.com, peterz@infradead.org, ldufour@linux.ibm.com, paulmck@kernel.org, luto@kernel.org, songliubraving@fb.com, peterx@redhat.com, david@redhat.com, dhowells@redhat.com, hughd@google.com, bigeasy@linutronix.de, kent.overstreet@linux.dev, punit.agrawal@bytedance.com, lstoakes@gmail.com, peterjung1337@gmail.com, rientjes@google.com, axelrasmussen@google.com, joelaf@google.com, minchan@google.com, jannh@google.com, shakeelb@google.com, tatashin@google.com, edumazet@google.com, gthelen@google.com, gurua@google.com, arjunroy@google.com, soheil@google.com, hughlynch@google.com, leewalsh@google.com, posk@google.com, will@kernel.org, aneesh.kumar@linux.ibm.com, npiggin@gmail.com, chenhuacai@kernel.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, richard@nod.at, anton.ivanov@cambridgegreys.com, johannes@sipsolutions.net, qianweili@huawei.com, wangzhou1@hisilicon.com, herbert@gondor.apana.org.au, davem@davemloft.net, vkoul@kernel.org, airlied@gmail.com, daniel@ffwll.ch, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, l.stach@pengutronix.de, krzysztof.kozlowski@linaro.org, patrik.r.jakobsson@gmail.com, matthias.bgg@gmail.com, robdclark@gmail.com, quic_abhinavk@quicinc.com, dmitry.baryshkov@linaro.org, tomba@kernel.org, hjc@rock-chips.com, heiko@sntech.de, ray.huang@amd.com, kraxel@redhat.com, sre@kernel.org, mcoquelin.stm32@gmail.com, alexandre.torgue@foss.st.com, tfiga@chromium.org, m.szyprowski@samsung.com, mchehab@kernel.org, dimitri.sivanich@hpe.com, zhangfei.gao@linaro.org, jejb@linux.ibm.com, martin.petersen@oracle.com, dgilbert@interlog.com, hdegoede@redhat.com, mst@redhat.com, jasowang@redhat.com, alex.williamson@redhat.com, deller@gmx.de, jayalk@intworks.biz, viro@zeniv.linux.org.uk, nico@fluxnic.net, xiang@kernel.org, chao@kernel.org, tytso@mit.edu, adilger.kernel@dilger.ca, miklos@szeredi.hu, mike.kravetz@oracle.com, muchun.song@linux.dev, bhe@redhat.com, andrii@kernel.org, yoshfuji@linux-ipv6.org, dsahern@kernel.org, kuba@kernel.org, pabeni@redhat.com, perex@perex.cz, tiwai@suse.com, haojian.zhuang@gmail.com, robert.jarzmik@free.fr, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, linux-graphics-maintainer@vmware.com, linux-ia64@vger.kernel.org, linux-arch@vger.kernel.org, loongarch@lists.linux.dev, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-sgx@vger.kernel.org, linux-um@lists.infradead.org, linux-acpi@vger.kernel.org, linux-crypto@vger.kernel.org, nvdimm@lists.linux.dev, dmaengine@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, etnaviv@lists.freedesktop.org, linux-samsung-soc@vger.kernel.org, intel-gfx@lists.freedesktop.org, linux-mediatek@lists.infradead.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-rockchip@lists.infradead.org, linux-tegra@vger.kernel.org, virtualization@lists.linux-foundation.org, xen-devel@lists.xenproject.org, linux-stm32@st-md-mailman.stormreply.com, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, linux-accelerators@lists.ozlabs.org, sparclinux@vger.kernel.org, linux-scsi@vger.kernel.org, linux-staging@lists.linux.dev, target-devel@vger.kernel.org, linux-usb@vger.kernel.org, netdev@vger.kernel.org, linux-fbdev@vger.kernel.org, linux-aio@kvack.org, linux-fsdevel@vger.kernel.org, linux-erofs@lists.ozlabs.org, linux-ext4@vger.kernel.org, devel@lists.orangefs.org, kexec@lists.infradead.org, linux-xfs@vger.kernel.org, bpf@vger.kernel.org, linux-perf-users@vger.kernel.org, kasan-dev@googlegroups.com, selinux@vger.kernel.org, alsa-devel@alsa-project.org, kernel-team@android.com Subject: Re: [PATCH v2 2/6] mm: replace VM_LOCKED_CLEAR_MASK with VM_LOCKED_MASK Message-ID: References: <20230125083851.27759-1-surenb@google.com> <20230125083851.27759-3-surenb@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230125083851.27759-3-surenb@google.com> X-Rspam-User: X-Rspamd-Queue-Id: 361EE4000F X-Rspamd-Server: rspam01 X-Stat-Signature: xtw8ada8sd9f8kiwb4eh8gsp6g191qe3 X-HE-Tag: 1674724834-272988 X-HE-Meta: U2FsdGVkX19aRcxW3mYf3IIeB4aQ5Mtf3mE2K1JLeI54mL7/kpWAUXhdFWgBlZ7pCwNZoi21NcjYJCIrCuUWVPdLbQJ9zDPcD9ALSwDCVvQz0l8s1U6MUsdRvPpSjJBZZfsO6T0Wlatqfk/egfQXs8T+ROIQOhFE4nfYYlW9N6gp556HvCvbWrYkk01aT2nOnYGk1Nb2vckAX8cmFjas7VVcQMw7lh6AT6Y0IONkuTmpXVaL9to6ImzBaqOF6LX5lDvc6I6gLybwpFL7WLPi5lwBtiO1MvrXwAso89kiymohGi08a026pGsz+3vMpLGLDNVXIGnMtAfu+1I2tLFs/Y606tHZbVcWULS5MjfyB4Fyh/yO1Zb/XVsl2rfZwdgXs4lPDetOlRxzsU3c8j/0HeTo405NF3EVTfwV4d92aKkPVPh8hB/xgx2FnPDDadXH3KfRS7iWIHwIqx/jq0jSjXgF4fp2zAaiKNGOD8LEJF/wBiM7Sm2or/SfhbQG7uL77N5S+Br3IDh8cfG33VvGnUs3Urqzehcv2lMCJiQ/0wmwAR3ZihOFpYE5zndrmxvM+DZf4RdmOkbYc7MYLMbzBtnZ6H8dYxjExN5UmVTrlRFWWdL1/vFk+R3XxKVMDxIVhJsDMZas9U2R1p7F6PUEAQVERoUQpEthAGVhto1VfVTznL6HHy/eCWA5rZ7xgu9RBeBTVmljjUBdcfPfCWlafliHiYdH6WsY1/BPfkT7WCpmkK3A+9PutrVoO7q78Ru0eNLtpDbOjUwR0jtDug8JRNyYm7uNs0NxM6Lm45pRq4t0ARQ05jnPlnSqqPWP49W6jysxOwRHi0LrOfkTWeqzkHO9rRwS1H0+T367yBIcJTGh7dTChvsC6hlS0xE+0sENXUEPjfmN7RpwR8fGvYQlZQTTRNY4G0XUPjyIvMHF4T86Fdg+2YiTFqz3frJOD5tXgGFlwakBUmm+TRSaUbO FW7fnIM0 9At26LzCyRDF5oZ7KKsZB4zvKtPWPHf4j1OHBw5YZzUDzQBj2huZ28fk0kS98vqmf0mzE22BRTTQMkGqcWHJTm74HNMOlJVFNr+lpsdviXKtypXr5NpXTuj+8XQTAAuI6GJPhWjkj91wdDWwLx9WrsTYkcx1BahQd565OGlMrSwslnoCWS8y41xHdZPnwKyrIZi+kNMk8TLA7u+RmJsmcQHoyyMD8t96EwCE9HOd6WqPqpfTuTNX2WxTz4CsiN2n3HGBMkeC1CBce0GqOdU4LcoFlAZI+0Uto3GVLNlc1wvhHpT8mgog8oirkA4RZn5rgtsrfCDpvmoc2RPupqagGWPokMkKPkVKNuUcjO8h0C+5HF+bscLzNfHvUt6Obp7KUKLHW0c5pZWrRR1mZ91dw8nzUKJlT5KVQCmmcEZAL+LHqbrIFgiqXxIOxGk4I8ztt7Ehc2qtys8ebWO3iHeWxBHr94eV7PxLd1Rieytu2Sh3pG7GrL8KkUHPiXRH4Sda/lJ1+tpz8kdD3hKv4YLZ2VpTax6gq9wrTDijjSTifADVpnQmW+sCFQsxsEIHyDKocvcaAxvahkiYMSAtWfmzL0MQoiiY7mHDthdmi8mD41Zq5lJKdQtKbn1V/lt6jwR/ABPd2IzTgDvbnJLsUiS0M2Dg0ITGVlXV9QnC1OywQHAltTO0YY38mTQqtSDqRaTO1JXtpsfdCPKHsnOtLcHdpWpanq8ieJfzj+norMrFJy7DM0XdIV6l7+EkUeNCFlSDYbjlvEXDy964Iw2sPkr78c2+KIuXEk5p7bN8e5bnzVR1qK8ZN8Q/ZLuqpljVlSvWqerH/niEBTkn2xIdfKub2Z+uCHOcArYWEz2JX7K6lfHKwjJdXwrUB7WTNDGHomUFyNrm0pOPLTQC9gPVjiGlgNQiYy3QPdN37akBvzBRU2ltla4Uv9xFQQUxXxeHkPFvBQPRuQYiK0IQWphxq/49PvN4Cz68g hUa3vbL+ OIz0ugxiRulZ6P1/01BI2x5KwAKZKvxmj+kPiAFiCN5IVYU0t6i/jeuf6kmXM2nI1ZnvbxQXWbi4sKaa2GGKYa4DoGzXeMP0Qr9VEN7bQFG1nYoGBcwHO9dRlAcbtNT0K7iETNlTz7Iy7JAXX7Er1GXsQjpZ1P34Hut2sLOZwmNyvslLn0izyMMmbp2IxO8pzJ+oHjAKmL5Zo9NR4OlEoRkK60E5sDxH3vhIZojiHnGBv0B1wXsJ2RtO8GBi4Lc73Lt0mX3qqiefMw4zP+ocO5fuoYaMUeAp/iaSmAJBc0URAkb3WW/bKaMzUlenrGgIwcmPWcMHbFvFnISBdlZNUeksyEORZhr14vT7bxrhFw0TvQvlS+ZpjR1HRKLjCCt4v1oQkDLniaIfrfCtNOcGxvvVq1oG6TpJRK+iQsUMskZ5NvJAfEfkbfJ6HP01ykXANXEuzGG2oYGJxEk/5XiHfLvfkVH64qZJQ5DkXsNpzYrLceEt53ZPs53tbjeidEG87YS9F44si6le5RgQUyP69Q8NdnXjuH23sXUhxIznWoTVm2/cBrSnOBTIxmlEs4XY6ITaGcZUVE5hhf7CwJAyop4PTCJWWfMyD1M5PeRjjslkRRCRhWGfnp/p28MtEl/5d03uwkNp3+lNv65ArR3xT8B6T0KiPkB5mEE04LScSAD21GfLr9vAoiqI/uwMmPJT2BazoohT6hE7yI+5TcYzM5b7qg01xkYrPVN1MBjXoF971Z6xmbavvExndDiC7lam10buDeoXFNxwHK5OByR1nfi5bV6YjSNl/Ocfy8qxwCMdEfkXw9T04qQlCSNOrOoKcAPz4nEquxifaMxZVBcTZx2l3GJzpduaFgPfvK6Vq785ipoulIkzxOHz9fzrTufrPhGM6EPdzhSMXp0aHHiLm445zcYpG2CqE9YzpGfPRyP4CbgpPq5cLSPvOrXwJmF2R1GthKELdeqVuPw3OPNldHJnn2iQ7 YOk7oVVx LEA5wwBO0bQBLcDwBosp0eGCgdU8+SSe+s8/6X+Qfu5XH6aQilW3OgHRNictBKd5knlBcyn27f7hJdc0ozH6q4ptTGyio/fTCt8TiF8FMEmzO6H40UnJk1Iq4tgZRsRHeyKdCGi0GfnMUJAE8VnUOqXhj6Duf6nHd5gAp985rsXEDETcuQTfHgbR0reNju6Cd53JU8pH3V4aJIckWGmBSeIeq5f+FWsR+iyzNEDaFynSkhwuAAD5riZ6vNedQ6g70oxnJT+uoLxA1yrCkEIzWgp+ydeQQZyxA29FRjG91AuTuyazF+ATsrE+zfOqa0AIcEOoyG6iURBpSFbwmNBSwymIS6xkzBW3WL8QiyDMmjZOrzUzK6sgWOykRKGgfJIWRuYRBTBZIcr/nYPe+9WdYW7zL9yl2mG6CJAi0oAqHkuG4wn/EVQ7HpW62h1l9+9Z85CSTloYbYxMG11JG+5OhBVbF1tZrMjre+RfVtv07fcjLeBR+n+giB7b1UCoyMdVXKy9pLYhqooaFSSoCPNnTLy16h7bBxqD66CswaufuJAMN9z+VDJO9SasrYf5kDnrQwzS/42KEzxuHGr2q2Zhe6Wv7LiBPiryx6OiQUlgLMm/TYaaFKiyd+cJ4QFyy9yMiBu02NgcPGO0Q7s44WF9DEvkCsCyzidLCCZTuVPVyL9NgA3X2XatiP8kzGPIm7GuMaAPRsqm+Qg3Aj3zt3Hhpsc/eQPZfRX4eXQx42Bd8WVMeIaOpLzAOrZlkzGyYKKpTJeKSUkDDWHhEYOIGSGGzVSYAt5UNvZcyYrMiyRfuGD9HFZTLQhXL8O5aP32/W+oKYMYzXIIQpRcufVRZfWLmBWDmbeH+3B75AzLwFtrkF7QcPb8aF1jJQDxid+hzAtdTZ8n+RdMqgblfEIAEL4D+s5qQO2wTRlMYaG+qgXkUhlOUGQPVuJmmjTOEBI8aONiQsYVom9DedXkq9/7HS0eIwUGoOpZe JfMJ8kev WcToZVOKns81Ga++Lek5sUG/d+FUUYOMn6XBUzHR+zpYino7vJ5kPXmDM0caeTF6NXJh9G0iO0ariUxUSQz0DtcLo8FXh2P8Nd+Pp+lcWQg1Ytp89o/pARFU3gz6v+KMLC+0cTu4Keno+kVEwv2yUgTd1KrzOteuDcs6fuTGj61n6GwN33fTyAUWI9jlWSFW/15MM/u/3SCefgO1tE6iqL7ED4gnOHpJ/B4oN/pbxhgLpQqmabvNHn8yf6AHoj4iclpYUwVMK5g8/t94XhEE0XOIoXTSWcDQeWnFFRBorqNCaF+zG5YHJ4q3NK+n1I/jkL4iY0qIx2f5gC+VwKPfpVWhj3prq+RFkJ8HQ98mh536Qr6nrBGUF0WyaZiESOiDeZAVOCcCScywhvxt39467e6cgLv0kM24akCqaz2pJhzqv0bLp1Zrdm+nxaZtaAJbRWLD/GBh6QA4yspzf8bcc6rjyy8EBFk/C55wQtwQ5chZzFId4vK09WD9dxn8rf/lMrp//KftIeMWDGDXsI9BaWLoAue63o6r9Bd9y3TFhwiGCuv7XVw43yGez5Xec1aQbtZDldkol0qLCuICWfbKQB7CwvKK81aPw= 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: On Wed, Jan 25, 2023 at 12:38:47AM -0800, Suren Baghdasaryan wrote: > To simplify the usage of VM_LOCKED_CLEAR_MASK in clear_vm_flags(), > replace it with VM_LOCKED_MASK bitmask and convert all users. > > Signed-off-by: Suren Baghdasaryan Acked-by: Mike Rapoport (IBM) > --- > include/linux/mm.h | 4 ++-- > kernel/fork.c | 2 +- > mm/hugetlb.c | 4 ++-- > mm/mlock.c | 6 +++--- > mm/mmap.c | 6 +++--- > mm/mremap.c | 2 +- > 6 files changed, 12 insertions(+), 12 deletions(-) > > diff --git a/include/linux/mm.h b/include/linux/mm.h > index b71f2809caac..da62bdd627bf 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -421,8 +421,8 @@ extern unsigned int kobjsize(const void *objp); > /* This mask defines which mm->def_flags a process can inherit its parent */ > #define VM_INIT_DEF_MASK VM_NOHUGEPAGE > > -/* This mask is used to clear all the VMA flags used by mlock */ > -#define VM_LOCKED_CLEAR_MASK (~(VM_LOCKED | VM_LOCKONFAULT)) > +/* This mask represents all the VMA flag bits used by mlock */ > +#define VM_LOCKED_MASK (VM_LOCKED | VM_LOCKONFAULT) > > /* Arch-specific flags to clear when updating VM flags on protection change */ > #ifndef VM_ARCH_CLEAR > diff --git a/kernel/fork.c b/kernel/fork.c > index 6683c1b0f460..03d472051236 100644 > --- a/kernel/fork.c > +++ b/kernel/fork.c > @@ -669,7 +669,7 @@ static __latent_entropy int dup_mmap(struct mm_struct *mm, > tmp->anon_vma = NULL; > } else if (anon_vma_fork(tmp, mpnt)) > goto fail_nomem_anon_vma_fork; > - tmp->vm_flags &= ~(VM_LOCKED | VM_LOCKONFAULT); > + clear_vm_flags(tmp, VM_LOCKED_MASK); > file = tmp->vm_file; > if (file) { > struct address_space *mapping = file->f_mapping; > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index d20c8b09890e..4ecdbad9a451 100644 > --- a/mm/hugetlb.c > +++ b/mm/hugetlb.c > @@ -6973,8 +6973,8 @@ static unsigned long page_table_shareable(struct vm_area_struct *svma, > unsigned long s_end = sbase + PUD_SIZE; > > /* Allow segments to share if only one is marked locked */ > - unsigned long vm_flags = vma->vm_flags & VM_LOCKED_CLEAR_MASK; > - unsigned long svm_flags = svma->vm_flags & VM_LOCKED_CLEAR_MASK; > + unsigned long vm_flags = vma->vm_flags & ~VM_LOCKED_MASK; > + unsigned long svm_flags = svma->vm_flags & ~VM_LOCKED_MASK; > > /* > * match the virtual addresses, permission and the alignment of the > diff --git a/mm/mlock.c b/mm/mlock.c > index 0336f52e03d7..5c4fff93cd6b 100644 > --- a/mm/mlock.c > +++ b/mm/mlock.c > @@ -497,7 +497,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, > if (vma->vm_start != tmp) > return -ENOMEM; > > - newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK; > + newflags = vma->vm_flags & ~VM_LOCKED_MASK; > newflags |= flags; > /* Here we know that vma->vm_start <= nstart < vma->vm_end. */ > tmp = vma->vm_end; > @@ -661,7 +661,7 @@ static int apply_mlockall_flags(int flags) > struct vm_area_struct *vma, *prev = NULL; > vm_flags_t to_add = 0; > > - current->mm->def_flags &= VM_LOCKED_CLEAR_MASK; > + current->mm->def_flags &= ~VM_LOCKED_MASK; > if (flags & MCL_FUTURE) { > current->mm->def_flags |= VM_LOCKED; > > @@ -681,7 +681,7 @@ static int apply_mlockall_flags(int flags) > for_each_vma(vmi, vma) { > vm_flags_t newflags; > > - newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK; > + newflags = vma->vm_flags & ~VM_LOCKED_MASK; > newflags |= to_add; > > /* Ignore errors */ > diff --git a/mm/mmap.c b/mm/mmap.c > index d4abc6feced1..323bd253b25a 100644 > --- a/mm/mmap.c > +++ b/mm/mmap.c > @@ -2671,7 +2671,7 @@ unsigned long mmap_region(struct file *file, unsigned long addr, > if ((vm_flags & VM_SPECIAL) || vma_is_dax(vma) || > is_vm_hugetlb_page(vma) || > vma == get_gate_vma(current->mm)) > - vma->vm_flags &= VM_LOCKED_CLEAR_MASK; > + clear_vm_flags(vma, VM_LOCKED_MASK); > else > mm->locked_vm += (len >> PAGE_SHIFT); > } > @@ -3340,8 +3340,8 @@ static struct vm_area_struct *__install_special_mapping( > vma->vm_start = addr; > vma->vm_end = addr + len; > > - vma->vm_flags = vm_flags | mm->def_flags | VM_DONTEXPAND | VM_SOFTDIRTY; > - vma->vm_flags &= VM_LOCKED_CLEAR_MASK; > + init_vm_flags(vma, (vm_flags | mm->def_flags | > + VM_DONTEXPAND | VM_SOFTDIRTY) & ~VM_LOCKED_MASK); > vma->vm_page_prot = vm_get_page_prot(vma->vm_flags); > > vma->vm_ops = ops; > diff --git a/mm/mremap.c b/mm/mremap.c > index 1b3ee02bead7..35db9752cb6a 100644 > --- a/mm/mremap.c > +++ b/mm/mremap.c > @@ -687,7 +687,7 @@ static unsigned long move_vma(struct vm_area_struct *vma, > > if (unlikely(!err && (flags & MREMAP_DONTUNMAP))) { > /* We always clear VM_LOCKED[ONFAULT] on the old vma */ > - vma->vm_flags &= VM_LOCKED_CLEAR_MASK; > + clear_vm_flags(vma, VM_LOCKED_MASK); > > /* > * anon_vma links of the old vma is no longer needed after its page > -- > 2.39.1 > >