ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "trusty: storage: proxy: FS_READY property setting on vendor only" into main

Browse source
This commit is contained in:
Treehugger Robot 2024-09-24 00:43:54 +00:00 • committed by Gerrit Code Review
commit 02ae1e127d
2 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
trusty/storage/proxy/Android.bp
View file

@ -47,7 +47,12 @@ cc_binary {
"libtrustystorageinterface", "libtrustystorageinterface",
"libtrusty", "libtrusty",
], ],
target: {
vendor: {
// vendor variant requires this flag
cflags: ["-DVENDOR_FS_READY_PROPERTY"],
},
},
cflags: [ cflags: [
"-Wall", "-Wall",
"-Werror", "-Werror",

26
trusty/storage/proxy/storage.c
View file

@ -54,6 +54,8 @@ static const char *ssdir_name;
/* List head for storage mapping, elements added at init, and never removed */ /* List head for storage mapping, elements added at init, and never removed */
static struct storage_mapping_node* storage_mapping_head; static struct storage_mapping_node* storage_mapping_head;
#ifdef VENDOR_FS_READY_PROPERTY
/* /*
* Properties set to 1 after we have opened a file under ssdir_name. The backing * Properties set to 1 after we have opened a file under ssdir_name. The backing
* files for both TD and TDP are currently located under /data/vendor/ss and can * files for both TD and TDP are currently located under /data/vendor/ss and can
@ -75,16 +77,6 @@ static struct storage_mapping_node* storage_mapping_head;
static bool fs_ready_set = false; static bool fs_ready_set = false;
static bool fs_ready_rw_set = false; static bool fs_ready_rw_set = false;
static enum sync_state fs_state;
static enum sync_state fd_state[FD_TBL_SIZE];
static bool alternate_mode;
static struct {
struct storage_file_read_resp hdr;
uint8_t data[MAX_READ_SIZE];
} read_rsp;
static bool property_set_helper(const char* prop) { static bool property_set_helper(const char* prop) {
int rc = property_set(prop, "1"); int rc = property_set(prop, "1");
if (rc == 0) { if (rc == 0) {
@ -96,6 +88,18 @@ static bool property_set_helper(const char* prop) {
return rc == 0; return rc == 0;
} }
#endif // #ifdef VENDOR_FS_READY_PROPERTY
static enum sync_state fs_state;
static enum sync_state fd_state[FD_TBL_SIZE];
static bool alternate_mode;
static struct {
struct storage_file_read_resp hdr;
uint8_t data[MAX_READ_SIZE];
} read_rsp;
static uint32_t insert_fd(int open_flags, int fd, struct storage_mapping_node* node) { static uint32_t insert_fd(int open_flags, int fd, struct storage_mapping_node* node) {
uint32_t handle = fd; uint32_t handle = fd;
@ -535,6 +539,7 @@ int storage_file_open(struct storage_msg* msg, const void* r, size_t req_len,
free(path); free(path);
path = NULL; path = NULL;
#ifdef VENDOR_FS_READY_PROPERTY
/* a backing file has been opened, notify any waiting init steps */ /* a backing file has been opened, notify any waiting init steps */
if (!fs_ready_set || !fs_ready_rw_set) { if (!fs_ready_set || !fs_ready_rw_set) {
bool is_checkpoint_active = false; bool is_checkpoint_active = false;
@ -552,6 +557,7 @@ int storage_file_open(struct storage_msg* msg, const void* r, size_t req_len,
} }
} }
} }
#endif // #ifdef VENDOR_FS_READY_PROPERTY
return ipc_respond(msg, &resp, sizeof(resp)); return ipc_respond(msg, &resp, sizeof(resp));