From mboxrd@z Thu Jan 1 00:00:00 1970 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 7A2A63B7B6E for ; Thu, 26 Mar 2026 08:08:53 +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=1774512535; cv=none; b=epy0qPknn3ssjuQQ6jRXZa5vCSgY2sy4gvZejEKKrOe0kSUrVHwL3xPDzT+UZwxcO3LVtHY9w3xHcGMK/B9SCi7rDcff/ocgnLxLI5UYzEfJNZ1L4gxR5iKiAktYojrwNujVAnZFNKcelb7FJkheLLRNNEEu5fnyCkiyGfZk2FI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1774512535; c=relaxed/simple; bh=96PaFZY6a3p2oI7osVjR8ZSNgplPhwNwVR2gXD9h42A=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=S7ARx3/QQ9wZmsxbB61ivRQBPegWaFMe/YkVQoHUa0bCol4gBYqxOgu0Wz/qMwLLuXSdG+63TVMBVftAoWfV3rARXrjaSsa/sCqUqxX06du+DrrNsdtoo2Xp1qPMEYF8gJ/+e0p6ubruibjPUYVyqR2rqDVDgKJT5wTDGbUvaXs= 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.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="sbR6NjWv" Received: by mail-dy1-f201.google.com with SMTP id 5a478bee46e88-2c16233ee11so726339eec.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=ghX30WGmNdKhXA+zeoBxI9UsHJ2fuLlUnh1cFcFHayEjUlqcuHDiEelVAb/duafiUp K2UaMLuZhvWosaxqF3JFMWngxoZQaOS3ZAJbdktIgf60YOMrQOqIeS/vS8XHe6IZ2lZa xKsgnuSxODTKZF1+bO2ojfNHX++l1AFSeEfTftKvipOrNPOijcTFd3yifGjBKxvu6JyP J7O+U3BtyCJNpYnVwP/wvdahyjWFzou//DAePJUvQPwkWVtE/ef8YuzQ6OecF8ZAn7FH 42x41QqUc5Ob1+QBGU3twKXT5t8i43zl8pp0csDza38GSsmWPIHToh5pTnyOrC6QlOue cToA== X-Forwarded-Encrypted: i=1; AJvYcCULsy57Ox84606vvpF3MsOppVm/D19aHOKd/Rz2rS4/WrLjKe1boIEK9BwxnkyVNpbuQAjB8mYR6X4n@vger.kernel.org X-Gm-Message-State: AOJu0YzLgO4HYXOLzVFUhmwQzoMByAEiovX8s31O9gP5m22UMRZghid2 l4MgoZDVqgHBhNog1I0w5Nr6rgxu+s81syfQn7x94Dno5jDBT5LC2WeBCm7fFNz9vF/h/XuN+q/ PA/il5A== 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-s390@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-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 --- 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; if (count > sizeof(buffer) - 1) count = sizeof(buffer) - 1; if (copy_from_user(buffer, buf, count)) return -EFAULT; - rv = kstrtoint(strstrip(buffer), 10, &itype); - if (rv < 0) - return rv; + err = kstrtoint(strstrip(buffer), 10, &itype); + if (err) + return err; type = (enum clear_refs_types)itype; if (type < CLEAR_REFS_ALL || type >= CLEAR_REFS_LAST) return -EINVAL; @@ -1824,7 +1824,7 @@ static ssize_t clear_refs_write(struct file *file, const 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 = walk_page_range(mm, 0, -1, &clear_refs_walk_ops, &cp); if (type == 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, const char __user *buf, } put_task_struct(task); - return count; + return err ? : count; } const struct file_operations proc_clear_refs_operations = { 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_walk_ops = { * (a hugetlbfs page or a transparent huge page being counted as 1). * -EIO - a misplaced page found, when MPOL_MF_STRICT specified without MOVEs. * -EFAULT - a hole in the memory range, when MPOL_MF_DISCONTIG_OK unspecified. + * -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_struct *mm, mmap_assert_write_locked(mm); } -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; } /* @@ -505,7 +505,9 @@ int walk_page_range_mm_unsafe(struct mm_struct *mm, unsigned long start, if (ops->pte_hole) err = ops->pte_hole(start, next, -1, &walk); } else { /* inside vma */ - process_vma_walk_lock(vma, ops->walk_lock); + err = process_vma_walk_lock(vma, ops->walk_lock); + if (err) + break; walk.vma = vma; next = min(end, vma->vm_end); vma = find_vma(mm, vma->vm_end); @@ -722,6 +724,7 @@ int walk_page_range_vma_unsafe(struct vm_area_struct *vma, unsigned long start, .vma = vma, .private = private, }; + int err; if (start >= end || !walk.mm) return -EINVAL; @@ -729,7 +732,9 @@ int walk_page_range_vma_unsafe(struct vm_area_struct *vma, unsigned long start, return -EINVAL; process_mm_walk_lock(walk.mm, ops->walk_lock); - process_vma_walk_lock(vma, ops->walk_lock); + err = process_vma_walk_lock(vma, ops->walk_lock); + if (err) + return err; return __walk_page_range(start, end, &walk); } @@ -752,6 +757,7 @@ int walk_page_vma(struct vm_area_struct *vma, const struct mm_walk_ops *ops, .vma = vma, .private = private, }; + int err; if (!walk.mm) return -EINVAL; @@ -759,7 +765,9 @@ int walk_page_vma(struct vm_area_struct *vma, const struct mm_walk_ops *ops, return -EINVAL; process_mm_walk_lock(walk.mm, ops->walk_lock); - process_vma_walk_lock(vma, ops->walk_lock); + err = process_vma_walk_lock(vma, ops->walk_lock); + if (err) + return err; return __walk_page_range(vma->vm_start, vma->vm_end, &walk); } -- 2.53.0.1018.g2bb0e51243-goog