!1066 【挑单】time相关系统调用内核栈信息泄露排查

Merge pull request !1066 from zhushengle/cherry-pick-1668148730

.gitee/PULL_REQUEST_TEMPLATE.zh-CN.md

@@ -1,6 +1,6 @@
 ### 相关的Issue
 
-
+  
 ### 原因（目的、解决的问题等）
 
 
@@ -8,14 +8,5 @@
 
 
 ### 测试用例（新增、改动、可能影响的功能）
-
-
-### 是否需要同步至release（如：3.0LTS ... ）分支？
-
-必须选择一项（在MarkDown模式下用[x]替换[ ]即可勾选对应选项）:
-- [ ] 是，需要同步的分支：
-- [ ] 否
-
-理由：
-
-
+    
+    

BUILD.gn

@@ -29,15 +29,17 @@
 
 import("//build/lite/config/component/lite_component.gni")
 
-LITEOS_MENUCONFIG_H = rebase_path("$root_out_dir/config.h")
-
 declare_args() {
   tee_enable = false
   liteos_name = "OHOS_Image"
   liteos_skip_make = false
-  liteos_is_mini = false
 }
 
+cmd = "if [ -f $device_path/BUILD.gn ]; then echo true; else echo false; fi"
+HAVE_DEVICE_SDK = exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
+
+LITEOS_MENUCONFIG_H = rebase_path("$root_out_dir/config.h")
+
 tee = ""
 if (tee_enable) {
   tee = "_tee"
@@ -47,27 +49,29 @@ declare_args() {
   liteos_config_file = "${ohos_build_type}${tee}.config"
 }
 
-liteos_config_file =
-    rebase_path(liteos_config_file, "", "$product_path/kernel_configs")
+liteos_config_file = rebase_path(liteos_config_file, "", "$product_path/kernel_configs")
 print("liteos_config_file:", liteos_config_file)
 
 exec_script("//build/lite/run_shell_cmd.py",
-            [ "env" + " CONFIG_=LOSCFG_" + " KCONFIG_CONFIG_HEADER='y=true'" +
-                  " KCONFIG_CONFIG=$liteos_config_file" +
-                  " DEVICE_PATH=$device_path" + " srctree=" + rebase_path(".") +
-                  " genconfig" + " --header-path $LITEOS_MENUCONFIG_H" +
-                  " --file-list kconfig_files.txt" +
-                  " --env-list kconfig_env.txt" + " --config-out config.gni" ],
-            "",
-            [ liteos_config_file ])
+            [
+              "env" +
+              " CONFIG_=LOSCFG_" +
+              " KCONFIG_CONFIG_HEADER='y=true'" +
+              " KCONFIG_CONFIG=$liteos_config_file" +
+              " DEVICE_PATH=$device_path" +
+              " srctree=" + rebase_path(".") +
+              " genconfig" +
+              " --header-path $LITEOS_MENUCONFIG_H" +
+              " --file-list kconfig_files.txt" +
+              " --env-list kconfig_env.txt" +
+              " --config-out config.gni",
+            ], "", [ liteos_config_file ])
 
 import("liteos.gni")
 
 assert(ARCH != "", "ARCH not set!")
 assert(ARCH == arch, "ARCH not match! details: $ARCH != $arch")
 assert(tee_enable == defined(LOSCFG_TEE_ENABLE), "TEE switch not match!")
-assert(ohos_build_compiler == "clang" == defined(LOSCFG_COMPILER_CLANG_LLVM),
-       "compiler not match!")
 
 generate_notice_file("kernel_notice_file") {
   module_name = "kernel"
@@ -76,6 +80,7 @@ generate_notice_file("kernel_notice_file") {
     "$LITEOSTHIRDPARTY/musl",
     "$LITEOSTHIRDPARTY/zlib",
     "$LITEOSTHIRDPARTY/FatFs",
+    "$LITEOSTHIRDPARTY/Linux_Kernel",
     "$LITEOSTHIRDPARTY/lwip",
     "$LITEOSTHIRDPARTY/NuttX",
     "$LITEOSTHIRDPARTY/mtd-utils",
@@ -108,7 +113,7 @@ config("arch_config") {
   ldflags = cflags
   if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
     if (!defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-      cflags += [ "-mthumb-interwork" ]
+      cflags += ["-mthumb-interwork"]
     }
   }
   if (defined(LOSCFG_THUMB)) {
@@ -122,16 +127,12 @@ config("arch_config") {
 }
 
 config("stdinc_config") {
-  std_include = exec_script("//build/lite/run_shell_cmd.py",
-                            [ "$cc -print-file-name=include" ],
-                            "trim string")
+  std_include = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-file-name=include" ], "trim string")
   cflags = [
     "-isystem",
     std_include,
   ]
-  if (!defined(LOSCFG_LIBC_NEWLIB)) {
-    cflags += [ "-nostdinc" ]
-  }
+  cflags += [ "-nostdinc" ]
   asmflags = cflags
 }
 
@@ -176,7 +177,7 @@ config("optimize_config") {
     if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
       cflags += [ "-flto=thin" ]
     } else {
-      #cflags += [ "-flto" ]
+      cflags += [ "-flto" ]
     }
   }
   cflags += [ optimization_cflag ]
@@ -198,10 +199,8 @@ config("warn_config") {
     "-Wpointer-arith",
     "-Wstrict-prototypes",
     "-Winvalid-pch",
+    "-Wno-address-of-packed-member",
   ]
-  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    cflags += [ "-Wno-address-of-packed-member" ]
-  }
   asmflags = cflags
 }
 
