From patchwork Fri Aug 4 15:27:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suren Baghdasaryan X-Patchwork-Id: 13342035 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 5DD77C001DB for ; Fri, 4 Aug 2023 15:27:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5D7478E0001; Fri, 4 Aug 2023 11:27:40 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5867B900004; Fri, 4 Aug 2023 11:27:40 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 400AB8E0016; Fri, 4 Aug 2023 11:27:40 -0400 (EDT) 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 2DA158E0001 for ; Fri, 4 Aug 2023 11:27:40 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id D7252C1535 for ; Fri, 4 Aug 2023 15:27:39 +0000 (UTC) X-FDA: 81086801838.08.1F77319 Received: from mail-yb1-f201.google.com (mail-yb1-f201.google.com [209.85.219.201]) by imf25.hostedemail.com (Postfix) with ESMTP id 104D7A0015 for ; Fri, 4 Aug 2023 15:27:37 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=TyIdh0Xc; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 36RjNZAYKCHwxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=36RjNZAYKCHwxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1691162858; a=rsa-sha256; cv=none; b=a5ktt8RnBAqn4/tNdWNftU9quNMNUvuOO5IxO8sDFgd6xMlv1X8q/QEiVHpEqrqFRcNH/c 9TqQd49a/iX7Te8Oe/YNMneemL7gErl97xVvUQpUFFzECK/D5MILD7AHlcyhGfD3ZlzRSr 23rXVwPFHRFjpbibMnHwYyt00mNm9EY= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=google.com header.s=20221208 header.b=TyIdh0Xc; dmarc=pass (policy=reject) header.from=google.com; spf=pass (imf25.hostedemail.com: domain of 36RjNZAYKCHwxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com designates 209.85.219.201 as permitted sender) smtp.mailfrom=36RjNZAYKCHwxzwjsglttlqj.htrqnsz2-rrp0fhp.twl@flex--surenb.bounces.google.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1691162858; 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=520TPAR42nWNvH3iwlw29nIZA75JEpTNGHc6Ua8ufv4=; b=Otqy1vG21lT1P3FZVPZhNsBpe7nJ5PeK8xdcMtURYAFA9vKsHsYCWrgIpkjgOQoQjaUALK 8jaaDaDLWLNM43HfahkdHOGAU7ANtpksITxEUccOuufU9PrCPGV91MX5xXaE/ItPMS/diY Fc5VPqXZtqkdMvwOjLPpgOdxsmqPWSg= Received: by mail-yb1-f201.google.com with SMTP id 3f1490d57ef6-d41fa6e7103so1453862276.0 for ; Fri, 04 Aug 2023 08:27:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1691162857; x=1691767657; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=520TPAR42nWNvH3iwlw29nIZA75JEpTNGHc6Ua8ufv4=; b=TyIdh0Xc7bjO/FKNU6ggV/1Dv2MMNNGLkgGiA1/wDC4kswrAYhcsNTWyI3nJOXhJeP aqsdLhrq6CUrp6q3DossAbcj51QnYlaAgR/aq+EsQJ3GN3Goge3dO8goY6tsWeahbwLY Emnw4tOdwC3ADtuaCKz1puhigXXZzjx89Nbekny2jzBpX5vMePV4JC0cjOazLXCBYExZ v6vsGj8x/91TJQOhZ43Nfe9PYgY1043oenv1qnEYngwp8wioDACX0eYyz//e76Lw3d64 gfVCR97aftdiX0XPkdD7dGCrEAiTfg0V+/tVEv94gIvaHCopa5EQ7aDwdogtXW1JtUu0 wsaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1691162857; x=1691767657; 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=520TPAR42nWNvH3iwlw29nIZA75JEpTNGHc6Ua8ufv4=; b=ljk8BthaFyT95pRC+FuuzWvDUxTYG8nrpxz/MSSVzY4TpFluooAuJHZu7OkHJWuAkP EHbar6Ae64NRsReaQSyDk6nkEsFWJzoVNI/SVvR6JQwSnf7U5w5jbocxKL2DBoQRI94G es1YXjR9Jijp+oQpnrxLwNGPjqB/xHYyAxdWfUpakersreddr0JF/fd5+bqukS/GlWxl J5J4jXAZwXcMY8bUyZSlj+S0RemWh3LUB9TgPQEcmylvHoan4rzVulWcNEqzFtTpxEAU W+3+H7zIZdke/O1jhVb1ptNfj2vsvX818TjCyeesSnEQYvTADkuuJIiDAKBxOxWxFgAq wHwQ== X-Gm-Message-State: AOJu0YxbyhRJo+NjHLqJVCtP+HhX9lr4M3zgO9MV4dmeO/f3uaSU6T75 Dajx6RkChmbit5vGkUj7UZEpRS9hPMk= X-Google-Smtp-Source: AGHT+IGlTGXhVU4fUQkbJkgfXB3PlqbjxRUP6W6WYZII59aJQ9IDvYRKiBgp8gXvPph741ZWOBMBJXs8JB4= X-Received: from surenb-desktop.mtv.corp.google.com ([2620:15c:211:201:43a7:a50f:b0fd:a068]) (user=surenb job=sendgmr) by 2002:a25:ce94:0:b0:cf9:3564:33cc with SMTP id x142-20020a25ce94000000b00cf9356433ccmr10206ybe.13.1691162857007; Fri, 04 Aug 2023 08:27:37 -0700 (PDT) Date: Fri, 4 Aug 2023 08:27:22 -0700 In-Reply-To: <20230804152724.3090321-1-surenb@google.com> Mime-Version: 1.0 References: <20230804152724.3090321-1-surenb@google.com> X-Mailer: git-send-email 2.41.0.585.gd2178a4bd4-goog Message-ID: <20230804152724.3090321-5-surenb@google.com> Subject: [PATCH v4 4/6] mm: lock vma explicitly before doing vm_flags_reset and vm_flags_reset_once From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: torvalds@linux-foundation.org, jannh@google.com, willy@infradead.org, liam.howlett@oracle.com, david@redhat.com, peterx@redhat.com, ldufour@linux.ibm.com, vbabka@suse.cz, michel@lespinasse.org, jglisse@google.com, mhocko@suse.com, hannes@cmpxchg.org, dave@stgolabs.net, hughd@google.com, linux-kernel@vger.kernel.org, linux-mm@kvack.org, stable@vger.kernel.org, kernel-team@android.com, Suren Baghdasaryan , Linus Torvalds X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 104D7A0015 X-Stat-Signature: xz769nmwrjwb5r3ofubkk9jd9oeoyt8n X-HE-Tag: 1691162857-108538 X-HE-Meta: U2FsdGVkX1+SteeXtCYU2AQsHU2QM/IwgHqrxp1lIlUpGZuPTYOl6weVhRVqDF7wz6h41HWoLUGstK7i9/om/4I5CuZ+P0/W15I0PSzXes8SxW2Le8dJCFg7IrniyXinoeUvpwQMbY63LRAy+DjQFbJpI8a3LBy8ZlJtYyNaHaxgesSdt7k3JV68m9dCVrbL9qbQZHe6GdqEEEg1d/RmvRsEiEiWYJM88LSZQaWYvGkysdeJahbr8w+Q4XlJI2S/7gftO+UyvXpilrSPL9SxqxI6KoYQ2ODr5a68TfK//umLljPMzEEUG3JEgTapKHGSSGC6shz/ZWFfn6FdLBtglSI3TOn/AXWmwFQhDGa3csm/+cOEsjKFh6tyl9WNuBflc+jNOKTfBMBXJ6uJWCfBkH/kqDN/itNErC4X+vnVz9LE63Y5d0MeODSjbG6ezGg5WKDY+ZGE9WGZzvW3jsW0Yun2rp8w0uZc0IxvUKjbiLR8jrd6//PgzbDifjCWTwb48sDUvibIRCYnVRDBb4tSNPUJw/YLaCsyPQToTjMdCedGGBnEJq0bvwFb0WAKR6itjGYC1ZoO0BI5k1YVwpPdct/nnOxWktzEebDWiR7FIIzk2/7/O2L6cjAZ2T73dK9nkhtbvRpvMPZGCX/7ov0naOFB09nqJxV6D1UWP7f1/6eX94v3iT0JtFA5LOPsgwM/sfxSc5Lf+YnbjKRDB6lEWsNG1GONSFdnBjpe6QB7FBvakcnRHbl+JdMi09+u5IJAminIljY39BP8use1mp+96KjAZfXSKTUoZK0x2jK20agNnW2FVvbcZUTCpt3+Gr0e2MSoei6wYjuZQvq2fSe0fNxexqxIAp17iUK0+tN8uA6kQ+v4O6GPBUx7yT/gsswjTGga98Xl/FdQkqdm6laQfnOKC0FXStUcFooFSwM0dBOkSB9vY1bQOK3OgqjMbw64Do4C6Ujf0S6k8Awubkw h+8EbreF H90lHt+nSAHFCQtQBTN+wxLCGUqzHHbUtrhLFXLN+/cLjKj0xx1jWisFYLWYIBV3KzZ0CGeVRljI5TwEZzwUHRFXCQPGSz3HZqdY0aBgNRCcL6JYMYfBdsZRK08EVXJxdsWKopk8HDPfEY3Yrb2ZE/6YO+VL2kAG4yOpFTr9PPVer5oNapiQrgsU8ZQP6ecA/F8LvKjHTEV52ruR2hKAZOk1I5HbslRxdXgn7GLp8h5eGAL3k7NV4QLngcwwJHCMWH8JM3h0u/SvGhrH1Oh90eJCiyb+THbnvxAbRZ0OUNJge/GpzgCkueJsx+L4isnkh0m08hNW38Vcw6YYLmeryeyGsZD9JbBCkKAWE0xLyr3i9RkQo7h4eZM5ojeLJd6M6znLz6vW+AkKU5GQC5AIN5Vav0ezS+SKHXh06fhmtCbKt1AZjZA4/O5uKGtuVul10P4G+OTqoTt8za+4IpfRlsuuofXh4CPgB+zfGWedRXyJtTnxNS1VDAA0RJ3aCrU0SSoDarHeJkxePjhOpUOwaSHMF9LhHkj/EAgII42HAEkuZBXhNu8wB9OdgBAk7F1xRDJOzfSAFMaCroYdAa0seS6bV7fR49HnJci9cgsaYzP3udrvZ8x83GlFbmSgPzPcLSSlPKKjim6ul6g87Fw+QUNf8zmTuZjMszho0TTxEPt76okefDB9Xwg6HcWQqUAYHkRghLkFWYSXmF8h8dahvPOBIJA== 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: Implicit vma locking inside vm_flags_reset() and vm_flags_reset_once() is not obvious and makes it hard to understand where vma locking is happening. Also in some cases (like in dup_userfaultfd()) vma should be locked earlier than vma_flags modification. To make locking more visible, change these functions to assert that the vma write lock is taken and explicitly lock the vma beforehand. Fix userfaultfd functions which should lock the vma earlier. Suggested-by: Linus Torvalds Signed-off-by: Suren Baghdasaryan --- arch/powerpc/kvm/book3s_hv_uvmem.c | 1 + fs/userfaultfd.c | 6 ++++++ include/linux/mm.h | 10 +++++++--- mm/madvise.c | 5 ++--- mm/mlock.c | 3 ++- mm/mprotect.c | 1 + 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_hv_uvmem.c index 709ebd578394..e2d6f9327f77 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -410,6 +410,7 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, ret = H_STATE; break; } + vma_start_write(vma); /* Copy vm_flags to avoid partial modifications in ksm_madvise */ vm_flags = vma->vm_flags; ret = ksm_madvise(vma, vma->vm_start, vma->vm_end, diff --git a/fs/userfaultfd.c b/fs/userfaultfd.c index 7cecd49e078b..6cde95533dcd 100644 --- a/fs/userfaultfd.c +++ b/fs/userfaultfd.c @@ -667,6 +667,7 @@ static void userfaultfd_event_wait_completion(struct userfaultfd_ctx *ctx, mmap_write_lock(mm); for_each_vma(vmi, vma) { if (vma->vm_userfaultfd_ctx.ctx == release_new_ctx) { + vma_start_write(vma); vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; userfaultfd_set_vm_flags(vma, vma->vm_flags & ~__VM_UFFD_FLAGS); @@ -702,6 +703,7 @@ int dup_userfaultfd(struct vm_area_struct *vma, struct list_head *fcs) octx = vma->vm_userfaultfd_ctx.ctx; if (!octx || !(octx->features & UFFD_FEATURE_EVENT_FORK)) { + vma_start_write(vma); vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; userfaultfd_set_vm_flags(vma, vma->vm_flags & ~__VM_UFFD_FLAGS); return 0; @@ -783,6 +785,7 @@ void mremap_userfaultfd_prep(struct vm_area_struct *vma, atomic_inc(&ctx->mmap_changing); } else { /* Drop uffd context if remap feature not enabled */ + vma_start_write(vma); vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; userfaultfd_set_vm_flags(vma, vma->vm_flags & ~__VM_UFFD_FLAGS); } @@ -940,6 +943,7 @@ static int userfaultfd_release(struct inode *inode, struct file *file) prev = vma; } + vma_start_write(vma); userfaultfd_set_vm_flags(vma, new_flags); vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; } @@ -1502,6 +1506,7 @@ static int userfaultfd_register(struct userfaultfd_ctx *ctx, * the next vma was merged into the current one and * the current one has not been updated yet. */ + vma_start_write(vma); userfaultfd_set_vm_flags(vma, new_flags); vma->vm_userfaultfd_ctx.ctx = ctx; @@ -1685,6 +1690,7 @@ static int userfaultfd_unregister(struct userfaultfd_ctx *ctx, * the next vma was merged into the current one and * the current one has not been updated yet. */ + vma_start_write(vma); userfaultfd_set_vm_flags(vma, new_flags); vma->vm_userfaultfd_ctx = NULL_VM_UFFD_CTX; diff --git a/include/linux/mm.h b/include/linux/mm.h index 262b5f44101d..2c720c9bb1ae 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -780,18 +780,22 @@ static inline void vm_flags_init(struct vm_area_struct *vma, ACCESS_PRIVATE(vma, __vm_flags) = flags; } -/* Use when VMA is part of the VMA tree and modifications need coordination */ +/* + * Use when VMA is part of the VMA tree and modifications need coordination + * Note: vm_flags_reset and vm_flags_reset_once do not lock the vma and + * it should be locked explicitly beforehand. + */ static inline void vm_flags_reset(struct vm_area_struct *vma, vm_flags_t flags) { - vma_start_write(vma); + vma_assert_write_locked(vma); vm_flags_init(vma, flags); } static inline void vm_flags_reset_once(struct vm_area_struct *vma, vm_flags_t flags) { - vma_start_write(vma); + vma_assert_write_locked(vma); WRITE_ONCE(ACCESS_PRIVATE(vma, __vm_flags), flags); } diff --git a/mm/madvise.c b/mm/madvise.c index bfe0e06427bd..507b1d299fec 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -173,9 +173,8 @@ static int madvise_update_vma(struct vm_area_struct *vma, } success: - /* - * vm_flags is protected by the mmap_lock held in write mode. - */ + /* vm_flags is protected by the mmap_lock held in write mode. */ + vma_start_write(vma); vm_flags_reset(vma, new_flags); if (!vma->vm_file || vma_is_anon_shmem(vma)) { error = replace_anon_vma_name(vma, anon_name); diff --git a/mm/mlock.c b/mm/mlock.c index 479e09d0994c..06bdfab83b58 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -387,6 +387,7 @@ static void mlock_vma_pages_range(struct vm_area_struct *vma, */ if (newflags & VM_LOCKED) newflags |= VM_IO; + vma_start_write(vma); vm_flags_reset_once(vma, newflags); lru_add_drain(); @@ -461,9 +462,9 @@ static int mlock_fixup(struct vma_iterator *vmi, struct vm_area_struct *vma, * It's okay if try_to_unmap_one unmaps a page just after we * set VM_LOCKED, populate_vma_page_range will bring it back. */ - if ((newflags & VM_LOCKED) && (oldflags & VM_LOCKED)) { /* No work to do, and mlocking twice would be wrong */ + vma_start_write(vma); vm_flags_reset(vma, newflags); } else { mlock_vma_pages_range(vma, start, end, newflags); diff --git a/mm/mprotect.c b/mm/mprotect.c index 3aef1340533a..362e190a8f81 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -657,6 +657,7 @@ mprotect_fixup(struct vma_iterator *vmi, struct mmu_gather *tlb, * vm_flags and vm_page_prot are protected by the mmap_lock * held in write mode. */ + vma_start_write(vma); vm_flags_reset(vma, newflags); if (vma_wants_manual_pte_write_upgrade(vma)) mm_cp_flags |= MM_CP_TRY_CHANGE_WRITABLE;