a4d5c09d6c
-----BEGIN PGP SIGNATURE----- iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAmBEqmIACgkQONu9yGCS aT6dGw//fFNF0dEARBdb1yhkxjkuQ/n+o2bDp74e8p3LWHqDA7Cu59gPa5lv22IR XOntbhUH/2XOgPqw/D4CRWo6Uh266Cmcf59cl4N9ysMV7mOsfCqQ5KqXEUIJv+tq nZ/voEFDfPpU0EapvJgpuuofKblUY/ryfLgnzc1t6z2UxEeqj499/4ouahcI+AvH p55IJfGLW1Qv4gz6P6iWCmDCo7BWzkxH4OkyQMTkGFd/EZ9s0VDMw5658dnwC0Av nuaR3IDMc1YUJkRZKDxbR/oMX1tokW+cgk10yi9NbCi0frx7qly8rFlIH09VuBL6 6zcSDaDXLbhU6rQYDsim9cxH6ZhsfpqrSOfD2DYzhApEq99GuakdQyMvLtADLCEb Yk/L3Wc+vVqBmmFb1gV2UTXzPim+S/QyAAl6MD6ButYxLTyQ93jySUs93/EYPnGh XJW6rekk5KMLg2ZSWe2o4Rj8D9LpnIKr/VETwr8rC3gmqtr1ojA/NC7Ix01UUOsw yumzsm3GjttfIjGPByVvrMNJ5iz7dIMYjTX/t7pgwcPiq1Gj6ZRyCg9JtjiryUm4 AYtf3NT09cC/nqUpX42JWmOvG1TVBB5/cQf9jhbyX3Cq3ieUp14WSm9SlVGwf6GQ y68qmnHKvftgKZpqebVzztrjfkXbs68O4U/IX5zYSCCoiIZgqDk= =7sUk -----END PGP SIGNATURE----- Merge 4.9.260 into android-4.9-q Changes in 4.9.260 futex: Cleanup variable names for futex_top_waiter() futex: Cleanup refcounting futex: Pull rt_mutex_futex_unlock() out from under hb->lock futex: Futex_unlock_pi() determinism futex: Fix pi_state->owner serialization futex: Fix more put_pi_state() vs. exit_pi_state_list() races futex: Don't enable IRQs unconditionally in put_pi_state() net: usb: qmi_wwan: support ZTE P685M modem arm: kprobes: Allow to handle reentered kprobe on single-stepping scripts: use pkg-config to locate libcrypto scripts: set proper OpenSSL include dir also for sign-file hugetlb: fix update_and_free_page contig page struct assumption printk: fix deadlock when kernel panic arm64: Remove redundant mov from LL/SC cmpxchg arm64: Avoid redundant type conversions in xchg() and cmpxchg() arm64: cmpxchg: Use "K" instead of "L" for ll/sc immediate constraint arm64: Use correct ll/sc atomic constraints JFS: more checks for invalid superblock xfs: Fix assert failure in xfs_setattr_size() smackfs: restrict bytes count in smackfs write functions net: fix up truesize of cloned skb in skb_prepare_for_shift() mm/hugetlb.c: fix unnecessary address expansion of pmd sharing staging: fwserial: Fix error handling in fwserial_create x86/reboot: Add Zotac ZBOX CI327 nano PCI reboot quirk vt/consolemap: do font sum unsigned wlcore: Fix command execute failure 19 for wl12xx pktgen: fix misuse of BUG_ON() in pktgen_thread_worker() ath10k: fix wmi mgmt tx queue full due to race condition x86/build: Treat R_386_PLT32 relocation as R_386_PC32 Bluetooth: Fix null pointer dereference in amp_read_loc_assoc_final_data staging: most: sound: add sanity check for function argument media: uvcvideo: Allow entities with no pads scsi: iscsi: Restrict sessions and handles to admin capabilities sysfs: Add sysfs_emit and sysfs_emit_at to format sysfs output scsi: iscsi: Ensure sysfs attributes are limited to PAGE_SIZE scsi: iscsi: Verify lengths on passthrough PDUs Xen/gnttab: handle p2m update errors on a per-slot basis xen-netback: respect gnttab_map_refs()'s return value zsmalloc: account the number of compacted pages correctly swap: fix swapfile read/write offset media: v4l: ioctl: Fix memory leak in video_usercopy Linux 4.9.260 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I36c2dd54eec10fff4b30d04830dbf0c3928ec088
60 lines
1.7 KiB
C
60 lines
1.7 KiB
C
/*
|
|
* zsmalloc memory allocator
|
|
*
|
|
* Copyright (C) 2011 Nitin Gupta
|
|
* Copyright (C) 2012, 2013 Minchan Kim
|
|
*
|
|
* This code is released using a dual license strategy: BSD/GPL
|
|
* You can choose the license that better fits your requirements.
|
|
*
|
|
* Released under the terms of 3-clause BSD License
|
|
* Released under the terms of GNU General Public License Version 2.0
|
|
*/
|
|
|
|
#ifndef _ZS_MALLOC_H_
|
|
#define _ZS_MALLOC_H_
|
|
|
|
#include <linux/types.h>
|
|
|
|
/*
|
|
* zsmalloc mapping modes
|
|
*
|
|
* NOTE: These only make a difference when a mapped object spans pages.
|
|
* They also have no effect when PGTABLE_MAPPING is selected.
|
|
*/
|
|
enum zs_mapmode {
|
|
ZS_MM_RW, /* normal read-write mapping */
|
|
ZS_MM_RO, /* read-only (no copy-out at unmap time) */
|
|
ZS_MM_WO /* write-only (no copy-in at map time) */
|
|
/*
|
|
* NOTE: ZS_MM_WO should only be used for initializing new
|
|
* (uninitialized) allocations. Partial writes to already
|
|
* initialized allocations should use ZS_MM_RW to preserve the
|
|
* existing data.
|
|
*/
|
|
};
|
|
|
|
struct zs_pool_stats {
|
|
/* How many pages were migrated (freed) */
|
|
atomic_long_t pages_compacted;
|
|
};
|
|
|
|
struct zs_pool;
|
|
|
|
struct zs_pool *zs_create_pool(const char *name);
|
|
void zs_destroy_pool(struct zs_pool *pool);
|
|
|
|
unsigned long zs_malloc(struct zs_pool *pool, size_t size, gfp_t flags);
|
|
void zs_free(struct zs_pool *pool, unsigned long obj);
|
|
|
|
size_t zs_huge_class_size(struct zs_pool *pool);
|
|
|
|
void *zs_map_object(struct zs_pool *pool, unsigned long handle,
|
|
enum zs_mapmode mm);
|
|
void zs_unmap_object(struct zs_pool *pool, unsigned long handle);
|
|
|
|
unsigned long zs_get_total_pages(struct zs_pool *pool);
|
|
unsigned long zs_compact(struct zs_pool *pool);
|
|
|
|
void zs_pool_stats(struct zs_pool *pool, struct zs_pool_stats *stats);
|
|
#endif
|