From: "Uladzislau Rezki (Sony)" <urezki@gmail.com>
To: linux-mm@kvack.org, Andrew Morton <akpm@linux-foundation.org>
Cc: LKML <linux-kernel@vger.kernel.org>, Baoquan He <bhe@redhat.com>,
Lorenzo Stoakes <lstoakes@gmail.com>,
Christoph Hellwig <hch@infradead.org>,
Matthew Wilcox <willy@infradead.org>,
"Liam R . Howlett" <Liam.Howlett@oracle.com>,
Dave Chinner <david@fromorbit.com>,
"Paul E . McKenney" <paulmck@kernel.org>,
Joel Fernandes <joel@joelfernandes.org>,
Uladzislau Rezki <urezki@gmail.com>,
Oleksiy Avramchenko <oleksiy.avramchenko@sony.com>,
Christoph Hellwig <hch@lst.de>
Subject: [PATCH v2 1/9] mm: vmalloc: Add va_alloc() helper
Date: Tue, 29 Aug 2023 10:11:34 +0200 [thread overview]
Message-ID: <20230829081142.3619-2-urezki@gmail.com> (raw)
In-Reply-To: <20230829081142.3619-1-urezki@gmail.com>
Currently __alloc_vmap_area() function contains an open codded
logic that finds and adjusts a VA based on allocation request.
Introduce a va_alloc() helper that adjusts found VA only. It
will be used later at least in two places.
There is no a functional change as a result of this patch.
Reviewed-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Lorenzo Stoakes <lstoakes@gmail.com>
Signed-off-by: Uladzislau Rezki (Sony) <urezki@gmail.com>
---
mm/vmalloc.c | 41 ++++++++++++++++++++++++++++-------------
1 file changed, 28 insertions(+), 13 deletions(-)
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 93cf99aba335..00afc1ee4756 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -1481,6 +1481,32 @@ adjust_va_to_fit_type(struct rb_root *root, struct list_head *head,
return 0;
}
+static unsigned long
+va_alloc(struct vmap_area *va,
+ struct rb_root *root, struct list_head *head,
+ unsigned long size, unsigned long align,
+ unsigned long vstart, unsigned long vend)
+{
+ unsigned long nva_start_addr;
+ int ret;
+
+ if (va->va_start > vstart)
+ nva_start_addr = ALIGN(va->va_start, align);
+ else
+ nva_start_addr = ALIGN(vstart, align);
+
+ /* Check the "vend" restriction. */
+ if (nva_start_addr + size > vend)
+ return vend;
+
+ /* Update the free vmap_area. */
+ ret = adjust_va_to_fit_type(root, head, va, nva_start_addr, size);
+ if (WARN_ON_ONCE(ret))
+ return vend;
+
+ return nva_start_addr;
+}
+
/*
* Returns a start address of the newly allocated area, if success.
* Otherwise a vend is returned that indicates failure.
@@ -1493,7 +1519,6 @@ __alloc_vmap_area(struct rb_root *root, struct list_head *head,
bool adjust_search_size = true;
unsigned long nva_start_addr;
struct vmap_area *va;
- int ret;
/*
* Do not adjust when:
@@ -1511,18 +1536,8 @@ __alloc_vmap_area(struct rb_root *root, struct list_head *head,
if (unlikely(!va))
return vend;
- if (va->va_start > vstart)
- nva_start_addr = ALIGN(va->va_start, align);
- else
- nva_start_addr = ALIGN(vstart, align);
-
- /* Check the "vend" restriction. */
- if (nva_start_addr + size > vend)
- return vend;
-
- /* Update the free vmap_area. */
- ret = adjust_va_to_fit_type(root, head, va, nva_start_addr, size);
- if (WARN_ON_ONCE(ret))
+ nva_start_addr = va_alloc(va, root, head, size, align, vstart, vend);
+ if (nva_start_addr == vend)
return vend;
#if DEBUG_AUGMENT_LOWEST_MATCH_CHECK
--
2.30.2
next prev parent reply other threads:[~2023-08-29 8:11 UTC|newest]
Thread overview: 62+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-08-29 8:11 [PATCH v2 0/9] Mitigate a vmap lock contention v2 Uladzislau Rezki (Sony)
2023-08-29 8:11 ` Uladzislau Rezki (Sony) [this message]
2023-09-06 5:51 ` [PATCH v2 1/9] mm: vmalloc: Add va_alloc() helper Baoquan He
2023-09-06 15:06 ` Uladzislau Rezki
2023-08-29 8:11 ` [PATCH v2 2/9] mm: vmalloc: Rename adjust_va_to_fit_type() function Uladzislau Rezki (Sony)
2023-09-06 5:51 ` Baoquan He
2023-09-06 16:27 ` Uladzislau Rezki
2023-08-29 8:11 ` [PATCH v2 3/9] mm: vmalloc: Move vmap_init_free_space() down in vmalloc.c Uladzislau Rezki (Sony)
2023-09-06 5:52 ` Baoquan He
2023-09-06 16:29 ` Uladzislau Rezki
2023-08-29 8:11 ` [PATCH v2 4/9] mm: vmalloc: Remove global vmap_area_root rb-tree Uladzislau Rezki (Sony)
2023-08-29 14:30 ` kernel test robot
2023-08-30 14:48 ` Uladzislau Rezki
2023-09-07 2:17 ` Baoquan He
2023-09-07 9:38 ` Baoquan He
2023-09-07 9:40 ` Uladzislau Rezki
2023-09-07 9:39 ` Uladzislau Rezki
2023-09-07 9:58 ` Baoquan He
2023-09-08 1:51 ` HAGIO KAZUHITO(萩尾 一仁)
2023-09-08 4:43 ` Baoquan He
2023-09-08 5:01 ` HAGIO KAZUHITO(萩尾 一仁)
2023-09-08 6:44 ` Baoquan He
2023-09-08 11:25 ` Uladzislau Rezki
2023-09-08 11:38 ` Baoquan He
2023-09-08 13:23 ` Uladzislau Rezki
2023-09-11 2:38 ` Baoquan He
2023-09-11 16:53 ` Uladzislau Rezki
2023-09-12 13:19 ` Baoquan He
2023-08-29 8:11 ` [PATCH v2 5/9] mm: vmalloc: Remove global purge_vmap_area_root rb-tree Uladzislau Rezki (Sony)
2023-09-11 2:57 ` Baoquan He
2023-09-11 17:00 ` Uladzislau Rezki
2023-08-29 8:11 ` [PATCH v2 6/9] mm: vmalloc: Offload free_vmap_area_lock lock Uladzislau Rezki (Sony)
2023-09-06 6:04 ` Baoquan He
2023-09-06 19:16 ` Uladzislau Rezki
2023-09-07 0:06 ` Baoquan He
2023-09-07 9:33 ` Uladzislau Rezki
2023-09-11 3:25 ` Baoquan He
2023-09-11 17:10 ` Uladzislau Rezki
2023-09-12 13:21 ` Baoquan He
2023-08-29 8:11 ` [PATCH v2 7/9] mm: vmalloc: Support multiple nodes in vread_iter Uladzislau Rezki (Sony)
2023-09-11 3:58 ` Baoquan He
2023-09-11 18:16 ` Uladzislau Rezki
2023-09-12 13:42 ` Baoquan He
2023-09-13 15:42 ` Uladzislau Rezki
2023-09-14 3:02 ` Baoquan He
2023-09-14 3:36 ` Baoquan He
2023-09-14 3:38 ` Baoquan He
2023-09-13 10:59 ` Baoquan He
2023-09-13 15:38 ` Uladzislau Rezki
2023-08-29 8:11 ` [PATCH v2 8/9] mm: vmalloc: Support multiple nodes in vmallocinfo Uladzislau Rezki (Sony)
2023-09-15 13:02 ` Baoquan He
2023-09-15 18:32 ` Uladzislau Rezki
2023-08-29 8:11 ` [PATCH v2 9/9] mm: vmalloc: Set nr_nodes/node_size based on CPU-cores Uladzislau Rezki (Sony)
2023-09-15 13:03 ` Baoquan He
2023-09-15 18:31 ` Uladzislau Rezki
2023-08-31 1:15 ` [PATCH v2 0/9] Mitigate a vmap lock contention v2 Baoquan He
2023-08-31 16:26 ` Uladzislau Rezki
2023-09-04 14:55 ` Uladzislau Rezki
2023-09-04 19:53 ` Andrew Morton
2023-09-05 6:53 ` Uladzislau Rezki
2023-09-06 20:04 ` Lorenzo Stoakes
2023-09-07 9:15 ` Uladzislau Rezki
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230829081142.3619-2-urezki@gmail.com \
--to=urezki@gmail.com \
--cc=Liam.Howlett@oracle.com \
--cc=akpm@linux-foundation.org \
--cc=bhe@redhat.com \
--cc=david@fromorbit.com \
--cc=hch@infradead.org \
--cc=hch@lst.de \
--cc=joel@joelfernandes.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=lstoakes@gmail.com \
--cc=oleksiy.avramchenko@sony.com \
--cc=paulmck@kernel.org \
--cc=willy@infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).