samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
포크 0
코드 이슈 풀 리퀘스트 Actions Packages Projects 릴리즈 위키 활동

smcinvoke: No need maintain bridge_created by others flag.

소스 검색 
Ref_count should be with shmbridge and shmbridge should
maintain real owner and ref_count info as smcinvoke is a
client it should blindly do register and deregister.

Change-Id: Ib9400af0db1abafa7c6262e7cd80c8ae301a4ed1
Signed-off-by: Nitin LNU <quic_nlakra@quicinc.com>
This commit is contained in:
Nitin LNU
2022-05-16 11:00:33 +05:30
committed by Gerrit - the friendly Code Review server
부모 f76193ca96
커밋 8083b9b690
1개의 변경된 파일과 5개의 추가작업 그리고 13개의 파일을 삭제
Download Patch File Download Diff File Expand all files Collapse all files

18
smcinvoke/smcinvoke.c
파일 보기

@@ -333,7 +333,6 @@ struct smcinvoke_mem_obj {
uint64_t p_addr; uint64_t p_addr;
size_t p_addr_len; size_t p_addr_len;
struct list_head list; struct list_head list;
bool is_smcinvoke_created_shmbridge;
uint64_t shmbridge_handle; uint64_t shmbridge_handle;
struct smcinvoke_server_info *server; struct smcinvoke_server_info *server;
int32_t mem_obj_user_fd; int32_t mem_obj_user_fd;
@@ -809,7 +808,6 @@ static void queue_mem_obj_pending_async_locked(struct smcinvoke_mem_obj *mem_obj
static inline void free_mem_obj_locked(struct smcinvoke_mem_obj *mem_obj) static inline void free_mem_obj_locked(struct smcinvoke_mem_obj *mem_obj)
{ {
int ret = 0; int ret = 0;
bool is_bridge_created = mem_obj->is_smcinvoke_created_shmbridge;
struct dma_buf *dmabuf_to_free = mem_obj->dma_buf; struct dma_buf *dmabuf_to_free = mem_obj->dma_buf;
uint64_t shmbridge_handle = mem_obj->shmbridge_handle; uint64_t shmbridge_handle = mem_obj->shmbridge_handle;
struct smcinvoke_shmbridge_deregister_pending_list *entry = NULL; struct smcinvoke_shmbridge_deregister_pending_list *entry = NULL;
@@ -820,7 +818,7 @@ static inline void free_mem_obj_locked(struct smcinvoke_mem_obj *mem_obj)
mem_obj = NULL; mem_obj = NULL;
mutex_unlock(&g_smcinvoke_lock); mutex_unlock(&g_smcinvoke_lock);
if (is_bridge_created) if (shmbridge_handle)
ret = qtee_shmbridge_deregister(shmbridge_handle); ret = qtee_shmbridge_deregister(shmbridge_handle);
if (ret) { if (ret) {
pr_err("Error:%d delete bridge failed leaking memory 0x%x\n", pr_err("Error:%d delete bridge failed leaking memory 0x%x\n",
@@ -1159,16 +1157,10 @@ static int smcinvoke_create_bridge(struct smcinvoke_mem_obj *mem_obj)
ret = qtee_shmbridge_register(phys, size, vmid_list, perms_list, nelems, ret = qtee_shmbridge_register(phys, size, vmid_list, perms_list, nelems,
tz_perm, &mem_obj->shmbridge_handle); tz_perm, &mem_obj->shmbridge_handle);
if (ret == 0) { if (ret) {
/* In case of ret=0/success handle has to be freed in memobj release */ pr_err("creation of shm bridge for mem_region_id %d failed ret %d\n",
mem_obj->is_smcinvoke_created_shmbridge = true; mem_obj->mem_region_id, ret);
} else if (ret == -EEXIST) { goto exit;
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;
} }
trace_smcinvoke_create_bridge(mem_obj->shmbridge_handle, mem_obj->mem_region_id); trace_smcinvoke_create_bridge(mem_obj->shmbridge_handle, mem_obj->mem_region_id);