From: Dennis Zhou <dennisz@fb.com>
To: Tejun Heo <tj@kernel.org>, Christoph Lameter <cl@linux.com>,
Josef Bacik <josef@toxicpanda.com>
Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org,
kernel-team@fb.com, Dennis Zhou <dennisszhou@gmail.com>
Subject: [PATCH v2 04/23] percpu: setup_first_chunk remove dyn_size and consolidate logic
Date: Mon, 24 Jul 2017 19:02:01 -0400 [thread overview]
Message-ID: <20170724230220.21774-5-dennisz@fb.com> (raw)
In-Reply-To: <20170724230220.21774-1-dennisz@fb.com>
From: "Dennis Zhou (Facebook)" <dennisszhou@gmail.com>
There is logic for setting variables in the static chunk init code that
could be consolidated with the dynamic chunk init code. This combines
this logic to setup for combining the allocation paths. reserved_size is
used as the conditional as a dynamic region will always exist.
Signed-off-by: Dennis Zhou <dennisszhou@gmail.com>
---
mm/percpu.c | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
diff --git a/mm/percpu.c b/mm/percpu.c
index 470e1a0..851aa81 100644
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -1562,8 +1562,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
{
static int smap[PERCPU_DYNAMIC_EARLY_SLOTS] __initdata;
static int dmap[PERCPU_DYNAMIC_EARLY_SLOTS] __initdata;
- size_t dyn_size = ai->dyn_size;
- size_t size_sum = ai->static_size + ai->reserved_size + dyn_size;
+ size_t size_sum = ai->static_size + ai->reserved_size + ai->dyn_size;
struct pcpu_chunk *schunk, *dchunk = NULL;
unsigned long *group_offsets;
size_t *group_sizes;
@@ -1690,14 +1689,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
bitmap_fill(schunk->populated, pcpu_unit_pages);
schunk->nr_populated = pcpu_unit_pages;
- if (ai->reserved_size) {
- schunk->free_size = ai->reserved_size;
- pcpu_reserved_chunk = schunk;
- } else {
- schunk->free_size = dyn_size;
- dyn_size = 0; /* dynamic area covered */
- }
-
+ schunk->free_size = ai->reserved_size ?: ai->dyn_size;
schunk->contig_hint = schunk->free_size;
schunk->map[0] = 1;
schunk->map[1] = schunk->start_offset;
@@ -1705,7 +1697,9 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
schunk->map_used = 2;
/* init dynamic chunk if necessary */
- if (dyn_size) {
+ if (ai->reserved_size) {
+ pcpu_reserved_chunk = schunk;
+
dchunk = memblock_virt_alloc(pcpu_chunk_struct_size, 0);
INIT_LIST_HEAD(&dchunk->list);
INIT_LIST_HEAD(&dchunk->map_extend_list);
@@ -1717,7 +1711,7 @@ int __init pcpu_setup_first_chunk(const struct pcpu_alloc_info *ai,
bitmap_fill(dchunk->populated, pcpu_unit_pages);
dchunk->nr_populated = pcpu_unit_pages;
- dchunk->contig_hint = dchunk->free_size = dyn_size;
+ dchunk->contig_hint = dchunk->free_size = ai->dyn_size;
dchunk->map[0] = 1;
dchunk->map[1] = dchunk->start_offset;
dchunk->map[2] = (dchunk->start_offset + dchunk->free_size) | 1;
--
2.9.3
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2017-07-24 23:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 23:01 [PATCH v2 00/23] percpu: replace percpu area map allocator with bitmap allocator Dennis Zhou
2017-07-24 23:01 ` [PATCH v2 01/23] percpu: setup_first_chunk enforce dynamic region must exist Dennis Zhou
2017-07-25 18:03 ` Josef Bacik
2017-07-24 23:01 ` [PATCH v2 02/23] percpu: introduce start_offset to pcpu_chunk Dennis Zhou
2017-07-25 18:04 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 03/23] percpu: remove has_reserved from pcpu_chunk Dennis Zhou
2017-07-25 18:05 ` Josef Bacik
2017-07-24 23:02 ` Dennis Zhou [this message]
2017-07-25 18:07 ` [PATCH v2 04/23] percpu: setup_first_chunk remove dyn_size and consolidate logic Josef Bacik
2017-07-24 23:02 ` [PATCH v2 05/23] percpu: unify allocation of schunk and dchunk Dennis Zhou
2017-07-25 18:10 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 06/23] percpu: end chunk area maps page aligned for the populated bitmap Dennis Zhou
2017-07-25 18:14 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 07/23] percpu: setup_first_chunk rename schunk/dchunk to chunk Dennis Zhou
2017-07-25 18:15 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 08/23] percpu: modify base_addr to be region specific Dennis Zhou
2017-07-25 18:24 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 09/23] percpu: combine percpu address checks Dennis Zhou
2017-07-25 18:25 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 10/23] percpu: change the number of pages marked in the first_chunk pop bitmap Dennis Zhou
2017-07-25 18:27 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 11/23] percpu: introduce nr_empty_pop_pages to help empty page accounting Dennis Zhou
2017-07-25 18:29 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 12/23] percpu: increase minimum percpu allocation size and align first regions Dennis Zhou
2017-07-25 18:33 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 13/23] percpu: generalize bitmap (un)populated iterators Dennis Zhou
2017-07-25 18:35 ` Josef Bacik
2017-07-26 14:08 ` Tejun Heo
2017-07-24 23:02 ` [PATCH v2 14/23] percpu: replace area map allocator with bitmap allocator Dennis Zhou
2017-07-25 17:36 ` [percpu] ec1f2e572e: WARNING:at_lib/list_debug.c:#__list_add_valid kernel test robot
2017-07-25 19:15 ` [PATCH v2 14/23] percpu: replace area map allocator with bitmap allocator Josef Bacik
2017-07-25 20:24 ` [PATCH updated 14/23] percpu: replace area map allocator with bitmap Dennis Zhou
2017-07-24 23:02 ` [PATCH v2 15/23] percpu: introduce bitmap metadata blocks Dennis Zhou
2017-07-25 19:20 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 16/23] percpu: add first_bit to keep track of the first free in the bitmap Dennis Zhou
2017-07-25 19:21 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 17/23] percpu: skip chunks if the alloc does not fit in the contig hint Dennis Zhou
2017-07-25 19:25 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 18/23] percpu: keep track of the best offset for contig hints Dennis Zhou
2017-07-25 19:29 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 19/23] percpu: update alloc path to only scan if contig hints are broken Dennis Zhou
2017-07-25 19:32 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 20/23] percpu: update free path to take advantage of contig hints Dennis Zhou
2017-07-25 19:38 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 21/23] percpu: use metadata blocks to update the chunk contig hint Dennis Zhou
2017-07-25 19:40 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 22/23] percpu: update pcpu_find_block_fit to use an iterator Dennis Zhou
2017-07-25 19:47 ` Josef Bacik
2017-07-24 23:02 ` [PATCH v2 23/23] percpu: update header to contain bitmap allocator explanation Dennis Zhou
2017-07-25 19:49 ` Josef Bacik
2017-07-26 21:42 ` Tejun Heo
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=20170724230220.21774-5-dennisz@fb.com \
--to=dennisz@fb.com \
--cc=cl@linux.com \
--cc=dennisszhou@gmail.com \
--cc=josef@toxicpanda.com \
--cc=kernel-team@fb.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=tj@kernel.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