xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop flex_arrays

Browse Source 
All existing users have been converted to generic radix trees

Link: http://lkml.kernel.org/r/20181217131929.11727-8-kent.overstreet@gmail.com
Signed-off-by: Kent Overstreet <kent.overstreet@gmail.com>
Acked-by: Dave Hansen <dave.hansen@intel.com>
Cc: Alexey Dobriyan <adobriyan@gmail.com>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Eric Paris <eparis@parisplace.org>
Cc: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Neil Horman <nhorman@tuxdriver.com>
Cc: Paul Moore <paul@paul-moore.com>
Cc: Pravin B Shelar <pshelar@ovn.org>
Cc: Shaohua Li <shli@kernel.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Kent Overstreet
2019-03-11 23:31:26 -07:00
committed by Linus Torvalds
parent 2075e50caf
commit 586187d7de
7 changed files with 1 additions and 807 deletions
Download Patch File Download Diff File Expand all files Collapse all files

149
include/linux/flex_array.h
View File

@@ -1,149 +0,0 @@
/* SPDX-License-Identifier: GPL-2.0 */
#ifndef _FLEX_ARRAY_H
#define _FLEX_ARRAY_H
#include <linux/types.h>
#include <linux/reciprocal_div.h>
#include <asm/page.h>
#define FLEX_ARRAY_PART_SIZE PAGE_SIZE
#define FLEX_ARRAY_BASE_SIZE PAGE_SIZE
struct flex_array_part;
/*
* This is meant to replace cases where an array-like
* structure has gotten too big to fit into kmalloc()
* and the developer is getting tempted to use
* vmalloc().
*/
struct flex_array {
union {
struct {
int element_size;
int total_nr_elements;
int elems_per_part;
struct reciprocal_value reciprocal_elems;
struct flex_array_part *parts[];
};
/*
* This little trick makes sure that
* sizeof(flex_array) == PAGE_SIZE
*/
char padding[FLEX_ARRAY_BASE_SIZE];
};
};
/* Number of bytes left in base struct flex_array, excluding metadata */
#define FLEX_ARRAY_BASE_BYTES_LEFT \
(FLEX_ARRAY_BASE_SIZE - offsetof(struct flex_array, parts))
/* Number of pointers in base to struct flex_array_part pages */
#define FLEX_ARRAY_NR_BASE_PTRS \
(FLEX_ARRAY_BASE_BYTES_LEFT / sizeof(struct flex_array_part *))
/* Number of elements of size that fit in struct flex_array_part */
#define FLEX_ARRAY_ELEMENTS_PER_PART(size) \
(FLEX_ARRAY_PART_SIZE / size)
/*
* Defines a statically allocated flex array and ensures its parameters are
* valid.
*/
#define DEFINE_FLEX_ARRAY(__arrayname, __element_size, __total) \
struct flex_array __arrayname = { { { \
.element_size = (__element_size), \
.total_nr_elements = (__total), \
} } }; \
static inline void __arrayname##_invalid_parameter(void) \
{ \
BUILD_BUG_ON((__total) > FLEX_ARRAY_NR_BASE_PTRS * \
FLEX_ARRAY_ELEMENTS_PER_PART(__element_size)); \
}
/**
* flex_array_alloc() - Creates a flexible array.
* @element_size: individual object size.
* @total: maximum number of objects which can be stored.
* @flags: GFP flags
*
* Return: Returns an object of structure flex_array.
*/
struct flex_array *flex_array_alloc(int element_size, unsigned int total,
gfp_t flags);
/**
* flex_array_prealloc() - Ensures that memory for the elements indexed in the
* range defined by start and nr_elements has been allocated.
* @fa: array to allocate memory to.
* @start: start address
* @nr_elements: number of elements to be allocated.
* @flags: GFP flags
*
*/
int flex_array_prealloc(struct flex_array *fa, unsigned int start,
unsigned int nr_elements, gfp_t flags);
/**
* flex_array_free() - Removes all elements of a flexible array.
* @fa: array to be freed.
*/
void flex_array_free(struct flex_array *fa);
/**
* flex_array_free_parts() - Removes all elements of a flexible array, but
* leaves the array itself in place.
* @fa: array to be emptied.
*/
void flex_array_free_parts(struct flex_array *fa);
/**
* flex_array_put() - Stores data into a flexible array.
* @fa: array where element is to be stored.
* @element_nr: position to copy, must be less than the maximum specified when
* the array was created.
* @src: data source to be copied into the array.
* @flags: GFP flags
*
* Return: Returns zero on success, a negative error code otherwise.
*/
int flex_array_put(struct flex_array *fa, unsigned int element_nr, void *src,
gfp_t flags);
/**
* flex_array_clear() - Clears an individual element in the array, sets the
* given element to FLEX_ARRAY_FREE.
* @element_nr: element position to clear.
* @fa: array to which element to be cleared belongs.
*
* Return: Returns zero on success, -EINVAL otherwise.
*/
int flex_array_clear(struct flex_array *fa, unsigned int element_nr);
/**
* flex_array_get() - Retrieves data into a flexible array.
*
* @element_nr: Element position to retrieve data from.
* @fa: array from which data is to be retrieved.
*
* Return: Returns a pointer to the data element, or NULL if that
* particular element has never been allocated.
*/
void *flex_array_get(struct flex_array *fa, unsigned int element_nr);
/**
* flex_array_shrink() - Reduces the allocated size of an array.
* @fa: array to shrink.
*
* Return: Returns number of pages of memory actually freed.
*
*/
int flex_array_shrink(struct flex_array *fa);
#define flex_array_put_ptr(fa, nr, src, gfp) \
flex_array_put(fa, nr, (void *)&(src), gfp)
void *flex_array_get_ptr(struct flex_array *fa, unsigned int element_nr);
#endif /* _FLEX_ARRAY_H */

3
include/linux/poison.h
View File

@@ -83,9 +83,6 @@
#define MUTEX_DEBUG_FREE 0x22
#define MUTEX_POISON_WW_CTX ((void *) 0x500 + POISON_POINTER_DELTA)
/********** lib/flex_array.c **********/
#define FLEX_ARRAY_FREE 0x6c /* for use-after-free poisoning */
/********** security/ **********/
#define KEY_DESTROY 0xbd