From aa25a952ea2b19a081fa746f043228c270f43f94 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 11 May 2015 19:28:11 -0700 Subject: Revert "gpu: nvgpu: New allocator for VA space" This reverts commit 2e235ac150fa4af8632c9abf0f109a10973a0bf5. Change-Id: I3aa745152124c2bc09c6c6dc5aeb1084ae7e08a4 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/741469 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Hiroshi Doyu Tested-by: Hiroshi Doyu --- drivers/gpu/nvgpu/gk20a/gk20a_allocator.h | 213 +++++++----------------------- 1 file changed, 49 insertions(+), 164 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/gk20a_allocator.h') diff --git a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h index e86e053b..69a227bd 100644 --- a/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h +++ b/drivers/gpu/nvgpu/gk20a/gk20a_allocator.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011-2015, NVIDIA CORPORATION. All rights reserved. + * Copyright (c) 2011-2014, NVIDIA CORPORATION. All rights reserved. * * This program is free software; you can redistribute it and/or modify it * under the terms and conditions of the GNU General Public License, @@ -17,190 +17,75 @@ #ifndef GK20A_ALLOCATOR_H #define GK20A_ALLOCATOR_H -#include #include -#include -#include +#include +#include /* #define ALLOCATOR_DEBUG */ -/* - * Each buddy is an element in a binary tree. - */ -struct gk20a_buddy { - struct gk20a_buddy *parent; /* Parent node. */ - struct gk20a_buddy *buddy; /* This node's buddy. */ - struct gk20a_buddy *left; /* Lower address sub-node. */ - struct gk20a_buddy *right; /* Higher address sub-node. */ - - struct list_head buddy_entry; /* List entry for various lists. */ - struct rb_node alloced_entry; /* RB tree of allocations. */ - - u64 start; /* Start address of this buddy. */ - u64 end; /* End address of this buddy. */ - u64 order; /* Buddy order. */ - -#define BALLOC_BUDDY_ALLOCED 0x1 -#define BALLOC_BUDDY_SPLIT 0x2 -#define BALLOC_BUDDY_IN_LIST 0x4 - int flags; /* List of associated flags. */ - - /* - * Size of the PDE this buddy is using. This allows for grouping like - * sized allocations into the same PDE. - */ -#define BALLOC_PTE_SIZE_ANY 0x0 -#define BALLOC_PTE_SIZE_SMALL 0x1 -#define BALLOC_PTE_SIZE_BIG 0x2 - int pte_size; -}; - -#define __buddy_flag_ops(flag, flag_up) \ - static inline int buddy_is_ ## flag(struct gk20a_buddy *b) \ - { \ - return b->flags & BALLOC_BUDDY_ ## flag_up; \ - } \ - static inline void buddy_set_ ## flag(struct gk20a_buddy *b) \ - { \ - b->flags |= BALLOC_BUDDY_ ## flag_up; \ - } \ - static inline void buddy_clr_ ## flag(struct gk20a_buddy *b) \ - { \ - b->flags &= ~BALLOC_BUDDY_ ## flag_up; \ - } - -/* - * int buddy_is_alloced(struct gk20a_buddy *b); - * void buddy_set_alloced(struct gk20a_buddy *b); - * void buddy_clr_alloced(struct gk20a_buddy *b); - * - * int buddy_is_split(struct gk20a_buddy *b); - * void buddy_set_split(struct gk20a_buddy *b); - * void buddy_clr_split(struct gk20a_buddy *b); - * - * int buddy_is_in_list(struct gk20a_buddy *b); - * void buddy_set_in_list(struct gk20a_buddy *b); - * void buddy_clr_in_list(struct gk20a_buddy *b); - */ -__buddy_flag_ops(alloced, ALLOCED); -__buddy_flag_ops(split, SPLIT); -__buddy_flag_ops(in_list, IN_LIST); - -/* - * Keeps info for a fixed allocation. - */ -struct gk20a_fixed_alloc { - struct list_head buddies; /* List of buddies. */ - struct rb_node alloced_entry; /* RB tree of fixed allocations. */ - - u64 start; /* Start of fixed block. */ - u64 end; /* End address. */ -}; - -struct vm_gk20a; - -/* - * GPU buddy allocator for the various GPU address spaces. Each addressable unit - * doesn't have to correspond to a byte. In some cases each unit is a more - * complex object such as a comp_tag line or the like. - * - * The max order is computed based on the size of the minimum order and the size - * of the address space. - * - * order_size is the size of an order 0 buddy. - */ +/* main struct */ struct gk20a_allocator { - struct vm_gk20a *vm; /* Parent VM - can be NULL. */ - - char name[32]; /* Name of allocator. */ - - u64 base; /* Base address of the space. */ - u64 length; /* Length of the space. */ - u64 blk_size; /* Size of order 0 allocation. */ - u64 blk_shift; /* Shift to divide by blk_size. */ - - int init; /* Non-zero if initialized. */ + char name[32]; /* name for allocator */ + struct rb_root rb_root; /* rb tree root for blocks */ - /* Internal stuff. */ - u64 start; /* Real start (aligned to blk_size). */ - u64 end; /* Real end, trimmed if needed. */ - u64 count; /* Count of objects in space. */ - u64 blks; /* Count of blks in the space. */ - u64 max_order; /* Specific maximum order. */ + u32 base; /* min value of this linear space */ + u32 limit; /* max value = limit - 1 */ - struct rb_root alloced_buddies; /* Outstanding allocations. */ - struct rb_root fixed_allocs; /* Outstanding fixed allocations. */ + unsigned long *bitmap; /* bitmap */ - struct mutex lock; /* Protects buddy access. */ + struct gk20a_alloc_block *block_first; /* first block in list */ + struct gk20a_alloc_block *block_recent; /* last visited block */ -#define GPU_BALLOC_GVA_SPACE 0x1 - u64 flags; + u32 first_free_addr; /* first free addr, non-contigous + allocation preferred start, + in order to pick up small holes */ + u32 last_free_addr; /* last free addr, contiguous + allocation preferred start */ + u32 cached_hole_size; /* max free hole size up to + last_free_addr */ + u32 block_count; /* number of blocks */ - /* - * Impose an upper bound on the maximum order. - */ -#define GPU_BALLOC_MAX_ORDER 31 -#define GPU_BALLOC_ORDER_LIST_LEN (GPU_BALLOC_MAX_ORDER + 1) + struct rw_semaphore rw_sema; /* lock */ + struct kmem_cache *block_cache; /* slab cache */ - struct list_head buddy_list[GPU_BALLOC_ORDER_LIST_LEN]; - u64 buddy_list_len[GPU_BALLOC_ORDER_LIST_LEN]; - u64 buddy_list_split[GPU_BALLOC_ORDER_LIST_LEN]; - u64 buddy_list_alloced[GPU_BALLOC_ORDER_LIST_LEN]; + /* if enabled, constrain to [base, limit) */ + struct { + bool enable; + u32 base; + u32 limit; + } constraint; - /* - * This is for when the allocator is managing a GVA space (the - * GPU_BALLOC_GVA_SPACE bit is set in @flags). This requires - * that we group like sized allocations into PDE blocks. - */ - u64 pte_blk_order; + int (*alloc)(struct gk20a_allocator *allocator, + u32 *addr, u32 len, u32 align); + int (*free)(struct gk20a_allocator *allocator, + u32 addr, u32 len, u32 align); - struct dentry *debugfs_entry; - - u64 bytes_alloced; - u64 bytes_alloced_real; - u64 bytes_freed; }; -#define balloc_lock(a) mutex_lock(&(a)->lock) -#define balloc_unlock(a) mutex_unlock(&(a)->lock) +int gk20a_allocator_init(struct gk20a_allocator *allocator, + const char *name, u32 base, u32 size); +void gk20a_allocator_destroy(struct gk20a_allocator *allocator); -#define balloc_get_order_list(a, order) (&(a)->buddy_list[(order)]) -#define balloc_order_to_len(a, order) ((1 << order) * (a)->blk_size) -#define balloc_base_shift(a, base) ((base) - (a)->start) -#define balloc_base_unshift(a, base) ((base) + (a)->start) +int gk20a_allocator_block_alloc(struct gk20a_allocator *allocator, + u32 *addr, u32 len, u32 align); -int gk20a_allocator_init(struct gk20a_allocator *allocator, - const char *name, u64 base, u64 size, u64 order0); -int __gk20a_allocator_init(struct gk20a_allocator *allocator, - struct vm_gk20a *vm, const char *name, - u64 base, u64 size, u64 order0, - u64 max_order, u64 flags); -void gk20a_allocator_destroy(struct gk20a_allocator *allocator); +int gk20a_allocator_block_free(struct gk20a_allocator *allocator, + u32 addr, u32 len, u32 align); -/* - * Normal alloc/free operations for the buddy allocator. - */ -u64 gk20a_balloc(struct gk20a_allocator *allocator, u64 len); -void gk20a_bfree(struct gk20a_allocator *allocator, u64 addr); +#if defined(ALLOCATOR_DEBUG) -/* - * Special interface to allocate a memory regions with a specific starting - * address. Yikes. - */ -u64 gk20a_balloc_fixed(struct gk20a_allocator *allocator, u64 base, u64 len); +#define allocator_dbg(alloctor, format, arg...) \ +do { \ + if (1) \ + pr_debug("gk20a_allocator (%s) %s: " format "\n",\ + alloctor->name, __func__, ##arg);\ +} while (0) -/* - * Debugfs init. - */ -void gk20a_alloc_debugfs_init(struct platform_device *pdev); +#else /* ALLOCATOR_DEBUG */ -#if defined(ALLOCATOR_DEBUG) -#define balloc_dbg(alloctor, format, arg...) \ - pr_info("%-25s %25s() " format, \ - alloctor->name, __func__, ##arg) -#else -#define balloc_dbg(allocator, format, arg...) -#endif +#define allocator_dbg(format, arg...) + +#endif /* ALLOCATOR_DEBUG */ #endif /* GK20A_ALLOCATOR_H */ -- cgit v1.2.2