diff options
author | Andrew Morton <akpm@linux-foundation.org> | 2024-04-05 11:22:11 -0700 |
---|---|---|
committer | Andrew Morton <akpm@linux-foundation.org> | 2024-04-05 11:22:11 -0700 |
commit | 9c187b20e47ca1d59527541051a5709df059a1f7 (patch) | |
tree | ea8af49ccd7f0ae85797085ce8a789dc26ff09af | |
parent | fbbb6212d5f00d227b15ccf95960680f33c787a3 (diff) | |
download | 25-new-9c187b20e47ca1d59527541051a5709df059a1f7.tar.gz |
foo
-rw-r--r-- | patches/mm-vmalloc-fix-lockdep-warning.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/patches/mm-vmalloc-fix-lockdep-warning.patch b/patches/mm-vmalloc-fix-lockdep-warning.patch index 93afd8bba..73c63e600 100644 --- a/patches/mm-vmalloc-fix-lockdep-warning.patch +++ b/patches/mm-vmalloc-fix-lockdep-warning.patch @@ -33,6 +33,7 @@ To address this a lowest VA is found first without holding a node lock where it resides. As a last step we check if a VA still there because it can go away, if removed, proceed with next lowest. +[akpm@linux-foundation.org: fix comment typos, per Baoquan] Link: https://lkml.kernel.org/r/20240328140330.4747-1-urezki@gmail.com Fixes: 53becf32aec1 ("mm: vmalloc: support multiple nodes in vread_iter") Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com> @@ -48,8 +49,8 @@ Cc: Oleksiy Avramchenko <oleksiy.avramchenko@sony.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> --- - mm/vmalloc.c | 74 +++++++++++++++++++++++++++++-------------------- - 1 file changed, 44 insertions(+), 30 deletions(-) + mm/vmalloc.c | 73 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 43 insertions(+), 30 deletions(-) --- a/mm/vmalloc.c~mm-vmalloc-fix-lockdep-warning +++ a/mm/vmalloc.c @@ -81,7 +82,7 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> /* Look up the first VA which satisfies addr < va_end, NULL if none. */ static struct vmap_area * __find_vmap_area_exceed_addr(unsigned long addr, struct rb_root *root) -@@ -1025,47 +1046,40 @@ __find_vmap_area_exceed_addr(unsigned lo +@@ -1025,47 +1046,39 @@ __find_vmap_area_exceed_addr(unsigned lo static struct vmap_node * find_vmap_area_exceed_addr_lock(unsigned long addr, struct vmap_area **va) { @@ -119,10 +120,9 @@ Signed-off-by: Andrew Morton <akpm@linux-foundation.org> - return va_node; -} + /* -+ * Check if found VA exists, it might it is gone away. -+ * In this case we repeat the search because a VA has -+ * been removed concurrently thus we need to proceed -+ * with next one what is a rare case. ++ * Check if found VA exists, it might have gone away. In this case we ++ * repeat the search because a VA has been removed concurrently and we ++ * need to proceed to the next one, which is a rare case. + */ + if (va_start_lowest) { + vn = addr_to_node(va_start_lowest); |