From nobody Thu Apr 2 22:22:20 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 A7C9F34D3A5 for ; Thu, 26 Mar 2026 08:08:44 +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=1774512525; cv=none; b=DjcnXHgIUJ7ApyzwA2faOYR5SrBHaw1IuxXop4OryHfw+9d/boUGxHh9e5iOvC6RB+KrunX7vjQupUqTVEHOTB1I+sXp/aQOvlJDt4SmEECYaq7SCfAisP9RnRpDIOJ2puVnHSe4lOMVS8bLEelLTKMDw381qr+sOR1hNyN27vg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512525; c=relaxed/simple; bh=sf6ZRopiRtrqEMlCQEVNfp8Vt7nygFqSKsvnUNGcEHI=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GFb4SjuxAFVpdxnlgk9BiiZdzPdNRiyCmcSVvmOYdbcdoOItb+P4OM/dChihT/1linVvtORZ0D64CgBtQ/bd1is9GGvUCFe6l/CkdkUpwRoYN5Q+z72a2FSJKcopSrSlclv0d0sF+3pKeIi/rlaaHipdWOnMRWxC/qqkLT0fYDA= 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=LUvHAW7L; 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="LUvHAW7L" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c0bddb9196so450930eec.1 for ; Thu, 26 Mar 2026 01:08:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774512524; x=1775117324; 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=wGMSLi6pfWPDruUV3e3+0duVYRVGge54aYv+ZuYilb8=; b=LUvHAW7LNoZv8pxT5kMz299rQ3sQw5KTiRBTHyeSYvnHX3ReTAMcmTsE1upIxRTQJS hmNH4G4YgL2xFLEo/9apgYlNbmZ0io9gsE2MOl4ahN+ANNKgxlW+T7P2uXY0+C8naLY/ YComYY787qk4vXbIIAbbO5J3eRGQe7Ew3bY52n57aNxsucOuoYjf2uZTSedFs/mM/6TQ b/iKt2GlTUHmuQKHzWKqa4ZuCMHAVuRAj0Q9ZhqmOc5A1NEWmTvp+GvRnxBaPjXRp14z Txx1f5CYqN7XhqNZN3ST+xT4jQPUeKXJC7nfyPG2jl4w8tE9LKnZYWmxNrAZgXCMIX10 qPCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774512524; x=1775117324; 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=wGMSLi6pfWPDruUV3e3+0duVYRVGge54aYv+ZuYilb8=; b=ECqvIDCBMJn1ujKCCqiIEWKYnQ0z5C3w/t+k4hbDVMbiSUE1MSY6Za3bllBZoZjbuC Z2H9388ZDl30gUaxY3ezhX1vefIvR+yHfHlSxVozE8Y0nZ18ecSRzI5XcKN9kQFsYbec YNWFwDzw/akm3wrNkBlANnFxZr7p78Mve5iHOQy5LQEzwuERQGYML5TXh8YkHbfnAIEu JcUb9rEic3uIYwmH5vsGEKS3p5HH/+pEfg+RpWtCPSP3b5/cwlZtTHPYofn4++gd/pjt Tk1iGt55Dixo5TMFBWOWuAA75F2sop5u7kzW6eB9Gt8SQRuYLD2wCm98tjsG3F5PmWE0 T16A== X-Forwarded-Encrypted: i=1; AJvYcCU0uOsG4vF4vgOZy8tXaGCClW2NAoWcXQN1uyMG2IyGWE7sziruf7C3P56ntSCnIfr6oou25AtBLnHuhgg=@vger.kernel.org X-Gm-Message-State: AOJu0Yz7g5HNSexIEduwDvBkBrF+QVCXEQ8qXTK7ZrfSF0l32J2+VVVT AW0VfHy+0tXXZNwDnJSgbMd3Pl/yJhszcGsnwM33Q0BVtNdaCkPp349PqRWt90BSL4uClmnBN8D uzQYlRQ== X-Received: from dykg12.prod.google.com ([2002:a05:7300:578c:b0:2c0:da3c:9f74]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:dc05:b0:2c0:f424:b545 with SMTP id 5a478bee46e88-2c15d350374mr3760721eec.15.1774512523474; Thu, 26 Mar 2026 01:08:43 -0700 (PDT) Date: Thu, 26 Mar 2026 01:08:31 -0700 In-Reply-To: <20260326080836.695207-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: <20260326080836.695207-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326080836.695207-2-surenb@google.com> Subject: [PATCH v5 1/6] mm/vma: cleanup error handling path in vma_expand() 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, lorenzo.stoakes@oracle.com, 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" vma_expand() error handling is a bit confusing with "if (ret) return ret;" mixed with "if (!ret && ...) ret =3D ...;". Simplify the code to check for errors and return immediately after an operation that might fail. This also makes later changes to this function more readable. Change variable name for storing the error code from "ret" to "err". No functional change intended. Suggested-by: Jann Horn Signed-off-by: Suren Baghdasaryan Reviewed-by: Liam R. Howlett Reviewed-by: Lorenzo Stoakes Reviewed-by: Barry Song --- mm/vma.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index a43f3c5d4b3d..ba78ab1f397a 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1170,7 +1170,7 @@ int vma_expand(struct vma_merge_struct *vmg) vma_flags_t sticky_flags =3D vma_flags_and_mask(&vmg->vma_flags, VMA_STICKY_FLAGS); vma_flags_t target_sticky; - int ret =3D 0; + int err =3D 0; =20 mmap_assert_write_locked(vmg->mm); vma_start_write(target); @@ -1200,12 +1200,16 @@ int vma_expand(struct vma_merge_struct *vmg) * Note that, by convention, callers ignore OOM for this case, so * we don't need to account for vmg->give_up_on_mm here. */ - if (remove_next) - ret =3D dup_anon_vma(target, next, &anon_dup); - if (!ret && vmg->copied_from) - ret =3D dup_anon_vma(target, vmg->copied_from, &anon_dup); - if (ret) - return ret; + if (remove_next) { + err =3D dup_anon_vma(target, next, &anon_dup); + if (err) + return err; + } + if (vmg->copied_from) { + err =3D dup_anon_vma(target, vmg->copied_from, &anon_dup); + if (err) + return err; + } =20 if (remove_next) { vma_flags_t next_sticky; --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 22:22:20 2026 Received: from mail-dy1-f201.google.com (mail-dy1-f201.google.com [74.125.82.201]) (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 BFF6838A70F for ; Thu, 26 Mar 2026 08:08:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512529; cv=none; b=QoAWFRV7atUQMboY0IA+yl9JupuokesYQSnDAbSuy2go76lkne3G3PEpRB3aCqayHaWIAtR0oO399YBOyP2tRod2Sa5/vUngNtId9v4/8tVSC5i7zA0eATWvMUOvk6aIbRF5fXcUckVQvMvSqkNLZvuEMtY4yIobbvTitJhm+bI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512529; c=relaxed/simple; bh=t74dnI+rxOISLYbAQ9wo5lkenKT6OQ51Z5+uKLX6Lxw=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=jwRSUVOFKFXybbtnVM9Z2UzCvUrLxW5kIvCAuVFsZp1+zlJo9iHfoy/4SlojWKocMK9DGa9pqx2vAiL6nn2UQ/Y4+h/s1QXfvSmeofddrWZ7ExrUx3amAS6d00VjzOhs1beOUOyPTk3cLGAVv5j8R5MthP/nzJ8dQH0uhXj9U8E= 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=tLQSdwKL; arc=none smtp.client-ip=74.125.82.201 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="tLQSdwKL" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c0ffce2570so4640850eec.1 for ; Thu, 26 Mar 2026 01:08:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774512526; x=1775117326; 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=C+yXmhx3uKy+6G9q4kJM+us9QDWjdFJDAOgDq56Y4dE=; b=tLQSdwKLC8kDAOHCsUi0vAe3124R4x7w9bZHzZR2Ql1ymRZVUdLhQ9/xDBLplca+c5 RmkYV2q2HljCwsCZXYnWYep/Bh4rywBiYX5rC3RXHyWv/CFmY8Kf39SEPKpmiEnpDCf4 PWuNfqQNfJoeLFAEqhtr2PyD6Fl2lMmrTXO+CwILorDYmGk9QzG47XCJ61ARvu/Fu0xw nAG7+hcUzV0r/nIfLBzzwDAMqzgbamw2mMJk2W3WGJGGnF20srT0XNG3DTq7k46XACQC /GJWaLfB2A8NPL9R9SmCnF1pZIV9Km7WDWkZ14GJn7lQVgyfVwAOmyLqjmW4TkczCN2z cQOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774512526; x=1775117326; 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=C+yXmhx3uKy+6G9q4kJM+us9QDWjdFJDAOgDq56Y4dE=; b=CycIheEylQtFPgeH2zBnTpVlS3mfepb7q6j1AVwDJO6hgNydr5+kE2ymwFp82O2zGX 1neZPtJgycoq3K8/+Gi562fuH+EElC5xL1RnuQhFe25RUDbA5Z7J3E+VO2NGpCOyzs5Y g+JEVLXqRyr7mmznJKW68YIN4ZmjDxXD4/DM12rM5q7na65rc+fC+EIWqIJF+JGEsCOr Z4pbPjlVynMJqTnkn4xkeNCto6UEdQiQ4/Zv6dm+tEP9mYQQ9Lcwh2ssdE9S4HoR5U1g oA7MIioKX6De65E+aDLr/3niyNxVGP/QAAeOj+IJigEks+yOuBstq0KPjFPgSjgDFrAx LtgQ== X-Forwarded-Encrypted: i=1; AJvYcCVgPhO0Y6W0aR3G1gzt0cVrE9IEZCiG75/PNlHvjG6r0nE+5hz5zb1HOf3OGZV6uy7Oe8UcOzKXNKHSafw=@vger.kernel.org X-Gm-Message-State: AOJu0Yyy2LeQxTSJLDm+Cp5lyXoCWPQnnAOC5B7QteO69hKLDnh7vxS3 iAK3F3czCB9s6QQ9AhVC//Yklarj0FVZAvPXmf9zCkA+VO/UrK5zfvydqo/ekMUorKU7TCan4Wg rU2FmYQ== X-Received: from dlbvs2.prod.google.com ([2002:a05:7022:3f02:b0:128:d36e:eb6f]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:402:b0:11b:c1ab:bdd4 with SMTP id a92af1059eb24-12a96f04f69mr3338876c88.38.1774512525642; Thu, 26 Mar 2026 01:08:45 -0700 (PDT) Date: Thu, 26 Mar 2026 01:08:32 -0700 In-Reply-To: <20260326080836.695207-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: <20260326080836.695207-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326080836.695207-3-surenb@google.com> Subject: [PATCH v5 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, lorenzo.stoakes@oracle.com, 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 Reviewed-by: Lorenzo Stoakes (Oracle) --- mm/madvise.c | 4 +++- mm/memory.c | 2 ++ mm/mempolicy.c | 11 +++++++++-- mm/mlock.c | 28 ++++++++++++++++++++++------ mm/mprotect.c | 5 ++++- mm/mremap.c | 8 +++++--- mm/mseal.c | 5 ++++- 7 files changed, 49 insertions(+), 14 deletions(-) diff --git a/mm/madvise.c b/mm/madvise.c index 69708e953cf5..feaa16b0e1dc 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -175,7 +175,9 @@ static int madvise_update_vma(vm_flags_t new_flags, madv_behavior->vma =3D vma; =20 /* vm_flags is protected by the mmap_lock held in write mode. */ - vma_start_write(vma); + if (vma_start_write_killable(vma)) + return -EINTR; + 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..3d9147f3d404 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,13 @@ 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); } out: *prev =3D vma; @@ -739,9 +746,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..ae6ed882b600 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -768,7 +768,10 @@ mprotect_fixup(struct vma_iterator *vmi, struct mmu_ga= ther *tlb, * vm_flags and vm_page_prot are protected by the mmap_lock * held in write mode. */ - vma_start_write(vma); + error =3D vma_start_write_killable(vma); + if (error) + goto fail; + 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..3b7737ba7524 100644 --- a/mm/mseal.c +++ b/mm/mseal.c @@ -70,6 +70,7 @@ static int mseal_apply(struct mm_struct *mm, =20 if (!vma_test(vma, VMA_SEALED_BIT)) { vma_flags_t vma_flags =3D vma->flags; + int err; =20 vma_flags_set(&vma_flags, VMA_SEALED_BIT); =20 @@ -77,7 +78,9 @@ static int mseal_apply(struct mm_struct *mm, curr_end, &vma_flags); if (IS_ERR(vma)) return PTR_ERR(vma); - vma_start_write(vma); + err =3D vma_start_write_killable(vma); + if (err) + return err; vma_set_flags(vma, VMA_SEALED_BIT); } =20 --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 22:22:20 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 A62D83AE6ED for ; Thu, 26 Mar 2026 08:08:48 +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=1774512531; cv=none; b=Ms53m6HklZRKuvXuTozhoNI5Ez+xnfzUgC3ZvDLXu4frhjx5FmvgSU9Wovd1HG3sMhCYN5FJFjidcxA4kZP1mNxM7eiwQD+JnOuktPRA0oW6GpRy5FVy7OPolgJ7IETZiXpr8/F/B8qkDk2T7fu1r2NnbNInxGRk4CacDs+OCNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512531; c=relaxed/simple; bh=3GnyT2WlT0kxCiLmP60OzV4FCCTn3R5BE0Og+KeeECM=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=nJ74Qhl89KmbHUDTX8vEbvj5FaSpbckZPqp0gRwU1f5+2hn7x+Iu/kHmw1um/FGbPfwD3FlTzo5iaYYDQKvby3zdHcyZ4XkhoeJUGd0kYxMjXghSoaBJRRHyIqYVD+MFzGol8KvnJls+KaPj4qxwn3cELR7kFkuS3fuVc3lJjmQ= 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=g2rMXptF; 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="g2rMXptF" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2bda35eab74so476615eec.0 for ; Thu, 26 Mar 2026 01:08:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774512528; x=1775117328; 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=f0m3laKqVZc6BVbp9FlOKUOANtvuTeySm/ZmFaYOMpk=; b=g2rMXptFmW4TRj48LH0oH/MEJgD7TxDarlOlK0oGHU9UxCAgx/NiGncdIC/DM8RwSm 32EMcdSlm01zFWSHXMQfaOMO4JjnsIeP2PjnBSoNvEiI++XSmS/UetS1bfdXtddkP1Sl t1aOICPZClUQxh5m/lUNpHmF35ecEwhxh1UBApWjhvSSOlDr0EpbOVNWyII2RIUs6OBQ G8PKZoNLStToQL+oR6Su/TrFhVQjQZ2Ot1a49D9TGhrDMG2ZRLn8iocSg/IR+LeSrOp3 BHio8f5uCbx2xI/1sers5kiY9GkrFxNXIdtMB2NXMw44Wv6xsnfF97LQThfc9f22pbnc MpXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774512528; x=1775117328; 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=f0m3laKqVZc6BVbp9FlOKUOANtvuTeySm/ZmFaYOMpk=; b=k2jtXxkng3gMSM6BJQrHGldGkPF0IUBxdImuP4ePPFXltvoVZN978/uX/gzuUZ+jrR NQuV9bqduprt++q77dAG6hYRh/12Exrhq31WBUkjPM5TjB10ypr6khtZOFNkqzZ2FSNE 52SYxFQxqsiHKpefxQc8mRoDNFxHMXE7vNOG8cKP0/gOQTlukEy/yhLthEbHruzz4wdh vQhuAg7q6lC5DV0l2SLj3ly/tR7z0YDgZ1nmRcG+084BXfA9v8cMvCPu/Ik9liyZjzBT j3p8CQz4zItEhANro7rGPWbXUG3BYwE5wORAvXBMOk588yNjq5yj8CpM5iKg+QOzzDmn rXLg== X-Forwarded-Encrypted: i=1; AJvYcCXuvvUHkAmqs3jf1BBw62PQxXVryudy8TV2tdKP3a+t8GCgqY4hCbxTXhX6Dbpx2y2FQhtIl0kqLs7kC9s=@vger.kernel.org X-Gm-Message-State: AOJu0Yz29TyX3jHI7AWhOgOrrCxFlwRPzLK/4gZdwkXqQBtJgLJxnfSb GG/BCOSMG/16lHmmxrt43K6EMPR9hDr+fHf680yANUV8got2cKlm3W5Nk+/0K1grY4xKVo9sc7s JXFVIlQ== X-Received: from dybvq8.prod.google.com ([2002:a05:7301:77c8:b0:2c1:da8:eab3]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:724c:b0:2ba:6f16:10cf with SMTP id 5a478bee46e88-2c17726234cmr295020eec.14.1774512527594; Thu, 26 Mar 2026 01:08:47 -0700 (PDT) Date: Thu, 26 Mar 2026 01:08:33 -0700 In-Reply-To: <20260326080836.695207-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: <20260326080836.695207-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326080836.695207-4-surenb@google.com> Subject: [PATCH v5 3/6] mm/khugepaged: use vma_start_write_killable() in collapse_huge_page() 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, lorenzo.stoakes@oracle.com, 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, "Lorenzo Stoakes (Oracle)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace vma_start_write() with vma_start_write_killable(), improving reaction time to the kill signal. Replace vma_start_write() in collapse_huge_page(). Suggested-by: Matthew Wilcox Signed-off-by: Suren Baghdasaryan Reviewed-by: Lorenzo Stoakes (Oracle) --- mm/khugepaged.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mm/khugepaged.c b/mm/khugepaged.c index d06d84219e1b..a1825a4dec8b 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1166,7 +1166,10 @@ static enum scan_result collapse_huge_page(struct mm= _struct *mm, unsigned long a if (result !=3D SCAN_SUCCEED) goto out_up_write; /* check if the pmd is still valid */ - vma_start_write(vma); + if (vma_start_write_killable(vma)) { + result =3D SCAN_FAIL; + goto out_up_write; + } result =3D check_pmd_still_valid(mm, address, pmd); if (result !=3D SCAN_SUCCEED) goto out_up_write; --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 22:22:20 2026 Received: from mail-dl1-f74.google.com (mail-dl1-f74.google.com [74.125.82.74]) (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 E63E53B6352 for ; Thu, 26 Mar 2026 08:08:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.74 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512532; cv=none; b=M0BSwSYk3IKXWrJvH+Kaw07ZuSMbM1SJTKGx+KH+iCJfq/W8lTDaq8z4eo37z4UT0wEsbtjxo+mVAIwxrv4Mgh6ouiOPsXrouUn9NE+F4/+Ds+3ypGcFo2vSS5o4fWrRGRVYa4qoMaQHBGmyBMav46mVwQUiBPigWbwXo4dvUWk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512532; c=relaxed/simple; bh=wV10NJ0R0I+zl6eHhbnSr8trrLW6Jl7aEBlC+EKJbFQ=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=JAwdLU8jRsGQNHM6JmSJfy0gAhQTxrEECbb3S6nWzmxxJG5224Lu/fCSxUfvuyYsxdYqzUWWZxU5t4GiM0euMqkKDWUEsUau5hGCb5XM++bGUWl3eKfn2uTvPxlpfxsQyw64tkD81iNSH2rbkLFzYtCVZx9bQmXMBzCNCErvrmI= 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=Ya+463Al; arc=none smtp.client-ip=74.125.82.74 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="Ya+463Al" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-12711ec96fbso3104844c88.0 for ; Thu, 26 Mar 2026 01:08:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774512530; x=1775117330; 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=PUqdYCoBg/kEy42eZkJV8irdcP7MA2fDPdgYAg1G1X4=; b=Ya+463AlSnQurMLGmK75mpMEoJ+haFpk8McAEPMtXKC4/6btbsalrjvkOHMfwEcpLD X+4VtD5HkLSLSiRYFLAYYDVLzS943bSzz1M1ofuEyVNcKuJI7Kkyt0a/h1fDor1KZKoY xhYxddbwu77f8oK7ZfNCo5jq104/A/Y5dTDj91HNg59P7EMMa5nP0No1jly3dnb/zAK2 u12UVPSkgrpjlHao5IZFvKfIIrAWJdoTMdj6f4fpVjcnmCFIrq1B8V7rAdsWBpVtglln 2+ue5iIwshy5+BWagQasHrTD+H0Vot/+KQjHaBP/1N2FuHK/j338hzobdI77/eT4mg7M l2DQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774512530; x=1775117330; 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=PUqdYCoBg/kEy42eZkJV8irdcP7MA2fDPdgYAg1G1X4=; b=aXuj8R2OJTNBeH+vxQ6dz4ZT/+djPVRecLPvGSeHv8BL19mo3Krrg2wcbkJu8/oxlk uMzzT9Gb1G4CBzrLaPfDx3XmDVfMq2nsp3SQLl4V0AIH17+9t6hBl4/OaozjRNrjj9ul tAtshI7nKT+p4SeGS2p45tUhrkHoYQ2MBJNwGPsDwS9RPYsR+8Q8LJ0EoBUcJAaGQj9s VXhtL3a688qBI2h5iHbrdn8h4uVVzn+dtB4YtSpE0tqhQlYykT+/AIVrKVqY96nHwMbV 7akwoaJih64xFYyFbJZrbWCmEy3rXUE9c1Kxjnf/MhP2mTDEMxUdsd+7BlQYZ8rZg24B oMXA== X-Forwarded-Encrypted: i=1; AJvYcCVh8aZKLB9tV10Xghso7trBj9PB6i8wQm4NfL2QctkAAL/3addswwrWEiCk/peyFt7u1m4fG3Zd/xeY+yY=@vger.kernel.org X-Gm-Message-State: AOJu0YwQHdaJ7wlN2aw527KMciOF80omE3EV7TnqJNklvxpUPbxxsS6u 8zzLMvGjGgnTEAgdME+zIAoBuGkFJcmNdRwROsBGSbgh1fe5jLd2CqVmXmeSWKR2tKD93YNvqid dbA2hLw== X-Received: from dlx24.prod.google.com ([2002:a05:7022:98:b0:12a:6ccc:6d06]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:4387:b0:128:d107:da0f with SMTP id a92af1059eb24-12a96e5405cmr4138769c88.10.1774512529879; Thu, 26 Mar 2026 01:08:49 -0700 (PDT) Date: Thu, 26 Mar 2026 01:08:34 -0700 In-Reply-To: <20260326080836.695207-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: <20260326080836.695207-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326080836.695207-5-surenb@google.com> Subject: [PATCH v5 4/6] mm/vma: use vma_start_write_killable() in vma operations 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, lorenzo.stoakes@oracle.com, 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(), improving reaction time to the kill signal. Replace vma_start_write() calls when we operate on VMAs. 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 Reviewed-by: Lorenzo Stoakes (Oracle) --- mm/vma.c | 130 +++++++++++++++++++++++++++++++++++++------------- mm/vma_exec.c | 6 ++- 2 files changed, 101 insertions(+), 35 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index ba78ab1f397a..7ee68fbfea03 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -524,6 +524,17 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_s= truct *vma, new->vm_pgoff +=3D ((addr - vma->vm_start) >> PAGE_SHIFT); } =20 + /* + * Lock VMAs before cloning to avoid extra work if fatal signal + * is pending. + */ + err =3D vma_start_write_killable(vma); + if (err) + goto out_free_vma; + err =3D vma_start_write_killable(new); + if (err) + goto out_free_vma; + err =3D -ENOMEM; vma_iter_config(vmi, new->vm_start, new->vm_end); if (vma_iter_prealloc(vmi, new)) @@ -543,9 +554,6 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_st= ruct *vma, if (new->vm_ops && new->vm_ops->open) new->vm_ops->open(new); =20 - vma_start_write(vma); - vma_start_write(new); - init_vma_prep(&vp, vma); vp.insert =3D new; vma_prepare(&vp); @@ -900,12 +908,22 @@ static __must_check struct vm_area_struct *vma_merge_= existing_range( } =20 /* No matter what happens, we will be adjusting middle. */ - vma_start_write(middle); + err =3D vma_start_write_killable(middle); + if (err) { + /* Ensure error propagates. */ + vmg->give_up_on_oom =3D false; + goto abort; + } =20 if (merge_right) { vma_flags_t next_sticky; =20 - vma_start_write(next); + err =3D vma_start_write_killable(next); + if (err) { + /* Ensure error propagates. */ + vmg->give_up_on_oom =3D false; + goto abort; + } vmg->target =3D next; next_sticky =3D vma_flags_and_mask(&next->flags, VMA_STICKY_FLAGS); vma_flags_set_mask(&sticky_flags, next_sticky); @@ -914,7 +932,12 @@ static __must_check struct vm_area_struct *vma_merge_e= xisting_range( if (merge_left) { vma_flags_t prev_sticky; =20 - vma_start_write(prev); + err =3D vma_start_write_killable(prev); + if (err) { + /* Ensure error propagates. */ + vmg->give_up_on_oom =3D false; + goto abort; + } vmg->target =3D prev; =20 prev_sticky =3D vma_flags_and_mask(&prev->flags, VMA_STICKY_FLAGS); @@ -1170,10 +1193,12 @@ int vma_expand(struct vma_merge_struct *vmg) vma_flags_t sticky_flags =3D vma_flags_and_mask(&vmg->vma_flags, VMA_STICKY_FLAGS); vma_flags_t target_sticky; - int err =3D 0; + int err; =20 mmap_assert_write_locked(vmg->mm); - vma_start_write(target); + err =3D vma_start_write_killable(target); + if (err) + return err; =20 target_sticky =3D vma_flags_and_mask(&target->flags, VMA_STICKY_FLAGS); =20 @@ -1201,6 +1226,13 @@ int vma_expand(struct vma_merge_struct *vmg) * we don't need to account for vmg->give_up_on_mm here. */ if (remove_next) { + /* + * Lock the VMA early to avoid extra work if fatal signal + * is pending. + */ + err =3D vma_start_write_killable(next); + if (err) + return err; err =3D dup_anon_vma(target, next, &anon_dup); if (err) return err; @@ -1214,7 +1246,6 @@ int vma_expand(struct vma_merge_struct *vmg) if (remove_next) { vma_flags_t next_sticky; =20 - vma_start_write(next); vmg->__remove_next =3D true; =20 next_sticky =3D vma_flags_and_mask(&next->flags, VMA_STICKY_FLAGS); @@ -1252,9 +1283,14 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_a= rea_struct *vma, unsigned long start, unsigned long end, pgoff_t pgoff) { struct vma_prepare vp; + int err; =20 WARN_ON((vma->vm_start !=3D start) && (vma->vm_end !=3D end)); =20 + err =3D vma_start_write_killable(vma); + if (err) + return err; + if (vma->vm_start < start) vma_iter_config(vmi, vma->vm_start, start); else @@ -1263,8 +1299,6 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_ar= ea_struct *vma, if (vma_iter_prealloc(vmi, NULL)) return -ENOMEM; =20 - vma_start_write(vma); - init_vma_prep(&vp, vma); vma_prepare(&vp); vma_adjust_trans_huge(vma, start, end, NULL); @@ -1453,7 +1487,9 @@ static int vms_gather_munmap_vmas(struct vma_munmap_s= truct *vms, if (error) goto end_split_failed; } - vma_start_write(next); + error =3D vma_start_write_killable(next); + if (error) + goto munmap_gather_failed; mas_set(mas_detach, vms->vma_count++); error =3D mas_store_gfp(mas_detach, next, GFP_KERNEL); if (error) @@ -1848,12 +1884,16 @@ static void vma_link_file(struct vm_area_struct *vm= a, bool hold_rmap_lock) static int vma_link(struct mm_struct *mm, struct vm_area_struct *vma) { VMA_ITERATOR(vmi, mm, 0); + int err; + + err =3D vma_start_write_killable(vma); + if (err) + return err; =20 vma_iter_config(&vmi, vma->vm_start, vma->vm_end); if (vma_iter_prealloc(&vmi, vma)) return -ENOMEM; =20 - vma_start_write(vma); vma_iter_store_new(&vmi, vma); vma_link_file(vma, /* hold_rmap_lock=3D */false); mm->map_count++; @@ -2239,9 +2279,8 @@ int mm_take_all_locks(struct mm_struct *mm) * is reached. */ for_each_vma(vmi, vma) { - if (signal_pending(current)) + if (signal_pending(current) || vma_start_write_killable(vma)) goto out_unlock; - vma_start_write(vma); } =20 vma_iter_init(&vmi, mm, 0); @@ -2540,8 +2579,8 @@ static int __mmap_new_vma(struct mmap_state *map, str= uct vm_area_struct **vmap, struct mmap_action *action) { struct vma_iterator *vmi =3D map->vmi; - int error =3D 0; struct vm_area_struct *vma; + int error; =20 /* * Determine the object being mapped and call the appropriate @@ -2552,6 +2591,14 @@ static int __mmap_new_vma(struct mmap_state *map, st= ruct vm_area_struct **vmap, if (!vma) return -ENOMEM; =20 + /* + * Lock the VMA early to avoid extra work if fatal signal + * is pending. + */ + error =3D vma_start_write_killable(vma); + if (error) + goto free_vma; + vma_iter_config(vmi, map->addr, map->end); vma_set_range(vma, map->addr, map->end, map->pgoff); vma->flags =3D map->vma_flags; @@ -2582,8 +2629,6 @@ static int __mmap_new_vma(struct mmap_state *map, str= uct vm_area_struct **vmap, WARN_ON_ONCE(!arch_validate_flags(map->vm_flags)); #endif =20 - /* Lock the VMA since it is modified after insertion into VMA tree */ - vma_start_write(vma); vma_iter_store_new(vmi, vma); map->mm->map_count++; vma_link_file(vma, action->hide_from_rmap_until_complete); @@ -2878,6 +2923,7 @@ int do_brk_flags(struct vma_iterator *vmi, struct vm_= area_struct *vma, unsigned long addr, unsigned long len, vma_flags_t vma_flags) { struct mm_struct *mm =3D current->mm; + int err; =20 /* * Check against address space limits by the changed size @@ -2910,24 +2956,33 @@ int do_brk_flags(struct vma_iterator *vmi, struct v= m_area_struct *vma, =20 if (vma_merge_new_range(&vmg)) goto out; - else if (vmg_nomem(&vmg)) + if (vmg_nomem(&vmg)) { + err =3D -ENOMEM; goto unacct_fail; + } } =20 if (vma) vma_iter_next_range(vmi); /* create a vma struct for an anonymous mapping */ vma =3D vm_area_alloc(mm); - if (!vma) + if (!vma) { + err =3D -ENOMEM; goto unacct_fail; + } =20 vma_set_anonymous(vma); vma_set_range(vma, addr, addr + len, addr >> PAGE_SHIFT); vma->flags =3D vma_flags; vma->vm_page_prot =3D vm_get_page_prot(vma_flags_to_legacy(vma_flags)); - vma_start_write(vma); - if (vma_iter_store_gfp(vmi, vma, GFP_KERNEL)) + if (vma_start_write_killable(vma)) { + err =3D -EINTR; + goto vma_lock_fail; + } + if (vma_iter_store_gfp(vmi, vma, GFP_KERNEL)) { + err =3D -ENOMEM; goto mas_store_fail; + } =20 mm->map_count++; validate_mm(mm); @@ -2942,10 +2997,11 @@ int do_brk_flags(struct vma_iterator *vmi, struct v= m_area_struct *vma, return 0; =20 mas_store_fail: +vma_lock_fail: vm_area_free(vma); unacct_fail: vm_unacct_memory(len >> PAGE_SHIFT); - return -ENOMEM; + return err; } =20 /** @@ -3112,8 +3168,8 @@ int expand_upwards(struct vm_area_struct *vma, unsign= ed long address) struct mm_struct *mm =3D vma->vm_mm; struct vm_area_struct *next; unsigned long gap_addr; - int error =3D 0; VMA_ITERATOR(vmi, mm, vma->vm_start); + int error; =20 if (!vma_test(vma, VMA_GROWSUP_BIT)) return -EFAULT; @@ -3149,12 +3205,14 @@ int expand_upwards(struct vm_area_struct *vma, unsi= gned long address) =20 /* We must make sure the anon_vma is allocated. */ if (unlikely(anon_vma_prepare(vma))) { - vma_iter_free(&vmi); - return -ENOMEM; + error =3D -ENOMEM; + goto vma_prep_fail; } =20 /* Lock the VMA before expanding to prevent concurrent page faults */ - vma_start_write(vma); + error =3D vma_start_write_killable(vma); + if (error) + goto vma_lock_fail; /* We update the anon VMA tree. */ anon_vma_lock_write(vma->anon_vma); =20 @@ -3183,8 +3241,10 @@ int expand_upwards(struct vm_area_struct *vma, unsig= ned long address) } } anon_vma_unlock_write(vma->anon_vma); - vma_iter_free(&vmi); validate_mm(mm); +vma_lock_fail: +vma_prep_fail: + vma_iter_free(&vmi); return error; } #endif /* CONFIG_STACK_GROWSUP */ @@ -3197,8 +3257,8 @@ int expand_downwards(struct vm_area_struct *vma, unsi= gned long address) { struct mm_struct *mm =3D vma->vm_mm; struct vm_area_struct *prev; - int error =3D 0; VMA_ITERATOR(vmi, mm, vma->vm_start); + int error; =20 if (!vma_test(vma, VMA_GROWSDOWN_BIT)) return -EFAULT; @@ -3228,12 +3288,14 @@ int expand_downwards(struct vm_area_struct *vma, un= signed long address) =20 /* We must make sure the anon_vma is allocated. */ if (unlikely(anon_vma_prepare(vma))) { - vma_iter_free(&vmi); - return -ENOMEM; + error =3D -ENOMEM; + goto vma_prep_fail; } =20 /* Lock the VMA before expanding to prevent concurrent page faults */ - vma_start_write(vma); + error =3D vma_start_write_killable(vma); + if (error) + goto vma_lock_fail; /* We update the anon VMA tree. */ anon_vma_lock_write(vma->anon_vma); =20 @@ -3263,8 +3325,10 @@ int expand_downwards(struct vm_area_struct *vma, uns= igned long address) } } anon_vma_unlock_write(vma->anon_vma); - vma_iter_free(&vmi); validate_mm(mm); +vma_lock_fail: +vma_prep_fail: + vma_iter_free(&vmi); return error; } =20 diff --git a/mm/vma_exec.c b/mm/vma_exec.c index 5cee8b7efa0f..8ddcc791d828 100644 --- a/mm/vma_exec.c +++ b/mm/vma_exec.c @@ -41,6 +41,7 @@ int relocate_vma_down(struct vm_area_struct *vma, unsigne= d long shift) struct vm_area_struct *next; struct mmu_gather tlb; PAGETABLE_MOVE(pmc, vma, vma, old_start, new_start, length); + int err; =20 BUG_ON(new_start > new_end); =20 @@ -56,8 +57,9 @@ int relocate_vma_down(struct vm_area_struct *vma, unsigne= d long shift) * cover the whole range: [new_start, old_end) */ vmg.target =3D vma; - if (vma_expand(&vmg)) - return -ENOMEM; + err =3D vma_expand(&vmg); + if (err) + return err; =20 /* * move the page tables downwards, on failure we rely on --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 22:22:20 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 99A9C3B6C17 for ; Thu, 26 Mar 2026 08:08:53 +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=1774512534; cv=none; b=SVTa62/zX+Oj187kltMK04XuXJTzBqFA3aNxTUQ9MNm5NBff046WLXWVoxKa2MS6smOj+bHHQJTQROTPLvZQQoJ3/byl4YAjtO6cWIs3BFXzM92OCF1RT50vYrKlUOqyXYw9pEhYVJ1uqTJzm1TRSAZVDBUiOKezvF8BCoIWDGU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512534; c=relaxed/simple; bh=96PaFZY6a3p2oI7osVjR8ZSNgplPhwNwVR2gXD9h42A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=GPqWCk7Y1S+OE16jZhsVifbQR5tC8OsYDWhEexMAXbsKFpMu3EShdtXOlwlhmsq5CYGyjNx52PU7k5RS77OHwKhZP9AsgkhomRkGsDkRVExw7zdlLGzqUbWsZTzXqAMUEzm2BIPLpvODdfOA/0KmQKmaRKhcOHFLDmU0kAz4XIE= 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=sbR6NjWv; 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="sbR6NjWv" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c16233ee11so726349eec.1 for ; Thu, 26 Mar 2026 01:08:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774512533; x=1775117333; 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=A2FZ0j4JsuEtXH0QE0EGuqUW1/fY5oq45gPlzlHIXGA=; b=sbR6NjWv6Rc8Q+CWiiNwe+WfauU8/RUhhKM6vcYny9Ao/7RNEYAS6KDE1ocVbzHiaA Dm/4GsnwzGrVQ/4e8Y5+NB+NeW2uPiuHsuJpqz6JJA3HYdnBKb+02mTb9HVOnEo2O4H1 1i2YBQX6xalFp4Z2jfffC6joIs8WLerC0oX27CfcktsfIJcrPTiYN8KtNqig0oDrs5ML mPR83+pkZ5L9YvuK4HxIy/e56Xlv/XV3CvKjt5zQ+v46xeXZz347ogCfrLzEbJ616gmK 9PbXfOkH9lgtM6MHnuDybG/i7mR9m5n2KV/p+/cNM/OwX8RsRtB7X/iHJ/kkZc9wP66+ RdBQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774512533; x=1775117333; 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=A2FZ0j4JsuEtXH0QE0EGuqUW1/fY5oq45gPlzlHIXGA=; b=iMJz0RRuBynH/nCnTxdVT9hW0pCio8OfDWHV94w9JCDq/mo+LZ3MV2Hut/LlCKxnX1 pJX9eANgJn7UV8g1nNJHJ1/v0xdNazowCTzTg/mcbGBCTWB2lW5/Y3EgPx8DJ2VOr0ih FMhrGWwSMk+W9czZgKB/7bS9tKLujooYNVVB7e9tHxpXR/nS0byxYzUzsBmv+YLv48C1 rr7g0tsRsxbc5BV8Xnm8sRWjjnSxwhIAKNaTrs222mu2QFFu4K6WM2DQ+HOXrTnXAo7t X0GEyRcnDbYChVoFJwsF8uAs8WaD3QMGUyj7xrpJ1MEF2rr26s8MRhVVoZvOhjyXP7or CqHQ== X-Forwarded-Encrypted: i=1; AJvYcCVDcj9NII9Zvi31iWeD6OOhZfXuIiGwGeJ+OZlaAFztqljy47+eroeGLk6CA5+bg6cYL/x4DunTy5L7Xgk=@vger.kernel.org X-Gm-Message-State: AOJu0YzfIP0PXcJpEHlhRh1lB6yI0BQUf33XCPeZudvgvuxGsBr3hVJU j7DylFdkP5Dd7XGvV7KRsQPd7CeeI+YkF76ffy4ulBveWR92/ujUXs0U11sa5GoQQ6dk7PirGwx WKCmr2Q== X-Received: from dycrm24.prod.google.com ([2002:a05:693c:2a18:b0:2c1:4f1:c859]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:8b05:b0:2c1:161f:ac39 with SMTP id 5a478bee46e88-2c15d3e3b8cmr3740873eec.26.1774512531898; Thu, 26 Mar 2026 01:08:51 -0700 (PDT) Date: Thu, 26 Mar 2026 01:08:35 -0700 In-Reply-To: <20260326080836.695207-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: <20260326080836.695207-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326080836.695207-6-surenb@google.com> Subject: [PATCH v5 5/6] mm: use vma_start_write_killable() in process_vma_walk_lock() 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, lorenzo.stoakes@oracle.com, 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() when process_vma_walk_lock() is used with PGWALK_WRLOCK option. Adjust its direct and indirect users to check for a possible error and handle it. Ensure users handle EINTR correctly and do not ignore it. Suggested-by: Matthew Wilcox Signed-off-by: Suren Baghdasaryan Reviewed-by: Lorenzo Stoakes (Oracle) --- fs/proc/task_mmu.c | 12 ++++++------ mm/mempolicy.c | 1 + mm/pagewalk.c | 22 +++++++++++++++------- 3 files changed, 22 insertions(+), 13 deletions(-) diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index e091931d7ca1..33e5094a7842 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1774,15 +1774,15 @@ static ssize_t clear_refs_write(struct file *file, = const char __user *buf, struct vm_area_struct *vma; enum clear_refs_types type; int itype; - int rv; + int err; =20 if (count > sizeof(buffer) - 1) count =3D sizeof(buffer) - 1; if (copy_from_user(buffer, buf, count)) return -EFAULT; - rv =3D kstrtoint(strstrip(buffer), 10, &itype); - if (rv < 0) - return rv; + err =3D kstrtoint(strstrip(buffer), 10, &itype); + if (err) + return err; type =3D (enum clear_refs_types)itype; if (type < CLEAR_REFS_ALL || type >=3D CLEAR_REFS_LAST) return -EINVAL; @@ -1824,7 +1824,7 @@ static ssize_t clear_refs_write(struct file *file, co= nst char __user *buf, 0, mm, 0, -1UL); mmu_notifier_invalidate_range_start(&range); } - walk_page_range(mm, 0, -1, &clear_refs_walk_ops, &cp); + err =3D walk_page_range(mm, 0, -1, &clear_refs_walk_ops, &cp); if (type =3D=3D CLEAR_REFS_SOFT_DIRTY) { mmu_notifier_invalidate_range_end(&range); flush_tlb_mm(mm); @@ -1837,7 +1837,7 @@ static ssize_t clear_refs_write(struct file *file, co= nst char __user *buf, } put_task_struct(task); =20 - return count; + return err ? : count; } =20 const struct file_operations proc_clear_refs_operations =3D { diff --git a/mm/mempolicy.c b/mm/mempolicy.c index c38a90487531..336753a4b2b2 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -969,6 +969,7 @@ static const struct mm_walk_ops queue_pages_lock_vma_wa= lk_ops =3D { * (a hugetlbfs page or a transparent huge page being counted as 1). * -EIO - a misplaced page found, when MPOL_MF_STRICT specified without MO= VEs. * -EFAULT - a hole in the memory range, when MPOL_MF_DISCONTIG_OK unspeci= fied. + * -EINTR - walk got terminated due to pending fatal signal. */ static long queue_pages_range(struct mm_struct *mm, unsigned long start, unsigned long= end, diff --git a/mm/pagewalk.c b/mm/pagewalk.c index 3ae2586ff45b..eca7bc711617 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -443,14 +443,13 @@ static inline void process_mm_walk_lock(struct mm_str= uct *mm, mmap_assert_write_locked(mm); } =20 -static inline void process_vma_walk_lock(struct vm_area_struct *vma, - enum page_walk_lock walk_lock) +static int process_vma_walk_lock(struct vm_area_struct *vma, + enum page_walk_lock walk_lock) { #ifdef CONFIG_PER_VMA_LOCK switch (walk_lock) { case PGWALK_WRLOCK: - vma_start_write(vma); - break; + return vma_start_write_killable(vma); case PGWALK_WRLOCK_VERIFY: vma_assert_write_locked(vma); break; @@ -462,6 +461,7 @@ static inline void process_vma_walk_lock(struct vm_area= _struct *vma, break; } #endif + return 0; } =20 /* @@ -505,7 +505,9 @@ int walk_page_range_mm_unsafe(struct mm_struct *mm, uns= igned long start, if (ops->pte_hole) err =3D ops->pte_hole(start, next, -1, &walk); } else { /* inside vma */ - process_vma_walk_lock(vma, ops->walk_lock); + err =3D process_vma_walk_lock(vma, ops->walk_lock); + if (err) + break; walk.vma =3D vma; next =3D min(end, vma->vm_end); vma =3D find_vma(mm, vma->vm_end); @@ -722,6 +724,7 @@ int walk_page_range_vma_unsafe(struct vm_area_struct *v= ma, unsigned long start, .vma =3D vma, .private =3D private, }; + int err; =20 if (start >=3D end || !walk.mm) return -EINVAL; @@ -729,7 +732,9 @@ int walk_page_range_vma_unsafe(struct vm_area_struct *v= ma, unsigned long start, return -EINVAL; =20 process_mm_walk_lock(walk.mm, ops->walk_lock); - process_vma_walk_lock(vma, ops->walk_lock); + err =3D process_vma_walk_lock(vma, ops->walk_lock); + if (err) + return err; return __walk_page_range(start, end, &walk); } =20 @@ -752,6 +757,7 @@ int walk_page_vma(struct vm_area_struct *vma, const str= uct mm_walk_ops *ops, .vma =3D vma, .private =3D private, }; + int err; =20 if (!walk.mm) return -EINVAL; @@ -759,7 +765,9 @@ int walk_page_vma(struct vm_area_struct *vma, const str= uct mm_walk_ops *ops, return -EINVAL; =20 process_mm_walk_lock(walk.mm, ops->walk_lock); - process_vma_walk_lock(vma, ops->walk_lock); + err =3D process_vma_walk_lock(vma, ops->walk_lock); + if (err) + return err; return __walk_page_range(vma->vm_start, vma->vm_end, &walk); } =20 --=20 2.53.0.1018.g2bb0e51243-goog From nobody Thu Apr 2 22:22:20 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 8DF413B8D58 for ; Thu, 26 Mar 2026 08:08:55 +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=1774512536; cv=none; b=sZ7LsN80Bxr850Imz/Yqqahm8fId7OtHb7w36B8XgY78i17UrOc0J5wIoVf/HNK/ug3rvJ1ogbm8+sym6b9TiGWsJr25W1r9B8bvjfL/11VLxAvIuLM/JEjWvl6nptkOyrLFAnEn5we27v9LKQPzL/bV6gS/IoLDFta+ih7KF4s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512536; c=relaxed/simple; bh=7fxUvQarsZza+ZSNU1G51Ztbl4ikxZMWuEapYuAipV8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=OhWX/qPqi3pi4XFy7CaRn7LCQDpfpeTRMxkMCH2kFZ3RmmZIjFsG94qplElSz1cQnh4/lrdH9Nh02lGWvYWoYj13lqiwWQ/+fllhDncxmjfzVL1z+h7vg4LkxW3brX5BXEJtxTIHfdkA7Du8KADS/H20Wfl6Mm399Yq9rESTjOc= 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=fc4bFJFx; 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="fc4bFJFx" Received: by mail-dy1-f202.google.com with SMTP id 5a478bee46e88-2c1631e6189so5957825eec.0 for ; Thu, 26 Mar 2026 01:08:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20251104; t=1774512535; x=1775117335; 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=5NgLz5FVqf/NV7m9qbKXaNWE4w/1GDJf1IUGYhV4ad8=; b=fc4bFJFxER2E6T+QO701rz5XLCfU0mh6Ee4++ewdR7OSdiAKUDGN+vu8QOgwOXC9uP dhuLANhMBE7sLE+eNruFgKAMEjZmzYzyuuzH49tWMfCUG7aQCeiqUXFnnaQqQxVjIkZB LT666Bxwm76QTmS5Ck0Z0CX/CQwl7Nxd5zF63yuhmwFRf8ikJcEXW325s3fnbWdvDd9+ 5WVNAIS4vQU0o83ty2f1YJ+EIiZvrLq1HdoHFcL6UdUqeq1e7frei+h7nsCs1ZdzU+EV 53EOVLbUoIk1b6oFfaZ/aoEM3Gkq1dkwDL9f/MgbPiWmBH3DZs24hsP/rpkbnsaI0Rc/ FtQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1774512535; x=1775117335; 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=5NgLz5FVqf/NV7m9qbKXaNWE4w/1GDJf1IUGYhV4ad8=; b=OZ6y2faoVMxneTgyQH+Jk5txFiVs6vEBfC8eLh7t3JCR96EjrpeaPiMSvgFluiqveF qeKfJFlyF9I4KixJ+ZbYbpMM2Wyrul9WmyhlnZtXoXcda3XdQXDsBhMt3bpj9PceR1sO cwfqYXFffrqfQJZPuN4SRG9BKbD0g8qtffmcmVKX6WU/AuH5syqa0dIyeYA3Z2G97qEj Z2RNxQJjUFEvv/YinRnxl/h/qJjdqrf0IGne0U2mxIRfH2c6ALxD46H61qH0o4qsQ+ly eH0Uaa4p+ydPJwO7+ku+iyzwPk+45peHYXiijWVmDJw6SZY860O0YJbQC0f5YJHZP5nV Us+g== X-Forwarded-Encrypted: i=1; AJvYcCUaN4itzAsPWGZjADAY1k0L8RKSgYwgpNOw72zyB47zAmP8ttDN0dFXwuv4+8vifcGF3FSkqi64iz8oqIA=@vger.kernel.org X-Gm-Message-State: AOJu0YzRMx3ZqkTG68bOY7vLdc9Oc6BD8sPycRsqD7+AKNTMdbORaB0e 9f0JmYtcjYSYiZTbDeGAawXkItVPOjth0csxkGmw+M/yG7NMMBxWWRlGMoLaL+vXdKdd7S97PLl fs9UUug== X-Received: from dyt4.prod.google.com ([2002:a05:693c:8084:b0:2c1:63c5:aa2e]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7300:7304:b0:2c0:c96a:a4db with SMTP id 5a478bee46e88-2c15d2ba52bmr4025361eec.4.1774512534535; Thu, 26 Mar 2026 01:08:54 -0700 (PDT) Date: Thu, 26 Mar 2026 01:08:36 -0700 In-Reply-To: <20260326080836.695207-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: <20260326080836.695207-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.1018.g2bb0e51243-goog Message-ID: <20260326080836.695207-7-surenb@google.com> Subject: [PATCH v5 6/6] KVM: PPC: use vma_start_write_killable() in kvmppc_memslot_page_merge() 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, lorenzo.stoakes@oracle.com, 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, "Ritesh Harjani (IBM)" , "Lorenzo Stoakes (Oracle)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Replace vma_start_write() with vma_start_write_killable(), improving reaction time to the kill signal. Replace vma_start_write() in kvmppc_memslot_page_merge(). Signed-off-by: Suren Baghdasaryan Reviewed-by: Ritesh Harjani (IBM) Reviewed-by: Lorenzo Stoakes (Oracle) --- arch/powerpc/kvm/book3s_hv_uvmem.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_h= v_uvmem.c index 5fbb95d90e99..0a28b48a46b8 100644 --- a/arch/powerpc/kvm/book3s_hv_uvmem.c +++ b/arch/powerpc/kvm/book3s_hv_uvmem.c @@ -410,7 +410,10 @@ static int kvmppc_memslot_page_merge(struct kvm *kvm, ret =3D H_STATE; break; } - vma_start_write(vma); + if (vma_start_write_killable(vma)) { + ret =3D H_STATE; + break; + } /* Copy vm_flags to avoid partial modifications in ksm_madvise */ vm_flags =3D vma->vm_flags; ret =3D ksm_madvise(vma, vma->vm_start, vma->vm_end, --=20 2.53.0.1018.g2bb0e51243-goog