From: David Hildenbrand <david@redhat.com>
To: linux-mm@kvack.org
Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org,
linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
akpm@linux-foundation.org,
Dan Williams <dan.j.williams@intel.com>,
Wei Yang <richard.weiyang@gmail.com>,
Igor Mammedov <imammedo@redhat.com>,
David Hildenbrand <david@redhat.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>
Subject: [PATCH v3 05/11] drivers/base/memory: Pass a block_id to init_memory_block()
Date: Mon, 27 May 2019 13:11:46 +0200 [thread overview]
Message-ID: <20190527111152.16324-6-david@redhat.com> (raw)
In-Reply-To: <20190527111152.16324-1-david@redhat.com>
We'll rework hotplug_memory_register() shortly, so it no longer consumes
pass a section.
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Signed-off-by: David Hildenbrand <david@redhat.com>
---
drivers/base/memory.c | 15 +++++++--------
1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/drivers/base/memory.c b/drivers/base/memory.c
index f180427e48f4..f914fa6fe350 100644
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
@@ -651,21 +651,18 @@ int register_memory(struct memory_block *memory)
return ret;
}
-static int init_memory_block(struct memory_block **memory,
- struct mem_section *section, unsigned long state)
+static int init_memory_block(struct memory_block **memory, int block_id,
+ unsigned long state)
{
struct memory_block *mem;
unsigned long start_pfn;
- int scn_nr;
int ret = 0;
mem = kzalloc(sizeof(*mem), GFP_KERNEL);
if (!mem)
return -ENOMEM;
- scn_nr = __section_nr(section);
- mem->start_section_nr =
- base_memory_block_id(scn_nr) * sections_per_block;
+ mem->start_section_nr = block_id * sections_per_block;
mem->end_section_nr = mem->start_section_nr + sections_per_block - 1;
mem->state = state;
start_pfn = section_nr_to_pfn(mem->start_section_nr);
@@ -694,7 +691,8 @@ static int add_memory_block(int base_section_nr)
if (section_count == 0)
return 0;
- ret = init_memory_block(&mem, __nr_to_section(section_nr), MEM_ONLINE);
+ ret = init_memory_block(&mem, base_memory_block_id(base_section_nr),
+ MEM_ONLINE);
if (ret)
return ret;
mem->section_count = section_count;
@@ -707,6 +705,7 @@ static int add_memory_block(int base_section_nr)
*/
int hotplug_memory_register(int nid, struct mem_section *section)
{
+ int block_id = base_memory_block_id(__section_nr(section));
int ret = 0;
struct memory_block *mem;
@@ -717,7 +716,7 @@ int hotplug_memory_register(int nid, struct mem_section *section)
mem->section_count++;
put_device(&mem->dev);
} else {
- ret = init_memory_block(&mem, section, MEM_OFFLINE);
+ ret = init_memory_block(&mem, block_id, MEM_OFFLINE);
if (ret)
goto out;
mem->section_count++;
--
2.20.1
next prev parent reply other threads:[~2019-05-27 11:12 UTC|newest]
Thread overview: 55+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20190527111152.16324-1-david@redhat.com>
2019-05-27 11:11 ` [PATCH v3 01/11] mm/memory_hotplug: Simplify and fix check_hotplug_memory_range() David Hildenbrand
2019-05-30 17:53 ` Pavel Tatashin
2019-06-10 16:46 ` Oscar Salvador
2019-07-01 7:42 ` Michal Hocko
2019-05-27 11:11 ` [PATCH v3 02/11] s390x/mm: Fail when an altmap is used for arch_add_memory() David Hildenbrand
2019-06-10 17:07 ` Oscar Salvador
2019-07-01 7:43 ` Michal Hocko
2019-07-01 12:46 ` Michal Hocko
2019-07-15 10:51 ` David Hildenbrand
2019-07-19 6:45 ` Michal Hocko
2019-05-27 11:11 ` [PATCH v3 03/11] s390x/mm: Implement arch_remove_memory() David Hildenbrand
2019-07-01 7:45 ` Michal Hocko
2019-07-01 12:47 ` Michal Hocko
2019-07-15 10:45 ` David Hildenbrand
2019-05-27 11:11 ` [PATCH v3 04/11] arm64/mm: Add temporary arch_remove_memory() implementation David Hildenbrand
2019-06-03 21:41 ` Wei Yang
2019-06-04 6:56 ` David Hildenbrand
2019-06-04 17:36 ` Robin Murphy
2019-06-04 17:51 ` David Hildenbrand
2019-07-01 12:48 ` Michal Hocko
2019-05-27 11:11 ` David Hildenbrand [this message]
2019-06-03 21:49 ` [PATCH v3 05/11] drivers/base/memory: Pass a block_id to init_memory_block() Wei Yang
2019-06-04 6:56 ` David Hildenbrand
2019-07-01 7:56 ` Michal Hocko
2019-05-27 11:11 ` [PATCH v3 07/11] mm/memory_hotplug: Create memory block devices after arch_add_memory() David Hildenbrand
2019-05-30 21:07 ` Pavel Tatashin
2019-06-04 21:42 ` Wei Yang
2019-06-05 8:58 ` David Hildenbrand
2019-06-05 10:58 ` David Hildenbrand
2019-06-05 21:22 ` Wei Yang
2019-06-05 21:50 ` David Hildenbrand
2019-07-01 8:14 ` Michal Hocko
2019-05-27 11:11 ` [PATCH v3 08/11] mm/memory_hotplug: Drop MHP_MEMBLOCK_API David Hildenbrand
2019-06-04 21:47 ` Wei Yang
2019-07-01 8:15 ` Michal Hocko
2019-05-27 11:11 ` [PATCH v3 09/11] mm/memory_hotplug: Remove memory block devices before arch_remove_memory() David Hildenbrand
2019-06-04 22:07 ` Wei Yang
2019-06-05 9:00 ` David Hildenbrand
2019-07-01 8:41 ` Michal Hocko
2019-07-15 10:58 ` David Hildenbrand
2019-05-27 11:11 ` [PATCH v3 10/11] mm/memory_hotplug: Make unregister_memory_block_under_nodes() never fail David Hildenbrand
2019-06-05 21:21 ` Wei Yang
2019-06-10 16:56 ` Oscar Salvador
2019-07-01 8:51 ` Michal Hocko
2019-07-01 9:36 ` Oscar Salvador
2019-07-01 10:27 ` Michal Hocko
2019-07-15 11:10 ` David Hildenbrand
2019-07-16 8:46 ` Oscar Salvador
2019-07-16 11:08 ` David Hildenbrand
2019-07-16 11:09 ` David Hildenbrand
2019-07-19 6:05 ` Michal Hocko
2019-05-27 11:11 ` [PATCH v3 11/11] mm/memory_hotplug: Remove "zone" parameter from sparse_remove_one_section David Hildenbrand
2019-06-05 21:21 ` Wei Yang
2019-06-10 16:58 ` Oscar Salvador
2019-07-01 8:52 ` Michal Hocko
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=20190527111152.16324-6-david@redhat.com \
--to=david@redhat.com \
--cc=akpm@linux-foundation.org \
--cc=dan.j.williams@intel.com \
--cc=gregkh@linuxfoundation.org \
--cc=imammedo@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mm@kvack.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=rafael@kernel.org \
--cc=richard.weiyang@gmail.com \
/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).