Drop mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.8/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch b/queue-5.8/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch
deleted file mode 100644 (file)
index 9cfb08a..0000000
--- a/queue-5.8/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From fe5cb9c1da4800f1d8411f22cb03bf982e3f5e7b Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Oct 2020 20:07:43 -0700
-Subject: mm/mmu_notifier: fix mmget() assert in __mmu_interval_notifier_insert
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jann Horn <jannh@google.com>
-
-[ Upstream commit c9682d10271e1025ebfbb1675c7afffbef5c6856 ]
-
-The comment talks about having to hold mmget() (which means mm_users), but
-the actual check is on mm_count (which would be mmgrab()).
-
-Given that MMU notifiers are torn down in mmput() -> __mmput() ->
-exit_mmap() -> mmu_notifier_release(), I believe that the comment is
-correct and the check should be on mm->mm_users.  Fix it up accordingly.
-
-Fixes: 99cb252f5e68 ("mm/mmu_notifier: add an interval tree notifier")
-Signed-off-by: Jann Horn <jannh@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
-Cc: John Hubbard <jhubbard@nvidia.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Christian König <christian.koenig@amd.com
-Link: https://lkml.kernel.org/r/20200901000143.207585-1-jannh@google.com
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- mm/mmu_notifier.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
-index 352bb9f3ecc02..0d31b4ee63c04 100644
---- a/mm/mmu_notifier.c
-+++ b/mm/mmu_notifier.c
-@@ -913,7 +913,7 @@ static int __mmu_interval_notifier_insert(
-               return -EOVERFLOW;
- 
-       /* Must call with a mmget() held */
--      if (WARN_ON(atomic_read(&mm->mm_count) <= 0))
-+      if (WARN_ON(atomic_read(&mm->mm_users) <= 0))
-               return -EINVAL;
- 
-       /* pairs with mmdrop in mmu_interval_notifier_remove() */
--- 
-2.25.1
-

diff --git a/queue-5.8/series b/queue-5.8/series
index 2ad473a8fafaed7c118b78c1d519795b91bfc330..e27614ab2ea04e26bab67e1b2a93c9672f6d9eec 100644 (file)
--- a/queue-5.8/series
+++ b/queue-5.8/series
@@ -419,7 +419,6 @@ afs-fix-cell-purging-with-aliases.patch
 afs-fix-cell-removal.patch
 rdma-rxe-handle-skb_clone-failure-in-rxe_recv.c.patch
 mm-page_owner-change-split_page_owner-to-take-a-coun.patch
-mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch
 lib-crc32.c-fix-trivial-typo-in-preprocessor-conditi.patch
 ramfs-fix-nommu-mmap-with-gaps-in-the-page-cache.patch
 rapidio-fix-error-handling-path.patch

diff --git a/queue-5.9/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch b/queue-5.9/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch
deleted file mode 100644 (file)
index bbc0940..0000000
--- a/queue-5.9/mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From 66da55b8babcf5379e129595e69bcb13b6b268d5 Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Thu, 15 Oct 2020 20:07:43 -0700
-Subject: mm/mmu_notifier: fix mmget() assert in __mmu_interval_notifier_insert
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-From: Jann Horn <jannh@google.com>
-
-[ Upstream commit c9682d10271e1025ebfbb1675c7afffbef5c6856 ]
-
-The comment talks about having to hold mmget() (which means mm_users), but
-the actual check is on mm_count (which would be mmgrab()).
-
-Given that MMU notifiers are torn down in mmput() -> __mmput() ->
-exit_mmap() -> mmu_notifier_release(), I believe that the comment is
-correct and the check should be on mm->mm_users.  Fix it up accordingly.
-
-Fixes: 99cb252f5e68 ("mm/mmu_notifier: add an interval tree notifier")
-Signed-off-by: Jann Horn <jannh@google.com>
-Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
-Reviewed-by: Jason Gunthorpe <jgg@nvidia.com>
-Cc: John Hubbard <jhubbard@nvidia.com>
-Cc: Christoph Hellwig <hch@lst.de>
-Cc: Christian König <christian.koenig@amd.com
-Link: https://lkml.kernel.org/r/20200901000143.207585-1-jannh@google.com
-Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-Signed-off-by: Sasha Levin <sashal@kernel.org>
----
- mm/mmu_notifier.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/mm/mmu_notifier.c b/mm/mmu_notifier.c
-index 4fc918163dd32..5654dd19addc0 100644
---- a/mm/mmu_notifier.c
-+++ b/mm/mmu_notifier.c
-@@ -913,7 +913,7 @@ static int __mmu_interval_notifier_insert(
-               return -EOVERFLOW;
- 
-       /* Must call with a mmget() held */
--      if (WARN_ON(atomic_read(&mm->mm_count) <= 0))
-+      if (WARN_ON(atomic_read(&mm->mm_users) <= 0))
-               return -EINVAL;
- 
-       /* pairs with mmdrop in mmu_interval_notifier_remove() */
--- 
-2.25.1
-

diff --git a/queue-5.9/series b/queue-5.9/series
index 4a609440f92906f27725865c3a6d670e10eebb09..82c56b87c7031a03ebdb1978a4386059bbf00c05 100644 (file)
--- a/queue-5.9/series
+++ b/queue-5.9/series
@@ -509,7 +509,6 @@ rdma-rxe-handle-skb_clone-failure-in-rxe_recv.c.patch
 mm-page_owner-change-split_page_owner-to-take-a-coun.patch
 mm-huge_memory-fix-split-assumption-of-page-size.patch
 mm-fix-a-race-during-thp-splitting.patch
-mm-mmu_notifier-fix-mmget-assert-in-__mmu_interval_n.patch
 lib-crc32.c-fix-trivial-typo-in-preprocessor-conditi.patch
 ramfs-fix-nommu-mmap-with-gaps-in-the-page-cache.patch
 rapidio-fix-error-handling-path.patch