From nobody Fri Apr 3 04:49:59 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 D092B36F429 for ; Tue, 17 Feb 2026 16:32:56 +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=1771345978; cv=none; b=QybJz1lKKYa+iKEgeWeGwX2SOxS+xcxo+jubk4niMtj1VmOyGmOId0yNKzpLEjVF47fBjepVn8102H6fhD/11xwmP9GFufGsHPrVonS/cjvQN7vVMzuyzOSWs1u2uR9AVoYlQHXh8dIt3HnIumLpnh2Yb44OtAfrJ/QnbmrHPNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771345978; c=relaxed/simple; bh=5ko5sZevaLLikb5YibeDPV/ZAP+l239Wav0R9HXJvE0=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=ufaTDMiwi6y3B2tc8hN/IAP5e2ewsP+FnozJsVR1XiC9FZCZgMPblX9OvflAG5gBXSpc0H6bW/Shx3ZGpXXLC2bU/K7Bvs1n7Oz6gozPQvfpzwYlaq3tbictFrsftyAemqauyLIvp6iQNGvLwakYzXjQEVFLcvsWS90g7lH6Sbc= 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=bOWYw/xS; 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="bOWYw/xS" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2ba66faa692so5801031eec.1 for ; Tue, 17 Feb 2026 08:32:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771345976; x=1771950776; 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=20E8AsSTFCwzOiRhIxVDRmNYTsZqkvgm04spnyQD6co=; b=bOWYw/xStgqGO07nAt1N/mPv4mjbNFx5rwkOmNskCAIDmK/psW1QNnwiPfynqy3NYM VS7bhu9aGntGS3x9AchPlDChjJrf3hw+7z3iV6GXjRP99vVF6ZnoeT2evUXIUp9vNVFd vXSuHVGgDfmvVdc2ZZlNHRGbj/pCxMyJ42eoH+H/6ZvRs3MvB1VjW/ni2ApGYKfzL6F/ 8X59PEHnwE9DDzMMElmWPljhM4XR/91T13MD1n5GfZZd3K5j2db5J0Grg7kI+wGmgc01 njnuORIIdlmXV5hzy0V4XWcpoBUbmBM/q92sTBf6U6MYg2yf2VyFpOr32Cs4A5g8UhTb a2MA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771345976; x=1771950776; 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=20E8AsSTFCwzOiRhIxVDRmNYTsZqkvgm04spnyQD6co=; b=h9AsFRmi6Izc6ViDuNyx/0uMGGFpwe+U+2DKy/UwNKIB91nBU9tT/SgHgBVfnZ0oXx taisQl1J9HT0LOcRKWZ94MirwoxUJtu7lE4NGgbEaAnpe3of3BEEFoEQz4un9UJLmqhI VRP9JTeVoS5oS/XzsDYr5dpLM9MdjmZZkPmGfDgij4SWY2PD8+DGJwSAfHKUe/8ixN1K MiNuXYGU82nLzhe5BHTPYK7Xy2My+zS4JXOdaNfzfaUb4QvmAI7LFPWuA9RwMCjbQkzS M0zHFXMbItEPezy3wyjf09x0DGFVWwnk8NiiE5XHndkwJzjD2nZKkp73/F6FF158N5YW 2PxQ== X-Forwarded-Encrypted: i=1; AJvYcCWiDEYn5EnqmZb31srFJAKnvIkDcicK/z4rk4MArK5ahGHGW3gmEtaW4KqJaKYn7bMELUjJ21a0G2tmh4k=@vger.kernel.org X-Gm-Message-State: AOJu0YzXwpjvNA6owqRXGtVw4k0ipeYtJ/BYHDS4hXvFH9NIlQtaKzOG EbFu/KB8ilvSlByxloRk2R+xh3MnNCaKB+2Sj+dZF3Cc2AMF9YiUAHm1zmBmJxhBjXlvORh5NPP qMImHkw== X-Received: from dybmv5.prod.google.com ([2002:a05:7300:cd45:b0:2ba:9f53:8c70]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:693c:2c8b:b0:2ba:7f8c:6754 with SMTP id 5a478bee46e88-2bac97ceddbmr4300008eec.37.1771345975648; Tue, 17 Feb 2026 08:32:55 -0800 (PST) Date: Tue, 17 Feb 2026 08:32:48 -0800 In-Reply-To: <20260217163250.2326001-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: <20260217163250.2326001-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.273.g2a3d683680-goog Message-ID: <20260217163250.2326001-2-surenb@google.com> Subject: [PATCH v2 1/3] 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. No functional change intended. Suggested-by: Jann Horn Signed-off-by: Suren Baghdasaryan Reviewed-by: Liam R. Howlett --- mm/vma.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/mm/vma.c b/mm/vma.c index be64f781a3aa..bb4d0326fecb 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -1186,12 +1186,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) + if (remove_next) { ret =3D dup_anon_vma(target, next, &anon_dup); - if (!ret && vmg->copied_from) + if (ret) + return ret; + } + if (vmg->copied_from) { ret =3D dup_anon_vma(target, vmg->copied_from, &anon_dup); - if (ret) - return ret; + if (ret) + return ret; + } =20 if (remove_next) { vma_start_write(next); --=20 2.53.0.273.g2a3d683680-goog From nobody Fri Apr 3 04:49:59 2026 Received: from mail-dl1-f73.google.com (mail-dl1-f73.google.com [74.125.82.73]) (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 345B937106B for ; Tue, 17 Feb 2026 16:32:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771345982; cv=none; b=uUqgBVqjDcCcvyaywGsNL261+ywMFMU0cCmP6i8M2H2UUra2ZEBCRKSfe5nf7MAV/d/+0DbR8lbNjFDyRLMCX9KkYTeiVjtCCOWYrCMJL2nND+dE+zueWZ6pMrdh3B6meSNmagRzhFqzrfjerfojbv1uZQgr4x7Pq4IbW4W1uX0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771345982; c=relaxed/simple; bh=17clLGcYY45Z39yWNLAqxADhRzU/6E8ALUBNALKQrIU=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=p0f7GOOUq4+Xt9ryzTsuMiB4Kx+BdEdqYuN65LXnScuFgsSwBsitA5T0YM6xty3mTS7uYXQmiSuitoiR6M9rEATLkdQ6/KzCxtx90rK5C6NvPTz14Qi3uTFmTcTtq6wY+GxDR+/SeyjD4WbxIXKBR2OX4Fvujue2Ie2ICnOhwYQ= 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=4vJHBm6W; arc=none smtp.client-ip=74.125.82.73 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="4vJHBm6W" Received: by mail-dl1-f73.google.com with SMTP id a92af1059eb24-12711ec96fbso23532790c88.0 for ; Tue, 17 Feb 2026 08:32:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771345978; x=1771950778; 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=iaZ0FDTJwGlgc+6zx0Iu+po26eUYY+Uw/UyBjgMao2k=; b=4vJHBm6WR5umjOza9jA+sqjGvX1uYcOYGh4z9+aZ+6yZiz+rC7Xhp6KXmu+9bBT9Kd 7F50BSlSIWF6OMhKI4JgHcTwhTtyJ+CJuttZ+s2xeWxQhtNqeJ3plxsSE7YyYcZwwZ+p NwelLIffGOvPHU27PYVa2CsV2quGLter27yTfo19mxPIVvYLddFYahHWCQZ48+uz9X27 Eq8FMw7v7eY77UKuCICcaBLlD9kwyx4ANEcYzcfp1/bZeUNhH97Xt46e49pPUqsSmE4p 8jeSd/OyrQ8uKdFDxRZPZJz2t2dhoTmcC6234HuFBFAFph1nfsAO+OSEVN0NX4eL6nA7 tMNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771345978; x=1771950778; 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=iaZ0FDTJwGlgc+6zx0Iu+po26eUYY+Uw/UyBjgMao2k=; b=BOrJD6HmmuVMXAJkHU1un2bRKrfIxSmZU5bewWRGp2l+L6OPCvkJWswiuRKVAvI+OA N9LSYCxEGTdBoUqKnL8YRApQrZcaNz61zFdOfcyQljTn+SlkWWc1v5TBdCeFRJ9MfHpW 03zdk2R43OnzEDrTKzheXEz9fwg+fRuVqE5NV1VAUba+fW10zDHg1d5SzGyJ/D/lWLvz E9TyWuj9gVQuie6Uy6gIECuaJRWT7YfpGhqHOsDmbBr9shIdL6bFtHw7T0YTDjxyP1nF 4lD5eBLXUaFoc576Ak4yFkDAr0EFnEFH+o49fBF2qFeaY7XeO1E9RD9Kvqsfb4JiCrWs rriA== X-Forwarded-Encrypted: i=1; AJvYcCUbQ8jhqALy9oSeqH2h7z8QUPm4D7X5/TbY0vE9vOAP/+VCs3AzEX/dsiwBOpVyQuGs4KCFEwp2RWvjsas=@vger.kernel.org X-Gm-Message-State: AOJu0YwHCeVGE8JjxOFTbyO5eAxTR3rwAbaZ+Iat8Jl4PjvQCcu1sG6O MtBLxcuU/QnKNeBQOKaEf967vLyMPB34SrsaaFUVjc30RsChgc9Ca9PD8TpWt3rH4esW/RkUJJA ecuVSuA== X-Received: from dlbvg11.prod.google.com ([2002:a05:7022:7f0b:b0:127:bd1:76f0]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:6897:b0:127:337e:3301 with SMTP id a92af1059eb24-12741b6fd42mr4785616c88.12.1771345977912; Tue, 17 Feb 2026 08:32:57 -0800 (PST) Date: Tue, 17 Feb 2026 08:32:49 -0800 In-Reply-To: <20260217163250.2326001-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: <20260217163250.2326001-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.273.g2a3d683680-goog Message-ID: <20260217163250.2326001-3-surenb@google.com> Subject: [PATCH v2 2/3] mm: replace vma_start_write() with vma_start_write_killable() 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)" Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Now that we have vma_start_write_killable() we can replace most of the vma_start_write() calls with it, improving reaction time to the kill signal. There are several places which are left untouched by this patch: 1. free_pgtables() because function should free page tables even if a fatal signal is pending. 2. process_vma_walk_lock(), which requires changes in its callers and will be handled in the next patch. 3. userfaultd code, where some paths calling vma_start_write() can handle EINTR and some can't without a deeper code refactoring. 4. vm_flags_{set|mod|clear} require refactoring that involves moving vma_start_write() out of these functions and replacing it with vma_assert_write_locked(), then callers of these functions should lock the vma themselves using vma_start_write_killable() whenever possible. Suggested-by: Matthew Wilcox Signed-off-by: Suren Baghdasaryan Reviewed-by: Ritesh Harjani (IBM) # powerpc --- arch/powerpc/kvm/book3s_hv_uvmem.c | 5 +- include/linux/mempolicy.h | 5 +- mm/khugepaged.c | 5 +- mm/madvise.c | 4 +- mm/memory.c | 2 + mm/mempolicy.c | 23 ++++++-- mm/mlock.c | 20 +++++-- mm/mprotect.c | 4 +- mm/mremap.c | 4 +- mm/vma.c | 93 +++++++++++++++++++++--------- mm/vma_exec.c | 6 +- 11 files changed, 123 insertions(+), 48 deletions(-) diff --git a/arch/powerpc/kvm/book3s_hv_uvmem.c b/arch/powerpc/kvm/book3s_h= v_uvmem.c index 7cf9310de0ec..69750edcf8d5 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, diff --git a/include/linux/mempolicy.h b/include/linux/mempolicy.h index 0fe96f3ab3ef..762930edde5a 100644 --- a/include/linux/mempolicy.h +++ b/include/linux/mempolicy.h @@ -137,7 +137,7 @@ bool vma_policy_mof(struct vm_area_struct *vma); extern void numa_default_policy(void); extern void numa_policy_init(void); extern void mpol_rebind_task(struct task_struct *tsk, const nodemask_t *ne= w); -extern void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new); +extern int mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new); =20 extern int huge_node(struct vm_area_struct *vma, unsigned long addr, gfp_t gfp_flags, @@ -251,8 +251,9 @@ static inline void mpol_rebind_task(struct task_struct = *tsk, { } =20 -static inline void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new) +static inline int mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new) { + return 0; } =20 static inline int huge_node(struct vm_area_struct *vma, diff --git a/mm/khugepaged.c b/mm/khugepaged.c index fa1e57fd2c46..392dde66fa86 100644 --- a/mm/khugepaged.c +++ b/mm/khugepaged.c @@ -1150,7 +1150,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; diff --git a/mm/madvise.c b/mm/madvise.c index 8debb2d434aa..b41e64231c31 100644 --- a/mm/madvise.c +++ b/mm/madvise.c @@ -173,7 +173,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; + vm_flags_reset(vma, new_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 dc0e5da70cdc..29e12f063c7b 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -379,6 +379,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 dbd48502ac24..5f6302d227f5 100644 --- a/mm/mempolicy.c +++ b/mm/mempolicy.c @@ -556,17 +556,25 @@ void mpol_rebind_task(struct task_struct *tsk, const = nodemask_t *new) * * Call holding a reference to mm. Takes mm->mmap_lock during call. */ -void mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new) +int mpol_rebind_mm(struct mm_struct *mm, nodemask_t *new) { struct vm_area_struct *vma; VMA_ITERATOR(vmi, mm, 0); + int ret =3D 0; + + if (mmap_write_lock_killable(mm)) + return -EINTR; =20 - mmap_write_lock(mm); for_each_vma(vmi, vma) { - vma_start_write(vma); + if (vma_start_write_killable(vma)) { + ret =3D -EINTR; + break; + } mpol_rebind_policy(vma->vm_policy, new); } mmap_write_unlock(mm); + + return ret; } =20 static const struct mempolicy_operations mpol_ops[MPOL_MAX] =3D { @@ -1785,9 +1793,15 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned lo= ng, 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) { + if (vma_start_write_killable(vma)) { + err =3D -EINTR; + break; + } + /* * If any vma in the range got policy other than MPOL_BIND * or MPOL_PREFERRED_MANY we return error. We don't reset @@ -1808,7 +1822,6 @@ SYSCALL_DEFINE4(set_mempolicy_home_node, unsigned lon= g, start, unsigned long, le 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 2f699c3497a5..2885b858aa0f 100644 --- a/mm/mlock.c +++ b/mm/mlock.c @@ -420,7 +420,7 @@ static int mlock_pte_range(pmd_t *pmd, unsigned long ad= dr, * Called for mlock(), mlock2() and mlockall(), to set @vma VM_LOCKED; * called for munlock() and munlockall(), to clear VM_LOCKED from @vma. */ -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, vm_flags_t newflags) { static const struct mm_walk_ops mlock_walk_ops =3D { @@ -441,7 +441,9 @@ static void mlock_vma_pages_range(struct vm_area_struct= *vma, */ if (newflags & VM_LOCKED) newflags |=3D VM_IO; - vma_start_write(vma); + if (vma_start_write_killable(vma)) + return -EINTR; + vm_flags_reset_once(vma, newflags); =20 lru_add_drain(); @@ -452,6 +454,7 @@ static void mlock_vma_pages_range(struct vm_area_struct= *vma, newflags &=3D ~VM_IO; vm_flags_reset_once(vma, newflags); } + return 0; } =20 /* @@ -501,10 +504,12 @@ static int mlock_fixup(struct vma_iterator *vmi, stru= ct vm_area_struct *vma, */ if ((newflags & VM_LOCKED) && (oldflags & VM_LOCKED)) { /* No work to do, and mlocking twice would be wrong */ - vma_start_write(vma); + ret =3D vma_start_write_killable(vma); + if (ret) + goto out; vm_flags_reset(vma, newflags); } else { - mlock_vma_pages_range(vma, start, end, newflags); + ret =3D mlock_vma_pages_range(vma, start, end, newflags); } out: *prev =3D vma; @@ -733,9 +738,12 @@ 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) + /* Ignore errors except EINTR, but prev needs fixing up. */ + if (error) { + if (error =3D=3D -EINTR) + break; prev =3D vma; + } cond_resched(); } out: diff --git a/mm/mprotect.c b/mm/mprotect.c index c0571445bef7..49dbb7156936 100644 --- a/mm/mprotect.c +++ b/mm/mprotect.c @@ -765,7 +765,9 @@ mprotect_fixup(struct vma_iterator *vmi, struct mmu_gat= her *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 < 0) + goto fail; vm_flags_reset_once(vma, newflags); 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 2be876a70cc0..aef1e5f373c7 100644 --- a/mm/mremap.c +++ b/mm/mremap.c @@ -1286,7 +1286,9 @@ static unsigned long move_vma(struct vma_remap_struct= *vrm) return -ENOMEM; =20 /* We don't want racing faults. */ - vma_start_write(vrm->vma); + err =3D vma_start_write_killable(vrm->vma); + if (err) + return err; =20 /* Perform copy step. */ err =3D copy_vma_and_data(vrm, &new_vma); diff --git a/mm/vma.c b/mm/vma.c index bb4d0326fecb..1d21351282cf 100644 --- a/mm/vma.c +++ b/mm/vma.c @@ -530,6 +530,13 @@ __split_vma(struct vma_iterator *vmi, struct vm_area_s= truct *vma, if (err) goto out_free_vmi; =20 + err =3D vma_start_write_killable(vma); + if (err) + goto out_free_mpol; + err =3D vma_start_write_killable(new); + if (err) + goto out_free_mpol; + err =3D anon_vma_clone(new, vma, VMA_OP_SPLIT); if (err) goto out_free_mpol; @@ -540,9 +547,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); @@ -895,16 +899,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) + goto abort; =20 if (merge_right) { - vma_start_write(next); + err =3D vma_start_write_killable(next); + if (err) + goto abort; vmg->target =3D next; sticky_flags |=3D (next->vm_flags & VM_STICKY); } =20 if (merge_left) { - vma_start_write(prev); + err =3D vma_start_write_killable(prev); + if (err) + goto abort; vmg->target =3D prev; sticky_flags |=3D (prev->vm_flags & VM_STICKY); } @@ -1155,10 +1165,12 @@ int vma_expand(struct vma_merge_struct *vmg) struct vm_area_struct *next =3D vmg->next; bool remove_next =3D false; vm_flags_t sticky_flags; - int ret =3D 0; + int ret; =20 mmap_assert_write_locked(vmg->mm); - vma_start_write(target); + ret =3D vma_start_write_killable(target); + if (ret) + return ret; =20 if (next && target !=3D next && vmg->end =3D=3D next->vm_end) remove_next =3D true; @@ -1187,6 +1199,9 @@ int vma_expand(struct vma_merge_struct *vmg) * we don't need to account for vmg->give_up_on_mm here. */ if (remove_next) { + ret =3D vma_start_write_killable(next); + if (ret) + return ret; ret =3D dup_anon_vma(target, next, &anon_dup); if (ret) return ret; @@ -1197,10 +1212,8 @@ int vma_expand(struct vma_merge_struct *vmg) return ret; } =20 - if (remove_next) { - vma_start_write(next); + if (remove_next) vmg->__remove_next =3D true; - } if (commit_merge(vmg)) goto nomem; =20 @@ -1233,6 +1246,7 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_ar= ea_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 @@ -1244,7 +1258,11 @@ int vma_shrink(struct vma_iterator *vmi, struct vm_a= rea_struct *vma, if (vma_iter_prealloc(vmi, NULL)) return -ENOMEM; =20 - vma_start_write(vma); + err =3D vma_start_write_killable(vma); + if (err) { + vma_iter_free(vmi); + return err; + } =20 init_vma_prep(&vp, vma); vma_prepare(&vp); @@ -1434,7 +1452,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) @@ -1828,12 +1848,17 @@ 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; =20 vma_iter_config(&vmi, vma->vm_start, vma->vm_end); if (vma_iter_prealloc(&vmi, vma)) return -ENOMEM; =20 - vma_start_write(vma); + err =3D vma_start_write_killable(vma); + if (err) { + vma_iter_free(&vmi); + return err; + } vma_iter_store_new(&vmi, vma); vma_link_file(vma, /* hold_rmap_lock=3D */false); mm->map_count++; @@ -2215,9 +2240,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); @@ -2532,6 +2556,11 @@ static int __mmap_new_vma(struct mmap_state *map, st= ruct vm_area_struct **vmap) goto free_vma; } =20 + /* Lock the VMA since it is modified after insertion into VMA tree */ + error =3D vma_start_write_killable(vma); + if (error) + goto free_iter_vma; + if (map->file) error =3D __mmap_new_file_vma(map, vma); else if (map->vm_flags & VM_SHARED) @@ -2552,8 +2581,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, map->hold_file_rmap_lock); @@ -2864,6 +2891,7 @@ int do_brk_flags(struct vma_iterator *vmi, struct vm_= area_struct *vma, unsigned long addr, unsigned long len, vm_flags_t vm_flags) { struct mm_struct *mm =3D current->mm; + int err =3D -ENOMEM; =20 /* * Check against address space limits by the changed size @@ -2908,7 +2936,10 @@ int do_brk_flags(struct vma_iterator *vmi, struct vm= _area_struct *vma, vma_set_range(vma, addr, addr + len, addr >> PAGE_SHIFT); vm_flags_init(vma, vm_flags); vma->vm_page_prot =3D vm_get_page_prot(vm_flags); - vma_start_write(vma); + if (vma_start_write_killable(vma)) { + err =3D -EINTR; + goto mas_store_fail; + } if (vma_iter_store_gfp(vmi, vma, GFP_KERNEL)) goto mas_store_fail; =20 @@ -2928,7 +2959,7 @@ int do_brk_flags(struct vma_iterator *vmi, struct vm_= area_struct *vma, vm_area_free(vma); unacct_fail: vm_unacct_memory(len >> PAGE_SHIFT); - return -ENOMEM; + return err; } =20 /** @@ -3089,7 +3120,7 @@ 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; + int error; VMA_ITERATOR(vmi, mm, vma->vm_start); =20 if (!(vma->vm_flags & VM_GROWSUP)) @@ -3126,12 +3157,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 free; } =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 free; /* We update the anon VMA tree. */ anon_vma_lock_write(vma->anon_vma); =20 @@ -3160,6 +3193,7 @@ int expand_upwards(struct vm_area_struct *vma, unsign= ed long address) } } anon_vma_unlock_write(vma->anon_vma); +free: vma_iter_free(&vmi); validate_mm(mm); return error; @@ -3174,7 +3208,7 @@ 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; + int error; VMA_ITERATOR(vmi, mm, vma->vm_start); =20 if (!(vma->vm_flags & VM_GROWSDOWN)) @@ -3205,12 +3239,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 free; } =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 free; /* We update the anon VMA tree. */ anon_vma_lock_write(vma->anon_vma); =20 @@ -3240,6 +3276,7 @@ int expand_downwards(struct vm_area_struct *vma, unsi= gned long address) } } anon_vma_unlock_write(vma->anon_vma); +free: vma_iter_free(&vmi); validate_mm(mm); return error; diff --git a/mm/vma_exec.c b/mm/vma_exec.c index 8134e1afca68..a4addc2a8480 100644 --- a/mm/vma_exec.c +++ b/mm/vma_exec.c @@ -40,6 +40,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 @@ -55,8 +56,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.273.g2a3d683680-goog From nobody Fri Apr 3 04:49:59 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 6B4B3372B31 for ; Tue, 17 Feb 2026 16:33:01 +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=1771345982; cv=none; b=UsG5Ppai9kNecI6XOExsTW3itXdSJ8q7+a/nlXW0OGzUhmRweNhhaAj38evDL11Rw7aPjhKi5jb6CT9DNzpsTj/Llvak3YqeqGA3KZakom3Vd8740ZiiSsCdT2lOQAmE+05SyIEXKHjCYs732wlzbygrRmie+js5ga+OgxlcaJk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771345982; c=relaxed/simple; bh=6DUqg/j7MJoyMnUAkNIXLh7vawHaggQP3JXWAMjbmEE=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=XNSJm+U09pEB173UecMBlCPPPwm2RxZAQr4gF5p0Qr3LHdmum4aOY1PYnC67vpINGwI8wzZf3vzpARB3G2krd+LLpuM0n8UIncUOOL3Snhmws6qZZiQPdsPeVgWx+SicJQY24Z7AqvJD64PJa+LWy8Z/C9COT+7fYJ6aB4e3rIs= 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=LkBa/Te+; 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="LkBa/Te+" Received: by mail-dl1-f74.google.com with SMTP id a92af1059eb24-124a95b6f61so4310171c88.0 for ; Tue, 17 Feb 2026 08:33:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1771345981; x=1771950781; 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=Z9Ark9R30Qkzih8r6uy5tMYPv262iFz804WfSXpH0hs=; b=LkBa/Te+ITMyX7l2HgESECJxX2XpGj8KGIcSDtushZJxX1h0FeX9b66MBEa5/tGCU+ EgoNIAdXpgdXyG1Kt0iXitpD1WIov8Oa2okJcyC5zjPYaCBH7+tcWtGpmU2rsD0yZfgG 0RhfvYa3QeKTasOAZ+OskCA/U0UpZ904HN6oJVzWYHtGc9J4vJ7wLZP/zOMQ1gA30uHX oW81SuWGjpWHK66Oz1IbqGmFp9wL/972QWCwO6pL1eA+OuPih7MNGhyQ+P6FfrtQLgqB BEePKxH6GebGJiZsOaltBFUKfLlO/oU5129WNXJD6CffyTD4Oee9eInYhxpHNKt2/329 Kdjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771345981; x=1771950781; 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=Z9Ark9R30Qkzih8r6uy5tMYPv262iFz804WfSXpH0hs=; b=Vvg609HnFZV6jGXErDh9Mg9xIMnqqlTgaGWtVxoCEknhiAWuQkWJiS7xvj5GBgwtf4 BY+NkFtcIA87ZJg6uEd1YplvtjLAhJcUeMS0Z8APnh0/i3KOIN94PhFQwJIYpxOQlEMU fqvMlRLTsVM88PMFNckArOCwCd0bcGisZn/CjiBRGJwZ+jz6nZUTk0FsWUkP0oTjiIeZ cUHgGa8tXDhl/k11+/hQmDEjcKeb/1vf5NWrkbeI2oxzVaWP7l+gmIkEG111LhkOmJ4u 7k9n7qL7bpLbctIggmJzAh4Y9WOim21jaGhgyCftYxmUdxDRI3LTr8EkdIhbfJWfQtso vZ1w== X-Forwarded-Encrypted: i=1; AJvYcCV0YuXeyyORqb6I4+Hq4KdFf1MjZ2st5xj6RdFIa4YkXacP8C62tmMXssNx/eza6k+mFZ+c0/VCzFlGVLA=@vger.kernel.org X-Gm-Message-State: AOJu0YyIgkVmYPDfFRzTd8Wd06/xboiYWRRh2g1oNjAPAELy2ZLxSrOi MOvlLaL1zyKsGj0bPTKa02454Qea+Bdp6Wx4jGtXc0u+71MaDNzAMqFTNapKZSUnwLQigkfbswC mUHLcMg== X-Received: from dlbvt13.prod.google.com ([2002:a05:7022:3f8d:b0:119:49ca:6bae]) (user=surenb job=prod-delivery.src-stubby-dispatcher) by 2002:a05:7022:250e:b0:11d:f440:b743 with SMTP id a92af1059eb24-1273adf34c5mr6016405c88.7.1771345980160; Tue, 17 Feb 2026 08:33:00 -0800 (PST) Date: Tue, 17 Feb 2026 08:32:50 -0800 In-Reply-To: <20260217163250.2326001-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: <20260217163250.2326001-1-surenb@google.com> X-Mailer: git-send-email 2.53.0.273.g2a3d683680-goog Message-ID: <20260217163250.2326001-4-surenb@google.com> Subject: [PATCH v2 3/3] 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. Signed-off-by: Suren Baghdasaryan --- arch/s390/kvm/kvm-s390.c | 5 +++-- arch/s390/mm/gmap.c | 13 ++++++++++--- fs/proc/task_mmu.c | 7 ++++++- mm/pagewalk.c | 20 ++++++++++++++------ 4 files changed, 33 insertions(+), 12 deletions(-) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 56a50524b3ee..75aef9c66e03 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -958,6 +958,7 @@ static int kvm_s390_get_mem_control(struct kvm *kvm, st= ruct kvm_device_attr *att static int kvm_s390_set_mem_control(struct kvm *kvm, struct kvm_device_att= r *attr) { int ret; + int err; unsigned int idx; switch (attr->attr) { case KVM_S390_VM_MEM_ENABLE_CMMA: @@ -990,10 +991,10 @@ static int kvm_s390_set_mem_control(struct kvm *kvm, = struct kvm_device_attr *att VM_EVENT(kvm, 3, "%s", "RESET: CMMA states"); mutex_lock(&kvm->lock); idx =3D srcu_read_lock(&kvm->srcu); - s390_reset_cmma(kvm->arch.gmap->mm); + err =3D s390_reset_cmma(kvm->arch.gmap->mm); srcu_read_unlock(&kvm->srcu, idx); mutex_unlock(&kvm->lock); - ret =3D 0; + ret =3D (err < 0) ? err : 0; break; case KVM_S390_VM_MEM_LIMIT_SIZE: { unsigned long new_limit; diff --git a/arch/s390/mm/gmap.c b/arch/s390/mm/gmap.c index dd85bcca817d..96054b124db5 100644 --- a/arch/s390/mm/gmap.c +++ b/arch/s390/mm/gmap.c @@ -2271,6 +2271,7 @@ int s390_enable_skey(void) { struct mm_struct *mm =3D current->mm; int rc =3D 0; + int err; =20 mmap_write_lock(mm); if (mm_uses_skeys(mm)) @@ -2282,7 +2283,9 @@ int s390_enable_skey(void) mm->context.uses_skeys =3D 0; goto out_up; } - walk_page_range(mm, 0, TASK_SIZE, &enable_skey_walk_ops, NULL); + err =3D walk_page_range(mm, 0, TASK_SIZE, &enable_skey_walk_ops, NULL); + if (err < 0) + rc =3D err; =20 out_up: mmap_write_unlock(mm); @@ -2305,11 +2308,15 @@ static const struct mm_walk_ops reset_cmma_walk_ops= =3D { .walk_lock =3D PGWALK_WRLOCK, }; =20 -void s390_reset_cmma(struct mm_struct *mm) +int s390_reset_cmma(struct mm_struct *mm) { + int err; + mmap_write_lock(mm); - walk_page_range(mm, 0, TASK_SIZE, &reset_cmma_walk_ops, NULL); + err =3D walk_page_range(mm, 0, TASK_SIZE, &reset_cmma_walk_ops, NULL); mmap_write_unlock(mm); + + return (err < 0) ? err : 0; } EXPORT_SYMBOL_GPL(s390_reset_cmma); =20 diff --git a/fs/proc/task_mmu.c b/fs/proc/task_mmu.c index d7d52e259055..91e806d65bd9 100644 --- a/fs/proc/task_mmu.c +++ b/fs/proc/task_mmu.c @@ -1797,6 +1797,7 @@ static ssize_t clear_refs_write(struct file *file, co= nst char __user *buf, struct clear_refs_private cp =3D { .type =3D type, }; + int err; =20 if (mmap_write_lock_killable(mm)) { count =3D -EINTR; @@ -1824,7 +1825,11 @@ static ssize_t clear_refs_write(struct file *file, c= onst 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 (err < 0) { + count =3D err; + goto out_unlock; + } if (type =3D=3D CLEAR_REFS_SOFT_DIRTY) { mmu_notifier_invalidate_range_end(&range); flush_tlb_mm(mm); diff --git a/mm/pagewalk.c b/mm/pagewalk.c index a94c401ab2cf..dc9f7a7709c6 100644 --- a/mm/pagewalk.c +++ b/mm/pagewalk.c @@ -425,14 +425,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, +static inline 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; @@ -444,6 +443,7 @@ static inline void process_vma_walk_lock(struct vm_area= _struct *vma, break; } #endif + return 0; } =20 /* @@ -487,7 +487,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); @@ -704,6 +706,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; @@ -711,7 +714,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 @@ -734,6 +739,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; @@ -741,7 +747,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.273.g2a3d683680-goog