From d2f89a2b8ae5d1aa5650c22a863b8b8690d841d0 Mon Sep 17 00:00:00 2001 From: llyyr Date: Wed, 5 Mar 2025 04:53:49 +0530 Subject: [PATCH 1/3] Fix for kernel 6.13+ --- binder/binder.c | 4 +++- binder/binder_alloc.c | 15 +++++++++++++-- binder/binder_alloc.h | 2 ++ 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/binder/binder.c b/binder/binder.c index c0f6f12..ee38063 100644 --- a/binder/binder.c +++ b/binder/binder.c @@ -3128,7 +3128,9 @@ static void binder_transaction(struct binder_proc *proc, u32 secid; size_t added_size; -#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0) + security_cred_getsecid(proc->cred, &secid); +#elif LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) security_task_getsecid_obj(proc->tsk, &secid); #else security_task_getsecid(proc->tsk, &secid); diff --git a/binder/binder_alloc.c b/binder/binder_alloc.c index bfdec52..36941d3 100644 --- a/binder/binder_alloc.c +++ b/binder/binder_alloc.c @@ -1055,6 +1055,13 @@ err_get_alloc_mutex_failed: return LRU_SKIP; } +enum lru_status binder_alloc_free_page_no_lock(struct list_head *item, + struct list_lru_one *lru, + void *cb_arg) +{ + return binder_alloc_free_page(item, lru, NULL, cb_arg); +} + static unsigned long binder_shrink_count(struct shrinker *shrink, struct shrink_control *sc) { @@ -1066,9 +1073,13 @@ static unsigned long binder_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) { unsigned long ret; - +#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 13, 0)) + ret = list_lru_walk(&binder_alloc_lru, binder_alloc_free_page_no_lock, + NULL, sc->nr_to_scan); +#else ret = list_lru_walk(&binder_alloc_lru, binder_alloc_free_page, - NULL, sc->nr_to_scan); + NULL, sc->nr_to_scan); +#endif return ret; } diff --git a/binder/binder_alloc.h b/binder/binder_alloc.h index f6052c9..f766a68 100644 --- a/binder/binder_alloc.h +++ b/binder/binder_alloc.h @@ -117,6 +117,8 @@ static inline void binder_selftest_alloc(struct binder_alloc *alloc) {} enum lru_status binder_alloc_free_page(struct list_head *item, struct list_lru_one *lru, spinlock_t *lock, void *cb_arg); +enum lru_status binder_alloc_free_page_no_lock(struct list_head *item, + struct list_lru_one *lru, void *cb_arg); extern struct binder_buffer *binder_alloc_new_buf(struct binder_alloc *alloc, size_t data_size, size_t offsets_size, From 10c115cddef6c6504f9a5999337d463bc8d2b401 Mon Sep 17 00:00:00 2001 From: llyyr Date: Wed, 5 Mar 2025 05:27:59 +0530 Subject: [PATCH 2/3] Fix for kernel 6.14+ --- binder/binder.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/binder/binder.c b/binder/binder.c index ee38063..721902a 100644 --- a/binder/binder.c +++ b/binder/binder.c @@ -2869,8 +2869,12 @@ static void binder_transaction(struct binder_proc *proc, binder_size_t last_fixup_min_off = 0; struct binder_context *context = proc->context; int t_debug_id = atomic_inc_return(&binder_last_id); +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + struct lsm_context lsmctx = {}; +#else char *secctx = NULL; u32 secctx_sz = 0; +#endif e = binder_transaction_log_add(&binder_transaction_log); e->debug_id = t_debug_id; @@ -3135,14 +3139,23 @@ static void binder_transaction(struct binder_proc *proc, #else security_task_getsecid(proc->tsk, &secid); #endif +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + ret = security_secid_to_secctx(secid, &lsmctx); + if (ret < 0) { +#else ret = security_secid_to_secctx(secid, &secctx, &secctx_sz); if (ret) { +#endif return_error = BR_FAILED_REPLY; return_error_param = ret; return_error_line = __LINE__; goto err_get_secctx_failed; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + added_size = ALIGN(lsmctx.len, sizeof(u64)); +#else added_size = ALIGN(secctx_sz, sizeof(u64)); +#endif extra_buffers_size += added_size; if (extra_buffers_size < added_size) { /* integer overflow of extra_buffers_size */ @@ -3169,23 +3182,40 @@ static void binder_transaction(struct binder_proc *proc, t->buffer = NULL; goto err_binder_alloc_buf_failed; } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + if (lsmctx.context) { +#else if (secctx) { +#endif int err; size_t buf_offset = ALIGN(tr->data_size, sizeof(void *)) + ALIGN(tr->offsets_size, sizeof(void *)) + ALIGN(extra_buffers_size, sizeof(void *)) - +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + ALIGN(lsmctx.len, sizeof(u64)); +#else ALIGN(secctx_sz, sizeof(u64)); +#endif t->security_ctx = (uintptr_t)t->buffer->user_data + buf_offset; err = binder_alloc_copy_to_buffer(&target_proc->alloc, t->buffer, buf_offset, +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + lsmctx.context, lsmctx.len); +#else secctx, secctx_sz); +#endif if (err) { t->security_ctx = 0; WARN_ON(1); } +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + security_release_secctx(&lsmctx); + lsmctx.context = NULL; +#else security_release_secctx(secctx, secctx_sz); secctx = NULL; +#endif } t->buffer->debug_id = t->debug_id; t->buffer->transaction = t; @@ -3242,7 +3272,11 @@ static void binder_transaction(struct binder_proc *proc, off_end_offset = off_start_offset + tr->offsets_size; sg_buf_offset = ALIGN(off_end_offset, sizeof(void *)); sg_buf_end_offset = sg_buf_offset + extra_buffers_size - +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + ALIGN(lsmctx.len, sizeof(u64)); +#else ALIGN(secctx_sz, sizeof(u64)); +#endif off_min = 0; for (buffer_offset = off_start_offset; buffer_offset < off_end_offset; buffer_offset += sizeof(binder_size_t)) { @@ -3518,8 +3552,13 @@ err_copy_data_failed: binder_alloc_free_buf(&target_proc->alloc, t->buffer); err_binder_alloc_buf_failed: err_bad_extra_size: +#if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 14, 0) + if (lsmctx.context) + security_release_secctx(&lsmctx); +#else if (secctx) security_release_secctx(secctx, secctx_sz); +#endif err_get_secctx_failed: kfree(tcomplete); binder_stats_deleted(BINDER_STAT_TRANSACTION_COMPLETE); From 18f37babc3ab27abbe2f8383c6c850a3e81c03d7 Mon Sep 17 00:00:00 2001 From: llyyr Date: Wed, 5 Mar 2025 06:03:00 +0530 Subject: [PATCH 3/3] Remove ashmem Use memfd --- 99-anbox.rules | 1 - INSTALL.sh | 11 +- README.md | 30 +- UNINSTALL.sh | 16 +- anbox.conf | 1 - ashmem/Makefile | 18 - ashmem/ashmem.c | 926 -------------------------------- ashmem/ashmem.h | 27 - ashmem/deps.c | 69 --- ashmem/dkms.conf | 7 - ashmem/uapi/ashmem.h | 47 -- debian/control | 4 +- debian/dkms | 6 +- debian/install | 1 - scripts/build-against-kernel.sh | 5 - 15 files changed, 21 insertions(+), 1148 deletions(-) delete mode 100644 ashmem/Makefile delete mode 100644 ashmem/ashmem.c delete mode 100644 ashmem/ashmem.h delete mode 100644 ashmem/deps.c delete mode 100644 ashmem/dkms.conf delete mode 100644 ashmem/uapi/ashmem.h diff --git a/99-anbox.rules b/99-anbox.rules index 272502a..ed178a8 100644 --- a/99-anbox.rules +++ b/99-anbox.rules @@ -1,2 +1 @@ -KERNEL=="ashmem", MODE="0666" KERNEL=="*binder", MODE="0666", SYMLINK+="anbox-%k" diff --git a/INSTALL.sh b/INSTALL.sh index b66be2c..f6e32c1 100755 --- a/INSTALL.sh +++ b/INSTALL.sh @@ -4,16 +4,13 @@ sudo cp anbox.conf /etc/modules-load.d/ sudo cp 99-anbox.rules /lib/udev/rules.d/ -# Then copy the module sources to /usr/src/: -sudo cp -rT ashmem /usr/src/anbox-ashmem-1 +# Then copy the module source to /usr/src/: sudo cp -rT binder /usr/src/anbox-binder-1 # Finally use dkms to build and install: -sudo dkms install anbox-ashmem/1 sudo dkms install anbox-binder/1 -# Verify by loading these modules and checking the created devices: -sudo modprobe ashmem_linux +# Verify by loading the module and checking the created device: sudo modprobe binder_linux -lsmod | grep -e ashmem_linux -e binder_linux -ls -alh /dev/binder /dev/ashmem +lsmod | grep -e binder_linux +ls -alh /dev/binder diff --git a/README.md b/README.md index 66022da..0e65136 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ -[![Build Status](https://travis-ci.org/anbox/anbox-modules.svg?branch=master)](https://travis-ci.org/anbox/anbox-modules) +# Anbox Kernel Module -# Anbox Kernel Modules - -This repository contains the kernel modules necessary to run the Anbox +This repository contains the kernel module necessary to run the Anbox Android container runtime. They're split out of the original Anbox repository to make packaging in various Linux distributions easier. @@ -29,32 +27,27 @@ You can either run `./INSTALL.sh` script to automate the installation steps or f * Then copy the module sources to `/usr/src/`: ``` - sudo cp -rT ashmem /usr/src/anbox-ashmem-1 sudo cp -rT binder /usr/src/anbox-binder-1 ``` * Finally use `dkms` to build and install: ``` - sudo dkms install anbox-ashmem/1 sudo dkms install anbox-binder/1 ``` -You can verify by loading these modules and checking the created devices: +You can verify by loading these module and checking the created device: ``` - sudo modprobe ashmem_linux sudo modprobe binder_linux - lsmod | grep -e ashmem_linux -e binder_linux - ls -alh /dev/binder /dev/ashmem + lsmod | grep -e binder_linux + ls -alh /dev/binder ``` You are expected to see output like: ``` binder_linux 114688 0 -ashmem_linux 16384 0 -crw-rw-rw- 1 root root 10, 55 Jun 19 16:30 /dev/ashmem crw-rw-rw- 1 root root 511, 0 Jun 19 16:30 /dev/binder ``` @@ -62,17 +55,15 @@ crw-rw-rw- 1 root root 511, 0 Jun 19 16:30 /dev/binder ou can either run `./UNINSTALL.sh` script to automate the installation steps or follow them manually below: -* First use dkms to remove the modules: +* First use dkms to remove the module: ``` - sudo dkms remove anbox-ashmem/1 sudo dkms remove anbox-binder/1 ``` * Then remove the module sources from /usr/src/: ``` - sudo rm -rf /usr/src/anbox-ashmem-1 sudo rm -rf /usr/src/anbox-binder-1 ``` @@ -83,22 +74,19 @@ ou can either run `./UNINSTALL.sh` script to automate the installation steps or sudo rm -f /lib/udev/rules.d/99-anbox.rules ``` -You must then restart your device. You can then verify modules were removed by trying to load the modules and checking the created devices: +You must then restart your device. You can then verify module was removed by trying to load the module and checking the created device: ``` - sudo modprobe ashmem_linux sudo modprobe binder_linux - lsmod | grep -e ashmem_linux -e binder_linux - ls -alh /dev/binder /dev/ashmem + lsmod | grep -e binder_linux + ls -alh /dev/binder ``` You are expected to see output like: ``` -modprobe: FATAL: Module ashmem_linux not found in directory /lib/modules/6.0.2-76060002-generic modprobe: FATAL: Module binder_linux not found in directory /lib/modules/6.0.2-76060002-generic ls: cannot access '/dev/binder': No such file or directory -ls: cannot access '/dev/ashmem': No such file or directory ``` # Packaging: diff --git a/UNINSTALL.sh b/UNINSTALL.sh index 30fd341..f5d4795 100755 --- a/UNINSTALL.sh +++ b/UNINSTALL.sh @@ -1,11 +1,9 @@ #!/usr/bin/env bash -# First use dkms to remove the modules: -sudo dkms remove anbox-ashmem/1 +# First use dkms to remove the module: sudo dkms remove anbox-binder/1 # Then remove the module sources from /usr/src/: -sudo rm -rf /usr/src/anbox-ashmem-1 sudo rm -rf /usr/src/anbox-binder-1 # Finally remove the configuration files: @@ -14,25 +12,19 @@ sudo rm -f /lib/udev/rules.d/99-anbox.rules # Verify remove by trying to load the modules and checking the created devices: failed_checks=0 -if sudo modprobe ashmem_linux > /dev/null 2>&1; then - failed_checks=1 -else - failed_checks=0 -fi - if sudo modprobe binder_linux > /dev/null 2>&1; then failed_checks=1 else failed_checks=0 fi -if lsmod | grep -e ashmem_linux -e binder_linux > /dev/null 2>&1; then +if lsmod | grep -e binder_linux > /dev/null 2>&1; then failed_checks=1 else failed_checks=0 fi -if ls -alh /dev/binder /dev/ashmem > /dev/null 2>&1; then +if ls -alh /dev/binder > /dev/null 2>&1; then failed_checks=1 else failed_checks=0 @@ -42,4 +34,4 @@ if [ $failed_checks == 1 ]; then echo "Please restart your device and rerun this script to verify changes" else echo "Modules not installed" -fi \ No newline at end of file +fi diff --git a/anbox.conf b/anbox.conf index ba8ae38..6956a7a 100644 --- a/anbox.conf +++ b/anbox.conf @@ -1,2 +1 @@ -ashmem_linux binder_linux diff --git a/ashmem/Makefile b/ashmem/Makefile deleted file mode 100644 index 017e5b7..0000000 --- a/ashmem/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -ccflags-y += -I$(src) -Wno-error=implicit-int -Wno-int-conversion -obj-m := ashmem_linux.o -ashmem_linux-y := deps.o ashmem.o - -KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build -VZ= $(shell uname -r | grep vz) -ifneq ($(VZ),) -ccflags-y += -DVZKERNEL -endif - -all: - $(MAKE) -C $(KERNEL_SRC) V=0 M=$$PWD - -install: - cp ashmem_linux.ko $(DESTDIR)/ - -clean: - rm -rf deps.h *.o *.ko *.mod.c *.symvers *.order .*.cmd .tmp_versions diff --git a/ashmem/ashmem.c b/ashmem/ashmem.c deleted file mode 100644 index df9cf90..0000000 --- a/ashmem/ashmem.c +++ /dev/null @@ -1,926 +0,0 @@ -/* mm/ashmem.c - * - * Anonymous Shared Memory Subsystem, ashmem - * - * Copyright (C) 2008 Google, Inc. - * - * Robert Love - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - */ - -#define pr_fmt(fmt) "ashmem: " fmt - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "ashmem.h" - -#define ASHMEM_NAME_PREFIX "dev/ashmem/" -#define ASHMEM_NAME_PREFIX_LEN (sizeof(ASHMEM_NAME_PREFIX) - 1) -#define ASHMEM_FULL_NAME_LEN (ASHMEM_NAME_LEN + ASHMEM_NAME_PREFIX_LEN) - -/** - * struct ashmem_area - The anonymous shared memory area - * @name: The optional name in /proc/pid/maps - * @unpinned_list: The list of all ashmem areas - * @file: The shmem-based backing file - * @size: The size of the mapping, in bytes - * @prot_mask: The allowed protection bits, as vm_flags - * - * The lifecycle of this structure is from our parent file's open() until - * its release(). It is also protected by 'ashmem_mutex' - * - * Warning: Mappings do NOT pin this structure; It dies on close() - */ -struct ashmem_area { - char name[ASHMEM_FULL_NAME_LEN]; - struct list_head unpinned_list; - struct file *file; - size_t size; - unsigned long prot_mask; -}; - -/** - * struct ashmem_range - A range of unpinned/evictable pages - * @lru: The entry in the LRU list - * @unpinned: The entry in its area's unpinned list - * @asma: The associated anonymous shared memory area. - * @pgstart: The starting page (inclusive) - * @pgend: The ending page (inclusive) - * @purged: The purge status (ASHMEM_NOT or ASHMEM_WAS_PURGED) - * - * The lifecycle of this structure is from unpin to pin. - * It is protected by 'ashmem_mutex' - */ -struct ashmem_range { - struct list_head lru; - struct list_head unpinned; - struct ashmem_area *asma; - size_t pgstart; - size_t pgend; - unsigned int purged; -}; - -/* LRU list of unpinned pages, protected by ashmem_mutex */ -static LIST_HEAD(ashmem_lru_list); - -/* - * long lru_count - The count of pages on our LRU list. - * - * This is protected by ashmem_mutex. - */ -static unsigned long lru_count; - -/* - * ashmem_mutex - protects the list of and each individual ashmem_area - * - * Lock Ordering: ashmex_mutex -> i_mutex -> i_alloc_sem - */ -static DEFINE_MUTEX(ashmem_mutex); - -static struct kmem_cache *ashmem_area_cachep __read_mostly; -static struct kmem_cache *ashmem_range_cachep __read_mostly; - -#define range_size(range) \ - ((range)->pgend - (range)->pgstart + 1) - -#define range_on_lru(range) \ - ((range)->purged == ASHMEM_NOT_PURGED) - -#define page_range_subsumes_range(range, start, end) \ - (((range)->pgstart >= (start)) && ((range)->pgend <= (end))) - -#define page_range_subsumed_by_range(range, start, end) \ - (((range)->pgstart <= (start)) && ((range)->pgend >= (end))) - -#define page_in_range(range, page) \ - (((range)->pgstart <= (page)) && ((range)->pgend >= (page))) - -#define page_range_in_range(range, start, end) \ - (page_in_range(range, start) || page_in_range(range, end) || \ - page_range_subsumes_range(range, start, end)) - -#define range_before_page(range, page) \ - ((range)->pgend < (page)) - -#define PROT_MASK (PROT_EXEC | PROT_READ | PROT_WRITE) - -/** - * lru_add() - Adds a range of memory to the LRU list - * @range: The memory range being added. - * - * The range is first added to the end (tail) of the LRU list. - * After this, the size of the range is added to @lru_count - */ -static inline void lru_add(struct ashmem_range *range) -{ - list_add_tail(&range->lru, &ashmem_lru_list); - lru_count += range_size(range); -} - -/** - * lru_del() - Removes a range of memory from the LRU list - * @range: The memory range being removed - * - * The range is first deleted from the LRU list. - * After this, the size of the range is removed from @lru_count - */ -static inline void lru_del(struct ashmem_range *range) -{ - list_del(&range->lru); - lru_count -= range_size(range); -} - -/** - * range_alloc() - Allocates and initializes a new ashmem_range structure - * @asma: The associated ashmem_area - * @prev_range: The previous ashmem_range in the sorted asma->unpinned list - * @purged: Initial purge status (ASMEM_NOT_PURGED or ASHMEM_WAS_PURGED) - * @start: The starting page (inclusive) - * @end: The ending page (inclusive) - * - * This function is protected by ashmem_mutex. - * - * Return: 0 if successful, or -ENOMEM if there is an error - */ -static int range_alloc(struct ashmem_area *asma, - struct ashmem_range *prev_range, unsigned int purged, - size_t start, size_t end) -{ - struct ashmem_range *range; - - range = kmem_cache_zalloc(ashmem_range_cachep, GFP_KERNEL); - if (unlikely(!range)) - return -ENOMEM; - - range->asma = asma; - range->pgstart = start; - range->pgend = end; - range->purged = purged; - - list_add_tail(&range->unpinned, &prev_range->unpinned); - - if (range_on_lru(range)) - lru_add(range); - - return 0; -} - -/** - * range_del() - Deletes and dealloctes an ashmem_range structure - * @range: The associated ashmem_range that has previously been allocated - */ -static void range_del(struct ashmem_range *range) -{ - list_del(&range->unpinned); - if (range_on_lru(range)) - lru_del(range); - kmem_cache_free(ashmem_range_cachep, range); -} - -/** - * range_shrink() - Shrinks an ashmem_range - * @range: The associated ashmem_range being shrunk - * @start: The starting byte of the new range - * @end: The ending byte of the new range - * - * This does not modify the data inside the existing range in any way - It - * simply shrinks the boundaries of the range. - * - * Theoretically, with a little tweaking, this could eventually be changed - * to range_resize, and expand the lru_count if the new range is larger. - */ -static inline void range_shrink(struct ashmem_range *range, - size_t start, size_t end) -{ - size_t pre = range_size(range); - - range->pgstart = start; - range->pgend = end; - - if (range_on_lru(range)) - lru_count -= pre - range_size(range); -} - -/** - * ashmem_open() - Opens an Anonymous Shared Memory structure - * @inode: The backing file's index node(?) - * @file: The backing file - * - * Please note that the ashmem_area is not returned by this function - It is - * instead written to "file->private_data". - * - * Return: 0 if successful, or another code if unsuccessful. - */ -static int ashmem_open(struct inode *inode, struct file *file) -{ - struct ashmem_area *asma; - int ret; - - ret = generic_file_open(inode, file); - if (unlikely(ret)) - return ret; - - asma = kmem_cache_zalloc(ashmem_area_cachep, GFP_KERNEL); - if (unlikely(!asma)) - return -ENOMEM; - - INIT_LIST_HEAD(&asma->unpinned_list); - memcpy(asma->name, ASHMEM_NAME_PREFIX, ASHMEM_NAME_PREFIX_LEN); - asma->prot_mask = PROT_MASK; - file->private_data = asma; - - return 0; -} - -/** - * ashmem_release() - Releases an Anonymous Shared Memory structure - * @ignored: The backing file's Index Node(?) - It is ignored here. - * @file: The backing file - * - * Return: 0 if successful. If it is anything else, go have a coffee and - * try again. - */ -static int ashmem_release(struct inode *ignored, struct file *file) -{ - struct ashmem_area *asma = file->private_data; - struct ashmem_range *range, *next; - - mutex_lock(&ashmem_mutex); - list_for_each_entry_safe(range, next, &asma->unpinned_list, unpinned) - range_del(range); - mutex_unlock(&ashmem_mutex); - - if (asma->file) - fput(asma->file); - kmem_cache_free(ashmem_area_cachep, asma); - - return 0; -} - -/** - * ashmem_read() - Reads a set of bytes from an Ashmem-enabled file - * @file: The associated backing file. - * @buf: The buffer of data being written to - * @len: The number of bytes being read - * @pos: The position of the first byte to read. - * - * Return: 0 if successful, or another return code if not. - */ -static ssize_t ashmem_read(struct file *file, char __user *buf, - size_t len, loff_t *pos) -{ - struct ashmem_area *asma = file->private_data; - int ret = 0; - - mutex_lock(&ashmem_mutex); - - /* If size is not set, or set to 0, always return EOF. */ - if (asma->size == 0) - goto out_unlock; - - if (!asma->file) { - ret = -EBADF; - goto out_unlock; - } - - mutex_unlock(&ashmem_mutex); - - /* - * asma and asma->file are used outside the lock here. We assume - * once asma->file is set it will never be changed, and will not - * be destroyed until all references to the file are dropped and - * ashmem_release is called. - * - * kernel_read supersedes vfs_read from kernel version 3.9 - */ - #if LINUX_VERSION_CODE < KERNEL_VERSION(3, 9, 0) - ret = __vfs_read(asma->file, buf, len, pos); - #else - ret = kernel_read(asma->file, buf, len, pos); - #endif - if (ret >= 0) - /** Update backing file pos, since f_ops->read() doesn't */ - asma->file->f_pos = *pos; - return ret; - -out_unlock: - mutex_unlock(&ashmem_mutex); - return ret; -} - -static loff_t ashmem_llseek(struct file *file, loff_t offset, int origin) -{ - struct ashmem_area *asma = file->private_data; - int ret; - - mutex_lock(&ashmem_mutex); - - if (asma->size == 0) { - ret = -EINVAL; - goto out; - } - - if (!asma->file) { - ret = -EBADF; - goto out; - } - - ret = vfs_llseek(asma->file, offset, origin); - if (ret < 0) - goto out; - - /** Copy f_pos from backing file, since f_ops->llseek() sets it */ - file->f_pos = asma->file->f_pos; - -out: - mutex_unlock(&ashmem_mutex); - return ret; -} - -static inline vm_flags_t calc_vm_may_flags(unsigned long prot) -{ - return _calc_vm_trans(prot, PROT_READ, VM_MAYREAD) | - _calc_vm_trans(prot, PROT_WRITE, VM_MAYWRITE) | - _calc_vm_trans(prot, PROT_EXEC, VM_MAYEXEC); -} - -static int ashmem_mmap(struct file *file, struct vm_area_struct *vma) -{ - struct ashmem_area *asma = file->private_data; - int ret = 0; - - mutex_lock(&ashmem_mutex); - - /* user needs to SET_SIZE before mapping */ - if (unlikely(!asma->size)) { - ret = -EINVAL; - goto out; - } - - /* requested protection bits must match our allowed protection mask */ -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 5, 0) || defined(VZKERNEL) - if (unlikely((vma->vm_flags & ~calc_vm_prot_bits(asma->prot_mask, 0)) & - calc_vm_prot_bits(PROT_MASK, 0))) { -#else - if (unlikely((vma->vm_flags & ~calc_vm_prot_bits(asma->prot_mask)) & - calc_vm_prot_bits(PROT_MASK))) { -#endif - ret = -EPERM; - goto out; - } - #if LINUX_VERSION_CODE >= KERNEL_VERSION(6, 3, 0) - vm_flags_clear(vma, calc_vm_may_flags(~asma->prot_mask)); - #else - vma->vm_flags &= ~calc_vm_may_flags(~asma->prot_mask); - #endif - - if (!asma->file) { - char *name = ASHMEM_NAME_DEF; - struct file *vmfile; - - if (asma->name[ASHMEM_NAME_PREFIX_LEN] != '\0') - name = asma->name; - - /* ... and allocate the backing shmem file */ - vmfile = shmem_file_setup(name, asma->size, vma->vm_flags); - if (IS_ERR(vmfile)) { - ret = PTR_ERR(vmfile); - goto out; - } - asma->file = vmfile; - } - get_file(asma->file); - - /* - * XXX - Reworked to use shmem_zero_setup() instead of - * shmem_set_file while we're in staging. -jstultz - */ - if (vma->vm_flags & VM_SHARED) { - ret = shmem_zero_setup(vma); - if (ret) { - fput(asma->file); - goto out; - } -#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 18, 0) - } else { - vma_set_anonymous(vma); - } -#else - } -#endif - - if (vma->vm_file) - fput(vma->vm_file); - vma->vm_file = asma->file; - -out: - mutex_unlock(&ashmem_mutex); - return ret; -} - -/* - * ashmem_shrink - our cache shrinker, called from mm/vmscan.c - * - * 'nr_to_scan' is the number of objects to scan for freeing. - * - * 'gfp_mask' is the mask of the allocation that got us into this mess. - * - * Return value is the number of objects freed or -1 if we cannot - * proceed without risk of deadlock (due to gfp_mask). - * - * We approximate LRU via least-recently-unpinned, jettisoning unpinned partial - * chunks of ashmem regions LRU-wise one-at-a-time until we hit 'nr_to_scan' - * pages freed. - */ -static unsigned long -ashmem_shrink_scan(struct shrinker *shrink, struct shrink_control *sc) -{ - struct ashmem_range *range, *next; - unsigned long freed = 0; - - /* We might recurse into filesystem code, so bail out if necessary */ - if (!(sc->gfp_mask & __GFP_FS)) - return SHRINK_STOP; - - mutex_lock(&ashmem_mutex); - list_for_each_entry_safe(range, next, &ashmem_lru_list, lru) { - loff_t start = range->pgstart * PAGE_SIZE; - loff_t end = (range->pgend + 1) * PAGE_SIZE; - - vfs_fallocate(range->asma->file, - FALLOC_FL_PUNCH_HOLE | FALLOC_FL_KEEP_SIZE, - start, end - start); - range->purged = ASHMEM_WAS_PURGED; - lru_del(range); - - freed += range_size(range); - if (--sc->nr_to_scan <= 0) - break; - } - mutex_unlock(&ashmem_mutex); - return freed; -} - -static unsigned long -ashmem_shrink_count(struct shrinker *shrink, struct shrink_control *sc) -{ - /* - * note that lru_count is count of pages on the lru, not a count of - * objects on the list. This means the scan function needs to return the - * number of pages freed, not the number of objects scanned. - */ - return lru_count; -} - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) -static struct shrinker *ashmem_shrinker; -#else -static struct shrinker ashmem_shrinker = { - .count_objects = ashmem_shrink_count, - .scan_objects = ashmem_shrink_scan, - /* - * XXX (dchinner): I wish people would comment on why they need on - * significant changes to the default value here - */ - .seeks = DEFAULT_SEEKS * 4, -}; -#endif - -static int set_prot_mask(struct ashmem_area *asma, unsigned long prot) -{ - int ret = 0; - - mutex_lock(&ashmem_mutex); - - /* the user can only remove, not add, protection bits */ - if (unlikely((asma->prot_mask & prot) != prot)) { - ret = -EINVAL; - goto out; - } - - /* does the application expect PROT_READ to imply PROT_EXEC? */ - if ((prot & PROT_READ) && (current->personality & READ_IMPLIES_EXEC)) - prot |= PROT_EXEC; - - asma->prot_mask = prot; - -out: - mutex_unlock(&ashmem_mutex); - return ret; -} - -static int set_name(struct ashmem_area *asma, void __user *name) -{ - int len; - int ret = 0; - char local_name[ASHMEM_NAME_LEN]; - - /* - * Holding the ashmem_mutex while doing a copy_from_user might cause - * an data abort which would try to access mmap_sem. If another - * thread has invoked ashmem_mmap then it will be holding the - * semaphore and will be waiting for ashmem_mutex, there by leading to - * deadlock. We'll release the mutex and take the name to a local - * variable that does not need protection and later copy the local - * variable to the structure member with lock held. - */ - len = strncpy_from_user(local_name, name, ASHMEM_NAME_LEN); - if (len < 0) - return len; - if (len == ASHMEM_NAME_LEN) - local_name[ASHMEM_NAME_LEN - 1] = '\0'; - mutex_lock(&ashmem_mutex); - /* cannot change an existing mapping's name */ - if (unlikely(asma->file)) - ret = -EINVAL; - else - strcpy(asma->name + ASHMEM_NAME_PREFIX_LEN, local_name); - - mutex_unlock(&ashmem_mutex); - return ret; -} - -static int get_name(struct ashmem_area *asma, void __user *name) -{ - int ret = 0; - size_t len; - /* - * Have a local variable to which we'll copy the content - * from asma with the lock held. Later we can copy this to the user - * space safely without holding any locks. So even if we proceed to - * wait for mmap_sem, it won't lead to deadlock. - */ - char local_name[ASHMEM_NAME_LEN]; - - mutex_lock(&ashmem_mutex); - if (asma->name[ASHMEM_NAME_PREFIX_LEN] != '\0') { - /* - * Copying only `len', instead of ASHMEM_NAME_LEN, bytes - * prevents us from revealing one user's stack to another. - */ - len = strlen(asma->name + ASHMEM_NAME_PREFIX_LEN) + 1; - memcpy(local_name, asma->name + ASHMEM_NAME_PREFIX_LEN, len); - } else { - len = sizeof(ASHMEM_NAME_DEF); - memcpy(local_name, ASHMEM_NAME_DEF, len); - } - mutex_unlock(&ashmem_mutex); - - /* - * Now we are just copying from the stack variable to userland - * No lock held - */ - if (unlikely(copy_to_user(name, local_name, len))) - ret = -EFAULT; - return ret; -} - -/* - * ashmem_pin - pin the given ashmem region, returning whether it was - * previously purged (ASHMEM_WAS_PURGED) or not (ASHMEM_NOT_PURGED). - * - * Caller must hold ashmem_mutex. - */ -static int ashmem_pin(struct ashmem_area *asma, size_t pgstart, size_t pgend) -{ - struct ashmem_range *range, *next; - int ret = ASHMEM_NOT_PURGED; - - list_for_each_entry_safe(range, next, &asma->unpinned_list, unpinned) { - /* moved past last applicable page; we can short circuit */ - if (range_before_page(range, pgstart)) - break; - - /* - * The user can ask us to pin pages that span multiple ranges, - * or to pin pages that aren't even unpinned, so this is messy. - * - * Four cases: - * 1. The requested range subsumes an existing range, so we - * just remove the entire matching range. - * 2. The requested range overlaps the start of an existing - * range, so we just update that range. - * 3. The requested range overlaps the end of an existing - * range, so we just update that range. - * 4. The requested range punches a hole in an existing range, - * so we have to update one side of the range and then - * create a new range for the other side. - */ - if (page_range_in_range(range, pgstart, pgend)) { - ret |= range->purged; - - /* Case #1: Easy. Just nuke the whole thing. */ - if (page_range_subsumes_range(range, pgstart, pgend)) { - range_del(range); - continue; - } - - /* Case #2: We overlap from the start, so adjust it */ - if (range->pgstart >= pgstart) { - range_shrink(range, pgend + 1, range->pgend); - continue; - } - - /* Case #3: We overlap from the rear, so adjust it */ - if (range->pgend <= pgend) { - range_shrink(range, range->pgstart, - pgstart - 1); - continue; - } - - /* - * Case #4: We eat a chunk out of the middle. A bit - * more complicated, we allocate a new range for the - * second half and adjust the first chunk's endpoint. - */ - range_alloc(asma, range, range->purged, - pgend + 1, range->pgend); - range_shrink(range, range->pgstart, pgstart - 1); - break; - } - } - - return ret; -} - -/* - * ashmem_unpin - unpin the given range of pages. Returns zero on success. - * - * Caller must hold ashmem_mutex. - */ -static int ashmem_unpin(struct ashmem_area *asma, size_t pgstart, size_t pgend) -{ - struct ashmem_range *range, *next; - unsigned int purged = ASHMEM_NOT_PURGED; - -restart: - list_for_each_entry_safe(range, next, &asma->unpinned_list, unpinned) { - /* short circuit: this is our insertion point */ - if (range_before_page(range, pgstart)) - break; - - /* - * The user can ask us to unpin pages that are already entirely - * or partially pinned. We handle those two cases here. - */ - if (page_range_subsumed_by_range(range, pgstart, pgend)) - return 0; - if (page_range_in_range(range, pgstart, pgend)) { - pgstart = min_t(size_t, range->pgstart, pgstart); - pgend = max_t(size_t, range->pgend, pgend); - purged |= range->purged; - range_del(range); - goto restart; - } - } - - return range_alloc(asma, range, purged, pgstart, pgend); -} - -/* - * ashmem_get_pin_status - Returns ASHMEM_IS_UNPINNED if _any_ pages in the - * given interval are unpinned and ASHMEM_IS_PINNED otherwise. - * - * Caller must hold ashmem_mutex. - */ -static int ashmem_get_pin_status(struct ashmem_area *asma, size_t pgstart, - size_t pgend) -{ - struct ashmem_range *range; - int ret = ASHMEM_IS_PINNED; - - list_for_each_entry(range, &asma->unpinned_list, unpinned) { - if (range_before_page(range, pgstart)) - break; - if (page_range_in_range(range, pgstart, pgend)) { - ret = ASHMEM_IS_UNPINNED; - break; - } - } - - return ret; -} - -static int ashmem_pin_unpin(struct ashmem_area *asma, unsigned long cmd, - void __user *p) -{ - struct ashmem_pin pin; - size_t pgstart, pgend; - int ret = -EINVAL; - - if (unlikely(!asma->file)) - return -EINVAL; - - if (unlikely(copy_from_user(&pin, p, sizeof(pin)))) - return -EFAULT; - - /* per custom, you can pass zero for len to mean "everything onward" */ - if (!pin.len) - pin.len = PAGE_ALIGN(asma->size) - pin.offset; - - if (unlikely((pin.offset | pin.len) & ~PAGE_MASK)) - return -EINVAL; - - if (unlikely(((__u32)-1) - pin.offset < pin.len)) - return -EINVAL; - - if (unlikely(PAGE_ALIGN(asma->size) < pin.offset + pin.len)) - return -EINVAL; - - pgstart = pin.offset / PAGE_SIZE; - pgend = pgstart + (pin.len / PAGE_SIZE) - 1; - - mutex_lock(&ashmem_mutex); - - switch (cmd) { - case ASHMEM_PIN: - ret = ashmem_pin(asma, pgstart, pgend); - break; - case ASHMEM_UNPIN: - ret = ashmem_unpin(asma, pgstart, pgend); - break; - case ASHMEM_GET_PIN_STATUS: - ret = ashmem_get_pin_status(asma, pgstart, pgend); - break; - } - - mutex_unlock(&ashmem_mutex); - - return ret; -} - -static long ashmem_ioctl(struct file *file, unsigned int cmd, unsigned long arg) -{ - struct ashmem_area *asma = file->private_data; - long ret = -ENOTTY; - - switch (cmd) { - case ASHMEM_SET_NAME: - ret = set_name(asma, (void __user *)arg); - break; - case ASHMEM_GET_NAME: - ret = get_name(asma, (void __user *)arg); - break; - case ASHMEM_SET_SIZE: - ret = -EINVAL; - if (!asma->file) { - ret = 0; - asma->size = (size_t)arg; - } - break; - case ASHMEM_GET_SIZE: - ret = asma->size; - break; - case ASHMEM_SET_PROT_MASK: - ret = set_prot_mask(asma, arg); - break; - case ASHMEM_GET_PROT_MASK: - ret = asma->prot_mask; - break; - case ASHMEM_PIN: - case ASHMEM_UNPIN: - case ASHMEM_GET_PIN_STATUS: - ret = ashmem_pin_unpin(asma, cmd, (void __user *)arg); - break; - case ASHMEM_PURGE_ALL_CACHES: - ret = -EPERM; - if (capable(CAP_SYS_ADMIN)) { - struct shrink_control sc = { - .gfp_mask = GFP_KERNEL, - .nr_to_scan = LONG_MAX, - }; -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) - ret = ashmem_shrink_count(ashmem_shrinker, &sc); - ashmem_shrink_scan(ashmem_shrinker, &sc); -#else - ret = ashmem_shrink_count(&ashmem_shrinker, &sc); - ashmem_shrink_scan(&ashmem_shrinker, &sc); -#endif - } - break; - } - - return ret; -} - -/* support of 32bit userspace on 64bit platforms */ -#ifdef CONFIG_COMPAT -static long compat_ashmem_ioctl(struct file *file, unsigned int cmd, - unsigned long arg) -{ - switch (cmd) { - case COMPAT_ASHMEM_SET_SIZE: - cmd = ASHMEM_SET_SIZE; - break; - case COMPAT_ASHMEM_SET_PROT_MASK: - cmd = ASHMEM_SET_PROT_MASK; - break; - } - return ashmem_ioctl(file, cmd, arg); -} -#endif - -static const struct file_operations ashmem_fops = { - .owner = THIS_MODULE, - .open = ashmem_open, - .release = ashmem_release, - .read = ashmem_read, - .llseek = ashmem_llseek, - .mmap = ashmem_mmap, - .unlocked_ioctl = ashmem_ioctl, -#ifdef CONFIG_COMPAT - .compat_ioctl = compat_ashmem_ioctl, -#endif -}; - -static struct miscdevice ashmem_misc = { - .minor = MISC_DYNAMIC_MINOR, - .name = "ashmem", - .fops = &ashmem_fops, -}; - -static int __init ashmem_init(void) -{ - int ret; - - ashmem_area_cachep = kmem_cache_create("ashmem_area_cache", - sizeof(struct ashmem_area), - 0, 0, NULL); - if (unlikely(!ashmem_area_cachep)) { - pr_err("failed to create slab cache\n"); - return -ENOMEM; - } - - ashmem_range_cachep = kmem_cache_create("ashmem_range_cache", - sizeof(struct ashmem_range), - 0, 0, NULL); - if (unlikely(!ashmem_range_cachep)) { - pr_err("failed to create slab cache\n"); - return -ENOMEM; - } - - ret = misc_register(&ashmem_misc); - if (unlikely(ret)) { - pr_err("failed to register misc device!\n"); - return ret; - } - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) - ashmem_shrinker = shrinker_alloc(0, "android-ashmem"); - if (ashmem_shrinker) { - ashmem_shrinker->count_objects = ashmem_shrink_count; - ashmem_shrinker->scan_objects = ashmem_shrink_scan; - ashmem_shrinker->seeks = DEFAULT_SEEKS * 4; - shrinker_register(ashmem_shrinker); - } else { - return -ENOMEM; - } -#elif (LINUX_VERSION_CODE >= KERNEL_VERSION(6,0,0)) - register_shrinker(&ashmem_shrinker, "android-ashmem"); -#else - register_shrinker(&ashmem_shrinker); -#endif - - return 0; -} - -static void __exit ashmem_exit(void) -{ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6,7,0)) - shrinker_free(ashmem_shrinker); -#else - unregister_shrinker(&ashmem_shrinker); -#endif - - misc_deregister(&ashmem_misc); - - kmem_cache_destroy(ashmem_range_cachep); - kmem_cache_destroy(ashmem_area_cachep); -} - -module_init(ashmem_init); -module_exit(ashmem_exit); - -MODULE_LICENSE("GPL"); diff --git a/ashmem/ashmem.h b/ashmem/ashmem.h deleted file mode 100644 index 5abcfd7..0000000 --- a/ashmem/ashmem.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * include/linux/ashmem.h - * - * Copyright 2008 Google Inc. - * Author: Robert Love - * - * This file is dual licensed. It may be redistributed and/or modified - * under the terms of the Apache 2.0 License OR version 2 of the GNU - * General Public License. - */ - -#ifndef _LINUX_ASHMEM_H -#define _LINUX_ASHMEM_H - -#include -#include -#include - -#include "uapi/ashmem.h" - -/* support of 32bit userspace on 64bit platforms */ -#ifdef CONFIG_COMPAT -#define COMPAT_ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, compat_size_t) -#define COMPAT_ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned int) -#endif - -#endif /* _LINUX_ASHMEM_H */ diff --git a/ashmem/deps.c b/ashmem/deps.c deleted file mode 100644 index 4a89308..0000000 --- a/ashmem/deps.c +++ /dev/null @@ -1,69 +0,0 @@ -#include -#include -#include -#include - -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) - -#ifndef CONFIG_KPROBES -# error "Your kernel does not support KProbes, but this is required to compile ashmem as a kernel module on kernel 5.7 and later" -#endif - -typedef unsigned long (*kallsyms_lookup_name_t)(const char *name); - -static int dummy_kprobe_handler(struct kprobe *p, struct pt_regs *regs) -{ - return 0; -} - -static kallsyms_lookup_name_t get_kallsyms_lookup_name_ptr(void) -{ - struct kprobe probe; - int ret; - kallsyms_lookup_name_t addr; - - memset(&probe, 0, sizeof(probe)); - probe.pre_handler = dummy_kprobe_handler; - probe.symbol_name = "kallsyms_lookup_name"; - ret = register_kprobe(&probe); - if (ret) - return NULL; - addr = (kallsyms_lookup_name_t) probe.addr; - unregister_kprobe(&probe); - - return addr; -} -#endif - -/* - * On kernel 5.7 and later, kallsyms_lookup_name() can no longer be called from a kernel - * module for reasons described here: https://lwn.net/Articles/813350/ - * As ashmem really needs to use kallsysms_lookup_name() to access some kernel - * functions that otherwise wouldn't be accessible, KProbes are used on later - * kernels to get the address of kallsysms_lookup_name(). The function is - * afterwards used just as before. This is a very dirty hack though and the much - * better solution would be if all the functions that are currently resolved - * with kallsysms_lookup_name() would get an EXPORT_SYMBOL() annotation to - * make them directly accessible to kernel modules. - */ -static unsigned long kallsyms_lookup_name_wrapper(const char *name) -{ -#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0)) - static kallsyms_lookup_name_t func_ptr = NULL; - if (!func_ptr) - func_ptr = get_kallsyms_lookup_name_ptr(); - - return func_ptr(name); -#else - return kallsyms_lookup_name(name); -#endif -} - -static int (*shmem_zero_setup_ptr)(struct vm_area_struct *) = NULL; - -int shmem_zero_setup(struct vm_area_struct *vma) -{ - if (!shmem_zero_setup_ptr) - shmem_zero_setup_ptr = kallsyms_lookup_name_wrapper("shmem_zero_setup"); - return shmem_zero_setup_ptr(vma); -} diff --git a/ashmem/dkms.conf b/ashmem/dkms.conf deleted file mode 100644 index 715fa57..0000000 --- a/ashmem/dkms.conf +++ /dev/null @@ -1,7 +0,0 @@ -PACKAGE_NAME="anbox-ashmem" -PACKAGE_VERSION="1" -CLEAN="make clean" -MAKE[0]="make all KERNEL_SRC=/lib/modules/$kernelver/build" -BUILT_MODULE_NAME[0]="ashmem_linux" -DEST_MODULE_LOCATION[0]="/updates" -AUTOINSTALL="yes" diff --git a/ashmem/uapi/ashmem.h b/ashmem/uapi/ashmem.h deleted file mode 100644 index ba4743c..0000000 --- a/ashmem/uapi/ashmem.h +++ /dev/null @@ -1,47 +0,0 @@ -/* - * drivers/staging/android/uapi/ashmem.h - * - * Copyright 2008 Google Inc. - * Author: Robert Love - * - * This file is dual licensed. It may be redistributed and/or modified - * under the terms of the Apache 2.0 License OR version 2 of the GNU - * General Public License. - */ - -#ifndef _UAPI_LINUX_ASHMEM_H -#define _UAPI_LINUX_ASHMEM_H - -#include - -#define ASHMEM_NAME_LEN 256 - -#define ASHMEM_NAME_DEF "dev/ashmem" - -/* Return values from ASHMEM_PIN: Was the mapping purged while unpinned? */ -#define ASHMEM_NOT_PURGED 0 -#define ASHMEM_WAS_PURGED 1 - -/* Return values from ASHMEM_GET_PIN_STATUS: Is the mapping pinned? */ -#define ASHMEM_IS_UNPINNED 0 -#define ASHMEM_IS_PINNED 1 - -struct ashmem_pin { - __u32 offset; /* offset into region, in bytes, page-aligned */ - __u32 len; /* length forward from offset, in bytes, page-aligned */ -}; - -#define __ASHMEMIOC 0x77 - -#define ASHMEM_SET_NAME _IOW(__ASHMEMIOC, 1, char[ASHMEM_NAME_LEN]) -#define ASHMEM_GET_NAME _IOR(__ASHMEMIOC, 2, char[ASHMEM_NAME_LEN]) -#define ASHMEM_SET_SIZE _IOW(__ASHMEMIOC, 3, size_t) -#define ASHMEM_GET_SIZE _IO(__ASHMEMIOC, 4) -#define ASHMEM_SET_PROT_MASK _IOW(__ASHMEMIOC, 5, unsigned long) -#define ASHMEM_GET_PROT_MASK _IO(__ASHMEMIOC, 6) -#define ASHMEM_PIN _IOW(__ASHMEMIOC, 7, struct ashmem_pin) -#define ASHMEM_UNPIN _IOW(__ASHMEMIOC, 8, struct ashmem_pin) -#define ASHMEM_GET_PIN_STATUS _IO(__ASHMEMIOC, 9) -#define ASHMEM_PURGE_ALL_CACHES _IO(__ASHMEMIOC, 10) - -#endif /* _UAPI_LINUX_ASHMEM_H */ diff --git a/debian/control b/debian/control index 0b732fd..d7ac846 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Package: anbox-modules-dkms Architecture: all Depends: ${misc:Depends}, -Description: Android kernel driver (binder, ashmem) in DKMS format. +Description: Android kernel driver (binder) in DKMS format. . This package contains a out-of-tree version of the core Android - kernel functionalities binder and ashmem. + kernel functionality binder. diff --git a/debian/dkms b/debian/dkms index 1e5d8e1..ed90387 100644 --- a/debian/dkms +++ b/debian/dkms @@ -1,9 +1,7 @@ PACKAGE_NAME="anbox" PACKAGE_VERSION="1" -CLEAN="make -C ashmem clean && make -C binder clean" -MAKE[0]="'make' -j$parallel_jobs -C ashmem KERNEL_SRC=$kernel_source_dir && make -j$parallel_jobs -C binder KERNEL_SRC=$kernel_source_dir" -BUILT_MODULE_NAME[0]="ashmem_linux" -BUILT_MODULE_LOCATION[0]="ashmem" +CLEAN="make -C binder clean" +MAKE[0]="'make -j$parallel_jobs -C binder KERNEL_SRC=$kernel_source_dir" DEST_MODULE_LOCATION[0]="/updates" BUILT_MODULE_NAME[1]="binder_linux" BUILT_MODULE_LOCATION[1]="binder" diff --git a/debian/install b/debian/install index 22ed078..51e9617 100644 --- a/debian/install +++ b/debian/install @@ -1,3 +1,2 @@ -ashmem usr/src/anbox-1 binder usr/src/anbox-1 anbox.conf /etc/modules-load.d/ diff --git a/scripts/build-against-kernel.sh b/scripts/build-against-kernel.sh index da23e4d..2f0a599 100755 --- a/scripts/build-against-kernel.sh +++ b/scripts/build-against-kernel.sh @@ -24,11 +24,6 @@ make prepare CC=${CC} HOSTCC=${CC} make scripts CC=${CC} HOSTCC=${CC} ) -( -cd ashmem || exit 1 -make KERNEL_SRC="../${src_dir}" CC=${CC} HOSTCC=${CC} -) - ( cd binder || exit 1 make KERNEL_SRC="../${src_dir}" CC=${CC} HOSTCC=${CC}