qseecom: Add support to handle multiple app load & unload
Media server is associated with multiple apps on TZ-side.
Unloading a single app for clean up is not enought. QSEECOM
needs to handle the app load & unload of multiple apps
associated with the client. During app_load & app_unload
along with app_id, app_name should also be checked. Besides,
keymaster will not be unloaded.
Change-Id: Iea53362a21e359e54e40a0a93688a05264cfde5c
Signed-off-by: Hariprasad Dhalinarasimha <hnamgund@codeaurora.org>
Signed-off-by: Zhen Kong <zkong@codeaurora.org>
diff --git a/drivers/misc/qseecom.c b/drivers/misc/qseecom.c
index 32b39e7..b55ee8d 100644
--- a/drivers/misc/qseecom.c
+++ b/drivers/misc/qseecom.c
@@ -176,6 +176,7 @@
struct list_head list;
u32 app_id;
u32 ref_cnt;
+ char app_name[MAX_APP_NAME_SIZE];
};
struct qseecom_registered_kclient_list {
@@ -201,7 +202,6 @@
struct device *pdev;
struct cdev cdev;
- bool uclient_shutdown_app;
};
struct qseecom_client_handle {
@@ -211,6 +211,7 @@
uint32_t user_virt_sb_base;
size_t sb_length;
struct ion_handle *ihandle; /* Retrieve phy addr */
+ char app_name[MAX_APP_NAME_SIZE];
};
struct qseecom_listener_handle {
@@ -795,7 +796,9 @@
}
entry->app_id = app_id;
entry->ref_cnt = 1;
-
+ memset((void *)entry->app_name, 0, MAX_APP_NAME_SIZE);
+ memcpy((void *)entry->app_name,
+ (void *)load_img_req.img_name, MAX_APP_NAME_SIZE);
/* Deallocate the handle */
if (!IS_ERR_OR_NULL(ihandle))
ion_free(qseecom.ion_clnt, ihandle);
@@ -809,6 +812,9 @@
(char *)(load_img_req.img_name));
}
data->client.app_id = app_id;
+ memset((void *)data->client.app_name, 0, MAX_APP_NAME_SIZE);
+ memcpy((void *)data->client.app_name,
+ (void *)load_img_req.img_name, MAX_APP_NAME_SIZE);
load_img_req.app_id = app_id;
if (copy_to_user(argp, &load_img_req, sizeof(load_img_req))) {
pr_err("copy_to_user failed\n");
@@ -847,58 +853,64 @@
}
static int qseecom_unload_app(struct qseecom_dev_handle *data,
- bool uclient_release)
+ bool app_crash)
{
unsigned long flags;
+ unsigned long flags1;
int ret = 0;
struct qseecom_command_scm_resp resp;
- struct qseecom_registered_app_list *ptr_app;
+ struct qseecom_registered_app_list *ptr_app = NULL;
bool unload = false;
bool found_app = false;
+ bool found_dead_app = false;
- if ((qseecom.qseos_version == QSEOS_VERSION_14) &&
- (data->client.app_id > 0)) {
+ if (!memcmp(data->client.app_name, "keymaste", strlen("keymaste"))) {
+ pr_warn("Do not unload keymaster app from tz\n");
+ return 0;
+ }
+
+ if (data->client.app_id > 0) {
spin_lock_irqsave(&qseecom.registered_app_list_lock, flags);
list_for_each_entry(ptr_app, &qseecom.registered_app_list_head,
list) {
if (ptr_app->app_id == data->client.app_id) {
- found_app = true;
- if ((uclient_release) &&
- (!qseecom.uclient_shutdown_app)) {
- ptr_app->ref_cnt = 0;
- unload = true;
- break;
- } else {
- if (ptr_app->ref_cnt == 1) {
+ if (!memcmp((void *)ptr_app->app_name,
+ (void *)data->client.app_name,
+ strlen(data->client.app_name))) {
+ found_app = true;
+ if (app_crash) {
unload = true;
break;
} else {
- ptr_app->ref_cnt--;
- pr_debug("Can't unload app(%d) inuse\n",
- ptr_app->app_id);
- break;
+ if (ptr_app->ref_cnt == 1) {
+ unload = true;
+ break;
+ }
}
+ } else {
+ found_dead_app = true;
+ break;
}
}
}
spin_unlock_irqrestore(&qseecom.registered_app_list_lock,
- flags);
- if (found_app == false) {
- pr_err("Cannot find app with id = %d\n",
- data->client.app_id);
+ flags);
+ if (found_app == false && found_dead_app == false) {
+ pr_err("Cannot find app with id = %d (%s)\n",
+ data->client.app_id,
+ (char *)data->client.app_name);
return -EINVAL;
}
}
- if ((unload) && (qseecom.qseos_version == QSEOS_VERSION_14)) {
- struct qseecom_unload_app_ireq req;
-
+ if (found_dead_app) {
+ pr_warn("cleanup dead app: app_id %d(%s)\n", data->client.app_id,
+ (char *)data->client.app_name);
__qseecom_cleanup_app(data);
- spin_lock_irqsave(&qseecom.registered_app_list_lock, flags);
- list_del(&ptr_app->list);
- kzfree(ptr_app);
- spin_unlock_irqrestore(&qseecom.registered_app_list_lock,
- flags);
+ }
+
+ if (unload) {
+ struct qseecom_unload_app_ireq req;
/* Populate the structure for sending scm call to load image */
req.qsee_cmd_id = QSEOS_APP_SHUTDOWN_COMMAND;
req.app_id = data->client.app_id;
@@ -909,11 +921,20 @@
&resp, sizeof(resp));
if (ret) {
pr_err("scm_call to unload app (id = %d) failed\n",
- req.app_id);
+ req.app_id);
return -EFAULT;
} else {
pr_warn("App id %d now unloaded\n", req.app_id);
}
+ if (resp.result == QSEOS_RESULT_FAILURE) {
+ pr_err("app (%d) unload_failed!!\n",
+ data->client.app_id);
+ return -EFAULT;
+ }
+ if (resp.result == QSEOS_RESULT_SUCCESS)
+ pr_info("App (%d) is unloaded!!\n",
+ data->client.app_id);
+ __qseecom_cleanup_app(data);
if (resp.result == QSEOS_RESULT_INCOMPLETE) {
ret = __qseecom_process_incomplete_cmd(data, &resp);
if (ret) {
@@ -936,6 +957,28 @@
}
}
}
+ if (found_app) {
+ spin_lock_irqsave(&qseecom.registered_app_list_lock, flags1);
+ if (app_crash) {
+ ptr_app->ref_cnt = 0;
+ pr_debug("app_crash: ref_count = 0\n");
+ } else {
+ if (ptr_app->ref_cnt == 1) {
+ ptr_app->ref_cnt = 0;
+ pr_info("ref_count set to 0\n");
+ } else {
+ ptr_app->ref_cnt--;
+ pr_info("Can't unload app(%d) inuse\n",
+ ptr_app->app_id);
+ }
+ }
+ if (unload) {
+ list_del(&ptr_app->list);
+ kzfree(ptr_app);
+ }
+ spin_unlock_irqrestore(&qseecom.registered_app_list_lock,
+ flags1);
+ }
qseecom_unmap_ion_allocated_memory(data);
data->released = true;
return ret;
@@ -1046,6 +1089,9 @@
u32 reqd_len_sb_in = 0;
struct qseecom_client_send_data_ireq send_data_req;
struct qseecom_command_scm_resp resp;
+ unsigned long flags;
+ struct qseecom_registered_app_list *ptr_app;
+ bool found_app = false;
if (req->cmd_req_buf == NULL || req->resp_buf == NULL) {
pr_err("cmd buffer or response buffer is null\n");
@@ -1087,6 +1133,26 @@
return -ENOMEM;
}
+ /* find app_id & img_name from list */
+ spin_lock_irqsave(&qseecom.registered_app_list_lock, flags);
+ list_for_each_entry(ptr_app, &qseecom.registered_app_list_head,
+ list) {
+ if ((ptr_app->app_id == data->client.app_id) &&
+ (!memcmp((void *)ptr_app->app_name,
+ (void *)data->client.app_name,
+ strlen(data->client.app_name)))) {
+ found_app = true;
+ break;
+ }
+ }
+ spin_unlock_irqrestore(&qseecom.registered_app_list_lock, flags);
+
+ if (!found_app) {
+ pr_err("app_id %d (%s) is not found\n", data->client.app_id,
+ (char *)data->client.app_name);
+ return -EINVAL;
+ }
+
send_data_req.qsee_cmd_id = QSEOS_CLIENT_SEND_DATA_COMMAND;
send_data_req.app_id = data->client.app_id;
send_data_req.req_ptr = (void *)(__qseecom_uvirt_to_kphys(data,
@@ -2059,7 +2125,9 @@
&qseecom.registered_app_list_lock, flags);
data->client.app_id = ret;
query_req.app_id = ret;
-
+ memset((void *)data->client.app_name, 0, MAX_APP_NAME_SIZE);
+ memcpy((void *)data->client.app_name,
+ (void *)query_req.app_name, MAX_APP_NAME_SIZE);
if (copy_to_user(argp, &query_req, sizeof(query_req))) {
pr_err("copy_to_user failed\n");
return -EFAULT;
@@ -2171,7 +2239,6 @@
pr_debug("UNLOAD_APP: qseecom_addr = 0x%x\n", (u32)data);
mutex_lock(&app_access_lock);
atomic_inc(&data->ioctl_count);
- qseecom.uclient_shutdown_app = true;
ret = qseecom_unload_app(data, false);
atomic_dec(&data->ioctl_count);
mutex_unlock(&app_access_lock);
@@ -2268,6 +2335,7 @@
data->abort = 0;
data->type = QSEECOM_GENERIC;
data->released = false;
+ memset((void *)data->client.app_name, 0, MAX_APP_NAME_SIZE);
init_waitqueue_head(&data->abort_wq);
atomic_set(&data->ioctl_count, 0);
if (qseecom.qseos_version == QSEOS_VERSION_13) {
@@ -2324,7 +2392,6 @@
kfree(data);
return ret;
}
- qseecom.uclient_shutdown_app = false;
}
if (qseecom.qseos_version == QSEOS_VERSION_13) {
mutex_lock(&pil_access_lock);