commit 2e531d7af722300998e65c62e14e242d1c015159
author zhenyu.gao <zhenyu.gao@amlogic.com> Thu May 16 17:31:03 2024 +0800
committer Zhenyu Gao <zhenyu.gao@amlogic.com> Wed May 22 00:51:49 2024 -0700
tree 1be7fd653110ec6ad843f4c9c852c5974f6ae8ea
parent 835ec579fb297bec02f2a67dffd22456ddc9e436

aml_commonlib: CF1 Fix updateenv block issue [1/1]

PD#OTT-59596

Problem:
When bootenv_update is called, fsync occasionally takes too long time,
resulting in the failure of "envimg_buffer_lock".

Solution:
Remove the fsync operation and use the "O_SYNC" parameter instead,
Change the lock operation to infinite wait

Verify:
SC2-AH212
RDK trunk PB#9005
YOCTO 4.0 PB#1630

Change-Id: I4115777283532703260b1f7c53dc6f560af6aba7
Signed-off-by: zhenyu.gao <zhenyu.gao@amlogic.com>

ubootenv/ubootenv.c

diff --git a/ubootenv/ubootenv.c b/ubootenv/ubootenv.c
index 0b920d4..6e289f8 100644
--- a/ubootenv/ubootenv.c
+++ b/ubootenv/ubootenv.c
@@ -96,13 +96,22 @@
 }
 
 static void envimg_buffer_lock() {
-  int max_retry_cnt = 1000;
-  while (__sync_val_compare_and_swap(&gs_env_shm_info->lock, 0, 1) &&
-         max_retry_cnt-- > 0)
+  unsigned int max_retry_cnt = 0;
+  while (__sync_val_compare_and_swap(&gs_env_shm_info->lock, 0, 1)) {
+    if (max_retry_cnt++ >= 1000) {
+      ERROR("[ubootenv][%d] envimg_buffer_lock failed !!! lock=%d, retry..\n",
+            gettid(), gs_env_shm_info->lock);
+      max_retry_cnt = 0;
+    }
+
     usleep(1000);
+  }
 }
 
 static void envimg_buffer_unlock() {
+  if (gs_env_shm_info->lock != 1)
+    ERROR("[ubootenv][%d] envimg_buffer_unlock failed! lock = %d\n", gettid(),
+          gs_env_shm_info->lock);
   assert(__sync_val_compare_and_swap(&gs_env_shm_info->lock, 1, 0));
 }
 
@@ -405,7 +414,7 @@
   env_serialize_data();
   *(gs_env_data.crc) = crc32(gs_env_data.data, gs_env_data_size);
 
-  if ((fd = open(gs_partition_name, O_RDWR)) < 0) {
+  if ((fd = open(gs_partition_name, O_RDWR | O_SYNC)) < 0) {
     ERROR("[ubootenv] open devices error\n");
     return -1;
   }
@@ -463,22 +472,13 @@
     // emmc and nand needn't erase
     err = write(fd, gs_env_data.image, gs_env_partition_size);
   }
-
-  FILE *fp = NULL;
-  fp = fdopen(fd, "r+");
-  if (fp == NULL) {
-    ERROR("fdopen failed!\n");
+  if (err < 0) {
+    ERROR("[ubootenv] ERROR write, size %d \n", gs_env_partition_size);
     close(fd);
     return -3;
   }
 
-  fflush(fp);
-  fsync(fd);
-  fclose(fp);
-  if (err < 0) {
-    ERROR("[ubootenv] ERROR write, size %d \n", gs_env_partition_size);
-    return -3;
-  }
+  close(fd);
   return 0;
 }