Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1716592 > unrolled thread

[PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME

Started by"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
First post2017-08-21 17:30 +0200
Last post2017-08-22 20:00 +0200
Articles 3 — 3 participants

Back to article view | Back to linux.kernel

This discussion starts older than the indexed window; earlier articles aren't shown. The article labeled Started by below is the oldest one visible, not the original post.

Contents

  [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME "Kirill A. Shutemov" <kirill.shutemov@linux.intel.com> - 2017-08-21 17:30 +0200
    Re: [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime  for SPARSEMEM_EXTREME Borislav Petkov <bp@suse.de> - 2017-08-22 18:30 +0200
      Re: [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime  for SPARSEMEM_EXTREME "Kirill A. Shutemov" <kirill@shutemov.name> - 2017-08-22 20:00 +0200

#1716592 — [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME

From"Kirill A. Shutemov" <kirill.shutemov@linux.intel.com>
Date2017-08-21 17:30 +0200
Subject[PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME
Message-ID<ugWOm-648-3@gated-at.bofh.it>
Size of mem_section array depends on size of physical address space.

In preparation for boot-time switching between paging modes on x86-64
we need to make allocation of mem_section dynamic.

The patch allocates the array on the first call to
sparse_memory_present_with_active_regions().

Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
---
 include/linux/mmzone.h |  6 +++++-
 mm/page_alloc.c        | 10 ++++++++++
 mm/sparse.c            | 17 +++++++++++------
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
index fc14b8b3f6ce..9799c2c58ce6 100644
--- a/include/linux/mmzone.h
+++ b/include/linux/mmzone.h
@@ -1137,13 +1137,17 @@ struct mem_section {
 #define SECTION_ROOT_MASK	(SECTIONS_PER_ROOT - 1)
 
 #ifdef CONFIG_SPARSEMEM_EXTREME
-extern struct mem_section *mem_section[NR_SECTION_ROOTS];
+extern struct mem_section **mem_section;
 #else
 extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
 #endif
 
 static inline struct mem_section *__nr_to_section(unsigned long nr)
 {
+#ifdef CONFIG_SPARSEMEM_EXTREME
+        if (!mem_section)
+                return NULL;
+#endif
 	if (!mem_section[SECTION_NR_TO_ROOT(nr)])
 		return NULL;
 	return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index 6d30e914afb6..639fd2dce0c4 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -5681,6 +5681,16 @@ void __init sparse_memory_present_with_active_regions(int nid)
 	unsigned long start_pfn, end_pfn;
 	int i, this_nid;
 
+#ifdef CONFIG_SPARSEMEM_EXTREME
+	if (!mem_section) {
+		unsigned long size, align;
+
+		size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
+		align = 1 << (INTERNODE_CACHE_SHIFT);
+		mem_section = memblock_virt_alloc(size, align);
+	}
+#endif
+
 	for_each_mem_pfn_range(i, nid, &start_pfn, &end_pfn, &this_nid)
 		memory_present(this_nid, start_pfn, end_pfn);
 }
diff --git a/mm/sparse.c b/mm/sparse.c
index 7b4be3fd5cac..a91dafb189d4 100644
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -22,8 +22,7 @@
  * 1) mem_section	- memory sections, mem_map's for valid memory
  */
 #ifdef CONFIG_SPARSEMEM_EXTREME
-struct mem_section *mem_section[NR_SECTION_ROOTS]
-	____cacheline_internodealigned_in_smp;
+struct mem_section **mem_section;
 #else
 struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT]
 	____cacheline_internodealigned_in_smp;
@@ -104,7 +103,7 @@ static inline int sparse_index_init(unsigned long section_nr, int nid)
 int __section_nr(struct mem_section* ms)
 {
 	unsigned long root_nr;
-	struct mem_section* root;
+	struct mem_section* root = NULL;
 
 	for (root_nr = 0; root_nr < NR_SECTION_ROOTS; root_nr++) {
 		root = __nr_to_section(root_nr * SECTIONS_PER_ROOT);
@@ -115,7 +114,7 @@ int __section_nr(struct mem_section* ms)
 		     break;
 	}
 
-	VM_BUG_ON(root_nr == NR_SECTION_ROOTS);
+	VM_BUG_ON(!root);
 
 	return (root_nr * SECTIONS_PER_ROOT) + (ms - root);
 }
@@ -333,11 +332,17 @@ sparse_early_usemaps_alloc_pgdat_section(struct pglist_data *pgdat,
 static void __init check_usemap_section_nr(int nid, unsigned long *usemap)
 {
 	unsigned long usemap_snr, pgdat_snr;
-	static unsigned long old_usemap_snr = NR_MEM_SECTIONS;
-	static unsigned long old_pgdat_snr = NR_MEM_SECTIONS;
+	static unsigned long old_usemap_snr = 0;
+	static unsigned long old_pgdat_snr = 0;
 	struct pglist_data *pgdat = NODE_DATA(nid);
 	int usemap_nid;
 
+	/* First call */
+	if (!old_usemap_snr) {
+		old_usemap_snr = NR_MEM_SECTIONS;
+		old_pgdat_snr = NR_MEM_SECTIONS;
+	}
+
 	usemap_snr = pfn_to_section_nr(__pa(usemap) >> PAGE_SHIFT);
 	pgdat_snr = pfn_to_section_nr(__pa(pgdat) >> PAGE_SHIFT);
 	if (usemap_snr == pgdat_snr)
-- 
2.14.1

[toc] | [next] | [standalone]

#1717560 — Re: [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME

FromBorislav Petkov <bp@suse.de>
Date2017-08-22 18:30 +0200
SubjectRe: [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME
Message-ID<uhkdZ-4RO-25@gated-at.bofh.it>
In reply to#1716592
On Mon, Aug 21, 2017 at 06:28:58PM +0300, Kirill A. Shutemov wrote:
> Size of mem_section array depends on size of physical address space.
> 
> In preparation for boot-time switching between paging modes on x86-64
> we need to make allocation of mem_section dynamic.
> 
> The patch allocates the array on the first call to
> sparse_memory_present_with_active_regions().
> 
> Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> ---
>  include/linux/mmzone.h |  6 +++++-
>  mm/page_alloc.c        | 10 ++++++++++
>  mm/sparse.c            | 17 +++++++++++------
>  3 files changed, 26 insertions(+), 7 deletions(-)

This patch needs running through checkpatch:

ERROR: code indent should use tabs where possible
#53: FILE: include/linux/mmzone.h:1148:
+        if (!mem_section)$

WARNING: please, no spaces at the start of a line
#53: FILE: include/linux/mmzone.h:1148:
+        if (!mem_section)$

ERROR: code indent should use tabs where possible
#54: FILE: include/linux/mmzone.h:1149:
+                return NULL;$

WARNING: please, no spaces at the start of a line
#54: FILE: include/linux/mmzone.h:1149:
+                return NULL;$

ERROR: "foo* bar" should be "foo *bar"
#99: FILE: mm/sparse.c:106:
+       struct mem_section* root = NULL;

ERROR: do not initialise statics to 0
#118: FILE: mm/sparse.c:335:
+       static unsigned long old_usemap_snr = 0;

ERROR: do not initialise statics to 0
#119: FILE: mm/sparse.c:336:
+       static unsigned long old_pgdat_snr = 0;

You should integrate it into your patch creation workflow.

> diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
> index fc14b8b3f6ce..9799c2c58ce6 100644
> --- a/include/linux/mmzone.h
> +++ b/include/linux/mmzone.h
> @@ -1137,13 +1137,17 @@ struct mem_section {
>  #define SECTION_ROOT_MASK	(SECTIONS_PER_ROOT - 1)
>  
>  #ifdef CONFIG_SPARSEMEM_EXTREME
> -extern struct mem_section *mem_section[NR_SECTION_ROOTS];
> +extern struct mem_section **mem_section;
>  #else
>  extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
>  #endif
>  
>  static inline struct mem_section *__nr_to_section(unsigned long nr)
>  {
> +#ifdef CONFIG_SPARSEMEM_EXTREME
> +        if (!mem_section)
> +                return NULL;
> +#endif
>  	if (!mem_section[SECTION_NR_TO_ROOT(nr)])
>  		return NULL;
>  	return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
> diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> index 6d30e914afb6..639fd2dce0c4 100644
> --- a/mm/page_alloc.c
> +++ b/mm/page_alloc.c
> @@ -5681,6 +5681,16 @@ void __init sparse_memory_present_with_active_regions(int nid)
>  	unsigned long start_pfn, end_pfn;
>  	int i, this_nid;
>  
> +#ifdef CONFIG_SPARSEMEM_EXTREME
> +	if (!mem_section) {

Any chance this ifdeffery and above can use IS_ENABLED() instead?

> +		unsigned long size, align;
> +
> +		size = sizeof(struct mem_section) * NR_SECTION_ROOTS;
> +		align = 1 << (INTERNODE_CACHE_SHIFT);
> +		mem_section = memblock_virt_alloc(size, align);
> +	}
> +#endif

-- 
Regards/Gruss,
    Boris.

SUSE Linux GmbH, GF: Felix Imendörffer, Jane Smithard, Graham Norton, HRB 21284 (AG Nürnberg)
--

[toc] | [prev] | [next] | [standalone]

#1717626 — Re: [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME

From"Kirill A. Shutemov" <kirill@shutemov.name>
Date2017-08-22 20:00 +0200
SubjectRe: [PATCHv5 01/19] mm/sparsemem: Allocate mem_section at runtime for SPARSEMEM_EXTREME
Message-ID<uhlD3-5Gr-1@gated-at.bofh.it>
In reply to#1717560
On Tue, Aug 22, 2017 at 06:28:26PM +0200, Borislav Petkov wrote:
> On Mon, Aug 21, 2017 at 06:28:58PM +0300, Kirill A. Shutemov wrote:
> > Size of mem_section array depends on size of physical address space.
> > 
> > In preparation for boot-time switching between paging modes on x86-64
> > we need to make allocation of mem_section dynamic.
> > 
> > The patch allocates the array on the first call to
> > sparse_memory_present_with_active_regions().
> > 
> > Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
> > ---
> >  include/linux/mmzone.h |  6 +++++-
> >  mm/page_alloc.c        | 10 ++++++++++
> >  mm/sparse.c            | 17 +++++++++++------
> >  3 files changed, 26 insertions(+), 7 deletions(-)
> 
> This patch needs running through checkpatch:
> 
> ERROR: code indent should use tabs where possible
> #53: FILE: include/linux/mmzone.h:1148:
> +        if (!mem_section)$
> 
> WARNING: please, no spaces at the start of a line
> #53: FILE: include/linux/mmzone.h:1148:
> +        if (!mem_section)$
> 
> ERROR: code indent should use tabs where possible
> #54: FILE: include/linux/mmzone.h:1149:
> +                return NULL;$
> 
> WARNING: please, no spaces at the start of a line
> #54: FILE: include/linux/mmzone.h:1149:
> +                return NULL;$
> 
> ERROR: "foo* bar" should be "foo *bar"
> #99: FILE: mm/sparse.c:106:
> +       struct mem_section* root = NULL;
> 
> ERROR: do not initialise statics to 0
> #118: FILE: mm/sparse.c:335:
> +       static unsigned long old_usemap_snr = 0;
> 
> ERROR: do not initialise statics to 0
> #119: FILE: mm/sparse.c:336:
> +       static unsigned long old_pgdat_snr = 0;
> 
> You should integrate it into your patch creation workflow.

Sorry for this.

> > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h
> > index fc14b8b3f6ce..9799c2c58ce6 100644
> > --- a/include/linux/mmzone.h
> > +++ b/include/linux/mmzone.h
> > @@ -1137,13 +1137,17 @@ struct mem_section {
> >  #define SECTION_ROOT_MASK	(SECTIONS_PER_ROOT - 1)
> >  
> >  #ifdef CONFIG_SPARSEMEM_EXTREME
> > -extern struct mem_section *mem_section[NR_SECTION_ROOTS];
> > +extern struct mem_section **mem_section;
> >  #else
> >  extern struct mem_section mem_section[NR_SECTION_ROOTS][SECTIONS_PER_ROOT];
> >  #endif
> >  
> >  static inline struct mem_section *__nr_to_section(unsigned long nr)
> >  {
> > +#ifdef CONFIG_SPARSEMEM_EXTREME
> > +        if (!mem_section)
> > +                return NULL;
> > +#endif
> >  	if (!mem_section[SECTION_NR_TO_ROOT(nr)])
> >  		return NULL;
> >  	return &mem_section[SECTION_NR_TO_ROOT(nr)][nr & SECTION_ROOT_MASK];
> > diff --git a/mm/page_alloc.c b/mm/page_alloc.c
> > index 6d30e914afb6..639fd2dce0c4 100644
> > --- a/mm/page_alloc.c
> > +++ b/mm/page_alloc.c
> > @@ -5681,6 +5681,16 @@ void __init sparse_memory_present_with_active_regions(int nid)
> >  	unsigned long start_pfn, end_pfn;
> >  	int i, this_nid;
> >  
> > +#ifdef CONFIG_SPARSEMEM_EXTREME
> > +	if (!mem_section) {
> 
> Any chance this ifdeffery and above can use IS_ENABLED() instead?

Unfortunately, no.

This case cannot be changed to IS_ENABLED() as we don't define mem_section
and NR_SECTION_ROOTS for !SPARSEMEM.

The case above cannot be changed as GCC would complain in case of
!SPARSEMEM_EXTREME:

warning: the address of ‘mem_section’ will always evaluate as ‘true’ 

-- 
 Kirill A. Shutemov

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web