|
@@ -2600,74 +2600,104 @@ static inline void zone_statistics(struct zone *preferred_zone, struct zone *z)
|
|
#endif
|
|
#endif
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+/* Remove page from the per-cpu list, caller must protect the list */
|
|
|
|
+static struct page *__rmqueue_pcplist(struct zone *zone, int migratetype,
|
|
|
|
+ bool cold, struct per_cpu_pages *pcp,
|
|
|
|
+ struct list_head *list)
|
|
|
|
+{
|
|
|
|
+ struct page *page;
|
|
|
|
+
|
|
|
|
+ do {
|
|
|
|
+ if (list_empty(list)) {
|
|
|
|
+ pcp->count += rmqueue_bulk(zone, 0,
|
|
|
|
+ pcp->batch, list,
|
|
|
|
+ migratetype, cold);
|
|
|
|
+ if (unlikely(list_empty(list)))
|
|
|
|
+ return NULL;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if (cold)
|
|
|
|
+ page = list_last_entry(list, struct page, lru);
|
|
|
|
+ else
|
|
|
|
+ page = list_first_entry(list, struct page, lru);
|
|
|
|
+
|
|
|
|
+ list_del(&page->lru);
|
|
|
|
+ pcp->count--;
|
|
|
|
+ } while (check_new_pcp(page));
|
|
|
|
+
|
|
|
|
+ return page;
|
|
|
|
+}
|
|
|
|
+
|
|
|
|
+/* Lock and remove page from the per-cpu list */
|
|
|
|
+static struct page *rmqueue_pcplist(struct zone *preferred_zone,
|
|
|
|
+ struct zone *zone, unsigned int order,
|
|
|
|
+ gfp_t gfp_flags, int migratetype)
|
|
|
|
+{
|
|
|
|
+ struct per_cpu_pages *pcp;
|
|
|
|
+ struct list_head *list;
|
|
|
|
+ bool cold = ((gfp_flags & __GFP_COLD) != 0);
|
|
|
|
+ struct page *page;
|
|
|
|
+ unsigned long flags;
|
|
|
|
+
|
|
|
|
+ local_irq_save(flags);
|
|
|
|
+ pcp = &this_cpu_ptr(zone->pageset)->pcp;
|
|
|
|
+ list = &pcp->lists[migratetype];
|
|
|
|
+ page = __rmqueue_pcplist(zone, migratetype, cold, pcp, list);
|
|
|
|
+ if (page) {
|
|
|
|
+ __count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
|
|
|
|
+ zone_statistics(preferred_zone, zone);
|
|
|
|
+ }
|
|
|
|
+ local_irq_restore(flags);
|
|
|
|
+ return page;
|
|
|
|
+}
|
|
|
|
+
|
|
/*
|
|
/*
|
|
* Allocate a page from the given zone. Use pcplists for order-0 allocations.
|
|
* Allocate a page from the given zone. Use pcplists for order-0 allocations.
|
|
*/
|
|
*/
|
|
static inline
|
|
static inline
|
|
-struct page *buffered_rmqueue(struct zone *preferred_zone,
|
|
|
|
|
|
+struct page *rmqueue(struct zone *preferred_zone,
|
|
struct zone *zone, unsigned int order,
|
|
struct zone *zone, unsigned int order,
|
|
gfp_t gfp_flags, unsigned int alloc_flags,
|
|
gfp_t gfp_flags, unsigned int alloc_flags,
|
|
int migratetype)
|
|
int migratetype)
|
|
{
|
|
{
|
|
unsigned long flags;
|
|
unsigned long flags;
|
|
struct page *page;
|
|
struct page *page;
|
|
- bool cold = ((gfp_flags & __GFP_COLD) != 0);
|
|
|
|
|
|
|
|
if (likely(order == 0)) {
|
|
if (likely(order == 0)) {
|
|
- struct per_cpu_pages *pcp;
|
|
|
|
- struct list_head *list;
|
|
|
|
-
|
|
|
|
- local_irq_save(flags);
|
|
|
|
- do {
|
|
|
|
- pcp = &this_cpu_ptr(zone->pageset)->pcp;
|
|
|
|
- list = &pcp->lists[migratetype];
|
|
|
|
- if (list_empty(list)) {
|
|
|
|
- pcp->count += rmqueue_bulk(zone, 0,
|
|
|
|
- pcp->batch, list,
|
|
|
|
- migratetype, cold);
|
|
|
|
- if (unlikely(list_empty(list)))
|
|
|
|
- goto failed;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if (cold)
|
|
|
|
- page = list_last_entry(list, struct page, lru);
|
|
|
|
- else
|
|
|
|
- page = list_first_entry(list, struct page, lru);
|
|
|
|
-
|
|
|
|
- list_del(&page->lru);
|
|
|
|
- pcp->count--;
|
|
|
|
|
|
+ page = rmqueue_pcplist(preferred_zone, zone, order,
|
|
|
|
+ gfp_flags, migratetype);
|
|
|
|
+ goto out;
|
|
|
|
+ }
|
|
|
|
|
|
- } while (check_new_pcp(page));
|
|
|
|
- } else {
|
|
|
|
- /*
|
|
|
|
- * We most definitely don't want callers attempting to
|
|
|
|
- * allocate greater than order-1 page units with __GFP_NOFAIL.
|
|
|
|
- */
|
|
|
|
- WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
|
|
|
|
- spin_lock_irqsave(&zone->lock, flags);
|
|
|
|
|
|
+ /*
|
|
|
|
+ * We most definitely don't want callers attempting to
|
|
|
|
+ * allocate greater than order-1 page units with __GFP_NOFAIL.
|
|
|
|
+ */
|
|
|
|
+ WARN_ON_ONCE((gfp_flags & __GFP_NOFAIL) && (order > 1));
|
|
|
|
+ spin_lock_irqsave(&zone->lock, flags);
|
|
|
|
|
|
- do {
|
|
|
|
- page = NULL;
|
|
|
|
- if (alloc_flags & ALLOC_HARDER) {
|
|
|
|
- page = __rmqueue_smallest(zone, order, MIGRATE_HIGHATOMIC);
|
|
|
|
- if (page)
|
|
|
|
- trace_mm_page_alloc_zone_locked(page, order, migratetype);
|
|
|
|
- }
|
|
|
|
- if (!page)
|
|
|
|
- page = __rmqueue(zone, order, migratetype);
|
|
|
|
- } while (page && check_new_pages(page, order));
|
|
|
|
- spin_unlock(&zone->lock);
|
|
|
|
|
|
+ do {
|
|
|
|
+ page = NULL;
|
|
|
|
+ if (alloc_flags & ALLOC_HARDER) {
|
|
|
|
+ page = __rmqueue_smallest(zone, order, MIGRATE_HIGHATOMIC);
|
|
|
|
+ if (page)
|
|
|
|
+ trace_mm_page_alloc_zone_locked(page, order, migratetype);
|
|
|
|
+ }
|
|
if (!page)
|
|
if (!page)
|
|
- goto failed;
|
|
|
|
- __mod_zone_freepage_state(zone, -(1 << order),
|
|
|
|
- get_pcppage_migratetype(page));
|
|
|
|
- }
|
|
|
|
|
|
+ page = __rmqueue(zone, order, migratetype);
|
|
|
|
+ } while (page && check_new_pages(page, order));
|
|
|
|
+ spin_unlock(&zone->lock);
|
|
|
|
+ if (!page)
|
|
|
|
+ goto failed;
|
|
|
|
+ __mod_zone_freepage_state(zone, -(1 << order),
|
|
|
|
+ get_pcppage_migratetype(page));
|
|
|
|
|
|
__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
|
|
__count_zid_vm_events(PGALLOC, page_zonenum(page), 1 << order);
|
|
zone_statistics(preferred_zone, zone);
|
|
zone_statistics(preferred_zone, zone);
|
|
local_irq_restore(flags);
|
|
local_irq_restore(flags);
|
|
|
|
|
|
- VM_BUG_ON_PAGE(bad_range(zone, page), page);
|
|
|
|
|
|
+out:
|
|
|
|
+ VM_BUG_ON_PAGE(page && bad_range(zone, page), page);
|
|
return page;
|
|
return page;
|
|
|
|
|
|
failed:
|
|
failed:
|
|
@@ -2972,7 +3002,7 @@ get_page_from_freelist(gfp_t gfp_mask, unsigned int order, int alloc_flags,
|
|
}
|
|
}
|
|
|
|
|
|
try_this_zone:
|
|
try_this_zone:
|
|
- page = buffered_rmqueue(ac->preferred_zoneref->zone, zone, order,
|
|
|
|
|
|
+ page = rmqueue(ac->preferred_zoneref->zone, zone, order,
|
|
gfp_mask, alloc_flags, ac->migratetype);
|
|
gfp_mask, alloc_flags, ac->migratetype);
|
|
if (page) {
|
|
if (page) {
|
|
prep_new_page(page, order, gfp_mask, alloc_flags);
|
|
prep_new_page(page, order, gfp_mask, alloc_flags);
|