From: Michal Hocko <mhocko@kernel.org> To: Jerome Glisse <jglisse@redhat.com> Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, John Hubbard <jhubbard@nvidia.com>, Dan Williams <dan.j.williams@intel.com>, Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, David Nellans <dnellans@nvidia.com>, Russell King <linux@armlinux.org.uk>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Rich Felker <dalias@libc.org>, Chris Metcalf <cmetcalf@mellanox.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com> Subject: Re: [HMM 01/16] mm/memory/hotplug: add memory type parameter to arch_add/remove_memory Date: Fri, 7 Apr 2017 19:59:12 +0200 [thread overview] Message-ID: <20170407175912.GL16413@dhcp22.suse.cz> (raw) In-Reply-To: <20170407171055.GA16527@redhat.com> On Fri 07-04-17 13:10:59, Jerome Glisse wrote: > On Fri, Apr 07, 2017 at 06:37:37PM +0200, Michal Hocko wrote: > > On Fri 07-04-17 12:10:00, Jerome Glisse wrote: [...] > > > No guaranteed so yes i somewhat care about max_pfn, i do not care about > > > any of its existing user last time i check but it might matter for some > > > new user. > > > > OK, then we can add add_pages() which would do __add_pages by default > > (#ifndef ARCH_HAS_ADD_PAGES) and x86 would override it do also call > > update_end_of_memory_vars. This sounds easier to me than updating all > > the archs and add something that most of them do not really care about. > > > > But I will not insist. If you think that your approach is better I will > > not object. > > Something like attached patch ? No I meant something like the diff below but maybe even that is too excessive. > > > > Btw. is your series reviewed and ready to be applied to the mm tree? I > > planed to post mine on Monday so I would like to know how do we > > coordinate. I rebase on topo of yours or vice versa. > > Well v18 core patches were review by Mel, i did include all of his comment > in v19 (i don't think i did miss any). I think Dan still want to look at > patch 1 and 3 for ZONE_DEVICE. > > But i always welcome more review. I know Anshuman replied to this patch > to improve a comments. Balbir had issue on powerpc because iomem_resource.end > isn't clamped to MAX_PHYSMEM_BITS But that is all review i got so far on v19. > > I don't mind rebasing on top of your patchset. What ever is easier for > Andrew i guess. Well, considering that my patchset is changing the behavior of the core of the memory hotplug I would prefer if it could go first and add new user on top. But I realize that you are maintaining your series for a _long_ time so I would completely understand if you wouldn't be impressed by another rebase... If you are OK with rebasing and I will help you with that as much as I can I would be really grateful. --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 69188841717a..66e74928c2f0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2260,6 +2260,10 @@ config ARCH_ENABLE_MEMORY_HOTPLUG def_bool y depends on X86_64 || (X86_32 && HIGHMEM) +config ARCH_HAS_ADD_PAGES + def_bool y + depends on X86_64 && ARCH_ENABLE_MEMORY_HOTPLUG + config ARCH_ENABLE_MEMORY_HOTREMOVE def_bool y depends on MEMORY_HOTPLUG diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 754d47cb2847..ed1bb63d8f90 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -626,9 +626,9 @@ void __init paging_init(void) * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need * updating. */ -static void update_end_of_memory_vars(u64 start, u64 size) +static void update_end_of_memory_vars(u64 start_pfn, u64 nr_pages) { - unsigned long end_pfn = PFN_UP(start + size); + unsigned long end_pfn = start_pfn + nr_pages; if (end_pfn > max_pfn) { max_pfn = end_pfn; @@ -637,22 +637,29 @@ static void update_end_of_memory_vars(u64 start, u64 size) } } -int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) +int add_pages(int nid, unsigned long start_pfn, + unsigned long nr_pages, bool want_memblock) { - unsigned long start_pfn = start >> PAGE_SHIFT; - unsigned long nr_pages = size >> PAGE_SHIFT; int ret; - init_memory_mapping(start, start + size); - ret = __add_pages(nid, start_pfn, nr_pages, want_memblock); WARN_ON_ONCE(ret); /* update max_pfn, max_low_pfn and high_memory */ - update_end_of_memory_vars(start, size); + update_end_of_memory_vars(start_pfn, nr_pages); return ret; } + +int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) +{ + unsigned long start_pfn = start >> PAGE_SHIFT; + unsigned long nr_pages = size >> PAGE_SHIFT; + + init_memory_mapping(start, start + size); + + return add_pages(nid, start_pfn, nr_pages, want_memblock); +} EXPORT_SYMBOL_GPL(arch_add_memory); #define PAGE_INUSE 0xFD diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index a9985f6c460a..a0973fc80e60 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -113,6 +113,14 @@ extern int __remove_pages(struct zone *zone, unsigned long start_pfn, extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, bool want_memblock); +#ifndef CONFIG_ARCH_HAS_ADD_PAGES +static inline int add_pages(int nid, unsigned long start_pfn, + unsigned long nr_pages, bool want_memblock) +{ + return __add_pages(nid, start_pfn, nr_pages, want_memblock); +} +#endif + #ifdef CONFIG_NUMA extern int memory_add_physaddr_to_nid(u64 start); #else -- Michal Hocko SUSE Labs
WARNING: multiple messages have this Message-ID (diff)
From: Michal Hocko <mhocko@kernel.org> To: Jerome Glisse <jglisse@redhat.com> Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, John Hubbard <jhubbard@nvidia.com>, Dan Williams <dan.j.williams@intel.com>, Naoya Horiguchi <n-horiguchi@ah.jp.nec.com>, David Nellans <dnellans@nvidia.com>, Russell King <linux@armlinux.org.uk>, Benjamin Herrenschmidt <benh@kernel.crashing.org>, Paul Mackerras <paulus@samba.org>, Michael Ellerman <mpe@ellerman.id.au>, Martin Schwidefsky <schwidefsky@de.ibm.com>, Heiko Carstens <heiko.carstens@de.ibm.com>, Yoshinori Sato <ysato@users.sourceforge.jp>, Rich Felker <dalias@libc.org>, Chris Metcalf <cmetcalf@mellanox.com>, Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com> Subject: Re: [HMM 01/16] mm/memory/hotplug: add memory type parameter to arch_add/remove_memory Date: Fri, 7 Apr 2017 19:59:12 +0200 [thread overview] Message-ID: <20170407175912.GL16413@dhcp22.suse.cz> (raw) In-Reply-To: <20170407171055.GA16527@redhat.com> On Fri 07-04-17 13:10:59, Jerome Glisse wrote: > On Fri, Apr 07, 2017 at 06:37:37PM +0200, Michal Hocko wrote: > > On Fri 07-04-17 12:10:00, Jerome Glisse wrote: [...] > > > No guaranteed so yes i somewhat care about max_pfn, i do not care about > > > any of its existing user last time i check but it might matter for some > > > new user. > > > > OK, then we can add add_pages() which would do __add_pages by default > > (#ifndef ARCH_HAS_ADD_PAGES) and x86 would override it do also call > > update_end_of_memory_vars. This sounds easier to me than updating all > > the archs and add something that most of them do not really care about. > > > > But I will not insist. If you think that your approach is better I will > > not object. > > Something like attached patch ? No I meant something like the diff below but maybe even that is too excessive. > > > > Btw. is your series reviewed and ready to be applied to the mm tree? I > > planed to post mine on Monday so I would like to know how do we > > coordinate. I rebase on topo of yours or vice versa. > > Well v18 core patches were review by Mel, i did include all of his comment > in v19 (i don't think i did miss any). I think Dan still want to look at > patch 1 and 3 for ZONE_DEVICE. > > But i always welcome more review. I know Anshuman replied to this patch > to improve a comments. Balbir had issue on powerpc because iomem_resource.end > isn't clamped to MAX_PHYSMEM_BITS But that is all review i got so far on v19. > > I don't mind rebasing on top of your patchset. What ever is easier for > Andrew i guess. Well, considering that my patchset is changing the behavior of the core of the memory hotplug I would prefer if it could go first and add new user on top. But I realize that you are maintaining your series for a _long_ time so I would completely understand if you wouldn't be impressed by another rebase... If you are OK with rebasing and I will help you with that as much as I can I would be really grateful. --- diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 69188841717a..66e74928c2f0 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -2260,6 +2260,10 @@ config ARCH_ENABLE_MEMORY_HOTPLUG def_bool y depends on X86_64 || (X86_32 && HIGHMEM) +config ARCH_HAS_ADD_PAGES + def_bool y + depends on X86_64 && ARCH_ENABLE_MEMORY_HOTPLUG + config ARCH_ENABLE_MEMORY_HOTREMOVE def_bool y depends on MEMORY_HOTPLUG diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 754d47cb2847..ed1bb63d8f90 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -626,9 +626,9 @@ void __init paging_init(void) * After memory hotplug the variables max_pfn, max_low_pfn and high_memory need * updating. */ -static void update_end_of_memory_vars(u64 start, u64 size) +static void update_end_of_memory_vars(u64 start_pfn, u64 nr_pages) { - unsigned long end_pfn = PFN_UP(start + size); + unsigned long end_pfn = start_pfn + nr_pages; if (end_pfn > max_pfn) { max_pfn = end_pfn; @@ -637,22 +637,29 @@ static void update_end_of_memory_vars(u64 start, u64 size) } } -int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) +int add_pages(int nid, unsigned long start_pfn, + unsigned long nr_pages, bool want_memblock) { - unsigned long start_pfn = start >> PAGE_SHIFT; - unsigned long nr_pages = size >> PAGE_SHIFT; int ret; - init_memory_mapping(start, start + size); - ret = __add_pages(nid, start_pfn, nr_pages, want_memblock); WARN_ON_ONCE(ret); /* update max_pfn, max_low_pfn and high_memory */ - update_end_of_memory_vars(start, size); + update_end_of_memory_vars(start_pfn, nr_pages); return ret; } + +int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock) +{ + unsigned long start_pfn = start >> PAGE_SHIFT; + unsigned long nr_pages = size >> PAGE_SHIFT; + + init_memory_mapping(start, start + size); + + return add_pages(nid, start_pfn, nr_pages, want_memblock); +} EXPORT_SYMBOL_GPL(arch_add_memory); #define PAGE_INUSE 0xFD diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h index a9985f6c460a..a0973fc80e60 100644 --- a/include/linux/memory_hotplug.h +++ b/include/linux/memory_hotplug.h @@ -113,6 +113,14 @@ extern int __remove_pages(struct zone *zone, unsigned long start_pfn, extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages, bool want_memblock); +#ifndef CONFIG_ARCH_HAS_ADD_PAGES +static inline int add_pages(int nid, unsigned long start_pfn, + unsigned long nr_pages, bool want_memblock) +{ + return __add_pages(nid, start_pfn, nr_pages, want_memblock); +} +#endif + #ifdef CONFIG_NUMA extern int memory_add_physaddr_to_nid(u64 start); #else -- Michal Hocko SUSE Labs -- 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-04-07 17:59 UTC|newest] Thread overview: 81+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-04-05 20:40 [HMM 00/16] HMM (Heterogeneous Memory Management) v19 Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 01/16] mm/memory/hotplug: add memory type parameter to arch_add/remove_memory Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-06 9:45 ` Anshuman Khandual 2017-04-06 9:45 ` Anshuman Khandual 2017-04-06 13:58 ` Jerome Glisse 2017-04-06 13:58 ` Jerome Glisse 2017-04-07 12:13 ` Michal Hocko 2017-04-07 12:13 ` Michal Hocko 2017-04-07 14:32 ` Jerome Glisse 2017-04-07 14:32 ` Jerome Glisse 2017-04-07 14:45 ` Michal Hocko 2017-04-07 14:45 ` Michal Hocko 2017-04-07 14:57 ` Jerome Glisse 2017-04-07 14:57 ` Jerome Glisse 2017-04-07 15:11 ` Michal Hocko 2017-04-07 15:11 ` Michal Hocko 2017-04-07 16:10 ` Jerome Glisse 2017-04-07 16:10 ` Jerome Glisse 2017-04-07 16:37 ` Michal Hocko 2017-04-07 16:37 ` Michal Hocko 2017-04-07 17:10 ` Jerome Glisse 2017-04-07 17:10 ` Jerome Glisse 2017-04-07 17:59 ` Michal Hocko [this message] 2017-04-07 17:59 ` Michal Hocko 2017-04-07 18:27 ` Jerome Glisse 2017-04-07 18:27 ` Jerome Glisse 2017-04-05 20:40 ` [HMM 02/16] mm/put_page: move ZONE_DEVICE page reference decrement v2 Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 03/16] mm/unaddressable-memory: new type of ZONE_DEVICE for unaddressable memory Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 04/16] mm/ZONE_DEVICE/x86: add support for un-addressable device memory Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 05/16] mm/migrate: new migrate mode MIGRATE_SYNC_NO_COPY Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 06/16] mm/migrate: new memory migration helper for use with device memory v4 Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 07/16] mm/migrate: migrate_vma() unmap page from vma while collecting pages Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 08/16] mm/hmm: heterogeneous memory management (HMM for short) Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 09/16] mm/hmm/mirror: mirror process address space on device with HMM helpers Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 10/16] mm/hmm/mirror: helper to snapshot CPU page table v2 Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-10 8:35 ` Michal Hocko 2017-04-10 8:35 ` Michal Hocko 2017-04-10 8:43 ` Michal Hocko 2017-04-10 8:43 ` Michal Hocko 2017-04-10 22:10 ` Andrew Morton 2017-04-10 22:10 ` Andrew Morton 2017-04-11 1:33 ` Jerome Glisse 2017-04-11 1:33 ` Jerome Glisse 2017-04-11 20:33 ` Andrew Morton 2017-04-11 20:33 ` Andrew Morton 2017-04-05 20:40 ` [HMM 11/16] mm/hmm/mirror: device page fault handler Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 12/16] mm/migrate: support un-addressable ZONE_DEVICE page in migration Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 13/16] mm/migrate: allow migrate_vma() to alloc new page on empty entry Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 14/16] mm/hmm/devmem: device memory hotplug using ZONE_DEVICE Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-06 21:22 ` Jerome Glisse 2017-04-06 21:22 ` Jerome Glisse 2017-04-07 1:37 ` Balbir Singh 2017-04-07 1:37 ` Balbir Singh 2017-04-07 2:02 ` Jerome Glisse 2017-04-07 2:02 ` Jerome Glisse 2017-04-07 16:26 ` Jerome Glisse 2017-04-07 16:26 ` Jerome Glisse 2017-04-10 4:31 ` Balbir Singh 2017-04-10 4:31 ` Balbir Singh 2017-04-05 20:40 ` [HMM 15/16] mm/hmm/devmem: dummy HMM device for ZONE_DEVICE memory v2 Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-05 20:40 ` [HMM 16/16] hmm: heterogeneous memory management documentation Jérôme Glisse 2017-04-05 20:40 ` Jérôme Glisse 2017-04-06 3:22 ` [HMM 00/16] HMM (Heterogeneous Memory Management) v19 Figo.zhang 2017-04-06 4:59 ` Jerome Glisse 2017-04-06 4:59 ` Jerome Glisse
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=20170407175912.GL16413@dhcp22.suse.cz \ --to=mhocko@kernel.org \ --cc=akpm@linux-foundation.org \ --cc=benh@kernel.crashing.org \ --cc=cmetcalf@mellanox.com \ --cc=dalias@libc.org \ --cc=dan.j.williams@intel.com \ --cc=dnellans@nvidia.com \ --cc=heiko.carstens@de.ibm.com \ --cc=hpa@zytor.com \ --cc=jglisse@redhat.com \ --cc=jhubbard@nvidia.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=linux@armlinux.org.uk \ --cc=mingo@redhat.com \ --cc=mpe@ellerman.id.au \ --cc=n-horiguchi@ah.jp.nec.com \ --cc=paulus@samba.org \ --cc=schwidefsky@de.ibm.com \ --cc=tglx@linutronix.de \ --cc=ysato@users.sourceforge.jp \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.