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 58E4CC27C76 for ; Wed, 25 Jan 2023 09:02:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B174B6B0072; Wed, 25 Jan 2023 04:02:16 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id A3D6F6B0073; Wed, 25 Jan 2023 04:02:16 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 841B16B0072; Wed, 25 Jan 2023 04:02:16 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 60ACE6B0072 for ; Wed, 25 Jan 2023 04:02:16 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 287DF140349 for ; Wed, 25 Jan 2023 09:02:16 +0000 (UTC) X-FDA: 80392729872.20.F1B29FD Received: from smtp-out1.suse.de (smtp-out1.suse.de [195.135.220.28]) by imf14.hostedemail.com (Postfix) with ESMTP id BB524100009; Wed, 25 Jan 2023 09:02:13 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=CylERLDb; spf=pass (imf14.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1674637334; 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=SlRMHnKgl2ysMiG3ziDgQVqy0pZ2+RMTN2tEUkXl1oQ=; b=4c38ykClA1pIabO9UZ+vNg0czGorWLppycMEiw+Igqj/h0LBz4AoqbnqMsgFT4AMU3+RwE mBceidTtdQlVNqPKaFgv5bsaX8jKGNIiuDoL0DeP65Ku1VEOKW0+dAYuoSVSgEiEOTh5Ls kiNJENZy8pn+0i5ZlR2QcaQyNEVhNwI= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=suse.com header.s=susede1 header.b=CylERLDb; spf=pass (imf14.hostedemail.com: domain of mhocko@suse.com designates 195.135.220.28 as permitted sender) smtp.mailfrom=mhocko@suse.com; dmarc=pass (policy=quarantine) header.from=suse.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1674637334; a=rsa-sha256; cv=none; b=2LhsF8Kss5e4RSSd+dQOu8VH9MtnCUJ9ZBG41mxWgCKTYdwVt/VHe/CUro8akliTuFw96O UPSAeUtRB76lDQx3qDtkuOamot6SgIFjGFKQ+LlqAMFt0fDvMwUglSl9+u22NTEjsok2qS QbW/bPOmIG49LEqDKNP96hcoDsjc/38= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out1.suse.de (Postfix) with ESMTPS id 706F421BC7; Wed, 25 Jan 2023 09:02:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.com; s=susede1; t=1674637332; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=SlRMHnKgl2ysMiG3ziDgQVqy0pZ2+RMTN2tEUkXl1oQ=; b=CylERLDbieGu3PWTdvXLEld0Li+qbd7wIdoCwjIyDd+qG3j/xsmZaFNxHZ9BHqigKFDp2h G+luEBa1wjOWHFua4YAnGvwD5IYd5KDo2FdpDHLq+ELEUbPuYE6WIwO6oA3RlzeuL+Fv1J XkwT2InE7+nANi+BujeIlpRiAMYhk9g= Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 224651339E; Wed, 25 Jan 2023 09:02:12 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id reRPCBTw0GOqDAAAMHmgww (envelope-from ); Wed, 25 Jan 2023 09:02:12 +0000 Date: Wed, 25 Jan 2023 10:02:11 +0100 From: Michal Hocko To: Suren Baghdasaryan Cc: akpm@linux-foundation.org, michel@lespinasse.org, jglisse@google.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-Server: rspam03 X-Stat-Signature: h64b7mam6476hfwomn1djwk3h4guio5u X-Rspamd-Queue-Id: BB524100009 X-HE-Tag: 1674637333-795854 X-HE-Meta: U2FsdGVkX1/REzl4tgXbkZivZsDkym3XC9ogmvq2kRUoN+GtpITw+e/1235bRMAGkuIErgnkR1jg6un7jiEWsVcBW0M91Pb6cfk30nFd8eO6j1CW9gxJtgkLH2kCyoE1oqzST7vxM8qAyJ3jsZ+dvNaMutw/4p7ORy3oclClsbS60mXtKuFKmwuLJXftoAI5ICC+2gC24ifvxMvoGESKz9y0K/Lo7KQHsOMx/lo1roV7zvX5UH594Yyi2YkIyv21LWJ7CToNkUTfPjJR6qNs1kHyKKlBqFQz/PHNnutKdmQlLnK4L73Xtvi6Jsi4NxEd6Koe9T8TenLTjpeH13OQ+I9DA1LmbD53+NzdZmmAXaUZS7KjA2rJv0YoAeU+r+ytpF3JNCWktC6ZP0Wjc4BxP00OCd2RBg7D+RNXnFqerZeOEKCqtBsfip/RacpKuljTjVA51iD0DaOWC64UD/RTuBba/yWW0KW56wsNGbsdBSyV13nk99dkGS59/O8n2Jgl0Kxm6MODgeKa7mlwLxbJcXfPGe0nx+iRyDbaXzKYHbP8WoWl5hOpzdLtHs/9H/Qtr6L4qL6r2tglBtxQRXTqm7PIbdA0XDACzjQTyrdxIELxF12AjAIVx6aG2cHtLNyfJTLj3D9ERSSyc3hudSukm44BVlUBmmZRpEZSTkXDjzDrqlWqYav9AgRdi8VBZkQeVWRI8WpAbGhOqrLpfWhIvAeL7FwxJ69uPpyT85ez9sMpQ//GB2oqIWvbe058otr43fhzQmxH/o5OZ+WUT0cxH4v9K2PijrlmqSCY1Eyhv17VlP/AAD0MlTpMcDMf9sUpuQIV84R94+lY4f8bpEHJsgdp9SZnXzml9P+qUQT6hbuF9bQvjMisakLpdL/zPqREJQm+Dq8WktVA7pqzurdUJNrpPspJX8R6rZsjtfWW21p6K8iH0+E0IEQ+0eAMP/654jxkgQ8idLLxCAPJiy4 bOjeYYqB gXYqEesgYOSlgolFglgDuGtUNLHPwhCuhzKWXPf04NzwScewLc/nI8PcHRJCmGE3gCBGNNaj4DZs9bLK9INF/nxAehAws28coGERD6dAyQfHsYogS5lbt+weDvlcaPEUrJjvL6ZAIkobFBI2FTS/rLuZDJiQFOBv4tlig0Kok4F/rtsWWyiU6vziojHT9vfIBsu9tsCviz7IwQc0sCge8q1kXh/mfiIYhNeOJxZmD3vMqx1nXhBr+xGcoEnxmR1Vy/FQNwHFF3I31y4KzQKPueNUdIzDdUqXU1+Umrj4rIChgG+WpN72btb3F82GpREr8IphubdK4Eq89nFOdPf8DqQLzlyWp0EM3meQwjlTceF/p9L5V0SEamM7wEVwc7rOQ9xjxEQKQiUKRkFmJHsOuI0v+2SIkqpEZ0VnIh4mLlHH8ly+afHZFeMMiuEH/lS2SkzqFELscH++tPQC2AMGB31m+xffeFkMEziC5F3w8yPMIr1pp3oSFwRNfCCdoz7Sf38GGKQtqy9HFA0pxfc9GnEAT2GsrOZS4cBZseLBRGJfMpz6LA5kFzYBBBASumWbTjx+P5cQQg/LePXfFVbXsXMvCf/21IdpreLww/r/cZNyH1ok+g6cXZw5/n9PSNDgvai5iFnvxmWLmq37aMtl3IHjJK9PIGMkwinaNz+0f089UgXgifrObzGYCJOgO6Cu8EOUZHfKKdl7CpHU7Wv+km+OcEt7L4GzwZ75x8tgzfQZZ0D+LDtxoQWWKTNLvQIY6LxKkENc7qK9praFdrwFsi3sFimQRfKxTtuS1dxygMmGUM5HnPOMxVe3h7nYaKNkJYRWDk6s4xrVwdJ185ipWVIdmwN9LDgpA4Nm4P2JmCYpuNuDKW4VEEKdotR8pE5ZeiDTs4za2ctEMPUmYTuxAW4JboDvzO5WBeR7dJ73KlWn6MqmLUSNkQNgANYUzzkY+jibxW6m+9G8TyGO+4DBQom5n2sc7 evQxqLt6 dV0glOikskRIN19H99ORjS3XOVhkyqgWaOdL/ti8whKrrqPNS2GVwFUcTTnHYsv+N4oO9GTwmz5dOOvbe+jD9pbLL86DTgazCutbG2NLqdfzFaEd7MxZuSXROGvksFrSWNDfKteIiTmbFRGsYS/I/QD9IyMOYRZWjujGMZ/v8iKdLK4DGf0UcUIDCKw79Nf1zztiKUFc+b8qKjsz++Ft/C96cMSnNT4hn1t4AIJEkVTCIf+yoAm9cVYS7bvH5xBRVCT2e8jlJoedxoTrRU4bov215+OGnPorbHoKX8ZhuTd2aIaIv+x6qaeYtlUOCW/f92cQklF4KXEy+JDUTbamJQ1JDMeKlGx7mxQ7+jSzd4KlmIOIAvbf0vh3fRaxhbGTb/UR6WN9O7eO55jkyrQHWWx9iCH7Z/j9nQ9Nwe3faO6M8sVtWzG4J+1jeZV/1wDuvpgWMx73WweA5X0oIMpu9tYETh1d4zKIF2N1SrxJFsbVP+R6K6zCXsT5sRbot3EPXl/IjO8glO1Am8PbmgdSqMWaEB6hWAQFpZlozYhe8ASRMIFp0O0QLXUqswdVn1CPT5nRXhO2qBkO3JCZGdpSm2gNAxDBm6uIiZ19DcnLALQbvOYkTD7L9E4wWeZl0a6dehboz5b3C8n5GzT6KHCtWwOXAdZfeTWwhJK/bN1kE9lJNoVDdsXRHfAy76xZMF+OVs3fxfts5mLyjQpfuAIho5NwydPd7V+JftjH35v4DoCSTJqNNK/H4ayR7ZBgceR9cwseJHDcABdx67PQWaVRLAzDQ64uwsRKlz4541r/4Cio54QUEs0W4IogCiJNGH9313T8SA1R2b7HVV1Om1Jp6vUYXVobQhNOZAt4rk7uxVEtew9Prn3Ceg1t3Dk49nQ76xxj1FZjXKCRSohIQfNgSMVJAHb1jtsHqMdQfOWWTEgrdEWnL4ZN/I9KNzssjeBJmPi32MYE9Hn0GxkKfWOBV8kimm3fC M6zgLuAJ hn1T+//5VZx9TL0wRwcJ9TTaqOUOKGeYfO35DgcyrDuf9wXeE4MU6irj0NiYJMLfNuaJXvPdQlGMh3/VVNFtZOoONSG7R7DmvqiNlIArOiC4ZevdMXdHoGsVFDd+WN7Z/2OcYH2Ntpa2vOtmyL5dSF++2hkopx0uz/IQb/n/J7a3zZYf9FTPFX7l1BIyu9COoaa4bunInuJq8eIBjyq3Eepx1DXJCbFXV5aPqkXb6Q/fZlZOzpyMoFAhmsulejGQ84nuMoQ5+BteQFsmaGqQqe3QgWk13K2nJalZdjuAGwlwjX22AJ/n8+QrWiazRgHc0eOokg4edA5aE+a3gz1iqGsRc3d0ckvowQawS4/GhODhaQ5NBRwJZar2wThWPlge1xJA3e3CXOuVGOOGkFTCuxeqbrqNsUQ7Hls6CeXdtfNyNkYgJT3YKz4iHPTn2deG9mU1T3ES5o8klSVNUkVZWK9bsUHOu0+zutmqkB40bRr7D5gcucL3ngYID2nsmyUkAp8VKT33V3qm5Nz1ILMV/rlFiARMFyuGLsWGQsS3S5xN3B5ikFnj57xhgWJJldc3/e/YCSYf2p6gPGu3OciSexEgG7TXTvXOYwPyrR5sxys17p/YmOJEV7b/lXpt5VSCeLghRFj5rE1zWbZ4KmHjmhxjHgVFKgIEDZfld4jvZZDrH8WNBxpHFMmAlBIdtNkE9P3sO5Qj6KWNIbSbpB6RPh82JPhdL/2V4q1D//1C5ME+mfcYeS9syi0MKncaLgzf7VSlh0LH0VqWR2qIZqMIuE6wWSlaz9mZ1GqQYP1I7sjttu5MqH5xwhoj1BvZRCnzXretztNKCrP6LdeCb0Ar3Ty8l6ZnyQU0BSYUQ3eHNaMNL9amkVwEwuu9htbCii5TKwn6Txc/fO/5Kl1EOdF9bnnUomzyfNu9yGXxSGHJD0VFvT9gE0yY4UGn6IMuVud6bY1Cj1+oZOvY2egHt040OFBvftnJS NSrX1A4p gq7nLXr7fXAUZVG9t3NPdK9qYhDrmcCecAqZ+J0PB1qHclXs94utalAWFpw1AoicWN0L0aXREtYVPHRDq23+PFKAw+V9PdkfLVS4VU9r+Ojaa0rR4xwwzr0lB5Zgf1/KjOZoEZwDLjY6aptVTodWDUJ55p8WvVsNcX+gYO/BRKaGLSePcmedcSbHqhCDO9x0RE1R4nIoVM5aUihbygM+DLB/qmxJ9J5lwYiMp/nBKccvRddg9v1FnyOmBOhwXfv8oR3mb6IWoiI7yNSpDYia2xsplZdjiXy+XG7/z1JG8Kf9aDCj5StEw8V7trqYtBF4WWR6PG+7/dQw9Md8ujbncpWWdRgwqfgfe4xO6+wWuNVG9Mm3D/XZlExZ9+PO/1xfFLU2sDmOmcuqW0sGUnwkMkqmbfaG+kZtLbYVwYY4TrlL4uRjdMXBa9DK8BkjzkA/e2A3ap+YQzeCKLSr/bLCNw 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 25-01-23 00:38:47, 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: Michal Hocko > --- > 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 -- Michal Hocko SUSE Labs