Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f40a12b3 authored by Isaac J. Manjarres's avatar Isaac J. Manjarres Committed by Sandeep Patil
Browse files

ANDROID: staging: android: ion: Decouple ION page pooling from ION core 



Since page pooling is compiled together with the system heap,
and it is the only user, page pooling should not be a part
of the ION core. Thus, separate it out as a library, and
give it its own interface.

Bug: 133508579
Test: ion-unit-tests
Change-Id: I95909d250fc37a401d9e23264cd27c78a2a74637
Signed-off-by: default avatarIsaac J. Manjarres <isaacm@codeaurora.org>
Signed-off-by: default avatarSandeep Patil <sspatil@google.com>
parent 1eb7cdb2

drivers/staging/android/ion/ion.h

+0 −51
Original line number Diff line number Diff line
@@ -257,55 +257,4 @@ size_t ion_heap_freelist_shrink(struct ion_heap *heap, 
 */

size_t ion_heap_freelist_size(struct ion_heap *heap);



/**

 * functions for creating and destroying a heap pool -- allows you

 * to keep a pool of pre allocated memory to use from your heap.  Keeping

 * a pool of memory that is ready for dma, ie any cached mapping have been

 * invalidated from the cache, provides a significant performance benefit on

 * many systems

 */



/**

 * struct ion_page_pool - pagepool struct

 * @high_count:		number of highmem items in the pool

 * @low_count:		number of lowmem items in the pool

 * @high_items:		list of highmem items

 * @low_items:		list of lowmem items

 * @mutex:		lock protecting this struct and especially the count

 *			item list

 * @gfp_mask:		gfp_mask to use from alloc

 * @order:		order of pages in the pool

 * @list:		plist node for list of pools

 *

 * Allows you to keep a pool of pre allocated pages to use from your heap.

 * Keeping a pool of pages that is ready for dma, ie any cached mapping have

 * been invalidated from the cache, provides a significant performance benefit

 * on many systems

 */

struct ion_page_pool {

	int high_count;

	int low_count;

	struct list_head high_items;

	struct list_head low_items;

	struct mutex mutex;

	gfp_t gfp_mask;

	unsigned int order;

	struct plist_node list;

};



struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order);

void ion_page_pool_destroy(struct ion_page_pool *pool);

struct page *ion_page_pool_alloc(struct ion_page_pool *pool);

void ion_page_pool_free(struct ion_page_pool *pool, struct page *page);



/** ion_page_pool_shrink - shrinks the size of the memory cached in the pool

 * @pool:		the pool

 * @gfp_mask:		the memory type to reclaim

 * @nr_to_scan:		number of items to shrink in pages

 *

 * returns the number of items freed in pages

 */

int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,

			 int nr_to_scan);



#endif /* _ION_H */

drivers/staging/android/ion/ion_page_pool.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
#include <linux/slab.h>

#include <linux/swap.h>



#include "ion.h"

#include "ion_page_pool.h"



static inline struct page *ion_page_pool_alloc_pages(struct ion_page_pool *pool)

{

drivers/staging/android/ion/ion_page_pool.h

0 → 100644
+66 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * ION Page Pool kernel interface header

 *

 * Copyright (C) 2011 Google, Inc.

 */



#ifndef _ION_PAGE_POOL_H

#define _ION_PAGE_POOL_H



#include <linux/mm_types.h>

#include <linux/mutex.h>

#include <linux/shrinker.h>

#include <linux/types.h>



/**

 * functions for creating and destroying a heap pool -- allows you

 * to keep a pool of pre allocated memory to use from your heap.  Keeping

 * a pool of memory that is ready for dma, ie any cached mapping have been

 * invalidated from the cache, provides a significant performance benefit on

 * many systems

 */



/**

 * struct ion_page_pool - pagepool struct

 * @high_count:		number of highmem items in the pool

 * @low_count:		number of lowmem items in the pool

 * @high_items:		list of highmem items

 * @low_items:		list of lowmem items

 * @mutex:		lock protecting this struct and especially the count

 *			item list

 * @gfp_mask:		gfp_mask to use from alloc

 * @order:		order of pages in the pool

 * @list:		plist node for list of pools

 *

 * Allows you to keep a pool of pre allocated pages to use from your heap.

 * Keeping a pool of pages that is ready for dma, ie any cached mapping have

 * been invalidated from the cache, provides a significant performance benefit

 * on many systems

 */

struct ion_page_pool {

	int high_count;

	int low_count;

	struct list_head high_items;

	struct list_head low_items;

	struct mutex mutex;

	gfp_t gfp_mask;

	unsigned int order;

	struct plist_node list;

};



struct ion_page_pool *ion_page_pool_create(gfp_t gfp_mask, unsigned int order);

void ion_page_pool_destroy(struct ion_page_pool *pool);

struct page *ion_page_pool_alloc(struct ion_page_pool *pool);

void ion_page_pool_free(struct ion_page_pool *pool, struct page *page);



/** ion_page_pool_shrink - shrinks the size of the memory cached in the pool

 * @pool:		the pool

 * @gfp_mask:		the memory type to reclaim

 * @nr_to_scan:		number of items to shrink in pages

 *

 * returns the number of items freed in pages

 */

int ion_page_pool_shrink(struct ion_page_pool *pool, gfp_t gfp_mask,

			 int nr_to_scan);

#endif /* _ION_PAGE_POOL_H */

drivers/staging/android/ion/ion_system_heap.c

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <linux/vmalloc.h>



#include "ion.h"

#include "ion_page_pool.h"



#define NUM_ORDERS ARRAY_SIZE(orders)