Skip to content

Commit

Permalink
mm: use 'unsigned int' for page order
Browse files Browse the repository at this point in the history 
[ Upstream commit d00181b ]

Let's try to be consistent about data type of page order.

[sfr@canb.auug.org.au: fix build (type of pageblock_order)]
[hughd@google.com: some configs end up with MAX_ORDER and pageblock_order having different types]
Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com>
Acked-by: Michal Hocko <mhocko@suse.com>
Acked-by: Vlastimil Babka <vbabka@suse.cz>
Reviewed-by: Andrea Arcangeli <aarcange@redhat.com>
Cc: "Paul E. McKenney" <paulmck@linux.vnet.ibm.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc: Christoph Lameter <cl@linux.com>
Cc: David Rientjes <rientjes@google.com>
Cc: Joonsoo Kim <iamjoonsoo.kim@lge.com>
Cc: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Hugh Dickins <hughd@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
  • Loading branch information
@kiryl @sashalevin
kiryl authored and sashalevin committed Apr 18, 2016
1 parent 302ea3e commit 972c6ab
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 27 deletions.
5 changes: 3 additions & 2 deletions include/linux/mm.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@ static inline compound_page_dtor *get_compound_page_dtor(struct page *page)
return (compound_page_dtor *)page[1].lru.next;
}

static inline int compound_order(struct page *page)
static inline unsigned int compound_order(struct page *page)
{
if (!PageHead(page))
return 0;
Expand Down Expand Up @@ -1730,7 +1730,8 @@ extern void si_meminfo(struct sysinfo * val);
extern void si_meminfo_node(struct sysinfo *val, int nid);

extern __printf(3, 4)
void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...);
void warn_alloc_failed(gfp_t gfp_mask, unsigned int order,
const char *fmt, ...);

extern void setup_per_cpu_pageset(void);