@@ -212,7 +211,6 @@ config("dialect_config") {
 
 config("misc_config") {
   defines = [ "__LITEOS__" ]
-  defines += [ "__LITEOS_A__" ]
   if (!defined(LOSCFG_DEBUG_VERSION)) {
     defines += [ "NDEBUG" ]
   }
@@ -252,12 +250,62 @@ config("los_config") {
   ]
 }
 
-cmd = "if [ -f $device_path/BUILD.gn ]; then echo true; else echo false; fi"
-HAVE_DEVICE_SDK = exec_script("//build/lite/run_shell_cmd.py", [ cmd ], "value")
+executable("liteos") {
+  configs = [] # clear default configs
+  configs += [ ":arch_config" ]
+  configs += [ ":public" ]
+
+  ldflags = [
+    "-static",
+    "-nostdlib",
+    "-Wl,--gc-sections",
+    "-Wl,-Map=$liteos_name.map",
+    "-Wl,--no-eh-frame-hdr",
+  ]
+
+  libgcc = exec_script("//build/lite/run_shell_cmd.py", [ "$cc -print-libgcc-file-name" ], "trim string")
+  libs = [ libgcc ]
+  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
+    ldflags += [ "-Wl,-T" + rebase_path("tools/build/liteos_llvm.ld", root_build_dir) ]
+    inputs = [ "tools/build/liteos_llvm.ld" ]
+  } else {
+    ldflags += [ "-Wl,-T" + rebase_path("tools/build/liteos.ld", root_build_dir) ]
+    ldflags += [ "-Wl,-nostartfiles" ]
+    inputs = [ "tools/build/liteos.ld" ]
+  }
+
+  inputs += [ "$root_out_dir/board.ld" ]
+
+  output_dir = target_out_dir
+
+  deps = [
+    "platform:copy_board.ld",
+    ":modules",
+  ]
+}
+
+copy("copy_liteos") {
+  deps = [ ":liteos" ]
+  sources = [ "$target_out_dir/unstripped/bin/liteos" ]
+  outputs = [ "$root_out_dir/$liteos_name" ]
+}
+
+build_ext_component("build_kernel_image") {
+  deps = [ ":copy_liteos" ]
+  exec_path = rebase_path(root_out_dir)
+
+  objcopy = "${compile_prefix}objcopy$toolchain_cmd_suffix"
+  objdump = "${compile_prefix}objdump$toolchain_cmd_suffix"
+
+  command = "$objcopy -O binary $liteos_name $liteos_name.bin"
+  command += " && sh -c '$objdump -t $liteos_name | sort >$liteos_name.sym.sorted'"
+  command += " && sh -c '$objdump -d $liteos_name >$liteos_name.asm'"
+}
 
 config("public") {
   configs = [
     "arch:public",
+    "platform:public",
     "kernel:public",
     "compat:public",
     "bsd:public",
@@ -289,15 +337,15 @@ group("modules") {
     "kernel",
     "lib",
     "net",
+    "platform",
     "security",
     "shell",
     "syscall",
-    "testsuites/kernel:kernel_test",
   ]
 
   deps += [
-    "//drivers/liteos",
     HDFTOPDIR,
+    "//drivers/liteos",
   ]
 
   if (HAVE_DEVICE_SDK) {
@@ -318,87 +366,13 @@ group("kernel") {
 }
 
 group("liteos_a") {
-  deps = [ ":kernel" ]
-  if (!liteos_is_mini) {
-    deps += [
-      ":apps",
-      ":tests",
-      "//prebuilts/lite/sysroot/build:strip",
-    ]
-    if (liteos_skip_make == false) {
-      deps += [ ":make" ]
-    }
-  }
-}
-
-executable("liteos") {
-  configs = []  # clear default configs
-  configs += [ ":arch_config" ]
-  configs += [ ":public" ]
-
-  ldflags = [
-    "-static",
-    "-nostdlib",
-    "-Wl,--gc-sections",
-    "-Wl,-Map=$liteos_name.map",
-    "-Wl,--no-eh-frame-hdr",
-  ]
-
-  if (defined(LOSCFG_LIBC_NEWLIB)) {
-    ldflags += [
-      "-Wl,--wrap=_free_r",
-      "-Wl,--wrap,_malloc_usable_size_r",
-      "-Wl,--wrap,_malloc_r",
-      "-Wl,--wrap,_memalign_r",
-      "-Wl,--wrap,_realloc_r",
-      "-Wl,--wrap,_fseeko_r",
-    ]
-    ldflags -= [ "-nostdlib" ]
-  }
-  libgcc = exec_script("//build/lite/run_shell_cmd.py",
-                       [ "$cc -print-libgcc-file-name" ],
-                       "trim string")
-  libs = [ libgcc ]
-  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    ldflags +=
-        [ "-Wl,-T" + rebase_path("tools/build/liteos_llvm.ld", root_build_dir) ]
-    inputs = [ "tools/build/liteos_llvm.ld" ]
-  } else {
-    ldflags +=
-        [ "-Wl,-T" + rebase_path("tools/build/liteos.ld", root_build_dir) ]
-    ldflags += [ "-nostartfiles" ]
-    inputs = [ "tools/build/liteos.ld" ]
-  }
-
-  inputs += [ "$root_out_dir/board.ld" ]
-
-  output_dir = target_out_dir
-
   deps = [
-    ":modules",
-    "platform:copy_board.ld",
+    ":apps",
+    ":kernel",
+    ":tests",
   ]
 }
 
-copy("copy_liteos") {
-  deps = [ ":liteos" ]
-  sources = [ "$target_out_dir/unstripped/bin/liteos" ]
-  outputs = [ "$root_out_dir/$liteos_name" ]
-}
-
-build_ext_component("build_kernel_image") {
-  deps = [ ":copy_liteos" ]
-  exec_path = rebase_path(root_out_dir)
-
-  objcopy = "${compile_prefix}objcopy$toolchain_cmd_suffix"
-  objdump = "${compile_prefix}objdump$toolchain_cmd_suffix"
-
-  command = "$objcopy -O binary $liteos_name $liteos_name.bin"
-  command +=
-      " && sh -c '$objdump -t $liteos_name | sort >$liteos_name.sym.sorted'"
-  command += " && sh -c '$objdump -d $liteos_name >$liteos_name.asm'"
-}
-
 build_ext_component("make") {
   exec_path = rebase_path(".", root_build_dir)
   outdir = rebase_path("$target_out_dir/${target_name}_out")

Kconfig

@@ -50,7 +50,7 @@ config COMPILER_CLANG_LLVM
 config LLVM_TARGET
     string "Clang LLVM target"
     depends on COMPILER_CLANG_LLVM
-    default "arm-liteos-ohos" if ARCH_ARM_AARCH32
+    default "arm-liteos" if ARCH_ARM_AARCH32
 
 endchoice
 
@@ -94,6 +94,15 @@ source "platform/Kconfig"
 ######################### config options of cpu arch ################
 source "arch/Kconfig"
 
+######################### config options of rootfs #####################
+source "kernel/common/rootfs/Kconfig"
+######################### config options of patchfs #####################
+source "kernel/common/patchfs/Kconfig"
+######################### config options of blackbox #####################
+source "kernel/common/blackbox/Kconfig"
+######################### config options of hidumper #####################
+source "kernel/common/hidumper/Kconfig"
+
 config QUICK_START
     bool "Enable QUICK_START"
     default n
@@ -114,7 +123,36 @@ endmenu
 
 ######################## config options of filesystem ##################
 menu "FileSystem"
-source "fs/Kconfig"
+source "fs/vfs/Kconfig"
+source "fs/fat/Kconfig"
+source "fs/ramfs/Kconfig"
+source "fs/romfs/Kconfig"
+source "fs/nfs/Kconfig"
+source "fs/proc/Kconfig"
+source "fs/jffs2/Kconfig"
+source "fs/zpfs/Kconfig"
+config ENABLE_READ_BUFFER
+    bool "Enable read buffer Option"
+    default n
+    depends on FS_VFS
+    help
+      Answer Y to add enable read buffer Option.
+
+config MAX_VNODE_SIZE
+    int "Vnode max number"
+    range 0 512
+    default 512
+    depends on FS_VFS
+    help
+      vnode number, range from 0 to 512.
+
+config MAX_PATH_CACHE_SIZE
+    int "PathCache max number"
+    range 0 1024
+    default 512
+    depends on FS_VFS
+    help
+      pathCache number, range from 0 to 1024.
 endmenu
 
 ######################## config options of net ############################
@@ -189,7 +227,7 @@ config DEBUG_VERSION
       It also means you do not want to use debug modules, like shell,telnet,tftp,nfs and
       memory check, etc.
       If you select this option that means you enable a debug version for LiteOS.
-      That means you want an opposite behaviour compared to release version.
+      That means you want a opposite behaviour compared to release version.
 
 config DEBUG_KERNEL
     bool "Enable Debug LiteOS Kernel Resource"
@@ -198,7 +236,7 @@ config DEBUG_KERNEL
     help
       If you select this option that means you enable debugging kernel resource.
       It also means you want to get queue, mutex, semaphore, memory debug information.
-      That means you want an opposite behaviour compared to release version.
+      That means you want a opposite behaviour compared to release version.
 
 config DEBUG_QUEUE
     bool "Enable Queue Debugging"
@@ -265,7 +303,7 @@ config MEM_LEAKCHECK
     default n
     depends on DEBUG_VERSION && MEM_DEBUG
     help
-      Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the informations of mem node.
+      Answer Y to enable record the LR of Function call stack of Mem operation, it can check the mem leak through the infomations of mem node.
 config BASE_MEM_NODE_INTEGRITY_CHECK
     bool "Enable integrity check or not"
     default n
@@ -286,10 +324,29 @@ endmenu
 
 ######################## config options os drivers ########################
 menu "Driver"
-source "drivers/Kconfig"
+config DRIVERS
+    bool "Enable Driver"
+    default y
+    help
+      Answer Y to enable LiteOS support driver.
+
+source "bsd/dev/usb/Kconfig"
+source "../../drivers/adapter/khdf/liteos/Kconfig"
+
+# Device driver Kconfig import
+source "$(DEVICE_PATH)/drivers/Kconfig"
+
+source "drivers/char/mem/Kconfig"
+source "drivers/char/quickstart/Kconfig"
+source "drivers/char/random/Kconfig"
+source "drivers/char/video/Kconfig"
+source "drivers/char/trace/Kconfig"
+
+source "../../drivers/liteos/tzdriver/Kconfig"
+source "../../drivers/liteos/hievent/Kconfig"
+
 endmenu
 
-######################## config options os security #######################
 menu "Security"
 source "security/Kconfig"
 endmenu

Makefile

@@ -61,6 +61,12 @@ endif
 
 KCONFIG_CONFIG ?= $(CONFIG)
 SYSROOT_PATH ?= $(OUT)/sysroot
+LITEOS_MENUCONFIG_H ?= $(LITEOSTOPDIR)/config.h
+LITEOS_CONFIG_FILE ?= $(LITEOSTOPDIR)/.config
+
+# export los_config.mk related environment variables
+export LITEOS_MENUCONFIG_H
+export LITEOS_CONFIG_FILE
 
 # export subdir Makefile related environment variables
 export SYSROOT_PATH
@@ -97,7 +103,7 @@ Targets:
     cleanall:   clean all build outputs
     all:        make liteos kernel image and rootfs image (Default target)
     $(APPS):       build all apps
-    $(ROOTFS):     make an original rootfs image
+    $(ROOTFS):     make a original rootfs image
     $(LITEOS_LIBS_TARGET):       compile all kernel modules (libraries)
     $(LITEOS_TARGET):     make liteos kernel image
     update_config:  update product kernel config (use menuconfig)
@@ -119,6 +125,7 @@ help:
 
 sysroot:
 	$(HIDE)echo "sysroot:" $(abspath $(SYSROOT_PATH))
+ifeq ($(LOSCFG_COMPILER_CLANG_LLVM), y)
 ifeq ($(origin SYSROOT_PATH),file)
 	$(HIDE)mkdir -p $(SYSROOT_PATH)/build && cd $(SYSROOT_PATH)/build && \
 	ln -snf $(LITEOSTOPDIR)/../../prebuilts/lite/sysroot/build/Makefile && \
@@ -128,9 +135,11 @@ ifeq ($(origin SYSROOT_PATH),file)
 		ARCH_CFLAGS="$(LITEOS_CORE_COPTS) -w" \
 		TOPDIR="$(LITEOSTOPDIR)/../.." \
 		SYSROOTDIR="$(SYSROOT_PATH)" \
-		$(if $(LOSCFG_COMPILER_CLANG_LLVM),CLANG="$(LITEOS_COMPILER_PATH)clang",GCC="$(CC)") \
+		CLANG="$(LITEOS_COMPILER_PATH)clang" \
+		BUILD_ALL_MULTILIB=false \
 		BUILD_DEBUG=$(if $(patsubst y,,$(or $(RELEASE:1=y),n)),true,false)
 endif
+endif
 
 $(filter-out menuconfig,$(KCONFIG_CMDS)):
 	$(HIDE)$@ $(args)

OAT.xml

@@ -12,10 +12,9 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
 
-<!--
-   This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README.
+    This is the configuration file template for OpenHarmony OSS Audit Tool, please copy it to your project root dir and modify it refer to OpenHarmony/tools_oat/README.
+
 -->
 
 <configuration>

README.md

@@ -73,9 +73,9 @@ OpenHarmony LiteOS Cortex-A supports the  [Hi3518E V300](https://gitee.com/openh
 
 You need to set up the compilation environment on Linux.
 
--   [Setting Up Ubuntu Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-env-setup-linux.md)
--   For Hi3518E V300, see  [Setting Up the Hi3518 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-hi3518-setting.md).
--   For Hi3516D V300, see  [Setting Up the Hi3516 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-hi3516-setting.md).
+-   [Compilation environment on Linux](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-env-setup-lin.md)
+-   For Hi3518E V300, see  [Setting Up the Hi3518 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3518-setting.md).
+-   For Hi3516D V300, see  [Setting Up the Hi3516 Development Environment](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3516-setting.md).
 
 ### Source Code Acquisition<a name="section11443189655"></a>
 
@@ -85,9 +85,9 @@ Download and decompress a set of source code on a Linux server to acquire the  [
 
 For details about how to develop the first application, see:
 
--   [Developing the First Example Program Running on Hi3518](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-hi3518-running.md)
+-   [Developing the First Example Program Running on Hi3518](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3518-running.md)
 
--   [Developing the First Example Program Running on Hi3516](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-hi3516-running.md)
+-   [Developing the First Example Program Running on Hi3516](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-board3516-running.md)
 
 ## Repositories Involved<a name="section1371113476307"></a>
 
@@ -95,5 +95,5 @@ For details about how to develop the first application, see:
 
 [drivers\_liteos](https://gitee.com/openharmony/drivers_liteos/blob/master/README.md)
 
-[kernel\_liteos\_a](https://gitee.com/openharmony/kernel_liteos_a/blob/master/README.md)
+**kernel\_liteos\_a**
 

README_zh-HK.md

@@ -54,6 +54,7 @@ OpenHarmony LiteOS-A內核是基於Huawei LiteOS內核演進發展的新一代
 │ ├── hw # 時鐘與中斷相關邏輯代碼
 │ ├── include # 對外暴露頭文件存放目錄
 │ └── uart # 串口相關邏輯代碼
+├── platform # 支持不同的芯片平台代碼，如Hi3516DV300等
 ├── security # 安全特性相關的代碼，包括進程權限管理和虛擬id映射管理
 ├── syscall # 系統調用
 └── tools # 構建工具及相關配置和代碼
@@ -67,13 +68,13 @@ OpenHarmony LiteOS-A內核是基於Huawei LiteOS內核演進發展的新一代
 
 ## 使用說明<a name="section741617511812"></a>
 
-OpenHarmony LiteOS-A內核支持Hi3518EV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3518.md)）、Hi3516DV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3516.md)）單板，開發者可基於兩種單板開發運行自己的應用程序。
+OpenHarmony LiteOS-A內核支持Hi3518EV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3518.md)）、Hi3516DV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3516.md)）單板，開發者可基於兩種單板開發運行自己的應用程序。
 
 ### 準備<a name="section1579912573329"></a>
 
 開發者需要在Linux上搭建編譯環境：
 
-- [編譯環境凖備](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-package-environment.md);
+- [Ubuntu編譯環境凖備](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md);
 - Hi3518EV300單板：參考[環境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-setting.md)；
 - Hi3516DV300單板：參考[環境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-setting.md)。
 
@@ -95,4 +96,4 @@ OpenHarmony LiteOS-A內核支持Hi3518EV300（[介紹](https://gitee.com/openhar
 
 [drivers\_liteos](https://gitee.com/openharmony/drivers_liteos/blob/master/README_zh.md)
 
-[kernel\_liteos\_a](https://gitee.com/openharmony/kernel_liteos_a/blob/master/README_zh-HK.md) 
+**kernel\_liteos\_a** 

README_zh.md

@@ -53,6 +53,7 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 │   ├── hw                 # 时钟与中断相关逻辑代码
 │   ├── include            # 对外暴露头文件存放目录
 │   └── uart               # 串口相关逻辑代码
+├── platform               # 支持不同的芯片平台代码，如Hi3516DV300等
 ├── security               # 安全特性相关的代码，包括进程权限管理和虚拟id映射管理
 ├── syscall                # 系统调用
 └── tools                  # 构建工具及相关配置和代码
@@ -66,13 +67,13 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 
 ## 使用说明<a name="section741617511812"></a>
 
-OpenHarmony LiteOS-A内核支持Hi3518EV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3518.md)）、Hi3516DV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3516.md)）单板，开发者可基于两种单板开发运行自己的应用程序。
+OpenHarmony LiteOS-A内核支持Hi3518EV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3518.md)）、Hi3516DV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/oem_minitinier_des_3516.md)）单板，开发者可基于两种单板开发运行自己的应用程序。
 
 ### 准备<a name="section1579912573329"></a>
 
 开发者需要在Linux上搭建编译环境：
 
--   [编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-package-environment.md);
+-   [Ubuntu编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup-linux.md);
 -   Hi3518EV300单板：参考[环境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-setting.md)；
 -   Hi3516DV300单板：参考[环境搭建](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-setting.md)。
 
@@ -94,5 +95,5 @@ OpenHarmony LiteOS-A内核支持Hi3518EV300（[介绍](https://gitee.com/openhar
 
 [drivers\_liteos](https://gitee.com/openharmony/drivers_liteos/blob/master/README_zh.md)
 
-[kernel\_liteos\_a](https://gitee.com/openharmony/kernel_liteos_a/blob/master/README_zh.md)
+**kernel\_liteos\_a**
 

apps/BUILD.gn

@@ -34,8 +34,8 @@ group("apps") {
 
   if (defined(LOSCFG_SHELL)) {
     deps += [
-      "mksh",
       "shell",
+      "mksh",
       "toybox",
     ]
   }
@@ -51,12 +51,4 @@ group("apps") {
   if (defined(LOSCFG_DRIVERS_TRACE)) {
     deps += [ "trace" ]
   }
-
-  if (defined(LOSCFG_DRIVERS_PERF)) {
-    deps += [ "perf" ]
-  }
-
-  if (defined(LOSCFG_KERNEL_LMS)) {
-    deps += [ "lms:sample_usr_lms" ]
-  }
 }

apps/Makefile

@@ -34,7 +34,14 @@ export APPSTOPDIR
 
 include $(APPSTOPDIR)/config.mk
 
-all clean:
-	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir $@ || exit 1; done
+all:
+ifneq ($(APP_SUBDIRS), )
+	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir all || exit 1; done
+endif
+
+clean:
+ifneq ($(APP_SUBDIRS), )
+	$(HIDE) for dir in $(APP_SUBDIRS); do $(MAKE) -C $$dir clean || exit 1; done
+endif
 
 .PHONY: all clean

apps/app.mk

@@ -27,6 +27,88 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-override TARGET = $(OUT)/bin/$(APP_NAME)
+OBJOUT := $(BUILD)$(dir $(subst $(LITEOSTOPDIR),,$(shell pwd)))$(APP_NAME)
 
-include $(MODULE)
+APP := $(OUT)/bin/$(APP_NAME)
+
+# create a separate list of objects per source type
+
+LOCAL_CSRCS := $(filter %.c,$(LOCAL_SRCS))
+LOCAL_CPPSRCS := $(filter %.cpp,$(LOCAL_SRCS))
+LOCAL_ASMSRCS := $(filter %.S,$(LOCAL_SRCS))
+LOCAL_ASMSRCS2 := $(filter %.s,$(LOCAL_SRCS))
+LOCAL_CCSRCS := $(filter %.cc,$(LOCAL_SRCS))
+
+LOCAL_COBJS := $(patsubst %.c,$(OBJOUT)/%.o,$(LOCAL_CSRCS))
+LOCAL_CPPOBJS := $(patsubst %.cpp,$(OBJOUT)/%.o,$(LOCAL_CPPSRCS))
+LOCAL_ASMOBJS := $(patsubst %.S,$(OBJOUT)/%.o,$(LOCAL_ASMSRCS))
+LOCAL_ASMOBJS2 := $(patsubst %.s,$(OBJOUT)/%.o,$(LOCAL_ASMSRCS2))
+LOCAL_CCOBJS := $(patsubst %.cc,$(OBJOUT)/%.o,$(LOCAL_CCSRCS))
+
+LOCAL_OBJS := $(LOCAL_COBJS) $(LOCAL_CPPOBJS) $(LOCAL_ASMOBJS) $(LOCAL_ASMOBJS2) $(LOCAL_CCOBJS)
+
+LOCAL_CGCH := $(patsubst %.h,%.h.gch,$(LOCAL_CHS))
+LOCAL_CPPGCH := $(patsubst %.h,%.h.gch,$(LOCAL_CPPHS))
+
+all : $(APP)
+
+define ECHO =
+ifeq ($$(HIDE),@)
+_$(1) := $($(1))
+$(1) = echo "  $(1)" $$(patsubst $$(OUT)/%,%,$$@) && $$(_$(1))
+endif
+endef
+$(foreach cmd,CC GPP AS,$(eval $(call ECHO,$(cmd))))
+
+LOCAL_FLAGS += -MD -MP
+-include $(LOCAL_OBJS:%.o=%.d)
+
+$(LOCAL_COBJS): $(OBJOUT)/%.o: %.c
+	$(HIDE)$(OBJ_MKDIR)
+	$(HIDE)$(CC) $(CFLAGS) $(LOCAL_FLAGS) $(LOCAL_CFLAGS) -c $< -o $@
+
+$(LOCAL_CPPOBJS): $(OBJOUT)/%.o: %.cpp
+	$(HIDE)$(OBJ_MKDIR)
+	$(HIDE)$(GPP) $(CXXFLAGS) $(LOCAL_FLAGS) $(LOCAL_CPPFLAGS) -c $< -o $@
+
+$(LOCAL_ASMOBJS): $(OBJOUT)/%.o: %.S
+	$(HIDE)$(OBJ_MKDIR)
+	$(HIDE)$(CC) $(CFLAGS) $(LOCAL_FLAGS) $(LOCAL_ASFLAGS) -c $< -o $@
+
+$(LOCAL_ASMOBJS2): $(OBJOUT)/%.o: %.s
+	$(HIDE)$(OBJ_MKDIR)
+	$(HIDE)$(AS) $(ASFLAGS) $(LOCAL_FLAGS) $(LOCAL_ASFLAGS) -c $< -o $@
+
+$(LOCAL_CCOBJS): $(OBJOUT)/%.o: %.cc
+	$(HIDE)$(OBJ_MKDIR)
+	$(HIDE)$(GPP) $(CXXFLAGS) $(LOCAL_FLAGS) $(LOCAL_CPPFLAGS) -c $< -o $@
+
+$(LOCAL_CGCH): %.h.gch : %.h
+	$(HIDE)$(CC) $(CFLAGS) $(LOCAL_FLAGS) $(LOCAL_CFLAGS) $> $^
+
+$(LOCAL_CPPGCH): %.h.gch : %.h
+	$(HIDE)$(GPP) $(CXXFLAGS) $(LOCAL_FLAGS) $(LOCAL_CPPFLAGS) -x c++-header $> $^
+
+LOCAL_GCH := $(LOCAL_CGCH) $(LOCAL_CPPGCH)
+
+$(LOCAL_OBJS): $(LOCAL_GCH)
+$(APP): $(LOCAL_OBJS)
+	$(HIDE)$(OBJ_MKDIR)
+	$(HIDE)$(GPP) $(LDFLAGS) -o $@ $^
+
+clean:
+	$(HIDE)$(RM) $(APP) $(OBJOUT) $(LOCAL_GCH) *.bak *~
+
+.PHONY: all clean
+
+# clear some variables we set here
+LOCAL_CSRCS :=
+LOCAL_CPPSRCS :=
+LOCAL_ASMSRCS :=
+LOCAL_COBJS :=
+LOCAL_CPPOBJS :=
+LOCAL_ASMOBJS :=
+LOCAL_ASMOBJS2 :=
+
+# LOCAL_OBJS is passed back
+#LOCAL_OBJS :=

apps/config.mk

@@ -30,7 +30,7 @@
 include $(LITEOSTOPDIR)/config.mk
 
 # common flags config
-BASE_OPTS := -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE=700
+BASE_OPTS := -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE=700 $(LITEOS_GCOV_OPTS)
 
 ASFLAGS   :=
 CFLAGS    := $(LITEOS_COPTS) $(BASE_OPTS) -fPIE
@@ -70,6 +70,11 @@ ifeq ($(LOSCFG_DRIVERS_TRACE), y)
 APP_SUBDIRS += trace
 endif
 
-ifeq ($(LOSCFG_DRIVERS_PERF), y)
-APP_SUBDIRS += perf
-endif
+# clear all local variables
+LOCAL_FLAGS    :=
+LOCAL_CFLAGS   :=
+LOCAL_CPPFLAGS :=
+LOCAL_ASFLAGS  :=
+LOCAL_SRCS     :=
+LOCAL_CHS      :=
+LOCAL_CPPHS    :=

apps/init/src/init.c

@@ -48,7 +48,6 @@
 #endif
 int main(int argc, char * const *argv)
 {
-    (void)argv;
     int ret;
     pid_t gid;
     const char *shellPath = "/bin/mksh";

apps/lms/BUILD.gn

@@ -1,77 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//build/lite/config/component/lite_component.gni")
-lite_component("LMS-Sample") {
-  features = [ ":sample_usr_lms" ]
-}
-executable("sample_usr_lms") {
-  output_name = "sample_usr_lms"
-  sources = [ "src/sample_usr_lms.c" ]
-  include_dirs = []
-  defines = []
-  if (ohos_build_compiler == "gcc") {
-    cflags_c = [
-      "-O0",
-      "-fsanitize=kernel-address",
-      "-funwind-tables",
-      "-fasynchronous-unwind-tables",
-    ]
-  } else {
-    cflags_c = [
-      "-O0",
-      "-fsanitize=kernel-address",
-      "-mllvm",
-      "-asan-instrumentation-with-call-threshold=0",
-      "-mllvm",
-      "-asan-stack=0",
-      "-mllvm",
-      "-asan-globals=0",
-      "-funwind-tables",
-      "-fasynchronous-unwind-tables",
-    ]
-  }
-  ldflags = [
-    "-rdynamic",
-    "-lunwind",
-    "-lusrlms",
-    "-Wl,--wrap=realloc",
-    "-Wl,--wrap=calloc",
-    "-Wl,--wrap=malloc",
-    "-Wl,--wrap=free",
-    "-Wl,--wrap=valloc",
-    "-Wl,--wrap=aligned_alloc",
-    "-Wl,--wrap=memset",
-    "-Wl,--wrap=memcpy",
-    "-Wl,--wrap=memmove",
-    "-Wl,--wrap=strcpy",
-    "-Wl,--wrap=strcat",
-  ]
-  deps = [ "//kernel/liteos_a/kernel/extended/lms/usr:usrlmslib" ]
-}

apps/lms/src/sample_usr_lms.c

@@ -1,248 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- * conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- * of conditions and the following disclaimer in the documentation and/or other materials
- * provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- * to endorse or promote products derived from this software without specific prior written
- * permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static void BufWriteTest(void *buf, int start, int end)
-{
-    for (int i = start; i <= end; i++) {
-        ((char *)buf)[i] = 'a';
-    }
-}
-
-static void BufReadTest(void *buf, int start, int end)
-{
-    char tmp;
-    for (int i = start; i <= end; i++) {
-        tmp = ((char *)buf)[i];
-    }
-}
-
-static void LmsMallocTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsMallocTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsMallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    printf("[LmsMallocTest] write overflow error should be triggered, write range[0, TEST_SIZE]\n");
-    BufWriteTest(buf, 0, TEST_SIZE);
-
-    free(buf);
-    printf("\n-------- LmsMallocTest End --------\n");
-}
-
-static void LmsReallocTest(void)
-{
-#define TEST_SIZE     64
-#define TEST_SIZE_MIN 32
-    printf("\n-------- LmsReallocTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    printf("[LmsReallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    char *buf1 = (char *)realloc(buf, TEST_SIZE_MIN);
-    if (buf1 == NULL) {
-        free(buf);
-        return;
-    }
-    buf = NULL;
-    printf("[LmsReallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE_MIN]\n");
-    BufReadTest(buf1, -1, TEST_SIZE_MIN);
-    free(buf1);
-    printf("\n-------- LmsReallocTest End --------\n");
-}
-
-static void LmsCallocTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsCallocTest Start --------\n");
-    char *buf = (char *)calloc(4, 4); /* 4: test size */
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsCallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    free(buf);
-    printf("\n-------- LmsCallocTest End --------\n");
-}
-
-static void LmsVallocTest(void)
-{
-#define TEST_SIZE 4096
-    printf("\n-------- LmsVallocTest Start --------\n");
-    char *buf = (char *)valloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsVallocTest] read overflow & underflow error should be triggered, read range[-1, TEST_SIZE]\n");
-    BufReadTest(buf, -1, TEST_SIZE);
-    free(buf);
-    printf("\n-------- LmsVallocTest End --------\n");
-}
-
-static void LmsAlignedAllocTest(void)
-{
-#define TEST_ALIGN_SIZE 64
-#define TEST_SIZE       128
-    printf("\n-------- LmsAlignedAllocTest Start --------\n");
-    char *buf = (char *)aligned_alloc(TEST_ALIGN_SIZE, TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsAlignedAllocTest] read overflow & underflow error should be triggered, read range[-1,128]\n");
-    BufReadTest(buf, -1, 128);
-    free(buf);
-    printf("\n-------- LmsAlignedAllocTest End --------\n");
-}
-
-static void LmsMemsetTest(void)
-{
-#define TEST_SIZE 32
-    printf("\n-------- LmsMemsetTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsMemsetTest] memset overflow & underflow error should be triggered, memset size:%d\n", TEST_SIZE + 1);
-    memset(buf, 0, TEST_SIZE + 1);
-    free(buf);
-    printf("\n-------- LmsMemsetTest End --------\n");
-}
-
-static void LmsMemcpyTest(void)
-{
-#define TEST_SIZE 20
-    printf("\n-------- LmsMemcpyTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    char localBuf[32] = {0}; /* 32: test size */
-    printf("[LmsMemcpyTest] memcpy overflow error should be triggered, memcpy size:%d\n", TEST_SIZE + 1);
-    memcpy(buf, localBuf, TEST_SIZE + 1);
-    free(buf);
-    printf("\n-------- LmsMemcpyTest End --------\n");
-}
-
-static void LmsMemmoveTest(void)
-{
-#define TEST_SIZE 20
-    printf("\n-------- LmsMemmoveTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsMemmoveTest] memmove overflow error should be triggered\n");
-    memmove(buf + 12, buf, 10); /* 12 and 10: test size */
-    free(buf);
-    printf("\n-------- LmsMemmoveTest End --------\n");
-}
-
-static void LmsStrcpyTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsStrcpyTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    char *testStr = "bbbbbbbbbbbbbbbbb";
-    printf("[LmsStrcpyTest] strcpy overflow error should be triggered, src string buf size:%d\n", strlen(testStr) + 1);
-    strcpy(buf, testStr);
-    free(buf);
-    printf("\n-------- LmsStrcpyTest End --------\n");
-}
-
-static void LmsStrcatTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsStrcatTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    buf[0] = 'a';
-    buf[1] = 'b';
-    buf[2] = 0;
-    char *testStr = "cccccccccccccc";
-    printf("[LmsStrcatTest] strcat overflow error should be triggered, src string:%s dest string:%s"
-        "total buf size:%d\n",
-        testStr, buf, strlen(testStr) + strlen(buf) + 1);
-    strcat(buf, testStr);
-    free(buf);
-    printf("\n-------- LmsStrcatTest End --------\n");
-}
-
-static void LmsFreeTest(void)
-{
-#define TEST_SIZE 16
-    printf("\n-------- LmsFreeTest Start --------\n");
-    char *buf = (char *)malloc(TEST_SIZE);
-    if (buf == NULL) {
-        return;
-    }
-    printf("[LmsFreeTest] free size:%d\n", TEST_SIZE);
-    free(buf);
-    printf("[LmsFreeTest] Use after free error should be triggered, read range[1,1]\n");
-    BufReadTest(buf, 1, 1);
-    printf("[LmsFreeTest] double free error should be triggered\n");
-    free(buf);
-    printf("\n-------- LmsFreeTest End --------\n");
-}
-
-int main(int argc, char * const *argv)
-{
-    (void)argc;
-    (void)argv;
-    printf("\n############### Lms Test start ###############\n");
-    char *tmp = (char *)malloc(5000); /* 5000: test mem size */
-    if (tmp == NULL) {
-        return;
-    }
-    LmsMallocTest();
-    LmsReallocTest();
-    LmsCallocTest();
-    LmsVallocTest();
-    LmsAlignedAllocTest();
-    LmsMemsetTest();
-    LmsMemcpyTest();
-    LmsMemmoveTest();
-    LmsStrcpyTest();
-    LmsStrcatTest();
-    LmsFreeTest();
-    free(tmp);
-    printf("\n############### Lms Test End ###############\n");
-}

apps/mksh/BUILD.gn

@@ -29,14 +29,13 @@
 
 import("//build/lite/config/component/lite_component.gni")
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/mksh/mksh.gni")
 
 group("mksh") {
   deps = [ ":build_mksh" ]
 }
 
 copy("copy_mksh_src") {
-  sources = MKSH_SRC_DIR
+  sources = [ "$LITEOSTHIRDPARTY/mksh" ]
   outputs = [ "$target_out_dir/mksh_build" ]
 }
 

apps/perf/BUILD.gn

@@ -1,63 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-executable("perf") {
-  sources = [
-    "src/main.c",
-    "src/option.c",
-    "src/perf.c",
-    "src/perf_list.c",
-    "src/perf_record.c",
-    "src/perf_stat.c",
-  ]
-  include_dirs = [ "include" ]
-  defines = []
-
-  if (defined(LOSCFG_PERF_HW_PMU)) {
-    defines += [ "LOSCFG_PERF_HW_PMU" ]
-  }
-
-  if (defined(LOSCFG_PERF_TIMED_PMU)) {
-    defines += [ "LOSCFG_PERF_TIMED_PMU" ]
-  }
-
-  if (defined(LOSCFG_PERF_SW_PMU)) {
-    defines += [ "LOSCFG_PERF_SW_PMU" ]
-  }
-
-  if (defined(LOSCFG_FS_VFS)) {
-    defines += [ "LOSCFG_FS_VFS" ]
-  }
-
-  defines += [ "LOSCFG_PERF_BUFFER_SIZE=$LOSCFG_PERF_BUFFER_SIZE" ]
-
-  deps = [ "$LITEOSTHIRDPARTY/bounds_checking_function:libsec_static" ]
-}

apps/perf/Makefile

@@ -1,62 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-include $(APPSTOPDIR)/config.mk
-
-APP_NAME := $(notdir $(shell pwd))
-
-SECUREC_DIR := $(LITEOSTHIRDPARTY)/bounds_checking_function
-
-LOCAL_SRCS = $(wildcard src/*.c)
-LOCAL_SRCS += $(wildcard $(SECUREC_DIR)/src/*.c)
-
-LOCAL_INCLUDE := \
-    -I include \
-    -I $(SECUREC_DIR)/include
-
-LOCAL_FLAGS += $(LOCAL_INCLUDE)
-
-ifeq ($(LOSCFG_PERF_HW_PMU), y)
-CFLAGS += -DLOSCFG_PERF_HW_PMU
-endif
-
-ifeq ($(LOSCFG_PERF_TIMED_PMU), y)
-CFLAGS += -DLOSCFG_PERF_TIMED_PMU
-endif
-
-ifeq ($(LOSCFG_PERF_SW_PMU), y)
-CFLAGS += -DLOSCFG_PERF_SW_PMU
-endif
-
-ifeq ($(LOSCFG_FS_VFS), y)
-CFLAGS += -DLOSCFG_FS_VFS
-endif
-
-CFLAGS += -DLOSCFG_PERF_BUFFER_SIZE=$(LOSCFG_PERF_BUFFER_SIZE)
-include $(APP)

apps/perf/include/perf.h

@@ -1,163 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
-#ifndef _PERF_H
-#define _PERF_H
-
-#include <stdlib.h>
-
-#ifdef  __cplusplus
-#if  __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#define PERF_MAX_EVENT          7
-#define PERF_MAX_FILTER_TSKS    32
-
-#ifdef PERF_DEBUG
-#define printf_debug(fmt, ...) printf(fmt, ##__VA_ARGS__)
-#else
-#define printf_debug(fmt, ...)
-#endif
-
-/*
- * Perf types
- */
-enum PerfEventType {
-    PERF_EVENT_TYPE_HW,      /* boards common hw events */
-    PERF_EVENT_TYPE_TIMED,   /* hrtimer timed events */
-    PERF_EVENT_TYPE_SW,      /* software trace events */
-    PERF_EVENT_TYPE_RAW,     /* boards special hw events, see enum PmuEventType in corresponding arch headfile */
-
-    PERF_EVENT_TYPE_MAX
-};
-
-/*
- * Common hardware pmu events
- */
-enum PmuHwId {
-    PERF_COUNT_HW_CPU_CYCLES = 0,      /* cpu cycle event */
-    PERF_COUNT_HW_INSTRUCTIONS,        /* instruction event */
-    PERF_COUNT_HW_DCACHE_REFERENCES,   /* dcache access event */
-    PERF_COUNT_HW_DCACHE_MISSES,       /* dcache miss event */
-    PERF_COUNT_HW_ICACHE_REFERENCES,   /* icache access event */
-    PERF_COUNT_HW_ICACHE_MISSES,       /* icache miss event */
-    PERF_COUNT_HW_BRANCH_INSTRUCTIONS, /* software change of pc event */
-    PERF_COUNT_HW_BRANCH_MISSES,       /* branch miss event */
-
-    PERF_COUNT_HW_MAX,
-};
-
-/*
- * Common hrtimer timed events
- */
-enum PmuTimedId {
-    PERF_COUNT_CPU_CLOCK = 0,      /* hrtimer timed event */
-};
-
-/*
- * Common software pmu events
- */
-enum PmuSwId {
-    PERF_COUNT_SW_TASK_SWITCH = 1, /* task switch event */
-    PERF_COUNT_SW_IRQ_RESPONSE,    /* irq response event */
-    PERF_COUNT_SW_MEM_ALLOC,       /* memory alloc event */
-    PERF_COUNT_SW_MUX_PEND,        /* mutex pend event */
-
-    PERF_COUNT_SW_MAX,
-};
-
-/*
- * perf sample data types
- * Config it through PerfConfigAttr->sampleType.
- */
-enum PerfSampleType {
-    PERF_RECORD_CPU       = 1U << 0, /* record current cpuid */
-    PERF_RECORD_TID       = 1U << 1, /* record current task id */
-    PERF_RECORD_TYPE      = 1U << 2, /* record event type */
-    PERF_RECORD_PERIOD    = 1U << 3, /* record event period */
-    PERF_RECORD_TIMESTAMP = 1U << 4, /* record timestamp */
-    PERF_RECORD_IP        = 1U << 5, /* record instruction pointer */
-    PERF_RECORD_CALLCHAIN = 1U << 6, /* record backtrace */
-    PERF_RECORD_PID       = 1U << 7, /* record current process id */
-};
-
-/*
- * perf configuration sub event information
- *
- * This structure is used to config specific events attributes.
- */
-typedef struct {
-    unsigned int type;              /* enum PerfEventType */
-    struct {
-        unsigned int eventId;       /* the specific event corresponds to the PerfEventType */
-        unsigned int period;        /* event period, for every "period"th occurrence of the event a
-                                        sample will be recorded */
-    } events[PERF_MAX_EVENT];       /* perf event list */
-    unsigned int eventsNr;          /* total perf event number */
-    size_t predivided;              /* whether to prescaler (once every 64 counts),
-                                        which only take effect on cpu cycle hardware event */
-} PerfEventConfig;
-
-/*
- * perf configuration main information
- *
- * This structure is used to set perf sampling attributes, including events, tasks and other information.
- */
-typedef struct {
-    PerfEventConfig         eventsCfg;                      /* perf event config */
-    unsigned int            taskIds[PERF_MAX_FILTER_TSKS];  /* perf task filter list (allowlist) */
-    unsigned int            taskIdsNr;                      /* task numbers of task filter allowlist,
-                                                                 if set 0 perf will sample all tasks */
-    unsigned int            processIds[PERF_MAX_FILTER_TSKS];  /* perf process filter list (allowlist) */
-    unsigned int            processIdsNr;                      /* process numbers of process filter allowlist,
-                                                                 if set 0 perf will sample all processes */
-    unsigned int            sampleType;                     /* type of data to sample defined in PerfSampleType */
-    size_t                  needSample;                     /* whether to sample data */
-} PerfConfigAttr;
-
-void PerfUsage(void);
-void PerfDumpAttr(PerfConfigAttr *attr);
-int PerfConfig(int fd, PerfConfigAttr *attr);
-void PerfStart(int fd, size_t sectionId);
-void PerfStop(int fd);
-ssize_t PerfRead(int fd, char *buf, size_t size);
-void PerfPrintBuffer(const char *buf, ssize_t num);
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif
-#endif
-
-#endif /* _PERF_H */

apps/perf/src/option.c

@@ -1,182 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <string.h>
-#include "option.h"
-#include "perf_list.h"
-
-static int ParseOption(char **argv, int *index, PerfOption *opts)
-{
-    int ret = 0;
-    const char *str = NULL;
-
-    while ((opts->name != NULL) && (*opts->name != 0)) {
-        if (strcmp(argv[*index], opts->name) == 0) {
-            switch (opts->type) {
-                case OPTION_TYPE_UINT:
-                    *opts->value = strtoul(argv[++(*index)], NULL, 0);
-                    break;
-                case OPTION_TYPE_STRING:
-                    *opts->str = argv[++(*index)];
-                    break;
-                case OPTION_TYPE_CALLBACK:
-                    str = argv[++(*index)];
-                    if ((*opts->cb)(str) != 0) {
-                        printf("parse error\n");
-                        ret = -1;
-                    }
-                    break;
-                default:
-                    printf("invalid option\n");
-                    ret = -1;
-                    break;
-            }
-            return ret;
-        }
-        opts++;
-    }
-
-    return -1;
-}
-
-int ParseOptions(int argc, char **argv, PerfOption *opts, SubCmd *cmd)
-{
-    int i;
-    int index = 0;
-
-    while ((index < argc) && (argv[index] != NULL) && (*argv[index] == '-')) {
-        if (ParseOption(argv, &index, opts) != 0) {
-            return -1;
-        }
-        index++;
-    }
-
-    if ((index < argc) && (argv[index] != NULL)) {
-        cmd->path = argv[index];
-        cmd->params[0] = argv[index];
-        index++;
-    } else {
-        printf("no subcmd to execute\n");
-        return -1;
-    }
-
-    for (i = 1; (index < argc) && (i < CMD_MAX_PARAMS); index++, i++) {
-        cmd->params[i] = argv[index];
-    }
-    printf_debug("subcmd = %s\n", cmd->path);
-    for (int j = 0; j < i; j++) {
-        printf_debug("paras[%d]:%s\n", j, cmd->params[j]);
-    }
-    return 0;
-}
-
-int ParseIds(const char *argv, int *arr, unsigned int *len)
-{
-    int res, ret;
-    unsigned int index  = 0;
-    char *sp = NULL;
-    char *this = NULL;
-    char *list = strdup(argv);
-
-    if (list == NULL) {
-        printf("no memory for ParseIds\n");
-        return -1;
-    }
-
-    sp = strtok_r(list, ",", &this);
-    while (sp) {
-        res = strtoul(sp, NULL, 0);
-        if (res < 0) {
-            ret = -1;
-            goto EXIT;
-        }
-        arr[index++] = res;
-        sp = strtok_r(NULL, ",", &this);
-    }
-    *len = index;
-    ret = 0;
-EXIT:
-    free(list);
-    return ret;
-}
-
-static inline const PerfEvent *StrToEvent(const char *str)
-{
-    const PerfEvent *evt = &g_events[0];
-
-    for (; evt->event != -1; evt++) {
-        if (strcmp(str, evt->name) == 0) {
-            return evt;
-        }
-    }
-    return NULL;
-}
-
-int ParseEvents(const char *argv, PerfEventConfig *eventsCfg, unsigned int *len)
-{
-    int ret;
-    unsigned int index  = 0;
-    const PerfEvent *event = NULL;
-    char *sp = NULL;
-    char *this = NULL;
-    char *list = strdup(argv);
-
-    if (list == NULL) {
-        printf("no memory for ParseEvents\n");
-        return -1;
-    }
-
-    sp = strtok_r(list, ",", &this);
-    while (sp) {
-        event = StrToEvent(sp);
-        if (event == NULL) {
-            ret = -1;
-            goto EXIT;
-        }
-
-        if (index == 0) {
-            eventsCfg->type = event->type;
-        } else if (eventsCfg->type != event->type) {
-            printf("events type must be same\n");
-            ret = -1;
-            goto EXIT;
-        }
-        eventsCfg->events[index].eventId = event->event;
-        sp = strtok_r(NULL, ",", &this);
-        index++;
-    }
-    *len = index;
-    ret = 0;
-EXIT:
-    free(list);
-    return ret;
-}

apps/perf/src/perf.c

@@ -1,136 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include "perf.h"
-
-#define PERF_IOC_MAGIC     'T'
-#define PERF_START         _IO(PERF_IOC_MAGIC, 1)
-#define PERF_STOP          _IO(PERF_IOC_MAGIC, 2)
-
-void PerfUsage(void)
-{
-    printf("\nUsage: ./perf start [id]. Start perf.\n");
-    printf("\nUsage: ./perf stop. Stop perf.\n");
-    printf("\nUsage: ./perf read <nBytes>. Read nBytes raw data from perf buffer and print out.\n");
-    printf("\nUsage: ./perf list. List events to be used in -e.\n");
-    printf("\nUsage: ./perf stat/record [option] <command>. \n"
-                    "-e, event selector. use './perf list' to list available events.\n"
-                    "-p, event period.\n"
-                    "-o, perf data output filename.\n"
-                    "-t, taskId filter(allowlist), if not set perf will sample all tasks.\n"
-                    "-s, type of data to sample defined in PerfSampleType los_perf.h.\n"
-                    "-P, processId filter(allowlist), if not set perf will sample all processes.\n"
-                    "-d, whether to prescaler (once every 64 counts),"
-                    "which only take effect on cpu cycle hardware event.\n"
-    );
-}
-
-static void PerfSetPeriod(PerfConfigAttr *attr)
-{
-    int i;
-    for (i = 1; i < attr->eventsCfg.eventsNr; i++) {
-        attr->eventsCfg.events[i].period = attr->eventsCfg.events[0].period;
-    }
-}
-
-void PerfPrintBuffer(const char *buf, ssize_t num)
-{
-#define BYTES_PER_LINE  4
-    ssize_t i;
-    for (i = 0; i < num; i++) {
-        printf(" %02x", (unsigned char)buf[i]);
-        if (((i + 1) % BYTES_PER_LINE) == 0) {
-            printf("\n");
-        }
-    }
-    printf("\n");
-}
-
-void PerfDumpAttr(PerfConfigAttr *attr)
-{
-    int i;
-    printf_debug("attr->type: %d\n", attr->eventsCfg.type);
-    for (i = 0; i < attr->eventsCfg.eventsNr; i++) {
-        printf_debug("attr->events[%d]: %d, 0x%x\n", i, attr->eventsCfg.events[i].eventId,
-            attr->eventsCfg.events[i].period);
-    }
-    printf_debug("attr->predivided: %d\n", attr->eventsCfg.predivided);
-    printf_debug("attr->sampleType: 0x%x\n", attr->sampleType);
-
-    for (i = 0; i < attr->taskIdsNr; i++) {
-        printf_debug("attr->taskIds[%d]: %d\n", i, attr->taskIds[i]);
-    }
-
-    for (i = 0; i < attr->processIdsNr; i++) {
-        printf_debug("attr->processIds[%d]: %d\n", i, attr->processIds[i]);
-    }
-
-    printf_debug("attr->needSample: %d\n", attr->needSample);
-}
-
-
-void PerfStart(int fd, size_t sectionId)
-{
-    (void)ioctl(fd, PERF_START, sectionId);
-}
-
-void PerfStop(int fd)
-{
-    (void)ioctl(fd, PERF_STOP, NULL);
-}
-
-int PerfConfig(int fd, PerfConfigAttr *attr)
-{
-    if (attr == NULL) {
-        return -1;
-    }
-    PerfSetPeriod(attr);
-    PerfDumpAttr(attr);
-    return write(fd, attr, sizeof(PerfConfigAttr));
-}
-
-ssize_t PerfRead(int fd, char *buf, size_t size)
-{
-    ssize_t len;
-    if (buf == NULL) {
-        printf("Read buffer is null.\n");
-        return 0;
-    }
-
-    len = read(fd, buf, size);
-    return len;
-}

apps/perf/src/perf_list.c

@@ -1,129 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <stdio.h>
-#include "perf.h"
-#include "perf_list.h"
-
-static const char *g_eventTypeStr[] = {
-    "[Hardware event]",
-    "[Timed event]",
-    "[Software event]",
-};
-
-const PerfEvent g_events[] = {
-#ifdef LOSCFG_PERF_HW_PMU
-    {
-        .name = "cycles",
-        .event = PERF_COUNT_HW_CPU_CYCLES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "instruction",
-        .event = PERF_COUNT_HW_INSTRUCTIONS,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "dcache",
-        .event = PERF_COUNT_HW_DCACHE_REFERENCES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "dcache-miss",
-        .event = PERF_COUNT_HW_DCACHE_MISSES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "icache",
-        .event = PERF_COUNT_HW_ICACHE_REFERENCES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "icache-miss",
-        .event = PERF_COUNT_HW_ICACHE_MISSES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "branch",
-        .event = PERF_COUNT_HW_BRANCH_INSTRUCTIONS,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-    {
-        .name = "branch-miss",
-        .event = PERF_COUNT_HW_BRANCH_MISSES,
-        .type = PERF_EVENT_TYPE_HW,
-    },
-#endif
-#ifdef LOSCFG_PERF_TIMED_PMU
-    {
-        .name = "clock",
-        .event = PERF_COUNT_CPU_CLOCK,
-        .type = PERF_EVENT_TYPE_TIMED,
-    },
-#endif
-#ifdef LOSCFG_PERF_SW_PMU
-    {
-        .name = "task-switch",
-        .event = PERF_COUNT_SW_TASK_SWITCH,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-    {
-        .name = "irq-in",
-        .event = PERF_COUNT_SW_IRQ_RESPONSE,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-    {
-        .name = "mem-alloc",
-        .event = PERF_COUNT_SW_MEM_ALLOC,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-    {
-        .name = "mux-pend",
-        .event = PERF_COUNT_SW_MUX_PEND,
-        .type = PERF_EVENT_TYPE_SW,
-    },
-#endif
-    {
-        .name = "",
-        .event = -1,
-        .type = PERF_EVENT_TYPE_MAX,
-    }
-};
-
-void PerfList(void)
-{
-    const PerfEvent *evt = &g_events[0];
-    printf("\n");
-    for (; evt->event != -1; evt++) {
-        printf("\t %-25s%30s\n", evt->name, g_eventTypeStr[evt->type]);
-    }
-    printf("\n");
-}

apps/perf/src/perf_record.c

@@ -1,203 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <unistd.h>
-#include <sys/wait.h>
-#include <securec.h>
-
-#ifdef LOSCFG_FS_VFS
-#include <fcntl.h>
-#include <errno.h>
-#endif
-
-#include "perf.h"
-#include "option.h"
-#include "perf_record.h"
-
-#define PERF_FILE_MODE 0644
-static PerfConfigAttr g_recordAttr;
-static const char *g_savePath = "/storage/data/perf.data";
-
-static inline int GetEvents(const char *argv)
-{
-    return ParseEvents(argv, &g_recordAttr.eventsCfg, &g_recordAttr.eventsCfg.eventsNr);
-}
-
-static inline int GetTids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_recordAttr.taskIds, &g_recordAttr.taskIdsNr);
-}
-
-static inline int GetPids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_recordAttr.processIds, &g_recordAttr.processIdsNr);
-}
-
-static PerfOption g_recordOpts[] = {
-    OPTION_CALLBACK("-e", GetEvents),
-    OPTION_CALLBACK("-t", GetTids),
-    OPTION_CALLBACK("-P", GetPids),
-    OPTION_STRING("-o", &g_savePath),
-    OPTION_UINT("-p", &g_recordAttr.eventsCfg.events[0].period),
-    OPTION_UINT("-s", &g_recordAttr.sampleType),
-    OPTION_UINT("-d", &g_recordAttr.eventsCfg.predivided),
-};
-
-static int PerfRecordAttrInit(void)
-{
-    PerfConfigAttr attr = {
-        .eventsCfg = {
-#ifdef LOSCFG_PERF_HW_PMU
-            .type = PERF_EVENT_TYPE_HW,
-            .events = {
-                [0] = {PERF_COUNT_HW_CPU_CYCLES, 0xFFFF},
-            },
-#elif defined LOSCFG_PERF_TIMED_PMU
-            .type = PERF_EVENT_TYPE_TIMED,
-            .events = {
-                [0] = {PERF_COUNT_CPU_CLOCK, 100},
-            },
-#elif defined LOSCFG_PERF_SW_PMU
-            .type = PERF_EVENT_TYPE_SW,
-            .events = {
-                [0] = {PERF_COUNT_SW_TASK_SWITCH, 1},
-            },
-#endif
-            .eventsNr = 1, /* 1 event */
-            .predivided = 0,
-        },
-        .taskIds = {0},
-        .taskIdsNr = 0,
-        .processIds = {0},
-        .processIdsNr = 0,
-        .needSample = 1,
-        .sampleType = PERF_RECORD_IP | PERF_RECORD_CALLCHAIN,
-    };
-
-    return memcpy_s(&g_recordAttr, sizeof(PerfConfigAttr), &attr, sizeof(PerfConfigAttr)) != EOK ? -1 : 0;
-}
-
-ssize_t PerfWriteFile(const char *filePath, const char *buf, ssize_t bufSize)
-{
-#ifdef LOSCFG_FS_VFS
-    int fd = -1;
-    ssize_t totalToWrite = bufSize;
-    ssize_t totalWrite = 0;
-
-    if (filePath == NULL || buf == NULL || bufSize == 0) {
-        return -1;
-    }
-
-    fd = open(filePath, O_CREAT | O_RDWR | O_TRUNC, PERF_FILE_MODE);
-    if (fd < 0) {
-        printf("create file [%s] failed, fd: %d, %s!\n", filePath, fd, strerror(errno));
-        return -1;
-    }
-    while (totalToWrite > 0) {
-        ssize_t writeThisTime = write(fd, buf, totalToWrite);
-        if (writeThisTime < 0) {
-            printf("failed to write file [%s], %s!\n", filePath, strerror(errno));
-            (void)close(fd);
-            return -1;
-        }
-        buf += writeThisTime;
-        totalToWrite -= writeThisTime;
-        totalWrite += writeThisTime;
-    }
-    (void)fsync(fd);
-    (void)close(fd);
-
-    return (totalWrite == bufSize) ? 0 : -1;
-#else
-    (void)filePath;
-    PerfPrintBuffer(buf, bufSize);
-    return 0;
-#endif
-}
-
-void PerfRecord(int fd, int argc, char **argv)
-{
-    int ret;
-    int child;
-    char *buf;
-    ssize_t len;
-    SubCmd cmd = {0};
-
-    if (argc < 3) { /* perf record argc is at least 3 */
-        return;
-    }
-
-    ret = PerfRecordAttrInit();
-    if (ret != 0) {
-        printf("perf record attr init failed\n");
-        return;
-    }
-
-    ret = ParseOptions(argc - 2, &argv[2], g_recordOpts, &cmd); /* parse option and cmd begin at index 2 */
-    if (ret != 0) {
-        printf("parse error\n");
-        return;
-    }
-
-    ret = PerfConfig(fd, &g_recordAttr);
-    if (ret != 0) {
-        printf("perf config failed\n");
-        return;
-    }
-
-    PerfStart(fd, 0);
-    child = fork();
-    if (child < 0) {
-        printf("fork error\n");
-        PerfStop(fd);
-        return;
-    } else if (child == 0) {
-        (void)execve(cmd.path, cmd.params, NULL);
-        exit(0);
-    }
-
-    waitpid(child, 0, 0);
-    PerfStop(fd);
-
-    buf = (char *)malloc(LOSCFG_PERF_BUFFER_SIZE);
-    if (buf == NULL) {
-        printf("no memory for read perf 0x%x\n", LOSCFG_PERF_BUFFER_SIZE);
-        return;
-    }
-    len = PerfRead(fd, buf, LOSCFG_PERF_BUFFER_SIZE);
-    ret = PerfWriteFile(g_savePath, buf, len);
-    if (ret == 0) {
-        printf("save perf data success at %s\n", g_savePath);
-    } else {
-        printf("save perf data failed at %s\n", g_savePath);
-    }
-    free(buf);
-}

apps/perf/src/perf_stat.c

@@ -1,149 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include <unistd.h>
-#include <securec.h>
-#include <sys/wait.h>
-#include "perf.h"
-#include "option.h"
-#include "perf_stat.h"
-
-static PerfConfigAttr g_statAttr;
-
-static inline int GetEvents(const char *argv)
-{
-    return ParseEvents(argv, &g_statAttr.eventsCfg, &g_statAttr.eventsCfg.eventsNr);
-}
-
-static inline int GetTids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_statAttr.taskIds, &g_statAttr.taskIdsNr);
-}
-
-static inline int GetPids(const char *argv)
-{
-    return ParseIds(argv, (int *)g_statAttr.processIds, &g_statAttr.processIdsNr);
-}
-
-static PerfOption g_statOpts[] = {
-    OPTION_CALLBACK("-e", GetEvents),
-    OPTION_CALLBACK("-t", GetTids),
-    OPTION_CALLBACK("-P", GetPids),
-    OPTION_UINT("-p", &g_statAttr.eventsCfg.events[0].period),
-    OPTION_UINT("-s", &g_statAttr.sampleType),
-    OPTION_UINT("-d", &g_statAttr.eventsCfg.predivided),
-};
-
-static int PerfStatAttrInit(void)
-{
-    PerfConfigAttr attr = {
-        .eventsCfg = {
-#ifdef LOSCFG_PERF_HW_PMU
-            .type = PERF_EVENT_TYPE_HW,
-            .events = {
-                [0] = {PERF_COUNT_HW_CPU_CYCLES, 0xFFFF},
-                [1] = {PERF_COUNT_HW_INSTRUCTIONS, 0xFFFFFF00},
-                [2] = {PERF_COUNT_HW_ICACHE_REFERENCES, 0xFFFF},
-                [3] = {PERF_COUNT_HW_DCACHE_REFERENCES, 0xFFFF},
-            },
-            .eventsNr = 4, /* 4 events */
-#elif defined LOSCFG_PERF_TIMED_PMU
-            .type = PERF_EVENT_TYPE_TIMED,
-            .events = {
-                [0] = {PERF_COUNT_CPU_CLOCK, 100},
-            },
-            .eventsNr = 1, /* 1 event */
-#elif defined LOSCFG_PERF_SW_PMU
-            .type = PERF_EVENT_TYPE_SW,
-            .events = {
-                [0] = {PERF_COUNT_SW_TASK_SWITCH, 1},
-                [1] = {PERF_COUNT_SW_IRQ_RESPONSE, 1},
-                [2] = {PERF_COUNT_SW_MEM_ALLOC, 1},
-                [3] = {PERF_COUNT_SW_MUX_PEND, 1},
-            },
-            .eventsNr = 4, /* 4 events */
-#endif
-            .predivided = 0,
-        },
-        .taskIds = {0},
-        .taskIdsNr = 0,
-        .processIds = {0},
-        .processIdsNr = 0,
-        .needSample = 0,
-        .sampleType = 0,
-    };
-
-    return memcpy_s(&g_statAttr, sizeof(PerfConfigAttr), &attr, sizeof(PerfConfigAttr)) != EOK ? -1 : 0;
-}
-
-void PerfStat(int fd, int argc, char **argv)
-{
-    int ret;
-    int child;
-    SubCmd cmd = {0};
-
-    if (argc < 3) { /* perf stat argc is at least 3 */
-        return;
-    }
-
-    ret = PerfStatAttrInit();
-    if (ret != 0) {
-        printf("perf stat attr init failed\n");
-        return;
-    }
-
-    ret = ParseOptions(argc - 2, &argv[2], g_statOpts, &cmd); /* parse option and cmd begin at index 2 */
-    if (ret != 0) {
-        printf("parse error\n");
-        return;
-    }
-
-    ret = PerfConfig(fd, &g_statAttr);
-    if (ret != 0) {
-        printf("perf config failed\n");
-        return;
-    }
-
-    PerfStart(fd, 0);
-    child = fork();
-    if (child < 0) {
-        printf("fork error\n");
-        goto EXIT;
-    } else if (child == 0) {
-        (void)execve(cmd.path, cmd.params, NULL);
-        exit(0);
-    }
-
-    (void)waitpid(child, 0, 0);
-EXIT:
-    PerfStop(fd);
-}
-

apps/shell/builtin/cd.c

@@ -46,7 +46,7 @@ int Chdir(const char *tgtDir)
 
     ret = chdir(tgtDir);
     if (ret == 0) {
-        ret = OsShellSetWorkingDirectory(tgtDir, strlen(tgtDir) + 1); /* 1: the length of '\0' */
+        ret = OsShellSetWorkingDirtectory(tgtDir, strlen(tgtDir) + 1); /* 1: the length of '\0' */        
     }
 
     return ret;

apps/shell/include/shcmd.h

@@ -53,7 +53,7 @@ typedef struct {
 } CmdKeyLink;
 
 #define NEED_NEW_LINE(timesPrint, lineCap) ((timesPrint) % (lineCap) == 0)
-#define SCREEN_IS_FULL(timesPrint, lineCap) ((timesPrint) >= ((lineCap) * DEFAULT_SCREEN_HEIGHT))
+#define SCREEN_IS_FULL(timesPrint, lineCap) ((timesPrint) >= ((lineCap) * DEFAULT_SCREEN_HEIGNT))
 
 extern unsigned int OsCmdExec(CmdParsed *cmdParsed, char *cmdStr);
 extern unsigned int OsCmdKeyShift(const char *cmdKey, char *cmdOut, unsigned int size);
@@ -62,7 +62,7 @@ extern void OsShellCmdPush(const char *string, CmdKeyLink *cmdKeyLink);
 extern void OsShellHistoryShow(unsigned int value, ShellCB *shellCB);
 extern unsigned int OsShellKeyInit(ShellCB *shellCB);
 extern void OsShellKeyDeInit(CmdKeyLink *cmdKeyLink);
-extern int OsShellSetWorkingDirectory(const char *dir, size_t len);
+extern int OsShellSetWorkingDirtectory(const char *dir, size_t len);
 
 #ifdef __cplusplus
 #if __cplusplus

apps/shell/include/shell.h

@@ -54,7 +54,7 @@ extern "C" {
 #define CMD_HISTORY_LEN                 10
 #define CMD_MAX_PATH                    256
 #define DEFAULT_SCREEN_WIDTH            80
-#define DEFAULT_SCREEN_HEIGHT           24
+#define DEFAULT_SCREEN_HEIGNT           24
 
 #define SWITCH_QUOTES_STATUS(qu) do {   \
     if ((qu) == TRUE) {                 \
@@ -67,6 +67,7 @@ extern "C" {
 #define QUOTES_STATUS_CLOSE(qu) ((qu) == FALSE)
 #define QUOTES_STATUS_OPEN(qu)  ((qu) == TRUE)
 
+typedef size_t bool;
 
 typedef struct {
     unsigned int   consoleID;

apps/shell/include/shell_pri.h

@@ -32,7 +32,9 @@
 #ifndef _SHELL_PRI_H
 #define _SHELL_PRI_H
 
-#include "shell.h"
+#include "sys/types.h"
+#include "bits/alltypes.h"
+#include "shcmd.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -40,7 +42,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-extern void ShellEntry(ShellCB *shellCB);
+extern void *ShellEntry(void *argv);
 extern void *ShellTask(void *argv);
 
 #ifdef __cplusplus

apps/shell/include/sherr.h

@@ -32,6 +32,9 @@
 #ifndef _SHERR_H
 #define _SHERR_H
 
+#include "sys/types.h"
+#include "bits/alltypes.h"
+
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {

apps/shell/include/shmsg.h

@@ -32,7 +32,6 @@
 #ifndef _SHMSG_H
 #define _SHMSG_H
 
-#include "shell_list.h"
 #include "shell.h"
 
 #ifdef __cplusplus
@@ -47,7 +46,7 @@ extern "C" {
 #define SHELL_EXEC_COMMAND          "exec"
 #define SHELL_EXEC_COMMAND_BYTES    4
 #define CMD_EXEC_COMMAND            SHELL_EXEC_COMMAND" "
-#define CMD_EXEC_COMMAND_BYTES      (SHELL_EXEC_COMMAND_BYTES + 1)
+#define CMD_EXEC_COMMAND_BYTES      (SHELL_EXEC_COMMAND_BYTES+1)
 #define CMD_EXIT_COMMAND            "exit"
 #define CMD_EXIT_COMMAND_BYTES      4
 #define CMD_EXIT_CODE_BASE_DEC      10
@@ -60,9 +59,10 @@ extern "C" {
 #define COLOR_L_RED    "\e[1;31m"
 #define SHELL_PROMPT   COLOR_L_RED"OHOS # "COLOR_NONE
 
-typedef void (* OutputFunc)(const char *fmt, ...);
+typedef void (*OutputFunc)(const char *fmt, ...);
 extern int ShellTaskInit(ShellCB *shellCB);
-extern void ChildExec(const char *cmdName, char *const paramArray[], bool foreground);
+extern int ShellEntryInit(ShellCB *shellCB);
+extern void ChildExec(const char *cmdName, char *const paramArray[]);
 extern void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB);
 extern int ShellNotify(ShellCB *shellCB);
 

apps/shell/include/show.h

@@ -42,7 +42,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-extern char *OsShellGetWorkingDirectory(void);
+extern char *OsShellGetWorkingDirtectory(void);
 extern unsigned int OsShellInit(void);
 extern int OsShellDeinit(ShellCB *shellCB);
 extern ShellCB *OsGetShellCb(void);

apps/shell/src/main.c

@@ -31,16 +31,13 @@
 
 #define _GNU_SOURCE
 
-#include <signal.h>
-#include <sys/wait.h>
-#include <unistd.h>
-#include <sys/syscall.h>
 #include "show.h"
 #include "shmsg.h"
 #include "shcmd.h"
-#include "shell_pri.h"
 #include "semaphore.h"
 #include "securec.h"
+#include "unistd.h"
+#include <sys/syscall.h>
 
 ShellCB *g_shellCB = NULL;
 
@@ -80,8 +77,13 @@ static int OsShellCreateTask(ShellCB *shellCB)
         goto OUT;
     }
 
-    shellCB->shellEntryHandle = pthread_self();
-    return 0;
+    ret = ShellEntryInit(shellCB);
+    if (ret != SH_OK) {
+        goto OUT;
+    }
+
+    (void)pthread_join(shellCB->shellTaskHandle, NULL);
+    (void)pthread_join(shellCB->shellEntryHandle, NULL);
 
 OUT:
     ShellDeinit(shellCB);
@@ -96,7 +98,7 @@ static int DoShellExec(char **argv)
     char *cmdLine = NULL;
 
     if (strncmp(argv[0], SHELL_EXEC_COMMAND, SHELL_EXEC_COMMAND_BYTES) == 0) {
-        ChildExec(argv[1], argv + 1, FALSE);
+        ChildExec(argv[1], argv + 1);
     }
     for (i = 0; argv[i]; i++) {
         len += strlen(argv[i]);
@@ -106,39 +108,24 @@ static int DoShellExec(char **argv)
     if (!cmdLine) {
         return ret;
     }
-    errno_t ret1 = memset_s(cmdLine, len, 0, len);
-    if (ret1 != EOK) {
-        free(cmdLine);
-        return ret1;
+    memset_s(cmdLine, len, 0, len);
+
+    for(j = 0; j < i; j++) {
+        strcat_s(cmdLine, len,  argv[j]);
+        strcat_s(cmdLine, len, " ");
     }
 
-    for (j = 0; j < i; j++) {
-        (void)strcat_s(cmdLine, len,  argv[j]);
-        (void)strcat_s(cmdLine, len, " ");
-    }
-
-    cmdLine[len - 2] = '\0'; /* 2, (len - 2) is the end of cmdline buf */
+    cmdLine[len - 2] = '\0';
     ret = syscall(__NR_shellexec, argv[0], cmdLine);
     free(cmdLine);
     return ret;
 }
 
-static void ShellSigChildHook(int sig)
-{
-    (void)sig;
-
-    while (waitpid(-1, NULL, WNOHANG) > 0) {
-        continue;
-    }
-}
-
 int main(int argc, char **argv)
 {
     int ret = SH_NOK;
     ShellCB *shellCB = NULL;
 
-    (void)signal(SIGCHLD, ShellSigChildHook);
-
     if (argc > 1) {
         ret = DoShellExec(argv + 1);
         return ret;
@@ -174,12 +161,7 @@ int main(int argc, char **argv)
     sem_init(&shellCB->shellSem, 0, 0);
 
     g_shellCB = shellCB;
-    ret = OsShellCreateTask(shellCB);
-    if (ret != SH_OK) {
-        goto ERR_OUT3;
-    }
-
-    ShellEntry(shellCB);
+    return OsShellCreateTask(shellCB);
 
 ERR_OUT3:
     (void)pthread_mutex_destroy(&shellCB->historyMutex);

apps/shell/src/shcmd.c

@@ -36,6 +36,7 @@
 #include "dirent.h"
 #include "securec.h"
 
+
 #define SHELL_INIT_MAGIC_FLAG 0xABABABAB
 #define CTRL_C 0x03 /* 0x03: ctrl+c ASCII */
 
@@ -90,12 +91,12 @@ static int OsStrSeparateTabStrGet(const char **tabStr, CmdParsed *parsed, unsign
     return SH_OK;
 }
 
-char *OsShellGetWorkingDirectory(void)
+char *OsShellGetWorkingDirtectory()
 {
     return OsGetShellCb()->shellWorkingDirectory;
 }
 
-int OsShellSetWorkingDirectory(const char *dir, size_t len)
+int OsShellSetWorkingDirtectory(const char *dir, size_t len)
 {
     if (dir == NULL) {
         return SH_NOK;
@@ -114,7 +115,7 @@ static int OsStrSeparate(const char *tabStr, char *strPath, char *nameLooking, u
     char *strEnd = NULL;
     char *cutPos = NULL;
     CmdParsed parsed = {0};
-    char *shellWorkingDirectory = OsShellGetWorkingDirectory();
+    char *shellWorkingDirectory = OsShellGetWorkingDirtectory();
     int ret;
 
     ret = OsStrSeparateTabStrGet(&tabStr, &parsed, tabStrLen);
@@ -222,7 +223,7 @@ static int OsPrintMatchList(unsigned int count, const char *strPath, const char
         return (int)SH_ERROR;
     }
 
-    if (count > (lineCap * DEFAULT_SCREEN_HEIGHT)) {
+    if (count > (lineCap * DEFAULT_SCREEN_HEIGNT)) {
         ret = OsSurePrintAll(count);
         if (ret != 1) {
             return ret;
@@ -374,10 +375,10 @@ static int OsTabMatchFile(char *cmdKey, unsigned int *len)
 }
 
 /*
- * Description: Pass in the string and clear useless space ,which include:
+ * Description: Pass in the string and clear useless space ,which inlcude:
  *                1) The overmatch space which is not be marked by Quote's area
  *                   Squeeze the overmatch space into one space
- *                2) Clear all space before first valid character
+ *                2) Clear all space before first vaild charatctor
  * Input:       cmdKey : Pass in the buff string, which is ready to be operated
  *              cmdOut : Pass out the buffer string ,which has already been operated
  *              size : cmdKey length
@@ -406,17 +407,17 @@ unsigned int OsCmdKeyShift(const char *cmdKey, char *cmdOut, unsigned int size)
 
     /* Backup the 'output' start address */
     outputBak = output;
-    /* Scan each character in 'cmdKey',and squeeze the overmuch space and ignore invalid character */
+    /* Scan each charactor in 'cmdKey',and squeeze the overmuch space and ignore invaild charactor */
     for (; *cmdKey != '\0'; cmdKey++) {
         /* Detected a Double Quotes, switch the matching status */
         if (*(cmdKey) == '\"') {
             SWITCH_QUOTES_STATUS(quotes);
         }
-        /* Ignore the current character in following situation */
+        /* Ignore the current charactor in following situation */
         /* 1) Quotes matching status is FALSE (which said that the space is not been marked by double quotes) */
-        /* 2) Current character is a space */
-        /* 3) Next character is a space too, or the string is been seeked to the end already(\0) */
-        /* 4) Invalid character, such as single quotes */
+        /* 2) Current charactor is a space */
+        /* 3) Next charactor is a space too, or the string is been seeked to the end already(\0) */
+        /* 4) Invaild charactor, such as single quotes */
         if ((*cmdKey == ' ') && ((*(cmdKey + 1) == ' ') || (*(cmdKey + 1) == '\0')) && QUOTES_STATUS_CLOSE(quotes)) {
             continue;
         }
@@ -430,7 +431,7 @@ unsigned int OsCmdKeyShift(const char *cmdKey, char *cmdOut, unsigned int size)
     /* Restore the 'output' start address */
     output = outputBak;
     len = strlen(output);
-    /* Clear the space which is located at the first character in buffer */
+    /* Clear the space which is located at the first charactor in buffer */
     if (*output == ' ') {
         output++;
         len--;
@@ -584,6 +585,7 @@ END:
 
 unsigned int OsCmdExec(CmdParsed *cmdParsed, char *cmdStr)
 {
+    /* TODO: complete the usrspace command */
     unsigned int ret = SH_OK;
     if (cmdParsed && cmdStr) {
         ret = SH_NOK;

apps/shell/src/shmsg.c

@@ -133,7 +133,7 @@ int ShellNotify(ShellCB *shellCB)
 }
 
 enum {
-    STAT_NORMAL_KEY,
+    STAT_NOMAL_KEY,
     STAT_ESC_KEY,
     STAT_MULTI_KEY
 };
@@ -152,23 +152,23 @@ static int ShellCmdLineCheckUDRL(const char ch, ShellCB *shellCB)
     } else if (ch == 0x41) { /* up */
         if (shellCB->shellKeyType == STAT_MULTI_KEY) {
             OsShellHistoryShow(CMD_KEY_UP, shellCB);
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
             return ret;
         }
     } else if (ch == 0x42) { /* down */
         if (shellCB->shellKeyType == STAT_MULTI_KEY) {
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
             OsShellHistoryShow(CMD_KEY_DOWN, shellCB);
             return ret;
         }
     } else if (ch == 0x43) { /* right */
         if (shellCB->shellKeyType == STAT_MULTI_KEY) {
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
             return ret;
         }
     } else if (ch == 0x44) { /* left */
         if (shellCB->shellKeyType == STAT_MULTI_KEY) {
-            shellCB->shellKeyType = STAT_NORMAL_KEY;
+            shellCB->shellKeyType = STAT_NOMAL_KEY;
             return ret;
         }
     }
@@ -265,7 +265,7 @@ void ParseNormalChar(char ch, OutputFunc outputFunc, ShellCB *shellCB)
         outputFunc("%c", ch);
     }
 
-    shellCB->shellKeyType = STAT_NORMAL_KEY;
+    shellCB->shellKeyType = STAT_NOMAL_KEY;
 }
 
 void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB)
@@ -334,12 +334,12 @@ char *GetCmdName(const char *cmdline, unsigned int len)
         /* If reach a double quotes, switch the quotes matching status */
         if (*tmpStr == '\"') {
             SWITCH_QUOTES_STATUS(quotes);
-            /* Ignore the double quote character itself */
+            /* Ignore the double quote charactor itself */
             tmpStr++;
             continue;
         }
         /* If detected a space which the quotes matching status is false */
-        /* which said has detected the first space for separator, finish this scan operation */
+        /* which said has detected the first space for seperator, finish this scan operation */
         if ((*tmpStr == ' ') && (QUOTES_STATUS_CLOSE(quotes))) {
             break;
         }
@@ -351,7 +351,7 @@ char *GetCmdName(const char *cmdline, unsigned int len)
     return cmdName;
 }
 
-void ChildExec(const char *cmdName, char *const paramArray[], bool foreground)
+void ChildExec(const char *cmdName, char *const paramArray[])
 {
     int ret;
     pid_t gid;
@@ -364,15 +364,11 @@ void ChildExec(const char *cmdName, char *const paramArray[], bool foreground)
     gid = getpgrp();
     if (gid < 0) {
         printf("get group id failed, pgrpid %d, errno %d\n", gid, errno);
-        exit(1);
     }
 
-    if (!foreground) {
-        ret = tcsetpgrp(STDIN_FILENO, gid);
-        if (ret != 0) {
-            printf("tcsetpgrp failed, errno %d\n", errno);
-            exit(1);
-        }
+    ret = tcsetpgrp(STDIN_FILENO, gid);
+    if (ret != 0) {
+        printf("tcsetpgrp failed, errno %d\n", errno);
     }
 
     ret = execve(cmdName, paramArray, NULL);
@@ -395,7 +391,7 @@ int CheckExit(const char *cmdName, const CmdParsed *cmdParsed)
         return -1;
     }
     if (cmdParsed->paramCnt == 1) {
-        char *p = NULL;
+        char *p;
         ret = strtol(cmdParsed->paramArray[0], &p, CMD_EXIT_CODE_BASE_DEC);
         if (*p != '\0') {
             printf("exit: bad number: %s\n", cmdParsed->paramArray[0]);
@@ -406,30 +402,20 @@ int CheckExit(const char *cmdName, const CmdParsed *cmdParsed)
     exit(ret);
 }
 
-static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len, CmdParsed *cmdParsed)
+static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len, const CmdParsed *cmdParsed)
 {
-    bool foreground = FALSE;
     int ret;
     pid_t forkPid;
 
     if (strncmp(cmdline, CMD_EXEC_COMMAND, CMD_EXEC_COMMAND_BYTES) == 0) {
-        if ((cmdParsed->paramCnt > 1) && (strcmp(cmdParsed->paramArray[cmdParsed->paramCnt - 1], "&") == 0)) {
-            free(cmdParsed->paramArray[cmdParsed->paramCnt - 1]);
-            cmdParsed->paramArray[cmdParsed->paramCnt - 1] = NULL;
-            cmdParsed->paramCnt--;
-            foreground = TRUE;
-        }
-
         forkPid = fork();
         if (forkPid < 0) {
             printf("Faild to fork from shell\n");
             return;
         } else if (forkPid == 0) {
-            ChildExec(cmdParsed->paramArray[0], cmdParsed->paramArray, foreground);
+            ChildExec(cmdParsed->paramArray[0], cmdParsed->paramArray);
         } else {
-            if (!foreground) {
-                (void)waitpid(forkPid, 0, 0);
-            }
+            waitpid(forkPid, 0, 0);
             ret = tcsetpgrp(STDIN_FILENO, getpid());
             if (ret != 0) {
                 printf("tcsetpgrp failed, errno %d\n", errno);
@@ -473,7 +459,7 @@ static void ParseAndExecCmdline(CmdParsed *cmdParsed, const char *cmdline, unsig
     DoCmdExec(cmdName, cmdlineOrigin, len, cmdParsed);
 
     if (getcwd(shellWorkingDirectory, PATH_MAX) != NULL) {
-        (void)OsShellSetWorkingDirectory(shellWorkingDirectory, (PATH_MAX + 1));
+        (void)OsShellSetWorkingDirtectory(shellWorkingDirectory, (PATH_MAX + 1));
     }
 
 OUT:
@@ -515,7 +501,7 @@ unsigned int PreHandleCmdline(const char *input, char **output, unsigned int *ou
     *output = shiftStr;
     *outputlen = shiftLen;
 
-    /* Check and parse "./", located at the first two characters of the cmd */
+    /* Check and parse "./", located at the first two charaters of the cmd */
     if ((shiftLen > removeLen) && (shiftStr[0] == '.') && (shiftStr[1] == '/')) {
         execLen = strlen(execCmd);
         newLen = execLen + shiftLen - removeLen; /* i.e., newLen - execLen == shiftLen - removeLen */
@@ -579,10 +565,20 @@ static void ExecCmdline(const char *cmdline)
     free(output);
 }
 
+void RecycleZombieChild(void)
+{
+    while (waitpid(-1, NULL, WNOHANG) > 0) {
+        continue;
+    }
+}
+
 static void ShellCmdProcess(ShellCB *shellCB)
 {
+    char *buf = NULL;
     while (1) {
-        char *buf = GetCmdline(shellCB);
+        /* recycle zombine child process */
+        RecycleZombieChild();
+        buf = GetCmdline(shellCB);
         if (buf == NULL) {
             break;
         }
@@ -656,19 +652,25 @@ static int ShellKernelReg(unsigned int shellHandle)
     return ioctl(STDIN_FILENO, CONSOLE_CONTROL_REG_USERTASK, shellHandle);
 }
 
-void ShellEntry(ShellCB *shellCB)
+void *ShellEntry(void *argv)
 {
     char ch;
     int ret;
     int n;
     pid_t tid = syscall(__NR_gettid);
+    ShellCB *shellCB = (ShellCB *)argv;
 
     if (shellCB == NULL) {
-        return;
+        return NULL;
     }
 
     (void)memset_s(shellCB->shellBuf, SHOW_MAX_LEN, 0, SHOW_MAX_LEN);
 
+    ret = prctl(PR_SET_NAME, "ShellEntry");
+    if (ret != SH_OK) {
+        return NULL;
+    }
+
     ret = ShellKernelReg((int)tid);
     if (ret != 0) {
         printf("another shell is already running!\n");
@@ -681,5 +683,32 @@ void ShellEntry(ShellCB *shellCB)
             ShellCmdLineParse(ch, (OutputFunc)printf, shellCB);
         }
     }
-    return;
+    return NULL;
 }
+
+int ShellEntryInit(ShellCB *shellCB)
+{
+    int ret;
+    size_t stackSize = SHELL_ENTRY_STACKSIZE;
+    void *arg = NULL;
+    pthread_attr_t attr;
+
+    if (shellCB == NULL) {
+        return SH_NOK;
+    }
+
+    ret = pthread_attr_init(&attr);
+    if (ret != SH_OK) {
+        return SH_NOK;
+    }
+
+    pthread_attr_setstacksize(&attr, stackSize);
+    arg = (void *)shellCB;
+    ret = pthread_create(&shellCB->shellEntryHandle, &attr, &ShellEntry, arg);
+    if (ret != SH_OK) {
+        return SH_NOK;
+    }
+
+    return ret;
+}
+

apps/tftp/include/tftpc.h

@@ -42,7 +42,7 @@ extern "C" {
 
 #define TFTP_NULL_UINT32        ((u32_t)0xffffffffUL)
 
-#define TFTP_NULL_INT32         (-1)
+#define TFTP_NULL_INT32       -1
 
 /** @cond liteos
 * @defgroup TFTP_Interfaces
@@ -114,7 +114,7 @@ typedef enum tagTFTPC_OpCode {
     TFTPC_OP_RRQ = 1,         /* read request */
     TFTPC_OP_WRQ,             /* write request */
     TFTPC_OP_DATA,            /* data packet */
-    TFTPC_OP_ACK,             /* acknowledgment */
+    TFTPC_OP_ACK,             /* acknowledgement */
     TFTPC_OP_ERROR,           /* error code */
     TFTPC_OP_OPT              /* option code */
 } TFTPC_OPCODE_E;

apps/tftp/src/main.c

@@ -50,11 +50,11 @@ static char *TftpError[] = {
     "Error while sending data to the peer\n",
     "Requested file is not found\n",
     "This is the error sent by the server when hostname cannot be resolved\n",
-    "Input parameters passed to TFTP interfaces are invalid\n",
+    "Input paramters passed to TFTP interfaces are invalid\n",
     "Error detected in TFTP packet or the error received from the TFTP server\n",
     "Error during packet synhronization while sending or unexpected packet is received\n",
     "File size limit crossed, Max block can be 0xFFFF, each block containing 512 bytes\n",
-    "File name length greater than 256\n",
+    "File name lenght greater than 256\n",
     "Hostname IP is not valid\n",
     "TFTP server returned file access error\n",
     "TFTP server returned error signifying that the DISK is full to write\n",
@@ -66,11 +66,11 @@ static char *TftpError[] = {
     "File create error\n",
     "File write error\n",
     "Max time expired while waiting for file to be recived\n",
-    "Error when the received packet is less than 4bytes(error length) or greater than 512bytes\n",
+    "Error when the received packet is less than 4bytes(error lenght) or greater than 512bytes\n",
     "Returned by TFTP server for protocol user error\n",
     "The destination file path length greater than 256\n",
     "Returned by TFTP server for undefined transfer ID\n",
-    "IOCTL function failed at TFTP client while setting the socket to non-block\n",
+    "IOCTL fucntion failed at TFTP client while setting the socket to non-block\n",
 };
 
 #ifndef ARRAY_SIZE

apps/tftp/src/tftpc.c

@@ -189,7 +189,7 @@ u32_t lwip_tftp_recv_from_server(s32_t iSockNum, u32_t *pulSize, TFTPC_PACKET_S
     if (iRet == -1) {
         return TFTPC_SELECT_ERROR;
     } else if (iRet == 0) {
-        return TFTPC_TIMEOUT_ERROR;         /* Select timeout occurred */
+        return TFTPC_TIMEOUT_ERROR;         /* Select timeout occured */
     }
 
     if (!FD_ISSET(iSockNum, &stReadfds)) {
@@ -218,7 +218,7 @@ u32_t lwip_tftp_recv_from_server(s32_t iSockNum, u32_t *pulSize, TFTPC_PACKET_S
     usOpcode = ntohs(pstRecvBuf->usOpcode);
     /* if this packet is ERROR packet */
     if (usOpcode == TFTPC_OP_ERROR) {
-        ulError = ntohs(pstRecvBuf->u.stTFTP_Err.usErrNum);
+        ulError = ntohs (pstRecvBuf->u.stTFTP_Err.usErrNum);
 
         /*If the error is according to RFC,then convert to lwip error codes.
         Constant values are used in the cases as these error codes are as per
@@ -268,7 +268,7 @@ u32_t lwip_tftp_recv_from_server(s32_t iSockNum, u32_t *pulSize, TFTPC_PACKET_S
     *pulSize = (u32_t)iRet;
 
     /* If received packet is first block of data(for get operation) or if
-       received packet is acknowledgment for write request (put operation)
+       received packet is acknowledgement for write request (put operation)
        store the received port number */
     if (((usOpcode == TFTPC_OP_DATA) &&
          (ntohs(pstRecvBuf->u.stTFTP_Data.usBlknum) == 1)) ||
@@ -687,7 +687,7 @@ u32_t lwip_tftp_get_file_by_filename(u32_t ulHostAddr,
 
         ulErrCode = lwip_tftp_recv_from_server(iSockNum, &ulRecvSize, pstRecvBuf,
                                                &ulIgnorePkt, &stServerAddr, pstSendBuf);
-        /* If select timeout occurred */
+        /* If select timeout occured */
         if (ulErrCode == TFTPC_TIMEOUT_ERROR) {
             ulTotalTime++;
             if (ulTotalTime < TFTPC_MAX_SEND_REQ_ATTEMPTS) {
@@ -727,7 +727,7 @@ u32_t lwip_tftp_get_file_by_filename(u32_t ulHostAddr,
         }
 
         /* if this packet is unkonwn or incorrect packet */
-        if (ntohs(pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
+        if (ntohs (pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
             /* Send error packet to server */
             lwip_tftp_send_error(iSockNum,
                                  TFTPC_PROTOCOL_PROTO_ERROR,
@@ -982,7 +982,7 @@ u32_t lwip_tftp_put_file_by_filename(u32_t ulHostAddr, u16_t usTftpServPort, u8_
         return TFTPC_MEMALLOC_ERROR;
     }
 
-    /* First time initialize the buffer */
+    /* First time intialize the buffer */
     (void)memset_s((void *)pstSendBuf, sizeof(TFTPC_PACKET_S), 0, sizeof(TFTPC_PACKET_S));
 
     /* The destination path can only be one of the following:
@@ -1221,7 +1221,7 @@ u32_t lwip_tftp_inner_put_file(s32_t iSockNum,
         return TFTPC_MEMALLOC_ERROR;
     }
 
-    /* First time initialize the buffer */
+    /* First time intialize the buffer */
     (void)memset_s((void *)pstRecvBuf, sizeof(TFTPC_PACKET_S), 0, sizeof(TFTPC_PACKET_S));
 
     /* Initialize from address to the server address at first */
@@ -1235,7 +1235,7 @@ u32_t lwip_tftp_inner_put_file(s32_t iSockNum,
         ulError = lwip_tftp_recv_from_server(iSockNum, &ulPktSize,
                                              pstRecvBuf, &ulIgnorePkt,
                                              pstServerAddr, pstSendBuf);
-        /* If select timeout occurred */
+        /* If select timeout occured */
         if (ulError == TFTPC_TIMEOUT_ERROR) {
             ulTotalTime++;
             if (ulTotalTime < TFTPC_MAX_SEND_REQ_ATTEMPTS) {
@@ -1526,7 +1526,7 @@ u32_t lwip_tftp_get_file_by_filename_to_rawmem(u32_t ulHostAddr,
 
         ulErrCode = lwip_tftp_recv_from_server(iSockNum, &ulRecvSize, pstRecvBuf, &ulIgnorePkt,
                                                &stServerAddr, pstSendBuf);
-        /* If select timeout occurred */
+        /* If select timeout occured */
         if (ulErrCode == TFTPC_TIMEOUT_ERROR) {
             ulTotalTime++;
             if (ulTotalTime < TFTPC_MAX_SEND_REQ_ATTEMPTS) {
@@ -1557,7 +1557,7 @@ u32_t lwip_tftp_get_file_by_filename_to_rawmem(u32_t ulHostAddr,
         }
 
         /* if this packet is unkonwn or incorrect packet */
-        if (ntohs(pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
+        if (ntohs (pstRecvBuf->usOpcode) != TFTPC_OP_DATA) {
             /* Send error packet to server */
             lwip_tftp_send_error(iSockNum,
                                  TFTPC_PROTOCOL_PROTO_ERROR,

apps/toybox/BUILD.gn

@@ -29,14 +29,13 @@
 
 import("//build/lite/config/component/lite_component.gni")
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/toybox/toybox.gni")
 
 group("toybox") {
   deps = [ ":build_toybox" ]
 }
 
 copy("copy_toybox_src") {
-  sources = TOYBOX_SRC_DIR
+  sources = [ "$LITEOSTHIRDPARTY/toybox" ]
   outputs = [ "$target_out_dir/toybox_build" ]
 }
 
@@ -47,10 +46,7 @@ copy("copy_toybox_config") {
 }
 
 build_ext_component("build_toybox") {
-  deps = [
-    ":copy_toybox_config",
-    ":copy_toybox_src",
-  ]
+  deps = [ ":copy_toybox_src", ":copy_toybox_config" ]
   deps += [ "//prebuilts/lite/sysroot" ]
   exec_path = rebase_path("$target_out_dir/toybox_build")
 

apps/trace/BUILD.gn

@@ -31,4 +31,4 @@ import("//kernel/liteos_a/liteos.gni")
 
 executable("trace") {
   sources = [ "src/trace.c" ]
-}
+}

apps/trace/src/trace.c

@@ -70,10 +70,6 @@ static void TraceRead(int fd, size_t size)
 {
     ssize_t i;
     ssize_t len;
-    if (size <= 0) {
-        return;
-    }
-
     char *buffer = (char *)malloc(size);
     if (buffer == NULL) {
         printf("Read buffer malloc failed.\n");
@@ -92,13 +88,11 @@ static void TraceWrite(int fd, int argc, char **argv)
 {
     int i;
     UsrEventInfo info = {0};
-    info.eventType = strtoul(argv[2], NULL, 0); /* 2, argv number  */
-    info.identity = strtoul(argv[3], NULL, 0); /* 3, argv number  */
-    /* 4, argc -4 means user argv that does not contain argv[0]~argv[3] */
+    info.eventType = strtoul(argv[2], NULL, 0);
+    info.identity = strtoul(argv[3], NULL, 0);
     int paramNum = (argc - 4) > TRACE_USR_MAX_PARAMS ? TRACE_USR_MAX_PARAMS : (argc - 4);
-
+    
     for (i = 0; i < paramNum; i++) {
-        /* 4, argc -4 means user argv that does not contain argv[0]~argv[3] */
         info.params[i] = strtoul(argv[4 + i], NULL, 0);
     }
     (void)write(fd, &info, sizeof(UsrEventInfo));
@@ -114,22 +108,22 @@ int main(int argc, char **argv)
 
     if (argc == 1) {
         TraceUsage();
-    } else if (argc == 2 && strcmp(argv[1], "start") == 0) { /* 2, argv num, no special meaning */
+    } else if (argc == 2 && strcmp(argv[1], "start") == 0) {
         ioctl(fd, TRACE_START, NULL);
-    } else if (argc == 2 && strcmp(argv[1], "stop") == 0) { /* 2, argv num, no special meaning */
+    } else if (argc == 2 && strcmp(argv[1], "stop") == 0) {
         ioctl(fd, TRACE_STOP, NULL);
-    } else if (argc == 2 && strcmp(argv[1], "reset") == 0) { /* 2, argv num, no special meaning */
+    } else if (argc == 2 && strcmp(argv[1], "reset") == 0) {
         ioctl(fd, TRACE_RESET, NULL);
-    } else if (argc == 3 && strcmp(argv[1], "mask") == 0) { /* 3, argv num, no special meaning */
+    } else if (argc == 3 && strcmp(argv[1], "mask") == 0) {
         size_t mask = strtoul(argv[2], NULL, 0);
         ioctl(fd, TRACE_SET_MASK, mask);
-    } else if (argc == 3 && strcmp(argv[1], "dump") == 0) { /* 3, argv num, no special meaning */
+    } else if (argc == 3 && strcmp(argv[1], "dump") == 0) {
         size_t flag = strtoul(argv[2], NULL, 0);
         ioctl(fd, TRACE_DUMP, flag);
-    } else if (argc == 3 && strcmp(argv[1], "read") == 0) { /* 3, argv num, no special meaning */
+    } else if (argc == 3 && strcmp(argv[1], "read") == 0) {
         size_t size = strtoul(argv[2], NULL, 0);
         TraceRead(fd, size);
-    } else if (argc >= 4 && strcmp(argv[1], "write") == 0) { /* 4, argv num, no special meaning */
+    } else if (argc >= 4 && strcmp(argv[1], "write") == 0) {
         TraceWrite(fd, argc, argv);
     } else {
         printf("Unsupported trace command.\n");

arch/arm/arm.mk

@@ -74,3 +74,12 @@ ARCH_INCLUDE            := -I $(LITEOSTOPDIR)/arch/arm/include \
                            -I $(LITEOSTOPDIR)/arch/arm/$(ARCH)/src/include
 
 LITEOS_PLATFORM_INCLUDE += $(ARCH_INCLUDE)
+
+# expose FPU info to assembly code
+ifeq ($(LOSCFG_ARCH_FPU_DISABLE), y)
+    LITEOS_CMACRO       += -DLOSCFG_ARCH_FPU_DISABLE
+else ifeq ($(LOSCFG_ARCH_FPU_VFP_D16), y)
+    LITEOS_CMACRO       += -DLOSCFG_ARCH_FPU_VFP_D16
+else ifeq ($(LOSCFG_ARCH_FPU_VFP_D32), y)
+    LITEOS_CMACRO       += -DLOSCFG_ARCH_FPU_VFP_D32
+endif

arch/arm/arm/BUILD.gn

@@ -46,10 +46,10 @@ kernel_module(module_name) {
     "src/los_hw_runstop.S",
     "src/los_hw_tick.c",
     "src/los_hwi.c",
-    "src/smp.c",
     "src/strncpy_from_user.c",
     "src/strnlen_user.c",
     "src/user_copy.c",
+    "src/smp.c",
   ]
 
   if (LOSCFG_ARCH_ARM_VER == "armv7-a") {
@@ -64,10 +64,6 @@ kernel_module(module_name) {
 
   include_dirs = [ "src/include" ]
 
-  if (defined(LOSCFG_PERF_HW_PMU)) {
-    sources += [ "src/pmu/armv7_pmu.c" ]
-  }
-
   if (defined(LOSCFG_GDB)) {
     configs += [ ":as_objs_libc_flags" ]
   }
@@ -86,11 +82,9 @@ config("as_objs_libc_flags") {
   defines = [ "__ASSEMBLY__" ]
 
   # linux style macros
-  if (defined(LOSCFG_ARCH_ARM_V7A) || defined(LOSCFG_ARCH_ARM_V7R) ||
-      defined(LOSCFG_ARCH_ARM_V7M)) {
+  if (defined(LOSCFG_ARCH_ARM_V7A) || defined(LOSCFG_ARCH_ARM_V7R) || defined(LOSCFG_ARCH_ARM_V7M)) {
     defines += [ "__LINUX_ARM_ARCH__=7" ]
-  } else if (defined(LOSCFG_ARCH_ARM_V8A) || defined(LOSCFG_ARCH_ARM_V8R) ||
-             defined(LOSCFG_ARCH_ARM_V8M)) {
+  } else if (defined(LOSCFG_ARCH_ARM_V8A) || defined(LOSCFG_ARCH_ARM_V8R) || defined(LOSCFG_ARCH_ARM_V8M)) {
     defines += [ "__LINUX_ARM_ARCH__=8" ]
   }
 }

arch/arm/arm/Makefile

@@ -32,6 +32,11 @@ include $(LITEOSTOPDIR)/config.mk
 MODULE_NAME := $(LOSCFG_ARCH_CPU)
 
 LOCAL_SRCS := $(wildcard src/*.c) $(wildcard src/*.S)
+LOCAL_INCLUDE := \
+	-I $(LITEOSTOPDIR)/kernel/base/include \
+	-I $(LITEOSTOPDIR)/kernel/extended/include \
+	-I $(LITEOSTOPDIR)/kernel/extended/dynload/include \
+	-I $(LITEOSTOPDIR)/arch/arm/arm/include \
 
 ifeq ($(LOSCFG_ARCH_ARM_VER), "armv7-a")
 LOCAL_SRCS += $(wildcard src/armv7a/*.S)
@@ -43,11 +48,7 @@ else
 LOCAL_SRCS += src/startup/reset_vector_up.S
 endif
 
-ifeq ($(LOSCFG_PERF_HW_PMU), y)
-LOCAL_SRCS += src/pmu/armv7_pmu.c
-endif
-
-LOCAL_FLAGS := $(LOCAL_INCLUDE)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
 
 AS_OBJS_LIBC_FLAGS  = -D__ASSEMBLY__
 # linux style macros

arch/arm/arm/include/hal_timer.h

@@ -46,7 +46,7 @@ extern VOID HalClockInit(VOID);
 extern UINT64 HalClockGetCycles(VOID);
 extern VOID HalDelayUs(UINT32 usecs);
 extern UINT32 HalClockGetTickTimerCycles(VOID);
-extern UINT64 HalClockTickTimerReload(UINT64 cycles);
+extern VOID HalClockTickTimerReload(UINT64 cycles);
 
 extern UINT32 HrtimersInit(VOID);
 extern VOID HrtimerClockIrqClear(VOID);

arch/arm/arm/include/los_arch_mmu.h

@@ -38,10 +38,7 @@
 #define __LOS_ARCH_MMU_H__
 
 #include "los_typedef.h"
-#include "los_vm_phys.h"
-#ifndef LOSCFG_PAGE_TABLE_FINE_LOCK
-#include "los_spinlock.h"
-#endif
+#include "los_mux.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -50,9 +47,7 @@ extern "C" {
 #endif /* __cplusplus */
 
 typedef struct ArchMmu {
-#ifndef LOSCFG_PAGE_TABLE_FINE_LOCK
-    SPIN_LOCK_S         lock;           /**< arch mmu page table entry modification spin lock */
-#endif
+    LosMux              mtx;            /**< arch mmu page table entry modification mutex lock */
     VADDR_T             *virtTtb;       /**< translation table base virtual addr */
     PADDR_T             physTtb;        /**< translation table base phys addr */
     UINT32              asid;           /**< TLB asid */
@@ -76,5 +71,5 @@ VADDR_T *OsGFirstTableGet(VOID);
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#endif /* __LOS_ARCH_MMU_H__ */
+#endif /* __LOS_VM_PAGE_H__ */
 

arch/arm/arm/include/los_atomic.h

@@ -246,7 +246,7 @@ STATIC INLINE INT32 LOS_AtomicIncRet(Atomic *v)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implement the atomic auto-decrement.
+ * This API is used to implementating the atomic auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -280,7 +280,7 @@ STATIC INLINE VOID LOS_AtomicDec(Atomic *v)
  * @brief Atomic auto-decrement.
  *
  * @par Description:
- * This API is used to implement the atomic auto-decrement and return the result of auto-decrement.
+ * This API is used to implementating the atomic auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -531,7 +531,7 @@ STATIC INLINE INT64 LOS_Atomic64IncRet(Atomic64 *v)
  * @brief Atomic64 auto-decrement.
  *
  * @par Description:
- * This API is used to implement the atomic64 auto-decrement.
+ * This API is used to implementating the atomic64 auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>
@@ -566,7 +566,7 @@ STATIC INLINE VOID LOS_Atomic64Dec(Atomic64 *v)
  * @brief Atomic64 auto-decrement.
  *
  * @par Description:
- * This API is used to implement the atomic64 auto-decrement and return the result of auto-decrement.
+ * This API is used to implementating the atomic64 auto-decrement and return the result of auto-decrement.
  * @attention
  * <ul>
  * <li>The pointer v must not be NULL.</li>

arch/arm/arm/include/los_pte_ops.h

@@ -69,11 +69,6 @@ STATIC INLINE VOID OsClearPte1(PTE_T *pte1Ptr)
     OsSavePte1(pte1Ptr, 0);
 }
 
-STATIC INLINE PADDR_T OsGetPte1Paddr(PADDR_T PhysTtb, vaddr_t va)
-{
-    return (PhysTtb + (OsGetPte1Index(va) * sizeof(PADDR_T)));
-}
-
 STATIC INLINE PTE_T *OsGetPte1Ptr(PTE_T *pte1BasePtr, vaddr_t va)
 {
     return (pte1BasePtr + OsGetPte1Index(va));

arch/arm/arm/src/arm_generic_timer.c

@@ -31,6 +31,7 @@
 
 #include "los_hw_pri.h"
 #include "los_tick_pri.h"
+#include "los_sched_pri.h"
 #include "los_sys_pri.h"
 #include "gic_common.h"
 
@@ -138,6 +139,11 @@ LITE_OS_SEC_TEXT_INIT VOID HalClockInit(VOID)
 
 LITE_OS_SEC_TEXT_INIT VOID HalClockStart(VOID)
 {
+    UINT32 ret = OsSchedSetTickTimerType(64); /* 64 bit tick timer */
+    if (ret != LOS_OK) {
+        return;
+    }
+
     HalIrqUnmask(OS_TICK_INT_NUM);
 
     /* triggle the first tick */
@@ -169,7 +175,7 @@ UINT32 HalClockGetTickTimerCycles(VOID)
     return (UINT32)((cval > cycles) ? (cval - cycles) : 0);
 }
 
-UINT64 HalClockTickTimerReload(UINT64 cycles)
+VOID HalClockTickTimerReload(UINT64 cycles)
 {
     HalIrqMask(OS_TICK_INT_NUM);
     HalIrqClear(OS_TICK_INT_NUM);
@@ -179,5 +185,4 @@ UINT64 HalClockTickTimerReload(UINT64 cycles)
     TimerCtlWrite(1);
 
     HalIrqUnmask(OS_TICK_INT_NUM);
-    return cycles;
 }

arch/arm/arm/src/include/armv7_pmu_pri.h

@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifndef _ARMV7_PMU_PRI_H
-#define _ARMV7_PMU_PRI_H
-
-#include "los_typedef.h"
-
-#ifdef __cplusplus
-#if __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-/* counters overflow flag status reg */
-#define ARMV7_FLAG_MASK         0xffffffff                 /* Mask for writable bits */
-#define ARMV7_OVERFLOWED_MASK   ARMV7_FLAG_MASK            /* Mask for pmu overflowed */
-
-/* pmnc config reg */
-#define ARMV7_PMNC_E            (1U << 0)                  /* Enable all counters */
-#define ARMV7_PMNC_P            (1U << 1)                  /* Reset all counters */
-#define ARMV7_PMNC_C            (1U << 2)                  /* Cycle counter reset */
-#define ARMV7_PMNC_D            (1U << 3)                  /* CCNT counts every 64th cpu cycle */
-#define ARMV7_PMNC_X            (1U << 4)                  /* Export to ETM */
-#define ARMV7_PMNC_DP           (1U << 5)                  /* Disable CCNT if non-invasive debug */
-#define ARMV7_PMNC_MASK         0x3f                       /* Mask for writable bits */
-
-/* pmxevtyper event selection reg */
-#define ARMV7_EVTYPE_MASK       0xc80000ff                 /* Mask for writable bits */
-
-/* armv7 counters index */
-#define ARMV7_IDX_COUNTER0      1
-#define ARMV7_IDX_CYCLE_COUNTER 0
-#define ARMV7_IDX_MAX_COUNTER   9
-
-#define ARMV7_MAX_COUNTERS      32
-#define ARMV7_IDX_COUNTER_LAST  (ARMV7_IDX_CYCLE_COUNTER + ARMV7_MAX_COUNTERS - 1)
-#define ARMV7_COUNTER_MASK      (ARMV7_MAX_COUNTERS - 1)
-
-/* armv7 event counter index mapping */
-#define ARMV7_CNT2BIT(x)        (1UL << (x))
-#define ARMV7_IDX2CNT(x)        (((x) - ARMV7_IDX_COUNTER0) & ARMV7_COUNTER_MASK)
-
-enum PmuEventType {
-    ARMV7_PERF_HW_CYCLES                   = 0xFF,    /* cycles */
-    ARMV7_PERF_HW_INSTRUCTIONS             = 0x08,    /* instructions */
-    ARMV7_PERF_HW_DCACHES                  = 0x04,    /* dcache */
-    ARMV7_PERF_HW_DCACHE_MISSES            = 0x03,    /* dcache-misses */
-    ARMV7_PERF_HW_ICACHES                  = 0x14,    /* icache */
-    ARMV7_PERF_HW_ICACHE_MISSES            = 0x01,    /* icache-misses */
-    ARMV7_PERF_HW_BRANCHES                 = 0x0C,    /* software change of pc */
-    ARMV7_PERF_HW_BRANCE_MISSES            = 0x10,    /* branch-misses */
-    ARMV7_PERF_HW_PRED_BRANCH              = 0x12,    /* predictable branches */
-    ARMV7_PERF_HW_NUM_CYC_IRQ              = 0x50,    /* number of cycles Irqs are interrupted */
-    ARMV7_PERF_HW_EXC_TAKEN                = 0x09,    /* exception_taken */
-    ARMV7_PERF_HW_DATA_READ                = 0x06,    /* data read */
-    ARMV7_PERF_HW_DATA_WRITE               = 0x07,    /* data write */
-    ARMV7_PERF_HW_STREX_PASSED             = 0x80,    /* strex passed */
-    ARMV7_PERF_HW_STREX_FAILED             = 0x81,    /* strex failed */
-    ARMV7_PERF_HW_LP_IN_TCM                = 0x82,    /* literal pool in TCM region */
-    ARMV7_PERF_HW_DMB_STALL                = 0x90,    /* DMB stall */
-    ARMV7_PERF_HW_ITCM_ACCESS              = 0x91,    /* ITCM access */
-    ARMV7_PERF_HW_DTCM_ACCESS              = 0x92,    /* DTCM access */
-    ARMV7_PERF_HW_DATA_EVICTION            = 0x93,    /* data eviction */
-    ARMV7_PERF_HW_SCU                      = 0x94,    /* SCU coherency operation */
-    ARMV7_PERF_HW_INSCACHE_DEP_DW          = 0x95,    /* instruction cache dependent stall */
-    ARMV7_PERF_HW_DATA_CACHE_DEP_STALL     = 0x96,    /* data cache dependent stall */
-    ARMV7_PERF_HW_NOCACHE_NO_PER_DEP_STALL = 0x97,    /* non-cacheable no peripheral dependent stall */
-    ARMV7_PERF_HW_NOCACHE_PER_DEP_STALL    = 0x98,    /* non-Cacheable peripheral dependent stall */
-    ARMV7_PERF_HW_DATA_CACHE_HP_DEP_STALL  = 0x99,    /* data cache high priority dependent stall */
-    ARMV7_PERF_HW_AXI_FAST_PERIPHERAL      = 0x9A,    /* Accesses_to_AXI_fast_peripheral_port(reads_and_writes) */
-};
-
-#ifdef __cplusplus
-#if __cplusplus
-}
-#endif /* __cplusplus */
-#endif /* __cplusplus */
-
-#endif /* _ARMV7_PMU_PRI_H */

arch/arm/arm/src/include/los_exc_pri.h

@@ -44,24 +44,10 @@ extern "C" {
 #define OS_SYSTEM_EXC_CURR_CPU  1
 #define OS_SYSTEM_EXC_OTHER_CPU 2
 
-#define REGION_PATH_MAX 32
-
-typedef struct {
-#ifdef LOSCFG_KERNEL_VM
-    UINTPTR ip;
-    UINT32 len; /* f_path length */
-    CHAR f_path[REGION_PATH_MAX];
-#else
-    UINTPTR ip;
-#endif
-} IpInfo;
-
 extern UINT32 OsGetSystemStatus(VOID);
 extern VOID BackTraceSub(UINTPTR regFP);
 extern VOID OsExcInit(VOID);
 extern BOOL OsSystemExcIsReset(VOID);
-extern UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth);
-extern BOOL OsGetUsrIpInfo(UINTPTR ip, IpInfo *info);
 
 #ifdef __cplusplus
 #if __cplusplus

arch/arm/arm/src/include/los_hwi_pri.h

@@ -55,8 +55,8 @@ extern "C" {
 #define HWI_IS_REGISTED(num)             ((&g_hwiForm[num])->pstNext != NULL)
 #endif
 extern VOID OsHwiInit(VOID);
-extern VOID OsIncHwiFormCnt(UINT16 cpuid, UINT32 index);
-extern UINT32 OsGetHwiFormCnt(UINT16 cpuid, UINT32 index);
+extern VOID OsIncHwiFormCnt(UINT32 index);
+extern UINT32 OsGetHwiFormCnt(UINT32 index);
 extern CHAR *OsGetHwiFormName(UINT32 index);
 extern VOID OsInterrupt(UINT32 intNum);
 extern VOID OsSyscallHandleInit(VOID);

arch/arm/arm/src/los_arch_mmu.c

@@ -39,21 +39,14 @@
 #include "los_pte_ops.h"
 #include "los_tlb_v6.h"
 #include "los_printf.h"
+#include "los_vm_phys.h"
 #include "los_vm_common.h"
 #include "los_vm_map.h"
 #include "los_vm_boot.h"
 #include "los_mmu_descriptor_v6.h"
-#include "los_process_pri.h"
+
 
 #ifdef LOSCFG_KERNEL_MMU
-typedef struct {
-    LosArchMmu *archMmu;
-    VADDR_T *vaddr;
-    PADDR_T *paddr;
-    UINT32 *flags;
-} MmuMapInfo;
-
-#define TRY_MAX_TIMES 10
 
 __attribute__((aligned(MMU_DESCRIPTOR_L1_SMALL_ENTRY_NUMBERS))) \
     __attribute__((section(".bss.prebss.translation_table"))) UINT8 \
@@ -68,75 +61,6 @@ extern CHAR __mmu_ttlb_begin; /* defined in .ld script */
 UINT8 *g_mmuJumpPageTable = (UINT8 *)&__mmu_ttlb_begin; /* temp page table, this is only used when system power up */
 #endif
 
-STATIC SPIN_LOCK_S *OsGetPteLock(LosArchMmu *archMmu, PADDR_T paddr, UINT32 *intSave)
-{
-    SPIN_LOCK_S *lock = NULL;
-#ifdef LOSCFG_PAGE_TABLE_FINE_LOCK
-    LosVmPage *vmPage = NULL;
-
-    vmPage = OsVmPaddrToPage(paddr);
-    if (vmPage == NULL) {
-        return NULL;
-    }
-    lock = &vmPage->lock;
-#else
-    lock = &archMmu->lock;
-#endif
-
-    LOS_SpinLockSave(lock, intSave);
-    return lock;
-}
-
-STATIC SPIN_LOCK_S *OsGetPte1Lock(LosArchMmu *archMmu, PADDR_T paddr, UINT32 *intSave)
-{
-    return OsGetPteLock(archMmu, paddr, intSave);
-}
-
-STATIC INLINE VOID OsUnlockPte1(SPIN_LOCK_S *lock, UINT32 intSave)
-{
-    if (lock == NULL) {
-        return;
-    }
-    LOS_SpinUnlockRestore(lock, intSave);
-}
-
-STATIC SPIN_LOCK_S *OsGetPte1LockTmp(LosArchMmu *archMmu, PADDR_T paddr, UINT32 *intSave)
-{
-    SPIN_LOCK_S *spinLock = NULL;
-#ifdef LOSCFG_PAGE_TABLE_FINE_LOCK
-    spinLock = OsGetPteLock(archMmu, paddr, intSave);
-#else
-    (VOID)archMmu;
-    (VOID)paddr;
-    (VOID)intSave;
-#endif
-    return spinLock;
-}
-
-STATIC INLINE VOID OsUnlockPte1Tmp(SPIN_LOCK_S *lock, UINT32 intSave)
-{
-#ifdef LOSCFG_PAGE_TABLE_FINE_LOCK
-    if (lock == NULL) {
-        return;
-    }
-    LOS_SpinUnlockRestore(lock, intSave);
-#else
-    (VOID)lock;
-    (VOID)intSave;
-#endif
-}
-
-STATIC INLINE SPIN_LOCK_S *OsGetPte2Lock(LosArchMmu *archMmu, PTE_T pte1, UINT32 *intSave)
-{
-    PADDR_T pa = MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(pte1);
-    return OsGetPteLock(archMmu, pa, intSave);
-}
-
-STATIC INLINE VOID OsUnlockPte2(SPIN_LOCK_S *lock, UINT32 intSave)
-{
-    return OsUnlockPte1(lock, intSave);
-}
-
 STATIC INLINE PTE_T *OsGetPte2BasePtr(PTE_T pte1)
 {
     PADDR_T pa = MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(pte1);
@@ -248,30 +172,20 @@ STATIC VOID OsPutL2Table(const LosArchMmu *archMmu, UINT32 l1Index, paddr_t l2Pa
 #endif
 }
 
-STATIC VOID OsTryUnmapL1PTE(LosArchMmu *archMmu, PTE_T *l1Entry, vaddr_t vaddr, UINT32 scanIndex, UINT32 scanCount)
+STATIC VOID OsTryUnmapL1PTE(const LosArchMmu *archMmu, vaddr_t vaddr, UINT32 scanIndex, UINT32 scanCount)
 {
     /*
      * Check if all pages related to this l1 entry are deallocated.
      * We only need to check pages that we did not clear above starting
-     * from scanIndex and wrapped around SECTION.
+     * from page_idx and wrapped around SECTION.
      */
     UINT32 l1Index;
+    PTE_T l1Entry;
     PTE_T *pte2BasePtr = NULL;
-    SPIN_LOCK_S *pte1Lock = NULL;
-    SPIN_LOCK_S *pte2Lock = NULL;
-    UINT32 pte1IntSave;
-    UINT32 pte2IntSave;
-    PTE_T pte1Val;
-    PADDR_T pte1Paddr;
 
-    pte1Paddr = OsGetPte1Paddr(archMmu->physTtb, vaddr);
-    pte2Lock = OsGetPte2Lock(archMmu, *l1Entry, &pte2IntSave);
-    if (pte2Lock == NULL) {
-        return;
-    }
-    pte2BasePtr = OsGetPte2BasePtr(*l1Entry);
+    pte2BasePtr = OsGetPte2BasePtr(OsGetPte1(archMmu->virtTtb, vaddr));
     if (pte2BasePtr == NULL) {
-        OsUnlockPte2(pte2Lock, pte2IntSave);
+        VM_ERR("pte2 base ptr is NULL");
         return;
     }
 
@@ -286,27 +200,15 @@ STATIC VOID OsTryUnmapL1PTE(LosArchMmu *archMmu, PTE_T *l1Entry, vaddr_t vaddr,
     }
 
     if (!scanCount) {
-        /*
-         * The pte1 of kprocess is placed in kernel image when compiled. So the pte1Lock will be null.
-         * There is no situation to simultaneous access the pte1 of kprocess.
-         */
-        pte1Lock = OsGetPte1LockTmp(archMmu, pte1Paddr, &pte1IntSave);
-        if (!OsIsPte1PageTable(*l1Entry)) {
-            OsUnlockPte1Tmp(pte1Lock, pte1IntSave);
-            OsUnlockPte2(pte2Lock, pte2IntSave);
-            return;
-        }
-        pte1Val = *l1Entry;
-        /* we can kill l1 entry */
-        OsClearPte1(l1Entry);
         l1Index = OsGetPte1Index(vaddr);
+        l1Entry = archMmu->virtTtb[l1Index];
+        /* we can kill l1 entry */
+        OsClearPte1(&archMmu->virtTtb[l1Index]);
         OsArmInvalidateTlbMvaNoBarrier(l1Index << MMU_DESCRIPTOR_L1_SMALL_SHIFT);
 
         /* try to free l2 page itself */
-        OsPutL2Table(archMmu, l1Index, MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(pte1Val));
-        OsUnlockPte1Tmp(pte1Lock, pte1IntSave);
+        OsPutL2Table(archMmu, l1Index, MMU_DESCRIPTOR_L1_PAGE_TABLE_ADDR(l1Entry));
     }
-    OsUnlockPte2(pte2Lock, pte2IntSave);
 }
 
 STATIC UINT32 OsCvtSecCacheFlagsToMMUFlags(UINT32 flags)
@@ -438,54 +340,34 @@ STATIC VOID OsCvtSecAttsToFlags(PTE_T l1Entry, UINT32 *flags)
     }
 }
 
-STATIC UINT32 OsUnmapL2PTE(LosArchMmu *archMmu, PTE_T *pte1, vaddr_t vaddr, UINT32 *count)
+STATIC UINT32 OsUnmapL2PTE(const LosArchMmu *archMmu, vaddr_t vaddr, UINT32 *count)
 {
     UINT32 unmapCount;
     UINT32 pte2Index;
-    UINT32 intSave;
     PTE_T *pte2BasePtr = NULL;
-    SPIN_LOCK_S *lock = NULL;
+
+    pte2BasePtr = OsGetPte2BasePtr(OsGetPte1((PTE_T *)archMmu->virtTtb, vaddr));
+    if (pte2BasePtr == NULL) {
+        LOS_Panic("%s %d, pte2 base ptr is NULL\n", __FUNCTION__, __LINE__);
+    }
 
     pte2Index = OsGetPte2Index(vaddr);
     unmapCount = MIN2(MMU_DESCRIPTOR_L2_NUMBERS_PER_L1 - pte2Index, *count);
 
-    lock = OsGetPte2Lock(archMmu, *pte1, &intSave);
-    if (lock == NULL) {
-        return unmapCount;
-    }
-
-    pte2BasePtr = OsGetPte2BasePtr(*pte1);
-    if (pte2BasePtr == NULL) {
-        OsUnlockPte2(lock, intSave);
-        return unmapCount;
-    }
-
     /* unmap page run */
     OsClearPte2Continuous(&pte2BasePtr[pte2Index], unmapCount);
 
     /* invalidate tlb */
     OsArmInvalidateTlbMvaRangeNoBarrier(vaddr, unmapCount);
-    OsUnlockPte2(lock, intSave);
 
     *count -= unmapCount;
     return unmapCount;
 }
 
-STATIC UINT32 OsUnmapSection(LosArchMmu *archMmu, PTE_T *l1Entry, vaddr_t *vaddr, UINT32 *count)
+STATIC UINT32 OsUnmapSection(LosArchMmu *archMmu, vaddr_t *vaddr, UINT32 *count)
 {
-    UINT32 intSave;
-    PADDR_T pte1Paddr;
-    SPIN_LOCK_S *lock = NULL;
-
-    pte1Paddr = OsGetPte1Paddr(archMmu->physTtb, *vaddr);
-    lock = OsGetPte1Lock(archMmu, pte1Paddr, &intSave);
-    if (!OsIsPte1Section(*l1Entry)) {
-        OsUnlockPte1(lock, intSave);
-        return 0;
-    }
     OsClearPte1(OsGetPte1Ptr((PTE_T *)archMmu->virtTtb, *vaddr));
     OsArmInvalidateTlbMvaNoBarrier(*vaddr);
-    OsUnlockPte1(lock, intSave);
 
     *vaddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
     *count -= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1;
@@ -502,9 +384,12 @@ BOOL OsArchMmuInit(LosArchMmu *archMmu, VADDR_T *virtTtb)
     }
 #endif
 
-#ifndef LOSCFG_PAGE_TABLE_FINE_LOCK
-    LOS_SpinInit(&archMmu->lock);
-#endif
+    status_t retval = LOS_MuxInit(&archMmu->mtx, NULL);
+    if (retval != LOS_OK) {
+        VM_ERR("Create mutex for arch mmu failed, status: %d", retval);
+        return FALSE;
+    }
+
     LOS_ListInit(&archMmu->ptList);
     archMmu->virtTtb = virtTtb;
     archMmu->physTtb = (VADDR_T)(UINTPTR)virtTtb - KERNEL_ASPACE_BASE + SYS_MEM_BASE;
@@ -553,55 +438,45 @@ STATUS_T LOS_ArchMmuQuery(const LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T *pad
 
 STATUS_T LOS_ArchMmuUnmap(LosArchMmu *archMmu, VADDR_T vaddr, size_t count)
 {
-    PTE_T *l1Entry = NULL;
+    PTE_T l1Entry;
     INT32 unmapped = 0;
     UINT32 unmapCount = 0;
-    INT32 tryTime = TRY_MAX_TIMES;
 
     while (count > 0) {
-        l1Entry = OsGetPte1Ptr(archMmu->virtTtb, vaddr);
-        if (OsIsPte1Invalid(*l1Entry)) {
+        l1Entry = OsGetPte1(archMmu->virtTtb, vaddr);
+        if (OsIsPte1Invalid(l1Entry)) {
             unmapCount = OsUnmapL1Invalid(&vaddr, &count);
-        } else if (OsIsPte1Section(*l1Entry)) {
+        } else if (OsIsPte1Section(l1Entry)) {
             if (MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(vaddr) && count >= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1) {
-                unmapCount = OsUnmapSection(archMmu, l1Entry, &vaddr, &count);
+                unmapCount = OsUnmapSection(archMmu, &vaddr, &count);
             } else {
                 LOS_Panic("%s %d, unimplemented\n", __FUNCTION__, __LINE__);
             }
-        } else if (OsIsPte1PageTable(*l1Entry)) {
-            unmapCount = OsUnmapL2PTE(archMmu, l1Entry, vaddr, &count);
-            OsTryUnmapL1PTE(archMmu, l1Entry, vaddr, OsGetPte2Index(vaddr) + unmapCount,
-                            MMU_DESCRIPTOR_L2_NUMBERS_PER_L1);
+        } else if (OsIsPte1PageTable(l1Entry)) {
+            unmapCount = OsUnmapL2PTE(archMmu, vaddr, &count);
+            OsTryUnmapL1PTE(archMmu, vaddr, OsGetPte2Index(vaddr) + unmapCount,
+                            MMU_DESCRIPTOR_L2_NUMBERS_PER_L1 - unmapCount);
             vaddr += unmapCount << MMU_DESCRIPTOR_L2_SMALL_SHIFT;
         } else {
             LOS_Panic("%s %d, unimplemented\n", __FUNCTION__, __LINE__);
         }
-        tryTime = (unmapCount == 0) ? (tryTime - 1) : tryTime;
-        if (tryTime == 0) {
-            return LOS_ERRNO_VM_FAULT;
-        }
         unmapped += unmapCount;
     }
     OsArmInvalidateTlbBarrier();
     return unmapped;
 }
 
-STATIC UINT32 OsMapSection(MmuMapInfo *mmuMapInfo, UINT32 *count)
+STATIC UINT32 OsMapSection(const LosArchMmu *archMmu, UINT32 flags, VADDR_T *vaddr,
+                           PADDR_T *paddr, UINT32 *count)
 {
     UINT32 mmuFlags = 0;
-    UINT32 intSave;
-    PADDR_T pte1Paddr;
-    SPIN_LOCK_S *lock = NULL;
 
-    mmuFlags |= OsCvtSecFlagsToAttrs(*mmuMapInfo->flags);
-    pte1Paddr = OsGetPte1Paddr(mmuMapInfo->archMmu->physTtb, *mmuMapInfo->vaddr);
-    lock = OsGetPte1Lock(mmuMapInfo->archMmu, pte1Paddr, &intSave);
-    OsSavePte1(OsGetPte1Ptr(mmuMapInfo->archMmu->virtTtb, *mmuMapInfo->vaddr),
-        OsTruncPte1(*mmuMapInfo->paddr) | mmuFlags | MMU_DESCRIPTOR_L1_TYPE_SECTION);
-    OsUnlockPte1(lock, intSave);
+    mmuFlags |= OsCvtSecFlagsToAttrs(flags);
+    OsSavePte1(OsGetPte1Ptr(archMmu->virtTtb, *vaddr),
+        OsTruncPte1(*paddr) | mmuFlags | MMU_DESCRIPTOR_L1_TYPE_SECTION);
     *count -= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1;
-    *mmuMapInfo->vaddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
-    *mmuMapInfo->paddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
+    *vaddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
+    *paddr += MMU_DESCRIPTOR_L1_SMALL_SIZE;
 
     return MMU_DESCRIPTOR_L2_NUMBERS_PER_L1;
 }
@@ -642,10 +517,27 @@ STATIC STATUS_T OsGetL2Table(LosArchMmu *archMmu, UINT32 l1Index, paddr_t *ppa)
     (VOID)memset_s(kvaddr, MMU_DESCRIPTOR_L2_SMALL_SIZE, 0, MMU_DESCRIPTOR_L2_SMALL_SIZE);
 
     /* get physical address */
-    *ppa = OsKVaddrToPaddr((VADDR_T)kvaddr) + l2Offset;
+    *ppa = LOS_PaddrQuery(kvaddr) + l2Offset;
     return LOS_OK;
 }
 
+STATIC VOID OsMapL1PTE(LosArchMmu *archMmu, PTE_T *pte1Ptr, vaddr_t vaddr, UINT32 flags)
+{
+    paddr_t pte2Base = 0;
+
+    if (OsGetL2Table(archMmu, OsGetPte1Index(vaddr), &pte2Base) != LOS_OK) {
+        LOS_Panic("%s %d, failed to allocate pagetable\n", __FUNCTION__, __LINE__);
+    }
+
+    *pte1Ptr = pte2Base | MMU_DESCRIPTOR_L1_TYPE_PAGE_TABLE;
+    if (flags & VM_MAP_REGION_FLAG_NS) {
+        *pte1Ptr |= MMU_DESCRIPTOR_L1_PAGETABLE_NON_SECURE;
+    }
+    *pte1Ptr &= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_MASK;
+    *pte1Ptr |= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_CLIENT; // use client AP
+    OsSavePte1(OsGetPte1Ptr(archMmu->virtTtb, vaddr), *pte1Ptr);
+}
+
 STATIC UINT32 OsCvtPte2CacheFlagsToMMUFlags(UINT32 flags)
 {
     UINT32 mmuFlags = 0;
@@ -726,93 +618,32 @@ STATIC UINT32 OsCvtPte2FlagsToAttrs(UINT32 flags)
     return mmuFlags;
 }
 
-STATIC UINT32 OsMapL1PTE(MmuMapInfo *mmuMapInfo, PTE_T *l1Entry, UINT32 *count)
-{
-    PADDR_T pte2Base = 0;
-    PADDR_T pte1Paddr;
-    SPIN_LOCK_S *pte1Lock = NULL;
-    SPIN_LOCK_S *pte2Lock = NULL;
-    PTE_T *pte2BasePtr = NULL;
-    UINT32 saveCounts, archFlags, pte1IntSave, pte2IntSave;
-
-    pte1Paddr = OsGetPte1Paddr(mmuMapInfo->archMmu->physTtb, *mmuMapInfo->vaddr);
-    pte1Lock = OsGetPte1Lock(mmuMapInfo->archMmu, pte1Paddr, &pte1IntSave);
-    if (!OsIsPte1Invalid(*l1Entry)) {
-        OsUnlockPte1(pte1Lock, pte1IntSave);
-        return 0;
-    }
-    if (OsGetL2Table(mmuMapInfo->archMmu, OsGetPte1Index(*mmuMapInfo->vaddr), &pte2Base) != LOS_OK) {
-        LOS_Panic("%s %d, failed to allocate pagetable\n", __FUNCTION__, __LINE__);
-    }
-
-    *l1Entry = pte2Base | MMU_DESCRIPTOR_L1_TYPE_PAGE_TABLE;
-    if (*mmuMapInfo->flags & VM_MAP_REGION_FLAG_NS) {
-        *l1Entry |= MMU_DESCRIPTOR_L1_PAGETABLE_NON_SECURE;
-    }
-    *l1Entry &= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_MASK;
-    *l1Entry |= MMU_DESCRIPTOR_L1_SMALL_DOMAIN_CLIENT; // use client AP
-    OsSavePte1(OsGetPte1Ptr(mmuMapInfo->archMmu->virtTtb, *mmuMapInfo->vaddr), *l1Entry);
-    OsUnlockPte1(pte1Lock, pte1IntSave);
-
-    pte2Lock = OsGetPte2Lock(mmuMapInfo->archMmu, *l1Entry, &pte2IntSave);
-    if (pte2Lock == NULL) {
-        LOS_Panic("pte2 should not be null!\n");
-    }
-    pte2BasePtr = (PTE_T *)LOS_PaddrToKVaddr(pte2Base);
-
-    /* compute the arch flags for L2 4K pages */
-    archFlags = OsCvtPte2FlagsToAttrs(*mmuMapInfo->flags);
-    saveCounts = OsSavePte2Continuous(pte2BasePtr, OsGetPte2Index(*mmuMapInfo->vaddr), *mmuMapInfo->paddr | archFlags,
-                                      *count);
-    OsUnlockPte2(pte2Lock, pte2IntSave);
-    *mmuMapInfo->paddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
-    *mmuMapInfo->vaddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
-    *count -= saveCounts;
-    return saveCounts;
-}
-
-STATIC UINT32 OsMapL2PageContinous(MmuMapInfo *mmuMapInfo, PTE_T *pte1, UINT32 *count)
+STATIC UINT32 OsMapL2PageContinous(PTE_T pte1, UINT32 flags, VADDR_T *vaddr, PADDR_T *paddr, UINT32 *count)
 {
     PTE_T *pte2BasePtr = NULL;
     UINT32 archFlags;
     UINT32 saveCounts;
-    UINT32 intSave;
-    SPIN_LOCK_S *lock = NULL;
 
-    lock = OsGetPte2Lock(mmuMapInfo->archMmu, *pte1, &intSave);
-    if (lock == NULL) {
-        return 0;
-    }
-    pte2BasePtr = OsGetPte2BasePtr(*pte1);
+    pte2BasePtr = OsGetPte2BasePtr(pte1);
     if (pte2BasePtr == NULL) {
-        OsUnlockPte2(lock, intSave);
-        return 0;
+        LOS_Panic("%s %d, pte1 %#x error\n", __FUNCTION__, __LINE__, pte1);
     }
 
     /* compute the arch flags for L2 4K pages */
-    archFlags = OsCvtPte2FlagsToAttrs(*mmuMapInfo->flags);
-    saveCounts = OsSavePte2Continuous(pte2BasePtr, OsGetPte2Index(*mmuMapInfo->vaddr), *mmuMapInfo->paddr | archFlags,
-                                      *count);
-    OsUnlockPte2(lock, intSave);
-    *mmuMapInfo->paddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
-    *mmuMapInfo->vaddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
+    archFlags = OsCvtPte2FlagsToAttrs(flags);
+    saveCounts = OsSavePte2Continuous(pte2BasePtr, OsGetPte2Index(*vaddr), *paddr | archFlags, *count);
+    *paddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
+    *vaddr += (saveCounts << MMU_DESCRIPTOR_L2_SMALL_SHIFT);
     *count -= saveCounts;
     return saveCounts;
 }
 
 status_t LOS_ArchMmuMap(LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T paddr, size_t count, UINT32 flags)
 {
-    PTE_T *l1Entry = NULL;
+    PTE_T l1Entry;
     UINT32 saveCounts = 0;
     INT32 mapped = 0;
-    INT32 tryTime = TRY_MAX_TIMES;
     INT32 checkRst;
-    MmuMapInfo mmuMapInfo = {
-        .archMmu = archMmu,
-        .vaddr = &vaddr,
-        .paddr = &paddr,
-        .flags = &flags,
-    };
 
     checkRst = OsMapParamCheck(flags, vaddr, paddr);
     if (checkRst < 0) {
@@ -821,27 +652,24 @@ status_t LOS_ArchMmuMap(LosArchMmu *archMmu, VADDR_T vaddr, PADDR_T paddr, size_
 
     /* see what kind of mapping we can use */
     while (count > 0) {
-        if (MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(*mmuMapInfo.vaddr) &&
-            MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(*mmuMapInfo.paddr) &&
+        if (MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(vaddr) &&
+            MMU_DESCRIPTOR_IS_L1_SIZE_ALIGNED(paddr) &&
             count >= MMU_DESCRIPTOR_L2_NUMBERS_PER_L1) {
             /* compute the arch flags for L1 sections cache, r ,w ,x, domain and type */
-            saveCounts = OsMapSection(&mmuMapInfo, &count);
+            saveCounts = OsMapSection(archMmu, flags, &vaddr, &paddr, &count);
         } else {
             /* have to use a L2 mapping, we only allocate 4KB for L1, support 0 ~ 1GB */
-            l1Entry = OsGetPte1Ptr(archMmu->virtTtb, *mmuMapInfo.vaddr);
-            if (OsIsPte1Invalid(*l1Entry)) {
-                saveCounts = OsMapL1PTE(&mmuMapInfo, l1Entry, &count);
-            } else if (OsIsPte1PageTable(*l1Entry)) {
-                saveCounts = OsMapL2PageContinous(&mmuMapInfo, l1Entry, &count);
+            l1Entry = OsGetPte1(archMmu->virtTtb, vaddr);
+            if (OsIsPte1Invalid(l1Entry)) {
+                OsMapL1PTE(archMmu, &l1Entry, vaddr, flags);
+                saveCounts = OsMapL2PageContinous(l1Entry, flags, &vaddr, &paddr, &count);
+            } else if (OsIsPte1PageTable(l1Entry)) {
+                saveCounts = OsMapL2PageContinous(l1Entry, flags, &vaddr, &paddr, &count);
             } else {
                 LOS_Panic("%s %d, unimplemented tt_entry %x\n", __FUNCTION__, __LINE__, l1Entry);
             }
         }
         mapped += saveCounts;
-        tryTime = (saveCounts == 0) ? (tryTime - 1) : tryTime;
-        if (tryTime == 0) {
-            return LOS_ERRNO_VM_TIMED_OUT;
-        }
     }
 
     return mapped;
@@ -888,7 +716,7 @@ STATUS_T LOS_ArchMmuMove(LosArchMmu *archMmu, VADDR_T oldVaddr, VADDR_T newVaddr
     PADDR_T paddr = 0;
 
     if ((archMmu == NULL) || (oldVaddr == 0) || (newVaddr == 0) || (count == 0)) {
-        VM_ERR("invalid args: archMmu %p, oldVaddr %p, newVaddr %p, count %d",
+        VM_ERR("invalid args: archMmu %p, oldVaddr %p, newVddr %p, count %d",
                archMmu, oldVaddr, newVaddr, count);
         return LOS_NOK;
     }
@@ -965,6 +793,7 @@ STATUS_T LOS_ArchMmuDestroy(LosArchMmu *archMmu)
     OsArmWriteTlbiasidis(archMmu->asid);
     OsFreeAsid(archMmu->asid);
 #endif
+    (VOID)LOS_MuxDestroy(&archMmu->mtx);
     return LOS_OK;
 }
 
@@ -1033,7 +862,7 @@ STATIC VOID OsSetKSectionAttr(UINTPTR virtAddr, BOOL uncached)
     LosVmSpace *kSpace = LOS_GetKVmSpace();
     status_t status;
     UINT32 length;
-    INT32 i;
+    int i;
     LosArchMmuInitMapping *kernelMap = NULL;
     UINT32 kmallocLength;
     UINT32 flags;
@@ -1137,3 +966,4 @@ VOID OsInitMappingStartUp(VOID)
 }
 #endif
 
+

arch/arm/arm/src/los_dispatch.S

@@ -147,14 +147,6 @@ OsIrqHandler:
     /* disable irq, switch to svc mode */
     CPSID   i, #0x13
 
-#ifdef LOSCFG_KERNEL_PERF
-    PUSH    {R0-R3, R12, LR}
-    MOV     R0, LR
-    MOV     R1, FP
-    BL      OsPerfSetIrqRegs
-    POP     {R0-R3, R12, LR}
-#endif
-
     STMFD   SP!, {R0-R3, R12, LR}
     STMFD   SP, {R13, R14}^
     SUB     SP, SP, #(4 * 4)

arch/arm/arm/src/los_exc.c

@@ -33,7 +33,6 @@
 #include "los_memory_pri.h"
 #include "los_printf_pri.h"
 #include "los_task_pri.h"
-#include "los_percpu_pri.h"
 #include "los_hw_pri.h"
 #ifdef LOSCFG_SAVE_EXCINFO
 #include "los_excinfo_pri.h"
@@ -59,7 +58,6 @@
 #include "los_bitmap.h"
 #include "los_process_pri.h"
 #include "los_exc_pri.h"
-#include "los_sched_pri.h"
 #ifdef LOSCFG_FS_VFS
 #include "console.h"
 #endif
@@ -74,7 +72,7 @@
 
 STATIC UINTPTR g_minAddr;
 STATIC UINTPTR g_maxAddr;
-STATIC UINT32 g_currHandleExcCpuid = INVALID_CPUID;
+STATIC UINT32 g_currHandleExcCpuID = INVALID_CPUID;
 VOID OsExcHook(UINT32 excType, ExcContext *excBufAddr, UINT32 far, UINT32 fsr);
 UINT32 g_curNestCount[LOSCFG_KERNEL_CORE_NUM] = { 0 };
 BOOL g_excFromUserMode[LOSCFG_KERNEL_CORE_NUM];
@@ -88,7 +86,6 @@ STATIC UINT32 g_nextExcWaitCpu = INVALID_CPUID;
 #define OS_MAX_BACKTRACE    15U
 #define DUMPSIZE            128U
 #define DUMPREGS            12U
-#define COM_REGS            4U
 #define INSTR_SET_MASK      0x01000020U
 #define THUMB_INSTR_LEN     2U
 #define ARM_INSTR_LEN       4U
@@ -113,11 +110,11 @@ STATIC const StackInfo g_excStack[] = {
 UINT32 OsGetSystemStatus(VOID)
 {
     UINT32 flag;
-    UINT32 cpuid = g_currHandleExcCpuid;
+    UINT32 cpuID = g_currHandleExcCpuID;
 
-    if (cpuid == INVALID_CPUID) {
+    if (cpuID == INVALID_CPUID) {
         flag = OS_SYSTEM_NORMAL;
-    } else if (cpuid == ArchCurrCpuid()) {
+    } else if (cpuID == ArchCurrCpuid()) {
         flag = OS_SYSTEM_EXC_CURR_CPU;
     } else {
         flag = OS_SYSTEM_EXC_OTHER_CPU;
@@ -194,7 +191,7 @@ UINT32 OsArmSharedPageFault(UINT32 excType, ExcContext *frame, UINT32 far, UINT3
         return LOS_ERRNO_VM_NOT_FOUND;
     }
 #if defined(LOSCFG_KERNEL_SMP) && defined(LOSCFG_DEBUG_VERSION)
-    BOOL irqEnable = !(LOS_SpinHeld(&g_taskSpin) && OsSchedIsLock());
+    BOOL irqEnable = !(LOS_SpinHeld(&g_taskSpin) && (OsPercpuGet()->taskLockCnt != 0));
     if (irqEnable) {
         ArchIrqEnable();
     } else {
@@ -248,7 +245,7 @@ UINT32 OsArmSharedPageFault(UINT32 excType, ExcContext *frame, UINT32 far, UINT3
 
 STATIC VOID OsExcType(UINT32 excType, ExcContext *excBufAddr, UINT32 far, UINT32 fsr)
 {
-    /* undefined exception handling or software interrupt */
+    /* undefinited exception handling or software interrupt */
     if ((excType == OS_EXCEPT_UNDEF_INSTR) || (excType == OS_EXCEPT_SWI)) {
         if ((excBufAddr->regCPSR & INSTR_SET_MASK) == 0) { /* work status: ARM */
             excBufAddr->PC = excBufAddr->PC - ARM_INSTR_LEN;
@@ -458,7 +455,7 @@ STATIC VOID OsDumpExcVaddrRegion(LosVmSpace *space, LosVmMapRegion *region)
             mmuFlag = FALSE;
         }
         PrintExcInfo("       0x%08x   0x%08x   0x%08x\n",
-                     startVaddr, LOS_PaddrToKVaddr(startPaddr), (UINT32)pageCount << PAGE_SHIFT);
+                     startVaddr, (UINTPTR)LOS_PaddrToKVaddr(startPaddr), (UINT32)pageCount << PAGE_SHIFT);
         pageCount = 0;
         startPaddr = 0;
     }
@@ -483,7 +480,7 @@ STATIC VOID OsDumpProcessUsedMemRegion(LosProcessCB *runProcess, LosVmSpace *run
     RB_SCAN_SAFE_END(&space->regionRbTree, pstRbNodeTemp, pstRbNodeNext)
 }
 
-STATIC VOID OsDumpProcessUsedMemNode(UINT16 vmmFlags)
+STATIC VOID OsDumpProcessUsedMemNode(UINT16 vmmFalgs)
 {
     LosProcessCB *runProcess = NULL;
     LosVmSpace *runspace = NULL;
@@ -504,7 +501,7 @@ STATIC VOID OsDumpProcessUsedMemNode(UINT16 vmmFlags)
         return;
     }
 
-    OsDumpProcessUsedMemRegion(runProcess, runspace, vmmFlags);
+    OsDumpProcessUsedMemRegion(runProcess, runspace, vmmFalgs);
     return;
 }
 #endif
@@ -517,22 +514,13 @@ VOID OsDumpContextMem(const ExcContext *excBufAddr)
         return;
     }
 
-    for (excReg = &(excBufAddr->R0); count < COM_REGS; excReg++, count++) {
+    for (excReg = &(excBufAddr->R0); count <= DUMPREGS; excReg++, count++) {
         if (IS_VALID_ADDR(*excReg)) {
-            PrintExcInfo("\ndump mem around R%u:%p", count, (*excReg));
+            PrintExcInfo("\ndump mem around R%u:0x%x", count, (*excReg));
             OsDumpMemByte(DUMPSIZE, ((*excReg) - (DUMPSIZE >> 1)));
         }
     }
-    for (excReg = &(excBufAddr->R4); count < DUMPREGS; excReg++, count++) {
-        if (IS_VALID_ADDR(*excReg)) {
-            PrintExcInfo("\ndump mem around R%u:%p", count, (*excReg));
-            OsDumpMemByte(DUMPSIZE, ((*excReg) - (DUMPSIZE >> 1)));
-        }
-    }
-    if (IS_VALID_ADDR(excBufAddr->R12)) {
-        PrintExcInfo("\ndump mem around R12:%p", excBufAddr->R12);
-        OsDumpMemByte(DUMPSIZE, (excBufAddr->R12 - (DUMPSIZE >> 1)));
-    }
+
     if (IS_VALID_ADDR(excBufAddr->SP)) {
         PrintExcInfo("\ndump mem around SP:%p", excBufAddr->SP);
         OsDumpMemByte(DUMPSIZE, (excBufAddr->SP - (DUMPSIZE >> 1)));
@@ -541,15 +529,15 @@ VOID OsDumpContextMem(const ExcContext *excBufAddr)
 
 STATIC VOID OsExcRestore(VOID)
 {
-    UINT32 currCpuid = ArchCurrCpuid();
+    UINT32 currCpuID = ArchCurrCpuid();
 
-    g_excFromUserMode[currCpuid] = FALSE;
-    g_intCount[currCpuid] = 0;
-    g_curNestCount[currCpuid] = 0;
+    g_excFromUserMode[currCpuID] = FALSE;
+    g_intCount[currCpuID] = 0;
+    g_curNestCount[currCpuID] = 0;
 #ifdef LOSCFG_KERNEL_SMP
-    OsCpuStatusSet(CPU_RUNNING);
+    OsPercpuGet()->excFlag = CPU_RUNNING;
 #endif
-    OsSchedLockSet(0);
+    OsPercpuGet()->taskLockCnt = 0;
 }
 
 STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
@@ -566,16 +554,17 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
 #ifdef LOSCFG_KERNEL_SMP
     LOS_SpinLock(&g_excSerializerSpin);
     if (g_nextExcWaitCpu != INVALID_CPUID) {
-        g_currHandleExcCpuid = g_nextExcWaitCpu;
+        g_currHandleExcCpuID = g_nextExcWaitCpu;
         g_nextExcWaitCpu = INVALID_CPUID;
     } else {
-        g_currHandleExcCpuid = INVALID_CPUID;
+        g_currHandleExcCpuID = INVALID_CPUID;
     }
     g_currHandleExcPID = OS_INVALID_VALUE;
     LOS_SpinUnlock(&g_excSerializerSpin);
 #else
-    g_currHandleExcCpuid = INVALID_CPUID;
+    g_currHandleExcCpuID = INVALID_CPUID;
 #endif
+    runProcess->processStatus &= ~OS_PROCESS_FLAG_EXIT;
 
 #ifdef LOSCFG_KERNEL_SMP
 #ifdef LOSCFG_FS_VFS
@@ -592,14 +581,14 @@ STATIC VOID OsUserExcHandle(ExcContext *excBufAddr)
 #endif
     OsProcessExitCodeSignalSet(runProcess, SIGUSR2);
 
-    /* An exception was raised by a task during the exit process of
+    /* An exception was raised by a task that is not the current main thread during the exit process of
      * the current process.
      */
-    if (runProcess->processStatus & OS_PROCESS_FLAG_EXIT) {
+    if ((runProcess->processStatus & OS_PROCESS_FLAG_EXIT) && (runProcess->threadGroupID != runTask->taskID)) {
         SCHEDULER_UNLOCK(intSave);
         /* Exception handling All operations should be kept prior to that operation */
         OsExcRestore();
-        OsRunningTaskToExit(runTask, OS_PRO_EXIT_OK);
+        OsTaskToExit(runTask, OS_PRO_EXIT_OK);
     } else {
         SCHEDULER_UNLOCK(intSave);
 
@@ -655,7 +644,6 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
     const StackInfo *stack = NULL;
     vaddr_t kvaddr;
 
-#ifdef LOSCFG_KERNEL_VM
     if (g_excFromUserMode[ArchCurrCpuid()] == TRUE) {
         taskCB = OsCurrTaskGet();
         stackStart = taskCB->userMapBase;
@@ -666,7 +654,6 @@ STATIC INLINE BOOL FindSuitableStack(UINTPTR regFP, UINTPTR *start, UINTPTR *end
         }
         return found;
     }
-#endif
 
     /* Search in the task stacks */
     for (index = 0; index < g_taskMaxNum; index++) {
@@ -704,66 +691,20 @@ FOUND:
     return found;
 }
 
-BOOL OsGetUsrIpInfo(UINTPTR ip, IpInfo *info)
-{
-    if (info == NULL) {
-        return FALSE;
-    }
-#ifdef LOSCFG_KERNEL_VM
-    BOOL ret = FALSE;
-    const CHAR *name = NULL;
-    LosVmMapRegion *region = NULL;
-    LosProcessCB *runProcess = OsCurrProcessGet();
-
-    if (LOS_IsUserAddress((VADDR_T)ip) == FALSE) {
-        info->ip = ip;
-        name = "kernel";
-        ret = FALSE;
-        goto END;
-    }
-
-    region = LOS_RegionFind(runProcess->vmSpace, (VADDR_T)ip);
-    if (region == NULL) {
-        info->ip = ip;
-        name = "invalid";
-        ret = FALSE;
-        goto END;
-    }
-
-    info->ip = ip - OsGetTextRegionBase(region, runProcess);
-    name = OsGetRegionNameOrFilePath(region);
-    ret = TRUE;
-    if (strcmp(name, "/lib/libc.so") != 0) {
-        PRINT_ERR("ip = 0x%x, %s\n", info->ip, name);
-    }
-END:
-    info->len = strlen(name);
-    if (strncpy_s(info->f_path, REGION_PATH_MAX, name, REGION_PATH_MAX - 1) != EOK) {
-        info->f_path[0] = '\0';
-        info->len = 0;
-        PRINT_ERR("copy f_path failed, %s\n", name);
-    }
-    return ret;
-#else
-    info->ip = ip;
-    return FALSE;
-#endif
-}
-
-UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth)
+VOID BackTraceSub(UINTPTR regFP)
 {
     UINTPTR tmpFP, backLR;
     UINTPTR stackStart, stackEnd;
     UINTPTR backFP = regFP;
     UINT32 count = 0;
-    BOOL ret;
     VADDR_T kvaddr;
+#ifdef LOSCFG_KERNEL_VM
+    LosProcessCB *runProcess = OsCurrProcessGet();
+#endif
 
     if (FindSuitableStack(regFP, &stackStart, &stackEnd, &kvaddr) == FALSE) {
-        if (callChain == NULL) {
-            PrintExcInfo("traceback error fp = 0x%x\n", regFP);
-        }
-        return 0;
+        PrintExcInfo("traceback error fp = 0x%x\n", regFP);
+        return;
     }
 
     /*
@@ -775,9 +716,7 @@ UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth)
     tmpFP = *(UINTPTR *)(UINTPTR)kvaddr;
     if (IsValidFP(tmpFP, stackStart, stackEnd, NULL) == TRUE) {
         backFP = tmpFP;
-        if (callChain == NULL) {
-            PrintExcInfo("traceback fp fixed, trace using   fp = 0x%x\n", backFP);
-        }
+        PrintExcInfo("traceback fp fixed, trace using   fp = 0x%x\n", backFP);
     }
 
     while (IsValidFP(backFP, stackStart, stackEnd, &kvaddr) == TRUE) {
@@ -785,49 +724,38 @@ UINT32 BackTraceGet(UINTPTR regFP, IpInfo *callChain, UINT32 maxDepth)
 #ifdef LOSCFG_COMPILER_CLANG_LLVM
         backFP = *(UINTPTR *)(UINTPTR)kvaddr;
         if (IsValidFP(tmpFP + POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
-            if (callChain == NULL) {
-                PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE);
-            }
-            return 0;
+            PrintExcInfo("traceback backLR check failed, backLP: 0x%x\n", tmpFP + POINTER_SIZE);
+            return;
         }
         backLR = *(UINTPTR *)(UINTPTR)kvaddr;
 #else
         backLR = *(UINTPTR *)(UINTPTR)kvaddr;
         if (IsValidFP(tmpFP - POINTER_SIZE, stackStart, stackEnd, &kvaddr) == FALSE) {
-            if (callChain == NULL) {
-                PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE);
-            }
-            return 0;
+            PrintExcInfo("traceback backFP check failed, backFP: 0x%x\n", tmpFP - POINTER_SIZE);
+            return;
         }
         backFP = *(UINTPTR *)(UINTPTR)kvaddr;
 #endif
-        IpInfo info = {0};
-        ret = OsGetUsrIpInfo((VADDR_T)backLR, &info);
-        if (callChain == NULL) {
-            PrintExcInfo("traceback %u -- lr = 0x%x    fp = 0x%x ", count, backLR, backFP);
-            if (ret) {
 #ifdef LOSCFG_KERNEL_VM
-                PrintExcInfo("lr in %s --> 0x%x\n", info.f_path, info.ip);
-#else
-                PrintExcInfo("\n");
+        LosVmMapRegion *region = NULL;
+        if (LOS_IsUserAddress((VADDR_T)backLR) == TRUE) {
+            region = LOS_RegionFind(runProcess->vmSpace, (VADDR_T)backLR);
+        }
+        if (region != NULL) {
+            PrintExcInfo("traceback %u -- lr = 0x%x    fp = 0x%x lr in %s --> 0x%x\n", count, backLR, backFP,
+                         OsGetRegionNameOrFilePath(region),
+                         backLR - OsGetTextRegionBase(region, runProcess));
+            region = NULL;
+        } else
 #endif
-            } else {
-                PrintExcInfo("\n");
-            }
-        } else {
-            (VOID)memcpy_s(&callChain[count], sizeof(IpInfo), &info, sizeof(IpInfo));
+        {
+            PrintExcInfo("traceback %u -- lr = 0x%x    fp = 0x%x\n", count, backLR, backFP);
         }
         count++;
-        if ((count == maxDepth) || (backFP == tmpFP)) {
+        if ((count == OS_MAX_BACKTRACE) || (backFP == tmpFP)) {
             break;
         }
     }
-    return count;
-}
-
-VOID BackTraceSub(UINTPTR regFP)
-{
-    (VOID)BackTraceGet(regFP, NULL, OS_MAX_BACKTRACE);
 }
 
 VOID BackTrace(UINT32 regFP)
@@ -884,7 +812,7 @@ VOID OsCallStackInfo(VOID)
     PrintExcInfo("runTask->stackPointer = 0x%x\n"
                  "runTask->topOfStack = 0x%x\n"
                  "text_start:0x%x,text_end:0x%x\n",
-                 stackPointer, runTask->topOfStack, &__text_start, &__text_end);
+                 (UINTPTR)stackPointer, runTask->topOfStack, &__text_start, &__text_end);
 
     while ((stackPointer > (UINT32 *)runTask->topOfStack) && (count < OS_MAX_BACKTRACE)) {
         if ((*stackPointer > (UINTPTR)(&__text_start)) &&
@@ -991,14 +919,36 @@ VOID OsDataAbortExcHandleEntry(ExcContext *excBufAddr)
 #define EXC_WAIT_INTER 50U
 #define EXC_WAIT_TIME  2000U
 
-STATIC VOID WaitAllCpuStop(UINT32 cpuid)
+STATIC VOID OsAllCpuStatusOutput(VOID)
+{
+    UINT32 i;
+
+    for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
+        switch (g_percpu[i].excFlag) {
+            case CPU_RUNNING:
+                PrintExcInfo("cpu%u is running.\n", i);
+                break;
+            case CPU_HALT:
+                PrintExcInfo("cpu%u is halted.\n", i);
+                break;
+            case CPU_EXC:
+                PrintExcInfo("cpu%u is in exc.\n", i);
+                break;
+            default:
+                break;
+        }
+    }
+    PrintExcInfo("The current handling the exception is cpu%u !\n", ArchCurrCpuid());
+}
+
+STATIC VOID WaitAllCpuStop(UINT32 cpuID)
 {
     UINT32 i;
     UINT32 time = 0;
 
     while (time < EXC_WAIT_TIME) {
         for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
-            if ((i != cpuid) && !OsCpuStatusIsHalt(i)) {
+            if ((i != cpuID) && (g_percpu[i].excFlag != CPU_HALT)) {
                 LOS_Mdelay(EXC_WAIT_INTER);
                 time += EXC_WAIT_INTER;
                 break;
@@ -1012,19 +962,19 @@ STATIC VOID WaitAllCpuStop(UINT32 cpuid)
     return;
 }
 
-STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuid)
+STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuID)
 {
     while (1) {
         LOS_SpinLock(&g_excSerializerSpin);
-        if ((g_currHandleExcCpuid == INVALID_CPUID) || (g_currHandleExcCpuid == currCpuid)) {
-            g_currHandleExcCpuid = currCpuid;
+        if ((g_currHandleExcCpuID == INVALID_CPUID) || (g_currHandleExcCpuID == currCpuID)) {
+            g_currHandleExcCpuID = currCpuID;
             g_currHandleExcPID = OsCurrProcessGet()->processID;
             LOS_SpinUnlock(&g_excSerializerSpin);
             break;
         }
 
         if (g_nextExcWaitCpu == INVALID_CPUID) {
-            g_nextExcWaitCpu = currCpuid;
+            g_nextExcWaitCpu = currCpuID;
         }
         LOS_SpinUnlock(&g_excSerializerSpin);
         LOS_Mdelay(EXC_WAIT_INTER);
@@ -1033,25 +983,25 @@ STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuid)
 
 STATIC VOID OsCheckAllCpuStatus(VOID)
 {
-    UINT32 currCpuid = ArchCurrCpuid();
+    UINT32 currCpuID = ArchCurrCpuid();
     UINT32 ret, target;
 
-    OsCpuStatusSet(CPU_EXC);
+    OsPercpuGet()->excFlag = CPU_EXC;
     LOCKDEP_CLEAR_LOCKS();
 
     LOS_SpinLock(&g_excSerializerSpin);
-    /* Only the current CPU anomaly */
-    if (g_currHandleExcCpuid == INVALID_CPUID) {
-        g_currHandleExcCpuid = currCpuid;
+    /* Only the current nuclear anomaly */
+    if (g_currHandleExcCpuID == INVALID_CPUID) {
+        g_currHandleExcCpuID = currCpuID;
         g_currHandleExcPID = OsCurrProcessGet()->processID;
         LOS_SpinUnlock(&g_excSerializerSpin);
 #ifndef LOSCFG_SAVE_EXCINFO
-        if (g_excFromUserMode[currCpuid] == FALSE) {
-            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuid));
+        if (g_excFromUserMode[currCpuID] == FALSE) {
+            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuID));
             HalIrqSendIpi(target, LOS_MP_IPI_HALT);
         }
 #endif
-    } else if (g_excFromUserMode[currCpuid] == TRUE) {
+    } else if (g_excFromUserMode[currCpuID] == TRUE) {
         /* Both cores raise exceptions, and the current core is a user-mode exception.
          * Both cores are abnormal and come from the same process
          */
@@ -1063,12 +1013,12 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
         }
         LOS_SpinUnlock(&g_excSerializerSpin);
 
-        OsWaitOtherCoresHandleExcEnd(currCpuid);
+        OsWaitOtherCoresHandleExcEnd(currCpuID);
     } else {
-        if ((g_currHandleExcCpuid < LOSCFG_KERNEL_CORE_NUM) && (g_excFromUserMode[g_currHandleExcCpuid] == TRUE)) {
-            g_currHandleExcCpuid = currCpuid;
+        if ((g_currHandleExcCpuID < LOSCFG_KERNEL_CORE_NUM) && (g_excFromUserMode[g_currHandleExcCpuID] == TRUE)) {
+            g_currHandleExcCpuID = currCpuID;
             LOS_SpinUnlock(&g_excSerializerSpin);
-            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuid));
+            target = (UINT32)(OS_MP_CPU_ALL & ~CPUID_TO_AFFI_MASK(currCpuID));
             HalIrqSendIpi(target, LOS_MP_IPI_HALT);
         } else {
             LOS_SpinUnlock(&g_excSerializerSpin);
@@ -1078,7 +1028,7 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
 #ifndef LOSCFG_SAVE_EXCINFO
     /* use halt ipi to stop other active cores */
     if (g_excFromUserMode[ArchCurrCpuid()] == FALSE) {
-        WaitAllCpuStop(currCpuid);
+        WaitAllCpuStop(currCpuID);
     }
 #endif
 }
@@ -1089,7 +1039,7 @@ STATIC VOID OsCheckCpuStatus(VOID)
 #ifdef LOSCFG_KERNEL_SMP
     OsCheckAllCpuStatus();
 #else
-    g_currHandleExcCpuid = ArchCurrCpuid();
+    g_currHandleExcCpuID = ArchCurrCpuid();
 #endif
 }
 
@@ -1144,15 +1094,15 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsPrintExcHead(UINT32 far)
 STATIC VOID OsSysStateSave(UINT32 *intCount, UINT32 *lockCount)
 {
     *intCount = g_intCount[ArchCurrCpuid()];
-    *lockCount = OsSchedLockCountGet();
+    *lockCount = OsPercpuGet()->taskLockCnt;
     g_intCount[ArchCurrCpuid()] = 0;
-    OsSchedLockSet(0);
+    OsPercpuGet()->taskLockCnt = 0;
 }
 
 STATIC VOID OsSysStateRestore(UINT32 intCount, UINT32 lockCount)
 {
     g_intCount[ArchCurrCpuid()] = intCount;
-    OsSchedLockSet(lockCount);
+    OsPercpuGet()->taskLockCnt = lockCount;
 }
 #endif
 
@@ -1169,7 +1119,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsExcHandleEntry(UINT32 excType, ExcContext *excBufAd
 #endif
 
     /* Task scheduling is not allowed during exception handling */
-    OsSchedLock();
+    OsPercpuGet()->taskLockCnt++;
 
     g_curNestCount[ArchCurrCpuid()]++;
 
@@ -1230,10 +1180,10 @@ __attribute__((noinline)) VOID LOS_Panic(const CHAR *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
-    OsVprintf(fmt, ap, EXC_OUTPUT);
+    UartVprintf(fmt, ap);
     va_end(ap);
     __asm__ __volatile__("swi 0");
-    while (1) {}
+    while (1);
 }
 
 /* stack protector */

arch/arm/arm/src/los_hwi.c

@@ -46,11 +46,16 @@ LITE_OS_SEC_BSS  SPIN_LOCK_INIT(g_hwiSpin);
 size_t g_intCount[LOSCFG_KERNEL_CORE_NUM] = {0};
 HwiHandleForm g_hwiForm[OS_HWI_MAX_NUM];
 STATIC CHAR *g_hwiFormName[OS_HWI_MAX_NUM] = {0};
-STATIC UINT32 g_hwiFormCnt[LOSCFG_KERNEL_CORE_NUM][OS_HWI_MAX_NUM] = {0};
+STATIC UINT32 g_hwiFormCnt[OS_HWI_MAX_NUM] = {0};
 
-UINT32 OsGetHwiFormCnt(UINT16 cpuid, UINT32 index)
+VOID OsIncHwiFormCnt(UINT32 index)
 {
-    return g_hwiFormCnt[cpuid][index];
+    g_hwiFormCnt[index]++;
+}
+
+UINT32 OsGetHwiFormCnt(UINT32 index)
+{
+    return g_hwiFormCnt[index];
 }
 
 CHAR *OsGetHwiFormName(UINT32 index)
@@ -69,17 +74,16 @@ VOID OsInterrupt(UINT32 intNum)
 {
     HwiHandleForm *hwiForm = NULL;
     UINT32 *intCnt = NULL;
-    UINT16 cpuid = ArchCurrCpuid();
 
     /* Must keep the operation at the beginning of the interface */
-    intCnt = &g_intCount[cpuid];
+    intCnt = &g_intCount[ArchCurrCpuid()];
     *intCnt = *intCnt + 1;
 
-#ifdef LOSCFG_CPUP_INCLUDE_IRQ
-    OsCpupIrqStart(cpuid);
-#endif
-
     OsSchedIrqStartTime();
+
+#ifdef LOSCFG_CPUP_INCLUDE_IRQ
+    OsCpupIrqStart();
+#endif
     OsHookCall(LOS_HOOK_TYPE_ISR_ENTER, intNum);
     hwiForm = (&g_hwiForm[intNum]);
 #ifndef LOSCFG_NO_SHARED_IRQ
@@ -101,14 +105,14 @@ VOID OsInterrupt(UINT32 intNum)
 #ifndef LOSCFG_NO_SHARED_IRQ
     }
 #endif
-    ++g_hwiFormCnt[cpuid][intNum];
+    ++g_hwiFormCnt[intNum];
 
     OsHookCall(LOS_HOOK_TYPE_ISR_EXIT, intNum);
-    OsSchedIrqUsedTimeUpdate();
-
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
-    OsCpupIrqEnd(cpuid, intNum);
+    OsCpupIrqEnd(intNum);
 #endif
+    OsSchedIrqUpdateUsedTime();
+
     /* Must keep the operation at the end of the interface */
     *intCnt = *intCnt - 1;
 }

arch/arm/arm/src/pmu/armv7_pmu.c

@@ -1,373 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "armv7_pmu_pri.h"
-#include "perf_pmu_pri.h"
-#include "los_hw_cpu.h"
-#include "asm/platform.h"
-
-OS_PMU_INTS(LOSCFG_KERNEL_CORE_NUM, g_pmuIrqNr);
-STATIC HwPmu g_armv7Pmu;
-
-STATIC INLINE UINT32 Armv7PmncRead(VOID)
-{
-    UINT32 value = 0;
-    __asm__ volatile("mrc p15, 0, %0, c9, c12, 0" : "=r"(value));
-    return value;
-}
-
-STATIC INLINE VOID Armv7PmncWrite(UINT32 value)
-{
-    value &= ARMV7_PMNC_MASK;
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 0" : : "r"(value));
-    ISB;
-}
-
-STATIC INLINE UINT32 Armv7PmuOverflowed(UINT32 pmnc)
-{
-    return pmnc & ARMV7_OVERFLOWED_MASK;
-}
-
-STATIC INLINE UINT32 Armv7PmuCntOverflowed(UINT32 pmnc, UINT32 index)
-{
-    return pmnc & ARMV7_CNT2BIT(ARMV7_IDX2CNT(index));
-}
-
-STATIC INLINE UINT32 Armv7CntValid(UINT32 index)
-{
-    return index <= ARMV7_IDX_COUNTER_LAST;
-}
-
-STATIC INLINE VOID Armv7PmuSelCnt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 5" : : "r" (counter));
-    ISB;
-}
-
-STATIC INLINE VOID Armv7PmuSetCntPeriod(UINT32 index, UINT32 period)
-{
-    if (!Armv7CntValid(index)) {
-        PRINT_ERR("CPU writing wrong counter %u\n", index);
-    } else if (index == ARMV7_IDX_CYCLE_COUNTER) {
-        __asm__ volatile("mcr p15, 0, %0, c9, c13, 0" : : "r" (period));
-    } else {
-        Armv7PmuSelCnt(index);
-        __asm__ volatile("mcr p15, 0, %0, c9, c13, 2" : : "r" (period));
-    }
-}
-
-STATIC INLINE VOID Armv7BindEvt2Cnt(UINT32 index, UINT32 value)
-{
-    PRINT_DEBUG("bind event: %u to counter: %u\n", value, index);
-    Armv7PmuSelCnt(index);
-    value &= ARMV7_EVTYPE_MASK;
-    __asm__ volatile("mcr p15, 0, %0, c9, c13, 1" : : "r" (value));
-}
-
-STATIC INLINE VOID Armv7EnableCnt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    PRINT_DEBUG("index : %u, counter: %u\n", index, counter);
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 1" : : "r" (ARMV7_CNT2BIT(counter)));
-}
-
-STATIC INLINE VOID Armv7DisableCnt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    PRINT_DEBUG("index : %u, counter: %u\n", index, counter);
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 2" : : "r" (ARMV7_CNT2BIT(counter)));
-}
-
-STATIC INLINE VOID Armv7EnableCntInterrupt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    __asm__ volatile("mcr p15, 0, %0, c9, c14, 1" : : "r" (ARMV7_CNT2BIT(counter)));
-    ISB;
-}
-
-STATIC INLINE VOID Armv7DisableCntInterrupt(UINT32 index)
-{
-    UINT32 counter = ARMV7_IDX2CNT(index);
-    __asm__ volatile("mcr p15, 0, %0, c9, c14, 2" : : "r" (ARMV7_CNT2BIT(counter)));
-    /* Clear the overflow flag in case an interrupt is pending. */
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (ARMV7_CNT2BIT(counter)));
-    ISB;
-}
-
-STATIC INLINE UINT32 Armv7PmuGetOverflowStatus(VOID)
-{
-    UINT32 value;
-
-    __asm__ volatile("mrc p15, 0, %0, c9, c12, 3" : "=r" (value));
-    value &= ARMV7_FLAG_MASK;
-    __asm__ volatile("mcr p15, 0, %0, c9, c12, 3" : : "r" (value));
-
-    return value;
-}
-
-STATIC VOID Armv7EnableEvent(Event *event)
-{
-    UINT32 cnt = event->counter;
-
-    if (!Armv7CntValid(cnt)) {
-        PRINT_ERR("CPU enabling wrong PMNC counter IRQ enable %u\n", cnt);
-        return;
-    }
-
-    if (event->period == 0) {
-        PRINT_INFO("event period value not valid, counter: %u\n", cnt);
-        return;
-    }
-    /*
-     * Enable counter and interrupt, and set the counter to count
-     * the event that we're interested in.
-     */
-    UINT32 intSave = LOS_IntLock();
-
-    Armv7DisableCnt(cnt);
-
-    /*
-     * Set event (if destined for PMNx counters)
-     * We only need to set the event for the cycle counter if we
-     * have the ability to perform event filtering.
-     */
-    if (cnt != ARMV7_IDX_CYCLE_COUNTER) {
-        Armv7BindEvt2Cnt(cnt, event->eventId);
-    }
-
-    /* Enable interrupt for this counter */
-    Armv7EnableCntInterrupt(cnt);
-    Armv7EnableCnt(cnt);
-    LOS_IntRestore(intSave);
-
-    PRINT_DEBUG("enabled event: %u cnt: %u\n", event->eventId, cnt);
-}
-
-STATIC VOID Armv7DisableEvent(Event *event)
-{
-    UINT32 cnt = event->counter;
-
-    if (!Armv7CntValid(cnt)) {
-        PRINT_ERR("CPU enabling wrong PMNC counter IRQ enable %u\n", cnt);
-        return;
-    }
-
-    UINT32 intSave = LOS_IntLock();
-    Armv7DisableCnt(cnt);
-    Armv7DisableCntInterrupt(cnt);
-    LOS_IntRestore(intSave);
-}
-
-
-STATIC VOID Armv7StartAllCnt(VOID)
-{
-    PRINT_DEBUG("starting pmu...\n");
-
-    /* Enable all counters */
-    UINT32 reg = Armv7PmncRead() | ARMV7_PMNC_E;
-    if (g_armv7Pmu.cntDivided) {
-        reg |= ARMV7_PMNC_D;
-    } else {
-        reg &= ~ARMV7_PMNC_D;
-    }
-
-    Armv7PmncWrite(reg);
-    HalIrqUnmask(g_pmuIrqNr[ArchCurrCpuid()]);
-}
-
-STATIC VOID Armv7StopAllCnt(VOID)
-{
-    PRINT_DEBUG("stopping pmu...\n");
-    /* Disable all counters */
-    Armv7PmncWrite(Armv7PmncRead() & ~ARMV7_PMNC_E);
-
-    HalIrqMask(g_pmuIrqNr[ArchCurrCpuid()]);
-}
-
-STATIC VOID Armv7ResetAllCnt(VOID)
-{
-    UINT32 index;
-
-    /* The counter and interrupt enable registers are unknown at reset. */
-    for (index = ARMV7_IDX_CYCLE_COUNTER; index < ARMV7_IDX_MAX_COUNTER; index++) {
-        Armv7DisableCnt(index);
-        Armv7DisableCntInterrupt(index);
-    }
-
-    /* Initialize & Reset PMNC: C and P bits and D bits */
-    UINT32 reg = ARMV7_PMNC_P | ARMV7_PMNC_C | (g_armv7Pmu.cntDivided ? ARMV7_PMNC_D : 0);
-    Armv7PmncWrite(reg);
-}
-
-STATIC VOID Armv7SetEventPeriod(Event *event)
-{
-    if (event->period != 0) {
-        PRINT_INFO("counter: %u, period: 0x%x\n", event->counter, event->period);
-        Armv7PmuSetCntPeriod(event->counter, PERIOD_CALC(event->period));
-    }
-}
-
-STATIC UINTPTR Armv7ReadEventCnt(Event *event)
-{
-    UINT32 value = 0;
-    UINT32 index = event->counter;
-
-    if (!Armv7CntValid(index)) {
-        PRINT_ERR("CPU reading wrong counter %u\n", index);
-    } else if (index == ARMV7_IDX_CYCLE_COUNTER) {
-        __asm__ volatile("mrc p15, 0, %0, c9, c13, 0" : "=r" (value));
-    } else {
-        Armv7PmuSelCnt(index);
-        __asm__ volatile("mrc p15, 0, %0, c9, c13, 2" : "=r" (value));
-    }
-
-    if (value < PERIOD_CALC(event->period)) {
-        if (Armv7PmuCntOverflowed(Armv7PmuGetOverflowStatus(), event->counter)) {
-            value += event->period;
-        }
-    } else {
-        value -= PERIOD_CALC(event->period);
-    }
-    return value;
-}
-
-STATIC const UINT32 g_armv7Map[] = {
-    [PERF_COUNT_HW_CPU_CYCLES]          = ARMV7_PERF_HW_CYCLES,
-    [PERF_COUNT_HW_INSTRUCTIONS]        = ARMV7_PERF_HW_INSTRUCTIONS,
-    [PERF_COUNT_HW_DCACHE_REFERENCES]   = ARMV7_PERF_HW_DCACHES,
-    [PERF_COUNT_HW_DCACHE_MISSES]       = ARMV7_PERF_HW_DCACHE_MISSES,
-    [PERF_COUNT_HW_ICACHE_REFERENCES]   = ARMV7_PERF_HW_ICACHES,
-    [PERF_COUNT_HW_ICACHE_MISSES]       = ARMV7_PERF_HW_ICACHE_MISSES,
-    [PERF_COUNT_HW_BRANCH_INSTRUCTIONS] = ARMV7_PERF_HW_BRANCHES,
-    [PERF_COUNT_HW_BRANCH_MISSES]       = ARMV7_PERF_HW_BRANCE_MISSES,
-};
-
-UINT32 Armv7PmuMapEvent(UINT32 eventType, BOOL reverse)
-{
-    if (!reverse) {  /* Common event to armv7 real event */
-        if (eventType < ARRAY_SIZE(g_armv7Map)) {
-            return g_armv7Map[eventType];
-        }
-        return eventType;
-    } else {        /* Armv7 real event to common event */
-        UINT32 i;
-        for (i = 0; i < ARRAY_SIZE(g_armv7Map); i++) {
-            if (g_armv7Map[i] == eventType) {
-                return i;
-            }
-        }
-        return PERF_HW_INVALID_EVENT_TYPE;
-    }
-}
-
-STATIC VOID Armv7PmuIrqHandler(VOID)
-{
-    UINT32 index;
-    PerfRegs regs;
-
-    PerfEvent *events = &(g_armv7Pmu.pmu.events);
-    UINT32 eventNum = events->nr;
-
-    /* Get and reset the IRQ flags */
-    UINT32 pmnc = Armv7PmuGetOverflowStatus();
-    if (!Armv7PmuOverflowed(pmnc)) {
-        return;
-    }
-
-    (VOID)memset_s(&regs, sizeof(PerfRegs), 0, sizeof(PerfRegs));
-    OsPerfFetchIrqRegs(&regs);
-
-    Armv7StopAllCnt();
-
-    for (index = 0; index < eventNum; index++) {
-        Event *event = &(events->per[index]);
-        /*
-         * We have a single interrupt for all counters. Check that
-         * each counter has overflowed before we process it.
-         */
-        if (!Armv7PmuCntOverflowed(pmnc, event->counter) || (event->period == 0)) {
-            continue;
-        }
-
-        Armv7PmuSetCntPeriod(event->counter, PERIOD_CALC(event->period));
-
-        OsPerfUpdateEventCount(event, event->period);
-        OsPerfHandleOverFlow(event, &regs);
-    }
-    Armv7StartAllCnt();
-}
-
-UINT32 OsGetPmuMaxCounter(VOID)
-{
-    return ARMV7_IDX_MAX_COUNTER;
-}
-
-UINT32 OsGetPmuCycleCounter(VOID)
-{
-    return ARMV7_IDX_CYCLE_COUNTER;
-}
-
-UINT32 OsGetPmuCounter0(VOID)
-{
-    return ARMV7_IDX_COUNTER0;
-}
-
-STATIC HwPmu g_armv7Pmu = {
-    .canDivided = TRUE,
-    .enable     = Armv7EnableEvent,
-    .disable    = Armv7DisableEvent,
-    .start      = Armv7StartAllCnt,
-    .stop       = Armv7StopAllCnt,
-    .clear      = Armv7ResetAllCnt,
-    .setPeriod  = Armv7SetEventPeriod,
-    .readCnt    = Armv7ReadEventCnt,
-    .mapEvent   = Armv7PmuMapEvent,
-};
-
-UINT32 OsHwPmuInit(VOID)
-{
-    UINT32 ret;
-    UINT32 index;
-
-    for (index = 0; index < LOSCFG_KERNEL_CORE_NUM; index++) {
-        ret = LOS_HwiCreate(g_pmuIrqNr[index], 0, 0, Armv7PmuIrqHandler, 0);
-        if (ret != LOS_OK) {
-            PRINT_ERR("pmu %u irq handler register failed\n", g_pmuIrqNr[index]);
-            return ret;
-        }
-#ifdef LOSCFG_KERNEL_SMP
-        HalIrqSetAffinity(g_pmuIrqNr[index], CPUID_TO_AFFI_MASK(index));
-#endif
-    }
-    ret = OsPerfHwInit(&g_armv7Pmu);
-    return ret;
-}

arch/arm/arm/src/smp.c

@@ -35,6 +35,7 @@
 #include "los_hw.h"
 #include "los_atomic.h"
 #include "los_arch_mmu.h"
+#include "los_init_pri.h"
 #include "gic_common.h"
 #include "los_task_pri.h"
 
@@ -54,7 +55,7 @@ VOID HalArchCpuOn(UINT32 cpuNum, ArchCpuStartFunc func, struct SmpOps *ops, VOID
 {
     struct OsCpuInit *cpuInit = &g_cpuInit[cpuNum - 1];
     UINTPTR startEntry = (UINTPTR)&reset_vector - KERNEL_VMM_BASE + SYS_MEM_BASE;
-    INT32 ret;
+    INT32 ret = 0;
 
     cpuInit->cpuStart = func;
     cpuInit->arg = arg;
@@ -93,6 +94,7 @@ VOID HalSecondaryCpuStart(VOID)
     /* store each core's hwid */
     CPU_MAP_SET(cpuid, OsHwIDGet());
     HalIrqInitPercpu();
+    OsInitCall(LOS_INIT_LEVEL_ARCH);
 
     cpuInit->cpuStart(cpuInit->arg);
 

arch/arm/arm/src/startup/reset_vector_mp.S

@@ -121,9 +121,8 @@ reset_vector:
     mcr     p15, 0, r0, c13, c0, 4
     /* do some early cpu setup: i/d cache disable, mmu disabled */
     mrc     p15, 0, r0, c1, c0, 0
-    bic     r0, #(1 << 12)          /* i cache */
-    bic     r0, #(1 << 2)           /* d cache */
-    bic     r0, #(1 << 0)           /* mmu */
+    bic     r0, #(1<<12)
+    bic     r0, #(1<<2 | 1<<0)
     mcr     p15, 0, r0, c1, c0, 0
 
     /* enable fpu+neon */
@@ -283,11 +282,11 @@ mmu_setup:
     mcr    p15, 0, r12, c1, c0, 1               /* ACTLR, Auxlliary Control Register */
     dsb
     mrc     p15, 0, r12, c1, c0, 0
-    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
-    orr     r12, #(1 << 0)                      /* mmu enable */
+    bic     r12, #(1 << 29 | 1 << 28)
+    orr     r12, #(1 << 0)
     bic     r12, #(1 << 1)
-    orr     r12, #(1 << 2)                     /* D cache enable */
-    orr     r12, #(1 << 12)                    /* I cache enable */
+    orr     r12, #(1 << 2)
+    orr     r12, #(1 << 12)
     mcr     p15, 0, r12, c1, c0, 0              /* Set SCTLR with r12: Turn on the MMU, I/D cache Disable TRE/AFE */
     isb
     ldr     pc,  =1f                            /* Convert to VA */

arch/arm/arm/src/startup/reset_vector_up.S

@@ -101,9 +101,8 @@ __exception_handlers:
 reset_vector:
     /* do some early cpu setup: i/d cache disable, mmu disabled */
     mrc     p15, 0, r0, c1, c0, 0
-    bic     r0, #(1 << 12)          /* i cache */
-    bic     r0, #(1 << 2)           /* d cache */
-    bic     r0, #(1 << 0)           /* mmu */
+    bic     r0, #(1<<12)
+    bic     r0, #(1<<2 | 1<<0)
     mcr     p15, 0, r0, c1, c0, 0
 
     /* enable fpu+neon */
@@ -270,11 +269,11 @@ mmu_setup:
     isb
 
     mrc     p15, 0, r12, c1, c0, 0
-    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
-    orr     r12, #(1 << 0)                      /* mmu enable */
+    bic     r12, #(1 << 29 | 1 << 28)
+    orr     r12, #(1 << 0)
     bic     r12, #(1 << 1)
-    orr     r12, #(1 << 2)                      /* D cache enable */
-    orr     r12, #(1 << 12)                     /* I cache enable */
+    orr     r12, #(1 << 2)
+    orr     r12, #(1 << 12)
     mcr     p15, 0, r12, c1, c0, 0              /* Set SCTLR with r12: Turn on the MMU, I/D cache Disable TRE/AFE */
     isb
 

arch/arm/gic/Makefile

@@ -31,10 +31,18 @@ include $(LITEOSTOPDIR)/config.mk
 
 MODULE_NAME := $(notdir $(shell pwd))
 
+# LOCAL_SRCS := $(wildcard *.c)
+
 ifeq ($(LOSCFG_ARCH_GIC_V2), y)
 LOCAL_SRCS := gic_v2.c
 else ifeq ($(LOSCFG_ARCH_GIC_V3), y)
 LOCAL_SRCS := gic_v3.c
 endif
 
+LOCAL_INCLUDE := \
+	-I $(LITEOSTOPDIR)/kernel/base/include \
+	-I $(LITEOSTOPDIR)/arch/arm/include \
+	-I $(LITEOSTOPDIR)/arch/arm/arm/src/include \
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
 include $(MODULE)

arch/arm/gic/gic_v2.c

@@ -49,7 +49,7 @@ STATIC UINT32 g_curIrqNum = 0;
  */
 STATIC VOID GicWriteSgi(UINT32 vector, UINT32 cpuMask, UINT32 filter)
 {
-    UINT32 val = ((filter & 0x3) << 24) | ((cpuMask & 0xFF) << 16) | /* 24, 16: Register bit offset */
+    UINT32 val = ((filter & 0x3) << 24) | ((cpuMask & 0xFF) << 16) |
                  (vector & 0xF);
 
     GIC_REG_32(GICD_SGIR) = val;
@@ -62,7 +62,7 @@ VOID HalIrqSendIpi(UINT32 target, UINT32 ipi)
 
 VOID HalIrqSetAffinity(UINT32 vector, UINT32 cpuMask)
 {
-    UINT32 offset = vector / 4; /* 4: Interrupt bit width */
+    UINT32 offset = vector / 4;
     UINT32 index = vector & 0x3;
 
     GIC_REG_8(GICD_ITARGETSR(offset) + index) = cpuMask;
@@ -80,7 +80,7 @@ VOID HalIrqMask(UINT32 vector)
         return;
     }
 
-    GIC_REG_32(GICD_ICENABLER(vector / 32)) = 1U << (vector % 32); /* 32: Interrupt bit width */
+    GIC_REG_32(GICD_ICENABLER(vector / 32)) = 1U << (vector % 32);
 }
 
 VOID HalIrqUnmask(UINT32 vector)
@@ -89,7 +89,7 @@ VOID HalIrqUnmask(UINT32 vector)
         return;
     }
 
-    GIC_REG_32(GICD_ISENABLER(vector >> 5)) = 1U << (vector % 32); /* 5, 32: Register bit offset */
+    GIC_REG_32(GICD_ISENABLER(vector >> 5)) = 1U << (vector % 32);
 }
 
 VOID HalIrqPending(UINT32 vector)
@@ -98,7 +98,7 @@ VOID HalIrqPending(UINT32 vector)
         return;
     }
 
-    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32); /* 5, 32: Register bit offset */
+    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32);
 }
 
 VOID HalIrqClear(UINT32 vector)
@@ -119,24 +119,24 @@ VOID HalIrqInit(VOID)
 {
     UINT32 i;
 
-    /* set external interrupts to be level triggered, active low. */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) { /* 32: Start interrupt number, 16: Interrupt bit width */
-        GIC_REG_32(GICD_ICFGR(i / 16)) = 0; /* 16: Register bit offset */
+    /* set externel interrupts to be level triggered, active low. */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) {
+        GIC_REG_32(GICD_ICFGR(i / 16)) = 0;
     }
 
-    /* set external interrupts to CPU 0 */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 4) { /* 32: Start interrupt number, 4: Interrupt bit width */
+    /* set externel interrupts to CPU 0 */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 4) {
         GIC_REG_32(GICD_ITARGETSR(i / 4)) = 0x01010101;
     }
 
     /* set priority on all interrupts */
-    for (i = 0; i < OS_HWI_MAX_NUM; i += 4) { /* 4: Interrupt bit width */
+    for (i = 0; i < OS_HWI_MAX_NUM; i += 4) {
         GIC_REG_32(GICD_IPRIORITYR(i / 4)) = GICD_INT_DEF_PRI_X4;
     }
 
     /* disable all interrupts. */
-    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) { /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICENABLER(i / 32)) = ~0; /* 32: Interrupt bit width */
+    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) {
+        GIC_REG_32(GICD_ICENABLER(i / 32)) = ~0;
     }
 
     HalIrqInitPercpu();
@@ -149,9 +149,6 @@ VOID HalIrqInit(VOID)
     (VOID)LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0);
     (VOID)LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0);
     (VOID)LOS_HwiCreate(LOS_MP_IPI_HALT, 0xa0, 0, OsMpHaltHandler, 0);
-#ifdef LOSCFG_KERNEL_SMP_CALL
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_FUNC_CALL, 0xa0, 0, OsMpFuncCallHandler, 0);
-#endif
 #endif
 }
 
@@ -172,7 +169,7 @@ VOID HalIrqHandler(VOID)
 
     OsInterrupt(vector);
 
-    /* use original iar to do the EOI */
+    /* use orignal iar to do the EOI */
     GIC_REG_32(GICC_EOIR) = iar;
 }
 

arch/arm/gic/gic_v3.c

@@ -42,9 +42,9 @@ STATIC UINT32 g_curIrqNum = 0;
 
 STATIC INLINE UINT64 MpidrToAffinity(UINT64 mpidr)
 {
-    return ((MPIDR_AFF_LEVEL(mpidr, 3) << 32) | /* 3: Serial number, 32: Register bit offset */
-            (MPIDR_AFF_LEVEL(mpidr, 2) << 16) | /* 2: Serial number, 16: Register bit offset */
-            (MPIDR_AFF_LEVEL(mpidr, 1) << 8)  | /* 1: Serial number, 8: Register bit offset */
+    return ((MPIDR_AFF_LEVEL(mpidr, 3) << 32) |
+            (MPIDR_AFF_LEVEL(mpidr, 2) << 16) |
+            (MPIDR_AFF_LEVEL(mpidr, 1) << 8)  |
             (MPIDR_AFF_LEVEL(mpidr, 0)));
 }
 
@@ -106,10 +106,10 @@ STATIC VOID GicSgi(UINT32 irq, UINT32 cpuMask)
             tList = GicTargetList(&cpu, cpuMask, cluster);
 
             /* Generates a Group 1 interrupt for the current security state */
-            val = ((MPIDR_AFF_LEVEL(cluster, 3) << 48) | /* 3: Serial number, 48: Register bit offset */
-                   (MPIDR_AFF_LEVEL(cluster, 2) << 32) | /* 2: Serial number, 32: Register bit offset */
-                   (MPIDR_AFF_LEVEL(cluster, 1) << 16) | /* 1: Serial number, 16: Register bit offset */
-                   (irq << 24) | tList); /* 24: Register bit offset */
+            val = ((MPIDR_AFF_LEVEL(cluster, 3) << 48) |
+                   (MPIDR_AFF_LEVEL(cluster, 2) << 32) |
+                   (MPIDR_AFF_LEVEL(cluster, 1) << 16) |
+                   (irq << 24) | tList);
 
             GiccSetSgi1r(val);
         }
@@ -150,9 +150,9 @@ STATIC INLINE VOID GicdSetGroup(UINT32 irq)
 {
     /* configure spi as group 0 on secure mode and group 1 on unsecure mode */
 #ifdef LOSCFG_ARCH_SECURE_MONITOR_MODE
-    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0; /* 32: Interrupt bit width */
+    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0;
 #else
-    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0xffffffff; /* 32: Interrupt bit width */
+    GIC_REG_32(GICD_IGROUPR(irq / 32)) = 0xffffffff;
 #endif
 }
 
@@ -248,13 +248,13 @@ UINT32 HalCurIrqGet(VOID)
 VOID HalIrqMask(UINT32 vector)
 {
     INT32 i;
-    const UINT32 mask = 1U << (vector % 32); /* 32: Interrupt bit width */
+    const UINT32 mask = 1U << (vector % 32);
 
     if ((vector > OS_USER_HWI_MAX) || (vector < OS_USER_HWI_MIN)) {
         return;
     }
 
-    if (vector < 32) { /* 32: Interrupt bit width */
+    if (vector < 32) {
         for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
             GIC_REG_32(GICR_ICENABLER0(i)) = mask;
             GicWaitForRwp(GICR_CTLR(i));
@@ -268,19 +268,19 @@ VOID HalIrqMask(UINT32 vector)
 VOID HalIrqUnmask(UINT32 vector)
 {
     INT32 i;
-    const UINT32 mask = 1U << (vector % 32); /* 32: Interrupt bit width */
+    const UINT32 mask = 1U << (vector % 32);
 
     if ((vector > OS_USER_HWI_MAX) || (vector < OS_USER_HWI_MIN)) {
         return;
     }
 
-    if (vector < 32) { /* 32: Interrupt bit width */
+    if (vector < 32) {
         for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
             GIC_REG_32(GICR_ISENABLER0(i)) = mask;
             GicWaitForRwp(GICR_CTLR(i));
         }
     } else {
-        GIC_REG_32(GICD_ISENABLER(vector >> 5)) = mask; /* 5: Register bit offset */
+        GIC_REG_32(GICD_ISENABLER(vector >> 5)) = mask;
         GicWaitForRwp(GICD_CTLR);
     }
 }
@@ -291,7 +291,7 @@ VOID HalIrqPending(UINT32 vector)
         return;
     }
 
-    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32); /* 5: Register bit offset, 32: Interrupt bit width */
+    GIC_REG_32(GICD_ISPENDR(vector >> 5)) = 1U << (vector % 32);
 }
 
 VOID HalIrqClear(UINT32 vector)
@@ -362,30 +362,30 @@ VOID HalIrqInit(VOID)
     GicWaitForRwp(GICD_CTLR);
     ISB;
 
-    /* set external interrupts to be level triggered, active low. */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) { /* 32: Start interrupt number, 16: Interrupt bit width */
+    /* set externel interrupts to be level triggered, active low. */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 16) {
         GIC_REG_32(GICD_ICFGR(i / 16)) = 0;
     }
 
     /* config distributer, mask and clear all spis, set group x */
-    for (i = 32; i < OS_HWI_MAX_NUM; i += 32) { /* 32: Start interrupt number, 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff; /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICPENDR(i / 32)) = 0xffffffff; /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_IGRPMODR(i / 32)) = 0; /* 32: Interrupt bit width */
+    for (i = 32; i < OS_HWI_MAX_NUM; i += 32) {
+        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff;
+        GIC_REG_32(GICD_ICPENDR(i / 32)) = 0xffffffff;
+        GIC_REG_32(GICD_IGRPMODR(i / 32)) = 0;
 
         GicdSetGroup(i);
     }
 
     /* set spi priority as default */
-    for (i = 32; i < OS_HWI_MAX_NUM; i++) { /* 32: Start interrupt number */
+    for (i = 32; i < OS_HWI_MAX_NUM; i++) {
         GicdSetPmr(i, MIN_INTERRUPT_PRIORITY);
     }
 
     GicWaitForRwp(GICD_CTLR);
 
     /* disable all interrupts. */
-    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) { /* 32: Interrupt bit width */
-        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff; /* 32: Interrupt bit width */
+    for (i = 0; i < OS_HWI_MAX_NUM; i += 32) {
+        GIC_REG_32(GICD_ICENABLER(i / 32)) = 0xffffffff;
     }
 
     /* enable distributor with ARE, group 1 enabled */
@@ -393,7 +393,7 @@ VOID HalIrqInit(VOID)
 
     /* set spi to boot cpu only. ARE must be enabled */
     affinity = MpidrToAffinity(AARCH64_SYSREG_READ(mpidr_el1));
-    for (i = 32; i < OS_HWI_MAX_NUM; i++) { /* 32: Start interrupt number */
+    for (i = 32; i < OS_HWI_MAX_NUM; i++) {
         GIC_REG_64(GICD_IROUTER(i)) = affinity;
     }
 
@@ -401,12 +401,9 @@ VOID HalIrqInit(VOID)
 
 #ifdef LOSCFG_KERNEL_SMP
     /* register inter-processor interrupt */
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0);
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0);
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_HALT, 0xa0, 0, OsMpScheduleHandler, 0);
-#ifdef LOSCFG_KERNEL_SMP_CALL
-    (VOID)LOS_HwiCreate(LOS_MP_IPI_FUNC_CALL, 0xa0, 0, OsMpFuncCallHandler, 0);
-#endif
+    LOS_HwiCreate(LOS_MP_IPI_WAKEUP, 0xa0, 0, OsMpWakeHandler, 0);
+    LOS_HwiCreate(LOS_MP_IPI_SCHEDULE, 0xa0, 0, OsMpScheduleHandler, 0);
+    LOS_HwiCreate(LOS_MP_IPI_HALT, 0xa0, 0, OsMpScheduleHandler, 0);
 #endif
 }
 

arch/arm/include/gic_common.h

@@ -77,8 +77,8 @@ enum {
 #define GICD_PIDR2V3                    (GICD_OFFSET + 0xffe8)
 
 #ifdef LOSCFG_ARCH_GIC_V3
-#define GICD_IGRPMODR(n)                (GICD_OFFSET + 0x0d00 + (n) * 4) /* Interrupt Group Mode Registers */
-#define GICD_IROUTER(n)                 (GICD_OFFSET + 0x6000 + (n) * 8) /* Interrupt Rounter Registers */
+#define GICD_IGRPMODR(n)                (GICD_OFFSET + 0x0d00 + (n) * 4) /* Interrupt Group Mode Reisters */
+#define GICD_IROUTER(n)                 (GICD_OFFSET + 0x6000 + (n) * 8) /* Interrupt Rounter Reisters */
 #endif
 
 #define GIC_REG_8(reg)                  (*(volatile UINT8 *)((UINTPTR)(GIC_BASE_ADDR + (reg))))

bsd/Makefile

@@ -41,6 +41,14 @@ LOCAL_SRCS += $(wildcard crypto/rijndael/*.c) \
               $(wildcard crypto/sha2/*.c) \
               $(wildcard dev/random/*.c) \
               $(wildcard libkern/*.c)
+
 endif
 
+LOCAL_INCLUDE := \
+        -I $(LITEOSTOPDIR)/kernel/base/include \
+        -I $(LITEOSTOPDIR)/bsd \
+        -I $(LITEOSTOPDIR)/bsd/kern \
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+
 include $(MODULE)

bsd/compat/linuxkpi/Makefile

@@ -37,4 +37,10 @@ ifneq ($(LOSCFG_HRTIMER_ENABLE), y)
 LOCAL_SRCS := $(filter-out src/linux_hrtimer.c, $(LOCAL_SRCS))
 endif
 
+LOCAL_INCLUDE := \
+        -I $(LITEOSTOPDIR)/kernel/base/include \
+        -I $(LITEOSTOPDIR)/bsd/compat/linuxkpi/include
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+
 include $(MODULE)

bsd/dev/usb/BUILD.gn

@@ -137,13 +137,14 @@ kernel_module(module_name) {
     ]
   }
 
-  configs += [ "$HDFTOPDIR:hdf_config" ]
+  configs += [
+    "$HDFTOPDIR:hdf_config"
+  ]
 
   public_configs = [ ":public" ]
 }
 
 config("public") {
-  defines = [ "USB_DEBUG_VAR=5" ]
   include_dirs = [ "." ]
   include_dirs += [ "$LITEOSTHIRDPARTY/FreeBSD/sys/dev/evdev" ]
 }

bsd/dev/usb/Makefile

@@ -135,4 +135,6 @@ LOCAL_SRCS += $(INPUT_SRC)/uhid.c  \
               $(CORE_SRC)/usb_hid.c
 endif
 
+LOCAL_FLAGS += $(LITEOS_GCOV_OPTS)
+
 include $(HDF_DRIVER)

bundle.json

@@ -1,7 +1,7 @@
 {
-    "name": "@ohos/liteos_a",
-    "version": "3.1.0",
-    "description": "liteos-a kernel",
+    "name": "@ohos/kernel_liteos_a",
+    "version": "",
+    "description": "liteos-a内核",
     "homePage": "https://gitee.com/openharmony",
     "license": "BSD 3-clause",
     "repository": "https://gitee.com/openharmony/kernel_liteos_a",
@@ -19,14 +19,24 @@
     ],
     "envs": [],
     "dirs": [],
-    "author": {},
-    "contributors": [],
+    "author": {
+        "name": "",
+        "email": "",
+        "url": ""
+    },
+    "contributors": [
+        {
+            "name": "",
+            "email": "",
+            "url": ""
+        }
+    ],
     "segment": {
         "destPath": "kernel/liteos_a"
     },
     "component": {
-        "name": "liteos_a",
-        "subsystem": "kernel",
+        "name": "liteos-a",
+        "subsystem": "liteos_a",
         "syscap": [
             "SystemCapability.Kernel.liteos-a"
         ],
@@ -34,32 +44,16 @@
         "adated_system_type": [
             "small"
         ],
-        "rom": "1.5MB",
-        "ram": "2MB",
+        "rom": "",
+        "ram": "",
         "deps": {
-            "components": [
-            ], 
-            "third_party": [
-                "bounds_checking_function",
-                "toybox",
-                "NuttX",
-                "FatFs",
-                "mksh",
-                "musl",
-                "mbedtls",
-                "FreeBSD",
-                "zlib",
-                "lwip",
-                "optimized-routines",
-                "googletest"
-            ]
+            "components": [],
+            "third_party": []
         },
         "build": {
-            "sub_component": [
-                "//kernel/liteos_a:liteos_a"
-            ],
+            "sub_component": [],
             "inner_kits": [],
             "test": []
         }
     }
-}
+}

compat/posix/Makefile

@@ -33,8 +33,10 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
-LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/compat/posix/src
+LOCAL_INCLUDE := \
+    -I $(LITEOSTOPDIR)/compat/posix/src \
+    -I $(LITEOSTOPDIR)/kernel/base/include \
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
 
 include $(MODULE)

compat/posix/include/mqueue.h

@@ -71,7 +71,7 @@ extern "C" {
 /* CONSTANTS */
 
 #define MQ_USE_MAGIC  0x89abcdef
-/* not support prio */
+/* not suppurt prio */
 #define MQ_PRIO_MAX 1
 
 typedef union send_receive_t {
@@ -297,7 +297,7 @@ extern int mq_send(mqd_t personal, const char *msg, size_t msgLen, unsigned int
  * <li><b>EAGAIN</b>: The message queue is empty.</li>
  * <li><b>EINVAL</b>: invalid parameter.</li>
  * <li><b>EMSGSIZE</b>: The message to be received is too long.</li>
- * <li><b>ETIMEDOUT</b>: The operation times out.</li>
+ * <li><b>ETIMEDOUT</b>: The operaton times out.</li>
  * </ul>
  *
  * @par Dependency:

compat/posix/include/time_posix.h

@@ -86,7 +86,6 @@ STATIC INLINE VOID OsTick2TimeSpec(struct timespec *tp, UINT32 tick)
 }
 
 int OsTimerCreate(clockid_t, struct ksigevent *__restrict, timer_t *__restrict);
-void OsAdjTime(void);
 
 #ifdef __cplusplus
 #if __cplusplus

compat/posix/src/malloc.c

@@ -40,7 +40,7 @@
  */
 
 void *calloc(size_t nitems, size_t size)
-{
+{ /*lint !e578*/
     size_t real_size;
     void *ptr = NULL;
 
@@ -78,7 +78,7 @@ void free(void *ptr)
  */
 
 void *malloc(size_t size)
-{
+{ /*lint !e31 !e10*/
     if (size == 0) {
         return NULL;
     }
@@ -87,7 +87,7 @@ void *malloc(size_t size)
 }
 
 void *zalloc(size_t size)
-{
+{ /*lint !e10*/
     void *ptr = NULL;
 
     if (size == 0) {
@@ -142,4 +142,4 @@ void *realloc(void *ptr, size_t size)
     }
 
     return LOS_KernelRealloc(ptr, (UINT32) size);
-}
+}

compat/posix/src/misc.c

@@ -154,9 +154,7 @@ pid_t getpid(void)
 
 int getrlimit(int resource, struct rlimit *rlim)
 {
-    unsigned int intSave;
     LosProcessCB *pcb = OsCurrProcessGet();
-    struct rlimit *resourceLimit = pcb->resourceLimit;
 
     switch (resource) {
         case RLIMIT_NOFILE:
@@ -165,18 +163,8 @@ int getrlimit(int resource, struct rlimit *rlim)
         default:
             return -EINVAL;
     }
-
-    if (resourceLimit == NULL) {
-        rlim->rlim_cur = 0;
-        rlim->rlim_max = 0;
-
-        return 0;
-    }
-
-    SCHEDULER_LOCK(intSave);
-    rlim->rlim_cur = resourceLimit[resource].rlim_cur;
-    rlim->rlim_max = resourceLimit[resource].rlim_max;
-    SCHEDULER_UNLOCK(intSave);
+    rlim->rlim_cur = pcb->pl_rlimit[resource].rlim_cur;
+    rlim->rlim_max = pcb->pl_rlimit[resource].rlim_max;
 
     return 0;
 }
@@ -187,8 +175,6 @@ int getrlimit(int resource, struct rlimit *rlim)
 #endif
 int setrlimit(int resource, const struct rlimit *rlim)
 {
-    unsigned int intSave;
-    struct rlimit *resourceLimit = NULL;
     LosProcessCB *pcb = OsCurrProcessGet();
 
     if (rlim->rlim_cur > rlim->rlim_max) {
@@ -208,23 +194,8 @@ int setrlimit(int resource, const struct rlimit *rlim)
         default:
             return -EINVAL;
     }
+    pcb->pl_rlimit[resource].rlim_cur = rlim->rlim_cur;
+    pcb->pl_rlimit[resource].rlim_max = rlim->rlim_max;
 
-    if (pcb->resourceLimit == NULL) {
-        resourceLimit = LOS_MemAlloc((VOID *)m_aucSysMem0, RLIM_NLIMITS * sizeof(struct rlimit));
-        if (resourceLimit == NULL) {
-            return -EINVAL;
-        }
-    }
-
-    SCHEDULER_LOCK(intSave);
-    if (pcb->resourceLimit == NULL) {
-        pcb->resourceLimit = resourceLimit;
-        resourceLimit = NULL;
-    }
-    pcb->resourceLimit[resource].rlim_cur = rlim->rlim_cur;
-    pcb->resourceLimit[resource].rlim_max = rlim->rlim_max;
-    SCHEDULER_UNLOCK(intSave);
-
-    (VOID)LOS_MemFree((VOID *)m_aucSysMem0, resourceLimit);
     return 0;
-}
+}

compat/posix/src/pthread.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without modification,
  * are permitted provided that the following conditions are met:
@@ -158,7 +158,7 @@ STATIC VOID SetPthreadAttr(const _pthread_data *self, const pthread_attr_t *attr
     }
     if (outAttr->inheritsched == PTHREAD_INHERIT_SCHED) {
         if (self->task == NULL) {
-            outAttr->schedparam.sched_priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
+            outAttr->schedparam.sched_priority = ((LosTaskCB *)(OsCurrTaskGet()))->priority;
         } else {
             outAttr->schedpolicy = self->attr.schedpolicy;
             outAttr->schedparam  = self->attr.schedparam;
@@ -231,7 +231,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
 
     SetPthreadAttr(self, attr, &userAttr);
 
-    (VOID)snprintf_s(name, sizeof(name), sizeof(name) - 1, "pth%02d", pthreadNumber);
+    (VOID)snprintf_s(name, sizeof(name), sizeof(name) - 1, "pth%02u", pthreadNumber);
     pthreadNumber++;
 
     taskInitParam.pcName       = name;
@@ -248,7 +248,7 @@ int pthread_create(pthread_t *thread, const pthread_attr_t *attr,
         taskInitParam.uwResved = LOS_TASK_STATUS_DETACHED;
     } else {
         /* Set the pthread default joinable */
-        taskInitParam.uwResved = LOS_TASK_ATTR_JOINABLE;
+        taskInitParam.uwResved = 0;
     }
 
     PthreadReap();

compat/posix/src/stdlib.c

@@ -47,7 +47,7 @@ void srand(unsigned s)
 
 int rand(void)
 {
-    return random();
+   return random();
 }
 
 void _exit(int status)

compat/posix/src/time.c

@@ -387,16 +387,9 @@ int gettimeofday64(struct timeval64 *tv, struct timezone *tz)
 }
 #endif
 
-#ifdef LOSCFG_LIBC_NEWLIB
-int gettimeofday(struct timeval *tv, void *_tz)
-#else
 int gettimeofday(struct timeval *tv, struct timezone *tz)
-#endif
 {
     struct timeval64 stTimeVal64 = {0};
-#ifdef LOSCFG_LIBC_NEWLIB
-    struct timezone *tz = (struct timezone *)_tz;
-#endif
 
     if (tv == NULL) {
         TIME_RETURN(EINVAL);
@@ -516,11 +509,7 @@ static int ProcessGetCputime(clockid_t clockID, struct timespec *ats)
     }
 
     SCHEDULER_LOCK(intSave);
-    if (spcb->processCpup == NULL) {
-        SCHEDULER_UNLOCK(intSave);
-        return -EINVAL;
-    }
-    runtime = spcb->processCpup->allTime;
+    runtime = spcb->processCpup.allTime;
     SCHEDULER_UNLOCK(intSave);
 
     ats->tv_sec = runtime / OS_SYS_NS_PER_SECOND;
@@ -654,7 +643,7 @@ int clock_getres(clockid_t clockID, struct timespec *tp)
         case CLOCK_MONOTONIC_RAW:
         case CLOCK_MONOTONIC:
         case CLOCK_REALTIME:
-            /* the accessible rtc resolution */
+            /* the accessable rtc resolution */
             tp->tv_nsec = OS_SYS_NS_PER_US; /* the precision of clock_gettime is 1us */
             tp->tv_sec = 0;
             break;
@@ -725,7 +714,6 @@ typedef struct {
 
 static VOID SwtmrProc(UINTPTR tmrArg)
 {
-#ifdef LOSCFG_KERNEL_VM
     INT32 sig, ret;
     UINT32 intSave;
     pid_t pid;
@@ -768,48 +756,10 @@ static VOID SwtmrProc(UINTPTR tmrArg)
     }
     return;
 EXIT:
-    PRINT_ERR("Dispatch signals failed!, ret: %d\r\n", ret);
-#endif
+    PRINT_ERR("Dsipatch signals failed!, ret: %d\r\n", ret);
     return;
 }
 
-int timer_create(clockid_t clockID, struct sigevent *restrict evp, timer_t *restrict timerID)
-{
-    UINT32 ret;
-    UINT16 swtmrID;
-#ifdef LOSCFG_SECURITY_VID
-    UINT16 vid;
-#endif
-
-    if (!timerID || (clockID != CLOCK_REALTIME) || !evp) {
-        errno = EINVAL;
-        return -1;
-    }
-
-    if ((evp->sigev_notify != SIGEV_THREAD) || evp->sigev_notify_attributes) {
-        errno = ENOTSUP;
-        return -1;
-    }
-
-    ret = LOS_SwtmrCreate(1, LOS_SWTMR_MODE_ONCE, (SWTMR_PROC_FUNC)evp->sigev_notify_function,
-                          &swtmrID, (UINTPTR)evp->sigev_value.sival_ptr);
-    if (ret != LOS_OK) {
-        errno = (ret == LOS_ERRNO_SWTMR_MAXSIZE) ? EAGAIN : EINVAL;
-        return -1;
-    }
-
-#ifdef LOSCFG_SECURITY_VID
-    vid = AddNodeByRid(swtmrID);
-    if (vid == MAX_INVALID_TIMER_VID) {
-        (VOID)LOS_SwtmrDelete(swtmrID);
-        return -1;
-    }
-    swtmrID = vid;
-#endif
-    *timerID = (timer_t)(UINTPTR)swtmrID;
-    return 0;
-}
-
 int OsTimerCreate(clockid_t clockID, struct ksigevent *evp, timer_t *timerID)
 {
     UINT32 ret;
@@ -869,7 +819,6 @@ int timer_delete(timer_t timerID)
 {
     UINT16 swtmrID = (UINT16)(UINTPTR)timerID;
     VOID *arg = NULL;
-    UINTPTR swtmrProc;
 
 #ifdef LOSCFG_SECURITY_VID
     swtmrID = GetRidByVid(swtmrID);
@@ -879,11 +828,10 @@ int timer_delete(timer_t timerID)
     }
 
     arg = (VOID *)OS_SWT_FROM_SID(swtmrID)->uwArg;
-    swtmrProc = (UINTPTR)OS_SWT_FROM_SID(swtmrID)->pfnHandler;
     if (LOS_SwtmrDelete(swtmrID)) {
         goto ERROUT;
     }
-    if ((swtmrProc == (UINTPTR)SwtmrProc) && (arg != NULL)) {
+    if (arg != NULL) {
         free(arg);
     }
 
@@ -1027,11 +975,7 @@ STATIC INT32 DoNanoSleep(UINT64 nanoseconds)
     return -1;
 }
 
-#ifdef LOSCFG_LIBC_NEWLIB
-int usleep(unsigned long useconds)
-#else
 int usleep(unsigned useconds)
-#endif
 {
     return DoNanoSleep((UINT64)useconds * OS_SYS_NS_PER_US);
 }

config.mk

@@ -38,7 +38,7 @@ LITEOS_CXXOPTS  := $(LITEOS_CXXOPTS_BASE)
 LITEOS_INCLUDE  := $(LITEOS_KERNEL_INCLUDE)  $(LITEOS_EXTKERNEL_INCLUDE) \
                    $(LITEOS_COMPAT_INCLUDE)  $(LITEOS_FS_INCLUDE) \
                    $(LITEOS_NET_INCLUDE)     $(LITEOS_LIB_INCLUDE) \
-                   $(LITEOS_DRIVERS_INCLUDE) $(LITEOS_TOOLS_DEBUG_INCLUDE) \
+                   $(LITEOS_DRIVERS_INCLUDE) $(LOSCFG_TOOLS_DEBUG_INCLUDE) \
                    $(LITEOS_PLATFORM_INCLUDE) $(LITEOS_DFX_INCLUDE) \
                    $(LITEOS_SECURITY_INCLUDE)
 LITEOS_LIBDEP   := $(LITEOS_BASELIB)
@@ -52,17 +52,10 @@ LITEOS_LDFLAGS  := $(LITEOS_LD_OPTS)     $(LITEOS_LD_PATH) \
                    $(LITEOS_LD_SCRIPT)
 
 # clear all local variables
-LOCAL_FLAGS    =
-LOCAL_CFLAGS   =
-LOCAL_CPPFLAGS =
-LOCAL_ASFLAGS  =
-LOCAL_SRCS     =
-LOCAL_CHS      =
-LOCAL_CPPHS    =
-
-# basic build flags
-CFLAGS    := $(LITEOS_CFLAGS)
-CXXFLAGS  := $(LITEOS_CXXFLAGS)
-ASFLAGS   := $(LITEOS_ASFLAGS)
-LDFLAGS   := $(LITEOS_LDFLAGS)
-ARFLAGS   := rc
+LOCAL_FLAGS    :=
+LOCAL_CFLAGS   :=
+LOCAL_CPPFLAGS :=
+LOCAL_ASFLAGS  :=
+LOCAL_SRCS     :=
+LOCAL_CHS      :=
+LOCAL_CPPHS    :=

drivers/BUILD.gn

@@ -29,10 +29,28 @@
 
 import("//kernel/liteos_a/liteos.gni")
 
-module_group("drivers") {
-  modules = [
-    "block",
-    "char",
-    "mtd",
+group("drivers") {
+  deps = [
+    "block/disk",
+    "char/bch",
+    "char/mem",
+    "char/quickstart",
+    "char/random",
+    "char/trace",
+    "char/video",
+    "mtd/multi_partition",
+  ]
+}
+
+config("public") {
+  configs = [
+    "block/disk:public",
+    "char/bch:public",
+    "char/mem:public",
+    "char/quickstart:public",
+    "char/random:public",
+    "char/video:public",
+    "char/trace:public",
+    "mtd/multi_partition:public",
   ]
 }

drivers/Kconfig

@@ -1,21 +0,0 @@
-config DRIVERS
-    bool "Enable Driver"
-    default y
-    help
-      Answer Y to enable LiteOS support driver.
-
-source "bsd/dev/usb/Kconfig"
-source "../../drivers/adapter/khdf/liteos/Kconfig"
-
-# Device driver Kconfig import
-source "$(DEVICE_PATH)/drivers/Kconfig"
-
-source "drivers/char/mem/Kconfig"
-source "drivers/char/quickstart/Kconfig"
-source "drivers/char/random/Kconfig"
-source "drivers/char/video/Kconfig"
-source "drivers/char/trace/Kconfig"
-source "drivers/char/perf/Kconfig"
-
-source "../../drivers/liteos/tzdriver/Kconfig"
-source "../../drivers/liteos/hievent/Kconfig"

drivers/block/BUILD.gn

@@ -1,34 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_group("block") {
-  modules = [ "disk" ]
-}

drivers/block/disk/Makefile

@@ -33,4 +33,8 @@ MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
+LOCAL_INCLUDE := \
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
+
 include $(MODULE)

drivers/block/disk/include/disk.h

@@ -45,6 +45,8 @@
 #include "bcache.h"
 #endif
 
+#include "pthread.h"
+
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
@@ -163,7 +165,7 @@ extern "C" {
 #define DISK_ATA_GET_MODEL      21  /* Get model name */
 #define DISK_ATA_GET_SN         22  /* Get serial number */
 
-#ifndef LOSCFG_FS_FAT_CACHE
+#ifdef LOSCFG_FS_FAT_CACHE
 #define DISK_DIRECT_BUFFER_SIZE 4   /* los_disk direct io buffer when bcache is off */
 #endif
 
@@ -251,7 +253,7 @@ struct disk_divide_info {
  * </ul>
  *
  * @param  diskName  [IN] Type #const CHAR *                      disk driver name.
- * @param  bops      [IN] Type #const struct block_operations *   block driver control structure.
+ * @param  bops      [IN] Type #const struct block_operations *   block driver control sturcture.
  * @param  priv      [IN] Type #VOID *                            private data of vnode.
  * @param  diskID    [IN] Type #INT32                             disk id number, less than SYS_MAX_DISK.
  * @param  info      [IN] Type #VOID *                            disk driver partition information.
@@ -710,7 +712,7 @@ INT32 los_alloc_diskid_byname(const CHAR *diskName);
  * @brief get the INUSED disk id.
  *
  * @par Description:
- * Get the corresponding INUSED disk id by diskName.
+ * Get the correponding INUSED disk id by diskName.
  *
  * @attention
  * <ul>

drivers/block/disk/src/disk.c

@@ -107,7 +107,7 @@ INT32 los_alloc_diskid_byname(const CHAR *diskName)
     size_t nameLen;
 
     if (diskName == NULL) {
-        PRINT_ERR("The parameter disk_name is NULL");
+        PRINT_ERR("The paramter disk_name is NULL");
         return VFS_ERROR;
     }
 
@@ -163,7 +163,7 @@ INT32 los_get_diskid_byname(const CHAR *diskName)
     size_t diskNameLen;
 
     if (diskName == NULL) {
-        PRINT_ERR("The parameter diskName is NULL");
+        PRINT_ERR("The paramter diskName is NULL");
         return VFS_ERROR;
     }
 
@@ -756,7 +756,7 @@ INT32 DiskPartitionRegister(los_disk *disk)
     los_part *part = NULL;
     struct disk_divide_info parInfo;
 
-    /* Fill disk_divide_info structure to set partition's information. */
+    /* Fill disk_divide_info structure to set partition's infomation. */
     (VOID)memset_s(parInfo.part, sizeof(parInfo.part), 0, sizeof(parInfo.part));
     partSize = sizeof(parInfo.part) / sizeof(parInfo.part[0]);
 
@@ -788,7 +788,7 @@ INT32 DiskPartitionRegister(los_disk *disk)
     }
 
     for (i = 0; i < partSize; i++) {
-        /* Read the disk_divide_info structure to get partition's information. */
+        /* Read the disk_divide_info structure to get partition's infomation. */
         if ((parInfo.part[i].type != 0) && (parInfo.part[i].type != EXTENDED_PAR) &&
             (parInfo.part[i].type != EXTENDED_8G)) {
             part = get_part(DiskAddPart(disk, parInfo.part[i].sector_start, parInfo.part[i].sector_count, TRUE));
@@ -1063,7 +1063,7 @@ INT32 los_part_read(INT32 pt, VOID *buf, UINT64 sector, UINT32 count, BOOL useRe
     }
 
     if (count > part->sector_count) {
-        PRINT_ERR("los_part_read failed, invalid count, count = %u\n", count);
+        PRINT_ERR("los_part_read failed, invaild count, count = %u\n", count);
         goto ERROR_HANDLE;
     }
 
@@ -1072,7 +1072,7 @@ INT32 los_part_read(INT32 pt, VOID *buf, UINT64 sector, UINT32 count, BOOL useRe
         if ((disk->sector_count - part->sector_start) > sector) {
             sector += part->sector_start;
         } else {
-            PRINT_ERR("los_part_read failed, invalid sector, sector = %llu\n", sector);
+            PRINT_ERR("los_part_read failed, invaild sector, sector = %llu\n", sector);
             goto ERROR_HANDLE;
         }
     }
@@ -1119,7 +1119,7 @@ INT32 los_part_write(INT32 pt, const VOID *buf, UINT64 sector, UINT32 count)
     }
 
     if (count > part->sector_count) {
-        PRINT_ERR("los_part_write failed, invalid count, count = %u\n", count);
+        PRINT_ERR("los_part_write failed, invaild count, count = %u\n", count);
         goto ERROR_HANDLE;
     }
 
@@ -1128,7 +1128,7 @@ INT32 los_part_write(INT32 pt, const VOID *buf, UINT64 sector, UINT32 count)
         if ((disk->sector_count - part->sector_start) > sector) {
             sector += part->sector_start;
         } else {
-            PRINT_ERR("los_part_write failed, invalid sector, sector = %llu\n", sector);
+            PRINT_ERR("los_part_write failed, invaild sector, sector = %llu\n", sector);
             goto ERROR_HANDLE;
         }
     }

drivers/char/BUILD.gn

@@ -1,42 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_group("char") {
-  modules = [
-    "bch",
-    "mem",
-    "perf",
-    "quickstart",
-    "random",
-    "trace",
-    "video",
-  ]
-}

drivers/char/bch/BUILD.gn

@@ -28,12 +28,21 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_FS_VFS_BLOCK_DEVICE)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
-  sources = NUTTX_DRIVERS_BCH_SRC_FILES
+  sources = [
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_driver.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_register.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchdev_unregister.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_cache.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_read.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_sem.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_setup.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_teardown.c",
+    "$LITEOSTHIRDPARTY/NuttX/drivers/bch/bchlib_write.c",
+  ]
 
   public_configs = [ ":public" ]
 }

drivers/char/bch/Makefile

@@ -34,8 +34,9 @@ MODULE_NAME := $(notdir $(shell pwd))
 LOCAL_SRCS :=  $(wildcard $(LITEOSTHIRDPARTY)/NuttX/drivers/bch/*.c)
 
 LOCAL_INCLUDE := \
-	-I $(LITEOSTHIRDPARTY)/NuttX/drivers/bch
+	-I $(LITEOSTHIRDPARTY)/NuttX/drivers/bch \
+	-I $(LITEOSTOPDIR)/fs/include \
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
 
 include $(MODULE)

drivers/char/perf/BUILD.gn

@@ -1,42 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_switch = defined(LOSCFG_DRIVERS_PERF)
-module_name = "perf_dev"
-kernel_module(module_name) {
-  sources = [ "src/perf.c" ]
-
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}

drivers/char/perf/Kconfig

@@ -1,6 +0,0 @@
-config DRIVERS_PERF
-    bool "Enable PERF DRIVER"
-    default y
-    depends on DRIVERS && FS_VFS && KERNEL_PERF
-    help
-      Answer Y to enable LiteOS support perf in userspace.

drivers/char/perf/Makefile

@@ -1,36 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-include $(LITEOSTOPDIR)/config.mk
-
-MODULE_NAME := perf_dev
-
-LOCAL_SRCS :=  $(wildcard src/*.c)
-
-include $(MODULE)

drivers/char/perf/src/perf.c

@@ -1,153 +0,0 @@
-/*
- * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *
- * 1. Redistributions of source code must retain the above copyright notice, this list of
- *    conditions and the following disclaimer.
- *
- * 2. Redistributions in binary form must reproduce the above copyright notice, this list
- *    of conditions and the following disclaimer in the documentation and/or other materials
- *    provided with the distribution.
- *
- * 3. Neither the name of the copyright holder nor the names of its contributors may be used
- *    to endorse or promote products derived from this software without specific prior written
- *    permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "fcntl.h"
-#include "user_copy.h"
-#include "sys/ioctl.h"
-#include "fs/driver.h"
-#include "los_dev_perf.h"
-#include "los_perf.h"
-#include "los_init.h"
-
-#define PERF_DRIVER "/dev/perf"
-#define PERF_DRIVER_MODE 0666
-
-/* perf ioctl */
-#define PERF_IOC_MAGIC     'T'
-#define PERF_START         _IO(PERF_IOC_MAGIC, 1)
-#define PERF_STOP          _IO(PERF_IOC_MAGIC, 2)
-
-static int PerfOpen(struct file *filep)
-{
-    (void)filep;
-    return 0;
-}
-
-static int PerfClose(struct file *filep)
-{
-    (void)filep;
-    return 0;
-}
-
-static ssize_t PerfRead(struct file *filep, char *buffer, size_t buflen)
-{
-    /* perf record buffer read */
-    (void)filep;
-    int ret;
-    int realLen;
-
-    char *records = LOS_MemAlloc(m_aucSysMem0, buflen);
-    if (records == NULL) {
-        return -ENOMEM;
-    }
-
-    realLen = LOS_PerfDataRead(records, buflen); /* get sample data */
-    if (realLen == 0) {
-        PRINT_ERR("Perf read failed, check whether perf is configured to sample mode.\n");
-        ret = -EINVAL;
-        goto EXIT;
-    }
-
-    ret = LOS_CopyFromKernel((void *)buffer, buflen, (void *)records, realLen);
-    if (ret != 0) {
-        ret = -EINVAL;
-        goto EXIT;
-    }
-
-    ret = realLen;
-EXIT:
-    LOS_MemFree(m_aucSysMem0, records);
-    return ret;
-}
-
-static ssize_t PerfConfig(struct file *filep, const char *buffer, size_t buflen)
-{
-    (void)filep;
-    int ret;
-    PerfConfigAttr attr = {0};
-    int attrlen = sizeof(PerfConfigAttr);
-
-    if (buflen != attrlen) {
-        PRINT_ERR("PerfConfigAttr is %d bytes not %d\n", attrlen, buflen);
-        return -EINVAL;
-    }
-
-    ret = LOS_CopyToKernel(&attr, attrlen, buffer, buflen);
-    if (ret != 0) {
-        return -EINVAL;
-    }
-
-    ret = LOS_PerfConfig(&attr);
-    if (ret != LOS_OK) {
-        PRINT_ERR("perf config error %u\n", ret);
-        return -EINVAL;
-    }
-
-    return 0;
-}
-
-static int PerfIoctl(struct file *filep, int cmd, unsigned long arg)
-{
-    (void)filep;
-    switch (cmd) {
-        case PERF_START:
-            LOS_PerfStart((UINT32)arg);
-            break;
-        case PERF_STOP:
-            LOS_PerfStop();
-            break;
-        default:
-            PRINT_ERR("Unknown perf ioctl cmd:%d\n", cmd);
-            return -EINVAL;
-    }
-    return 0;
-}
-
-static const struct file_operations_vfs g_perfDevOps = {
-    PerfOpen,        /* open */
-    PerfClose,       /* close */
-    PerfRead,        /* read */
-    PerfConfig,      /* write */
-    NULL,            /* seek */
-    PerfIoctl,       /* ioctl */
-    NULL,            /* mmap */
-#ifndef CONFIG_DISABLE_POLL
-    NULL,            /* poll */
-#endif
-    NULL,            /* unlink */
-};
-
-int DevPerfRegister(void)
-{
-    return register_driver(PERF_DRIVER, &g_perfDevOps, PERF_DRIVER_MODE, 0); /* 0666: file mode */
-}
-
-LOS_MODULE_INIT(DevPerfRegister, LOS_INIT_LEVEL_KMOD_EXTENDED);

drivers/char/random/Kconfig

@@ -5,7 +5,7 @@ config DRIVERS_RANDOM
     help
         Answer Y to support random.
 config HW_RANDOM_ENABLE
-    depends on DRIVERS_RANDOM && (PLATFORM_HI3518EV300 || PLATFORM_HI3516CV300 || PLATFORM_HI3516DV300 || PLATFORM_HI3556V200 || PLATFORM_QEMU_ARM_VIRT_CA7)
+    depends on DRIVERS_RANDOM && (PLATFORM_HI3518EV300 || PLATFORM_HI3516CV300 || PLATFORM_HI3516DV300 || PLATFORM_HI3556V200)
     bool "Select hw random"
     default y
     help

drivers/char/random/Makefile

@@ -37,4 +37,9 @@ ifdef LOSCFG_HW_RANDOM_ENABLE
 LOCAL_SRCS += $(wildcard src/random_hw.c)
 endif
 
+LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/drivers/char/random/include \
+                 -I $(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH)/include
+
+LOCAL_FLAGS := $(LOCAL_INCLUDE)
+
 include $(MODULE)

drivers/char/random/src/random_hw.c

@@ -41,7 +41,7 @@ void RandomOperationsInit(const RandomOperations *r)
     if (r != NULL) {
         (void)memcpy_s(&g_randomOp, sizeof(RandomOperations), r, sizeof(RandomOperations));
     } else {
-        PRINT_ERR("%s %d param is invalid\n", __FUNCTION__, __LINE__);
+        PRINT_ERR("param is invalid\n", __FUNCTION__, __LINE__);
     }
     return;
 }

drivers/char/trace/Makefile

@@ -35,6 +35,6 @@ LOCAL_SRCS :=  $(wildcard src/*.c)
 
 LOCAL_INCLUDE := -I $(LITEOSTOPDIR)/drivers/char/trace/include
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
 
 include $(MODULE)

drivers/char/trace/src/trace.c

@@ -103,7 +103,7 @@ static ssize_t TraceWrite(struct file *filep, const char *buffer, size_t buflen)
     if (info == NULL) {
         return -ENOMEM;
     }
-    (void)memset_s(info, infoLen, 0, infoLen);
+    memset_s(info, infoLen, 0, infoLen);
 
     ret = LOS_CopyToKernel(info, infoLen, buffer, buflen);
     if (ret != 0) {

drivers/char/video/BUILD.gn

@@ -28,16 +28,15 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/NuttX/NuttX.gni")
 
 module_switch = defined(LOSCFG_DRIVERS_VIDEO)
 module_name = get_path_info(rebase_path("."), "name")
 kernel_module(module_name) {
-  sources = NUTTX_DRIVERS_VIDEO_SRC_FILES
+  sources = [ "$LITEOSTHIRDPARTY/NuttX/drivers/video/fb.c" ]
 
   public_configs = [ ":public" ]
 }
 
 config("public") {
-  include_dirs = NUTTX_DRIVERS_VIDEO_INCLUDE_DIRS
+  include_dirs = [ "$LITEOSTHIRDPARTY/NuttX/include/nuttx/video" ]
 }

drivers/mtd/BUILD.gn

@@ -1,34 +0,0 @@
-# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without modification,
-# are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice, this list of
-#    conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice, this list
-#    of conditions and the following disclaimer in the documentation and/or other materials
-#    provided with the distribution.
-#
-# 3. Neither the name of the copyright holder nor the names of its contributors may be used
-#    to endorse or promote products derived from this software without specific prior written
-#    permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-import("//kernel/liteos_a/liteos.gni")
-
-module_group("mtd") {
-  modules = [ "multi_partition" ]
-}

drivers/mtd/multi_partition/Makefile

@@ -34,12 +34,14 @@ MODULE_NAME := $(notdir $(shell pwd))
 LOCAL_SRCS :=  $(wildcard src/*.c)
 
 LOCAL_INCLUDE := \
-    -I $(LITEOSTOPDIR)/fs/jffs2/include
+    -I $(LITEOSTOPDIR)/fs/jffs2/include \
+    -I $(LITEOSTOPDIR)/../../drivers/framework/model/storage/include \
+    -I $(LITEOSTOPDIR)/../../drivers/adapter/khdf/liteos/model/storage/include
 
 ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
 LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
 endif
 
-LOCAL_FLAGS := $(LOCAL_INCLUDE)
+LOCAL_FLAGS := $(LOCAL_INCLUDE) $(LITEOS_GCOV_OPTS)
 
 include $(MODULE)

drivers/mtd/multi_partition/src/mtd_partition.c

@@ -37,7 +37,7 @@
 #include "los_config.h"
 #include "los_mux.h"
 #include "fs/driver.h"
-#include "mtd/mtd_legacy_lite.h"
+#include "mtd_legacy_lite.h"
 
 #ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
 #include "cfiflash.h"
@@ -289,7 +289,7 @@ static INT32 BlockDriverRegisterOperate(mtd_partition *newNode,
         if (ret) {
             free(newNode->blockdriver_name);
             newNode->blockdriver_name = NULL;
-            PRINT_ERR("register blkdev partition error\n");
+            PRINT_ERR("register blkdev partion error\n");
             return ret;
         }
     } else {
@@ -322,7 +322,7 @@ static INT32 CharDriverRegisterOperate(mtd_partition *newNode,
 
         ret = register_driver(newNode->chardriver_name, param->char_ops, RWE_RW_RW, newNode);
         if (ret) {
-            PRINT_ERR("register chardev partition error\n");
+            PRINT_ERR("register chardev partion error\n");
             free(newNode->chardriver_name);
             newNode->chardriver_name = NULL;
             return ret;
@@ -340,7 +340,7 @@ static INT32 BlockDriverUnregister(mtd_partition *node)
     if (node->blockdriver_name != NULL) {
         ret = unregister_blockdriver(node->blockdriver_name);
         if (ret == -EBUSY) {
-            PRINT_ERR("unregister blkdev partition error:%d\n", ret);
+            PRINT_ERR("unregister blkdev partion error:%d\n", ret);
             return ret;
         }
         free(node->blockdriver_name);
@@ -356,7 +356,7 @@ static INT32 CharDriverUnregister(mtd_partition *node)
     if (node->chardriver_name != NULL) {
         ret = unregister_driver(node->chardriver_name);
         if (ret == -EBUSY) {
-            PRINT_ERR("unregister chardev partition error:%d\n", ret);
+            PRINT_ERR("unregister chardev partion error:%d\n", ret);
             return ret;
         }
         free(node->chardriver_name);