From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 08A451F09A5; Wed, 17 Sep 2025 12:39:45 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112786; cv=none; b=h0P4ftYkMeVvH2kx4pmGDwnpp92/1ml+oPV53tbkhmWs/JJua+28wog4/UtPsSnTQi9SBNn4DxSzk63JVUMENaXePqWJZrBDv6PgUrb5yHsI4BDqmfQ1sAgmXGrOtRFhvpiqvyDL/EFTLteFQ+a0IEYQKRRTU7wPvZCIOpsvz8s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758112786; c=relaxed/simple; bh=B1Jjb+gpONgPyFEUfYTKo5fCJtbVIO5YJYsai5BFqyM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eABAZDvQDmEYOckxCZ61nzjtYr8cHnpbqFxCClTdYEj+jV+nWajeIzqqXxk/BL6ZpQfZfwE+g/ejLjxRr7OH0xuqfNYl9KZBapDaEVUyQsuRTEx4z4pI8k7pjqRXVgkNplCn3cyra9L5iii+MQ0OCMhhEHy307XvbfqyynMd0II= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DtGvN9+V; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DtGvN9+V" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2B67CC4CEF0; Wed, 17 Sep 2025 12:39:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758112785; bh=B1Jjb+gpONgPyFEUfYTKo5fCJtbVIO5YJYsai5BFqyM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DtGvN9+Vo4yMNvkRLJ3cD6AQiCzxKwJaaUQ20pX41zuXbMGajyHrD9kTBgp2+X0SU T9GqDxh4kgk+3ToOLfPPgCkmtjrutI3tMuYT2G6Rz/BplGWilPFAZNy8l2MTAMqfDN mYfiONpecbMHR3sNPj0ZDenUtDVvSchER3sYaet0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jeongjun Park , syzbot+417aeb05fd190f3a6da9@syzkaller.appspotmail.com, Sidhartha Kumar , Breno Leitao , David Hildenbrand , Muchun Song , Oscar Salvador , Andrew Morton Subject: [PATCH 6.16 076/189] mm/hugetlb: add missing hugetlb_lock in __unmap_hugepage_range() Date: Wed, 17 Sep 2025 14:33:06 +0200 Message-ID: <20250917123353.725616961@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250917123351.839989757@linuxfoundation.org> References: <20250917123351.839989757@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jeongjun Park commit 21cc2b5c5062a256ae9064442d37ebbc23f5aef7 upstream. When restoring a reservation for an anonymous page, we need to check to freeing a surplus. However, __unmap_hugepage_range() causes data race because it reads h->surplus_huge_pages without the protection of hugetlb_lock. And adjust_reservation is a boolean variable that indicates whether reservations for anonymous pages in each folio should be restored. Therefore, it should be initialized to false for each round of the loop. However, this variable is not initialized to false except when defining the current adjust_reservation variable. This means that once adjust_reservation is set to true even once within the loop, reservations for anonymous pages will be restored unconditionally in all subsequent rounds, regardless of the folio's state. To fix this, we need to add the missing hugetlb_lock, unlock the page_table_lock earlier so that we don't lock the hugetlb_lock inside the page_table_lock lock, and initialize adjust_reservation to false on each round within the loop. Link: https://lkml.kernel.org/r/20250823182115.1193563-1-aha310510@gmail.com Fixes: df7a6d1f6405 ("mm/hugetlb: restore the reservation if needed") Signed-off-by: Jeongjun Park Reported-by: syzbot+417aeb05fd190f3a6da9@syzkaller.appspotmail.com Closes: https://syzkaller.appspot.com/bug?extid=417aeb05fd190f3a6da9 Reviewed-by: Sidhartha Kumar Cc: Breno Leitao Cc: David Hildenbrand Cc: Muchun Song Cc: Oscar Salvador Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/hugetlb.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -5855,7 +5855,7 @@ void __unmap_hugepage_range(struct mmu_g spinlock_t *ptl; struct hstate *h = hstate_vma(vma); unsigned long sz = huge_page_size(h); - bool adjust_reservation = false; + bool adjust_reservation; unsigned long last_addr_mask; bool force_flush = false; @@ -5948,6 +5948,7 @@ void __unmap_hugepage_range(struct mmu_g sz); hugetlb_count_sub(pages_per_huge_page(h), mm); hugetlb_remove_rmap(folio); + spin_unlock(ptl); /* * Restore the reservation for anonymous page, otherwise the @@ -5955,14 +5956,16 @@ void __unmap_hugepage_range(struct mmu_g * If there we are freeing a surplus, do not set the restore * reservation bit. */ + adjust_reservation = false; + + spin_lock_irq(&hugetlb_lock); if (!h->surplus_huge_pages && __vma_private_lock(vma) && folio_test_anon(folio)) { folio_set_hugetlb_restore_reserve(folio); /* Reservation to be adjusted after the spin lock */ adjust_reservation = true; } - - spin_unlock(ptl); + spin_unlock_irq(&hugetlb_lock); /* * Adjust the reservation for the region that will have the