Expand Down
2 changes: 1 addition & 1 deletion include/linux/pageblock-flags.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ enum pageblock_bits {
#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE

/* Huge page sizes are variable */
extern int pageblock_order;
extern unsigned int pageblock_order;

#else /* CONFIG_HUGETLB_PAGE_SIZE_VARIABLE */

Expand Down
19 changes: 10 additions & 9 deletions mm/hugetlb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ static int hstate_next_node_to_free(struct hstate *h, nodemask_t *nodes_allowed)

#if defined(CONFIG_CMA) && defined(CONFIG_X86_64)
static void destroy_compound_gigantic_page(struct page *page,
unsigned long order)
unsigned int order)
{
int i;
int nr_pages = 1 << order;
Expand All @@ -697,7 +697,7 @@ static void destroy_compound_gigantic_page(struct page *page,
__ClearPageHead(page);
}

static void free_gigantic_page(struct page *page, unsigned order)
static void free_gigantic_page(struct page *page, unsigned int order)
{
free_contig_range(page_to_pfn(page), 1 << order);
}
Expand Down Expand Up @@ -741,7 +741,7 @@ static bool zone_spans_last_pfn(const struct zone *zone,
return zone_spans_pfn(zone, last_pfn);
}

static struct page *alloc_gigantic_page(int nid, unsigned order)
static struct page *alloc_gigantic_page(int nid, unsigned int order)
{
unsigned long nr_pages = 1 << order;
unsigned long ret, pfn, flags;
Expand Down Expand Up @@ -777,7 +777,7 @@ static struct page *alloc_gigantic_page(int nid, unsigned order)
}

static void prep_new_huge_page(struct hstate *h, struct page *page, int nid);
static void prep_compound_gigantic_page(struct page *page, unsigned long order);
static void prep_compound_gigantic_page(struct page *page, unsigned int order);

static struct page *alloc_fresh_gigantic_page_node(struct hstate *h, int nid)
{
Expand Down Expand Up @@ -810,9 +810,9 @@ static int alloc_fresh_gigantic_page(struct hstate *h,
static inline bool gigantic_page_supported(void) { return true; }
#else
static inline bool gigantic_page_supported(void) { return false; }
static inline void free_gigantic_page(struct page *page, unsigned order) { }
static inline void free_gigantic_page(struct page *page, unsigned int order) { }
static inline void destroy_compound_gigantic_page(struct page *page,
unsigned long order) { }
unsigned int order) { }
static inline int alloc_fresh_gigantic_page(struct hstate *h,
nodemask_t *nodes_allowed) { return 0; }
#endif
Expand Down Expand Up @@ -932,7 +932,7 @@ static void prep_new_huge_page(struct hstate *h, struct page *page, int nid)
put_page(page); /* free it into the hugepage allocator */
}

static void prep_compound_gigantic_page(struct page *page, unsigned long order)
static void prep_compound_gigantic_page(struct page *page, unsigned int order)
{
int i;
int nr_pages = 1 << order;
Expand Down Expand Up @@ -1490,7 +1490,8 @@ int __weak alloc_bootmem_huge_page(struct hstate *h)
return 1;
}

static void __init prep_compound_huge_page(struct page *page, int order)
static void __init prep_compound_huge_page(struct page *page,
unsigned int order)
{
if (unlikely(order > (MAX_ORDER - 1)))
prep_compound_gigantic_page(page, order);
Expand Down Expand Up @@ -2197,7 +2198,7 @@ static int __init hugetlb_init(void)
module_init(hugetlb_init);

/* Should be called on processing a hugepagesz=... option */
void __init hugetlb_add_hstate(unsigned order)
void __init hugetlb_add_hstate(unsigned int order)
{
struct hstate *h;
unsigned long i;
Expand Down
4 changes: 2 additions & 2 deletions mm/internal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ __find_buddy_index(unsigned long page_idx, unsigned int order)
extern int __isolate_free_page(struct page *page, unsigned int order);
extern void __free_pages_bootmem(struct page *page, unsigned long pfn,
unsigned int order);
extern void prep_compound_page(struct page *page, unsigned long order);
extern void prep_compound_page(struct page *page, unsigned int order);
#ifdef CONFIG_MEMORY_FAILURE
extern bool is_free_buddy_page(struct page *page);
#endif
Expand Down Expand Up @@ -193,7 +193,7 @@ isolate_migratepages_range(struct compact_control *cc,
* page cannot be allocated or merged in parallel. Alternatively, it must
* handle invalid values gracefully, and use page_order_unsafe() below.
*/
static inline unsigned long page_order(struct page *page)
static inline unsigned int page_order(struct page *page)
{
/* PageBuddy() must be checked by the caller */
return page_private(page);
Expand Down
29 changes: 16 additions & 13 deletions mm/page_alloc.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ bool pm_suspended_storage(void)
#endif /* CONFIG_PM_SLEEP */

#ifdef CONFIG_HUGETLB_PAGE_SIZE_VARIABLE
int pageblock_order __read_mostly;
unsigned int pageblock_order __read_mostly;
#endif

static void __free_pages_ok(struct page *page, unsigned int order);
Expand Down Expand Up @@ -361,7 +361,7 @@ static void free_compound_page(struct page *page)
__free_pages_ok(page, compound_order(page));
}

void prep_compound_page(struct page *page, unsigned long order)
void prep_compound_page(struct page *page, unsigned int order)
{
int i;
int nr_pages = 1 << order;
Expand Down Expand Up @@ -546,7 +546,7 @@ static inline void __free_one_page(struct page *page,
unsigned long combined_idx;
unsigned long uninitialized_var(buddy_idx);
struct page *buddy;
int max_order = MAX_ORDER;
unsigned int max_order = MAX_ORDER;

VM_BUG_ON(!zone_is_initialized(zone));

Expand All @@ -562,7 +562,7 @@ static inline void __free_one_page(struct page *page,
* pageblock. Without this, pageblock isolation
* could cause incorrect freepage accounting.
*/
max_order = min(MAX_ORDER, pageblock_order + 1);
max_order = min_t(unsigned int, MAX_ORDER, pageblock_order + 1);
} else {
__mod_zone_freepage_state(zone, 1 << order, migratetype);
}
Expand Down Expand Up @@ -994,7 +994,7 @@ int move_freepages(struct zone *zone,
int migratetype)
{
struct page *page;
unsigned long order;
unsigned int order;
int pages_moved = 0;

#ifndef CONFIG_HOLES_IN_ZONE
Expand Down Expand Up @@ -1080,7 +1080,7 @@ static void change_pageblock_range(struct page *pageblock_page,
static int try_to_steal_freepages(struct zone *zone, struct page *page,
int start_type, int fallback_type)
{
int current_order = page_order(page);
unsigned int current_order = page_order(page);

/*
* When borrowing from MIGRATE_CMA, we need to release the excess
Expand Down Expand Up @@ -2143,7 +2143,7 @@ static DEFINE_RATELIMIT_STATE(nopage_rs,
DEFAULT_RATELIMIT_INTERVAL,
DEFAULT_RATELIMIT_BURST);

void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
void warn_alloc_failed(gfp_t gfp_mask, unsigned int order, const char *fmt, ...)
{
unsigned int filter = SHOW_MEM_FILTER_NODES;

Expand Down Expand Up @@ -2177,7 +2177,7 @@ void warn_alloc_failed(gfp_t gfp_mask, int order, const char *fmt, ...)
va_end(args);
}

pr_warn("%s: page allocation failure: order:%d, mode:0x%x\n",
pr_warn("%s: page allocation failure: order:%u, mode:0x%x\n",
current->comm, order, gfp_mask);

dump_stack();
Expand Down Expand Up @@ -2950,7 +2950,8 @@ void free_kmem_pages(unsigned long addr, unsigned int order)
}
}

static void *make_alloc_exact(unsigned long addr, unsigned order, size_t size)
static void *make_alloc_exact(unsigned long addr, unsigned int order,
size_t size)
{
if (addr) {
unsigned long alloc_end = addr + (PAGE_SIZE << order);
Expand Down Expand Up @@ -3002,7 +3003,7 @@ EXPORT_SYMBOL(alloc_pages_exact);
*/
void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask)
{
unsigned order = get_order(size);
unsigned int order = get_order(size);
struct page *p = alloc_pages_node(nid, gfp_mask, order);
if (!p)
return NULL;
Expand Down Expand Up @@ -3301,7 +3302,8 @@ void show_free_areas(unsigned int filter)
}

for_each_populated_zone(zone) {
unsigned long nr[MAX_ORDER], flags, order, total = 0;
unsigned int order;
unsigned long nr[MAX_ORDER], flags, total = 0;
unsigned char types[MAX_ORDER];

if (skip_free_areas_node(filter, zone_to_nid(zone)))
Expand Down Expand Up @@ -3650,7 +3652,7 @@ static void build_zonelists(pg_data_t *pgdat)
nodemask_t used_mask;
int local_node, prev_node;
struct zonelist *zonelist;
int order = current_zonelist_order;
unsigned int order = current_zonelist_order;

/* initialize zonelists */
for (i = 0; i < MAX_ZONELISTS; i++) {
Expand Down Expand Up @@ -6321,7 +6323,8 @@ int alloc_contig_range(unsigned long start, unsigned long end,
unsigned migratetype)
{
unsigned long outer_start, outer_end;
int ret = 0, order;
unsigned int order;
int ret = 0;

struct compact_control cc = {
.nr_migratepages = 0,
Expand Down

0 comments on commit 972c6ab

Please sign in to comment.