From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794669609; b=yYlaJDMwrKGtv64SxSjDo5vRFTAP3JMrUmSH+ePtjq4pmC9b2p3lLyT1dY5xSBdA5efh dccYENeiOvy5Tcg9Zk1WTXF/ei8LOFr7TRsN674VsHRrncAyFRiy46NZLYQ4Qu0H8A+Xp z78L6dDad35Deqtay0KWIujrLnrbp6NC2NNyC6+VMEb9bgPy6GjuE1niEnOcaKWYQBOG2 kz0LlnIQc0pEOVug1l1kKTX5ppOafnUiBmHZhZ5X//BX+4kpcOXQ/emjPlvp8FPm9SCpg 5qfNeekLRqaFaWvbqsxAtAncZAAextYtnKtS+jrTv2Gf/UoEOZjw2HnzcJTeVJbgubw== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794669609; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Transfer-Encoding; bh=jmc1PnZ6TYkecLS9JD4bbaacj/hSCFLA6xjcVNa7baI=; b=KAeA/J0B860z/V7ZCDzZym8ZsATok9dZCViYdzPXNfKMxo0S7OLUCaIxpZQ3wpf8Ja8P QLm+yqzGxz/v3fEHxVGbHL5tKEUI/4KIBOjXbzQwpl6Dth+L9TTU0bQ2U6G64uQyy4AVT W/V8sSYSmvFvlYJ6UBQA7vtNAWGuJ2cdEX0ZLLeq6rMsiXWIUmu+In+nx3uuboTW78clo Q+rJNdjAlu8W/SwzKhg3+uuz8DTENnjljy5pKRetIAaRwVkoN+/sIJI0+QvBUAtjaal46 TzwnKix8lP56YDoioSWNM8jVYC0iW98UXIJiLjSASzz04dCZHqOcnX2+CC1YMsQJ2+A== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=RLQCiV8b; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 4C636606A329 for ; Sat, 14 Nov 2026 15:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=RLQCiV8b Received: by smtp.kernel.org (Postfix) with ESMTPSA id 71DD51F000C5; Sat, 14 Nov 2026 15:20:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794669609; bh=jmc1PnZ6TYkecLS9JD4bbaacj/hSCFLA6xjcVNa7baI=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=RLQCiV8b4Ub80HX/UoSGcoKf0h/dHk14rey6lx0xsSYn2pNUOvJS3OAHNqJMpuKaF UjttDclewhDJ97LLmn97dOtr7y+nYC59WV1ik2ArNEfVcMChGSr5wBtA7Bv52nCpl2 FTXcmxLlfaLmC3eNmDoZK+cKkKzwtOvrIrsXILAPii14qMGHaJS5AAry8iMWYtOBxV 16cva1Ficc6AK3XQie1w5tOYNrKJItKJH9zLtH8NjEWcXzTpFfIY8zDpGW7NOU4osB AMndjJ3us/o+Tlf/cMwycei79Eq3lcyGqK3jPwz+NfZZmrjchQutvLBFUbSpp+134J P4GVxOzF2aqTA== From: Sasha Levin To: stable@vger.kernel.org Cc: Josef Bacik , "Lorenzo Stoakes (ARM)" , Muhammad Usama Anjum , "David Hildenbrand (Arm)" , Sasha Levin Subject: [PATCH 6.6.y 2/2] mm/mmu_notifier: finish non-blocking interval invalidation on error Date: Sat, 14 Nov 2026 10:20:06 -0500 Message-ID: <20261114151943.3437554-2-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20261114151943.3437554-1-sashal@kernel.org> References: <20261109201336-failed-6.6-6d65925777ec@kernel.org> <20261114151943.3437554-1-sashal@kernel.org> X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Josef Bacik [ Upstream commit 6d65925777ecae9d7a571a327e41c63f3940a0c7 ] When an ordinary MMU notifier rejects a non-blocking invalidation, the interval invalidation started beforehand is left unfinished: the caller skips mmu_notifier_invalidate_range_end(). Subsequent interval notifier operations can then wait forever. The only in-tree trigger is nouveau SVM, which uses both notifier types and rejects non-blocking invalidations. Reaping via the OOM reaper or process_mrelease() can therefore leave the GPU fault worker stuck, holding a reference that prevents the dying process's address space and memory from being freed. End the interval invalidation when an ordinary notifier fails a non-blocking invalidation, like mn_itree_invalidate() already does when an interval notifier fails. Make that handling clearer in the documentation of mmu_notifier_invalidate_range_start_nonblock(). Fix generated by an LLM and sent by Josef Bacik in private. Fixes: 99cb252f5e68 ("mm/mmu_notifier: add an interval tree notifier") Cc: stable@vger.kernel.org Signed-off-by: Josef Bacik [ david: simplify description, update function doc ] Acked-by: Lorenzo Stoakes (ARM) Tested-by: Muhammad Usama Anjum Link: https://patch.msgid.link/20261031-fixes_core-v3-28-d6437171ecc3@kernel.org Signed-off-by: David Hildenbrand (Arm) Signed-off-by: Sasha Levin --- include/linux/mmu_notifier.h | 3 ++- mm/mmu_notifier.c | 17 +++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/include/linux/mmu_notifier.h b/include/linux/mmu_notifier.h index f349e08a9dfe1..0e8448c8f3924 100644 --- a/include/linux/mmu_notifier.h +++ b/include/linux/mmu_notifier.h @@ -462,7 +462,8 @@ mmu_notifier_invalidate_range_start(struct mmu_notifier_range *range) /* * This version of mmu_notifier_invalidate_range_start() avoids blocking, but it * can return an error if a notifier can't proceed without blocking, in which - * case you're not allowed to modify PTEs in the specified range. + * case you're not allowed to modify PTEs in the specified range or call + * mmu_notifier_invalidate_range_end(). * * This is mainly intended for OOM handling. */ diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c index 7cf6c0228aaaa..38f2c95bbe267 100644 --- a/mm/mmu_notifier.c +++ b/mm/mmu_notifier.c @@ -537,16 +537,25 @@ int __mmu_notifier_invalidate_range_start(struct mmu_notifier_range *range) { struct mmu_notifier_subscriptions *subscriptions = range->mm->notifier_subscriptions; - int ret; + const bool has_itree = subscriptions->has_itree; + int ret = 0; - if (subscriptions->has_itree) { + if (has_itree) { ret = mn_itree_invalidate(subscriptions, range); if (ret) return ret; } if (!hlist_empty(&subscriptions->list)) - return mn_hlist_invalidate_range_start(subscriptions, range); - return 0; + ret = mn_hlist_invalidate_range_start(subscriptions, range); + + /* + * On error, the non-blocking caller is not allowed to call + * invalidate_range_end(), as in mn_itree_invalidate(). + */ + if (ret && has_itree && !mmu_notifier_range_blockable(range)) + mn_itree_inv_end(subscriptions); + + return ret; } static void -- 2.53.0