From nobody Thu Apr 2 15:36:12 2026 Received: from mail-dy1-f202.google.com (mail-dy1-f202.google.com [74.125.82.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E8A9330EF77 for ; Fri, 27 Mar 2026 20:55:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774644908; cv=none; b=OYnpUXRA/ZnSLfpJg6ZK86WymPCWCFojYHquiTU5kNQYUa6YLRMA9GPZlsNIcmVUL/kc6CjzKV9eIlfiqUduhU2S7PsksR1yyND164fj1vAg88zO6Ewl3VK2nahrF/SVA5PkqmTKBJSt/3dtta0Rro0B7Jhe1jE405KpOVrWNXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774644908; c=relaxed/simple; bh=fZnlcZOeSjVhl04HcTlDCHmtii+E0UmZNLBd4Vz+tuU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=mmFAgArB9zck0uPGDM8DDR6upenhJs+SwHZQIWCHs7N+do1FMD2fsq/biqOatmUmcxcYJhlNMhqY4e+YoO3HaFyg0CmSNRwaHY8KcXyS1X/JCitgYWf8qob/51aJM3juXc7uojBbvOJQkrSJwqBV78PWnG6TZr07Otwd88fpcRE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=nC+AzOqz; arc=none smtp.client-ip=74.125.82.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--surenb.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="nC+AzOqz" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c0f6593ef5so2642253eec.1 for ; Fri, 27 Mar 2026 13:55:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774644906; x=1775249706; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=6+n3Djg+u5/v209SkkHKUKK85Ins0KyBj2RQsN4UbGc=; b=nC+AzOqzys4d7eC1ucjZQ1MFNGepMKuxNpvJyLgvS5G/WtLM4EUCIpyhhXThmUEEIO ynjR2DVaUKyqV5genLXibQca0oTJZJz31H5piq9a3aTnLS7LufCmRf2XwEEe3eKMuTuy a1LGouYkRqNmPwCGZbFcdvAUCT49JWniyyVBgFDnulLu9CDTNr/wazHUJ5TZ5MTGJUqt 2z6Pvwe3/AI5Pk8bnNxK39FEj1q2sJfSiIm5/1k0uPGaH/xKxjfJo/Jkhr3up7DBfPzM iGWvpp/sJqmbOp1MZnSQrVt5ivgPVC4xq05LP6HeNq2h256n+08VfIu7/QIarpCI0SBT a/gg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774644906; x=1775249706; 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=6+n3Djg+u5/v209SkkHKUKK85Ins0KyBj2RQsN4UbGc=; b=OPh4VTZOxaCxtJKfUW48qFVUMQcW5CLBJ61yhMqBNZ4UimMn46YOREn7rL/j8wC1ET OqPOA9OW01Alr1krTGjf/tu+5hvAGKfsMaCWPaxr7hAmnfAokDWPQC/Q8IjXANQbesdI foiucbVZQvGG3W9ODVTn8D7kAsE9XQOHxH3wbWOPZypvBh4Sd5lY8koGhWBJ1cqAa7jv /2skDGOAEVHfNJfWkW/tj07kU+6ldLdzEdr1yO7SqVOsgwt6NoXWEqqsAkd8JFjYPVDA yJAIGN9t3g8iW6JFgH/ilXlVpciH0WDBcVBxWFmG0wZCKIQZtM7+pUr3LDxaQRCeSih6 ZZdQ== X-Forwarded-Encrypted: i=1; AJvYcCXMSALmyLNl8AZ54iFHrhW3gi745lv9KGnt0Yripj4YN2Toto93OndJ5UyqzSu0FA/nd10Iz/2e2nNxJb4=@vger.kernel.org X-Gm-Message-State: AOJu0YwthJC2f6uEMVcu4NnV2YUw5e+/dpvsbAF+2DPAUwqfvDakg8xS jIYm89rEj5/bVpxx7wNRfJ8DDTUH4Jz0sOgJdFkTU7ULCdxUSjt/ghoOYHHavgqjqy9aduuuIWf ug3YuHQ== X-Received: from dybsr8.prod.google.com ([2002:a05:7301:7188:b0:2c0:b345:9b22]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7301:fa04:b0:2c1:6cfd:73da with SMTP id 5a478bee46e88-2c185fa842amr1935438eec.32.1774644905874; Fri, 27 Mar 2026 13:55:05 -0700 (PDT) Date: Fri, 27 Mar 2026 13:54:53 -0700 In-Reply-To: <20260327205457.604224-1-surenb@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20260327205457.604224-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260327205457.604224-3-surenb@google.com> Subject: [PATCH v6 2/6] mm: use vma_start_write_killable() in mm syscalls From: Suren Baghdasaryan To: akpm@linux-foundation.org Cc: willy@infradead.org, david@kernel.org, ziy@nvidia.com, matthew.brost@intel.com, joshua.hahnjy@gmail.com, rakie.kim@sk.com, byungchul@sk.com, gourry@gourry.net, ying.huang@linux.alibaba.com, apopple@nvidia.com, ljs@kernel.org, baolin.wang@linux.alibaba.com, Liam.Howlett@oracle.com, npache@redhat.com, ryan.roberts@arm.com, dev.jain@arm.com, baohua@kernel.org, lance.yang@linux.dev, vbabka@suse.cz, jannh@google.com, rppt@kernel.org, mhocko@suse.com, pfalcato@suse.de, kees@kernel.org, maddy@linux.ibm.com, npiggin@gmail.com, mpe@ellerman.id.au, chleroy@kernel.org, borntraeger@linux.ibm.com, frankja@linux.ibm.com, imbrenda@linux.ibm.com, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, gerald.schaefer@linux.ibm.com, linux-mm@kvack.org, linuxppc-dev@lists.ozlabs.org, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-s390@vger.kernel.org, surenb@google.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace vma_start_write() with vma_start_write_killable() in syscalls, improving reaction time to the kill signal. In a number of places we now lock VMA earlier than before to avoid doing work and undoing it later if a fatal signal is pending. This is safe because the moves are happening within sections where we already hold the mmap_write_lock, so the moves do not change the locking order relative to other kernel locks. Suggested-by: Matthew Wilcox Signed-off-by: Suren Baghdasaryan --- mm/madvise.c | 13 ++++++++++--- mm/memory.c | 2 ++ mm/mempolicy.c | 11 +++++++++-- mm/mlock.c | 30 ++++++++++++++++++++++++------ mm/mprotect.c | 25 +++++++++++++++++-------- mm/mremap.c | 8 +++++--- mm/mseal.c | 24 +++++++++++++++++++----- 7 files changed, 86 insertions(+), 27 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 69708e953cf5..f2c7b0512cdf 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -172,10 +172,17 @@ static int madvise_update_vma(vm_flags_t new_flags, if (IS_ERR(vma)) return PTR_ERR(vma); =20 - madv_behavior->vma =3D vma; + /* + * If a new vma was created during vma_modify_XXX, the resulting + * vma is already locked. Skip re-locking new vma in this case. + */ + if (vma =3D=3D madv_behavior->vma) { + if (vma_start_write_killable(vma)) + return -EINTR; + } else { + madv_behavior->vma =3D vma; + } =20 - /* vm_flags is protected by the mmap_lock held in write mode. */ - vma_start_write(vma); vma->flags =3D new_vma_flags; if (set_new_anon_name) return replace_anon_vma_name(vma, anon_name); diff --git a/mm/memory.c b/mm/memory.c index e44469f9cf65..9f99ec634831 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -366,6 +366,8 @@ void free_pgd_range(struct mmu_gather *tlb, * page tables that should be removed. This can differ from the vma mappi= ngs on * some archs that may have mappings that need to be removed outside the v= mas. * Note that the prev->vm_end and next->vm_start are often used. + * We don't use vma_start_write_killable() because page tables should be f= reed + * even if the task is being killed. * * The vma_end differs from the pg_end when a dup_mmap() failed and the tr= ee has * unrelated data to the mm_struct being torn down. diff --git a/mm/mempolicy.c b/mm/mempolicy.c index fd08771e2057..c38a90487531 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -1784,7 +1784,8 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned lon= g, start, unsigned long, le return -EINVAL; if (end =3D=3D start) return 0; - mmap_write_lock(mm); + if (mmap_write_lock_killable(mm)) + return -EINTR; prev =3D vma_prev(&vmi); for_each_vma_range(vmi, vma, end) { /* @@ -1801,13 +1802,19 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned l= ong, start, unsigned long, le err =3D -EOPNOTSUPP; break; } + /* + * Lock the VMA early to avoid extra work if fatal signal + * is pending. + */ + err =3D vma_start_write_killable(vma); + if (err) + break; new =3D mpol_dup(old); if (IS_ERR(new)) { err =3D PTR_ERR(new); break; } =20 - vma_start_write(vma); new->home_node =3D home_node; err =3D mbind_range(&vmi, vma, &prev, start, end, new); mpol_put(new); diff --git a/mm/mlock.c b/mm/mlock.c index 8c227fefa2df..2ed454db7cf7 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -419,8 +419,10 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long a= ddr, * * Called for mlock(), mlock2() and mlockall(), to set @vma VM_LOCKED; * called for munlock() and munlockall(), to clear VM_LOCKED from @vma. + * + * Return: 0 on success, -EINTR if fatal signal is pending. */ -static void mlock_vma_pages_range(struct vm_area_struct *vma, +static int mlock_vma_pages_range(struct vm_area_struct *vma, unsigned long start, unsigned long end, vma_flags_t *new_vma_flags) { @@ -442,7 +444,9 @@ static void mlock_vma_pages_range(struct vm_area_struct= *vma, */ if (vma_flags_test(new_vma_flags, VMA_LOCKED_BIT)) vma_flags_set(new_vma_flags, VMA_IO_BIT); - vma_start_write(vma); + if (vma_start_write_killable(vma)) + return -EINTR; + vma_flags_reset_once(vma, new_vma_flags); =20 lru_add_drain(); @@ -453,6 +457,7 @@ static void mlock_vma_pages_range(struct vm_area_struct= *vma, vma_flags_clear(new_vma_flags, VMA_IO_BIT); vma_flags_reset_once(vma, new_vma_flags); } + return 0; } =20 /* @@ -506,11 +511,15 @@ static int mlock_fixup(struct vma_iterator *vmi, stru= ct vm_area_struct *vma, */ if (vma_flags_test(&new_vma_flags, VMA_LOCKED_BIT) && vma_flags_test(&old_vma_flags, VMA_LOCKED_BIT)) { + ret =3D vma_start_write_killable(vma); + if (ret) + goto out; /* mm->locked_vm is fine as nr_pages =3D=3D 0 */ /* No work to do, and mlocking twice would be wrong */ - vma_start_write(vma); vma->flags =3D new_vma_flags; } else { - mlock_vma_pages_range(vma, start, end, &new_vma_flags); + ret =3D mlock_vma_pages_range(vma, start, end, &new_vma_flags); + if (ret) + mm->locked_vm -=3D nr_pages; } out: *prev =3D vma; @@ -739,9 +748,18 @@ static int apply_mlockall_flags(int flags) =20 error =3D mlock_fixup(&vmi, vma, &prev, vma->vm_start, vma->vm_end, newflags); - /* Ignore errors, but prev needs fixing up. */ - if (error) + if (error) { + /* + * If we failed due to a pending fatal signal, return + * now. If we locked the vma before signal arrived, it + * will be unlocked when we drop mmap_write_lock. + */ + if (fatal_signal_pending(current)) + return -EINTR; + + /* Ignore errors, but prev needs fixing up. */ prev =3D vma; + } cond_resched(); } out: diff --git a/mm/mprotect.c b/mm/mprotect.c index 110d47a36d4b..d6227877465f 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -700,6 +700,7 @@ mprotect_fixup(struct vma_iterator *vmi, struct mmu_gat= her *tlb, const vma_flags_t old_vma_flags =3D READ_ONCE(vma->flags); vma_flags_t new_vma_flags =3D legacy_to_vma_flags(newflags); long nrpages =3D (end - start) >> PAGE_SHIFT; + struct vm_area_struct *new_vma; unsigned int mm_cp_flags =3D 0; unsigned long charged =3D 0; int error; @@ -756,19 +757,27 @@ mprotect_fixup(struct vma_iterator *vmi, struct mmu_g= ather *tlb, vma_flags_clear(&new_vma_flags, VMA_ACCOUNT_BIT); } =20 - vma =3D vma_modify_flags(vmi, *pprev, vma, start, end, &new_vma_flags); - if (IS_ERR(vma)) { - error =3D PTR_ERR(vma); + new_vma =3D vma_modify_flags(vmi, *pprev, vma, start, end, + &new_vma_flags); + if (IS_ERR(new_vma)) { + error =3D PTR_ERR(new_vma); goto fail; } =20 - *pprev =3D vma; - /* - * vm_flags and vm_page_prot are protected by the mmap_lock - * held in write mode. + * If a new vma was created during vma_modify_flags, the resulting + * vma is already locked. Skip re-locking new vma in this case. */ - vma_start_write(vma); + if (new_vma =3D=3D vma) { + error =3D vma_start_write_killable(vma); + if (error) + goto fail; + } else { + vma =3D new_vma; + } + + *pprev =3D vma; + vma_flags_reset_once(vma, &new_vma_flags); if (vma_wants_manual_pte_write_upgrade(vma)) mm_cp_flags |=3D MM_CP_TRY_CHANGE_WRITABLE; diff --git a/mm/mremap.c b/mm/mremap.c index e9c8b1d05832..0860102bddab 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1348,6 +1348,11 @@ static unsigned long move_vma(struct vma_remap_struc= t *vrm) if (err) return err; =20 + /* We don't want racing faults. */ + err =3D vma_start_write_killable(vrm->vma); + if (err) + return err; + /* * If accounted, determine the number of bytes the operation will * charge. @@ -1355,9 +1360,6 @@ static unsigned long move_vma(struct vma_remap_struct= *vrm) if (!vrm_calc_charge(vrm)) return -ENOMEM; =20 - /* We don't want racing faults. */ - vma_start_write(vrm->vma); - /* Perform copy step. */ err =3D copy_vma_and_data(vrm, &new_vma); /* diff --git a/mm/mseal.c b/mm/mseal.c index 603df53ad267..1ea19fd3d384 100644 --- a/mm/mseal.c +++ b/mm/mseal.c @@ -70,14 +70,28 @@ static int mseal_apply(struct mm_struct *mm, =20 if (!vma_test(vma, VMA_SEALED_BIT)) { vma_flags_t vma_flags =3D vma->flags; + struct vm_area_struct *new_vma; =20 vma_flags_set(&vma_flags, VMA_SEALED_BIT); =20 - vma =3D vma_modify_flags(&vmi, prev, vma, curr_start, - curr_end, &vma_flags); - if (IS_ERR(vma)) - return PTR_ERR(vma); - vma_start_write(vma); + new_vma =3D vma_modify_flags(&vmi, prev, vma, curr_start, + curr_end, &vma_flags); + if (IS_ERR(new_vma)) + return PTR_ERR(new_vma); + + /* + * If a new vma was created during vma_modify_flags, + * the resulting vma is already locked. + * Skip re-locking new vma in this case. + */ + if (new_vma =3D=3D vma) { + int err =3D vma_start_write_killable(vma); + if (err) + return err; + } else { + vma =3D new_vma; + } + vma_set_flags(vma, VMA_SEALED_BIT); } =20 --=20 2.53.0.1018.g2bb0e51243-goog