xmalloc patches
v3 cover xmalloc patches
These are the remaining patches to xmalloc_tlsf.c that stem from debugging the problem that led to commit 56ad6265 "x86/msi: fix loop termination condition in pci_msi_conf_write_intercept()".
Paul Durrant (2):
xmalloc: remove struct xmem_pool init_region
xmalloc: add a Kconfig option to poison free pool memory
xen/Kconfig.debug | 7 ++++++ xen/common/string.c | 20 +++++++++++++++++ xen/common/xmalloc_tlsf.c | 46 ++++++++++++++------------------------- xen/include/xen/string.h | 2 ++ xen/include/xen/xmalloc.h | 2 -- 5 files changed, 45 insertions(+), 32 deletions(-)
---
v3:
- Extra note on patch #1 commit comment
- Couple of fixes to patch #2
v2:
- Patch #1 of v1 of the series already commmitted, so dropped
- New patch #1 (old patch #2) now removes the init_region
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 1/2 xmalloc: remove struct xmem_pool init_region
This patch dispenses with the init_region. It's simply not necessary (pools will still happily grow and shrink on demand in its absence) and the code can be shortended by removing it. It also avoids the sole evaluation of ADD_REGION without holding the pool lock (which is unsafe).
NOTE: The if statement that is removed from xmem_pool_destroy() has actually
been bogus since commit 6009f4dd "Transcendent memory ("tmem") for Xen." when the allocation of the init_region was moved out of xmem_pool_create().
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
v2:
- remove init_region instead of fixing the locking
--- xen/common/xmalloc_tlsf.c | 34 ++++------------------------------ xen/include/xen/xmalloc.h | 2 -- 2 files changed, 4 insertions(+), 32 deletions(-)
xen/common/xmalloc_tlsf.c +4 -30
@@ -101,7 +101,6 @@ struct xmem_pool {spinlock_t lock; -unsigned long init_size;unsigned long max_size;unsigned long grow_size;
@@ -115,7 +114,6 @@ struct xmem_pool {struct list_head list; -void *init_region;char name[MAX_POOL_NAME_LEN ]; };
@@ -287,14 +285,13 @@ struct xmem_pool *xmem_pool_create(const char *name, xmem_pool_get_memory get_mem, xmem_pool_put_memory put_mem, - unsigned long init_size, unsigned long max_size, unsigned long grow_size) { struct xmem_pool *pool;int pool_bytes, pool_order; -BUG_ON (max_size && (max_size < init_size)); +BUG_ON (max_size && (max_size < grow_size)); pool_bytes =ROUNDUP_SIZE (sizeof (*pool)); pool_order =get_order_from_bytes (pool_bytes);
@@ -305,23 +302,18 @@ struct xmem_pool *xmem_pool_create(memset (pool,0 , pool_bytes);/* Round to next page boundary */ - init_size =ROUNDUP_PAGE (init_size); max_size =ROUNDUP_PAGE (max_size); grow_size =ROUNDUP_PAGE (grow_size);/* pool global overhead not included in used size */ pool->used_size =0 ; - pool->init_size = init_size; pool->max_size = max_size; pool->grow_size = grow_size; pool->get_mem = get_mem; pool->put_mem = put_mem;strlcpy (pool->name, name,sizeof (pool->name)); -/* always obtain init_region lazily now to ensure it is get_mem'd -* in the same "context" as all other regions */ -spin_lock_init (&pool->lock);spin_lock (&pool_list_lock);
@@ -340,7 +332,6 @@ unsigned long xmem_pool_get_total_size(struct xmem_pool *pool) {unsigned long total; total =ROUNDUP_SIZE (sizeof (*pool)) - + pool->init_size + (pool->num_regions -1 ) * pool->grow_size;return total; }
@@ -352,13 +343,6 @@ void xmem_pool_destroy(struct xmem_pool *pool)if ( pool ==NULL )return ; -/* User is destroying without ever allocating from this pool */ -if (xmem_pool_get_used_size (pool) ==BHDR_OVERHEAD ) - { -ASSERT (!pool->init_region); - pool->used_size -=BHDR_OVERHEAD ; - } -/* Check for memory leaks in this pool */ if (xmem_pool_get_used_size (pool) ) printk("memory leak in pool: %s (%p). "
@@ -380,14 +364,6 @@ void *xmem_pool_alloc(unsigned long size, struct xmem_pool *pool)int fl, sl;unsigned long tmp_size; -if ( pool->init_region ==NULL ) - { -if ( (region = pool->get_mem (pool->init_size)) ==NULL ) - goto out; -ADD_REGION (region, pool->init_size, pool); - pool->init_region = region; - } - size = (size <MIN_BLOCK_SIZE ) ?MIN_BLOCK_SIZE :ROUNDUP_SIZE (size);/* Rounding up the requested size and calculating fl and sl */
@@ -401,8 +377,7 @@ void *xmem_pool_alloc(unsigned long size, struct xmem_pool *pool)/* Not found */ if ( size > (pool->grow_size -2 *BHDR_OVERHEAD ) ) goto out_locked; -if ( pool->max_size && (pool->init_size + - pool->num_regions * pool->grow_size +if ( pool->max_size && (pool->num_regions * pool->grow_size > pool->max_size) ) goto out_locked;spin_unlock (&pool->lock);
@@ -551,9 +526,8 @@ static void *xmalloc_whole_pages(unsigned long size, unsigned long align)static void tlsf_init (void ) { - xenpool =xmem_pool_create ( -"xmalloc" , xmalloc_pool_get, xmalloc_pool_put, -PAGE_SIZE ,0 ,PAGE_SIZE ); + xenpool =xmem_pool_create ("xmalloc" , xmalloc_pool_get, + xmalloc_pool_put,0 ,PAGE_SIZE );BUG_ON (!xenpool); }
xen/include/xen/xmalloc.h +0 -2
@@ -84,7 +84,6 @@ typedef void (xmem_pool_put_memory)(void *ptr);* @name: name of the pool * @get_mem: callback function used to expand pool * @put_mem: callback function used to shrink pool -* @init_size: inital pool size (in bytes) * @max_size: maximum pool size (in bytes) - set this as 0 for no limit * @grow_size: amount of memory (in bytes) added to pool whenever required *
@@ -94,7 +93,6 @@ struct xmem_pool *xmem_pool_create(const char *name, xmem_pool_get_memory get_mem, xmem_pool_put_memory put_mem, - unsigned long init_size, unsigned long max_size, unsigned long grow_size);
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH v3 2/2 xmalloc: add a Kconfig option to poison free pool memory
In reply to Paul DurrantThis patch adds XMEM_POOL_POISON to the Kconfig DEBUG options. If set, free blocks (greater than MIN_BLOCK_SIZE) will be poisoned with 0xAA bytes which will then be verified when memory is subsequently allocated. This can help in spotting heap corruption, particularly use-after-free.
---
Cc: Andrew Cooper <[email protected]>
Cc: George Dunlap <[email protected]>
Cc: Ian Jackson <[email protected]>
Cc: Jan Beulich <[email protected]>
Cc: Julien Grall <[email protected]>
Cc: Konrad Rzeszutek Wilk <[email protected]>
Cc: Stefano Stabellini <[email protected]>
Cc: Tim Deegan <[email protected]>
Cc: Wei Liu <[email protected]>
v3:
- #define the POISON_BYTE
- Fix whitespace in Kconfig.debug
v2:
- Change Kconfig option name to XMEM_POOL_POISON
- Add an implementation of memchr_inv() and use that
--- xen/Kconfig.debug | 7 +++++++ xen/common/string.c | 20 ++++++++++++++++++++ xen/common/xmalloc_tlsf.c | 12 ++++++++++++ xen/include/xen/string.h | 2 ++ 4 files changed, 41 insertions(+)
xen/Kconfig.debug +7 -0
@@ -105,6 +105,13 @@ config DEBUG_TRACE either directly to the console or are printed to console in case of a system crash. +config XMEM_POOL_POISON + bool "Poison free xenpool blocks" + default DEBUG + ---help--- + Poison free blocks with 0xAA bytes and verify them when a block is + allocated in order to spot use-after-free issues. + endif # DEBUG || EXPERT endmenu
xen/common/string.c +20 -0
@@ -423,6 +423,26 @@ void *(memchr)(const void *s, int c, size_t n) }#endif +/** +* memchr_inv - Find an unmatching character in an area of memory. +* @s: The memory area +* @c: The byte that is expected +* @n: The size of the area. +* +* returns the address of the first occurrence of a character other than @c, +* or %NULL if the whole buffer contains just @c. +*/ +void *memchr_inv (const void *s,int c,size_t n) +{ +const unsigned char *p = s; + +while (n--) +if ((unsigned char )c != *p++) +return (void *)(p -1 ); + +return NULL ; +} +/* * Local variables: * mode: C
xen/common/xmalloc_tlsf.c +12 -0
@@ -215,6 +215,8 @@ static inline void EXTRACT_BLOCK_HDR(struct bhdr *b, struct xmem_pool *p, int fl b->ptr.free_ptr = (struct free_ptr ) {NULL ,NULL }; } +#define POISON_BYTE 0xAA +/** * Removes block(b) from free list with indexes (fl, sl) */
@@ -238,6 +240,11 @@ static inline void EXTRACT_BLOCK(struct bhdr *b, struct xmem_pool *p, int fl, } } b->ptr.free_ptr = (struct free_ptr ) {NULL ,NULL }; +#ifdef CONFIG_XMEM_POOL_POISON +if ( (b->size &BLOCK_SIZE_MASK ) >MIN_BLOCK_SIZE ) +ASSERT (!memchr_inv (b->ptr.buffer +MIN_BLOCK_SIZE ,POISON_BYTE , + (b->size &BLOCK_SIZE_MASK ) -MIN_BLOCK_SIZE )); +#endif /* CONFIG_XMEM_POOL_POISON */ }/**
@@ -245,6 +252,11 @@ static inline void EXTRACT_BLOCK(struct bhdr *b, struct xmem_pool *p, int fl,*/ static inline void INSERT_BLOCK (struct bhdr *b,struct xmem_pool *p,int fl,int sl) { +#ifdef CONFIG_XMEM_POOL_POISON +if ( (b->size &BLOCK_SIZE_MASK ) >MIN_BLOCK_SIZE ) +memset (b->ptr.buffer +MIN_BLOCK_SIZE ,POISON_BYTE , + (b->size &BLOCK_SIZE_MASK ) -MIN_BLOCK_SIZE ); +#endif /* CONFIG_XMEM_POOL_POISON */ b->ptr.free_ptr = (struct free_ptr ) {NULL , p->matrix[fl][sl]};if ( p->matrix[fl][sl] ) p->matrix[fl][sl]->ptr.free_ptr.prev = b;
xen/include/xen/string.h +2 -0
@@ -106,6 +106,8 @@ void *memchr(const void *, int, size_t);#define memchr (s, c, n) __builtin_memchr(s, c, n)#endif +void *memchr_inv (const void *,int ,size_t ); +#define is_char_array (x) __builtin_types_compatible_p(typeof(x), char[])/* safe_xxx always NUL-terminates and returns !=0 if result is truncated. */
Signature · 7 lines
2.20.1.2.gb21ebb671 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/2] xmalloc: add a Kconfig option to poison free pool memory
Quoted 6 lines · Paul Durrant
This patch adds
XMEM_POOL_POISONto theKconfigDEBUG options. If set, free blocks (greater thanMIN_BLOCK_SIZE) will be poisoned with0xAAbytes which will then be verified when memory is subsequently allocated. This can help in spotting heap corruption, particularly use-after-free.Signed-off-by Paul Durrant <[email protected]>
(I'm pondering whether to add the suggested blank lines while committing.)
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
Re: [Xen-devel] [PATCH v3 2/2] xmalloc: add a Kconfig option to poison free pool memory
Quoted 16 lines
-----Original Message-----
From: Jan Beulich <[email protected]>
Sent: 05 July 2019 15:52
To: Paul Durrant <[email protected]>
Cc: [email protected]; Julien Grall <[email protected]>; Andrew Cooper <[email protected]>; George Dunlap <[email protected]>; Ian Jackson <[email protected]>; Stefano Stabellini <[email protected]>; Konrad Rzeszutek Wilk <[email protected]>; Tim (Xen.org) <[email protected]>; Wei Liu <[email protected]>
Subject: Re: [PATCH v3 2/2] xmalloc: add aKconfigoption to poison free pool memoryQuoted 5 lines · Paul Durrant
This patch adds
XMEM_POOL_POISONto theKconfigDEBUG options. If set, free blocks (greater thanMIN_BLOCK_SIZE) will be poisoned with0xAAbytes which will then be verified when memory is subsequently allocated. This can help in spotting heap corruption, particularly use-after-free.
Quoted 6 lines
Quoted 1 line
Signed-off-by Paul Durrant <[email protected]>Reviewed-by Jan Beulich <[email protected]>(I'm pondering whether to add the suggested blank lines while committing.)
Oh, sorry. I forgot about that.
Paul
_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel