samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Tükrözés 0
Kód Hibajegyek Egyesítési kérések Actions Packages Projektek Kiadások Wiki Tevékenység

smcinvoke: SHM create/delete handling in memory objects

Forráskód böngészése 
simplify handling of shm bridge create and delete
Signed-off-by: Pavan Bobba <quic_pav@quicinc.com>

Change-Id: I231d982ff27725bd20efc0080c6871f079e1be2a
This commit is contained in:
Pavan Bobba
2022-05-17 14:19:00 +05:30
szülő ce09152acc
commit 828d87565b
1 fájl változott, egészen pontosan 10 új sor hozzáadva és 9 régi sor törölve
Download Patch File Download Diff File Expand all files Collapse all files

19
smcinvoke/smcinvoke.c
Fájl megtekintése

@@ -264,7 +264,7 @@ struct smcinvoke_mem_obj {
uint64_t p_addr;
size_t p_addr_len;
struct list_head list;
bool bridge_created_by_others;
bool is_smcinvoke_created_shmbridge;
uint64_t shmbridge_handle;
};
@@ -373,7 +373,7 @@ static uint32_t next_mem_map_obj_id_locked(void)
static inline void free_mem_obj_locked(struct smcinvoke_mem_obj *mem_obj)
{
int ret = 0;
bool is_bridge_created_by_others = mem_obj->bridge_created_by_others;
bool is_bridge_created = mem_obj->is_smcinvoke_created_shmbridge;
struct dma_buf *dmabuf_to_free = mem_obj->dma_buf;
uint64_t shmbridge_handle = mem_obj->shmbridge_handle;
@@ -382,7 +382,7 @@ static inline void free_mem_obj_locked(struct smcinvoke_mem_obj *mem_obj)
mem_obj = NULL;
mutex_unlock(&g_smcinvoke_lock);
if (!is_bridge_created_by_others)
if (is_bridge_created)
ret = qtee_shmbridge_deregister(shmbridge_handle);
if (ret)
pr_err("Error:%d delete bridge failed leaking memory 0x%x\n",
@@ -848,17 +848,18 @@ static int smcinvoke_create_bridge(struct smcinvoke_mem_obj *mem_obj)
ret = qtee_shmbridge_register(phys, size, vmid_list, perms_list, nelems,
tz_perm, &mem_obj->shmbridge_handle);
if (ret && ret != -EEXIST) {
if (ret == 0) {
/* In case of ret=0/success handle has to be freed in memobj release */
mem_obj->is_smcinvoke_created_shmbridge = true;
} else if (ret == -EEXIST) {
ret = 0;
goto exit;
} else {
pr_err("creation of shm bridge for mem_region_id %d failed ret %d\n",
mem_obj->mem_region_id, ret);
goto exit;
}
if (ret == -EEXIST) {
mem_obj->bridge_created_by_others = true;
ret = 0;
}
trace_smcinvoke_create_bridge(mem_obj->shmbridge_handle, mem_obj->mem_region_id);
exit:
kfree(perms_list);