From patchwork Wed Jan 25 23:35:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 48419 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp543100wrn; Wed, 25 Jan 2023 15:41:00 -0800 (PST) X-Google-Smtp-Source: AMrXdXvTZZ7530awnGeg6atPzgj08Zt7xr6lgwR0M0qkfOHKjl6WC+s1KvDYJ3pDGROijbqw/+Eh X-Received: by 2002:a05:6402:4492:b0:499:b4e4:8a83 with SMTP id er18-20020a056402449200b00499b4e48a83mr37646278edb.21.1674690060540; Wed, 25 Jan 2023 15:41:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674690060; cv=none; d=google.com; s=arc-20160816; b=VDfCVSqNL2GdGG9F4N8oZVb2r7RoQUuvKoiKlL/EYhMgjaNB8i47kd1h8792blgi8q jckIu/GkR5fYAURvGja943JaRjgHBccY+4C8QBrrOGYu7uGL5hN4sy4bUZOHk2y9Ztei fxYaeY7hz6O779/QhDOzOSE3Fuwbfr/jxIQuFwffCyfWURywkJjSHG3kG35B568pLwUb lg6d3+6FW9z4MCTIgbZgqDM/T4i2PN98i4RoHOvjstPRgNiQfKHvlEkmzENNrREsbz36 Dj9eByAjlrgUATJirjPOkigY2IYn/HWFukq3E9NGpb5wIr6D6SXTPzMTntCAGc4xF8BJ 6Ljw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:dkim-signature; bh=OA1QItPelKW7nnImTBVBUTh9wI/to6l4+fxwxM8frdY=; b=fEDzMPTbJIQ9Ox71bYec6ysNzfpqjtu5l27zdOQfFh96sQ8RodP2jazr4cmWLdrgZ7 K9qDowBbCtSIN++suqGgIqmnYyEDBSr1GQeIGlmVLFrxQ6pgH8dd6dGyxnR8fqYXMfHC lImOoyby+rxfWLF/f1hw81Myvp3ZtApjEzPOv89X6hlfTIAneTYKfLyrknX02yr+eXSH HuxaeBjkKz7elCfbHAy+lAljE91cfRivXMaXqKBMakyg3DoDFFIcM3SeP6cRTpRh4LcI zdItrpw305fFdLPdD8pUTf7P6jkjrwUzVAwbyrISOEVBScxrxHNl7HSTy2R4aFRp/ptg gOPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qKTNUdAE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id i15-20020a056402054f00b0049de521f6b0si8031348edx.363.2023.01.25.15.40.36; Wed, 25 Jan 2023 15:41:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=qKTNUdAE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235991AbjAYXgN (ORCPT + 99 others); Wed, 25 Jan 2023 18:36:13 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37184 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236044AbjAYXgK (ORCPT ); Wed, 25 Jan 2023 18:36:10 -0500 Received: from mail-yw1-x114a.google.com (mail-yw1-x114a.google.com [IPv6:2607:f8b0:4864:20::114a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AB8695E526 for ; Wed, 25 Jan 2023 15:36:05 -0800 (PST) Received: by mail-yw1-x114a.google.com with SMTP id 00721157ae682-4fa63c84621so1176417b3.20 for ; Wed, 25 Jan 2023 15:36:05 -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=OA1QItPelKW7nnImTBVBUTh9wI/to6l4+fxwxM8frdY=; b=qKTNUdAE5hQ5PW8YlcaPldCem1GoBjMxVuSpxQHrMcNXTaNxXEo9ic5ofsiINpZuP6 ScHyAOu97fOwye/7E0RytrIWyTmZtuYpGHexas2ZUlU78GVgNCJ5Ib52rIblrXezxJiw TcYv29usd8N/RWDMmKJi9sstdK9ZmfH6cJzonZBnFrolLr4Oc/OpQfbshtJe7FC750a+ 7l8uLIBYS3lt6k3WU5EvZGO7LsqtZmf2+KwUHbJbspvivzz3DpJFlYLtZA9KrX1vTT3B aFuBFc4GAVt3y4gqg31iYRfxy+FahLngHsaxL5dQYjjovRITn7XTVJi1/7iiLOG8GQEP u58w== 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=OA1QItPelKW7nnImTBVBUTh9wI/to6l4+fxwxM8frdY=; b=14tH2n7ywkXfHmEF2VSYOMr1iFjnKkaWm7SvHwcRaS5+rqlpSGIDaBasgusXpZiYeC T0vfK0X7dkuQ/PsczGYsfDUBQe3V3ZcghukNgTt4oFgZwjNRQgBbskUOoPRt6Nyb7KAV MSuS0QldRHpMRzdShxIbmmx/T2M4I0wZtUh66PwtiMMkd4ARrO1BeA3LVtpzqhImMuYZ w/5Tc/C3ZZqLGvMh3vgkO71N/BJRydQDJP/6zcAajZUYEuxklEjHRA4ToWTbWo0tQ6Oa mn+u6JgJe877AF3z6fzz5/zTTaN4cmhhJTBfc2+hboLBv24HdTR8WLS894Pqbw6lQ/xR aUVw== X-Gm-Message-State: AO0yUKXNgYXIbaUgj5KwDyRbpS2CiZQ/pe+Kl6AJqoCYyhR0AOWEkb9a 76TGpqsaSBRnhvBX1VhAXNfI80+KkpY= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:200:f7b0:20e8:ce66:f98]) (user=surenb job=sendgmr) by 2002:a25:d1c7:0:b0:80b:6777:a2a0 with SMTP id i190-20020a25d1c7000000b0080b6777a2a0mr977883ybg.335.1674689764898; Wed, 25 Jan 2023 15:36:04 -0800 (PST) Date: Wed, 25 Jan 2023 15:35:50 -0800 In-Reply-To: <20230125233554.153109-1-surenb@google.com> Mime-Version: 1.0 References: <20230125233554.153109-1-surenb@google.com> X-Mailer: git-send-email 2.39.1.456.gfc5497dd1b-goog Message-ID: <20230125233554.153109-4-surenb@google.com> Subject: [PATCH v3 3/7] 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, paulmck@kernel.org, mingo@redhat.com, will@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-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756039805144029780?= X-GMAIL-MSGID: =?utf-8?q?1756039805144029780?= 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 Acked-by: Mel Gorman Acked-by: Mel Gorman --- 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 bf16ddd544a5..cccbc2811827 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 a531901859d9..4f097999a570 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