From patchwork Mon Jan 9 20:53:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13094280 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 82EDEC6379F for ; Mon, 9 Jan 2023 20:54:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1F79C8E0012; Mon, 9 Jan 2023 15:54:19 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 1A8978E0001; Mon, 9 Jan 2023 15:54:19 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id F3D5F8E0012; Mon, 9 Jan 2023 15:54:18 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id E48D18E0001 for ; Mon, 9 Jan 2023 15:54:18 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id B44F3A0BEE for ; Mon, 9 Jan 2023 20:54:18 +0000 (UTC) X-FDA: 80336463396.12.3AF75F9 Received: from mail-yw1-f201.google.com (mail-yw1-f201.google.com [209.85.128.201]) by imf08.hostedemail.com (Postfix) with ESMTP id 263B116000A for ; Mon, 9 Jan 2023 20:54:16 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jGV2twit; spf=pass (imf08.hostedemail.com: domain of 3-H68YwYKCA0574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3-H68YwYKCA0574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1673297657; a=rsa-sha256; cv=none; b=Tg/GlsqGM1RMe8A+5x/wFyX6rVea3J4TmAi+yzn5sI4e+r/Elp/6zo9L7Cr+n6Iw6CaxCF ZuWG2YSu+GVw2mZ2g/fQgj0v9iXikVCEwescsBptro3z2sxXW/BPRXGcwyB3d74cuqvwpq 0DJMqCR1zpGl+JZ9cCTja5Gyszjd0Po= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=google.com header.s=20210112 header.b=jGV2twit; spf=pass (imf08.hostedemail.com: domain of 3-H68YwYKCA0574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com designates 209.85.128.201 as permitted sender) smtp.mailfrom=3-H68YwYKCA0574r0ot11tyr.p1zyv07A-zzx8npx.14t@flex--surenb.bounces.google.com; dmarc=pass (policy=reject) header.from=google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1673297657; 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=q5vG3v1PIcAm/ERdB03D9/j7bAwMWdEUWbQM9OP8Y4c=; b=lWHDJe5tU3/x4qWrYmHm3S2EpbTt+xttAifWOThFq7RJTHcjWtkIFDP4wiMP8soe3+PZMy XWiP2/XBMyKU+KMIzBx3eL7iRn7/9l924Gx7G8SGCPAs33GNbr0QHf/uHyBGf0u7FBZsvc IFd1D4ieT6NTTrTjHoBfrucmhSNQnxU= Received: by mail-yw1-f201.google.com with SMTP id 00721157ae682-4c1456d608cso104264487b3.15 for ; Mon, 09 Jan 2023 12:54:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=q5vG3v1PIcAm/ERdB03D9/j7bAwMWdEUWbQM9OP8Y4c=; b=jGV2twit8eMqqlAwxSI2kIyw+GdbQsmn963oqlT3GN/ehTsmuPHj865pM8TWLhKQHd jTIMTXUStd0tYuBt7C6hb5YIOb4/wBppGWfSzDrzDKFeyuMa9uP2aNs8o441PZXFnjCo UTpNeX3UnEavX2v58G4+rqPOBU9aUnr6H/ChTcAvQIipWCjxL9GlTdM7oqLGXY19DPFQ q7bt4dBbBloqbwmYh9ylKkKgLjVpvssPEYXAiDYbhfBukg85oeSOt+1VHZNlGA7zFiYp 8fJla0RzQ4AZwln2gfdXjRilgUN42dHF3aEjUxK8uZvM/sfKPj53v6EzOYOtMmGPRMLa fuFQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=q5vG3v1PIcAm/ERdB03D9/j7bAwMWdEUWbQM9OP8Y4c=; b=1SfxemTljAQrYVu5jQ1j+CLcOuFx1cejWtAbltLmJZXCcPnNmFvC1R7AzVtnoI1Hro kAlIN/Pd+ctJSoPcBQCIuCA5CCtGrMWFhhGOYf783zoKjRjfR8jrskDiRRviPR6eBdIl HYibA6xrTYDXhDiEKlpPCyI5hI5eKKbK2Zx/aOoJw7BSNcIVCtQmgzty/f70H6yFDnjF X0j+XDhcPDw9yaMQ3irwRvFEyVuCvHfKyL06yKuYFbwXrZaxNvacbVC9yE+t/N1OJ1RY lo0/fRvugpD+1pvd3yVrb1SteXolVwCaew9QWxKOrr+136KrcSVozCJtZatzD+MpcYlE sJjw== X-Gm-Message-State: AFqh2koFHiRUCr6FFc/ZEyLPY4XE5TtZHztkGYYRhaw7lmkbUSF8E+P5 tZo+hjNS89Q2nr34VjNJPGWNo1nmIsw= X-Google-Smtp-Source: AMrXdXvsQzJo8PSoW1ccRcrlqwtefe5KwIQ7Te6dX0P6/V4WPjQWsck4Zjq+DJXzzvFNYEa755Hhn8p6kg0= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:9393:6f7a:d410:55ca]) (user=surenb job=sendgmr) by 2002:a25:ca88:0:b0:7bf:24c7:997e with SMTP id a130-20020a25ca88000000b007bf24c7997emr393826ybg.217.1673297656291; Mon, 09 Jan 2023 12:54:16 -0800 (PST) Date: Mon, 9 Jan 2023 12:53:09 -0800 In-Reply-To: <20230109205336.3665937-1-surenb@google.com> Mime-Version: 1.0 References: <20230109205336.3665937-1-surenb@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20230109205336.3665937-15-surenb@google.com> Subject: [PATCH 14/41] mm: replace VM_LOCKED_CLEAR_MASK with VM_LOCKED_MASK From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: 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, laurent.dufour@fr.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, linux-mm@kvack.org, linux-arm-kernel@lists.infradead.org, linuxppc-dev@lists.ozlabs.org, x86@kernel.org, linux-kernel@vger.kernel.org, kernel-team@android.com, surenb@google.com X-Rspam-User: X-Rspamd-Queue-Id: 263B116000A X-Rspamd-Server: rspam01 X-Stat-Signature: k7rodaj1waezs8fb9qn1w6rcjjmnir1w X-HE-Tag: 1673297656-296712 X-HE-Meta: U2FsdGVkX18SBvG3n45a67CAPaXxH3ssj/OqjA8NBcvi4N2VqZ9sYoG9VXdJkonQLctGPZjovc+RL7oQDV17Ysoq+xJ393s8KdOI3qj6t1SYq5mOVZJ28XiChtTsfzGmzZL/G+qCP205YHpZ8KzaHDKwuCQrMhizJW0Tyl+w4ty4XLpjWA6k4DEmhOqMLqFU2mgUlP3PSbau5zjc7YR+qiW9q462e90PbSdvGcCMk3z0o7kvHh7vsp6qnUpGOxX9FBkqNMCX1T79HiT47WQfUb3tHWdg82vr+ItZLqQ4y/chxPcTyjSKydnJDyTdQsZY/bEO6bFYstupfazL3WJu/iNq7HU4PS4wkY/YeI4SAYNHevqrRPTU0IViA7LDTFhnKgSu3y87hdhiD4jIcyzcGTk6tiZ9cxdKIjNh98kOYSpJLtU21f7qAyyAt2B4c7g4G7MyZnQ8DFSNyqulNVCFmSqWVvIlUt08uEkOwM8gLSBWl9m0qLOxPW2qN0dgoYWTuvfGIISxS2CDl8B6/Zt0Gh/hvzwbazv0rwR6Y2WUwrzEmC+J0PyfYcK/oUVPc9PKLUwbjPD4OOD0GbxTos30sWuUVCxWWoBGgxbNv09mjCU9aOHyyyC9WDYW9/BAfIfxKYCGTixH/Qwhhahl+hL5BaHPMpwhw8wcxT+yzXiYc8lkBgyQNsLAbk9Wg+F/m0C8c244xm2G7+peGPvZW2rnf4F9n3jdF3uKbZ5PXockMb9XeJG12maQSgG+aBx1iy1VJEjvKyRDqvD1Jck0sVFBxzGW3oXkTs389qEbGw/DPYBsYhWA6I4eh25KlfvZG3BzvDg7pn41XqbZky9T/VmA4NSGwilZayfLzpRk6YMs8Ol1v4LaXQe/kiOnBtgMqjHHhz8Yx14olLnUS4xqfZeiMSHB2nV9EGgLfPjIzLQusAwB02jTp6g3lqAkmmQI0y8r75AHLIkBfpdKACUuDWl 8Yub59p7 UTQ8guHqqL2ncfdbaXiecgBMej/ZwTfeFOpKjF/CvxfNFKW4MQAM/hmrLbHJ9aKAmGu2BuPIadVKO52fmFLqIrNwbpGXVngCFCpRsXNHwxYd+Zwptlut0AoXh0QhzcO+K1E6JKv1cIg4B6HpxbUBAp0lTexHhJ1TSbQar63tCuCLSLgjBz0jMGJi3IMqUcbEHSXM683uv2nLatpehAAs2xmYW2cG8adxh+nDS4R0mP3mtee3DrRUKBg8sYYNmozm1UByDborAHUQXbvu7bQF4SDyz+OjAL1GFu93UsOPttq0f7DRx+obuKMWdo0rAY/4tU5NJjSKDZ9oD39dog/vjzjRAMWALw5fr8wPTI0GSZ1z3jPpcKfyxNCBRfGsjbcAQpVM7H1VA3sDhg7+W/ElkyowA6soy5M0G5iBj 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: 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 --- 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 35cf0a6cbcc2..2b16d45b75a6 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -416,8 +416,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 c026d75108b3..1591dd8a0745 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -674,7 +674,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 db895230ee7e..24861cbfa2b1 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -6950,8 +6950,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 7032f6dd0ce1..06aa9e204fac 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -490,7 +490,7 @@ static int apply_vma_lock_flags(unsigned long start, size_t len, prev = mas_prev(&mas, 0); for (nstart = start ; ; ) { - vm_flags_t newflags = vma->vm_flags & VM_LOCKED_CLEAR_MASK; + vm_flags_t newflags = vma->vm_flags & ~VM_LOCKED_MASK; newflags |= flags; @@ -662,7 +662,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; @@ -682,7 +682,7 @@ static int apply_mlockall_flags(int flags) mas_for_each(&mas, vma, ULONG_MAX) { 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 9db37adfc00a..5c4b608edde9 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -2721,7 +2721,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); } @@ -3392,8 +3392,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 fe587c5d6591..5f6f9931bff1 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -686,7 +686,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