!871 fix: newlib for liteos_a and clip for liteos_a_mini

Merge pull request !871 from Harylee/qemu

BUILD.gn

@@ -35,6 +35,7 @@ declare_args() {
   tee_enable = false
   liteos_name = "OHOS_Image"
   liteos_skip_make = false
+  liteos_is_mini = false
 }
 
 tee = ""
@@ -128,7 +129,9 @@ config("stdinc_config") {
     "-isystem",
     std_include,
   ]
-  cflags += [ "-nostdinc" ]
+  if (!defined(LOSCFG_LIBC_NEWLIB)) {
+    cflags += [ "-nostdinc" ]
+  }
   asmflags = cflags
 }
 
@@ -289,6 +292,7 @@ group("modules") {
     "security",
     "shell",
     "syscall",
+    "testsuites/kernel:kernel_test",
   ]
 
   deps += [
@@ -314,13 +318,17 @@ group("kernel") {
 }
 
 group("liteos_a") {
-  deps = [
-    ":apps",
-    ":kernel",
-    ":make",
-    ":tests",
-    "//prebuilts/lite/sysroot/build:strip",
-  ]
+  deps = [ ":kernel" ]
+  if (!liteos_is_mini) {
+    deps += [
+      ":apps",
+      ":tests",
+      "//prebuilts/lite/sysroot/build:strip",
+    ]
+    if (liteos_skip_make == false) {
+      deps += [ ":make" ]
+    }
+  }
 }
 
 executable("liteos") {
@@ -336,6 +344,17 @@ executable("liteos") {
     "-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")
@@ -347,7 +366,7 @@ executable("liteos") {
   } else {
     ldflags +=
         [ "-Wl,-T" + rebase_path("tools/build/liteos.ld", root_build_dir) ]
-    ldflags += [ "-Wl,-nostartfiles" ]
+    ldflags += [ "-nostartfiles" ]
     inputs = [ "tools/build/liteos.ld" ]
   }
 

README.md

@@ -62,18 +62,19 @@ The OpenHarmony LiteOS Cortex-A is a new-generation kernel developed based on th
 ## Constraints<a name="section119744591305"></a>
 
 -   Programming languages: C and C++
--   Applicable development boards: Hi3516D V300
--   Hi3516D V300 uses the FAT file system by default.
+-   Applicable development boards: Hi3518E V300 and Hi3516D V300
+-   Hi3518E V300 uses the JFFS2 file system by default, and Hi3516D V300 uses the FAT file system by default.
 
 ## Usage<a name="section741617511812"></a>
 
-OpenHarmony LiteOS Cortex-A supports the  [Hi3516D V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-introduction-hi3516.md). You can develop and run your applications based on this development board.
+OpenHarmony LiteOS Cortex-A supports the  [Hi3518E V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-introduction-hi3518.md)  and  [Hi3516D V300](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-introduction-hi3516.md). You can develop and run your applications based on both development boards.
 
 ### Preparations<a name="section1579912573329"></a>
 
 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.md)
+-   [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).
 
 ### Source Code Acquisition<a name="section11443189655"></a>
@@ -84,6 +85,8 @@ 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 Hi3516](https://gitee.com/openharmony/docs/blob/master/en/device-dev/quick-start/quickstart-lite-steps-hi3516-running.md)
 
 ## Repositories Involved<a name="section1371113476307"></a>

README_zh-HK.md

@@ -62,18 +62,19 @@ OpenHarmony LiteOS-A內核是基於Huawei LiteOS內核演進發展的新一代
 ## 約束<a name="section119744591305"></a>
 
 - 開發語言：C/C++；
-- 適用於Hi3516DV300單板；
-- Hi3516DV300默認使用FAT文件系統。
+- 適用於Hi3518EV300、Hi3516DV300單板；
+- Hi3518EV300默認使用jffs2文件系統，Hi3516DV300默認使用FAT文件系統。
 
 ## 使用說明<a name="section741617511812"></a>
 
-OpenHarmony LiteOS-A內核支持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/quickstart-lite-introduction-hi3518.md)）、Hi3516DV300（[介紹](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3516.md)）單板，開發者可基於兩種單板開發運行自己的應用程序。
 
 ### 準備<a name="section1579912573329"></a>
 
 開發者需要在Linux上搭建編譯環境：
 
-- [編譯環境凖備](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup.md);
+- [編譯環境凖備](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-package-environment.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)。
 
 ### 獲取源碼<a name="section11443189655"></a>
@@ -84,6 +85,8 @@ OpenHarmony LiteOS-A內核支持Hi3516DV300（[介紹](https://gitee.com/openhar
 
 開發者開發第一個應用程序可參考：
 
+- [helloworld for Hi3518EV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-running.md)；
+
 - [helloworld for Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-running.md)。
 
 ## 相關倉<a name="section1371113476307"></a>

README_zh.md

@@ -61,18 +61,19 @@ OpenHarmony LiteOS-A内核是基于Huawei LiteOS内核演进发展的新一代
 ## 约束<a name="section119744591305"></a>
 
 -   开发语言：C/C++；
--   适用于Hi3516DV300单板；
--   Hi3516DV300默认使用FAT文件系统。
+-   适用于Hi3518EV300、Hi3516DV300单板；
+-   Hi3518EV300默认使用jffs2文件系统，Hi3516DV300默认使用FAT文件系统。
 
 ## 使用说明<a name="section741617511812"></a>
 
-OpenHarmony LiteOS-A内核支持[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/quickstart-lite-introduction-hi3518.md)）、Hi3516DV300（[介绍](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-introduction-hi3516.md)）单板，开发者可基于两种单板开发运行自己的应用程序。
 
 ### 准备<a name="section1579912573329"></a>
 
 开发者需要在Linux上搭建编译环境：
 
--   [编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-env-setup.md);
+-   [编译环境准备](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-package-environment.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)。
 
 ### 获取源码<a name="section11443189655"></a>
@@ -83,6 +84,8 @@ OpenHarmony LiteOS-A内核支持[Hi3516DV300](https://gitee.com/openharmony/docs
 
 开发者开发第一个应用程序可参考：
 
+-   [helloworld for Hi3518EV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3518-running.md)；
+
 -   [helloworld for Hi3516DV300](https://gitee.com/openharmony/docs/blob/master/zh-cn/device-dev/quick-start/quickstart-lite-steps-hi3516-running.md)。
 
 ## 相关仓<a name="section1371113476307"></a>

apps/shell/include/shell_pri.h

@@ -32,13 +32,15 @@
 #ifndef _SHELL_PRI_H
 #define _SHELL_PRI_H
 
+#include "shell.h"
+
 #ifdef __cplusplus
 #if __cplusplus
 extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-extern void *ShellEntry(void *argv);
+extern void ShellEntry(ShellCB *shellCB);
 extern void *ShellTask(void *argv);
 
 #ifdef __cplusplus

apps/shell/include/shmsg.h

@@ -32,6 +32,7 @@
 #ifndef _SHMSG_H
 #define _SHMSG_H
 
+#include "shell_list.h"
 #include "shell.h"
 
 #ifdef __cplusplus
@@ -61,8 +62,7 @@ extern "C" {
 
 typedef void (* OutputFunc)(const char *fmt, ...);
 extern int ShellTaskInit(ShellCB *shellCB);
-extern int ShellEntryInit(ShellCB *shellCB);
-extern void ChildExec(const char *cmdName, char *const paramArray[]);
+extern void ChildExec(const char *cmdName, char *const paramArray[], bool foreground);
 extern void ShellCmdLineParse(char c, OutputFunc outputFunc, ShellCB *shellCB);
 extern int ShellNotify(ShellCB *shellCB);
 

apps/shell/src/main.c

@@ -31,13 +31,16 @@
 
 #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;
 
@@ -77,13 +80,8 @@ static int OsShellCreateTask(ShellCB *shellCB)
         goto OUT;
     }
 
-    ret = ShellEntryInit(shellCB);
-    if (ret != SH_OK) {
-        goto OUT;
-    }
-
-    (void)pthread_join(shellCB->shellTaskHandle, NULL);
-    (void)pthread_join(shellCB->shellEntryHandle, NULL);
+    shellCB->shellEntryHandle = pthread_self();
+    return 0;
 
 OUT:
     ShellDeinit(shellCB);
@@ -98,7 +96,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);
+        ChildExec(argv[1], argv + 1, FALSE);
     }
     for (i = 0; argv[i]; i++) {
         len += strlen(argv[i]);
@@ -125,11 +123,22 @@ static int DoShellExec(char **argv)
     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;
@@ -165,7 +174,12 @@ int main(int argc, char **argv)
     sem_init(&shellCB->shellSem, 0, 0);
 
     g_shellCB = shellCB;
-    return OsShellCreateTask(shellCB);
+    ret = OsShellCreateTask(shellCB);
+    if (ret != SH_OK) {
+        goto ERR_OUT3;
+    }
+
+    ShellEntry(shellCB);
 
 ERR_OUT3:
     (void)pthread_mutex_destroy(&shellCB->historyMutex);

apps/shell/src/shmsg.c

@@ -351,7 +351,7 @@ char *GetCmdName(const char *cmdline, unsigned int len)
     return cmdName;
 }
 
-void ChildExec(const char *cmdName, char *const paramArray[])
+void ChildExec(const char *cmdName, char *const paramArray[], bool foreground)
 {
     int ret;
     pid_t gid;
@@ -367,10 +367,12 @@ void ChildExec(const char *cmdName, char *const paramArray[])
         exit(1);
     }
 
-    ret = tcsetpgrp(STDIN_FILENO, gid);
-    if (ret != 0) {
-        printf("tcsetpgrp failed, errno %d\n", errno);
-        exit(1);
+    if (!foreground) {
+        ret = tcsetpgrp(STDIN_FILENO, gid);
+        if (ret != 0) {
+            printf("tcsetpgrp failed, errno %d\n", errno);
+            exit(1);
+        }
     }
 
     ret = execve(cmdName, paramArray, NULL);
@@ -404,20 +406,30 @@ int CheckExit(const char *cmdName, const CmdParsed *cmdParsed)
     exit(ret);
 }
 
-static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len, const CmdParsed *cmdParsed)
+static void DoCmdExec(const char *cmdName, const char *cmdline, unsigned int len, 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);
+            ChildExec(cmdParsed->paramArray[0], cmdParsed->paramArray, foreground);
         } else {
-            waitpid(forkPid, 0, 0);
+            if (!foreground) {
+                (void)waitpid(forkPid, 0, 0);
+            }
             ret = tcsetpgrp(STDIN_FILENO, getpid());
             if (ret != 0) {
                 printf("tcsetpgrp failed, errno %d\n", errno);
@@ -567,20 +579,10 @@ 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) {
-        /* recycle zombine child process */
-        RecycleZombieChild();
-        buf = GetCmdline(shellCB);
+        char *buf = GetCmdline(shellCB);
         if (buf == NULL) {
             break;
         }
@@ -654,25 +656,19 @@ static int ShellKernelReg(unsigned int shellHandle)
     return ioctl(STDIN_FILENO, CONSOLE_CONTROL_REG_USERTASK, shellHandle);
 }
 
-void *ShellEntry(void *argv)
+void ShellEntry(ShellCB *shellCB)
 {
     char ch;
     int ret;
     int n;
     pid_t tid = syscall(__NR_gettid);
-    ShellCB *shellCB = (ShellCB *)argv;
 
     if (shellCB == NULL) {
-        return NULL;
+        return;
     }
 
     (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");
@@ -685,32 +681,5 @@ void *ShellEntry(void *argv)
             ShellCmdLineParse(ch, (OutputFunc)printf, shellCB);
         }
     }
-    return NULL;
+    return;
 }
-
-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;
-}
-

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(UINT32 index);
-extern UINT32 OsGetHwiFormCnt(UINT32 index);
+extern VOID OsIncHwiFormCnt(UINT16 cpuid, UINT32 index);
+extern UINT32 OsGetHwiFormCnt(UINT16 cpuid, UINT32 index);
 extern CHAR *OsGetHwiFormName(UINT32 index);
 extern VOID OsInterrupt(UINT32 intNum);
 extern VOID OsSyscallHandleInit(VOID);

arch/arm/arm/src/los_exc.c

@@ -74,7 +74,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,6 +88,7 @@ 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
@@ -112,11 +113,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;
@@ -516,13 +517,22 @@ VOID OsDumpContextMem(const ExcContext *excBufAddr)
         return;
     }
 
-    for (excReg = &(excBufAddr->R0); count <= DUMPREGS; excReg++, count++) {
+    for (excReg = &(excBufAddr->R0); count < COM_REGS; excReg++, count++) {
         if (IS_VALID_ADDR(*excReg)) {
             PrintExcInfo("\ndump mem around R%u:%p", 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)));
@@ -531,11 +541,11 @@ 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);
 #endif
@@ -556,15 +566,15 @@ 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
 
 #ifdef LOSCFG_KERNEL_SMP
@@ -645,6 +655,7 @@ 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;
@@ -655,6 +666,7 @@ 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++) {
@@ -979,14 +991,14 @@ VOID OsDataAbortExcHandleEntry(ExcContext *excBufAddr)
 #define EXC_WAIT_INTER 50U
 #define EXC_WAIT_TIME  2000U
 
-STATIC VOID WaitAllCpuStop(UINT32 cpuID)
+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) && !OsCpuStatusIsHalt(i)) {
                 LOS_Mdelay(EXC_WAIT_INTER);
                 time += EXC_WAIT_INTER;
                 break;
@@ -1000,19 +1012,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);
@@ -1021,7 +1033,7 @@ STATIC VOID OsWaitOtherCoresHandleExcEnd(UINT32 currCpuID)
 
 STATIC VOID OsCheckAllCpuStatus(VOID)
 {
-    UINT32 currCpuID = ArchCurrCpuid();
+    UINT32 currCpuid = ArchCurrCpuid();
     UINT32 ret, target;
 
     OsCpuStatusSet(CPU_EXC);
@@ -1029,17 +1041,17 @@ STATIC VOID OsCheckAllCpuStatus(VOID)
 
     LOS_SpinLock(&g_excSerializerSpin);
     /* Only the current CPU anomaly */
-    if (g_currHandleExcCpuID == INVALID_CPUID) {
-        g_currHandleExcCpuID = currCpuID;
+    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
          */
@@ -1051,12 +1063,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);
@@ -1066,7 +1078,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
 }
@@ -1077,7 +1089,7 @@ STATIC VOID OsCheckCpuStatus(VOID)
 #ifdef LOSCFG_KERNEL_SMP
     OsCheckAllCpuStatus();
 #else
-    g_currHandleExcCpuID = ArchCurrCpuid();
+    g_currHandleExcCpuid = ArchCurrCpuid();
 #endif
 }
 

arch/arm/arm/src/los_hwi.c

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

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

@@ -121,8 +121,9 @@ 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)
-    bic     r0, #(1<<2 | 1<<0)
+    bic     r0, #(1 << 12)          /* i cache */
+    bic     r0, #(1 << 2)           /* d cache */
+    bic     r0, #(1 << 0)           /* mmu */
     mcr     p15, 0, r0, c1, c0, 0
 
     /* enable fpu+neon */
@@ -282,11 +283,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)
-    orr     r12, #(1 << 0)
+    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
+    orr     r12, #(1 << 0)                      /* mmu enable */
     bic     r12, #(1 << 1)
-    orr     r12, #(1 << 2)
-    orr     r12, #(1 << 12)
+    orr     r12, #(1 << 2)                     /* D cache enable */
+    orr     r12, #(1 << 12)                    /* I cache enable */
     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,8 +101,9 @@ __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)
-    bic     r0, #(1<<2 | 1<<0)
+    bic     r0, #(1 << 12)          /* i cache */
+    bic     r0, #(1 << 2)           /* d cache */
+    bic     r0, #(1 << 0)           /* mmu */
     mcr     p15, 0, r0, c1, c0, 0
 
     /* enable fpu+neon */
@@ -269,11 +270,11 @@ mmu_setup:
     isb
 
     mrc     p15, 0, r12, c1, c0, 0
-    bic     r12, #(1 << 29 | 1 << 28)
-    orr     r12, #(1 << 0)
+    bic     r12, #(1 << 29 | 1 << 28)           /* Disable TRE/AFE */
+    orr     r12, #(1 << 0)                      /* mmu enable */
     bic     r12, #(1 << 1)
-    orr     r12, #(1 << 2)
-    orr     r12, #(1 << 12)
+    orr     r12, #(1 << 2)                      /* D cache enable */
+    orr     r12, #(1 << 12)                     /* I cache enable */
     mcr     p15, 0, r12, c1, c0, 0              /* Set SCTLR with r12: Turn on the MMU, I/D cache Disable TRE/AFE */
     isb
 

arch/arm/arm/src/strncpy_from_user.c

@@ -46,7 +46,7 @@ INT32 LOS_StrncpyFromUser(CHAR *dst, const CHAR *src, INT32 count)
     }
 
     maxCount = (LOS_IsUserAddressRange((VADDR_T)(UINTPTR)src, (size_t)count)) ? \
-                count : (USER_ASPACE_TOP_MAX - (UINTPTR)src);
+                count : (INT32)(USER_ASPACE_TOP_MAX - (UINTPTR)src);
 
     for (i = 0; i < maxCount; ++i) {
         if (LOS_GetUser(&character, src + offset) != LOS_OK) {

compat/posix/src/pthread.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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 = ((LosTaskCB *)(OsCurrTaskGet()))->priority;
+            outAttr->schedparam.sched_priority = LOS_TaskPriGet(OsCurrTaskGet()->taskID);
         } else {
             outAttr->schedpolicy = self->attr.schedpolicy;
             outAttr->schedparam  = self->attr.schedparam;

compat/posix/src/time.c

@@ -387,9 +387,16 @@ 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);
@@ -718,6 +725,7 @@ typedef struct {
 
 static VOID SwtmrProc(UINTPTR tmrArg)
 {
+#ifdef LOSCFG_KERNEL_VM
     INT32 sig, ret;
     UINT32 intSave;
     pid_t pid;
@@ -761,9 +769,47 @@ static VOID SwtmrProc(UINTPTR tmrArg)
     return;
 EXIT:
     PRINT_ERR("Dispatch signals failed!, ret: %d\r\n", ret);
+#endif
     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;
@@ -823,6 +869,7 @@ int timer_delete(timer_t timerID)
 {
     UINT16 swtmrID = (UINT16)(UINTPTR)timerID;
     VOID *arg = NULL;
+    UINTPTR swtmrProc;
 
 #ifdef LOSCFG_SECURITY_VID
     swtmrID = GetRidByVid(swtmrID);
@@ -832,10 +879,11 @@ 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 (arg != NULL) {
+    if ((swtmrProc == (UINTPTR)SwtmrProc) && (arg != NULL)) {
         free(arg);
     }
 
@@ -979,7 +1027,11 @@ 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);
 }

drivers/block/disk/include/disk.h

@@ -163,7 +163,7 @@ extern "C" {
 #define DISK_ATA_GET_MODEL      21  /* Get model name */
 #define DISK_ATA_GET_SN         22  /* Get serial number */
 
-#ifdef LOSCFG_FS_FAT_CACHE
+#ifndef LOSCFG_FS_FAT_CACHE
 #define DISK_DIRECT_BUFFER_SIZE 4   /* los_disk direct io buffer when bcache is off */
 #endif
 

fs/BUILD.gn

@@ -33,7 +33,6 @@ group("fs") {
   deps = [
     "fat",
     "fat/virpart",
-    "jffs2",
     "nfs",
     "patchfs",
     "proc",

fs/jffs2/BUILD.gn

@@ -31,86 +31,19 @@ import("//kernel/liteos_a/liteos.gni")
 
 module_switch = defined(LOSCFG_FS_JFFS)
 module_name = get_path_info(rebase_path("."), "name")
-linux_path = rebase_path("//kernel/linux/linux-5.10")
-out_path = rebase_path(target_out_dir)
-
 kernel_module(module_name) {
-  patch_path = rebase_path(".")
-  cmd = "if [ -d ${out_path}/jffs2_build ]; then rm -r ${out_path}/jffs2_build; fi && mkdir -p ${out_path}/jffs2_build/fs"
-  cmd += " && cp ${linux_path}/fs/jffs2 ${out_path}/jffs2_build/fs/. -r"
-  cmd += " && pushd ${out_path}/jffs2_build/"
-  cmd += " && patch -p1 < ${patch_path}/jffs2.patch && popd"
-  exec_script("//build/lite/run_shell_cmd.py", [ cmd ])
-
   sources = [
     "src/jffs2_hash.c",
     "src/vfs_jffs2.c",
   ]
 
-  sources += [
-    "${out_path}/jffs2_build/fs/jffs2/background.c",
-    "${out_path}/jffs2_build/fs/jffs2/build.c",
-    "${out_path}/jffs2_build/fs/jffs2/compr.c",
-    "${out_path}/jffs2_build/fs/jffs2/compr_rtime.c",
-    "${out_path}/jffs2_build/fs/jffs2/compr_rubin.c",
-    "${out_path}/jffs2_build/fs/jffs2/compr_zlib.c",
-    "${out_path}/jffs2_build/fs/jffs2/debug.c",
-    "${out_path}/jffs2_build/fs/jffs2/dir.c",
-    "${out_path}/jffs2_build/fs/jffs2/erase.c",
-    "${out_path}/jffs2_build/fs/jffs2/file.c",
-    "${out_path}/jffs2_build/fs/jffs2/fs.c",
-    "${out_path}/jffs2_build/fs/jffs2/gc.c",
-    "${out_path}/jffs2_build/fs/jffs2/malloc.c",
-    "${out_path}/jffs2_build/fs/jffs2/nodelist.c",
-    "${out_path}/jffs2_build/fs/jffs2/nodemgmt.c",
-    "${out_path}/jffs2_build/fs/jffs2/read.c",
-    "${out_path}/jffs2_build/fs/jffs2/readinode.c",
-    "${out_path}/jffs2_build/fs/jffs2/scan.c",
-    "${out_path}/jffs2_build/fs/jffs2/summary.c",
-    "${out_path}/jffs2_build/fs/jffs2/super.c",
-    "${out_path}/jffs2_build/fs/jffs2/write.c",
-    "${out_path}/jffs2_build/fs/jffs2/writev.c",
-  ]
+  sources += LINUX_KERNEL_FS_JFFS2_SRC_FILES
 
-  include_dirs = [
-    "${out_path}/jffs2_build/fs",
-    "${out_path}/jffs2_build/fs/jffs2",
-  ]
+  include_dirs = LINUX_KERNEL_FS_JFFS2_INCLUDE_DIRS
 
   public_configs = [ ":public" ]
-
-  deps = [ ":cp_jffs2_src" ]
 }
 
 config("public") {
   include_dirs = [ "include" ]
 }
-
-action("cp_jffs2_src") {
-  script = "//build/lite/run_shell_cmd.py"
-
-  outputs = [
-    "${target_out_dir}/jffs2_build/fs/jffs2/background.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/build.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/compr.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/compr_rtime.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/compr_rubin.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/compr_zlib.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/debug.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/dir.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/erase.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/file.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/fs.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/gc.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/malloc.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/nodelist.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/nodemgmt.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/read.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/readinode.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/scan.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/summary.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/super.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/write.c",
-    "${target_out_dir}/jffs2_build/fs/jffs2/writev.c",
-  ]
-}

fs/jffs2/Makefile

@@ -31,51 +31,13 @@ include $(LITEOSTOPDIR)/config.mk
 
 MODULE_NAME := $(notdir $(shell pwd))
 
-LINUX_PATH := $(LITEOSTOPDIR)/../linux/linux-5.10
-LOCAL_PATH := $(shell pwd)
-TEMP_SRC_PATH := $(OUT)/jffs2_build
-
-LOCAL_SRCS := \
-		$(TEMP_SRC_PATH)/fs/jffs2/background.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/build.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/compr.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/compr_rtime.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/compr_rubin.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/compr_zlib.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/debug.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/dir.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/erase.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/file.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/fs.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/gc.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/malloc.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/nodelist.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/nodemgmt.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/read.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/readinode.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/scan.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/summary.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/super.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/write.c \
-		$(TEMP_SRC_PATH)/fs/jffs2/writev.c \
-		$(LOCAL_PATH)/src/jffs2_hash.c \
-		$(LOCAL_PATH)/src/vfs_jffs2.c \
-
+LOCAL_SRCS := $(wildcard src/*.c) \
+		$(wildcard $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2/*.c)
 LOCAL_INCLUDE := \
 		-I $(LITEOSTOPDIR)/fs/jffs2/include \
-		-I $(TEMP_SRC_PATH)/fs/jffs2 \
-		-I $(TEMP_SRC_PATH)/fs
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2 \
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
-.PHONY: patch patch_clean
-$(LOCAL_SRCS): patch
-
-patch: patch_clean
-	cp $(LINUX_PATH)/fs/jffs2 $(TEMP_SRC_PATH)/fs/. -r
-	cd $(TEMP_SRC_PATH) && patch -p1 < $(LOCAL_PATH)/jffs2.patch
-
-patch_clean:
-	$(HIDE) $(RM) -rf $(TEMP_SRC_PATH)
-
 include $(MODULE)
 

fs/rootfs/Kconfig

@@ -29,10 +29,9 @@ endchoice
 config BOOTENV_ADDR
     int "Address of boot command line (KB)"
     depends on PLATFORM_ROOTFS && (STORAGE_SPINOR || STORAGE_SPINAND || STORAGE_EMMC)
-    range 0 1024
     default 512
     help
-      Boot command line addr, range from 0 to 1MB.
+      Boot command line addr.
 
 config BOOTENV_RAM
     bool "Read bootenv from RAM"

fs/vfs/epoll/fs_epoll.c

@@ -164,23 +164,23 @@ static VOID DoEpollClose(struct epoll_head *epHead)
 }
 
 /**
- * epoll_create,
+ * epoll_create unsupported api
+ *
+ * epoll_create is implemented by calling epoll_create1, it's parameter 'size' is useless.
+ *
+ * epoll_create1,
  * The simple version of epoll does not use red-black trees,
  * so when fd is normal value (greater than 0),
  * actually allocated epoll can manage num of EPOLL_DEFAULT_SIZE
  *
- * @param size: not actually used
+ * @param flags: not actually used
  * @return epoll fd
  */
-int epoll_create(int size)
+int epoll_create1(int flags)
 {
+    (void)flags;
     int fd = -1;
 
-    if (size <= 0) {
-        set_errno(EINVAL);
-        return fd;
-    }
-
     struct epoll_head *epHead = (struct epoll_head *)malloc(sizeof(struct epoll_head));
     if (epHead == NULL) {
         set_errno(ENOMEM);

fs/vfs/include/epoll.h

@@ -72,7 +72,7 @@ struct epoll_event {
     epoll_data_t data;
 };
 
-int epoll_create(int size);
+int epoll_create1(int flags);
 int epoll_close(int epfd);
 int epoll_ctl(int epfd, int op, int fd, struct epoll_event *ev);
 int epoll_wait(int epfd, FAR struct epoll_event *evs, int maxevents, int timeout);

fs/vfs/operation/vfs_fallocate64.c

@@ -133,7 +133,7 @@ int fallocate64(int fd, int mode, off64_t offset, off64_t len)
         return VFS_ERROR;
     }
 
-    if (filep->f_oflags & O_DIRECTORY) {
+    if ((unsigned int)filep->f_oflags & O_DIRECTORY) {
         set_errno(EBADF);
         return VFS_ERROR;
     }

kernel/Kconfig

@@ -67,6 +67,12 @@ config PAGE_TABLE_FINE_LOCK
     help
       This option will enable fine lock for page table.
 
+config ENABLE_KERNEL_TEST
+    bool "Enable kernel test"
+    default n
+    help
+      This option will enable kernel test.
+
 ######################### config options of extended #####################
 source "kernel/extended/Kconfig"
 

kernel/base/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 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:
@@ -65,10 +65,12 @@ kernel_module(module_name) {
     "mp/los_mp.c",
     "mp/los_percpu.c",
     "mp/los_spinlock.c",
-    "mp/los_stat.c",
     "om/los_err.c",
-    "sched/sched_sq/los_sched.c",
-    "sched/sched_sq/los_sortlink.c",
+    "sched/los_idle.c",
+    "sched/los_priority.c",
+    "sched/los_sched.c",
+    "sched/los_sortlink.c",
+    "sched/los_statistics.c",
     "vm/los_vm_boot.c",
     "vm/los_vm_dump.c",
     "vm/los_vm_fault.c",

kernel/base/Makefile

@@ -37,7 +37,7 @@ LOCAL_SRCS := 	$(wildcard ipc/*.c) $(wildcard core/*.c) $(wildcard mem/membox/*.
 		$(wildcard misc/*.c)\
 		$(wildcard mem/tlsf/*.c) \
 		$(wildcard mp/*.c) \
-		$(wildcard sched/sched_sq/*.c) \
+		$(wildcard sched/*.c) \
 		$(wildcard vm/*.c)
 
 LOCAL_FLAGS := $(LITEOS_CFLAGS_INTERWORK)

kernel/base/core/los_process.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -87,7 +87,7 @@ VOID OsDeleteTaskFromProcess(LosTaskCB *taskCB)
     OsTaskInsertToRecycleList(taskCB);
 }
 
-UINT32 OsProcessAddNewTask(UINT32 pid, LosTaskCB *taskCB)
+UINT32 OsProcessAddNewTask(UINT32 pid, LosTaskCB *taskCB, SchedParam *param)
 {
     UINT32 intSave;
     UINT16 numCount;
@@ -100,12 +100,14 @@ UINT32 OsProcessAddNewTask(UINT32 pid, LosTaskCB *taskCB)
     if (OsProcessIsUserMode(processCB)) {
         taskCB->taskStatus |= OS_TASK_FLAG_USER_MODE;
         if (processCB->threadNumber > 0) {
-            taskCB->basePrio = OS_TCB_FROM_TID(processCB->threadGroupID)->basePrio;
+            LosTaskCB *task = OS_TCB_FROM_TID(processCB->threadGroupID);
+            task->ops->schedParamGet(task, param);
         } else {
-            taskCB->basePrio = OS_USER_PROCESS_PRIORITY_HIGHEST;
+            OsSchedProcessDefaultSchedParamGet(param->policy, param);
         }
     } else {
-        taskCB->basePrio = OsCurrTaskGet()->basePrio;
+        LosTaskCB *runTask = OsCurrTaskGet();
+        runTask->ops->schedParamGet(runTask, param);
     }
 
 #ifdef LOSCFG_KERNEL_VM
@@ -283,7 +285,7 @@ STATIC LosProcessCB *OsFindExitChildProcess(const LosProcessCB *processCB, INT32
 VOID OsWaitWakeTask(LosTaskCB *taskCB, UINT32 wakePID)
 {
     taskCB->waitID = wakePID;
-    OsSchedTaskWake(taskCB);
+    taskCB->ops->wake(taskCB);
 #ifdef LOSCFG_KERNEL_SMP
     LOS_MpSchedule(OS_MP_CPU_ALL);
 #endif
@@ -897,7 +899,7 @@ STATIC INLINE INT32 OsProcessSchedlerParamCheck(INT32 which, INT32 pid, UINT16 p
 }
 
 #ifdef LOSCFG_SECURITY_CAPABILITY
-STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, UINT16 prio)
+STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, const SchedParam *param, UINT16 prio)
 {
     LosProcessCB *runProcess = OsCurrProcessGet();
 
@@ -907,7 +909,7 @@ STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, UINT16 prio)
     }
 
     /* user mode process can reduce the priority of itself */
-    if ((runProcess->processID == processCB->processID) && (prio > OsCurrTaskGet()->basePrio)) {
+    if ((runProcess->processID == processCB->processID) && (prio > param->basePrio)) {
         return TRUE;
     }
 
@@ -921,31 +923,33 @@ STATIC BOOL OsProcessCapPermitCheck(const LosProcessCB *processCB, UINT16 prio)
 
 LITE_OS_SEC_TEXT INT32 OsSetProcessScheduler(INT32 which, INT32 pid, UINT16 prio, UINT16 policy)
 {
-    LosProcessCB *processCB = NULL;
-    BOOL needSched = FALSE;
+    SchedParam param = { 0 };
     UINT32 intSave;
-    INT32 ret;
 
-    ret = OsProcessSchedlerParamCheck(which, pid, prio, policy);
+    INT32 ret = OsProcessSchedlerParamCheck(which, pid, prio, policy);
     if (ret != LOS_OK) {
         return -ret;
     }
 
+    LosProcessCB *processCB = OS_PCB_FROM_PID(pid);
     SCHEDULER_LOCK(intSave);
-    processCB = OS_PCB_FROM_PID(pid);
     if (OsProcessIsInactive(processCB)) {
         ret = LOS_ESRCH;
         goto EXIT;
     }
 
 #ifdef LOSCFG_SECURITY_CAPABILITY
-    if (!OsProcessCapPermitCheck(processCB, prio)) {
+    if (!OsProcessCapPermitCheck(processCB, &param, prio)) {
         ret = LOS_EPERM;
         goto EXIT;
     }
 #endif
 
-    needSched = OsSchedModifyProcessSchedParam(pid, policy, prio);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(processCB->threadGroupID);
+    taskCB->ops->schedParamGet(taskCB, &param);
+    param.basePrio = prio;
+
+    BOOL needSched = taskCB->ops->schedParamModify(taskCB, &param);
     SCHEDULER_UNLOCK(intSave);
 
     LOS_MpSchedule(OS_MP_CPU_ALL);
@@ -991,8 +995,8 @@ LITE_OS_SEC_TEXT INT32 LOS_SetProcessPriority(INT32 pid, UINT16 prio)
 
 LITE_OS_SEC_TEXT INT32 OsGetProcessPriority(INT32 which, INT32 pid)
 {
-    INT32 prio;
     UINT32 intSave;
+    SchedParam param = { 0 };
     (VOID)which;
 
     if (OS_PID_CHECK_INVALID(pid)) {
@@ -1006,15 +1010,15 @@ LITE_OS_SEC_TEXT INT32 OsGetProcessPriority(INT32 which, INT32 pid)
     LosProcessCB *processCB = OS_PCB_FROM_PID(pid);
     SCHEDULER_LOCK(intSave);
     if (OsProcessIsUnused(processCB)) {
-        prio = -LOS_ESRCH;
-        goto OUT;
+        SCHEDULER_UNLOCK(intSave);
+        return -LOS_ESRCH;
     }
 
-    prio = (INT32)OS_TCB_FROM_TID(processCB->threadGroupID)->basePrio;
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(processCB->threadGroupID);
+    taskCB->ops->schedParamGet(taskCB, &param);
 
-OUT:
     SCHEDULER_UNLOCK(intSave);
-    return prio;
+    return param.basePrio;
 }
 
 LITE_OS_SEC_TEXT INT32 LOS_GetProcessPriority(INT32 pid)
@@ -1050,8 +1054,7 @@ STATIC VOID OsWaitInsertWaitListInOrder(LosTaskCB *runTask, LosProcessCB *proces
     /* if runTask->waitFlag == OS_PROCESS_WAIT_PRO,
      * this node is inserted directly into the header of the waitList
      */
-
-    (VOID)OsSchedTaskWait(list->pstNext, LOS_WAIT_FOREVER, TRUE);
+    (VOID)runTask->ops->wait(runTask, list->pstNext, LOS_WAIT_FOREVER);
     return;
 }
 
@@ -1202,13 +1205,10 @@ STATIC INT32 OsWait(INT32 pid, USER INT32 *status, USER siginfo_t *info, UINT32
     UINT32 ret;
     UINT32 intSave;
     LosProcessCB *childCB = NULL;
-    LosProcessCB *processCB = NULL;
-    LosTaskCB *runTask = NULL;
 
+    LosProcessCB *processCB = OsCurrProcessGet();
+    LosTaskCB *runTask = OsCurrTaskGet();
     SCHEDULER_LOCK(intSave);
-    processCB = OsCurrProcessGet();
-    runTask = OsCurrTaskGet();
-
     ret = OsWaitChildProcessCheck(processCB, pid, &childCB);
     if (ret != LOS_OK) {
         pid = -ret;
@@ -1725,47 +1725,37 @@ STATIC UINT32 OsCopyUser(LosProcessCB *childCB, LosProcessCB *parentCB)
     return LOS_OK;
 }
 
-STATIC VOID OsInitCopyTaskParam(LosProcessCB *childProcessCB, const CHAR *name, UINTPTR entry, UINT32 size,
-                                TSK_INIT_PARAM_S *childPara)
-{
-    LosTaskCB *mainThread = NULL;
-    UINT32 intSave;
-
-    SCHEDULER_LOCK(intSave);
-    mainThread = OsCurrTaskGet();
-
-    if (OsProcessIsUserMode(childProcessCB)) {
-        childPara->pfnTaskEntry = mainThread->taskEntry;
-        childPara->uwStackSize = mainThread->stackSize;
-        childPara->userParam.userArea = mainThread->userArea;
-        childPara->userParam.userMapBase = mainThread->userMapBase;
-        childPara->userParam.userMapSize = mainThread->userMapSize;
-    } else {
-        childPara->pfnTaskEntry = (TSK_ENTRY_FUNC)entry;
-        childPara->uwStackSize = size;
-    }
-    childPara->pcName = (CHAR *)name;
-    childPara->policy = mainThread->policy;
-    childPara->usTaskPrio = mainThread->priority;
-    childPara->processID = childProcessCB->processID;
-    if (mainThread->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN) {
-        childPara->uwResved = LOS_TASK_ATTR_JOINABLE;
-    }
-
-    SCHEDULER_UNLOCK(intSave);
-}
-
 STATIC UINT32 OsCopyTask(UINT32 flags, LosProcessCB *childProcessCB, const CHAR *name, UINTPTR entry, UINT32 size)
 {
     LosTaskCB *runTask = OsCurrTaskGet();
-    TSK_INIT_PARAM_S childPara = { 0 };
-    UINT32 ret;
-    UINT32 intSave;
-    UINT32 taskID;
+    TSK_INIT_PARAM_S taskParam = { 0 };
+    UINT32 ret, taskID, intSave;
+    SchedParam param = { 0 };
 
-    OsInitCopyTaskParam(childProcessCB, name, entry, size, &childPara);
+    SCHEDULER_LOCK(intSave);
+    if (OsProcessIsUserMode(childProcessCB)) {
+        taskParam.pfnTaskEntry = runTask->taskEntry;
+        taskParam.uwStackSize = runTask->stackSize;
+        taskParam.userParam.userArea = runTask->userArea;
+        taskParam.userParam.userMapBase = runTask->userMapBase;
+        taskParam.userParam.userMapSize = runTask->userMapSize;
+    } else {
+        taskParam.pfnTaskEntry = (TSK_ENTRY_FUNC)entry;
+        taskParam.uwStackSize = size;
+    }
+    if (runTask->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN) {
+        taskParam.uwResved = LOS_TASK_ATTR_JOINABLE;
+    }
 
-    ret = LOS_TaskCreateOnly(&taskID, &childPara);
+    runTask->ops->schedParamGet(runTask, &param);
+    SCHEDULER_UNLOCK(intSave);
+
+    taskParam.pcName = (CHAR *)name;
+    taskParam.policy = param.policy;
+    taskParam.usTaskPrio = param.priority;
+    taskParam.processID = childProcessCB->processID;
+
+    ret = LOS_TaskCreateOnly(&taskID, &taskParam);
     if (ret != LOS_OK) {
         if (ret == LOS_ERRNO_TSK_TCB_UNAVAILABLE) {
             return LOS_EAGAIN;
@@ -1775,7 +1765,7 @@ STATIC UINT32 OsCopyTask(UINT32 flags, LosProcessCB *childProcessCB, const CHAR
 
     LosTaskCB *childTaskCB = OS_TCB_FROM_TID(taskID);
     childTaskCB->taskStatus = runTask->taskStatus;
-    childTaskCB->basePrio = runTask->basePrio;
+    childTaskCB->ops->schedParamModify(childTaskCB, &param);
     if (childTaskCB->taskStatus & OS_TASK_STATUS_RUNNING) {
         childTaskCB->taskStatus &= ~OS_TASK_STATUS_RUNNING;
     } else {
@@ -1882,6 +1872,7 @@ STATIC UINT32 OsChildSetProcessGroupAndSched(LosProcessCB *child, LosProcessCB *
     UINT32 ret;
     ProcessGroup *group = NULL;
 
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(child->threadGroupID);
     SCHEDULER_LOCK(intSave);
     if (run->group->groupID == OS_USER_PRIVILEGE_PROCESS_GROUP) {
         ret = OsSetProcessGroupIDUnsafe(child->processID, child->processID, &group);
@@ -1892,7 +1883,7 @@ STATIC UINT32 OsChildSetProcessGroupAndSched(LosProcessCB *child, LosProcessCB *
     }
 
     child->processStatus &= ~OS_PROCESS_STATUS_INIT;
-    OsSchedTaskEnQueue(OS_TCB_FROM_TID(child->threadGroupID));
+    taskCB->ops->enqueue(OsSchedRunqueue(), taskCB);
     SCHEDULER_UNLOCK(intSave);
 
     (VOID)LOS_MemFree(m_aucSysMem1, group);

kernel/base/core/los_swtmr.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -43,6 +43,9 @@
 #error "swtmr maxnum cannot be zero"
 #endif /* LOSCFG_BASE_CORE_SWTMR_LIMIT <= 0 */
 
+STATIC INLINE VOID SwtmrDelete(SWTMR_CTRL_S *swtmr);
+STATIC INLINE UINT64 SwtmrToStart(SWTMR_CTRL_S *swtmr, UINT16 cpuid);
+
 LITE_OS_SEC_BSS SWTMR_CTRL_S    *g_swtmrCBArray = NULL;     /* First address in Timer memory space */
 LITE_OS_SEC_BSS UINT8           *g_swtmrHandlerPool = NULL; /* Pool of Swtmr Handler */
 LITE_OS_SEC_BSS LOS_DL_LIST     g_swtmrFreeList;            /* Free list of Software Timer */
@@ -52,22 +55,232 @@ LITE_OS_SEC_BSS  SPIN_LOCK_INIT(g_swtmrSpin);
 #define SWTMR_LOCK(state)       LOS_SpinLockSave(&g_swtmrSpin, &(state))
 #define SWTMR_UNLOCK(state)     LOS_SpinUnlockRestore(&g_swtmrSpin, (state))
 
+typedef struct {
+    SortLinkAttribute swtmrSortLink;
+    LosTaskCB         *swtmrTask;           /* software timer task id */
+    LOS_DL_LIST       swtmrHandlerQueue;     /* software timer timeout queue id */
+} SwtmrRunqueue;
+
+STATIC SwtmrRunqueue g_swtmrRunqueue[LOSCFG_KERNEL_CORE_NUM];
+
+#ifdef LOSCFG_SWTMR_DEBUG
+#define OS_SWTMR_PERIOD_TO_CYCLE(period) (((UINT64)(period) * OS_NS_PER_TICK) / OS_NS_PER_CYCLE)
+STATIC SwtmrDebugData *g_swtmrDebugData = NULL;
+
+BOOL OsSwtmrDebugDataUsed(UINT32 swtmrID)
+{
+    if (swtmrID > LOSCFG_BASE_CORE_SWTMR_LIMIT) {
+        return FALSE;
+    }
+
+    return g_swtmrDebugData[swtmrID].swtmrUsed;
+}
+
+UINT32 OsSwtmrDebugDataGet(UINT32 swtmrID, SwtmrDebugData *data, UINT32 len, UINT8 *mode)
+{
+    UINT32 intSave;
+    errno_t ret;
+
+    if ((swtmrID > LOSCFG_BASE_CORE_SWTMR_LIMIT) || (data == NULL) ||
+        (mode == NULL) || (len < sizeof(SwtmrDebugData))) {
+        return LOS_NOK;
+    }
+
+    SWTMR_CTRL_S *swtmr = &g_swtmrCBArray[swtmrID];
+    SWTMR_LOCK(intSave);
+    ret = memcpy_s(data, len, &g_swtmrDebugData[swtmrID], sizeof(SwtmrDebugData));
+    *mode = swtmr->ucMode;
+    SWTMR_UNLOCK(intSave);
+    if (ret != EOK) {
+        return LOS_NOK;
+    }
+    return LOS_OK;
+}
+#endif
+
+STATIC VOID SwtmrDebugDataInit(VOID)
+{
+#ifdef LOSCFG_SWTMR_DEBUG
+    UINT32 size = sizeof(SwtmrDebugData) * LOSCFG_BASE_CORE_SWTMR_LIMIT;
+    g_swtmrDebugData = (SwtmrDebugData *)LOS_MemAlloc(m_aucSysMem1, size);
+    if (g_swtmrDebugData == NULL) {
+        PRINT_ERR("SwtmrDebugDataInit malloc failed!\n");
+        return;
+    }
+    (VOID)memset_s(g_swtmrDebugData, size, 0, size);
+#endif
+}
+
+STATIC INLINE VOID SwtmrDebugDataUpdate(SWTMR_CTRL_S *swtmr, UINT32 ticks, UINT32 times)
+{
+#ifdef LOSCFG_SWTMR_DEBUG
+    SwtmrDebugData *data = &g_swtmrDebugData[swtmr->usTimerID];
+    if (data->period != ticks) {
+        (VOID)memset_s(&data->base, sizeof(SwtmrDebugBase), 0, sizeof(SwtmrDebugBase));
+        data->period = ticks;
+    }
+    data->base.startTime = swtmr->startTime;
+    data->base.times += times;
+#endif
+}
+
+STATIC INLINE VOID SwtmrDebugDataStart(SWTMR_CTRL_S *swtmr, UINT16 cpuid)
+{
+#ifdef LOSCFG_SWTMR_DEBUG
+    SwtmrDebugData *data = &g_swtmrDebugData[swtmr->usTimerID];
+    data->swtmrUsed = TRUE;
+    data->handler = swtmr->pfnHandler;
+    data->cpuid = cpuid;
+#endif
+}
+
+STATIC INLINE VOID SwtmrDebugWaitTimeCalculate(UINT32 swtmrID, SwtmrHandlerItemPtr swtmrHandler)
+{
+#ifdef LOSCFG_SWTMR_DEBUG
+    SwtmrDebugBase *data = &g_swtmrDebugData[swtmrID].base;
+    swtmrHandler->swtmrID = swtmrID;
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    UINT64 waitTime = currTime - data->startTime;
+    data->waitTime += waitTime;
+    if (waitTime > data->waitTimeMax) {
+        data->waitTimeMax = waitTime;
+    }
+    data->readyStartTime = currTime;
+    data->waitCount++;
+#endif
+}
+
+STATIC INLINE VOID SwtmrDebugDataClear(UINT32 swtmrID)
+{
+#ifdef LOSCFG_SWTMR_DEBUG
+    (VOID)memset_s(&g_swtmrDebugData[swtmrID], sizeof(SwtmrDebugData), 0, sizeof(SwtmrDebugData));
+#endif
+}
+
+STATIC INLINE VOID SwtmrHandler(SwtmrHandlerItemPtr swtmrHandle)
+{
+#ifdef LOSCFG_SWTMR_DEBUG
+    UINT32 intSave;
+    SwtmrDebugBase *data = &g_swtmrDebugData[swtmrHandle->swtmrID].base;
+    UINT64 startTime = OsGetCurrSchedTimeCycle();
+#endif
+    swtmrHandle->handler(swtmrHandle->arg);
+#ifdef LOSCFG_SWTMR_DEBUG
+    UINT64 runTime = OsGetCurrSchedTimeCycle() - startTime;
+    SWTMR_LOCK(intSave);
+    data->runTime += runTime;
+    if (runTime > data->runTimeMax) {
+        data->runTimeMax = runTime;
+    }
+    runTime = startTime - data->readyStartTime;
+    data->readyTime += runTime;
+    if (runTime > data->readyTimeMax) {
+        data->readyTimeMax = runTime;
+    }
+    data->runCount++;
+    SWTMR_UNLOCK(intSave);
+#endif
+}
+
+STATIC INLINE VOID SwtmrWake(SwtmrRunqueue *srq, UINT64 startTime, SortLinkList *sortList)
+{
+    UINT32 intSave;
+    SWTMR_CTRL_S *swtmr = LOS_DL_LIST_ENTRY(sortList, SWTMR_CTRL_S, stSortList);
+    SwtmrHandlerItemPtr swtmrHandler = (SwtmrHandlerItemPtr)LOS_MemboxAlloc(g_swtmrHandlerPool);
+    LOS_ASSERT(swtmrHandler != NULL);
+
+    OsHookCall(LOS_HOOK_TYPE_SWTMR_EXPIRED, swtmr);
+
+    SWTMR_LOCK(intSave);
+    swtmrHandler->handler = swtmr->pfnHandler;
+    swtmrHandler->arg = swtmr->uwArg;
+    LOS_ListTailInsert(&srq->swtmrHandlerQueue, &swtmrHandler->node);
+    SwtmrDebugWaitTimeCalculate(swtmr->usTimerID, swtmrHandler);
+
+    if (swtmr->ucMode == LOS_SWTMR_MODE_ONCE) {
+        SwtmrDelete(swtmr);
+
+        if (swtmr->usTimerID < (OS_SWTMR_MAX_TIMERID - LOSCFG_BASE_CORE_SWTMR_LIMIT)) {
+            swtmr->usTimerID += LOSCFG_BASE_CORE_SWTMR_LIMIT;
+        } else {
+            swtmr->usTimerID %= LOSCFG_BASE_CORE_SWTMR_LIMIT;
+        }
+    } else if (swtmr->ucMode == LOS_SWTMR_MODE_NO_SELFDELETE) {
+        swtmr->ucState = OS_SWTMR_STATUS_CREATED;
+    } else {
+        swtmr->uwOverrun++;
+        swtmr->startTime = startTime;
+        (VOID)SwtmrToStart(swtmr, ArchCurrCpuid());
+    }
+
+    SWTMR_UNLOCK(intSave);
+}
+
+STATIC INLINE VOID ScanSwtmrTimeList(SwtmrRunqueue *srq)
+{
+    UINT32 intSave;
+    SortLinkAttribute *swtmrSortLink = &srq->swtmrSortLink;
+    LOS_DL_LIST *listObject = &swtmrSortLink->sortLink;
+
+    /*
+     * it needs to be carefully coped with, since the swtmr is in specific sortlink
+     * while other cores still has the chance to process it, like stop the timer.
+     */
+    LOS_SpinLockSave(&swtmrSortLink->spinLock, &intSave);
+
+    if (LOS_ListEmpty(listObject)) {
+        LOS_SpinUnlockRestore(&swtmrSortLink->spinLock, intSave);
+        return;
+    }
+    SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
+
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    while (sortList->responseTime <= currTime) {
+        sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
+        UINT64 startTime = GET_SORTLIST_VALUE(sortList);
+        OsDeleteNodeSortLink(swtmrSortLink, sortList);
+        LOS_SpinUnlockRestore(&swtmrSortLink->spinLock, intSave);
+
+        SwtmrWake(srq, startTime, sortList);
+
+        LOS_SpinLockSave(&swtmrSortLink->spinLock, &intSave);
+        if (LOS_ListEmpty(listObject)) {
+            break;
+        }
+
+        sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
+    }
+
+    LOS_SpinUnlockRestore(&swtmrSortLink->spinLock, intSave);
+    return;
+}
+
 STATIC VOID SwtmrTask(VOID)
 {
-    SwtmrHandlerItemPtr swtmrHandlePtr = NULL;
     SwtmrHandlerItem swtmrHandle;
-    UINT32 ret, swtmrHandlerQueue;
+    UINT32 intSave;
+    UINT64 waitTime;
 
-    swtmrHandlerQueue = OsSchedSwtmrHandlerQueueGet();
+    SwtmrRunqueue *srq = &g_swtmrRunqueue[ArchCurrCpuid()];
+    LOS_DL_LIST *head = &srq->swtmrHandlerQueue;
     for (;;) {
-        ret = LOS_QueueRead(swtmrHandlerQueue, &swtmrHandlePtr, sizeof(CHAR *), LOS_WAIT_FOREVER);
-        if ((ret == LOS_OK) && (swtmrHandlePtr != NULL)) {
-            swtmrHandle.handler = swtmrHandlePtr->handler;
-            swtmrHandle.arg = swtmrHandlePtr->arg;
+        waitTime = OsSortLinkGetNextExpireTime(OsGetCurrSchedTimeCycle(), &srq->swtmrSortLink);
+        if (waitTime != 0) {
+            SCHEDULER_LOCK(intSave);
+            srq->swtmrTask->ops->delay(srq->swtmrTask, waitTime);
+            OsHookCall(LOS_HOOK_TYPE_MOVEDTASKTODELAYEDLIST, srq->swtmrTask);
+            SCHEDULER_UNLOCK(intSave);
+        }
+
+        ScanSwtmrTimeList(srq);
+
+        while (!LOS_ListEmpty(head)) {
+            SwtmrHandlerItemPtr swtmrHandlePtr = LOS_DL_LIST_ENTRY(LOS_DL_LIST_FIRST(head), SwtmrHandlerItem, node);
+            LOS_ListDelete(&swtmrHandlePtr->node);
+
+            (VOID)memcpy_s(&swtmrHandle, sizeof(SwtmrHandlerItem), swtmrHandlePtr, sizeof(SwtmrHandlerItem));
             (VOID)LOS_MemboxFree(g_swtmrHandlerPool, swtmrHandlePtr);
-            if (swtmrHandle.handler != NULL) {
-                swtmrHandle.handler(swtmrHandle.arg);
-            }
+            SwtmrHandler(&swtmrHandle);
         }
     }
 }
@@ -94,6 +307,11 @@ STATIC UINT32 SwtmrTaskCreate(UINT16 cpuid, UINT32 *swtmrTaskID)
     return ret;
 }
 
+UINT32 OsSwtmrTaskIDGetByCpuid(UINT16 cpuid)
+{
+    return g_swtmrRunqueue[cpuid].swtmrTask->taskID;
+}
+
 BOOL OsIsSwtmrTask(const LosTaskCB *taskCB)
 {
     if (taskCB->taskEntry == (TSK_ENTRY_FUNC)SwtmrTask) {
@@ -111,51 +329,58 @@ LITE_OS_SEC_TEXT_INIT VOID OsSwtmrRecycle(UINT32 processID)
     }
 }
 
-LITE_OS_SEC_TEXT_INIT UINT32 OsSwtmrInit(VOID)
+STATIC UINT32 SwtmrBaseInit(VOID)
 {
-    UINT32 size;
-    UINT16 index;
     UINT32 ret;
-    SWTMR_CTRL_S *swtmr = NULL;
-    UINT32 swtmrHandlePoolSize;
-    UINT32 cpuid = ArchCurrCpuid();
-    UINT32 swtmrTaskID, swtmrHandlerQueue;
-
-    if (cpuid == 0) {
-        size = sizeof(SWTMR_CTRL_S) * LOSCFG_BASE_CORE_SWTMR_LIMIT;
-        swtmr = (SWTMR_CTRL_S *)LOS_MemAlloc(m_aucSysMem0, size); /* system resident resource */
-        if (swtmr == NULL) {
-            ret = LOS_ERRNO_SWTMR_NO_MEMORY;
-            goto ERROR;
-        }
-
-        (VOID)memset_s(swtmr, size, 0, size);
-        g_swtmrCBArray = swtmr;
-        LOS_ListInit(&g_swtmrFreeList);
-        for (index = 0; index < LOSCFG_BASE_CORE_SWTMR_LIMIT; index++, swtmr++) {
-            swtmr->usTimerID = index;
-            LOS_ListTailInsert(&g_swtmrFreeList, &swtmr->stSortList.sortLinkNode);
-        }
-
-        swtmrHandlePoolSize = LOS_MEMBOX_SIZE(sizeof(SwtmrHandlerItem), OS_SWTMR_HANDLE_QUEUE_SIZE);
-
-        g_swtmrHandlerPool = (UINT8 *)LOS_MemAlloc(m_aucSysMem1, swtmrHandlePoolSize); /* system resident resource */
-        if (g_swtmrHandlerPool == NULL) {
-            ret = LOS_ERRNO_SWTMR_NO_MEMORY;
-            goto ERROR;
-        }
-
-        ret = LOS_MemboxInit(g_swtmrHandlerPool, swtmrHandlePoolSize, sizeof(SwtmrHandlerItem));
-        if (ret != LOS_OK) {
-            ret = LOS_ERRNO_SWTMR_HANDLER_POOL_NO_MEM;
-            goto ERROR;
-        }
+    UINT32 size = sizeof(SWTMR_CTRL_S) * LOSCFG_BASE_CORE_SWTMR_LIMIT;
+    SWTMR_CTRL_S *swtmr = (SWTMR_CTRL_S *)LOS_MemAlloc(m_aucSysMem0, size); /* system resident resource */
+    if (swtmr == NULL) {
+        return LOS_ERRNO_SWTMR_NO_MEMORY;
     }
 
-    ret = LOS_QueueCreate(NULL, OS_SWTMR_HANDLE_QUEUE_SIZE, &swtmrHandlerQueue, 0, sizeof(CHAR *));
+    (VOID)memset_s(swtmr, size, 0, size);
+    g_swtmrCBArray = swtmr;
+    LOS_ListInit(&g_swtmrFreeList);
+    for (UINT16 index = 0; index < LOSCFG_BASE_CORE_SWTMR_LIMIT; index++, swtmr++) {
+        swtmr->usTimerID = index;
+        LOS_ListTailInsert(&g_swtmrFreeList, &swtmr->stSortList.sortLinkNode);
+    }
+
+    size = LOS_MEMBOX_SIZE(sizeof(SwtmrHandlerItem), OS_SWTMR_HANDLE_QUEUE_SIZE);
+    g_swtmrHandlerPool = (UINT8 *)LOS_MemAlloc(m_aucSysMem1, size); /* system resident resource */
+    if (g_swtmrHandlerPool == NULL) {
+        return LOS_ERRNO_SWTMR_NO_MEMORY;
+    }
+
+    ret = LOS_MemboxInit(g_swtmrHandlerPool, size, sizeof(SwtmrHandlerItem));
     if (ret != LOS_OK) {
-        ret = LOS_ERRNO_SWTMR_QUEUE_CREATE_FAILED;
-        goto ERROR;
+        return LOS_ERRNO_SWTMR_HANDLER_POOL_NO_MEM;
+    }
+
+    for (UINT16 index = 0; index < LOSCFG_KERNEL_CORE_NUM; index++) {
+        SwtmrRunqueue *srq = &g_swtmrRunqueue[index];
+        /* The linked list of all cores must be initialized at core 0 startup for load balancing */
+        OsSortLinkInit(&srq->swtmrSortLink);
+        LOS_ListInit(&srq->swtmrHandlerQueue);
+        srq->swtmrTask = NULL;
+    }
+
+    SwtmrDebugDataInit();
+
+    return LOS_OK;
+}
+
+LITE_OS_SEC_TEXT_INIT UINT32 OsSwtmrInit(VOID)
+{
+    UINT32 ret;
+    UINT32 cpuid = ArchCurrCpuid();
+    UINT32 swtmrTaskID;
+
+    if (cpuid == 0) {
+        ret = SwtmrBaseInit();
+        if (ret != LOS_OK) {
+            goto ERROR;
+        }
     }
 
     ret = SwtmrTaskCreate(cpuid, &swtmrTaskID);
@@ -164,25 +389,88 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsSwtmrInit(VOID)
         goto ERROR;
     }
 
-    OsSchedRunQueSwtmrInit(swtmrTaskID, swtmrHandlerQueue);
+    SwtmrRunqueue *srq = &g_swtmrRunqueue[cpuid];
+    srq->swtmrTask = OsGetTaskCB(swtmrTaskID);
     return LOS_OK;
 
 ERROR:
+    PRINT_ERR("OsSwtmrInit error! ret = %u\n", ret);
     (VOID)LOS_MemFree(m_aucSysMem0, g_swtmrCBArray);
     g_swtmrCBArray = NULL;
     (VOID)LOS_MemFree(m_aucSysMem1, g_swtmrHandlerPool);
     g_swtmrHandlerPool = NULL;
-    PRINT_ERR("OsSwtmrInit error! ret = %u\n", ret);
     return ret;
 }
 
-/*
- * Description: Start Software Timer
- * Input      : swtmr --- Need to start software timer
- */
-LITE_OS_SEC_TEXT VOID OsSwtmrStart(SWTMR_CTRL_S *swtmr)
+#ifdef LOSCFG_KERNEL_SMP
+STATIC INLINE VOID FindIdleSwtmrRunqueue(UINT16 *idleCpuid)
+{
+    SwtmrRunqueue *idleRq = &g_swtmrRunqueue[0];
+    UINT32 nodeNum = OsGetSortLinkNodeNum(&idleRq->swtmrSortLink);
+    UINT16 cpuid = 1;
+    do {
+        SwtmrRunqueue *srq = &g_swtmrRunqueue[cpuid];
+        UINT32 temp = OsGetSortLinkNodeNum(&srq->swtmrSortLink);
+        if (nodeNum > temp) {
+            *idleCpuid = cpuid;
+            nodeNum = temp;
+        }
+        cpuid++;
+    } while (cpuid < LOSCFG_KERNEL_CORE_NUM);
+}
+#endif
+
+STATIC INLINE VOID AddSwtmr2TimeList(SortLinkList *node, UINT64 responseTime, UINT16 cpuid)
+{
+    SwtmrRunqueue *srq = &g_swtmrRunqueue[cpuid];
+    OsAdd2SortLink(&srq->swtmrSortLink, node, responseTime, cpuid);
+}
+
+STATIC INLINE VOID DeSwtmrFromTimeList(SortLinkList *node)
+{
+#ifdef LOSCFG_KERNEL_SMP
+    UINT16 cpuid = OsGetSortLinkNodeCpuid(node);
+#else
+    UINT16 cpuid = 0;
+#endif
+    SwtmrRunqueue *srq = &g_swtmrRunqueue[cpuid];
+    OsDeleteFromSortLink(&srq->swtmrSortLink, node);
+    return;
+}
+
+STATIC VOID SwtmrAdjustCheck(UINT16 cpuid, UINT64 responseTime)
+{
+    UINT32 ret;
+    UINT32 intSave;
+    SwtmrRunqueue *srq = &g_swtmrRunqueue[cpuid];
+    SCHEDULER_LOCK(intSave);
+    if ((srq->swtmrTask == NULL) || !OsTaskIsBlocked(srq->swtmrTask)) {
+        SCHEDULER_UNLOCK(intSave);
+        return;
+    }
+
+    if (responseTime >= GET_SORTLIST_VALUE(&srq->swtmrTask->sortList)) {
+        SCHEDULER_UNLOCK(intSave);
+        return;
+    }
+
+    ret = OsSchedTimeoutQueueAdjust(srq->swtmrTask, responseTime);
+    SCHEDULER_UNLOCK(intSave);
+    if (ret != LOS_OK) {
+        return;
+    }
+
+    if (cpuid == ArchCurrCpuid()) {
+        OsSchedExpireTimeUpdate();
+    } else {
+        LOS_MpSchedule(CPUID_TO_AFFI_MASK(cpuid));
+    }
+}
+
+STATIC UINT64 SwtmrToStart(SWTMR_CTRL_S *swtmr, UINT16 cpuid)
 {
     UINT32 ticks;
+    UINT32 times = 0;
 
     if ((swtmr->uwOverrun == 0) && ((swtmr->ucMode == LOS_SWTMR_MODE_ONCE) ||
         (swtmr->ucMode == LOS_SWTMR_MODE_OPP) ||
@@ -193,75 +481,122 @@ LITE_OS_SEC_TEXT VOID OsSwtmrStart(SWTMR_CTRL_S *swtmr)
     }
     swtmr->ucState = OS_SWTMR_STATUS_TICKING;
 
-    OsSchedAddSwtmr2TimeList(&swtmr->stSortList, swtmr->startTime, ticks);
-    OsSchedUpdateExpireTime();
-    return;
+    UINT64 period = (UINT64)ticks * OS_CYCLE_PER_TICK;
+    UINT64 responseTime = swtmr->startTime + period;
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    if (responseTime < currTime) {
+        times = (UINT32)((currTime - swtmr->startTime) / period);
+        swtmr->startTime += times * period;
+        responseTime = swtmr->startTime + period;
+        PRINT_WARN("Swtmr already timeout! SwtmrID: %u\n", swtmr->usTimerID);
+    }
+
+    AddSwtmr2TimeList(&swtmr->stSortList, responseTime, cpuid);
+    SwtmrDebugDataUpdate(swtmr, ticks, times);
+    return responseTime;
+}
+
+/*
+ * Description: Start Software Timer
+ * Input      : swtmr --- Need to start software timer
+ */
+STATIC INLINE VOID SwtmrStart(SWTMR_CTRL_S *swtmr)
+{
+    UINT64 responseTime;
+    UINT16 idleCpu = 0;
+#ifdef LOSCFG_KERNEL_SMP
+    FindIdleSwtmrRunqueue(&idleCpu);
+#endif
+    swtmr->startTime = OsGetCurrSchedTimeCycle();
+    responseTime = SwtmrToStart(swtmr, idleCpu);
+
+    SwtmrDebugDataStart(swtmr, idleCpu);
+
+    SwtmrAdjustCheck(idleCpu, responseTime);
 }
 
 /*
  * Description: Delete Software Timer
  * Input      : swtmr --- Need to delete software timer, When using, Ensure that it can't be NULL.
  */
-STATIC INLINE VOID OsSwtmrDelete(SWTMR_CTRL_S *swtmr)
+STATIC INLINE VOID SwtmrDelete(SWTMR_CTRL_S *swtmr)
 {
     /* insert to free list */
     LOS_ListTailInsert(&g_swtmrFreeList, &swtmr->stSortList.sortLinkNode);
     swtmr->ucState = OS_SWTMR_STATUS_UNUSED;
     swtmr->uwOwnerPid = 0;
+
+    SwtmrDebugDataClear(swtmr->usTimerID);
 }
 
-VOID OsSwtmrWake(SchedRunQue *rq, UINT64 startTime, SortLinkList *sortList)
-{
-    SWTMR_CTRL_S *swtmr = LOS_DL_LIST_ENTRY(sortList, SWTMR_CTRL_S, stSortList);
-
-    OsHookCall(LOS_HOOK_TYPE_SWTMR_EXPIRED, swtmr);
-    LOS_SpinLock(&g_swtmrSpin);
-    SwtmrHandlerItemPtr swtmrHandler = (SwtmrHandlerItemPtr)LOS_MemboxAlloc(g_swtmrHandlerPool);
-    if (swtmrHandler != NULL) {
-        swtmrHandler->handler = swtmr->pfnHandler;
-        swtmrHandler->arg = swtmr->uwArg;
-
-        if (LOS_QueueWrite(rq->swtmrHandlerQueue, swtmrHandler, sizeof(CHAR *), LOS_NO_WAIT)) {
-            (VOID)LOS_MemboxFree(g_swtmrHandlerPool, swtmrHandler);
-        }
-    }
-
-    if (swtmr->ucMode == LOS_SWTMR_MODE_ONCE) {
-        OsSwtmrDelete(swtmr);
-
-        if (swtmr->usTimerID < (OS_SWTMR_MAX_TIMERID - LOSCFG_BASE_CORE_SWTMR_LIMIT)) {
-            swtmr->usTimerID += LOSCFG_BASE_CORE_SWTMR_LIMIT;
-        } else {
-            swtmr->usTimerID %= LOSCFG_BASE_CORE_SWTMR_LIMIT;
-        }
-    } else if (swtmr->ucMode == LOS_SWTMR_MODE_NO_SELFDELETE) {
-        swtmr->ucState = OS_SWTMR_STATUS_CREATED;
-    } else {
-        swtmr->uwOverrun++;
-        swtmr->startTime = startTime;
-        OsSwtmrStart(swtmr);
-    }
-
-    LOS_SpinUnlock(&g_swtmrSpin);
-}
-
-VOID OsSwtmrRestart(UINT64 startTime, SortLinkList *sortList)
+STATIC INLINE VOID SwtmrRestart(UINT64 startTime, SortLinkList *sortList, UINT16 cpuid)
 {
     UINT32 intSave;
 
     SWTMR_CTRL_S *swtmr = LOS_DL_LIST_ENTRY(sortList, SWTMR_CTRL_S, stSortList);
     SWTMR_LOCK(intSave);
     swtmr->startTime = startTime;
-    OsSwtmrStart(swtmr);
+    (VOID)SwtmrToStart(swtmr, cpuid);
     SWTMR_UNLOCK(intSave);
 }
 
+VOID OsSwtmrResponseTimeReset(UINT64 startTime)
+{
+    UINT16 cpuid = ArchCurrCpuid();
+    SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[cpuid].swtmrSortLink;
+    LOS_DL_LIST *listHead = &swtmrSortLink->sortLink;
+    LOS_DL_LIST *listNext = listHead->pstNext;
+
+    LOS_SpinLock(&swtmrSortLink->spinLock);
+    while (listNext != listHead) {
+        SortLinkList *sortList = LOS_DL_LIST_ENTRY(listNext, SortLinkList, sortLinkNode);
+        OsDeleteNodeSortLink(swtmrSortLink, sortList);
+        LOS_SpinUnlock(&swtmrSortLink->spinLock);
+
+        SwtmrRestart(startTime, sortList, cpuid);
+
+        LOS_SpinLock(&swtmrSortLink->spinLock);
+        listNext = listNext->pstNext;
+    }
+    LOS_SpinUnlock(&swtmrSortLink->spinLock);
+}
+
+STATIC INLINE BOOL SwtmrRunqueueFind(SortLinkAttribute *swtmrSortLink, SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
+{
+    LOS_DL_LIST *listObject = &swtmrSortLink->sortLink;
+    LOS_DL_LIST *list = listObject->pstNext;
+
+    LOS_SpinLock(&swtmrSortLink->spinLock);
+    while (list != listObject) {
+        SortLinkList *listSorted = LOS_DL_LIST_ENTRY(list, SortLinkList, sortLinkNode);
+        if (checkFunc((UINTPTR)listSorted, arg)) {
+            LOS_SpinUnlock(&swtmrSortLink->spinLock);
+            return TRUE;
+        }
+        list = list->pstNext;
+    }
+
+    LOS_SpinUnlock(&swtmrSortLink->spinLock);
+    return FALSE;
+}
+
+STATIC BOOL SwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
+{
+    for (UINT16 cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
+        SortLinkAttribute *swtmrSortLink = &g_swtmrRunqueue[ArchCurrCpuid()].swtmrSortLink;
+        if (SwtmrRunqueueFind(swtmrSortLink, checkFunc, arg)) {
+            return TRUE;
+        }
+    }
+    return FALSE;
+}
+
 BOOL OsSwtmrWorkQueueFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
 {
     UINT32 intSave;
 
     SWTMR_LOCK(intSave);
-    BOOL find = OsSchedSwtmrTimeListFind(checkFunc, arg);
+    BOOL find = SwtmrTimeListFind(checkFunc, arg);
     SWTMR_UNLOCK(intSave);
     return find;
 }
@@ -273,7 +608,8 @@ BOOL OsSwtmrWorkQueueFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg)
 LITE_OS_SEC_TEXT UINT32 OsSwtmrGetNextTimeout(VOID)
 {
     UINT64 currTime = OsGetCurrSchedTimeCycle();
-    UINT64 time = (OsSortLinkGetNextExpireTime(currTime, &OsSchedRunQue()->swtmrSortLink) / OS_CYCLE_PER_TICK);
+    SwtmrRunqueue *srq = &g_swtmrRunqueue[ArchCurrCpuid()];
+    UINT64 time = (OsSortLinkGetNextExpireTime(currTime, &srq->swtmrSortLink) / OS_CYCLE_PER_TICK);
     if (time > OS_INVALID_VALUE) {
         time = OS_INVALID_VALUE;
     }
@@ -284,14 +620,12 @@ LITE_OS_SEC_TEXT UINT32 OsSwtmrGetNextTimeout(VOID)
  * Description: Stop of Software Timer interface
  * Input      : swtmr --- the software timer control handler
  */
-LITE_OS_SEC_TEXT STATIC VOID OsSwtmrStop(SWTMR_CTRL_S *swtmr)
+STATIC VOID SwtmrStop(SWTMR_CTRL_S *swtmr)
 {
-    OsSchedDeSwtmrFromTimeList(&swtmr->stSortList);
-
     swtmr->ucState = OS_SWTMR_STATUS_CREATED;
     swtmr->uwOverrun = 0;
 
-    OsSchedUpdateExpireTime();
+    DeSwtmrFromTimeList(&swtmr->stSortList);
 }
 
 /*
@@ -389,11 +723,10 @@ LITE_OS_SEC_TEXT UINT32 LOS_SwtmrStart(UINT16 swtmrID)
          * then start the swtmr again.
          */
         case OS_SWTMR_STATUS_TICKING:
-            OsSwtmrStop(swtmr);
+            SwtmrStop(swtmr);
             /* fall-through */
         case OS_SWTMR_STATUS_CREATED:
-            swtmr->startTime = OsGetCurrSchedTimeCycle();
-            OsSwtmrStart(swtmr);
+            SwtmrStart(swtmr);
             break;
         default:
             ret = LOS_ERRNO_SWTMR_STATUS_INVALID;
@@ -433,7 +766,7 @@ LITE_OS_SEC_TEXT UINT32 LOS_SwtmrStop(UINT16 swtmrID)
             ret = LOS_ERRNO_SWTMR_NOT_STARTED;
             break;
         case OS_SWTMR_STATUS_TICKING:
-            OsSwtmrStop(swtmr);
+            SwtmrStop(swtmr);
             break;
         default:
             ret = LOS_ERRNO_SWTMR_STATUS_INVALID;
@@ -511,10 +844,10 @@ LITE_OS_SEC_TEXT UINT32 LOS_SwtmrDelete(UINT16 swtmrID)
             ret = LOS_ERRNO_SWTMR_NOT_CREATED;
             break;
         case OS_SWTMR_STATUS_TICKING:
-            OsSwtmrStop(swtmr);
+            SwtmrStop(swtmr);
             /* fall-through */
         case OS_SWTMR_STATUS_CREATED:
-            OsSwtmrDelete(swtmr);
+            SwtmrDelete(swtmr);
             break;
         default:
             ret = LOS_ERRNO_SWTMR_STATUS_INVALID;

kernel/base/core/los_task.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -90,19 +90,23 @@ VOID OsSetMainTask()
 {
     UINT32 i;
     CHAR *name = "osMain";
+    SchedParam schedParam = { 0 };
+
+    schedParam.policy = LOS_SCHED_RR;
+    schedParam.basePrio = OS_PROCESS_PRIORITY_HIGHEST;
+    schedParam.priority = OS_TASK_PRIORITY_LOWEST;
 
     for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
         g_mainTask[i].taskStatus = OS_TASK_STATUS_UNUSED;
         g_mainTask[i].taskID = LOSCFG_BASE_CORE_TSK_LIMIT;
         g_mainTask[i].processID = OS_KERNEL_PROCESS_GROUP;
-        g_mainTask[i].basePrio = OS_TASK_PRIORITY_HIGHEST;
-        g_mainTask[i].priority = OS_TASK_PRIORITY_LOWEST;
 #ifdef LOSCFG_KERNEL_SMP_LOCKDEP
         g_mainTask[i].lockDep.lockDepth = 0;
         g_mainTask[i].lockDep.waitLock = NULL;
 #endif
         (VOID)strncpy_s(g_mainTask[i].taskName, OS_TCB_NAME_LEN, name, OS_TCB_NAME_LEN - 1);
         LOS_ListInit(&g_mainTask[i].lockList);
+        (VOID)OsSchedParamInit(&g_mainTask[i], schedParam.policy, &schedParam, NULL);
     }
 }
 
@@ -120,13 +124,11 @@ VOID OsTaskInsertToRecycleList(LosTaskCB *taskCB)
 
 LITE_OS_SEC_TEXT_INIT VOID OsTaskJoinPostUnsafe(LosTaskCB *taskCB)
 {
-    LosTaskCB *resumedTask = NULL;
-
     if (taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN) {
         if (!LOS_ListEmpty(&taskCB->joinList)) {
-            resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(taskCB->joinList)));
+            LosTaskCB *resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(taskCB->joinList)));
             OsTaskWakeClearPendMask(resumedTask);
-            OsSchedTaskWake(resumedTask);
+            resumedTask->ops->wake(resumedTask);
         }
     }
     taskCB->taskStatus |= OS_TASK_STATUS_EXIT;
@@ -144,7 +146,8 @@ LITE_OS_SEC_TEXT UINT32 OsTaskJoinPendUnsafe(LosTaskCB *taskCB)
 
     if ((taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN) && LOS_ListEmpty(&taskCB->joinList)) {
         OsTaskWaitSetPendMask(OS_TASK_WAIT_JOIN, taskCB->taskID, LOS_WAIT_FOREVER);
-        return OsSchedTaskWait(&taskCB->joinList, LOS_WAIT_FOREVER, TRUE);
+        LosTaskCB *runTask = OsCurrTaskGet();
+        return runTask->ops->wait(runTask, &taskCB->joinList, LOS_WAIT_FOREVER);
     }
 
     return LOS_EINVAL;
@@ -203,7 +206,7 @@ EXIT:
 
 UINT32 OsGetIdleTaskId(VOID)
 {
-    return OsSchedGetRunQueIdle();
+    return OsSchedRunqueueIdleGet();
 }
 
 LITE_OS_SEC_TEXT_INIT UINT32 OsIdleTaskCreate(VOID)
@@ -216,18 +219,21 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsIdleTaskCreate(VOID)
     taskInitParam.pfnTaskEntry = (TSK_ENTRY_FUNC)OsIdleTask;
     taskInitParam.uwStackSize = LOSCFG_BASE_CORE_TSK_IDLE_STACK_SIZE;
     taskInitParam.pcName = "Idle";
+    taskInitParam.policy = LOS_SCHED_IDLE;
     taskInitParam.usTaskPrio = OS_TASK_PRIORITY_LOWEST;
     taskInitParam.processID = OsGetIdleProcessID();
 #ifdef LOSCFG_KERNEL_SMP
     taskInitParam.usCpuAffiMask = CPUID_TO_AFFI_MASK(ArchCurrCpuid());
 #endif
     ret = LOS_TaskCreateOnly(&idleTaskID, &taskInitParam);
+    if (ret != LOS_OK) {
+        return ret;
+    }
     LosTaskCB *idleTask = OS_TCB_FROM_TID(idleTaskID);
     idleTask->taskStatus |= OS_TASK_FLAG_SYSTEM_TASK;
-    OsSchedRunQueIdleInit(idleTaskID);
-    OsSchedSetIdleTaskSchedParam(idleTask);
+    OsSchedRunqueueIdleInit(idleTaskID);
 
-    return ret;
+    return LOS_TaskResume(idleTaskID);
 }
 
 /*
@@ -369,12 +375,11 @@ STATIC VOID OsTaskResourcesToFree(LosTaskCB *taskCB)
 
 LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree()
 {
-    LosTaskCB *taskCB = NULL;
     UINT32 intSave;
 
     SCHEDULER_LOCK(intSave);
     while (!LOS_ListEmpty(&g_taskRecycleList)) {
-        taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecycleList));
+        LosTaskCB *taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_taskRecycleList));
         LOS_ListDelete(&taskCB->pendList);
         SCHEDULER_UNLOCK(intSave);
 
@@ -391,8 +396,6 @@ LITE_OS_SEC_TEXT VOID OsTaskCBRecycleToFree()
  */
 LITE_OS_SEC_TEXT_INIT VOID OsTaskEntry(UINT32 taskID)
 {
-    LosTaskCB *taskCB = NULL;
-
     LOS_ASSERT(!OS_TID_CHECK_INVALID(taskID));
 
     /*
@@ -403,7 +406,7 @@ LITE_OS_SEC_TEXT_INIT VOID OsTaskEntry(UINT32 taskID)
     LOS_SpinUnlock(&g_taskSpin);
     (VOID)LOS_IntUnLock();
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     taskCB->joinRetval = taskCB->taskEntry(taskCB->args[0], taskCB->args[1],
                                            taskCB->args[2], taskCB->args[3]); /* 2 & 3: just for args array index */
     if (!(taskCB->taskStatus & OS_TASK_FLAG_PTHREAD_JOIN)) {
@@ -463,10 +466,8 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskStackAlloc(VOID **topStack, UINT32 stack
     *topStack = (VOID *)LOS_MemAllocAlign(pool, stackSize, LOSCFG_STACK_POINT_ALIGN_SIZE);
 }
 
-LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskCBInitBase(LosTaskCB *taskCB,
-                                                   const VOID *stackPtr,
-                                                   const VOID *topStack,
-                                                   const TSK_INIT_PARAM_S *initParam)
+STATIC VOID TaskCBBaseInit(LosTaskCB *taskCB, const VOID *stackPtr, const VOID *topStack,
+                           const TSK_INIT_PARAM_S *initParam)
 {
     taskCB->stackPointer = (VOID *)stackPtr;
     taskCB->args[0]      = initParam->auwArgs[0]; /* 0~3: just for args array index */
@@ -475,7 +476,6 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskCBInitBase(LosTaskCB *taskCB,
     taskCB->args[3]      = initParam->auwArgs[3];
     taskCB->topOfStack   = (UINTPTR)topStack;
     taskCB->stackSize    = initParam->uwStackSize;
-    taskCB->priority     = initParam->usTaskPrio;
     taskCB->taskEntry    = initParam->pfnTaskEntry;
     taskCB->signal       = SIGNAL_NONE;
 
@@ -484,7 +484,6 @@ LITE_OS_SEC_TEXT_INIT STATIC VOID OsTaskCBInitBase(LosTaskCB *taskCB,
     taskCB->cpuAffiMask  = (initParam->usCpuAffiMask) ?
                             initParam->usCpuAffiMask : LOSCFG_KERNEL_CPU_MASK;
 #endif
-    taskCB->policy = (initParam->policy == LOS_SCHED_FIFO) ? LOS_SCHED_FIFO : LOS_SCHED_RR;
     taskCB->taskStatus = OS_TASK_STATUS_INIT;
     if (initParam->uwResved & LOS_TASK_ATTR_JOINABLE) {
         taskCB->taskStatus |= OS_TASK_FLAG_PTHREAD_JOIN;
@@ -500,10 +499,13 @@ STATIC UINT32 OsTaskCBInit(LosTaskCB *taskCB, const TSK_INIT_PARAM_S *initParam,
 {
     UINT32 ret;
     UINT32 numCount;
+    SchedParam schedParam = { 0 };
+    UINT16 policy = (initParam->policy == LOS_SCHED_NORMAL) ? LOS_SCHED_RR : initParam->policy;
 
-    OsTaskCBInitBase(taskCB, stackPtr, topStack, initParam);
+    TaskCBBaseInit(taskCB, stackPtr, topStack, initParam);
 
-    numCount = OsProcessAddNewTask(initParam->processID, taskCB);
+    schedParam.policy = policy;
+    numCount = OsProcessAddNewTask(initParam->processID, taskCB, &schedParam);
 #ifdef LOSCFG_KERNEL_VM
     taskCB->futex.index = OS_INVALID_VALUE;
     if (taskCB->taskStatus & OS_TASK_FLAG_USER_MODE) {
@@ -514,6 +516,11 @@ STATIC UINT32 OsTaskCBInit(LosTaskCB *taskCB, const TSK_INIT_PARAM_S *initParam,
     }
 #endif
 
+    ret = OsSchedParamInit(taskCB, policy, &schedParam, initParam);
+    if (ret != LOS_OK) {
+        return ret;
+    }
+
     if (initParam->pcName != NULL) {
         ret = (UINT32)OsSetTaskName(taskCB, initParam->pcName, FALSE);
         if (ret == LOS_OK) {
@@ -530,7 +537,6 @@ STATIC UINT32 OsTaskCBInit(LosTaskCB *taskCB, const TSK_INIT_PARAM_S *initParam,
 LITE_OS_SEC_TEXT LosTaskCB *OsGetFreeTaskCB(VOID)
 {
     UINT32 intSave;
-    LosTaskCB *taskCB = NULL;
 
     SCHEDULER_LOCK(intSave);
     if (LOS_ListEmpty(&g_losFreeTask)) {
@@ -539,7 +545,7 @@ LITE_OS_SEC_TEXT LosTaskCB *OsGetFreeTaskCB(VOID)
         return NULL;
     }
 
-    taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_losFreeTask));
+    LosTaskCB *taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&g_losFreeTask));
     LOS_ListDelete(LOS_DL_LIST_FIRST(&g_losFreeTask));
     SCHEDULER_UNLOCK(intSave);
 
@@ -550,8 +556,6 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreateOnly(UINT32 *taskID, TSK_INIT_PARAM_S
 {
     UINT32 intSave, errRet;
     VOID *topStack = NULL;
-    VOID *stackPtr = NULL;
-    LosTaskCB *taskCB = NULL;
     VOID *pool = NULL;
 
     errRet = OsTaskCreateParamCheck(taskID, initParam, &pool);
@@ -559,7 +563,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreateOnly(UINT32 *taskID, TSK_INIT_PARAM_S
         return errRet;
     }
 
-    taskCB = OsGetFreeTaskCB();
+    LosTaskCB *taskCB = OsGetFreeTaskCB();
     if (taskCB == NULL) {
         errRet = LOS_ERRNO_TSK_TCB_UNAVAILABLE;
         goto LOS_ERREND;
@@ -576,7 +580,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreateOnly(UINT32 *taskID, TSK_INIT_PARAM_S
         goto LOS_ERREND_REWIND_SYNC;
     }
 
-    stackPtr = OsTaskStackInit(taskCB->taskID, initParam->uwStackSize, topStack, TRUE);
+    VOID *stackPtr = OsTaskStackInit(taskCB->taskID, initParam->uwStackSize, topStack, TRUE);
     errRet = OsTaskCBInit(taskCB, initParam, stackPtr, topStack);
     if (errRet != LOS_OK) {
         goto LOS_ERREND_TCB_INIT;
@@ -630,7 +634,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskCreate(UINT32 *taskID, TSK_INIT_PARAM_S *in
     LosTaskCB *taskCB = OS_TCB_FROM_TID(*taskID);
 
     SCHEDULER_LOCK(intSave);
-    OsSchedTaskEnQueue(taskCB);
+    taskCB->ops->enqueue(OsSchedRunqueue(), taskCB);
     SCHEDULER_UNLOCK(intSave);
 
     /* in case created task not running on this core,
@@ -647,13 +651,13 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskResume(UINT32 taskID)
 {
     UINT32 intSave;
     UINT32 errRet;
-    LosTaskCB *taskCB = NULL;
+    BOOL needSched = FALSE;
 
     if (OS_TID_CHECK_INVALID(taskID)) {
         return LOS_ERRNO_TSK_ID_INVALID;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
 
     /* clear pending signal */
@@ -667,7 +671,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskResume(UINT32 taskID)
         OS_GOTO_ERREND();
     }
 
-    BOOL needSched = OsSchedResume(taskCB);
+    errRet = taskCB->ops->resume(taskCB, &needSched);
     SCHEDULER_UNLOCK(intSave);
 
     LOS_MpSchedule(OS_MP_CPU_ALL);
@@ -675,7 +679,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskResume(UINT32 taskID)
         LOS_Schedule();
     }
 
-    return LOS_OK;
+    return errRet;
 
 LOS_ERREND:
     SCHEDULER_UNLOCK(intSave);
@@ -723,9 +727,7 @@ LITE_OS_SEC_TEXT_INIT STATIC BOOL OsTaskSuspendCheckOnRun(LosTaskCB *taskCB, UIN
 LITE_OS_SEC_TEXT STATIC UINT32 OsTaskSuspend(LosTaskCB *taskCB)
 {
     UINT32 errRet;
-    UINT16 tempStatus;
-
-    tempStatus = taskCB->taskStatus;
+    UINT16 tempStatus = taskCB->taskStatus;
     if (tempStatus & OS_TASK_STATUS_UNUSED) {
         return LOS_ERRNO_TSK_NOT_CREATED;
     }
@@ -739,21 +741,19 @@ LITE_OS_SEC_TEXT STATIC UINT32 OsTaskSuspend(LosTaskCB *taskCB)
         return errRet;
     }
 
-    OsSchedSuspend(taskCB);
-    return LOS_OK;
+    return taskCB->ops->suspend(taskCB);
 }
 
 LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskSuspend(UINT32 taskID)
 {
     UINT32 intSave;
-    LosTaskCB *taskCB = NULL;
     UINT32 errRet;
 
     if (OS_TID_CHECK_INVALID(taskID)) {
         return LOS_ERRNO_TSK_ID_INVALID;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     if (taskCB->taskStatus & OS_TASK_FLAG_SYSTEM_TASK) {
         return LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK;
     }
@@ -842,11 +842,11 @@ LITE_OS_SEC_TEXT VOID OsInactiveTaskDelete(LosTaskCB *taskCB)
 
     OsTaskReleaseHoldLock(taskCB);
 
-    OsSchedTaskExit(taskCB);
+    taskCB->ops->exit(taskCB);
     if (taskStatus & OS_TASK_STATUS_PENDING) {
         LosMux *mux = (LosMux *)taskCB->taskMux;
         if (LOS_MuxIsValid(mux) == TRUE) {
-            OsMuxBitmapRestore(mux, taskCB, (LosTaskCB *)mux->owner);
+            OsMuxBitmapRestore(mux, NULL, taskCB);
         }
     }
 
@@ -872,6 +872,10 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskDelete(UINT32 taskID)
 
     LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     if (taskCB == OsCurrTaskGet()) {
+        if (!OsPreemptable()) {
+            return LOS_ERRNO_TSK_DELETE_LOCKED;
+        }
+
         OsRunningTaskToExit(taskCB, OS_PRO_EXIT_OK);
         return LOS_NOK;
     }
@@ -900,20 +904,22 @@ LITE_OS_SEC_TEXT_INIT UINT32 LOS_TaskDelete(UINT32 taskID)
 
 LOS_ERREND:
     SCHEDULER_UNLOCK(intSave);
+    if (ret == LOS_OK) {
+        LOS_Schedule();
+    }
     return ret;
 }
 
 LITE_OS_SEC_TEXT UINT32 LOS_TaskDelay(UINT32 tick)
 {
     UINT32 intSave;
-    LosTaskCB *runTask = NULL;
 
     if (OS_INT_ACTIVE) {
         PRINT_ERR("In interrupt not allow delay task!\n");
         return LOS_ERRNO_TSK_DELAY_IN_INT;
     }
 
-    runTask = OsCurrTaskGet();
+    LosTaskCB *runTask = OsCurrTaskGet();
     if (runTask->taskStatus & OS_TASK_FLAG_SYSTEM_TASK) {
         OsBackTrace();
         return LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK;
@@ -928,39 +934,37 @@ LITE_OS_SEC_TEXT UINT32 LOS_TaskDelay(UINT32 tick)
     }
 
     SCHEDULER_LOCK(intSave);
-    OsSchedDelay(runTask, tick);
+    UINT32 ret = runTask->ops->delay(runTask, OS_SCHED_TICK_TO_CYCLE(tick));
     OsHookCall(LOS_HOOK_TYPE_MOVEDTASKTODELAYEDLIST, runTask);
     SCHEDULER_UNLOCK(intSave);
-
-    return LOS_OK;
+    return ret;
 }
 
 LITE_OS_SEC_TEXT_MINOR UINT16 LOS_TaskPriGet(UINT32 taskID)
 {
     UINT32 intSave;
-    LosTaskCB *taskCB = NULL;
-    UINT16 priority;
+    SchedParam param = { 0 };
 
     if (OS_TID_CHECK_INVALID(taskID)) {
         return (UINT16)OS_INVALID;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         SCHEDULER_UNLOCK(intSave);
         return (UINT16)OS_INVALID;
     }
 
-    priority = taskCB->priority;
+    taskCB->ops->schedParamGet(taskCB, &param);
     SCHEDULER_UNLOCK(intSave);
-    return priority;
+    return param.priority;
 }
 
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskPriSet(UINT32 taskID, UINT16 taskPrio)
 {
     UINT32 intSave;
-    LosTaskCB *taskCB = NULL;
+    SchedParam param = { 0 };
 
     if (taskPrio > OS_TASK_PRIORITY_LOWEST) {
         return LOS_ERRNO_TSK_PRIOR_ERROR;
@@ -970,7 +974,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskPriSet(UINT32 taskID, UINT16 taskPrio)
         return LOS_ERRNO_TSK_ID_INVALID;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     if (taskCB->taskStatus & OS_TASK_FLAG_SYSTEM_TASK) {
         return LOS_ERRNO_TSK_OPERATE_SYSTEM_TASK;
     }
@@ -981,11 +985,15 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskPriSet(UINT32 taskID, UINT16 taskPrio)
         return LOS_ERRNO_TSK_NOT_CREATED;
     }
 
-    BOOL isReady = OsSchedModifyTaskSchedParam(taskCB, taskCB->policy, taskPrio);
+    taskCB->ops->schedParamGet(taskCB, &param);
+
+    param.priority = taskPrio;
+
+    BOOL needSched = taskCB->ops->schedParamModify(taskCB, &param);
     SCHEDULER_UNLOCK(intSave);
 
     LOS_MpSchedule(OS_MP_CPU_ALL);
-    if (isReady && OS_SCHEDULER_ACTIVE) {
+    if (needSched && OS_SCHEDULER_ACTIVE) {
         LOS_Schedule();
     }
     return LOS_OK;
@@ -1015,7 +1023,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskYield(VOID)
 
     SCHEDULER_LOCK(intSave);
     /* reset timeslice of yielded task */
-    OsSchedYield();
+    runTask->ops->yield(runTask);
     SCHEDULER_UNLOCK(intSave);
     return LOS_OK;
 }
@@ -1045,7 +1053,7 @@ LITE_OS_SEC_TEXT_MINOR VOID LOS_TaskUnlock(VOID)
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInfo)
 {
     UINT32 intSave;
-    LosTaskCB *taskCB = NULL;
+    SchedParam param = { 0 };
 
     if (taskInfo == NULL) {
         return LOS_ERRNO_TSK_PTR_NULL;
@@ -1055,7 +1063,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInf
         return LOS_ERRNO_TSK_ID_INVALID;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         SCHEDULER_UNLOCK(intSave);
@@ -1068,8 +1076,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskInfoGet(UINT32 taskID, TSK_INFO_S *taskInf
         taskInfo->uwSP = ArchSPGet();
     }
 
+    taskCB->ops->schedParamGet(taskCB, &param);
     taskInfo->usTaskStatus = taskCB->taskStatus;
-    taskInfo->usTaskPrio = taskCB->priority;
+    taskInfo->usTaskPrio = param.priority;
     taskInfo->uwStackSize = taskCB->stackSize;
     taskInfo->uwTopOfStack = taskCB->topOfStack;
     taskInfo->uwEventMask = taskCB->eventMask;
@@ -1113,7 +1122,6 @@ LITE_OS_SEC_TEXT BOOL OsTaskCpuAffiSetUnsafe(UINT32 taskID, UINT16 newCpuAffiMas
 
 LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuAffiSet(UINT32 taskID, UINT16 cpuAffiMask)
 {
-    LosTaskCB *taskCB = NULL;
     BOOL needSched = FALSE;
     UINT32 intSave;
     UINT16 currCpuMask;
@@ -1126,7 +1134,7 @@ LITE_OS_SEC_TEXT_MINOR UINT32 LOS_TaskCpuAffiSet(UINT32 taskID, UINT16 cpuAffiMa
         return LOS_ERRNO_TSK_CPU_AFFINITY_MASK_ERR;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         SCHEDULER_UNLOCK(intSave);
@@ -1147,7 +1155,6 @@ LITE_OS_SEC_TEXT_MINOR UINT16 LOS_TaskCpuAffiGet(UINT32 taskID)
 {
 #ifdef LOSCFG_KERNEL_SMP
 #define INVALID_CPU_AFFI_MASK   0
-    LosTaskCB *taskCB = NULL;
     UINT16 cpuAffiMask;
     UINT32 intSave;
 
@@ -1155,7 +1162,7 @@ LITE_OS_SEC_TEXT_MINOR UINT16 LOS_TaskCpuAffiGet(UINT32 taskID)
         return INVALID_CPU_AFFI_MASK;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         SCHEDULER_UNLOCK(intSave);
@@ -1208,7 +1215,7 @@ LITE_OS_SEC_TEXT_MINOR VOID OsTaskProcSignal(VOID)
     } else if (runTask->signal & SIGNAL_AFFI) {
         runTask->signal &= ~SIGNAL_AFFI;
 
-        /* pri-queue has updated, notify the target cpu */
+        /* priority queue has updated, notify the target cpu */
         LOS_MpSchedule((UINT32)runTask->cpuAffiMask);
 #endif
     }
@@ -1347,21 +1354,22 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCreateUserTask(UINT32 processID, TSK_INIT_PARAM_S
 LITE_OS_SEC_TEXT INT32 LOS_GetTaskScheduler(INT32 taskID)
 {
     UINT32 intSave;
-    LosTaskCB *taskCB = NULL;
     INT32 policy;
+    SchedParam param = { 0 };
 
     if (OS_TID_CHECK_INVALID(taskID)) {
         return -LOS_EINVAL;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         policy = -LOS_EINVAL;
         OS_GOTO_ERREND();
     }
 
-    policy = taskCB->policy;
+    taskCB->ops->schedParamGet(taskCB, &param);
+    policy = (INT32)param.policy;
 
 LOS_ERREND:
     SCHEDULER_UNLOCK(intSave);
@@ -1370,8 +1378,8 @@ LOS_ERREND:
 
 LITE_OS_SEC_TEXT INT32 LOS_SetTaskScheduler(INT32 taskID, UINT16 policy, UINT16 priority)
 {
+    SchedParam param = { 0 };
     UINT32 intSave;
-    BOOL needSched = FALSE;
 
     if (OS_TID_CHECK_INVALID(taskID)) {
         return LOS_ESRCH;
@@ -1385,8 +1393,21 @@ LITE_OS_SEC_TEXT INT32 LOS_SetTaskScheduler(INT32 taskID, UINT16 policy, UINT16
         return LOS_EINVAL;
     }
 
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
+    if (taskCB->taskStatus & OS_TASK_FLAG_SYSTEM_TASK) {
+        return LOS_EPERM;
+    }
+
     SCHEDULER_LOCK(intSave);
-    needSched = OsSchedModifyTaskSchedParam(OS_TCB_FROM_TID(taskID), policy, priority);
+    if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
+        SCHEDULER_UNLOCK(intSave);
+        return LOS_EINVAL;
+    }
+
+    taskCB->ops->schedParamGet(taskCB, &param);
+    param.policy = policy;
+    param.priority = priority;
+    BOOL needSched = taskCB->ops->schedParamModify(taskCB, &param);
     SCHEDULER_UNLOCK(intSave);
 
     LOS_MpSchedule(OS_MP_CPU_ALL);
@@ -1411,9 +1432,15 @@ STATIC UINT32 OsTaskJoinCheck(UINT32 taskID)
         return LOS_EINVAL;
     }
 
-    if (taskID == OsCurrTaskGet()->taskID) {
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
+    if (taskCB->taskStatus & OS_TASK_FLAG_SYSTEM_TASK) {
+        return LOS_EPERM;
+    }
+
+    if (taskCB == OsCurrTaskGet()) {
         return LOS_EDEADLK;
     }
+
     return LOS_OK;
 }
 
@@ -1421,7 +1448,6 @@ UINT32 LOS_TaskJoin(UINT32 taskID, UINTPTR *retval)
 {
     UINT32 intSave;
     LosTaskCB *runTask = OsCurrTaskGet();
-    LosTaskCB *taskCB = NULL;
     UINT32 errRet;
 
     errRet = OsTaskJoinCheck(taskID);
@@ -1429,7 +1455,7 @@ UINT32 LOS_TaskJoin(UINT32 taskID, UINTPTR *retval)
         return errRet;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         SCHEDULER_UNLOCK(intSave);
@@ -1462,7 +1488,6 @@ UINT32 LOS_TaskDetach(UINT32 taskID)
 {
     UINT32 intSave;
     LosTaskCB *runTask = OsCurrTaskGet();
-    LosTaskCB *taskCB = NULL;
     UINT32 errRet;
 
     if (OS_TID_CHECK_INVALID(taskID)) {
@@ -1473,7 +1498,7 @@ UINT32 LOS_TaskDetach(UINT32 taskID)
         return LOS_EINTR;
     }
 
-    taskCB = OS_TCB_FROM_TID(taskID);
+    LosTaskCB *taskCB = OS_TCB_FROM_TID(taskID);
     SCHEDULER_LOCK(intSave);
     if (taskCB->taskStatus & OS_TASK_STATUS_UNUSED) {
         SCHEDULER_UNLOCK(intSave);

kernel/base/include/los_mux_pri.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -43,7 +43,7 @@ extern "C" {
 
 #define OS_MUX_MAGIC 0xEBCFDEA0
 
-extern VOID OsMuxBitmapRestore(const LosMux *mutex, const LosTaskCB *taskCB, LosTaskCB *owner);
+extern VOID OsMuxBitmapRestore(const LosMux *mutex, const LOS_DL_LIST *list, const LosTaskCB *runTask);
 extern UINT32 OsMuxLockUnsafe(LosMux *mutex, UINT32 timeout);
 extern UINT32 OsMuxTrylockUnsafe(LosMux *mutex, UINT32 timeout);
 extern UINT32 OsMuxUnlockUnsafe(LosTaskCB *taskCB, LosMux *mutex, BOOL *needSched);

kernel/base/include/los_process_pri.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -295,11 +295,6 @@ STATIC INLINE BOOL OsProcessIsUserMode(const LosProcessCB *processCB)
     return (processCB->processMode == OS_USER_MODE);
 }
 
-#define LOS_SCHED_NORMAL  0U
-#define LOS_SCHED_FIFO    1U
-#define LOS_SCHED_RR      2U
-#define LOS_SCHED_IDLE    3U
-
 #define LOS_PRIO_PROCESS  0U
 #define LOS_PRIO_PGRP     1U
 #define LOS_PRIO_USER     2U
@@ -488,7 +483,7 @@ extern UINTPTR OsGetSigHandler(VOID);
 extern VOID OsWaitWakeTask(LosTaskCB *taskCB, UINT32 wakePID);
 extern INT32 OsSendSignalToProcessGroup(INT32 pid, siginfo_t *info, INT32 permission);
 extern INT32 OsSendSignalToAllProcess(siginfo_t *info, INT32 permission);
-extern UINT32 OsProcessAddNewTask(UINT32 pid, LosTaskCB *taskCB);
+extern UINT32 OsProcessAddNewTask(UINT32 pid, LosTaskCB *taskCB, SchedParam *param);
 extern VOID OsDeleteTaskFromProcess(LosTaskCB *taskCB);
 extern VOID OsProcessThreadGroupDestroy(VOID);
 

kernel/base/include/los_rwlock_pri.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -41,7 +41,7 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#define OS_RWLOCK_MAGIC 0xBEFDCAU
+#define OS_RWLOCK_MAGIC 0xEFDCAU
 
 enum RwlockMode {
     RWLOCK_NONE_MODE,

kernel/base/include/los_sched_pri.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -37,10 +37,13 @@
 #include "los_hwi.h"
 #include "hal_timer.h"
 #ifdef LOSCFG_SCHED_DEBUG
-#include "los_stat_pri.h"
+#include "los_statistics_pri.h"
 #endif
 #include "los_stackinfo_pri.h"
 #include "los_futex_pri.h"
+#ifdef LOSCFG_KERNEL_PM
+#include "los_pm_pri.h"
+#endif
 #include "los_signal.h"
 #ifdef LOSCFG_KERNEL_CPUP
 #include "los_cpup_pri.h"
@@ -48,6 +51,7 @@
 #ifdef LOSCFG_KERNEL_LITEIPC
 #include "hm_liteipc.h"
 #endif
+#include "los_mp.h"
 
 #ifdef __cplusplus
 #if __cplusplus
@@ -55,14 +59,17 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-#define OS_SCHED_MINI_PERIOD       (OS_SYS_CLOCK / LOSCFG_BASE_CORE_TICK_PER_SECOND_MINI)
-#define OS_TICK_RESPONSE_PRECISION (UINT32)((OS_SCHED_MINI_PERIOD * 75) / 100)
-#define OS_SCHED_MAX_RESPONSE_TIME (UINT64)(((UINT64)-1) - 1U)
+#define OS_SCHED_MINI_PERIOD          (OS_SYS_CLOCK / LOSCFG_BASE_CORE_TICK_PER_SECOND_MINI)
+#define OS_TICK_RESPONSE_PRECISION    (UINT32)((OS_SCHED_MINI_PERIOD * 75) / 100)
+#define OS_SCHED_MAX_RESPONSE_TIME    OS_SORT_LINK_INVALID_TIME
+#define OS_SCHED_TICK_TO_CYCLE(ticks) ((UINT64)ticks * OS_CYCLE_PER_TICK)
+#define AFFI_MASK_TO_CPUID(mask)      ((UINT16)((mask) - 1))
 
 extern UINT32 g_taskScheduled;
 #define OS_SCHEDULER_ACTIVE (g_taskScheduled & (1U << ArchCurrCpuid()))
 #define OS_SCHEDULER_ALL_ACTIVE (g_taskScheduled == LOSCFG_KERNEL_CPU_MASK)
 
+typedef struct TagTaskCB LosTaskCB;
 typedef BOOL (*SCHED_TL_FIND_FUNC)(UINTPTR, UINTPTR);
 
 STATIC INLINE UINT64 OsGetCurrSchedTimeCycle(VOID)
@@ -76,53 +83,65 @@ typedef enum {
     INT_PEND_TICK = 0x2,  /* pending tick */
 } SchedFlag;
 
+#define OS_PRIORITY_QUEUE_NUM 32
 typedef struct {
-    SortLinkAttribute taskSortLink;          /* task sort link */
-    SortLinkAttribute swtmrSortLink;         /* swtmr sort link */
-    UINT64            responseTime;          /* Response time for current CPU tick interrupts */
-    UINT32            responseID;            /* The response ID of the current CPU tick interrupt */
-    UINT32            idleTaskID;            /* idle task id */
-    UINT32            taskLockCnt;           /* task lock flag */
-    UINT32            swtmrTaskID;           /* software timer task id */
-    UINT32            swtmrHandlerQueue;     /* software timer timeout queue id */
-    UINT32            schedFlag;             /* pending scheduler flag */
-} SchedRunQue;
+    LOS_DL_LIST priQueList[OS_PRIORITY_QUEUE_NUM];
+    UINT32      readyTasks[OS_PRIORITY_QUEUE_NUM];
+    UINT32      queueBitmap;
+} HPFQueue;
 
-extern SchedRunQue g_schedRunQue[LOSCFG_KERNEL_CORE_NUM];
+typedef struct {
+    HPFQueue queueList[OS_PRIORITY_QUEUE_NUM];
+    UINT32   queueBitmap;
+} HPFRunqueue;
 
-STATIC INLINE SchedRunQue *OsSchedRunQue(VOID)
+typedef struct {
+    SortLinkAttribute timeoutQueue; /* task timeout queue */
+    HPFRunqueue       *hpfRunqueue;
+    UINT64            responseTime; /* Response time for current CPU tick interrupts */
+    UINT32            responseID;   /* The response ID of the current CPU tick interrupt */
+    UINT32            idleTaskID;   /* idle task id */
+    UINT32            taskLockCnt;  /* task lock flag */
+    UINT32            schedFlag;    /* pending scheduler flag */
+} SchedRunqueue;
+
+extern SchedRunqueue g_schedRunqueue[LOSCFG_KERNEL_CORE_NUM];
+
+VOID OsSchedExpireTimeUpdate(VOID);
+
+STATIC INLINE SchedRunqueue *OsSchedRunqueue(VOID)
 {
-    return &g_schedRunQue[ArchCurrCpuid()];
+    return &g_schedRunqueue[ArchCurrCpuid()];
 }
 
-STATIC INLINE SchedRunQue *OsSchedRunQueByID(UINT16 id)
+STATIC INLINE SchedRunqueue *OsSchedRunqueueByID(UINT16 id)
 {
-    return &g_schedRunQue[id];
+    return &g_schedRunqueue[id];
 }
 
 STATIC INLINE UINT32 OsSchedLockCountGet(VOID)
 {
-    return OsSchedRunQue()->taskLockCnt;
+    return OsSchedRunqueue()->taskLockCnt;
 }
 
 STATIC INLINE VOID OsSchedLockSet(UINT32 count)
 {
-    OsSchedRunQue()->taskLockCnt = count;
+    OsSchedRunqueue()->taskLockCnt = count;
 }
 
 STATIC INLINE VOID OsSchedLock(VOID)
 {
-    OsSchedRunQue()->taskLockCnt++;
+    OsSchedRunqueue()->taskLockCnt++;
 }
 
 STATIC INLINE VOID OsSchedUnlock(VOID)
 {
-    OsSchedRunQue()->taskLockCnt--;
+    OsSchedRunqueue()->taskLockCnt--;
 }
 
 STATIC INLINE BOOL OsSchedUnlockResch(VOID)
 {
-    SchedRunQue *rq = OsSchedRunQue();
+    SchedRunqueue *rq = OsSchedRunqueue();
     if (rq->taskLockCnt > 0) {
         rq->taskLockCnt--;
         if ((rq->taskLockCnt == 0) && (rq->schedFlag & INT_PEND_RESCH) && OS_SCHEDULER_ACTIVE) {
@@ -135,13 +154,13 @@ STATIC INLINE BOOL OsSchedUnlockResch(VOID)
 
 STATIC INLINE BOOL OsSchedIsLock(VOID)
 {
-    return (OsSchedRunQue()->taskLockCnt != 0);
+    return (OsSchedRunqueue()->taskLockCnt != 0);
 }
 
 /* Check if preemptible with counter flag */
 STATIC INLINE BOOL OsPreemptable(VOID)
 {
-    SchedRunQue *rq = OsSchedRunQue();
+    SchedRunqueue *rq = OsSchedRunqueue();
     /*
      * Unlike OsPreemptableInSched, the int may be not disabled when OsPreemptable
      * is called, needs manually disable interrupt, to prevent current task from
@@ -160,7 +179,7 @@ STATIC INLINE BOOL OsPreemptable(VOID)
 STATIC INLINE BOOL OsPreemptableInSched(VOID)
 {
     BOOL preemptible = FALSE;
-    SchedRunQue *rq = OsSchedRunQue();
+    SchedRunqueue *rq = OsSchedRunqueue();
 
 #ifdef LOSCFG_KERNEL_SMP
     /*
@@ -180,85 +199,61 @@ STATIC INLINE BOOL OsPreemptableInSched(VOID)
     return preemptible;
 }
 
-STATIC INLINE UINT32 OsSchedGetRunQueIdle(VOID)
+STATIC INLINE UINT32 OsSchedRunqueueIdleGet(VOID)
 {
-    return OsSchedRunQue()->idleTaskID;
+    return OsSchedRunqueue()->idleTaskID;
 }
 
-STATIC INLINE VOID OsSchedRunQuePendingSet(VOID)
+STATIC INLINE VOID OsSchedRunqueuePendingSet(VOID)
 {
-    OsSchedRunQue()->schedFlag |= INT_PEND_RESCH;
+    OsSchedRunqueue()->schedFlag |= INT_PEND_RESCH;
 }
 
-#ifdef LOSCFG_KERNEL_SMP
-STATIC INLINE VOID FindIdleRunQue(UINT16 *idleCpuID)
-{
-    SchedRunQue *idleRq = OsSchedRunQueByID(0);
-    UINT32 nodeNum = OsGetSortLinkNodeNum(&idleRq->taskSortLink) + OsGetSortLinkNodeNum(&idleRq->swtmrSortLink);
-    UINT16 cpuID = 1;
-    do {
-        SchedRunQue *rq = OsSchedRunQueByID(cpuID);
-        UINT32 temp = OsGetSortLinkNodeNum(&rq->taskSortLink) + OsGetSortLinkNodeNum(&rq->swtmrSortLink);
-        if (nodeNum > temp) {
-            *idleCpuID = cpuID;
-            nodeNum = temp;
-        }
-        cpuID++;
-    } while (cpuID < LOSCFG_KERNEL_CORE_NUM);
-}
-#endif
+#define LOS_SCHED_NORMAL  0U
+#define LOS_SCHED_FIFO    1U
+#define LOS_SCHED_RR      2U
+#define LOS_SCHED_IDLE    3U
 
-STATIC INLINE VOID OsSchedAddTask2TimeList(SortLinkList *node, UINT64 startTime, UINT32 waitTicks)
-{
-    UINT16 idleCpu = 0;
-#ifdef LOSCFG_KERNEL_SMP
-    FindIdleRunQue(&idleCpu);
-#endif
-    SchedRunQue *rq = OsSchedRunQueByID(idleCpu);
-    UINT64 responseTime = startTime + (UINT64)waitTicks * OS_CYCLE_PER_TICK;
-    OsAdd2SortLink(&rq->taskSortLink, node, responseTime, idleCpu);
-}
+typedef struct {
+    UINT16 policy;
+    UINT16 basePrio;
+    UINT16 priority;
+    UINT32 timeSlice;
+} SchedParam;
 
-STATIC INLINE UINT32 OsSchedSwtmrHandlerQueueGet(VOID)
-{
-    return OsSchedRunQue()->swtmrHandlerQueue;
-}
+typedef struct {
+    UINT16  policy; /* This field must be present for all scheduling policies and must be the first in the structure */
+    UINT16  basePrio;
+    UINT16  priority;
+    UINT32  initTimeSlice;
+    UINT32  priBitmap; /**< Bitmap for recording the change of task priority, the priority can not be greater than 31 */
+} SchedHPF;
 
-STATIC INLINE VOID OsSchedDeTaskFromTimeList(SortLinkList *node)
-{
-#ifdef LOSCFG_KERNEL_SMP
-    SchedRunQue *rq = OsSchedRunQueByID(node->cpuid);
-#else
-    SchedRunQue *rq = OsSchedRunQueByID(0);
-#endif
-    OsDeleteFromSortLink(&rq->taskSortLink, node);
-}
+typedef struct {
+    union {
+        SchedHPF hpf;
+    } Policy;
+} SchedPolicy;
 
-STATIC INLINE VOID OsSchedAddSwtmr2TimeList(SortLinkList *node, UINT64 startTime, UINT32 waitTicks)
-{
-    UINT16 idleCpu = 0;
-#ifdef LOSCFG_KERNEL_SMP
-    FindIdleRunQue(&idleCpu);
-#endif
-    SchedRunQue *rq = OsSchedRunQueByID(idleCpu);
-    UINT64 responseTime = startTime + (UINT64)waitTicks * OS_CYCLE_PER_TICK;
-    OsAdd2SortLink(&rq->swtmrSortLink, node, responseTime, idleCpu);
-}
-
-STATIC INLINE VOID OsSchedDeSwtmrFromTimeList(SortLinkList *node)
-{
-#ifdef LOSCFG_KERNEL_SMP
-    SchedRunQue *rq = OsSchedRunQueByID(node->cpuid);
-#else
-    SchedRunQue *rq = OsSchedRunQueByID(0);
-#endif
-    OsDeleteFromSortLink(&rq->swtmrSortLink, node);
-}
-
-VOID OsSchedRunQueIdleInit(UINT32 idleTaskID);
-VOID OsSchedRunQueSwtmrInit(UINT32 swtmrTaskID, UINT32 swtmrQueue);
-VOID OsSchedRunQueInit(VOID);
-BOOL OsSchedSwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg);
+typedef struct {
+    VOID (*dequeue)(SchedRunqueue *rq, LosTaskCB *taskCB);
+    VOID (*enqueue)(SchedRunqueue *rq, LosTaskCB *taskCB);
+    VOID (*start)(SchedRunqueue *rq, LosTaskCB *taskCB);
+    VOID (*exit)(LosTaskCB *taskCB);
+    UINT32 (*wait)(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 timeout);
+    VOID (*wake)(LosTaskCB *taskCB);
+    BOOL (*schedParamModify)(LosTaskCB *taskCB, const SchedParam *param);
+    UINT32 (*schedParamGet)(const LosTaskCB *taskCB, SchedParam *param);
+    UINT32 (*delay)(LosTaskCB *taskCB, UINT64 waitTime);
+    VOID (*yield)(LosTaskCB *taskCB);
+    UINT32 (*suspend)(LosTaskCB *taskCB);
+    UINT32 (*resume)(LosTaskCB *taskCB, BOOL *needSched);
+    UINT64 (*deadlineGet)(const LosTaskCB *taskCB);
+    VOID (*timeSliceUpdate)(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime);
+    INT32 (*schedParamCompare)(const SchedPolicy *sp1, const SchedPolicy *sp2);
+    VOID (*priorityInheritance)(LosTaskCB *owner, const SchedParam *param);
+    VOID (*priorityRestore)(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param);
+} SchedOps;
 
 /**
  * @ingroup los_sched
@@ -348,23 +343,31 @@ BOOL OsSchedSwtmrTimeListFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg);
  */
 #define OS_TASK_STATUS_EXIT         0x0100U
 
+#define OS_TASK_STATUS_BLOCKED     (OS_TASK_STATUS_INIT | OS_TASK_STATUS_PENDING | \
+                                    OS_TASK_STATUS_DELAY | OS_TASK_STATUS_PEND_TIME)
+
+/**
+ * @ingroup los_task
+ * Flag that indicates the task or task control block status.
+ *
+ * The delayed operation of this task is frozen.
+ */
+#define OS_TASK_STATUS_FROZEN       0x0200U
+
 #define OS_TCB_NAME_LEN             32
 
-typedef struct {
+typedef struct TagTaskCB {
     VOID            *stackPointer;      /**< Task stack pointer */
     UINT16          taskStatus;         /**< Task status */
 
-    /* The scheduling */
-    UINT16          basePrio;
-    UINT16          priority;           /**< Task priority */
-    UINT16          policy;
     UINT64          startTime;          /**< The start time of each phase of task */
+    UINT64          waitTime;           /**< Task delay time, tick number */
     UINT64          irqStartTime;       /**< Interrupt start time */
     UINT32          irqUsedTime;        /**< Interrupt consumption time */
-    UINT32          initTimeSlice;      /**< Task init time slice */
     INT32           timeSlice;          /**< Task remaining time slice */
-    UINT32          waitTimes;          /**< Task delay time, tick number */
     SortLinkList    sortList;           /**< Task sortlink node */
+    const SchedOps  *ops;
+    SchedPolicy     sp;
 
     UINT32          stackSize;          /**< Task stack size */
     UINTPTR         topOfStack;         /**< Task stack top */
@@ -379,8 +382,6 @@ typedef struct {
     LOS_DL_LIST     threadList;         /**< thread list */
     UINT32          eventMask;          /**< Event mask */
     UINT32          eventMode;          /**< Event mode */
-    UINT32          priBitMap;          /**< BitMap for recording the change of task priority,
-                                             the priority can not be greater than 31 */
 #ifdef LOSCFG_KERNEL_CPUP
     OsCpupBase      taskCpup;           /**< task cpu usage */
 #endif
@@ -468,7 +469,7 @@ STATIC INLINE VOID OsCurrUserTaskSet(UINTPTR thread)
     ArchCurrUserTaskSet(thread);
 }
 
-STATIC INLINE VOID OsSchedIrqUpdateUsedTime(VOID)
+STATIC INLINE VOID OsSchedIrqUsedTimeUpdate(VOID)
 {
     LosTaskCB *runTask = OsCurrTaskGet();
     runTask->irqUsedTime = OsGetCurrSchedTimeCycle() - runTask->irqStartTime;
@@ -480,6 +481,123 @@ STATIC INLINE VOID OsSchedIrqStartTime(VOID)
     runTask->irqStartTime = OsGetCurrSchedTimeCycle();
 }
 
+#ifdef LOSCFG_KERNEL_SMP
+STATIC INLINE VOID IdleRunqueueFind(UINT16 *idleCpuid)
+{
+    SchedRunqueue *idleRq = OsSchedRunqueueByID(0);
+    UINT32 nodeNum = OsGetSortLinkNodeNum(&idleRq->timeoutQueue);
+    UINT16 cpuid = 1;
+    do {
+        SchedRunqueue *rq = OsSchedRunqueueByID(cpuid);
+        UINT32 temp = OsGetSortLinkNodeNum(&rq->timeoutQueue);
+        if (nodeNum > temp) {
+            *idleCpuid = cpuid;
+            nodeNum = temp;
+        }
+        cpuid++;
+    } while (cpuid < LOSCFG_KERNEL_CORE_NUM);
+}
+#endif
+
+STATIC INLINE VOID OsSchedTimeoutQueueAdd(LosTaskCB *taskCB, UINT64 responseTime)
+{
+#ifdef LOSCFG_KERNEL_SMP
+    UINT16 cpuid = AFFI_MASK_TO_CPUID(taskCB->cpuAffiMask);
+    if (cpuid >= LOSCFG_KERNEL_CORE_NUM) {
+        cpuid = 0;
+        IdleRunqueueFind(&cpuid);
+    }
+#else
+    UINT16 cpuid = 0;
+#endif
+
+    SchedRunqueue *rq = OsSchedRunqueueByID(cpuid);
+    OsAdd2SortLink(&rq->timeoutQueue, &taskCB->sortList, responseTime, cpuid);
+#ifdef LOSCFG_KERNEL_SMP
+    if ((cpuid != ArchCurrCpuid()) && (responseTime < rq->responseTime)) {
+        rq->schedFlag |= INT_PEND_TICK;
+        LOS_MpSchedule(CPUID_TO_AFFI_MASK(cpuid));
+    }
+#endif
+}
+
+STATIC INLINE VOID OsSchedTimeoutQueueDelete(LosTaskCB *taskCB)
+{
+    SortLinkList *node = &taskCB->sortList;
+#ifdef LOSCFG_KERNEL_SMP
+    SchedRunqueue *rq = OsSchedRunqueueByID(node->cpuid);
+#else
+    SchedRunqueue *rq = OsSchedRunqueueByID(0);
+#endif
+    UINT64 oldResponseTime = GET_SORTLIST_VALUE(node);
+    OsDeleteFromSortLink(&rq->timeoutQueue, node);
+    if (oldResponseTime <= rq->responseTime) {
+        rq->responseTime = OS_SCHED_MAX_RESPONSE_TIME;
+    }
+}
+
+STATIC INLINE UINT32 OsSchedTimeoutQueueAdjust(LosTaskCB *taskCB, UINT64 responseTime)
+{
+    UINT32 ret;
+    SortLinkList *node = &taskCB->sortList;
+#ifdef LOSCFG_KERNEL_SMP
+    UINT16 cpuid = node->cpuid;
+#else
+    UINT16 cpuid = 0;
+#endif
+    SchedRunqueue *rq = OsSchedRunqueueByID(cpuid);
+    ret = OsSortLinkAdjustNodeResponseTime(&rq->timeoutQueue, node, responseTime);
+    if (ret == LOS_OK) {
+        rq->schedFlag |= INT_PEND_TICK;
+    }
+    return ret;
+}
+
+STATIC INLINE VOID SchedTaskFreeze(LosTaskCB *taskCB)
+{
+    UINT64 responseTime;
+
+#ifdef LOSCFG_KERNEL_PM
+    if (!OsIsPmMode()) {
+        return;
+    }
+#endif
+
+    if (!(taskCB->taskStatus & (OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY))) {
+        return;
+    }
+
+    responseTime = GET_SORTLIST_VALUE(&taskCB->sortList);
+    OsSchedTimeoutQueueDelete(taskCB);
+    SET_SORTLIST_VALUE(&taskCB->sortList, responseTime);
+    taskCB->taskStatus |= OS_TASK_STATUS_FROZEN;
+    return;
+}
+
+STATIC INLINE VOID SchedTaskUnfreeze(LosTaskCB *taskCB)
+{
+    UINT64 currTime, responseTime;
+
+    if (!(taskCB->taskStatus & OS_TASK_STATUS_FROZEN)) {
+        return;
+    }
+
+    taskCB->taskStatus &= ~OS_TASK_STATUS_FROZEN;
+    currTime = OsGetCurrSchedTimeCycle();
+    responseTime = GET_SORTLIST_VALUE(&taskCB->sortList);
+    if (responseTime > currTime) {
+        OsSchedTimeoutQueueAdd(taskCB, responseTime);
+        return;
+    }
+
+    SET_SORTLIST_VALUE(&taskCB->sortList, OS_SORT_LINK_INVALID_TIME);
+    if (taskCB->taskStatus & OS_TASK_STATUS_PENDING) {
+        LOS_ListDelete(&taskCB->pendList);
+    }
+    taskCB->taskStatus &= ~OS_TASK_STATUS_BLOCKED;
+    return;
+}
+
 /*
  * Schedule flag, one bit represents one core.
  * This flag is used to prevent kernel scheduling before OSStartToRun.
@@ -492,25 +610,59 @@ STATIC INLINE VOID OsSchedIrqStartTime(VOID)
     g_taskScheduled &= ~(1U << (cpuid)); \
 } while (0);
 
-VOID OsSchedSetIdleTaskSchedParam(LosTaskCB *idleTask);
-VOID OsSchedResetSchedResponseTime(UINT64 responseTime);
-VOID OsSchedUpdateExpireTime(VOID);
+STATIC INLINE LosTaskCB *HPFRunqueueTopTaskGet(HPFRunqueue *rq)
+{
+    LosTaskCB *newTask = NULL;
+    UINT32 baseBitmap = rq->queueBitmap;
+#ifdef LOSCFG_KERNEL_SMP
+    UINT32 cpuid = ArchCurrCpuid();
+#endif
+
+    while (baseBitmap) {
+        UINT32 basePrio = CLZ(baseBitmap);
+        HPFQueue *queueList = &rq->queueList[basePrio];
+        UINT32 bitmap = queueList->queueBitmap;
+        while (bitmap) {
+            UINT32 priority = CLZ(bitmap);
+            LOS_DL_LIST_FOR_EACH_ENTRY(newTask, &queueList->priQueList[priority], LosTaskCB, pendList) {
+#ifdef LOSCFG_KERNEL_SMP
+                if (newTask->cpuAffiMask & (1U << cpuid)) {
+#endif
+                    return newTask;
+#ifdef LOSCFG_KERNEL_SMP
+                }
+#endif
+            }
+            bitmap &= ~(1U << (OS_PRIORITY_QUEUE_NUM - priority - 1));
+        }
+        baseBitmap &= ~(1U << (OS_PRIORITY_QUEUE_NUM - basePrio - 1));
+    }
+
+    return NULL;
+}
+
+VOID HPFSchedPolicyInit(SchedRunqueue *rq);
+VOID HPFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
+                           const SchedParam *parentParam, const TSK_INIT_PARAM_S *param);
+VOID HPFProcessDefaultSchedParamGet(SchedParam *param);
+
+VOID IdleTaskSchedParamInit(LosTaskCB *taskCB);
+
+INT32 OsSchedParamCompare(const LosTaskCB *task1, const LosTaskCB *task2);
+VOID OsSchedPriorityInheritance(LosTaskCB *owner, const SchedParam *param);
+UINT32 OsSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
+                        const SchedParam *parentParam, const TSK_INIT_PARAM_S *param);
+VOID OsSchedProcessDefaultSchedParamGet(UINT16 policy, SchedParam *param);
+
+VOID OsSchedResponseTimeReset(UINT64 responseTime);
 VOID OsSchedToUserReleaseLock(VOID);
-VOID OsSchedTaskDeQueue(LosTaskCB *taskCB);
-VOID OsSchedTaskEnQueue(LosTaskCB *taskCB);
-UINT32 OsSchedTaskWait(LOS_DL_LIST *list, UINT32 timeout, BOOL needSched);
-VOID OsSchedTaskWake(LosTaskCB *resumedTask);
-BOOL OsSchedModifyTaskSchedParam(LosTaskCB *taskCB, UINT16 policy, UINT16 priority);
-BOOL OsSchedModifyProcessSchedParam(UINT32 pid, UINT16 policy, UINT16 priority);
-VOID OsSchedSuspend(LosTaskCB *taskCB);
-BOOL OsSchedResume(LosTaskCB *taskCB);
-VOID OsSchedDelay(LosTaskCB *runTask, UINT32 tick);
-VOID OsSchedYield(VOID);
-VOID OsSchedTaskExit(LosTaskCB *taskCB);
 VOID OsSchedTick(VOID);
 UINT32 OsSchedInit(VOID);
 VOID OsSchedStart(VOID);
 
+VOID OsSchedRunqueueIdleInit(UINT32 idleTaskID);
+VOID OsSchedRunqueueInit(VOID);
+
 /*
  * This function simply picks the next task and switches to it.
  * Current task needs to already be in the right state or the right
@@ -525,14 +677,6 @@ VOID OsSchedIrqEndCheckNeedSched(VOID);
 */
 LOS_DL_LIST *OsSchedLockPendFindPos(const LosTaskCB *runTask, LOS_DL_LIST *lockList);
 
-#ifdef LOSCFG_SCHED_TICK_DEBUG
-VOID OsSchedDebugRecordData(VOID);
-#endif
-
-UINT32 OsShellShowTickRespo(VOID);
-
-UINT32 OsShellShowSchedParam(VOID);
-
 #ifdef __cplusplus
 #if __cplusplus
 }

kernel/base/include/los_sortlink_pri.h

@@ -72,28 +72,42 @@ STATIC INLINE UINT64 OsGetSortLinkNextExpireTime(SortLinkAttribute *sortHeader,
     LOS_DL_LIST *head = &sortHeader->sortLink;
     LOS_DL_LIST *list = head->pstNext;
 
+    LOS_SpinLock(&sortHeader->spinLock);
     if (LOS_ListEmpty(head)) {
+        LOS_SpinUnlock(&sortHeader->spinLock);
         return OS_SORT_LINK_INVALID_TIME - tickPrecision;
     }
 
     SortLinkList *listSorted = LOS_DL_LIST_ENTRY(list, SortLinkList, sortLinkNode);
     if (listSorted->responseTime <= (startTime + tickPrecision)) {
+        LOS_SpinUnlock(&sortHeader->spinLock);
         return startTime + tickPrecision;
     }
 
+    LOS_SpinUnlock(&sortHeader->spinLock);
     return listSorted->responseTime;
 }
 
-STATIC INLINE UINT32 OsGetSortLinkNodeNum(SortLinkAttribute *head)
+STATIC INLINE UINT32 OsGetSortLinkNodeNum(const SortLinkAttribute *head)
 {
     return head->nodeNum;
 }
 
+STATIC INLINE UINT16 OsGetSortLinkNodeCpuid(const SortLinkList *node)
+{
+#ifdef LOSCFG_KERNEL_SMP
+    return node->cpuid;
+#else
+    return 0;
+#endif
+}
+
 VOID OsSortLinkInit(SortLinkAttribute *sortLinkHeader);
 VOID OsAdd2SortLink(SortLinkAttribute *head, SortLinkList *node, UINT64 responseTime, UINT16 idleCpu);
 VOID OsDeleteFromSortLink(SortLinkAttribute *head, SortLinkList *node);
 UINT64 OsSortLinkGetTargetExpireTime(UINT64 currTime, const SortLinkList *targetSortList);
 UINT64 OsSortLinkGetNextExpireTime(UINT64 currTime, const SortLinkAttribute *sortLinkHeader);
+UINT32 OsSortLinkAdjustNodeResponseTime(SortLinkAttribute *head, SortLinkList *node, UINT64 responseTime);
 
 #ifdef __cplusplus
 #if __cplusplus

kernel/base/include/los_statistics_pri.h

@@ -40,11 +40,6 @@ extern "C" {
 #endif /* __cplusplus */
 #endif /* __cplusplus */
 
-typedef struct {
-    UINT64      runtime;
-    UINT32      contexSwitch;
-} SchedPercpu;
-
 typedef struct {
     UINT64      allRuntime;
     UINT64      runTime;
@@ -56,9 +51,17 @@ typedef struct {
     UINT64      pendCount;
     UINT64      waitSchedTime;        /* task status is ready to running times */
     UINT64      waitSchedCount;
-    SchedPercpu schedPercpu[LOSCFG_KERNEL_CORE_NUM];
 } SchedStat;
 
+#ifdef LOSCFG_SCHED_DEBUG
+#ifdef LOSCFG_SCHED_TICK_DEBUG
+VOID OsSchedDebugRecordData(VOID);
+UINT32 OsShellShowTickResponse(VOID);
+UINT32 OsShellShowSchedStatistics(VOID);
+UINT32 OsSchedDebugInit(VOID);
+#endif
+#endif
+
 #ifdef __cplusplus
 #if __cplusplus
 }

kernel/base/include/los_swtmr_pri.h

@@ -66,6 +66,10 @@ typedef struct {
     SWTMR_PROC_FUNC handler;    /**< Callback function that handles software timer timeout  */
     UINTPTR arg;                /**< Parameter passed in when the callback function
                                      that handles software timer timeout is called */
+    LOS_DL_LIST node;
+#ifdef LOSCFG_SWTMR_DEBUG
+    UINT32 swtmrID;
+#endif
 } SwtmrHandlerItem;
 
 /**
@@ -100,13 +104,42 @@ extern SWTMR_CTRL_S *g_swtmrCBArray;
  * @see LOS_SwtmrStop
  */
 
+extern UINT32 OsSwtmrGetNextTimeout(VOID);
 extern BOOL OsIsSwtmrTask(const LosTaskCB *taskCB);
-extern VOID OsSwtmrRestart(UINT64 startTime, SortLinkList *sortList);
-extern VOID OsSwtmrWake(SchedRunQue *rq, UINT64 currTime, SortLinkList *sortList);
+extern VOID OsSwtmrResponseTimeReset(UINT64 startTime);
 extern UINT32 OsSwtmrInit(VOID);
 extern VOID OsSwtmrRecycle(UINT32 processID);
 extern BOOL OsSwtmrWorkQueueFind(SCHED_TL_FIND_FUNC checkFunc, UINTPTR arg);
 extern SPIN_LOCK_S g_swtmrSpin;
+extern UINT32 OsSwtmrTaskIDGetByCpuid(UINT16 cpuid);
+
+#ifdef LOSCFG_SWTMR_DEBUG
+typedef struct {
+    UINT64 startTime;
+    UINT64 waitTimeMax;
+    UINT64 waitTime;
+    UINT64 waitCount;
+    UINT64 readyStartTime;
+    UINT64 readyTime;
+    UINT64 readyTimeMax;
+    UINT64 runTime;
+    UINT64 runTimeMax;
+    UINT64 runCount;
+    UINT32 times;
+} SwtmrDebugBase;
+
+typedef struct {
+    SwtmrDebugBase  base;
+    SWTMR_PROC_FUNC handler;
+    UINT32          period;
+    UINT32          cpuid;
+    BOOL            swtmrUsed;
+} SwtmrDebugData;
+
+extern BOOL OsSwtmrDebugDataUsed(UINT32 swtmrID);
+extern UINT32 OsSwtmrDebugDataGet(UINT32 swtmrID, SwtmrDebugData *data, UINT32 len, UINT8 *mode);
+#endif
+
 #ifdef __cplusplus
 #if __cplusplus
 }

kernel/base/include/los_task_pri.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -73,7 +73,7 @@ extern SPIN_LOCK_S g_taskSpin;
  *
  * The task control block is unused.
  */
-#define OS_TASK_STATUS_UNUSED       0x0200U
+#define OS_TASK_STATUS_UNUSED       0x0400U
 
 /**
  * @ingroup los_task
@@ -81,7 +81,7 @@ extern SPIN_LOCK_S g_taskSpin;
  *
  * The task is joinable.
  */
-#define OS_TASK_FLAG_PTHREAD_JOIN   0x0400U
+#define OS_TASK_FLAG_PTHREAD_JOIN   0x0800U
 
 /**
  * @ingroup los_task
@@ -89,7 +89,7 @@ extern SPIN_LOCK_S g_taskSpin;
  *
  * The task is user mode task.
  */
-#define OS_TASK_FLAG_USER_MODE      0x0800U
+#define OS_TASK_FLAG_USER_MODE      0x1000U
 
 /**
  * @ingroup los_task
@@ -97,7 +97,7 @@ extern SPIN_LOCK_S g_taskSpin;
  *
  * The task is system-level task, like idle, swtmr and etc.
  */
-#define OS_TASK_FLAG_SYSTEM_TASK    0x1000U
+#define OS_TASK_FLAG_SYSTEM_TASK    0x2000U
 
 /**
  * @ingroup los_task
@@ -105,7 +105,7 @@ extern SPIN_LOCK_S g_taskSpin;
  *
  * The task is no-delete system task, like resourceTask.
  */
-#define OS_TASK_FLAG_NO_DELETE      0x2000U
+#define OS_TASK_FLAG_NO_DELETE      0x4000U
 
 /**
  * @ingroup los_task
@@ -113,15 +113,7 @@ extern SPIN_LOCK_S g_taskSpin;
  *
  * Kills the thread during process exit.
  */
-#define OS_TASK_FLAG_EXIT_KILL       0x4000U
-
-/**
- * @ingroup los_task
- * Flag that indicates the task or task control block status.
- *
- * The delayed operation of this task is frozen.
- */
-#define OS_TASK_FLAG_FREEZE          0x8000U
+#define OS_TASK_FLAG_EXIT_KILL       0x8000U
 
 /**
  * @ingroup los_task

kernel/base/include/los_vm_dump.h

@@ -59,9 +59,9 @@ extern "C" {
 const CHAR *OsGetRegionNameOrFilePath(LosVmMapRegion *region);
 INT32 OsRegionOverlapCheckUnlock(LosVmSpace *space, LosVmMapRegion *region);
 UINT32 OsShellCmdProcessVmUsage(LosVmSpace *space);
-VOID OsShellCmdProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm);
-VOID OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm);
-VOID OsKProcessPmUsage(LosVmSpace *kAspace, UINT32 *actualPm);
+UINT32 OsShellCmdProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm);
+UINT32 OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm);
+UINT32 OsKProcessPmUsage(LosVmSpace *kAspace, UINT32 *actualPm);
 VOID OsDumpAspace(LosVmSpace *space);
 UINT32 OsCountRegionPages(LosVmSpace *space, LosVmMapRegion *region, UINT32 *pssPages);
 UINT32 OsCountAspacePages(LosVmSpace *space);

kernel/base/ipc/los_event.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -147,7 +147,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 OsEventReadImp(PEVENT_CB_S eventCB, UINT32 eventM
         runTask->eventMode = mode;
         runTask->taskEvent = eventCB;
         OsTaskWaitSetPendMask(OS_TASK_WAIT_EVENT, eventMask, timeout);
-        ret = OsSchedTaskWait(&eventCB->stEventList, timeout, TRUE);
+        ret = runTask->ops->wait(runTask, &eventCB->stEventList, timeout);
         if (ret == LOS_ERRNO_TSK_TIMEOUT) {
             return LOS_ERRNO_EVENT_READ_TIMEOUT;
         }
@@ -185,7 +185,7 @@ LITE_OS_SEC_TEXT STATIC UINT8 OsEventResume(LosTaskCB *resumedTask, const PEVENT
 
         resumedTask->taskEvent = NULL;
         OsTaskWakeClearPendMask(resumedTask);
-        OsSchedTaskWake(resumedTask);
+        resumedTask->ops->wake(resumedTask);
     }
 
     return exitFlag;

kernel/base/ipc/los_futex.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -118,10 +118,10 @@ STATIC VOID OsFutexShowTaskNodeAttr(const LOS_DL_LIST *futexList)
         lastNode = OS_FUTEX_FROM_QUEUELIST(queueList);
         if (!LOS_ListEmpty(&(lastNode->pendList))) {
             taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(lastNode->pendList)));
-            PRINTK(" %u(%u) ->", taskCB->taskID, taskCB->priority);
+            PRINTK(" %u ->", taskCB->taskID);
         } else {
             taskCB = LOS_DL_LIST_ENTRY(lastNode, LosTaskCB, futex);
-            PRINTK(" %u(%d) ->", taskCB->taskID, -1);
+            PRINTK(" %u ->", taskCB->taskID);
         }
         queueList = queueList->pstNext;
         if (queueList == &tempNode->queueList) {
@@ -336,20 +336,19 @@ STATIC INT32 OsFutexInsertFindFormBackToFront(LOS_DL_LIST *queueList, const LosT
 {
     LOS_DL_LIST *listHead = queueList;
     LOS_DL_LIST *listTail = queueList->pstPrev;
-    FutexNode *tempNode = NULL;
-    LosTaskCB *taskTail = NULL;
 
     for (; listHead != listTail; listTail = listTail->pstPrev) {
-        tempNode = OS_FUTEX_FROM_QUEUELIST(listTail);
+        FutexNode *tempNode = OS_FUTEX_FROM_QUEUELIST(listTail);
         tempNode = OsFutexDeleteAlreadyWakeTaskAndGetNext(tempNode, NULL, FALSE);
         if (tempNode == NULL) {
             return LOS_NOK;
         }
-        taskTail = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(tempNode->pendList)));
-        if (runTask->priority >= taskTail->priority) {
+        LosTaskCB *taskTail = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(tempNode->pendList)));
+        INT32 ret = OsSchedParamCompare(runTask, taskTail);
+        if (ret >= 0) {
             LOS_ListHeadInsert(&(tempNode->queueList), &(node->queueList));
             return LOS_OK;
-        } else if (runTask->priority < taskTail->priority) {
+        } else {
             if (listTail->pstPrev == listHead) {
                 LOS_ListTailInsert(&(tempNode->queueList), &(node->queueList));
                 return LOS_OK;
@@ -364,26 +363,25 @@ STATIC INT32 OsFutexInsertFindFromFrontToBack(LOS_DL_LIST *queueList, const LosT
 {
     LOS_DL_LIST *listHead = queueList;
     LOS_DL_LIST *listTail = queueList->pstPrev;
-    FutexNode *tempNode = NULL;
-    LosTaskCB *taskHead = NULL;
 
     for (; listHead != listTail; listHead = listHead->pstNext) {
-        tempNode = OS_FUTEX_FROM_QUEUELIST(listHead);
+        FutexNode *tempNode = OS_FUTEX_FROM_QUEUELIST(listHead);
         tempNode = OsFutexDeleteAlreadyWakeTaskAndGetNext(tempNode, NULL, FALSE);
         if (tempNode == NULL) {
             return LOS_NOK;
         }
-        taskHead = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(tempNode->pendList)));
+        LosTaskCB *taskHead = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(tempNode->pendList)));
         /* High priority comes before low priority,
          * in the case of the same priority, after the current node
          */
-        if (runTask->priority >= taskHead->priority) {
+        INT32 ret = OsSchedParamCompare(runTask, taskHead);
+        if (ret >= 0) {
             if (listHead->pstNext == listTail) {
                 LOS_ListHeadInsert(&(tempNode->queueList), &(node->queueList));
                 return LOS_OK;
             }
             continue;
-        } else if (runTask->priority < taskHead->priority) {
+        } else {
             LOS_ListTailInsert(&(tempNode->queueList), &(node->queueList));
             return LOS_OK;
         }
@@ -414,10 +412,9 @@ STATIC INT32 OsFutexInsertTasktoPendList(FutexNode **firstNode, FutexNode *node,
 {
     LosTaskCB *taskHead = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&((*firstNode)->pendList)));
     LOS_DL_LIST *queueList = &((*firstNode)->queueList);
-    FutexNode *tailNode = NULL;
-    LosTaskCB *taskTail = NULL;
 
-    if (run->priority < taskHead->priority) {
+    INT32 ret1 = OsSchedParamCompare(run, taskHead);
+    if (ret1 < 0) {
         /* The one with the highest priority is inserted at the top of the queue */
         LOS_ListTailInsert(queueList, &(node->queueList));
         OsFutexReplaceQueueListHeadNode(*firstNode, node);
@@ -425,16 +422,16 @@ STATIC INT32 OsFutexInsertTasktoPendList(FutexNode **firstNode, FutexNode *node,
         return LOS_OK;
     }
 
-    if (LOS_ListEmpty(queueList) && (run->priority >= taskHead->priority)) {
+    if (LOS_ListEmpty(queueList) && (ret1 >= 0)) {
         /* Insert the next position in the queue with equal priority */
         LOS_ListHeadInsert(queueList, &(node->queueList));
         return LOS_OK;
     }
 
-    tailNode = OS_FUTEX_FROM_QUEUELIST(LOS_DL_LIST_LAST(queueList));
-    taskTail = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(tailNode->pendList)));
-    if ((run->priority >= taskTail->priority) ||
-        ((run->priority - taskHead->priority) > (taskTail->priority - run->priority))) {
+    FutexNode *tailNode = OS_FUTEX_FROM_QUEUELIST(LOS_DL_LIST_LAST(queueList));
+    LosTaskCB *taskTail = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(tailNode->pendList)));
+    INT32 ret2 = OsSchedParamCompare(taskTail, run);
+    if ((ret2 <= 0) || (ret1 > ret2)) {
         return OsFutexInsertFindFormBackToFront(queueList, run, node);
     }
 
@@ -524,7 +521,7 @@ STATIC INT32 OsFutexWaitParamCheck(const UINT32 *userVaddr, UINT32 flags, UINT32
     }
 
     if (!absTime) {
-        return LOS_EINVAL;
+        return LOS_ETIMEDOUT;
     }
 
     return LOS_OK;
@@ -569,7 +566,7 @@ STATIC INT32 OsFutexInsertTaskToHash(LosTaskCB **taskCB, FutexNode **node, const
     return LOS_OK;
 }
 
-STATIC INT32 OsFutexWaitTask(const UINT32 *userVaddr, const UINT32 flags, const UINT32 val, const UINT32 timeOut)
+STATIC INT32 OsFutexWaitTask(const UINT32 *userVaddr, const UINT32 flags, const UINT32 val, const UINT32 timeout)
 {
     INT32 futexRet;
     UINT32 intSave, lockVal;
@@ -600,9 +597,9 @@ STATIC INT32 OsFutexWaitTask(const UINT32 *userVaddr, const UINT32 flags, const
     }
 
     SCHEDULER_LOCK(intSave);
-    OsTaskWaitSetPendMask(OS_TASK_WAIT_FUTEX, futexKey, timeOut);
-    OsSchedTaskWait(&(node->pendList), timeOut, FALSE);
     OsSchedLock();
+    OsTaskWaitSetPendMask(OS_TASK_WAIT_FUTEX, futexKey, timeout);
+    taskCB->ops->wait(taskCB, &(node->pendList), timeout);
     LOS_SpinUnlock(&g_taskSpin);
 
     futexRet = OsFutexUnlock(&hashNode->listLock);
@@ -639,17 +636,17 @@ EXIT_UNLOCK_ERR:
 INT32 OsFutexWait(const UINT32 *userVaddr, UINT32 flags, UINT32 val, UINT32 absTime)
 {
     INT32 ret;
-    UINT32 timeOut = LOS_WAIT_FOREVER;
+    UINT32 timeout = LOS_WAIT_FOREVER;
 
     ret = OsFutexWaitParamCheck(userVaddr, flags, absTime);
     if (ret) {
         return ret;
     }
     if (absTime != LOS_WAIT_FOREVER) {
-        timeOut = OsNS2Tick((UINT64)absTime * OS_SYS_NS_PER_US);
+        timeout = OsNS2Tick((UINT64)absTime * OS_SYS_NS_PER_US);
     }
 
-    return OsFutexWaitTask(userVaddr, flags, val, timeOut);
+    return OsFutexWaitTask(userVaddr, flags, val, timeout);
 }
 
 STATIC INT32 OsFutexWakeParamCheck(const UINT32 *userVaddr, UINT32 flags)
@@ -693,7 +690,7 @@ STATIC VOID OsFutexCheckAndWakePendTask(FutexNode *headNode, const INT32 wakeNum
         node = *nextNode;
         taskCB = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(node->pendList)));
         OsTaskWakeClearPendMask(taskCB);
-        OsSchedTaskWake(taskCB);
+        taskCB->ops->wake(taskCB);
         *wakeAny = TRUE;
         *nextNode = OS_FUTEX_FROM_QUEUELIST(LOS_DL_LIST_FIRST(&(node->queueList)));
         if (node != headNode) {

kernel/base/ipc/los_mux.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -257,40 +257,36 @@ LITE_OS_SEC_TEXT UINT32 LOS_MuxDestroy(LosMux *mutex)
     return LOS_OK;
 }
 
-STATIC VOID OsMuxBitmapSet(const LosMux *mutex, const LosTaskCB *runTask, LosTaskCB *owner)
+STATIC VOID OsMuxBitmapSet(const LosMux *mutex, const LosTaskCB *runTask)
 {
-    if ((owner->priority > runTask->priority) && (mutex->attr.protocol == LOS_MUX_PRIO_INHERIT)) {
-        LOS_BitmapSet(&(owner->priBitMap), owner->priority);
-        (VOID)OsSchedModifyTaskSchedParam(owner, owner->policy, runTask->priority);
-    }
-}
-
-VOID OsMuxBitmapRestore(const LosMux *mutex, const LosTaskCB *taskCB, LosTaskCB *owner)
-{
-    UINT16 bitMapPri;
-
     if (mutex->attr.protocol != LOS_MUX_PRIO_INHERIT) {
         return;
     }
 
-    if (owner->priority >= taskCB->priority) {
-        bitMapPri = LOS_LowBitGet(owner->priBitMap);
-        if (bitMapPri != LOS_INVALID_BIT_INDEX) {
-            LOS_BitmapClr(&(owner->priBitMap), bitMapPri);
-            OsSchedModifyTaskSchedParam(owner, owner->policy, bitMapPri);
-        }
-    } else {
-        if (LOS_HighBitGet(owner->priBitMap) != taskCB->priority) {
-            LOS_BitmapClr(&(owner->priBitMap), taskCB->priority);
-        }
+    SchedParam param = { 0 };
+    LosTaskCB *owner = (LosTaskCB *)mutex->owner;
+    INT32 ret = OsSchedParamCompare(owner, runTask);
+    if (ret > 0) {
+        runTask->ops->schedParamGet(runTask, &param);
+        owner->ops->priorityInheritance(owner, &param);
     }
 }
 
+VOID OsMuxBitmapRestore(const LosMux *mutex, const LOS_DL_LIST *list, const LosTaskCB *runTask)
+{
+    if (mutex->attr.protocol != LOS_MUX_PRIO_INHERIT) {
+        return;
+    }
+
+    SchedParam param = { 0 };
+    LosTaskCB *owner = (LosTaskCB *)mutex->owner;
+    runTask->ops->schedParamGet(runTask, &param);
+    owner->ops->priorityRestore(owner, list, &param);
+}
+
 STATIC UINT32 OsMuxPendOp(LosTaskCB *runTask, LosMux *mutex, UINT32 timeout)
 {
     UINT32 ret;
-    LOS_DL_LIST *node = NULL;
-    LosTaskCB *owner = NULL;
 
     if ((mutex->muxList.pstPrev == NULL) || (mutex->muxList.pstNext == NULL)) {
         /* This is for mutex macro initialization. */
@@ -303,9 +299,11 @@ STATIC UINT32 OsMuxPendOp(LosTaskCB *runTask, LosMux *mutex, UINT32 timeout)
         mutex->muxCount++;
         mutex->owner = (VOID *)runTask;
         LOS_ListTailInsert(&runTask->lockList, &mutex->holdList);
-        if ((mutex->attr.protocol == LOS_MUX_PRIO_PROTECT) && (runTask->priority > mutex->attr.prioceiling)) {
-            LOS_BitmapSet(&runTask->priBitMap, runTask->priority);
-            (VOID)OsSchedModifyTaskSchedParam(runTask, runTask->policy, mutex->attr.prioceiling);
+        if (mutex->attr.protocol == LOS_MUX_PRIO_PROTECT) {
+            SchedParam param = { 0 };
+            runTask->ops->schedParamGet(runTask, &param);
+            param.priority = mutex->attr.prioceiling;
+            runTask->ops->priorityInheritance(runTask, &param);
         }
         return LOS_OK;
     }
@@ -323,27 +321,23 @@ STATIC UINT32 OsMuxPendOp(LosTaskCB *runTask, LosMux *mutex, UINT32 timeout)
         return LOS_EDEADLK;
     }
 
-    OsMuxBitmapSet(mutex, runTask, (LosTaskCB *)mutex->owner);
+    OsMuxBitmapSet(mutex, runTask);
 
-    owner = (LosTaskCB *)mutex->owner;
     runTask->taskMux = (VOID *)mutex;
-    node = OsSchedLockPendFindPos(runTask, &mutex->muxList);
+    LOS_DL_LIST *node = OsSchedLockPendFindPos(runTask, &mutex->muxList);
     if (node == NULL) {
         ret = LOS_NOK;
         return ret;
     }
 
     OsTaskWaitSetPendMask(OS_TASK_WAIT_MUTEX, (UINTPTR)mutex, timeout);
-    ret = OsSchedTaskWait(node, timeout, TRUE);
+    ret = runTask->ops->wait(runTask, node, timeout);
     if (ret == LOS_ERRNO_TSK_TIMEOUT) {
+        OsMuxBitmapRestore(mutex, NULL, runTask);
         runTask->taskMux = NULL;
         ret = LOS_ETIMEDOUT;
     }
 
-    if (timeout != LOS_WAIT_FOREVER) {
-        OsMuxBitmapRestore(mutex, runTask, owner);
-    }
-
     return ret;
 }
 
@@ -440,50 +434,23 @@ LITE_OS_SEC_TEXT UINT32 LOS_MuxTrylock(LosMux *mutex)
     return ret;
 }
 
-STATIC VOID OsMuxPostOpSub(LosTaskCB *taskCB, LosMux *mutex)
-{
-    LosTaskCB *pendedTask = NULL;
-    UINT16 bitMapPri;
-
-    if (!LOS_ListEmpty(&mutex->muxList)) {
-        bitMapPri = LOS_HighBitGet(taskCB->priBitMap);
-        LOS_DL_LIST_FOR_EACH_ENTRY(pendedTask, (&mutex->muxList), LosTaskCB, pendList) {
-            if (bitMapPri != pendedTask->priority) {
-                LOS_BitmapClr(&taskCB->priBitMap, pendedTask->priority);
-            }
-        }
-    }
-    bitMapPri = LOS_LowBitGet(taskCB->priBitMap);
-    LOS_BitmapClr(&taskCB->priBitMap, bitMapPri);
-    (VOID)OsSchedModifyTaskSchedParam((LosTaskCB *)mutex->owner, ((LosTaskCB *)mutex->owner)->policy, bitMapPri);
-}
-
 STATIC UINT32 OsMuxPostOp(LosTaskCB *taskCB, LosMux *mutex, BOOL *needSched)
 {
-    LosTaskCB *resumedTask = NULL;
-
     if (LOS_ListEmpty(&mutex->muxList)) {
         LOS_ListDelete(&mutex->holdList);
         mutex->owner = NULL;
         return LOS_OK;
     }
 
-    resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(mutex->muxList)));
-    if (mutex->attr.protocol == LOS_MUX_PRIO_INHERIT) {
-        if (resumedTask->priority > taskCB->priority) {
-            if (LOS_HighBitGet(taskCB->priBitMap) != resumedTask->priority) {
-                LOS_BitmapClr(&taskCB->priBitMap, resumedTask->priority);
-            }
-        } else if (taskCB->priBitMap != 0) {
-            OsMuxPostOpSub(taskCB, mutex);
-        }
-    }
+    LosTaskCB *resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(mutex->muxList)));
+    OsMuxBitmapRestore(mutex, &mutex->muxList, resumedTask);
+
     mutex->muxCount = 1;
     mutex->owner = (VOID *)resumedTask;
     LOS_ListDelete(&mutex->holdList);
     LOS_ListTailInsert(&resumedTask->lockList, &mutex->holdList);
     OsTaskWakeClearPendMask(resumedTask);
-    OsSchedTaskWake(resumedTask);
+    resumedTask->ops->wake(resumedTask);
     resumedTask->taskMux = NULL;
     if (needSched != NULL) {
         *needSched = TRUE;
@@ -494,8 +461,6 @@ STATIC UINT32 OsMuxPostOp(LosTaskCB *taskCB, LosMux *mutex, BOOL *needSched)
 
 UINT32 OsMuxUnlockUnsafe(LosTaskCB *taskCB, LosMux *mutex, BOOL *needSched)
 {
-    UINT16 bitMapPri;
-
     if (mutex->magic != OS_MUX_MAGIC) {
         return LOS_EBADF;
     }
@@ -517,11 +482,9 @@ UINT32 OsMuxUnlockUnsafe(LosTaskCB *taskCB, LosMux *mutex, BOOL *needSched)
     }
 
     if (mutex->attr.protocol == LOS_MUX_PRIO_PROTECT) {
-        bitMapPri = LOS_HighBitGet(taskCB->priBitMap);
-        if (bitMapPri != LOS_INVALID_BIT_INDEX) {
-            LOS_BitmapClr(&taskCB->priBitMap, bitMapPri);
-            (VOID)OsSchedModifyTaskSchedParam(taskCB, taskCB->policy, bitMapPri);
-        }
+        SchedParam param = { 0 };
+        taskCB->ops->schedParamGet(taskCB, &param);
+        taskCB->ops->priorityRestore(taskCB, NULL, &param);
     }
 
     /* Whether a task block the mutex lock. */

kernel/base/ipc/los_queue.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -223,6 +223,7 @@ STATIC VOID OsQueueBufferOperate(LosQueueCB *queueCB, UINT32 operateType, VOID *
             PRINT_ERR("get msgdatasize failed\n");
             return;
         }
+        msgDataSize = (*bufferSize < msgDataSize) ? *bufferSize : msgDataSize;
         if (memcpy_s(bufferAddr, *bufferSize, queueNode, msgDataSize) != EOK) {
             PRINT_ERR("copy message to buffer failed\n");
             return;
@@ -249,9 +250,7 @@ STATIC UINT32 OsQueueOperateParamCheck(const LosQueueCB *queueCB, UINT32 queueID
         return LOS_ERRNO_QUEUE_NOT_CREATE;
     }
 
-    if (OS_QUEUE_IS_READ(operateType) && (*bufferSize < (queueCB->queueSize - sizeof(UINT32)))) {
-        return LOS_ERRNO_QUEUE_READ_SIZE_TOO_SMALL;
-    } else if (OS_QUEUE_IS_WRITE(operateType) && (*bufferSize > (queueCB->queueSize - sizeof(UINT32)))) {
+    if (OS_QUEUE_IS_WRITE(operateType) && (*bufferSize > (queueCB->queueSize - sizeof(UINT32)))) {
         return LOS_ERRNO_QUEUE_WRITE_SIZE_TOO_BIG;
     }
     return LOS_OK;
@@ -259,15 +258,13 @@ STATIC UINT32 OsQueueOperateParamCheck(const LosQueueCB *queueCB, UINT32 queueID
 
 UINT32 OsQueueOperate(UINT32 queueID, UINT32 operateType, VOID *bufferAddr, UINT32 *bufferSize, UINT32 timeout)
 {
-    LosQueueCB *queueCB = NULL;
-    LosTaskCB *resumedTask = NULL;
     UINT32 ret;
     UINT32 readWrite = OS_QUEUE_READ_WRITE_GET(operateType);
     UINT32 intSave;
     OsHookCall(LOS_HOOK_TYPE_QUEUE_READ, (LosQueueCB *)GET_QUEUE_HANDLE(queueID), operateType, *bufferSize, timeout);
 
     SCHEDULER_LOCK(intSave);
-    queueCB = (LosQueueCB *)GET_QUEUE_HANDLE(queueID);
+    LosQueueCB *queueCB = (LosQueueCB *)GET_QUEUE_HANDLE(queueID);
     ret = OsQueueOperateParamCheck(queueCB, queueID, operateType, bufferSize);
     if (ret != LOS_OK) {
         goto QUEUE_END;
@@ -284,8 +281,9 @@ UINT32 OsQueueOperate(UINT32 queueID, UINT32 operateType, VOID *bufferAddr, UINT
             goto QUEUE_END;
         }
 
+        LosTaskCB *runTask = OsCurrTaskGet();
         OsTaskWaitSetPendMask(OS_TASK_WAIT_QUEUE, queueCB->queueID, timeout);
-        ret = OsSchedTaskWait(&queueCB->readWriteList[readWrite], timeout, TRUE);
+        ret = runTask->ops->wait(runTask, &queueCB->readWriteList[readWrite], timeout);
         if (ret == LOS_ERRNO_TSK_TIMEOUT) {
             ret = LOS_ERRNO_QUEUE_TIMEOUT;
             goto QUEUE_END;
@@ -297,9 +295,9 @@ UINT32 OsQueueOperate(UINT32 queueID, UINT32 operateType, VOID *bufferAddr, UINT
     OsQueueBufferOperate(queueCB, operateType, bufferAddr, bufferSize);
 
     if (!LOS_ListEmpty(&queueCB->readWriteList[!readWrite])) {
-        resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&queueCB->readWriteList[!readWrite]));
+        LosTaskCB *resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&queueCB->readWriteList[!readWrite]));
         OsTaskWakeClearPendMask(resumedTask);
-        OsSchedTaskWake(resumedTask);
+        resumedTask->ops->wake(resumedTask);
         SCHEDULER_UNLOCK(intSave);
         LOS_MpSchedule(OS_MP_CPU_ALL);
         LOS_Schedule();

kernel/base/ipc/los_rwlock.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -37,7 +37,6 @@
 #include "los_exc.h"
 #include "los_sched_pri.h"
 
-
 #ifdef LOSCFG_BASE_IPC_RWLOCK
 #define RWLOCK_COUNT_MASK 0x00FFFFFFU
 
@@ -120,7 +119,7 @@ STATIC BOOL OsRwlockPriCompare(LosTaskCB *runTask, LOS_DL_LIST *rwList)
 {
     if (!LOS_ListEmpty(rwList)) {
         LosTaskCB *highestTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(rwList));
-        if (runTask->priority < highestTask->priority) {
+        if (OsSchedParamCompare(runTask, highestTask) < 0) {
             return TRUE;
         }
         return FALSE;
@@ -164,7 +163,7 @@ STATIC UINT32 OsRwlockRdPendOp(LosTaskCB *runTask, LosRwlock *rwlock, UINT32 tim
      * is lower than the first pended write task, current read task will be pended.
      */
     LOS_DL_LIST *node = OsSchedLockPendFindPos(runTask, &(rwlock->readList));
-    ret = OsSchedTaskWait(node, timeout, TRUE);
+    ret = runTask->ops->wait(runTask, node, timeout);
     if (ret == LOS_ERRNO_TSK_TIMEOUT) {
         return LOS_ETIMEDOUT;
     }
@@ -205,7 +204,7 @@ STATIC UINT32 OsRwlockWrPendOp(LosTaskCB *runTask, LosRwlock *rwlock, UINT32 tim
      * write task will be pended.
      */
     LOS_DL_LIST *node =  OsSchedLockPendFindPos(runTask, &(rwlock->writeList));
-    ret = OsSchedTaskWait(node, timeout, TRUE);
+    ret = runTask->ops->wait(runTask, node, timeout);
     if (ret == LOS_ERRNO_TSK_TIMEOUT) {
         ret = LOS_ETIMEDOUT;
     }
@@ -355,7 +354,7 @@ STATIC UINT32 OsRwlockGetMode(LOS_DL_LIST *readList, LOS_DL_LIST *writeList)
     }
     LosTaskCB *pendedReadTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(readList));
     LosTaskCB *pendedWriteTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(writeList));
-    if (pendedWriteTask->priority <= pendedReadTask->priority) {
+    if (OsSchedParamCompare(pendedWriteTask, pendedReadTask) <= 0) {
         return RWLOCK_WRITEFIRST_MODE;
     }
     return RWLOCK_READFIRST_MODE;
@@ -365,7 +364,6 @@ STATIC UINT32 OsRwlockPostOp(LosRwlock *rwlock, BOOL *needSched)
 {
     UINT32 rwlockMode;
     LosTaskCB *resumedTask = NULL;
-    UINT16 pendedWriteTaskPri;
 
     rwlock->rwCount = 0;
     rwlock->writeOwner = NULL;
@@ -378,29 +376,29 @@ STATIC UINT32 OsRwlockPostOp(LosRwlock *rwlock, BOOL *needSched)
         resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(rwlock->writeList)));
         rwlock->rwCount = -1;
         rwlock->writeOwner = (VOID *)resumedTask;
-        OsSchedTaskWake(resumedTask);
+        resumedTask->ops->wake(resumedTask);
         if (needSched != NULL) {
             *needSched = TRUE;
         }
         return LOS_OK;
     }
-    /* In this case, rwlock will wake the valid pended read task. */
-    if (rwlockMode == RWLOCK_READFIRST_MODE) {
-        pendedWriteTaskPri = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(rwlock->writeList)))->priority;
-    }
-    resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(rwlock->readList)));
+
     rwlock->rwCount = 1;
-    OsSchedTaskWake(resumedTask);
+    resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(rwlock->readList)));
+    resumedTask->ops->wake(resumedTask);
     while (!LOS_ListEmpty(&(rwlock->readList))) {
         resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(rwlock->readList)));
-        if ((rwlockMode == RWLOCK_READFIRST_MODE) && (resumedTask->priority >= pendedWriteTaskPri)) {
-            break;
+        if (rwlockMode == RWLOCK_READFIRST_MODE) {
+            LosTaskCB *pendedWriteTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(rwlock->writeList)));
+            if (OsSchedParamCompare(resumedTask, pendedWriteTask) >= 0) {
+                break;
+            }
         }
         if (rwlock->rwCount == INT8_MAX) {
             return EINVAL;
         }
         rwlock->rwCount++;
-        OsSchedTaskWake(resumedTask);
+        resumedTask->ops->wake(resumedTask);
     }
     if (needSched != NULL) {
         *needSched = TRUE;

kernel/base/ipc/los_sem.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -225,7 +225,7 @@ LITE_OS_SEC_TEXT UINT32 LOS_SemPend(UINT32 semHandle, UINT32 timeout)
 
     OsHookCall(LOS_HOOK_TYPE_SEM_PEND, semPended, runTask, timeout);
     OsTaskWaitSetPendMask(OS_TASK_WAIT_SEM, semPended->semID, timeout);
-    retErr = OsSchedTaskWait(&semPended->semList, timeout, TRUE);
+    retErr = runTask->ops->wait(runTask, &semPended->semList, timeout);
     if (retErr == LOS_ERRNO_TSK_TIMEOUT) {
         retErr = LOS_ERRNO_SEM_TIMEOUT;
     }
@@ -237,10 +237,8 @@ OUT:
 
 LITE_OS_SEC_TEXT UINT32 OsSemPostUnsafe(UINT32 semHandle, BOOL *needSched)
 {
-    LosSemCB *semPosted = NULL;
     LosTaskCB *resumedTask = NULL;
-
-    semPosted = GET_SEM(semHandle);
+    LosSemCB *semPosted = GET_SEM(semHandle);
     if ((semPosted->semID != semHandle) || (semPosted->semStat == OS_SEM_UNUSED)) {
         return LOS_ERRNO_SEM_INVALID;
     }
@@ -254,7 +252,7 @@ LITE_OS_SEC_TEXT UINT32 OsSemPostUnsafe(UINT32 semHandle, BOOL *needSched)
     if (!LOS_ListEmpty(&semPosted->semList)) {
         resumedTask = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(&(semPosted->semList)));
         OsTaskWakeClearPendMask(resumedTask);
-        OsSchedTaskWake(resumedTask);
+        resumedTask->ops->wake(resumedTask);
         if (needSched != NULL) {
             *needSched = TRUE;
         }

kernel/base/ipc/los_signal.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -129,7 +129,7 @@ STATIC INLINE VOID OsSigWaitTaskWake(LosTaskCB *taskCB, INT32 signo)
     if (!LOS_ListEmpty(&sigcb->waitList) && OsSigIsMember(&sigcb->sigwaitmask, signo)) {
         OsMoveTmpInfoToUnbInfo(sigcb, signo);
         OsTaskWakeClearPendMask(taskCB);
-        OsSchedTaskWake(taskCB);
+        taskCB->ops->wake(taskCB);
         OsSigEmptySet(&sigcb->sigwaitmask);
     }
 }
@@ -152,19 +152,19 @@ STATIC UINT32 OsPendingTaskWake(LosTaskCB *taskCB, INT32 signo)
             break;
         case OS_TASK_WAIT_JOIN:
             OsTaskWakeClearPendMask(taskCB);
-            OsSchedTaskWake(taskCB);
+            taskCB->ops->wake(taskCB);
             break;
         case OS_TASK_WAIT_SIGNAL:
             OsSigWaitTaskWake(taskCB, signo);
             break;
         case OS_TASK_WAIT_LITEIPC:
             OsTaskWakeClearPendMask(taskCB);
-            OsSchedTaskWake(taskCB);
+            taskCB->ops->wake(taskCB);
             break;
         case OS_TASK_WAIT_FUTEX:
             OsFutexNodeDeleteFromFutexHash(&taskCB->futex, TRUE, NULL, NULL);
             OsTaskWakeClearPendMask(taskCB);
-            OsSchedTaskWake(taskCB);
+            taskCB->ops->wake(taskCB);
             break;
         default:
             break;
@@ -567,7 +567,7 @@ int OsSigTimedWaitNoLock(sigset_t *set, siginfo_t *info, unsigned int timeout)
 
         sigcb->sigwaitmask |= *set;
         OsTaskWaitSetPendMask(OS_TASK_WAIT_SIGNAL, sigcb->sigwaitmask, timeout);
-        ret = OsSchedTaskWait(&sigcb->waitList, timeout, TRUE);
+        ret = task->ops->wait(task, &sigcb->waitList, timeout);
         if (ret == LOS_ERRNO_TSK_TIMEOUT) {
             ret = -EAGAIN;
         }

kernel/base/misc/swtmr_shellcmd.c

@@ -36,7 +36,7 @@
 #include "shcmd.h"
 #include "shell.h"
 
-
+#define OS_ALL_SWTMR_MASK 0xffffffff
 #define SWTMR_STRLEN  12
 
 LITE_OS_SEC_DATA_MINOR STATIC CHAR g_shellSwtmrMode[][SWTMR_STRLEN] = {
@@ -57,13 +57,7 @@ STATIC VOID OsPrintSwtmrMsg(const SWTMR_CTRL_S *swtmr)
     UINT32 ticks = 0;
     (VOID)LOS_SwtmrTimeGet(swtmr->usTimerID, &ticks);
 
-    PRINTK("0x%08x  "
-           "%-7s  "
-           "%-6s   "
-           "%-6u   "
-           "%-6u  "
-           "0x%08x  "
-           "%p\n",
+    PRINTK("%7u%10s%8s%12u%7u%#12x%#12x\n",
            swtmr->usTimerID % LOSCFG_BASE_CORE_SWTMR_LIMIT,
            g_shellSwtmrStatus[swtmr->ucState],
            g_shellSwtmrMode[swtmr->ucMode],
@@ -75,34 +69,15 @@ STATIC VOID OsPrintSwtmrMsg(const SWTMR_CTRL_S *swtmr)
 
 STATIC INLINE VOID OsPrintSwtmrMsgHead(VOID)
 {
-    PRINTK("\r\nSwTmrID     State    Mode    Interval  Count   Arg         handlerAddr\n");
-    PRINTK("----------  -------  ------- --------- ------- ----------  --------\n");
+    PRINTK("\r\nSwTmrID     State    Mode    Interval  Count         Arg handlerAddr\n");
 }
 
-LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdSwtmrInfoGet(INT32 argc, const UINT8 **argv)
+STATIC UINT32 SwtmrBaseInfoGet(UINT32 timerID)
 {
-#define OS_ALL_SWTMR_MASK 0xffffffff
     SWTMR_CTRL_S *swtmr = g_swtmrCBArray;
     SWTMR_CTRL_S *swtmr1 = g_swtmrCBArray;
     UINT16 index;
-    size_t timerID;
     UINT16 num = 0;
-    CHAR *endPtr = NULL;
-
-    if (argc > 1) {
-        PRINTK("\nUsage: swtmr [ID]\n");
-        return OS_ERROR;
-    }
-
-    if (argc == 0) {
-        timerID = OS_ALL_SWTMR_MASK;
-    } else {
-        timerID = strtoul((CHAR *)argv[0], &endPtr, 0);
-        if ((endPtr == NULL) || (*endPtr != 0) || (timerID > LOSCFG_BASE_CORE_SWTMR_LIMIT)) {
-            PRINTK("\nswtmr ID can't access %s.\n", argv[0]);
-            return OS_ERROR;
-        }
-    }
 
     for (index = 0; index < LOSCFG_BASE_CORE_SWTMR_LIMIT; index++, swtmr1++) {
         if (swtmr1->ucState == 0) {
@@ -112,13 +87,13 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdSwtmrInfoGet(INT32 argc, const UINT8 **a
 
     if (num == LOSCFG_BASE_CORE_SWTMR_LIMIT) {
         PRINTK("\r\nThere is no swtmr was created!\n");
-        return OS_ERROR;
+        return LOS_NOK;
     }
 
     if (timerID == OS_ALL_SWTMR_MASK) {
+        OsPrintSwtmrMsgHead();
         for (index = 0; index < LOSCFG_BASE_CORE_SWTMR_LIMIT; index++, swtmr++) {
             if (swtmr->ucState != 0) {
-                OsPrintSwtmrMsgHead();
                 OsPrintSwtmrMsg(swtmr);
             }
         }
@@ -135,6 +110,70 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdSwtmrInfoGet(INT32 argc, const UINT8 **a
     return LOS_OK;
 }
 
+#ifdef LOSCFG_SWTMR_DEBUG
+STATIC VOID OsSwtmrTimeInfoShow(VOID)
+{
+    UINT8 mode;
+    SwtmrDebugData data;
+
+    PRINTK("SwtmrID  Cpuid   Mode    Period(us) WaitTime(us) WaitMax(us) RTime(us) RTimeMax(us) ReTime(us)"
+           " ReTimeMax(us)      RunCount    LostNum     Handler\n");
+    for (UINT32 index = 0; index < LOSCFG_BASE_CORE_SWTMR_LIMIT; index++) {
+        if (!OsSwtmrDebugDataUsed(index)) {
+            continue;
+        }
+
+        UINT32 ret = OsSwtmrDebugDataGet(index, &data, sizeof(SwtmrDebugData), &mode);
+        if (ret != LOS_OK) {
+            break;
+        }
+
+        SwtmrDebugBase *base = &data.base;
+        UINT64 waitTime = ((base->waitTime / base->waitCount) * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        UINT64 waitTimeMax = (base->waitTimeMax * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        UINT64 runTime = ((base->runTime / base->runCount) * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        UINT64 runTimeMax = (base->runTimeMax * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        UINT64 readyTime = ((base->readyTime / base->runCount) * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        UINT64 readyTimeMax = (base->readyTimeMax * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        PRINTK("%4u%10u%7s%14u%13llu%12llu%10llu%13llu%10llu%14llu%15llu%11u%#12x\n",
+               index, data.cpuid, g_shellSwtmrMode[mode], data.period * OS_US_PER_TICK, waitTime, waitTimeMax,
+               runTime, runTimeMax, readyTime, readyTimeMax, base->runCount, base->times, data.handler);
+    }
+}
+#endif
+
+LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdSwtmrInfoGet(INT32 argc, const CHAR **argv)
+{
+    UINT32 timerID;
+    CHAR *endPtr = NULL;
+
+    if (argc > 1) {
+        goto SWTMR_HELP;
+    }
+
+    if (argc == 0) {
+        timerID = OS_ALL_SWTMR_MASK;
+#ifdef LOSCFG_SWTMR_DEBUG
+    } else if (strcmp("-t", argv[0]) == 0) {
+        OsSwtmrTimeInfoShow();
+        return LOS_OK;
+#endif
+    } else {
+        timerID = strtoul(argv[0], &endPtr, 0);
+        if ((endPtr == NULL) || (*endPtr != 0) || (timerID > LOSCFG_BASE_CORE_SWTMR_LIMIT)) {
+            PRINTK("\nswtmr ID can't access %s.\n", argv[0]);
+            return LOS_NOK;
+        }
+    }
+
+    return SwtmrBaseInfoGet(timerID);
+SWTMR_HELP:
+    PRINTK("Usage:\n");
+    PRINTK(" swtmr      --- Information about all created software timers.\n");
+    PRINTK(" swtmr ID   --- Specifies information about a software timer.\n");
+    return LOS_OK;
+}
+
 SHELLCMD_ENTRY(swtmr_shellcmd, CMD_TYPE_EX, "swtmr", 1, (CmdCallBackFunc)OsShellCmdSwtmrInfoGet);
 
 #endif /* LOSCFG_SHELL */

kernel/base/misc/task_shellcmd.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -52,7 +52,7 @@
 #include "fs/file.h"
 #endif
 #include "los_sched_pri.h"
-
+#include "los_swtmr_pri.h"
 
 #define OS_PROCESS_MEM_INFO 0x2U
 #define OS_PROCESS_INFO_LEN          (g_processMaxNum * (sizeof(LosProcessCB)))
@@ -63,46 +63,45 @@
 #define OS_PROCESS_CPUP_LEN           (g_processMaxNum * sizeof(CPUP_INFO_S))
 #define OS_PROCESS_AND_TASK_CPUP_LEN  ((g_processMaxNum + g_taskMaxNum) * sizeof(CPUP_INFO_S))
 #define OS_PROCESS_CPUP_ALLINFO_LEN   (OS_PROCESS_AND_TASK_CPUP_LEN * 3)
+STATIC VOID TaskCpupInfoBaseGet(UINTPTR base, const CPUP_INFO_S **, const CPUP_INFO_S **, const CPUP_INFO_S **);
+STATIC VOID ProcessCpupInfoBaseGet(UINTPTR base, const CPUP_INFO_S **, const CPUP_INFO_S **, const CPUP_INFO_S **);
 #else
 #define OS_PROCESS_CPUP_ALLINFO_LEN 0
 #endif
 #define OS_PROCESS_ALL_INFO_LEN (g_processMaxNum * (sizeof(LosProcessCB) + sizeof(UINT32)) + \
     OS_PROCESS_CPUP_ALLINFO_LEN + OS_PROCESS_UID_INFO_LEN)
 
-#ifdef LOSCFG_KERNEL_CPUP
-LITE_OS_SEC_BSS STATIC CPUP_INFO_S *processCpupAll = NULL;
-LITE_OS_SEC_BSS STATIC CPUP_INFO_S *processCpup10s = NULL;
-LITE_OS_SEC_BSS STATIC CPUP_INFO_S *processCpup1s = NULL;
-LITE_OS_SEC_BSS STATIC CPUP_INFO_S *taskCpupAll = NULL;
-LITE_OS_SEC_BSS STATIC CPUP_INFO_S *taskCpup10s = NULL;
-LITE_OS_SEC_BSS STATIC CPUP_INFO_S *taskCpup1s = NULL;
-#endif
-
-STATIC UINT32 *taskWaterLine = NULL;
 #define OS_INVALID_SEM_ID         0xFFFFFFFF
 #define OS_TASK_WATER_LINE_SIZE   (g_taskMaxNum * sizeof(UINT32))
 #define OS_TASK_INFO_LEN          (g_taskMaxNum * sizeof(LosTaskCB))
-#define OS_TASK_ALL_INFO_LEN      (g_taskMaxNum * (sizeof(LosTaskCB) + sizeof(UINT32)))
+#define OS_TASK_SCHED_INFO_LEN    (g_taskMaxNum * sizeof(SchedParam))
+#define OS_TASK_ALL_INFO_LEN      (g_taskMaxNum * (sizeof(LosTaskCB) + sizeof(UINT32) + sizeof(SchedParam)))
 
+#undef SHOW
 #ifdef LOSCFG_FS_VFS
 #if defined(LOSCFG_BLACKBOX) && defined(LOSCFG_SAVE_EXCINFO)
 #define SaveExcInfo(arg, ...) WriteExcInfoToBuf(arg, ##__VA_ARGS__)
 #else
 #define SaveExcInfo(arg, ...)
 #endif
-#define PROCESS_INFO_SHOW(seqBuf, arg...) do {              \
-    if (seqBuf != NULL) {                                   \
-        (void)LosBufPrintf((struct SeqBuf *)seqBuf, ##arg); \
+#define SHOW(arg...) do {                                    \
+    if (seqBuf != NULL) {                                    \
+        (void)LosBufPrintf((struct SeqBuf *)seqBuf, ##arg);  \
     } else {                                                 \
         PRINTK(arg);                                         \
     }                                                        \
     SaveExcInfo(arg);                                        \
 } while (0)
 #else
-#define PROCESS_INFO_SHOW(seqBuf, arg...) PRINTK(arg)
+#define SHOW(arg...) PRINTK(arg)
 #endif
 
-LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdProcessMode(UINT16 mode)
+#define VM_INDEX  PROCESS_VM_INDEX
+#define SM_INDEX  PROCESS_SM_INDEX
+#define PM_INDEX  PROCESS_PM_INDEX
+#define CPUP_MULT LOS_CPUP_PRECISION_MULT
+
+STATIC UINT8 *ConvertProcessModeToString(UINT16 mode)
 {
     if (mode == OS_KERNEL_MODE) {
         return (UINT8 *)"kernel";
@@ -113,7 +112,7 @@ LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdProcessMode(UINT16 mode)
     return (UINT8 *)"ERROR";
 }
 
-LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdSchedPolicy(UINT16 policy)
+STATIC UINT8 *ConvertSchedPolicyToString(UINT16 policy)
 {
     if (policy == LOS_SCHED_RR) {
         return (UINT8 *)"RR";
@@ -126,7 +125,7 @@ LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdSchedPolicy(UINT16 policy)
     return (UINT8 *)"ERROR";
 }
 
-LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellProcessStatus(UINT16 status)
+STATIC UINT8 *ConvertProcessStatusToString(UINT16 status)
 {
     if (status & OS_PROCESS_STATUS_ZOMBIES) {
         return (UINT8 *)"Zombies";
@@ -140,118 +139,123 @@ LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellProcessStatus(UINT16 status)
     return (UINT8 *)"Pending";
 }
 
-STATIC VOID OsShellCmdProcessTitle(VOID *seqBuf, UINT16 flag)
+STATIC VOID ProcessInfoTitle(VOID *seqBuf, UINT16 flag)
 {
-    PROCESS_INFO_SHOW(seqBuf, "\r\n  PID  PPID PGID       UID  Status ");
-    if (flag & OS_PROCESS_MEM_INFO) {
-        PROCESS_INFO_SHOW(seqBuf, "VirtualMem ShareMem PhysicalMem ");
-    }
-
+    SHOW("\r\n  PID  PPID PGID   UID   Mode  Status Policy Priority MTID TTotal");
     if (flag & OS_PROCESS_INFO_ALL) {
+        if (flag & OS_PROCESS_MEM_INFO) {
+            SHOW(" VirtualMem ShareMem PhysicalMem");
+        }
 #ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "CPUUSE CPUUSE10s CPUUSE1s ");
+        SHOW(" CPUUSE CPUUSE10s CPUUSE1s");
 #endif /* LOSCFG_KERNEL_CPUP */
-        PROCESS_INFO_SHOW(seqBuf, "Policy Priority MTID TaskTotal   Mode ");
     } else {
 #ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "CPUUSE10s ");
+        SHOW(" CPUUSE10s");
 #endif /* LOSCFG_KERNEL_CPUP */
     }
-    PROCESS_INFO_SHOW(seqBuf, " PName\n");
+    SHOW(" PName\n");
 }
 
-STATIC VOID OsShellCmdProcessInfoShow(const LosProcessCB *processCB, const INT32 *group,
-                                      const UINT32 *memArray, VOID *seqBuf, UINT16 flag)
+STATIC VOID AllProcessDataShow(const LosProcessCB *pcbArray, const SchedParam *param,
+                               UINTPTR cpupInfo, VOID *seqBuf, UINT16 flag)
 {
-    const UINT32 *procMemUsage = NULL;
+    const INT32 *group = (const INT32 *)((UINTPTR)pcbArray + OS_PROCESS_INFO_LEN);
     const INT32 *user = (const INT32 *)((UINTPTR)group + OS_PROCESS_GROUP_INFO_LEN);
-    UINT32 pid = processCB->processID;
-    PROCESS_INFO_SHOW(seqBuf, "%5u%6d%5d%10d%8s", pid, (INT32)processCB->parentProcessID, group[pid], user[pid],
-                      OsShellProcessStatus(processCB->processStatus));
-
-    if (flag & OS_PROCESS_MEM_INFO) {
-        procMemUsage = &memArray[pid * PROCESS_VM_INDEX_MAX];
-        PROCESS_INFO_SHOW(seqBuf, "%#11x%#9x%#12x", procMemUsage[PROCESS_VM_INDEX], procMemUsage[PROCESS_SM_INDEX],
-                          procMemUsage[PROCESS_PM_INDEX]);
-    }
-    if (flag & OS_PROCESS_INFO_ALL) {
+    const UINT32 *memArray = (const UINT32 *)((UINTPTR)pcbArray + OS_PROCESS_ALL_INFO_LEN);
 #ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "%4u.%-2u%7u.%-2u%6u.%-2u ",
-                          processCpupAll[pid].usage / LOS_CPUP_PRECISION_MULT,
-                          processCpupAll[pid].usage % LOS_CPUP_PRECISION_MULT,
-                          processCpup10s[pid].usage / LOS_CPUP_PRECISION_MULT,
-                          processCpup10s[pid].usage % LOS_CPUP_PRECISION_MULT,
-                          processCpup1s[pid].usage / LOS_CPUP_PRECISION_MULT,
-                          processCpup1s[pid].usage % LOS_CPUP_PRECISION_MULT);
-#endif /* LOSCFG_KERNEL_CPUP */
-        PROCESS_INFO_SHOW(seqBuf, "%6s%9u%5d%10u%7s ",
-                          OsShellCmdSchedPolicy(LOS_SCHED_RR), OS_TCB_FROM_TID(processCB->threadGroupID)->basePrio,
-                          (INT32)processCB->threadGroupID, processCB->threadNumber,
-                          OsShellCmdProcessMode(processCB->processMode));
-    } else {
-#ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "%7u.%-2u ",
-                          processCpup10s[pid].usage / LOS_CPUP_PRECISION_MULT,
-                          processCpup10s[pid].usage % LOS_CPUP_PRECISION_MULT);
-#endif /* LOSCFG_KERNEL_CPUP */
-    }
-    PROCESS_INFO_SHOW(seqBuf, " %-32s\n", processCB->processName);
-}
+    const CPUP_INFO_S *cpupAll = NULL;
+    const CPUP_INFO_S *cpup10s = NULL;
+    const CPUP_INFO_S *cpup1s = NULL;
+    ProcessCpupInfoBaseGet(cpupInfo, &cpupAll, &cpup10s, &cpup1s);
+#else
+    (VOID)cpupInfo;
+#endif
 
-STATIC VOID OsShellCmdAllProcessInfoShow(const LosProcessCB *pcbArray, const INT32 *group,
-                                         const UINT32 *memArray, VOID *seqBuf, UINT16 flag)
-{
-    const LosProcessCB *processCB = NULL;
-    UINT32 pid;
-
-    for (pid = 1; pid < g_processMaxNum; ++pid) {
-        processCB = pcbArray + pid;
+    for (UINT32 pid = 1; pid < g_processMaxNum; ++pid) {
+        const LosProcessCB *processCB = pcbArray + pid;
         if (OsProcessIsUnused(processCB)) {
             continue;
         }
 
-        OsShellCmdProcessInfoShow(processCB, group, memArray, seqBuf, flag);
+        SHOW("%5u%6d%5d%6d%7s%8s%7s%9u%5u%7u", pid, (INT32)processCB->parentProcessID, group[pid], user[pid],
+             ConvertProcessModeToString(processCB->processMode), ConvertProcessStatusToString(processCB->processStatus),
+             ConvertSchedPolicyToString(LOS_SCHED_RR), param[processCB->threadGroupID].basePrio,
+             processCB->threadGroupID, processCB->threadNumber);
+
+        if (flag & OS_PROCESS_INFO_ALL) {
+            if (flag & OS_PROCESS_MEM_INFO) {
+                const UINT32 *memUsage = &memArray[pid * PROCESS_VM_INDEX_MAX];
+                SHOW("%#11x%#9x%#12x", memUsage[VM_INDEX], memUsage[SM_INDEX], memUsage[PM_INDEX]);
+            }
+#ifdef LOSCFG_KERNEL_CPUP
+            SHOW("%4u.%-2u%7u.%-2u%6u.%-2u ", cpupAll[pid].usage / CPUP_MULT, cpupAll[pid].usage % CPUP_MULT,
+                 cpup10s[pid].usage / CPUP_MULT, cpup10s[pid].usage % CPUP_MULT,
+                 cpup1s[pid].usage / CPUP_MULT, cpup1s[pid].usage % CPUP_MULT);
+#endif /* LOSCFG_KERNEL_CPUP */
+        } else {
+#ifdef LOSCFG_KERNEL_CPUP
+            SHOW("%7u.%-2u ", cpup10s[pid].usage / CPUP_MULT, cpup10s[pid].usage % CPUP_MULT);
+#endif /* LOSCFG_KERNEL_CPUP */
+        }
+        SHOW("%-32s\n", processCB->processName);
     }
 }
 
 #ifdef LOSCFG_KERNEL_VM
-STATIC VOID OsProcessMemUsageGet(UINT32 *memArray)
+STATIC VOID ProcessMemUsageGet(LosProcessCB *pcbArray)
 {
-    UINT32 pid;
-    LosProcessCB *processCB = NULL;
-    UINT32 *proMemUsage = NULL;
+    UINT32 intSave, memUsed;
+    UINT32 *memArray = (UINT32 *)((UINTPTR)pcbArray + OS_PROCESS_ALL_INFO_LEN);
 
-    for (pid = 0; pid < g_processMaxNum; ++pid) {
-        processCB = g_processCBArray + pid;
+    for (UINT32 pid = 0; pid < g_processMaxNum; ++pid) {
+        const LosProcessCB *processCB = g_processCBArray + pid;
+        UINT32 *proMemUsage = &memArray[pid * PROCESS_VM_INDEX_MAX];
+
+        SCHEDULER_LOCK(intSave);
         if (OsProcessIsUnused(processCB)) {
+            SCHEDULER_UNLOCK(intSave);
+            pcbArray[pid].processStatus = OS_PROCESS_FLAG_UNUSED;
             continue;
         }
-        proMemUsage = &memArray[pid * PROCESS_VM_INDEX_MAX];
+
+        LosVmSpace *vmSpace  = processCB->vmSpace;
+        SCHEDULER_UNLOCK(intSave);
 
         /* Process memory usage statistics, idle task defaults to 0 */
         if (pid == OsGetIdleProcessID()) {
-            proMemUsage[PROCESS_VM_INDEX] = 0;
-            proMemUsage[PROCESS_SM_INDEX] = 0;
-            proMemUsage[PROCESS_PM_INDEX] = 0;
+            proMemUsage[VM_INDEX] = 0;
+            proMemUsage[SM_INDEX] = 0;
+            proMemUsage[PM_INDEX] = 0;
+        } else if (vmSpace == LOS_GetKVmSpace()) {
+            (VOID)OsShellCmdProcessPmUsage(vmSpace, &proMemUsage[SM_INDEX], &proMemUsage[PM_INDEX]);
+            proMemUsage[VM_INDEX] = proMemUsage[PM_INDEX];
         } else {
-            proMemUsage[PROCESS_VM_INDEX] = OsShellCmdProcessVmUsage(processCB->vmSpace);
-            OsShellCmdProcessPmUsage(processCB->vmSpace, &proMemUsage[PROCESS_SM_INDEX],
-                                     &proMemUsage[PROCESS_PM_INDEX]);
+            memUsed = OsShellCmdProcessVmUsage(vmSpace);
+            if (memUsed == 0) {
+                pcbArray[pid].processStatus = OS_PROCESS_FLAG_UNUSED;
+                continue;
+            }
+            proMemUsage[VM_INDEX] = memUsed;
+            memUsed = OsShellCmdProcessPmUsage(vmSpace, &proMemUsage[SM_INDEX], &proMemUsage[PM_INDEX]);
+            if (memUsed == 0) {
+                pcbArray[pid].processStatus = OS_PROCESS_FLAG_UNUSED;
+            }
         }
     }
 }
 #endif
 
 #define OS_TASK_STATUS_MASK 0x00FF
-STATIC VOID OsProcessInfoGet(LosProcessCB **pcbArray, INT32 **group,
-                             UINT32 **memArray, LosTaskCB **tcbArray,
-                             UINT16 flag)
+STATIC VOID ProcessInfoGet(LosProcessCB **pcbArray, LosTaskCB **tcbArray, SchedParam **schedParam)
 {
-    *group = (INT32 *)((UINTPTR)*pcbArray + OS_PROCESS_INFO_LEN);
-    INT32 *user = (INT32 *)((UINTPTR)*group + OS_PROCESS_GROUP_INFO_LEN);
+    INT32 *group = (INT32 *)((UINTPTR)*pcbArray + OS_PROCESS_INFO_LEN);
+    INT32 *user = (INT32 *)((UINTPTR)group + OS_PROCESS_GROUP_INFO_LEN);
+    SchedParam *param = (SchedParam *)((UINTPTR)*tcbArray + OS_TASK_INFO_LEN);
+    *schedParam = param;
 
     for (UINT32 tid = 0; tid < g_taskMaxNum; tid++) {
-        LosTaskCB *taskCB = *tcbArray + tid;
+        const LosTaskCB *taskCB = *tcbArray + tid;
         if (OsTaskIsUnused(taskCB)) {
             continue;
         }
@@ -260,18 +264,19 @@ STATIC VOID OsProcessInfoGet(LosProcessCB **pcbArray, INT32 **group,
         if (!OsProcessIsDead(processCB) && !OsProcessIsInit(processCB)) {
             processCB->processStatus |= (taskCB->taskStatus & OS_TASK_STATUS_MASK);
         }
+        taskCB->ops->schedParamGet(taskCB, &param[tid]);
     }
 
     for (UINT32 pid = 0; pid < g_processMaxNum; ++pid) {
-        LosProcessCB *processCB = *pcbArray + pid;
+        const LosProcessCB *processCB = *pcbArray + pid;
         if (OsProcessIsUnused(processCB)) {
             continue;
         }
 
         if (processCB->group != NULL) {
-            (*group)[processCB->processID] = processCB->group->groupID;
+            group[processCB->processID] = processCB->group->groupID;
         } else {
-            (*group)[processCB->processID] = -1;
+            group[processCB->processID] = -1;
         }
 
 #ifdef LOSCFG_SECURITY_CAPABILITY
@@ -284,47 +289,28 @@ STATIC VOID OsProcessInfoGet(LosProcessCB **pcbArray, INT32 **group,
         user[processCB->processID] = 0;
 #endif
     }
-
-#ifdef LOSCFG_KERNEL_CPUP
-    processCpupAll = (CPUP_INFO_S *)((UINTPTR)user + OS_PROCESS_UID_INFO_LEN);
-    taskCpupAll = (CPUP_INFO_S *)((UINTPTR)processCpupAll + OS_PROCESS_CPUP_LEN);
-    processCpup10s = (CPUP_INFO_S *)((UINTPTR)processCpupAll + OS_PROCESS_AND_TASK_CPUP_LEN);
-    taskCpup10s = (CPUP_INFO_S *)((UINTPTR)processCpup10s + OS_PROCESS_CPUP_LEN);
-    processCpup1s = (CPUP_INFO_S *)((UINTPTR)processCpup10s + OS_PROCESS_AND_TASK_CPUP_LEN);
-    taskCpup1s = (CPUP_INFO_S *)((UINTPTR)processCpup1s + OS_PROCESS_CPUP_LEN);
-
-    (VOID)OsGetAllProcessAndTaskCpuUsageUnsafe(CPUP_ALL_TIME, processCpupAll, OS_PROCESS_AND_TASK_CPUP_LEN);
-    (VOID)OsGetAllProcessAndTaskCpuUsageUnsafe(CPUP_LAST_TEN_SECONDS, processCpup10s, OS_PROCESS_AND_TASK_CPUP_LEN);
-    (VOID)OsGetAllProcessAndTaskCpuUsageUnsafe(CPUP_LAST_ONE_SECONDS, processCpup1s, OS_PROCESS_AND_TASK_CPUP_LEN);
-#endif
-
-#ifdef LOSCFG_KERNEL_VM
-    if (flag & OS_PROCESS_MEM_INFO) {
-        *memArray = (UINT32 *)((UINTPTR)*pcbArray + OS_PROCESS_ALL_INFO_LEN);
-        OsProcessMemUsageGet(*memArray);
-    }
-#endif
 }
 
-STATIC VOID OsShellCmdProcessInfoData(const LosProcessCB *pcbArray, const INT32 *group,
-                                      const UINT32 *memArray, VOID *seqBuf, UINT16 flag)
+STATIC VOID ProcessInfoShow(const LosProcessCB *pcbArray, const SchedParam *param,
+                            UINTPTR cpupInfo, VOID *seqBuf, UINT16 flag)
 {
 #ifdef LOSCFG_KERNEL_CPUP
+    const CPUP_INFO_S *cpupAll = NULL;
+    const CPUP_INFO_S *cpup10s = NULL;
+    const CPUP_INFO_S *cpup1s = NULL;
+    ProcessCpupInfoBaseGet(cpupInfo, &cpupAll, &cpup10s, &cpup1s);
     UINT32 pid = OsGetIdleProcessID();
-    UINT32 sysUsage = LOS_CPUP_PRECISION - processCpupAll[pid].usage;
+    UINT32 sysUsage = LOS_CPUP_PRECISION - cpupAll[pid].usage;
 
-    PROCESS_INFO_SHOW(seqBuf, "\n  allCpu(%%): %4u.%02u sys, %4u.%02u idle\n",
-                      sysUsage / LOS_CPUP_PRECISION_MULT,
-                      sysUsage % LOS_CPUP_PRECISION_MULT,
-                      processCpupAll[pid].usage / LOS_CPUP_PRECISION_MULT,
-                      processCpupAll[pid].usage % LOS_CPUP_PRECISION_MULT);
+    SHOW("\n  allCpu(%%): %4u.%02u sys, %4u.%02u idle\n", sysUsage / CPUP_MULT, sysUsage % CPUP_MULT,
+         cpupAll[pid].usage / CPUP_MULT, cpupAll[pid].usage % CPUP_MULT);
 #endif
 
-    OsShellCmdProcessTitle(seqBuf, flag);
-    OsShellCmdAllProcessInfoShow(pcbArray, group, memArray, seqBuf, flag);
+    ProcessInfoTitle(seqBuf, flag);
+    AllProcessDataShow(pcbArray, param, cpupInfo, seqBuf, flag);
 }
 
-LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus)
+STATIC UINT8 *ConvertTaskStatusToString(UINT16 taskStatus)
 {
     if (taskStatus & OS_TASK_STATUS_INIT) {
         return (UINT8 *)"Init";
@@ -332,6 +318,8 @@ LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus)
         return (UINT8 *)"Running";
     } else if (taskStatus & OS_TASK_STATUS_READY) {
         return (UINT8 *)"Ready";
+    } else if (taskStatus & OS_TASK_STATUS_FROZEN) {
+        return (UINT8 *)"Frozen";
     } else if (taskStatus & OS_TASK_STATUS_SUSPENDED) {
         return (UINT8 *)"Suspended";
     } else if (taskStatus & OS_TASK_STATUS_DELAY) {
@@ -349,26 +337,30 @@ LITE_OS_SEC_TEXT_MINOR UINT8 *OsShellCmdConvertTskStatus(UINT16 taskStatus)
     return (UINT8 *)"Invalid";
 }
 
-STATIC VOID OsShellCmdTaskWaterLineGet(const LosTaskCB *allTaskArray)
+STATIC VOID TaskWaterLineGet(UINTPTR waterLineBase, LosTaskCB *tcbArray)
 {
-    const LosTaskCB *taskCB = NULL;
-    UINT32 loop;
+    UINT32 intSave;
+    UINT32 *taskWaterLine = (UINT32 *)waterLineBase;
 
-    for (loop = 0; loop < g_taskMaxNum; ++loop) {
-        taskCB = allTaskArray + loop;
+    for (UINT32 tid = 0; tid < g_taskMaxNum; ++tid) {
+        const LosTaskCB *taskCB = g_taskCBArray + tid;
+        SCHEDULER_LOCK(intSave);
         if (OsTaskIsUnused(taskCB)) {
+            SCHEDULER_UNLOCK(intSave);
+            tcbArray[tid].taskStatus = OS_TASK_STATUS_UNUSED;
             continue;
         }
 
         (VOID)OsStackWaterLineGet((const UINTPTR *)((UINTPTR)taskCB->topOfStack + taskCB->stackSize),
                                   (const UINTPTR *)taskCB->topOfStack, &taskWaterLine[taskCB->taskID]);
+        SCHEDULER_UNLOCK(intSave);
     }
 }
 
 #ifdef LOSCFG_SHELL_CMD_DEBUG
 #define OS_PEND_REASON_MAX_LEN 20
 
-STATIC CHAR *OsShellCheckTaskWaitFlag(const LosTaskCB *taskCB, UINTPTR *lockID)
+STATIC CHAR *CheckTaskWaitFlag(const LosTaskCB *taskCB, UINTPTR *lockID)
 {
     *lockID = taskCB->waitID;
     switch (taskCB->waitFlag) {
@@ -403,24 +395,23 @@ STATIC CHAR *OsShellCheckTaskWaitFlag(const LosTaskCB *taskCB, UINTPTR *lockID)
     return NULL;
 }
 
-STATIC VOID OsShellCmdCheckTaskPend(const LosTaskCB *taskCB, CHAR *pendReason, UINT32 maxLen, UINTPTR *lockID)
+STATIC VOID TaskPendingReasonInfoGet(const LosTaskCB *taskCB, CHAR *pendReason, UINT32 maxLen, UINTPTR *lockID)
 {
     CHAR *reason = NULL;
-    LosTaskCB *owner = NULL;
 
     if (!(taskCB->taskStatus & OS_TASK_STATUS_PENDING)) {
-        reason = (CHAR *)OsShellCmdConvertTskStatus(taskCB->taskStatus);
+        reason = (CHAR *)ConvertTaskStatusToString(taskCB->taskStatus);
         goto EXIT;
     }
 
-    reason = OsShellCheckTaskWaitFlag(taskCB, lockID);
+    reason = CheckTaskWaitFlag(taskCB, lockID);
     if (reason == NULL) {
         reason = "Others";
     }
 
     if (taskCB->taskMux != NULL) {
         *lockID = (UINTPTR)taskCB->taskMux;
-        owner = ((LosMux *)taskCB->taskMux)->owner;
+        LosTaskCB *owner = ((LosMux *)taskCB->taskMux)->owner;
         if (owner != NULL) {
             if (snprintf_s(pendReason, maxLen, maxLen - 1, "Mutex-%u", owner->taskID) == EOK) {
                 return;
@@ -435,103 +426,133 @@ EXIT:
 }
 #endif
 
-STATIC VOID OsShellCmdTskInfoTitle(VOID *seqBuf, UINT16 flag)
+STATIC VOID TaskInfoTitle(VOID *seqBuf, UINT16 flag)
 {
-    PROCESS_INFO_SHOW(seqBuf, "\r\n  TID  PID ");
+    SHOW("\r\n  TID  PID");
 #ifdef LOSCFG_KERNEL_SMP
-    PROCESS_INFO_SHOW(seqBuf, "Affi CPU  ");
+    SHOW(" Affi CPU");
 #endif
-    PROCESS_INFO_SHOW(seqBuf, "     Status StackSize WaterLine ");
+    SHOW("    Status Policy Priority StackSize WaterLine");
     if (flag & OS_PROCESS_INFO_ALL) {
 #ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "CPUUSE CPUUSE10s CPUUSE1s ");
+        SHOW(" CPUUSE CPUUSE10s CPUUSE1s");
 #endif /* LOSCFG_KERNEL_CPUP */
 #ifdef LOSCFG_SHELL_CMD_DEBUG
-        PROCESS_INFO_SHOW(seqBuf, "  StackPoint  TopOfStack PendReason     LockID ");
+        SHOW("   StackPoint  TopOfStack PendReason     LockID");
 #endif
-        PROCESS_INFO_SHOW(seqBuf, "Policy Priority ");
     } else {
 #ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "CPUUSE10s ");
+        SHOW("  CPUUSE10s ");
 #endif /* LOSCFG_KERNEL_CPUP */
     }
-    PROCESS_INFO_SHOW(seqBuf, "   MEMUSE  TaskName\n");
+    SHOW("  TaskName\n");
 }
 
-STATIC INLINE VOID OsShellTskInfoData(const LosTaskCB *taskCB, VOID *seqBuf, UINT16 flag)
+STATIC VOID AllTaskInfoDataShow(const LosTaskCB *allTaskArray, UINTPTR cpupInfo, VOID *seqBuf, UINT16 flag)
 {
-#ifdef LOSCFG_SHELL_CMD_DEBUG
-    UINTPTR lockID = 0;
-    CHAR pendReason[OS_PEND_REASON_MAX_LEN] = { 0 };
-#endif
-    PROCESS_INFO_SHOW(seqBuf, " %4u%5u", taskCB->taskID, taskCB->processID);
-
-#ifdef LOSCFG_KERNEL_SMP
-    PROCESS_INFO_SHOW(seqBuf, "%#5x%4d ", taskCB->cpuAffiMask, (INT16)(taskCB->currCpu));
-#endif
-
-    PROCESS_INFO_SHOW(seqBuf, "%12s%#10x%#10x", OsShellCmdConvertTskStatus(taskCB->taskStatus),
-                      taskCB->stackSize, taskWaterLine[taskCB->taskID]);
-    if (flag & OS_PROCESS_INFO_ALL) {
+    const SchedParam *param = (const SchedParam *)((UINTPTR)allTaskArray + OS_TASK_INFO_LEN);
+    const UINT32 *waterLine = (const UINT32 *)((UINTPTR)allTaskArray + OS_TASK_INFO_LEN + OS_TASK_SCHED_INFO_LEN);
 #ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "%4u.%-2u%7u.%-2u%6u.%-2u ",
-                          taskCpupAll[taskCB->taskID].usage / LOS_CPUP_PRECISION_MULT,
-                          taskCpupAll[taskCB->taskID].usage % LOS_CPUP_PRECISION_MULT,
-                          taskCpup10s[taskCB->taskID].usage / LOS_CPUP_PRECISION_MULT,
-                          taskCpup10s[taskCB->taskID].usage % LOS_CPUP_PRECISION_MULT,
-                          taskCpup1s[taskCB->taskID].usage / LOS_CPUP_PRECISION_MULT,
-                          taskCpup1s[taskCB->taskID].usage % LOS_CPUP_PRECISION_MULT);
-#endif /* LOSCFG_KERNEL_CPUP */
-#ifdef LOSCFG_SHELL_CMD_DEBUG
-        OsShellCmdCheckTaskPend(taskCB, pendReason, OS_PEND_REASON_MAX_LEN, &lockID);
-        PROCESS_INFO_SHOW(seqBuf, "%#12x%#12x%11s%#11x", taskCB->stackPointer, taskCB->topOfStack, pendReason, lockID);
+    const CPUP_INFO_S *cpupAll = NULL;
+    const CPUP_INFO_S *cpup10s = NULL;
+    const CPUP_INFO_S *cpup1s = NULL;
+    TaskCpupInfoBaseGet(cpupInfo, &cpupAll, &cpup10s, &cpup1s);
+#else
+    (VOID)cpupInfo;
 #endif
-        PROCESS_INFO_SHOW(seqBuf, "%7s%9u", OsShellCmdSchedPolicy(taskCB->policy), taskCB->priority);
-    } else {
-#ifdef LOSCFG_KERNEL_CPUP
-        PROCESS_INFO_SHOW(seqBuf, "%7u.%-2u ",
-                          taskCpup10s[taskCB->taskID].usage / LOS_CPUP_PRECISION_MULT,
-                          taskCpup10s[taskCB->taskID].usage % LOS_CPUP_PRECISION_MULT);
-#endif /* LOSCFG_KERNEL_CPUP */
-    }
-    PROCESS_INFO_SHOW(seqBuf, "%#10x  %-32s\n", OsTaskMemUsage(taskCB->taskID), taskCB->taskName);
-}
-
-STATIC VOID OsShellCmdAllTaskInfoData(const LosTaskCB *allTaskArray, VOID *seqBuf, UINT16 flag)
-{
-    const LosTaskCB *taskCB = NULL;
-    UINT32 pid;
-    UINT32 loop;
-
-    for (pid = 1; pid < g_processMaxNum; ++pid) {
-        for (loop = 0; loop < g_taskMaxNum; ++loop) {
-            taskCB = allTaskArray + loop;
+    for (UINT32 pid = 1; pid < g_processMaxNum; ++pid) {
+        for (UINT32 tid = 0; tid < g_taskMaxNum; ++tid) {
+            const LosTaskCB *taskCB = allTaskArray + tid;
             if (OsTaskIsUnused(taskCB) || (taskCB->processID != pid)) {
                 continue;
             }
+#ifdef LOSCFG_SHELL_CMD_DEBUG
+            UINTPTR lockID = 0;
+            CHAR pendReason[OS_PEND_REASON_MAX_LEN] = { 0 };
+#endif
+            SHOW(" %4u%5u", tid, taskCB->processID);
 
-            OsShellTskInfoData(taskCB, seqBuf, flag);
+#ifdef LOSCFG_KERNEL_SMP
+            SHOW("%#5x%4d ", taskCB->cpuAffiMask, (INT16)(taskCB->currCpu));
+#endif
+            SHOW("%9s%7s%9u%#10x%#10x", ConvertTaskStatusToString(taskCB->taskStatus),
+                 ConvertSchedPolicyToString(param[tid].policy), param[tid].priority, taskCB->stackSize, waterLine[tid]);
+            if (flag & OS_PROCESS_INFO_ALL) {
+#ifdef LOSCFG_KERNEL_CPUP
+                SHOW("%4u.%-2u%7u.%-2u%6u.%-2u ", cpupAll[tid].usage / CPUP_MULT, cpupAll[tid].usage % CPUP_MULT,
+                     cpup10s[tid].usage / CPUP_MULT, cpup10s[tid].usage % CPUP_MULT,
+                     cpup1s[tid].usage / CPUP_MULT, cpup1s[tid].usage % CPUP_MULT);
+#endif /* LOSCFG_KERNEL_CPUP */
+#ifdef LOSCFG_SHELL_CMD_DEBUG
+                TaskPendingReasonInfoGet(taskCB, pendReason, OS_PEND_REASON_MAX_LEN, &lockID);
+                SHOW("%#12x%#12x%11s%#11x", taskCB->stackPointer, taskCB->topOfStack, pendReason, lockID);
+#endif
+            } else {
+#ifdef LOSCFG_KERNEL_CPUP
+                SHOW("%8u.%-2u ", cpup10s[tid].usage / CPUP_MULT, cpup10s[tid].usage % CPUP_MULT);
+#endif /* LOSCFG_KERNEL_CPUP */
+            }
+            SHOW("  %-32s\n", taskCB->taskName);
         }
     }
 }
 
-STATIC VOID OsShellCmdTskInfoData(const LosTaskCB *allTaskArray, VOID *seqBuf, UINT16 flag)
+STATIC VOID TaskInfoData(const LosTaskCB *allTaskArray, UINTPTR cpupInfo, VOID *seqBuf, UINT16 flag)
 {
-    OsShellCmdTskInfoTitle(seqBuf, flag);
-    OsShellCmdAllTaskInfoData(allTaskArray, seqBuf, flag);
+    TaskInfoTitle(seqBuf, flag);
+    AllTaskInfoDataShow(allTaskArray, cpupInfo, seqBuf, flag);
 }
 
-STATIC VOID OsProcessAndTaskInfoGet(LosProcessCB **pcbArray, INT32 **group, LosTaskCB **tcbArray,
-                                    UINT32 **memArray, UINT16 flag)
+#ifdef LOSCFG_KERNEL_CPUP
+STATIC VOID TaskCpupInfoBaseGet(UINTPTR base, const CPUP_INFO_S **cpupAll,
+                                const CPUP_INFO_S **cpup10s, const CPUP_INFO_S **cpup1s)
 {
-    BOOL lockFlag = FALSE;
-    UINT32 intSave = 0;
-    UINT32 processInfoLen = OS_PROCESS_ALL_INFO_LEN;
+    UINTPTR processCpupAll = base + OS_PROCESS_UID_INFO_LEN;
+    *cpupAll = (CPUP_INFO_S *)(processCpupAll + OS_PROCESS_CPUP_LEN);
+    UINTPTR processCpup10s = processCpupAll + OS_PROCESS_AND_TASK_CPUP_LEN;
+    *cpup10s = (CPUP_INFO_S *)(processCpup10s + OS_PROCESS_CPUP_LEN);
+    UINTPTR processCpup1s = processCpup10s + OS_PROCESS_AND_TASK_CPUP_LEN;
+    *cpup1s = (CPUP_INFO_S *)(processCpup1s + OS_PROCESS_CPUP_LEN);
+}
 
-    if (LOS_SpinHeld(&g_taskSpin) == FALSE) {
-        SCHEDULER_LOCK(intSave);
-        lockFlag = TRUE;
-    }
+STATIC VOID ProcessCpupInfoBaseGet(UINTPTR base, const CPUP_INFO_S **cpupAll,
+                                   const CPUP_INFO_S **cpup10s, const CPUP_INFO_S **cpup1s)
+{
+    *cpupAll = (CPUP_INFO_S *)(base + OS_PROCESS_UID_INFO_LEN);
+    *cpup10s = (CPUP_INFO_S *)((UINTPTR)*cpupAll + OS_PROCESS_AND_TASK_CPUP_LEN);
+    *cpup1s = (CPUP_INFO_S *)((UINTPTR)*cpup10s + OS_PROCESS_AND_TASK_CPUP_LEN);
+}
+
+STATIC VOID TaskCpupInfoGet(UINTPTR base)
+{
+    UINT32 intSave;
+
+    CPUP_INFO_S *processCpupAll = (CPUP_INFO_S *)(base + OS_PROCESS_UID_INFO_LEN);
+    CPUP_INFO_S *processCpup10s = (CPUP_INFO_S *)((UINTPTR)processCpupAll + OS_PROCESS_AND_TASK_CPUP_LEN);
+    CPUP_INFO_S *processCpup1s = (CPUP_INFO_S *)((UINTPTR)processCpup10s + OS_PROCESS_AND_TASK_CPUP_LEN);
+
+    SCHEDULER_LOCK(intSave);
+    (VOID)OsGetAllProcessAndTaskCpuUsageUnsafe(CPUP_ALL_TIME, processCpupAll, OS_PROCESS_AND_TASK_CPUP_LEN);
+    SCHEDULER_UNLOCK(intSave);
+
+    SCHEDULER_LOCK(intSave);
+    (VOID)OsGetAllProcessAndTaskCpuUsageUnsafe(CPUP_LAST_TEN_SECONDS, processCpup10s, OS_PROCESS_AND_TASK_CPUP_LEN);
+    SCHEDULER_UNLOCK(intSave);
+
+    SCHEDULER_LOCK(intSave);
+    (VOID)OsGetAllProcessAndTaskCpuUsageUnsafe(CPUP_LAST_ONE_SECONDS, processCpup1s, OS_PROCESS_AND_TASK_CPUP_LEN);
+    SCHEDULER_UNLOCK(intSave);
+}
+#endif
+
+/*
+ * | pcb | group | user | task and process cpup | process mem | tcb | sched param | task water line |
+ */
+STATIC VOID ProcessAndTaskInfoGet(LosProcessCB **pcbArray, LosTaskCB **tcbArray,
+                                  SchedParam **schedParam, UINTPTR *cpupInfo, UINT16 flag)
+{
+    UINT32 intSave;
+    UINT32 processInfoLen = OS_PROCESS_ALL_INFO_LEN;
 
 #ifdef LOSCFG_KERNEL_VM
     if (flag & OS_PROCESS_MEM_INFO) {
@@ -539,25 +560,35 @@ STATIC VOID OsProcessAndTaskInfoGet(LosProcessCB **pcbArray, INT32 **group, LosT
     }
 #endif
 
+    SCHEDULER_LOCK(intSave);
     (VOID)memcpy_s(*pcbArray, OS_PROCESS_INFO_LEN, g_processCBArray, OS_PROCESS_INFO_LEN);
     *tcbArray = (LosTaskCB *)((UINTPTR)*pcbArray + processInfoLen);
     (VOID)memcpy_s(*tcbArray, OS_TASK_INFO_LEN, g_taskCBArray, OS_TASK_INFO_LEN);
 
-    OsProcessInfoGet(pcbArray, group, memArray, tcbArray, flag);
-    taskWaterLine = (UINT32 *)((UINTPTR)*tcbArray + OS_TASK_INFO_LEN);
-    OsShellCmdTaskWaterLineGet(*tcbArray);
-    if (lockFlag == TRUE) {
-        SCHEDULER_UNLOCK(intSave);
+    ProcessInfoGet(pcbArray, tcbArray, schedParam);
+    SCHEDULER_UNLOCK(intSave);
+
+#ifdef LOSCFG_KERNEL_CPUP
+    *cpupInfo = (UINTPTR)*pcbArray + OS_PROCESS_INFO_LEN + OS_PROCESS_GROUP_INFO_LEN;
+    TaskCpupInfoGet(*cpupInfo);
+#endif
+
+#ifdef LOSCFG_KERNEL_VM
+    if (flag & OS_PROCESS_MEM_INFO) {
+        ProcessMemUsageGet(*pcbArray);
     }
+#endif
+
+    TaskWaterLineGet((UINTPTR)*tcbArray + OS_TASK_INFO_LEN + OS_TASK_SCHED_INFO_LEN, *tcbArray);
 }
 
 LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdTskInfoGet(UINT32 taskID, VOID *seqBuf, UINT16 flag)
 {
     UINT32 size;
     LosProcessCB *pcbArray = NULL;
-    INT32 *group = NULL;
     LosTaskCB *tcbArray = NULL;
-    UINT32 *memArray = NULL;
+    SchedParam *schedParam = NULL;
+    UINTPTR cpupInfo = 0;
 
     if (taskID == OS_ALL_TASK_MASK) {
         if (flag & OS_PROCESS_MEM_INFO) {
@@ -571,9 +602,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdTskInfoGet(UINT32 taskID, VOID *seqBuf,
             return LOS_NOK;
         }
         (VOID)memset_s(pcbArray, size, 0, size);
-        OsProcessAndTaskInfoGet(&pcbArray, &group, &tcbArray, &memArray, flag);
-        OsShellCmdProcessInfoData(pcbArray, group, memArray, seqBuf, flag);
-        OsShellCmdTskInfoData(tcbArray, seqBuf, flag);
+        ProcessAndTaskInfoGet(&pcbArray, &tcbArray, &schedParam, &cpupInfo, flag);
+        ProcessInfoShow(pcbArray, schedParam, cpupInfo, seqBuf, flag);
+        TaskInfoData(tcbArray, cpupInfo, seqBuf, flag);
 
         (VOID)LOS_MemFree(m_aucSysMem1, pcbArray);
     }
@@ -595,16 +626,20 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdDumpTask(INT32 argc, const CHAR **argv)
     if (argc == 1) {
         if (strcmp("-a", argv[0]) == 0) {
             flag |= OS_PROCESS_INFO_ALL;
+#ifdef LOSCFG_SCHED_DEBUG
+#ifdef LOSCFG_SCHED_TICK_DEBUG
         } else if (strcmp("-i", argv[0]) == 0) {
-            if (!OsShellShowTickRespo()) {
+            if (!OsShellShowTickResponse()) {
                 return LOS_OK;
             }
             goto TASK_HELP;
+#endif
         } else if (strcmp("-t", argv[0]) == 0) {
-            if (!OsShellShowSchedParam()) {
+            if (!OsShellShowSchedStatistics()) {
                 return LOS_OK;
             }
             goto TASK_HELP;
+#endif
         } else {
             goto TASK_HELP;
         }
@@ -614,7 +649,9 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdDumpTask(INT32 argc, const CHAR **argv)
 
 TASK_HELP:
     PRINTK("Unknown option: %s\n", argv[0]);
-    PRINTK("usage: task or task -a\n");
+    PRINTK("Usage:\n");
+    PRINTK(" task    --- Basic information about all created processes.\n");
+    PRINTK(" task -a --- Complete information about all created processes.\n");
     return LOS_NOK;
 }
 

kernel/base/mp/los_mp.c

@@ -62,7 +62,7 @@ VOID OsMpScheduleHandler(VOID)
      * set schedule flag to differ from wake function,
      * so that the scheduler can be triggered at the end of irq.
      */
-    OsSchedRunQuePendingSet();
+    OsSchedRunqueuePendingSet();
 }
 
 VOID OsMpHaltHandler(VOID)

kernel/base/mp/los_stat.c

@@ -1,323 +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 "los_task_pri.h"
-
-
-#ifdef LOSCFG_KERNEL_SCHED_STATISTICS
-#define HIGHTASKPRI           16
-#define NS_PER_MS             1000000
-#define DECIMAL_TO_PERCENTAGE 100
-
-typedef struct {
-    UINT64      idleRuntime;
-    UINT64      idleStarttime;
-    UINT64      highTaskRuntime;
-    UINT64      highTaskStarttime;
-    UINT64      spinWaitRuntime;
-    UINT64      sumPriority;
-    UINT32      prioritySwitch;
-    UINT32      highTaskSwitch;
-    UINT32      contexSwitch;
-    UINT32      hwiNum;
-    UINT32      ipiIrqNum;
-} MpStatPercpu;
-
-STATIC BOOL g_mpStaticStartFlag = FALSE;
-STATIC UINT64 g_mpStaticStartTime;
-STATIC MpStatPercpu g_mpStatPercpu[LOSCFG_KERNEL_SMP_CORE_NUM] = {0};
-
-STATIC VOID OsMpSchedStatistics(LosTaskCB *runTask, LosTaskCB *newTask)
-{
-    UINT32 cpuid;
-    UINT32 idleTaskID;
-    UINT64 now, runtime;
-
-    if (g_mpStaticStartFlag != TRUE) {
-        return;
-    }
-
-    cpuid = ArchCurrCpuid();
-    idleTaskID = OsGetIdleTaskId();
-    now = LOS_CurrNanosec();
-
-    g_mpStatPercpu[cpuid].contexSwitch++;
-
-    if ((runTask->taskID != idleTaskID) && (newTask->taskID == idleTaskID)) {
-        g_mpStatPercpu[cpuid].idleStarttime = now;
-    }
-
-    if ((runTask->taskID == idleTaskID) && (newTask->taskID != idleTaskID)) {
-        runtime = now - g_mpStatPercpu[cpuid].idleStarttime;
-        g_mpStatPercpu[cpuid].idleRuntime += runtime;
-        g_mpStatPercpu[cpuid].idleStarttime = 0;
-    }
-
-    if ((runTask->priority >= HIGHTASKPRI) && (newTask->priority < HIGHTASKPRI)) {
-        g_mpStatPercpu[cpuid].highTaskStarttime = now;
-    }
-
-    if ((runTask->priority < HIGHTASKPRI) && (newTask->priority >= HIGHTASKPRI)) {
-        runtime = now - g_mpStatPercpu[cpuid].highTaskStarttime;
-        g_mpStatPercpu[cpuid].highTaskRuntime += runtime;
-        g_mpStatPercpu[cpuid].highTaskStarttime = 0;
-    }
-
-    if (newTask->priority < HIGHTASKPRI) {
-        g_mpStatPercpu[cpuid].highTaskSwitch++;
-    }
-
-    if (newTask->taskID != idleTaskID) {
-        g_mpStatPercpu[cpuid].sumPriority += newTask->priority;
-        g_mpStatPercpu[cpuid].prioritySwitch++;
-    }
-
-    return;
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsSchedStatistics(LosTaskCB *runTask, LosTaskCB *newTask)
-{
-    UINT64 runtime;
-    UINT32 cpuid = ArchCurrCpuid();
-    UINT64 now = LOS_CurrNanosec();
-
-    SchedStat *schedRun = &runTask->schedStat;
-    SchedStat *schedNew = &newTask->schedStat;
-    SchedPercpu *cpuRun = &schedRun->schedPercpu[cpuid];
-    SchedPercpu *cpuNew = &schedNew->schedPercpu[cpuid];
-
-    /* calculate one chance of running time */
-    runtime = now - schedRun->startRuntime;
-
-    /* add running timer to running task statistics */
-    cpuRun->runtime += runtime;
-    schedRun->allRuntime += runtime;
-
-    /* add context switch counters and schedule start time */
-    cpuNew->contexSwitch++;
-    schedNew->allContextSwitch++;
-    schedNew->startRuntime = now;
-    OsMpSchedStatistics(runTask, newTask);
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsSpinWaitStatistics(UINT64 spinWaitRuntime)
-{
-    UINT32 cpuid = ArchCurrCpuid();
-    g_mpStatPercpu[cpuid].spinWaitRuntime += spinWaitRuntime;
-    return;
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsHwiStatistics(size_t intNum)
-{
-    UINT32 cpuid = ArchCurrCpuid();
-
-    if ((g_mpStaticStartFlag != TRUE) || (intNum == OS_TICK_INT_NUM)) {
-        return;
-    }
-
-    g_mpStatPercpu[cpuid].hwiNum++;
-    /* 16: 0~15 is ipi interrupts */
-    if (intNum < 16) {
-        g_mpStatPercpu[cpuid].ipiIrqNum++;
-    }
-
-    return;
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsShellCmdDumpSched(VOID)
-{
-    LosTaskCB *taskCB = NULL;
-    UINT32 loop;
-    UINT32 cpuid;
-    UINT32 affinity;
-
-    PRINTK("\n");
-    PRINTK("Task                          TID              Total Time     Total CST     "
-           "CPU                   Time           CST\n");
-    PRINTK("----                          ---      ------------------    ----------    -"
-           "---     ------------------    ----------\n");
-
-    for (loop = 0; loop < g_taskMaxNum; loop++) {
-        taskCB = (((LosTaskCB *)g_taskCBArray) + loop);
-        if (OsTaskIsUnused(taskCB)) {
-            continue;
-        }
-
-        affinity = (UINT32)taskCB->cpuAffiMask;
-
-        PRINTK("%-30s0x%-6x%+16lf ms  %10u\n", taskCB->taskName, taskCB->taskID,
-               (DOUBLE)(taskCB->schedStat.allRuntime) / NS_PER_MS,
-               taskCB->schedStat.allContextSwitch);
-
-        for (cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
-            if (!((1U << cpuid) & affinity)) {
-                continue;
-            }
-
-            PRINTK("                                                                           "
-                   "CPU%u    %+16lf ms  %12u\n", cpuid,
-                   (DOUBLE)(taskCB->schedStat.schedPercpu[cpuid].runtime) / NS_PER_MS,
-                   taskCB->schedStat.schedPercpu[cpuid].contexSwitch);
-        }
-    }
-
-    PRINTK("\n");
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsShellMpStaticStart(VOID)
-{
-    LosTaskCB *taskCB = NULL;
-    UINT32 loop;
-    UINT32 cpuid = 0;
-    UINT32 intSave;
-
-    SCHEDULER_LOCK(intSave);
-
-    if (g_mpStaticStartFlag) {
-        PRINT_WARN("mp static has started\n");
-        SCHEDULER_UNLOCK(intSave);
-        return;
-    }
-
-    g_mpStaticStartTime = LOS_CurrNanosec();
-
-    for (loop = 0; loop < g_taskMaxNum; loop++) {
-        taskCB = (((LosTaskCB *)g_taskCBArray) + loop);
-        if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) {
-#ifdef LOSCFG_KERNEL_SMP
-            cpuid = taskCB->currCpu;
-#endif
-            if ((UINT32)(OS_TASK_INVALID_CPUID) == cpuid) {
-                continue;
-            }
-            if (!strcmp(taskCB->taskName, "Idle")) {
-                g_mpStatPercpu[cpuid].idleStarttime = g_mpStaticStartTime;
-            }
-            if (taskCB->priority < HIGHTASKPRI) {
-                g_mpStatPercpu[cpuid].highTaskStarttime = g_mpStaticStartTime;
-                g_mpStatPercpu[cpuid].highTaskSwitch++;
-            }
-            if (strcmp(taskCB->taskName, "Idle")) {
-                g_mpStatPercpu[cpuid].sumPriority += taskCB->priority;
-                g_mpStatPercpu[cpuid].prioritySwitch++;
-            }
-        }
-    }
-    g_mpStaticStartFlag = TRUE;
-    SCHEDULER_UNLOCK(intSave);
-
-    PRINTK("mp static start\n");
-
-    return;
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsMpStaticShow(UINT64 mpStaticPastTime)
-{
-    UINT32 cpuid;
-    PRINTK("\n");
-    PRINTK("Passed Time: %+16lf ms\n", (DOUBLE)mpStaticPastTime / NS_PER_MS);
-    PRINTK("--------------------------------\n");
-    PRINTK("CPU       Idle(%%)      schedule    noTick Hwi        MP Hwi    MP Loss(%%)       "
-           "avg PRI      HiTSK(%%)     HiTSK SCH    HiTSK P(ms)\n");
-    PRINTK("----    ---------    ----------    ----------    ----------    ----------    "
-           "----------    ----------    ----------    ----------\n");
-
-    for (cpuid = 0; cpuid < LOSCFG_KERNEL_CORE_NUM; cpuid++) {
-        PRINTK("CPU%u   %+10lf%14u%14u%14u   %+11lf   %+11lf   %+11lf%14u   %+11lf\n", cpuid,
-               ((DOUBLE)(g_mpStatPercpu[cpuid].idleRuntime) / mpStaticPastTime) * DECIMAL_TO_PERCENTAGE,
-               g_mpStatPercpu[cpuid].contexSwitch,
-               g_mpStatPercpu[cpuid].hwiNum,
-               g_mpStatPercpu[cpuid].ipiIrqNum,
-               ((DOUBLE)(g_mpStatPercpu[cpuid].spinWaitRuntime) / mpStaticPastTime) * DECIMAL_TO_PERCENTAGE,
-               (g_mpStatPercpu[cpuid].prioritySwitch == 0) ? OS_TASK_PRIORITY_LOWEST :
-               ((DOUBLE)(g_mpStatPercpu[cpuid].sumPriority) / (g_mpStatPercpu[cpuid].prioritySwitch)),
-               ((DOUBLE)(g_mpStatPercpu[cpuid].highTaskRuntime) / mpStaticPastTime) * DECIMAL_TO_PERCENTAGE,
-               g_mpStatPercpu[cpuid].highTaskSwitch,
-               (g_mpStatPercpu[cpuid].highTaskSwitch == 0) ? 0 :
-               ((DOUBLE)(g_mpStatPercpu[cpuid].highTaskRuntime) / (g_mpStatPercpu[cpuid].highTaskSwitch)) / NS_PER_MS);
-    }
-
-    PRINTK("\n");
-}
-
-LITE_OS_SEC_TEXT_MINOR VOID OsShellMpStaticStop(VOID)
-{
-    LosTaskCB *taskCB = NULL;
-    UINT32 loop;
-    UINT32 cpuid = 0;
-    UINT64 mpStaticStopTime;
-    UINT64 mpStaticPastTime;
-    UINT64 runtime;
-    UINT32 intSave;
-
-    SCHEDULER_LOCK(intSave);
-
-    if (g_mpStaticStartFlag != TRUE) {
-        PRINT_WARN("Please set mp static start\n");
-        SCHEDULER_UNLOCK(intSave);
-        return;
-    }
-
-    g_mpStaticStartFlag = FALSE;
-    mpStaticStopTime = LOS_CurrNanosec();
-    mpStaticPastTime = mpStaticStopTime - g_mpStaticStartTime;
-
-    for (loop = 0; loop < g_taskMaxNum; loop++) {
-        taskCB = (((LosTaskCB *)g_taskCBArray) + loop);
-        if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) {
-#ifdef LOSCFG_KERNEL_SMP
-            cpuid = taskCB->currCpu;
-#endif
-            if (cpuid == (UINT32)(OS_TASK_INVALID_CPUID)) {
-                continue;
-            }
-            if (!strcmp(taskCB->taskName, "Idle")) {
-                runtime = mpStaticStopTime - g_mpStatPercpu[cpuid].idleStarttime;
-                g_mpStatPercpu[cpuid].idleRuntime += runtime;
-                g_mpStatPercpu[cpuid].idleStarttime = 0;
-            }
-            if (taskCB->priority < HIGHTASKPRI) {
-                runtime = mpStaticStopTime - g_mpStatPercpu[cpuid].highTaskStarttime;
-                g_mpStatPercpu[cpuid].highTaskRuntime += runtime;
-                g_mpStatPercpu[cpuid].highTaskStarttime = 0;
-            }
-        }
-    }
-    SCHEDULER_UNLOCK(intSave);
-    OsMpStaticShow(mpStaticPastTime);
-
-    (VOID)memset_s(g_mpStatPercpu, sizeof(g_mpStatPercpu), 0, sizeof(g_mpStatPercpu));
-    g_mpStaticStartTime = 0;
-    return;
-}
-
-#endif
-

kernel/base/sched/los_idle.c

@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2022-2022 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 "los_sched_pri.h"
+#include "los_process_pri.h"
+
+STATIC VOID IdleDequeue(SchedRunqueue *rq, LosTaskCB *taskCB);
+STATIC VOID IdleEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB);
+STATIC UINT32 IdleWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks);
+STATIC VOID IdleWake(LosTaskCB *resumedTask);
+STATIC UINT32 IdleSchedParamGet(const LosTaskCB *taskCB, SchedParam *param);
+STATIC VOID IdleYield(LosTaskCB *runTask);
+STATIC VOID IdleStartToRun(SchedRunqueue *rq, LosTaskCB *taskCB);
+STATIC UINT32 IdleResume(LosTaskCB *taskCB, BOOL *needSched);
+STATIC UINT64 IdleTimeSliceGet(const LosTaskCB *taskCB);
+STATIC VOID IdleTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime);
+STATIC INT32 IdleParamCompare(const SchedPolicy *sp1, const SchedPolicy *sp2);
+STATIC VOID IdlePriorityInheritance(LosTaskCB *owner, const SchedParam *param);
+STATIC VOID IdlePriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param);
+
+const STATIC SchedOps g_idleOps = {
+    .dequeue = IdleDequeue,
+    .enqueue = IdleEnqueue,
+    .wait = IdleWait,
+    .wake = IdleWake,
+    .schedParamModify = NULL,
+    .schedParamGet = IdleSchedParamGet,
+    .delay = NULL,
+    .yield = IdleYield,
+    .start = IdleStartToRun,
+    .exit = NULL,
+    .suspend = NULL,
+    .resume = IdleResume,
+    .deadlineGet = IdleTimeSliceGet,
+    .timeSliceUpdate = IdleTimeSliceUpdate,
+    .schedParamCompare = IdleParamCompare,
+    .priorityInheritance = IdlePriorityInheritance,
+    .priorityRestore = IdlePriorityRestore,
+};
+
+STATIC VOID IdleTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime)
+{
+    (VOID)rq;
+
+    taskCB->startTime = currTime;
+}
+
+STATIC UINT64 IdleTimeSliceGet(const LosTaskCB *taskCB)
+{
+    (VOID)taskCB;
+    return (OS_SCHED_MAX_RESPONSE_TIME - OS_TICK_RESPONSE_PRECISION);
+}
+
+STATIC VOID IdleEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB)
+{
+    (VOID)rq;
+
+    taskCB->taskStatus &= ~OS_TASK_STATUS_BLOCKED;
+    taskCB->taskStatus |= OS_TASK_STATUS_READY;
+}
+
+STATIC VOID IdleDequeue(SchedRunqueue *rq, LosTaskCB *taskCB)
+{
+    (VOID)rq;
+
+    taskCB->taskStatus &= ~OS_TASK_STATUS_READY;
+}
+
+STATIC VOID IdleStartToRun(SchedRunqueue *rq, LosTaskCB *taskCB)
+{
+    IdleDequeue(rq, taskCB);
+}
+
+STATIC VOID IdleYield(LosTaskCB *runTask)
+{
+    (VOID)runTask;
+    return;
+}
+
+STATIC UINT32 IdleWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks)
+{
+    (VOID)runTask;
+    (VOID)list;
+    (VOID)ticks;
+
+    return LOS_NOK;
+}
+
+STATIC VOID IdleWake(LosTaskCB *resumedTask)
+{
+    LOS_ListDelete(&resumedTask->pendList);
+    resumedTask->taskStatus &= ~OS_TASK_STATUS_PENDING;
+
+    if (resumedTask->taskStatus & OS_TASK_STATUS_PEND_TIME) {
+        OsSchedTimeoutQueueDelete(resumedTask);
+        resumedTask->taskStatus &= ~OS_TASK_STATUS_PEND_TIME;
+    }
+
+    if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) {
+#ifdef LOSCFG_SCHED_DEBUG
+        resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime;
+        resumedTask->schedStat.pendCount++;
+#endif
+        resumedTask->ops->enqueue(OsSchedRunqueue(), resumedTask);
+    }
+}
+
+STATIC UINT32 IdleResume(LosTaskCB *taskCB, BOOL *needSched)
+{
+    *needSched = FALSE;
+
+    taskCB->taskStatus &= ~OS_TASK_STATUS_SUSPENDED;
+    if (!OsTaskIsBlocked(taskCB)) {
+        taskCB->ops->enqueue(OsSchedRunqueue(), taskCB);
+        *needSched = TRUE;
+    }
+    return LOS_OK;
+}
+
+STATIC UINT32 IdleSchedParamGet(const LosTaskCB *taskCB, SchedParam *param)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+    param->policy = sched->policy;
+    param->basePrio = sched->basePrio;
+    param->priority = sched->priority;
+    param->timeSlice = 0;
+    return LOS_OK;
+}
+
+STATIC INT32 IdleParamCompare(const SchedPolicy *sp1, const SchedPolicy *sp2)
+{
+    return 0;
+}
+
+STATIC VOID IdlePriorityInheritance(LosTaskCB *owner, const SchedParam *param)
+{
+    (VOID)owner;
+    (VOID)param;
+    return;
+}
+
+STATIC VOID IdlePriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param)
+{
+    (VOID)owner;
+    (VOID)list;
+    (VOID)param;
+    return;
+}
+
+VOID IdleTaskSchedParamInit(LosTaskCB *taskCB)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+    sched->policy = LOS_SCHED_IDLE;
+    sched->basePrio = OS_PROCESS_PRIORITY_LOWEST;
+    sched->priority = OS_TASK_PRIORITY_LOWEST;
+    sched->initTimeSlice = 0;
+    taskCB->timeSlice = sched->initTimeSlice;
+    taskCB->taskStatus = OS_TASK_STATUS_SUSPENDED;
+    taskCB->ops = &g_idleOps;
+}

kernel/base/sched/los_priority.c

@@ -0,0 +1,546 @@
+/*
+ * Copyright (c) 2022-2022 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 "los_sched_pri.h"
+#include "los_task_pri.h"
+#include "los_process_pri.h"
+#include "los_hook.h"
+#include "los_tick_pri.h"
+#include "los_mp.h"
+
+#define OS_SCHED_FIFO_TIMEOUT      0x7FFFFFFF
+#define PRIQUEUE_PRIOR0_BIT        0x80000000U
+#define OS_SCHED_TIME_SLICES_MIN   ((5000 * OS_SYS_NS_PER_US) / OS_NS_PER_CYCLE)  /* 5ms */
+#define OS_SCHED_TIME_SLICES_MAX   ((LOSCFG_BASE_CORE_TIMESLICE_TIMEOUT * OS_SYS_NS_PER_US) / OS_NS_PER_CYCLE)
+#define OS_SCHED_TIME_SLICES_DIFF  (OS_SCHED_TIME_SLICES_MAX - OS_SCHED_TIME_SLICES_MIN)
+#define OS_SCHED_READY_MAX         30
+#define OS_TIME_SLICE_MIN          (INT32)((50 * OS_SYS_NS_PER_US) / OS_NS_PER_CYCLE) /* 50us */
+
+STATIC HPFRunqueue g_schedHPF;
+
+STATIC VOID HPFDequeue(SchedRunqueue *rq, LosTaskCB *taskCB);
+STATIC VOID HPFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB);
+STATIC UINT32 HPFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks);
+STATIC VOID HPFWake(LosTaskCB *resumedTask);
+STATIC BOOL HPFSchedParamModify(LosTaskCB *taskCB, const SchedParam *param);
+STATIC UINT32 HPFSchedParamGet(const LosTaskCB *taskCB, SchedParam *param);
+STATIC UINT32 HPFDelay(LosTaskCB *runTask, UINT64 waitTime);
+STATIC VOID HPFYield(LosTaskCB *runTask);
+STATIC VOID HPFStartToRun(SchedRunqueue *rq, LosTaskCB *taskCB);
+STATIC VOID HPFExit(LosTaskCB *taskCB);
+STATIC UINT32 HPFSuspend(LosTaskCB *taskCB);
+STATIC UINT32 HPFResume(LosTaskCB *taskCB, BOOL *needSched);
+STATIC UINT64 HPFTimeSliceGet(const LosTaskCB *taskCB);
+STATIC VOID HPFTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime);
+STATIC INT32 HPFParamCompare(const SchedPolicy *sp1, const SchedPolicy *sp2);
+STATIC VOID HPFPriorityInheritance(LosTaskCB *owner, const SchedParam *param);
+STATIC VOID HPFPriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param);
+
+const STATIC SchedOps g_priorityOps = {
+    .dequeue = HPFDequeue,
+    .enqueue = HPFEnqueue,
+    .wait = HPFWait,
+    .wake = HPFWake,
+    .schedParamModify = HPFSchedParamModify,
+    .schedParamGet = HPFSchedParamGet,
+    .delay = HPFDelay,
+    .yield = HPFYield,
+    .start = HPFStartToRun,
+    .exit = HPFExit,
+    .suspend = HPFSuspend,
+    .resume = HPFResume,
+    .deadlineGet = HPFTimeSliceGet,
+    .timeSliceUpdate = HPFTimeSliceUpdate,
+    .schedParamCompare = HPFParamCompare,
+    .priorityInheritance = HPFPriorityInheritance,
+    .priorityRestore = HPFPriorityRestore,
+};
+
+STATIC VOID HPFTimeSliceUpdate(SchedRunqueue *rq, LosTaskCB *taskCB, UINT64 currTime)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+    LOS_ASSERT(currTime >= taskCB->startTime);
+
+    INT32 incTime = (currTime - taskCB->startTime - taskCB->irqUsedTime);
+
+    LOS_ASSERT(incTime >= 0);
+
+    if (sched->policy == LOS_SCHED_RR) {
+        taskCB->timeSlice -= incTime;
+#ifdef LOSCFG_SCHED_DEBUG
+        taskCB->schedStat.timeSliceRealTime += incTime;
+#endif
+    }
+    taskCB->irqUsedTime = 0;
+    taskCB->startTime = currTime;
+    if (taskCB->timeSlice <= OS_TIME_SLICE_MIN) {
+        rq->schedFlag |= INT_PEND_RESCH;
+    }
+
+#ifdef LOSCFG_SCHED_DEBUG
+    taskCB->schedStat.allRuntime += incTime;
+#endif
+}
+
+STATIC UINT64 HPFTimeSliceGet(const LosTaskCB *taskCB)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+    INT32 timeSlice = taskCB->timeSlice;
+
+    timeSlice = (timeSlice <= OS_TIME_SLICE_MIN) ? sched->initTimeSlice : timeSlice;
+    return (taskCB->startTime + timeSlice);
+}
+
+STATIC INLINE UINT32 TimeSliceCalculate(HPFRunqueue *rq, UINT16 basePrio, UINT16 priority)
+{
+    UINT32 time;
+    UINT32 readyTasks;
+
+    HPFQueue *queueList = &rq->queueList[basePrio];
+    readyTasks = queueList->readyTasks[priority];
+    if (readyTasks > OS_SCHED_READY_MAX) {
+        return OS_SCHED_TIME_SLICES_MIN;
+    }
+    time = ((OS_SCHED_READY_MAX - readyTasks) * OS_SCHED_TIME_SLICES_DIFF) / OS_SCHED_READY_MAX;
+    return (time + OS_SCHED_TIME_SLICES_MIN);
+}
+
+STATIC INLINE VOID PriQueHeadInsert(HPFRunqueue *rq, UINT32 basePrio, LOS_DL_LIST *priQue, UINT32 priority)
+{
+    HPFQueue *queueList = &rq->queueList[basePrio];
+    LOS_DL_LIST *priQueList = &queueList->priQueList[0];
+    UINT32 *bitmap = &queueList->queueBitmap;
+
+    /*
+     * Task control blocks are inited as zero. And when task is deleted,
+     * and at the same time would be deleted from priority queue or
+     * other lists, task pend node will restored as zero.
+     */
+    LOS_ASSERT(priQue->pstNext == NULL);
+
+    if (*bitmap == 0) {
+        rq->queueBitmap |= PRIQUEUE_PRIOR0_BIT >> basePrio;
+    }
+
+    if (LOS_ListEmpty(&priQueList[priority])) {
+        *bitmap |= PRIQUEUE_PRIOR0_BIT >> priority;
+    }
+
+    LOS_ListHeadInsert(&priQueList[priority], priQue);
+    queueList->readyTasks[priority]++;
+}
+
+STATIC INLINE VOID PriQueTailInsert(HPFRunqueue *rq, UINT32 basePrio, LOS_DL_LIST *priQue, UINT32 priority)
+{
+    HPFQueue *queueList = &rq->queueList[basePrio];
+    LOS_DL_LIST *priQueList = &queueList->priQueList[0];
+    UINT32 *bitmap = &queueList->queueBitmap;
+
+    /*
+     * Task control blocks are inited as zero. And when task is deleted,
+     * and at the same time would be deleted from priority queue or
+     * other lists, task pend node will restored as zero.
+     */
+    LOS_ASSERT(priQue->pstNext == NULL);
+
+    if (*bitmap == 0) {
+        rq->queueBitmap |= PRIQUEUE_PRIOR0_BIT >> basePrio;
+    }
+
+    if (LOS_ListEmpty(&priQueList[priority])) {
+        *bitmap |= PRIQUEUE_PRIOR0_BIT >> priority;
+    }
+
+    LOS_ListTailInsert(&priQueList[priority], priQue);
+    queueList->readyTasks[priority]++;
+}
+
+STATIC INLINE VOID PriQueDelete(HPFRunqueue *rq, UINT32 basePrio, LOS_DL_LIST *priQue, UINT32 priority)
+{
+    HPFQueue *queueList = &rq->queueList[basePrio];
+    LOS_DL_LIST *priQueList = &queueList->priQueList[0];
+    UINT32 *bitmap = &queueList->queueBitmap;
+
+    LOS_ListDelete(priQue);
+    queueList->readyTasks[priority]--;
+    if (LOS_ListEmpty(&priQueList[priority])) {
+        *bitmap &= ~(PRIQUEUE_PRIOR0_BIT >> priority);
+    }
+
+    if (*bitmap == 0) {
+        rq->queueBitmap &= ~(PRIQUEUE_PRIOR0_BIT >> basePrio);
+    }
+}
+
+STATIC INLINE VOID PriQueInsert(HPFRunqueue *rq, LosTaskCB *taskCB)
+{
+    LOS_ASSERT(!(taskCB->taskStatus & OS_TASK_STATUS_READY));
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+
+    switch (sched->policy) {
+        case LOS_SCHED_RR: {
+            if (taskCB->timeSlice > OS_TIME_SLICE_MIN) {
+                PriQueHeadInsert(rq, sched->basePrio, &taskCB->pendList, sched->priority);
+            } else {
+                sched->initTimeSlice = TimeSliceCalculate(rq, sched->basePrio, sched->priority);
+                taskCB->timeSlice = sched->initTimeSlice;
+                PriQueTailInsert(rq, sched->basePrio, &taskCB->pendList, sched->priority);
+#ifdef LOSCFG_SCHED_DEBUG
+                taskCB->schedStat.timeSliceTime = taskCB->schedStat.timeSliceRealTime;
+                taskCB->schedStat.timeSliceCount++;
+#endif
+            }
+            break;
+        }
+        case LOS_SCHED_FIFO: {
+            /* The time slice of FIFO is always greater than 0 unless the yield is called */
+            if ((taskCB->timeSlice > OS_TIME_SLICE_MIN) && (taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) {
+                PriQueHeadInsert(rq, sched->basePrio, &taskCB->pendList, sched->priority);
+            } else {
+                sched->initTimeSlice = OS_SCHED_FIFO_TIMEOUT;
+                taskCB->timeSlice = sched->initTimeSlice;
+                PriQueTailInsert(rq, sched->basePrio, &taskCB->pendList, sched->priority);
+            }
+            break;
+        }
+        default:
+            LOS_ASSERT(0);
+            break;
+    }
+
+    taskCB->taskStatus &= ~OS_TASK_STATUS_BLOCKED;
+    taskCB->taskStatus |= OS_TASK_STATUS_READY;
+}
+
+STATIC VOID HPFEnqueue(SchedRunqueue *rq, LosTaskCB *taskCB)
+{
+#ifdef LOSCFG_SCHED_DEBUG
+    if (!(taskCB->taskStatus & OS_TASK_STATUS_RUNNING)) {
+        taskCB->startTime = OsGetCurrSchedTimeCycle();
+    }
+#endif
+    PriQueInsert(rq->hpfRunqueue, taskCB);
+}
+
+STATIC VOID HPFDequeue(SchedRunqueue *rq, LosTaskCB *taskCB)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+
+    if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
+        PriQueDelete(rq->hpfRunqueue, sched->basePrio, &taskCB->pendList, sched->priority);
+        taskCB->taskStatus &= ~OS_TASK_STATUS_READY;
+    }
+}
+
+STATIC VOID HPFStartToRun(SchedRunqueue *rq, LosTaskCB *taskCB)
+{
+    HPFDequeue(rq, taskCB);
+}
+
+STATIC VOID HPFExit(LosTaskCB *taskCB)
+{
+    if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
+        HPFDequeue(OsSchedRunqueue(), taskCB);
+    } else if (taskCB->taskStatus & OS_TASK_STATUS_PENDING) {
+        LOS_ListDelete(&taskCB->pendList);
+        taskCB->taskStatus &= ~OS_TASK_STATUS_PENDING;
+    }
+
+    if (taskCB->taskStatus & (OS_TASK_STATUS_DELAY | OS_TASK_STATUS_PEND_TIME)) {
+        OsSchedTimeoutQueueDelete(taskCB);
+        taskCB->taskStatus &= ~(OS_TASK_STATUS_DELAY | OS_TASK_STATUS_PEND_TIME);
+    }
+}
+
+STATIC VOID HPFYield(LosTaskCB *runTask)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+    runTask->timeSlice = 0;
+
+    runTask->startTime = OsGetCurrSchedTimeCycle();
+    HPFEnqueue(rq, runTask);
+    OsSchedResched();
+}
+
+STATIC UINT32 HPFDelay(LosTaskCB *runTask, UINT64 waitTime)
+{
+    runTask->taskStatus |= OS_TASK_STATUS_DELAY;
+    runTask->waitTime = waitTime;
+
+    OsSchedResched();
+    return LOS_OK;
+}
+
+STATIC UINT32 HPFWait(LosTaskCB *runTask, LOS_DL_LIST *list, UINT32 ticks)
+{
+    runTask->taskStatus |= OS_TASK_STATUS_PENDING;
+    LOS_ListTailInsert(list, &runTask->pendList);
+
+    if (ticks != LOS_WAIT_FOREVER) {
+        runTask->taskStatus |= OS_TASK_STATUS_PEND_TIME;
+        runTask->waitTime = OS_SCHED_TICK_TO_CYCLE(ticks);
+    }
+
+    if (OsPreemptableInSched()) {
+        OsSchedResched();
+        if (runTask->taskStatus & OS_TASK_STATUS_TIMEOUT) {
+            runTask->taskStatus &= ~OS_TASK_STATUS_TIMEOUT;
+            return LOS_ERRNO_TSK_TIMEOUT;
+        }
+    }
+
+    return LOS_OK;
+}
+
+STATIC VOID HPFWake(LosTaskCB *resumedTask)
+{
+    LOS_ListDelete(&resumedTask->pendList);
+    resumedTask->taskStatus &= ~OS_TASK_STATUS_PENDING;
+
+    if (resumedTask->taskStatus & OS_TASK_STATUS_PEND_TIME) {
+        OsSchedTimeoutQueueDelete(resumedTask);
+        resumedTask->taskStatus &= ~OS_TASK_STATUS_PEND_TIME;
+    }
+
+    if (!(resumedTask->taskStatus & OS_TASK_STATUS_SUSPENDED)) {
+#ifdef LOSCFG_SCHED_DEBUG
+        resumedTask->schedStat.pendTime += OsGetCurrSchedTimeCycle() - resumedTask->startTime;
+        resumedTask->schedStat.pendCount++;
+#endif
+        HPFEnqueue(OsSchedRunqueue(), resumedTask);
+    }
+}
+
+STATIC BOOL BasePriorityModify(SchedRunqueue *rq, LosTaskCB *taskCB, UINT16 priority)
+{
+    LosProcessCB *processCB = OS_PCB_FROM_PID(taskCB->processID);
+    BOOL needSched = FALSE;
+
+    LOS_DL_LIST_FOR_EACH_ENTRY(taskCB, &processCB->threadSiblingList, LosTaskCB, threadList) {
+        SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+        if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
+            taskCB->ops->dequeue(rq, taskCB);
+            sched->basePrio = priority;
+            taskCB->ops->enqueue(rq, taskCB);
+        } else {
+            sched->basePrio = priority;
+        }
+        if (taskCB->taskStatus & (OS_TASK_STATUS_READY | OS_TASK_STATUS_RUNNING)) {
+            needSched = TRUE;
+        }
+    }
+
+    return needSched;
+}
+
+STATIC BOOL HPFSchedParamModify(LosTaskCB *taskCB, const SchedParam *param)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+    BOOL needSched = FALSE;
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+
+    if (sched->policy != param->policy) {
+        sched->policy = param->policy;
+        taskCB->timeSlice = 0;
+    }
+
+    if (sched->basePrio != param->basePrio) {
+        needSched = BasePriorityModify(rq, taskCB, param->basePrio);
+    }
+
+    if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
+        HPFDequeue(rq, taskCB);
+        sched->priority = param->priority;
+        HPFEnqueue(rq, taskCB);
+        return TRUE;
+    }
+
+    sched->priority = param->priority;
+    OsHookCall(LOS_HOOK_TYPE_TASK_PRIMODIFY, taskCB, sched->priority);
+    if (taskCB->taskStatus & OS_TASK_STATUS_INIT) {
+        HPFEnqueue(rq, taskCB);
+        return TRUE;
+    }
+
+    if (taskCB->taskStatus & OS_TASK_STATUS_RUNNING) {
+        return TRUE;
+    }
+
+    return needSched;
+}
+
+STATIC UINT32 HPFSchedParamGet(const LosTaskCB *taskCB, SchedParam *param)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+    param->policy = sched->policy;
+    param->basePrio = sched->basePrio;
+    param->priority = sched->priority;
+    param->timeSlice = sched->initTimeSlice;
+    return LOS_OK;
+}
+
+STATIC UINT32 HPFSuspend(LosTaskCB *taskCB)
+{
+    if (taskCB->taskStatus & OS_TASK_STATUS_READY) {
+        HPFDequeue(OsSchedRunqueue(), taskCB);
+    }
+
+    SchedTaskFreeze(taskCB);
+
+    taskCB->taskStatus |= OS_TASK_STATUS_SUSPENDED;
+    OsHookCall(LOS_HOOK_TYPE_MOVEDTASKTOSUSPENDEDLIST, taskCB);
+    if (taskCB == OsCurrTaskGet()) {
+        OsSchedResched();
+    }
+    return LOS_OK;
+}
+
+STATIC UINT32 HPFResume(LosTaskCB *taskCB, BOOL *needSched)
+{
+    *needSched = FALSE;
+
+    SchedTaskUnfreeze(taskCB);
+
+    taskCB->taskStatus &= ~OS_TASK_STATUS_SUSPENDED;
+    if (!OsTaskIsBlocked(taskCB)) {
+        HPFEnqueue(OsSchedRunqueue(), taskCB);
+        *needSched = TRUE;
+    }
+
+    return LOS_OK;
+}
+
+STATIC INT32 HPFParamCompare(const SchedPolicy *sp1, const SchedPolicy *sp2)
+{
+    SchedHPF *param1 = (SchedHPF *)sp1;
+    SchedHPF *param2 = (SchedHPF *)sp2;
+
+    if (param1->basePrio != param2->basePrio) {
+        return (param1->basePrio - param2->basePrio);
+    }
+
+    return (param1->priority - param2->priority);
+}
+
+STATIC VOID HPFPriorityInheritance(LosTaskCB *owner, const SchedParam *param)
+{
+    SchedHPF *sp = (SchedHPF *)&owner->sp;
+
+    if ((param->policy != LOS_SCHED_RR) && (param->policy != LOS_SCHED_FIFO)) {
+        return;
+    }
+
+    if (sp->priority <= param->priority) {
+        return;
+    }
+
+    LOS_BitmapSet(&sp->priBitmap, sp->priority);
+    sp->priority = param->priority;
+}
+
+STATIC VOID HPFPriorityRestore(LosTaskCB *owner, const LOS_DL_LIST *list, const SchedParam *param)
+{
+    UINT16 priority;
+    LosTaskCB *pendedTask = NULL;
+
+    if ((param->policy != LOS_SCHED_RR) && (param->policy != LOS_SCHED_FIFO)) {
+        return;
+    }
+
+    SchedHPF *sp = (SchedHPF *)&owner->sp;
+    if (sp->priority < param->priority) {
+        if (LOS_HighBitGet(sp->priBitmap) != param->priority) {
+            LOS_BitmapClr(&sp->priBitmap, param->priority);
+        }
+        return;
+    }
+
+    if (sp->priBitmap == 0) {
+        return;
+    }
+
+    if ((list != NULL) && !LOS_ListEmpty((LOS_DL_LIST *)list)) {
+        priority = LOS_HighBitGet(sp->priBitmap);
+        LOS_DL_LIST_FOR_EACH_ENTRY(pendedTask, list, LosTaskCB, pendList) {
+            SchedHPF *pendSp = (SchedHPF *)&pendedTask->sp;
+            if ((pendedTask->ops == owner->ops) && (priority != pendSp->priority)) {
+                LOS_BitmapClr(&sp->priBitmap, pendSp->priority);
+            }
+        }
+    }
+
+    priority = LOS_LowBitGet(sp->priBitmap);
+    if (priority != LOS_INVALID_BIT_INDEX) {
+        LOS_BitmapClr(&sp->priBitmap, priority);
+        sp->priority = priority;
+    }
+}
+
+VOID HPFTaskSchedParamInit(LosTaskCB *taskCB, UINT16 policy,
+                           const SchedParam *parentParam,
+                           const TSK_INIT_PARAM_S *param)
+{
+    SchedHPF *sched = (SchedHPF *)&taskCB->sp;
+
+    sched->policy = policy;
+    if (param != NULL) {
+        sched->priority = param->usTaskPrio;
+    } else {
+        sched->priority = parentParam->priority;
+    }
+    sched->basePrio = parentParam->basePrio;
+
+    sched->initTimeSlice = 0;
+    taskCB->timeSlice = sched->initTimeSlice;
+    taskCB->ops = &g_priorityOps;
+}
+
+VOID HPFProcessDefaultSchedParamGet(SchedParam *param)
+{
+    param->basePrio = OS_USER_PROCESS_PRIORITY_HIGHEST;
+}
+
+VOID HPFSchedPolicyInit(SchedRunqueue *rq)
+{
+    if (ArchCurrCpuid() > 0) {
+        rq->hpfRunqueue = &g_schedHPF;
+        return;
+    }
+
+    for (UINT16 index = 0; index < OS_PRIORITY_QUEUE_NUM; index++) {
+        HPFQueue *queueList = &g_schedHPF.queueList[index];
+        LOS_DL_LIST *priQue = &queueList->priQueList[0];
+        for (UINT16 prio = 0; prio < OS_PRIORITY_QUEUE_NUM; prio++) {
+            LOS_ListInit(&priQue[prio]);
+        }
+    }
+
+    rq->hpfRunqueue = &g_schedHPF;
+}

kernel/base/sched/los_sched.c

@@ -0,0 +1,538 @@
+/*
+ * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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 "los_sched_pri.h"
+#include "los_hw_pri.h"
+#include "los_task_pri.h"
+#include "los_swtmr_pri.h"
+#include "los_process_pri.h"
+#include "los_arch_mmu.h"
+#include "los_hook.h"
+#ifdef LOSCFG_KERNEL_CPUP
+#include "los_cpup_pri.h"
+#endif
+#include "los_hw_tick_pri.h"
+#include "los_tick_pri.h"
+#ifdef LOSCFG_BASE_CORE_TSK_MONITOR
+#include "los_stackinfo_pri.h"
+#endif
+#include "los_mp.h"
+
+SchedRunqueue g_schedRunqueue[LOSCFG_KERNEL_CORE_NUM];
+
+STATIC INLINE VOID SchedNextExpireTimeSet(UINT32 responseID, UINT64 taskEndTime, UINT32 oldResponseID)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+    BOOL isTimeSlice = FALSE;
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    UINT64 nextExpireTime = OsGetSortLinkNextExpireTime(&rq->timeoutQueue, currTime, OS_TICK_RESPONSE_PRECISION);
+
+    rq->schedFlag &= ~INT_PEND_TICK;
+    if (rq->responseID == oldResponseID) {
+        /* This time has expired, and the next time the theory has expired is infinite */
+        rq->responseTime = OS_SCHED_MAX_RESPONSE_TIME;
+    }
+
+    /* The current thread's time slice has been consumed, but the current system lock task cannot
+     * trigger the schedule to release the CPU
+     */
+    if ((nextExpireTime > taskEndTime) && ((nextExpireTime - taskEndTime) > OS_SCHED_MINI_PERIOD)) {
+        nextExpireTime = taskEndTime;
+        isTimeSlice = TRUE;
+    }
+
+    if ((rq->responseTime <= nextExpireTime) ||
+        ((rq->responseTime - nextExpireTime) < OS_TICK_RESPONSE_PRECISION)) {
+        return;
+    }
+
+    if (isTimeSlice) {
+        /* The expiration time of the current system is the thread's slice expiration time */
+        rq->responseID = responseID;
+    } else {
+        rq->responseID = OS_INVALID_VALUE;
+    }
+
+    UINT64 nextResponseTime = nextExpireTime - currTime;
+    rq->responseTime = currTime + HalClockTickTimerReload(nextResponseTime);
+}
+
+VOID OsSchedExpireTimeUpdate(VOID)
+{
+    UINT32 intSave;
+    if (!OS_SCHEDULER_ACTIVE || OS_INT_ACTIVE) {
+        OsSchedRunqueuePendingSet();
+        return;
+    }
+
+    LosTaskCB *runTask = OsCurrTaskGet();
+    SCHEDULER_LOCK(intSave);
+    UINT64 deadline = runTask->ops->deadlineGet(runTask);
+    SCHEDULER_UNLOCK(intSave);
+    SchedNextExpireTimeSet(runTask->taskID, deadline, runTask->taskID);
+}
+
+STATIC INLINE VOID SchedTimeoutTaskWake(SchedRunqueue *rq, UINT64 currTime, LosTaskCB *taskCB, BOOL *needSched)
+{
+#ifndef LOSCFG_SCHED_DEBUG
+    (VOID)currTime;
+#endif
+
+    LOS_SpinLock(&g_taskSpin);
+    UINT16 tempStatus = taskCB->taskStatus;
+    if (tempStatus & (OS_TASK_STATUS_PENDING | OS_TASK_STATUS_DELAY)) {
+        taskCB->taskStatus &= ~(OS_TASK_STATUS_PENDING | OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY);
+        if (tempStatus & OS_TASK_STATUS_PENDING) {
+            taskCB->taskStatus |= OS_TASK_STATUS_TIMEOUT;
+            LOS_ListDelete(&taskCB->pendList);
+            taskCB->taskMux = NULL;
+            OsTaskWakeClearPendMask(taskCB);
+        }
+
+        if (!(tempStatus & OS_TASK_STATUS_SUSPENDED)) {
+#ifdef LOSCFG_SCHED_DEBUG
+            taskCB->schedStat.pendTime += currTime - taskCB->startTime;
+            taskCB->schedStat.pendCount++;
+#endif
+            taskCB->ops->enqueue(rq, taskCB);
+            *needSched = TRUE;
+        }
+    }
+
+    LOS_SpinUnlock(&g_taskSpin);
+}
+
+STATIC INLINE BOOL SchedTimeoutQueueScan(SchedRunqueue *rq)
+{
+    BOOL needSched = FALSE;
+    SortLinkAttribute *timeoutQueue = &rq->timeoutQueue;
+    LOS_DL_LIST *listObject = &timeoutQueue->sortLink;
+    /*
+     * When task is pended with timeout, the task block is on the timeout sortlink
+     * (per cpu) and ipc(mutex,sem and etc.)'s block at the same time, it can be waken
+     * up by either timeout or corresponding ipc it's waiting.
+     *
+     * Now synchronize sortlink procedure is used, therefore the whole task scan needs
+     * to be protected, preventing another core from doing sortlink deletion at same time.
+     */
+    LOS_SpinLock(&timeoutQueue->spinLock);
+
+    if (LOS_ListEmpty(listObject)) {
+        LOS_SpinUnlock(&timeoutQueue->spinLock);
+        return needSched;
+    }
+
+    SortLinkList *sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    while (sortList->responseTime <= currTime) {
+        LosTaskCB *taskCB = LOS_DL_LIST_ENTRY(sortList, LosTaskCB, sortList);
+        OsDeleteNodeSortLink(timeoutQueue, &taskCB->sortList);
+        LOS_SpinUnlock(&timeoutQueue->spinLock);
+
+        SchedTimeoutTaskWake(rq, currTime, taskCB, &needSched);
+
+        LOS_SpinLock(&timeoutQueue->spinLock);
+        if (LOS_ListEmpty(listObject)) {
+            break;
+        }
+
+        sortList = LOS_DL_LIST_ENTRY(listObject->pstNext, SortLinkList, sortLinkNode);
+    }
+
+    LOS_SpinUnlock(&timeoutQueue->spinLock);
+
+    return needSched;
+}
+
+VOID OsSchedTick(VOID)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+
+    if (rq->responseID == OS_INVALID_VALUE) {
+        if (SchedTimeoutQueueScan(rq)) {
+            LOS_MpSchedule(OS_MP_CPU_ALL);
+            rq->schedFlag |= INT_PEND_RESCH;
+        }
+    }
+    rq->schedFlag |= INT_PEND_TICK;
+    rq->responseTime = OS_SCHED_MAX_RESPONSE_TIME;
+}
+
+VOID OsSchedResponseTimeReset(UINT64 responseTime)
+{
+    OsSchedRunqueue()->responseTime = responseTime;
+}
+
+VOID OsSchedRunqueueInit(VOID)
+{
+    if (ArchCurrCpuid() != 0) {
+        return;
+    }
+
+    for (UINT16 index = 0; index < LOSCFG_KERNEL_CORE_NUM; index++) {
+        SchedRunqueue *rq = OsSchedRunqueueByID(index);
+        OsSortLinkInit(&rq->timeoutQueue);
+        rq->responseTime = OS_SCHED_MAX_RESPONSE_TIME;
+    }
+}
+
+VOID OsSchedRunqueueIdleInit(UINT32 idleTaskID)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+    rq->idleTaskID = idleTaskID;
+}
+
+UINT32 OsSchedInit(VOID)
+{
+    for (UINT16 cpuId = 0; cpuId < LOSCFG_KERNEL_CORE_NUM; cpuId++) {
+        HPFSchedPolicyInit(OsSchedRunqueueByID(cpuId));
+    }
+
+#ifdef LOSCFG_SCHED_TICK_DEBUG
+    UINT32 ret = OsSchedDebugInit();
+    if (ret != LOS_OK) {
+        return ret;
+    }
+#endif
+    return LOS_OK;
+}
+
+/*
+ * If the return value greater than 0,  task1 has a lower priority than task2.
+ * If the return value less than 0, task1 has a higher priority than task2.
+ * If the return value is 0, task1 and task2 have the same priority.
+ */
+INT32 OsSchedParamCompare(const LosTaskCB *task1, const LosTaskCB *task2)
+{
+    SchedHPF *rp1 = (SchedHPF *)&task1->sp;
+    SchedHPF *rp2 = (SchedHPF *)&task2->sp;
+
+    if (rp1->policy == rp2->policy) {
+        return task1->ops->schedParamCompare(&task1->sp, &task2->sp);
+    }
+
+    if (rp1->policy == LOS_SCHED_IDLE) {
+        return 1;
+    } else if (rp2->policy == LOS_SCHED_IDLE) {
+        return -1;
+    }
+    return 0;
+}
+
+UINT32 OsSchedParamInit(LosTaskCB *taskCB, UINT16 policy, const SchedParam *parentParam, const TSK_INIT_PARAM_S *param)
+{
+    switch (policy) {
+        case LOS_SCHED_FIFO:
+        case LOS_SCHED_RR:
+            HPFTaskSchedParamInit(taskCB, policy, parentParam, param);
+            break;
+        case LOS_SCHED_IDLE:
+            IdleTaskSchedParamInit(taskCB);
+            break;
+        default:
+            return LOS_NOK;
+    }
+
+    return LOS_OK;
+}
+
+VOID OsSchedProcessDefaultSchedParamGet(UINT16 policy, SchedParam *param)
+{
+    switch (policy) {
+        case LOS_SCHED_FIFO:
+        case LOS_SCHED_RR:
+            HPFProcessDefaultSchedParamGet(param);
+            break;
+        case LOS_SCHED_IDLE:
+        default:
+            PRINT_ERR("Invalid process-level scheduling policy, %u\n", policy);
+            break;
+    }
+    return;
+}
+
+STATIC LosTaskCB *TopTaskGet(SchedRunqueue *rq)
+{
+    LosTaskCB *newTask = HPFRunqueueTopTaskGet(rq->hpfRunqueue);
+
+    if (newTask == NULL) {
+        newTask = OS_TCB_FROM_TID(rq->idleTaskID);
+    }
+
+    newTask->ops->start(rq, newTask);
+    return newTask;
+}
+
+VOID OsSchedStart(VOID)
+{
+    UINT32 cpuid = ArchCurrCpuid();
+    UINT32 intSave;
+
+    PRINTK("cpu %d entering scheduler\n", cpuid);
+
+    SCHEDULER_LOCK(intSave);
+
+    OsTickStart();
+
+    SchedRunqueue *rq = OsSchedRunqueue();
+    LosTaskCB *newTask = TopTaskGet(rq);
+    newTask->taskStatus |= OS_TASK_STATUS_RUNNING;
+
+#ifdef LOSCFG_KERNEL_SMP
+    /*
+     * attention: current cpu needs to be set, in case first task deletion
+     * may fail because this flag mismatch with the real current cpu.
+     */
+    newTask->currCpu = cpuid;
+#endif
+
+    OsCurrTaskSet((VOID *)newTask);
+
+    newTask->startTime = OsGetCurrSchedTimeCycle();
+
+    OsSwtmrResponseTimeReset(newTask->startTime);
+
+    /* System start schedule */
+    OS_SCHEDULER_SET(cpuid);
+
+    rq->responseID = OS_INVALID;
+    UINT64 deadline = newTask->ops->deadlineGet(newTask);
+    SchedNextExpireTimeSet(newTask->taskID, deadline, OS_INVALID);
+    OsTaskContextLoad(newTask);
+}
+
+#ifdef LOSCFG_KERNEL_SMP
+VOID OsSchedToUserReleaseLock(VOID)
+{
+    /* The scheduling lock needs to be released before returning to user mode */
+    LOCKDEP_CHECK_OUT(&g_taskSpin);
+    ArchSpinUnlock(&g_taskSpin.rawLock);
+
+    OsSchedUnlock();
+}
+#endif
+
+#ifdef LOSCFG_BASE_CORE_TSK_MONITOR
+STATIC VOID TaskStackCheck(LosTaskCB *runTask, LosTaskCB *newTask)
+{
+    if (!OS_STACK_MAGIC_CHECK(runTask->topOfStack)) {
+        LOS_Panic("CURRENT task ID: %s:%d stack overflow!\n", runTask->taskName, runTask->taskID);
+    }
+
+    if (((UINTPTR)(newTask->stackPointer) <= newTask->topOfStack) ||
+        ((UINTPTR)(newTask->stackPointer) > (newTask->topOfStack + newTask->stackSize))) {
+        LOS_Panic("HIGHEST task ID: %s:%u SP error! StackPointer: %p TopOfStack: %p\n",
+                  newTask->taskName, newTask->taskID, newTask->stackPointer, newTask->topOfStack);
+    }
+}
+#endif
+
+STATIC INLINE VOID SchedSwitchCheck(LosTaskCB *runTask, LosTaskCB *newTask)
+{
+#ifdef LOSCFG_BASE_CORE_TSK_MONITOR
+    TaskStackCheck(runTask, newTask);
+#endif /* LOSCFG_BASE_CORE_TSK_MONITOR */
+    OsHookCall(LOS_HOOK_TYPE_TASK_SWITCHEDIN, newTask, runTask);
+}
+
+STATIC VOID SchedTaskSwitch(SchedRunqueue *rq, LosTaskCB *runTask, LosTaskCB *newTask)
+{
+    SchedSwitchCheck(runTask, newTask);
+
+    runTask->taskStatus &= ~OS_TASK_STATUS_RUNNING;
+    newTask->taskStatus |= OS_TASK_STATUS_RUNNING;
+
+#ifdef LOSCFG_KERNEL_SMP
+    /* mask new running task's owner processor */
+    runTask->currCpu = OS_TASK_INVALID_CPUID;
+    newTask->currCpu = ArchCurrCpuid();
+#endif
+
+    OsCurrTaskSet((VOID *)newTask);
+#ifdef LOSCFG_KERNEL_VM
+    if (newTask->archMmu != runTask->archMmu) {
+        LOS_ArchMmuContextSwitch((LosArchMmu *)newTask->archMmu);
+    }
+#endif
+
+#ifdef LOSCFG_KERNEL_CPUP
+    OsCpupCycleEndStart(runTask->taskID, newTask->taskID);
+#endif
+
+#ifdef LOSCFG_SCHED_DEBUG
+    UINT64 waitStartTime = newTask->startTime;
+#endif
+    if (runTask->taskStatus & OS_TASK_STATUS_READY) {
+        /* When a thread enters the ready queue, its slice of time is updated */
+        newTask->startTime = runTask->startTime;
+    } else {
+        /* The currently running task is blocked */
+        newTask->startTime = OsGetCurrSchedTimeCycle();
+        /* The task is in a blocking state and needs to update its time slice before pend */
+        runTask->ops->timeSliceUpdate(rq, runTask, newTask->startTime);
+
+        if (runTask->taskStatus & (OS_TASK_STATUS_PEND_TIME | OS_TASK_STATUS_DELAY)) {
+            OsSchedTimeoutQueueAdd(runTask, runTask->startTime + runTask->waitTime);
+        }
+    }
+
+    UINT64 deadline = newTask->ops->deadlineGet(newTask);
+    SchedNextExpireTimeSet(newTask->taskID, deadline, runTask->taskID);
+
+#ifdef LOSCFG_SCHED_DEBUG
+    newTask->schedStat.waitSchedTime += newTask->startTime - waitStartTime;
+    newTask->schedStat.waitSchedCount++;
+    runTask->schedStat.runTime = runTask->schedStat.allRuntime;
+    runTask->schedStat.switchCount++;
+#endif
+    /* do the task context switch */
+    OsTaskSchedule(newTask, runTask);
+}
+
+VOID OsSchedIrqEndCheckNeedSched(VOID)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+    LosTaskCB *runTask = OsCurrTaskGet();
+
+    runTask->ops->timeSliceUpdate(rq, runTask, OsGetCurrSchedTimeCycle());
+
+    if (OsPreemptable() && (rq->schedFlag & INT_PEND_RESCH)) {
+        rq->schedFlag &= ~INT_PEND_RESCH;
+
+        LOS_SpinLock(&g_taskSpin);
+
+        runTask->ops->enqueue(rq, runTask);
+
+        LosTaskCB *newTask = TopTaskGet(rq);
+        if (runTask != newTask) {
+            SchedTaskSwitch(rq, runTask, newTask);
+            LOS_SpinUnlock(&g_taskSpin);
+            return;
+        }
+
+        LOS_SpinUnlock(&g_taskSpin);
+    }
+
+    if (rq->schedFlag & INT_PEND_TICK) {
+        OsSchedExpireTimeUpdate();
+    }
+}
+
+VOID OsSchedResched(VOID)
+{
+    LOS_ASSERT(LOS_SpinHeld(&g_taskSpin));
+    SchedRunqueue *rq = OsSchedRunqueue();
+#ifdef LOSCFG_KERNEL_SMP
+    LOS_ASSERT(rq->taskLockCnt == 1);
+#else
+    LOS_ASSERT(rq->taskLockCnt == 0);
+#endif
+
+    rq->schedFlag &= ~INT_PEND_RESCH;
+    LosTaskCB *runTask = OsCurrTaskGet();
+    LosTaskCB *newTask = TopTaskGet(rq);
+    if (runTask == newTask) {
+        return;
+    }
+
+    SchedTaskSwitch(rq, runTask, newTask);
+}
+
+VOID LOS_Schedule(VOID)
+{
+    UINT32 intSave;
+    LosTaskCB *runTask = OsCurrTaskGet();
+    SchedRunqueue *rq = OsSchedRunqueue();
+
+    if (OS_INT_ACTIVE) {
+        OsSchedRunqueuePendingSet();
+        return;
+    }
+
+    if (!OsPreemptable()) {
+        return;
+    }
+
+    /*
+     * trigger schedule in task will also do the slice check
+     * if necessary, it will give up the timeslice more in time.
+     * otherwise, there's no other side effects.
+     */
+    SCHEDULER_LOCK(intSave);
+
+    runTask->ops->timeSliceUpdate(rq, runTask, OsGetCurrSchedTimeCycle());
+
+    /* add run task back to ready queue */
+    runTask->ops->enqueue(rq, runTask);
+
+    /* reschedule to new thread */
+    OsSchedResched();
+
+    SCHEDULER_UNLOCK(intSave);
+}
+
+STATIC INLINE LOS_DL_LIST *SchedLockPendFindPosSub(const LosTaskCB *runTask, const LOS_DL_LIST *lockList)
+{
+    LosTaskCB *pendedTask = NULL;
+
+    LOS_DL_LIST_FOR_EACH_ENTRY(pendedTask, lockList, LosTaskCB, pendList) {
+        INT32 ret = OsSchedParamCompare(pendedTask, runTask);
+        if (ret < 0) {
+            continue;
+        } else if (ret > 0) {
+            return &pendedTask->pendList;
+        } else {
+            return pendedTask->pendList.pstNext;
+        }
+    }
+    return NULL;
+}
+
+LOS_DL_LIST *OsSchedLockPendFindPos(const LosTaskCB *runTask, LOS_DL_LIST *lockList)
+{
+    if (LOS_ListEmpty(lockList)) {
+        return lockList;
+    }
+
+    LosTaskCB *pendedTask1 = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_FIRST(lockList));
+    INT32 ret = OsSchedParamCompare(pendedTask1, runTask);
+    if (ret > 0) {
+        return lockList->pstNext;
+    }
+
+    LosTaskCB *pendedTask2 = OS_TCB_FROM_PENDLIST(LOS_DL_LIST_LAST(lockList));
+    ret = OsSchedParamCompare(pendedTask2, runTask);
+    if (ret <= 0) {
+        return lockList;
+    }
+
+    return SchedLockPendFindPosSub(runTask, lockList);
+}

kernel/base/sched/los_sortlink.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -30,7 +30,6 @@
  */
 
 #include "los_sortlink_pri.h"
-#include "los_mp.h"
 
 VOID OsSortLinkInit(SortLinkAttribute *sortLinkHeader)
 {
@@ -82,12 +81,6 @@ VOID OsAdd2SortLink(SortLinkAttribute *head, SortLinkList *node, UINT64 response
     node->cpuid = idleCpu;
 #endif
     LOS_SpinUnlock(&head->spinLock);
-
-#ifdef LOSCFG_KERNEL_SMP
-    if (idleCpu != ArchCurrCpuid()) {
-        LOS_MpSchedule(CPUID_TO_AFFI_MASK(idleCpu));
-    }
-#endif
 }
 
 VOID OsDeleteFromSortLink(SortLinkAttribute *head, SortLinkList *node)
@@ -99,6 +92,21 @@ VOID OsDeleteFromSortLink(SortLinkAttribute *head, SortLinkList *node)
     LOS_SpinUnlock(&head->spinLock);
 }
 
+UINT32 OsSortLinkAdjustNodeResponseTime(SortLinkAttribute *head, SortLinkList *node, UINT64 responseTime)
+{
+    UINT32 ret = LOS_NOK;
+
+    LOS_SpinLock(&head->spinLock);
+    if (node->responseTime != OS_SORT_LINK_INVALID_TIME) {
+        OsDeleteNodeSortLink(head, node);
+        SET_SORTLIST_VALUE(node, responseTime);
+        AddNode2SortLink(head, node);
+        ret = LOS_OK;
+    }
+    LOS_SpinUnlock(&head->spinLock);
+    return ret;
+}
+
 UINT64 OsSortLinkGetTargetExpireTime(UINT64 currTime, const SortLinkList *targetSortList)
 {
     if (currTime >= targetSortList->responseTime) {

kernel/base/sched/los_statistics.c

@@ -0,0 +1,172 @@
+/*
+ * Copyright (c) 2022-2022 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 "los_statistics_pri.h"
+#include "los_task_pri.h"
+#include "los_process_pri.h"
+
+#ifdef LOSCFG_SCHED_DEBUG
+#ifdef LOSCFG_SCHED_TICK_DEBUG
+typedef struct {
+    UINT64 responseTime;
+    UINT64 responseTimeMax;
+    UINT64 count;
+} SchedTickDebug;
+STATIC SchedTickDebug *g_schedTickDebug = NULL;
+
+UINT32 OsSchedDebugInit(VOID)
+{
+    UINT32 size = sizeof(SchedTickDebug) * LOSCFG_KERNEL_CORE_NUM;
+    g_schedTickDebug = (SchedTickDebug *)LOS_MemAlloc(m_aucSysMem0, size);
+    if (g_schedTickDebug == NULL) {
+        return LOS_ERRNO_TSK_NO_MEMORY;
+    }
+
+    (VOID)memset_s(g_schedTickDebug, size, 0, size);
+    return LOS_OK;
+}
+
+VOID OsSchedDebugRecordData(VOID)
+{
+    SchedRunqueue *rq = OsSchedRunqueue();
+    SchedTickDebug *schedDebug = &g_schedTickDebug[ArchCurrCpuid()];
+    UINT64 currTime = OsGetCurrSchedTimeCycle();
+    LOS_ASSERT(currTime >= rq->responseTime);
+    UINT64 usedTime = currTime - rq->responseTime;
+    schedDebug->responseTime += usedTime;
+    if (usedTime > schedDebug->responseTimeMax) {
+        schedDebug->responseTimeMax = usedTime;
+    }
+    schedDebug->count++;
+}
+
+UINT32 OsShellShowTickResponse(VOID)
+{
+    UINT32 intSave;
+    UINT16 cpu;
+
+    UINT32 tickSize = sizeof(SchedTickDebug) * LOSCFG_KERNEL_CORE_NUM;
+    SchedTickDebug *schedDebug = (SchedTickDebug *)LOS_MemAlloc(m_aucSysMem1, tickSize);
+    if (schedDebug == NULL) {
+        return LOS_NOK;
+    }
+
+    SCHEDULER_LOCK(intSave);
+    (VOID)memcpy_s((CHAR *)schedDebug, tickSize, (CHAR *)g_schedTickDebug, tickSize);
+    SCHEDULER_UNLOCK(intSave);
+
+    PRINTK("cpu   ATRTime(us) ATRTimeMax(us)  TickCount\n");
+    for (cpu = 0; cpu < LOSCFG_KERNEL_CORE_NUM; cpu++) {
+        SchedTickDebug *schedData = &schedDebug[cpu];
+        UINT64 averTime = 0;
+        if (schedData->count > 0) {
+            averTime = schedData->responseTime / schedData->count;
+            averTime = (averTime * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        }
+        UINT64 timeMax = (schedData->responseTimeMax * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+        PRINTK("%3u%14llu%15llu%11llu\n", cpu, averTime, timeMax, schedData->count);
+    }
+
+    (VOID)LOS_MemFree(m_aucSysMem1, schedDebug);
+    return LOS_OK;
+}
+#endif
+
+STATIC VOID SchedDataGet(const LosTaskCB *taskCB, UINT64 *runTime, UINT64 *timeSlice,
+                         UINT64 *pendTime, UINT64 *schedWait)
+{
+    if (taskCB->schedStat.switchCount >= 1) {
+        UINT64 averRunTime = taskCB->schedStat.runTime / taskCB->schedStat.switchCount;
+        *runTime = (averRunTime * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+    }
+
+    if (taskCB->schedStat.timeSliceCount > 1) {
+        UINT64 averTimeSlice = taskCB->schedStat.timeSliceTime / (taskCB->schedStat.timeSliceCount - 1);
+        *timeSlice = (averTimeSlice * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+    }
+
+    if (taskCB->schedStat.pendCount > 1) {
+        UINT64 averPendTime = taskCB->schedStat.pendTime / taskCB->schedStat.pendCount;
+        *pendTime = (averPendTime * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+    }
+
+    if (taskCB->schedStat.waitSchedCount > 0) {
+        UINT64 averSchedWait = taskCB->schedStat.waitSchedTime / taskCB->schedStat.waitSchedCount;
+        *schedWait = (averSchedWait * OS_NS_PER_CYCLE) / OS_SYS_NS_PER_US;
+    }
+}
+
+UINT32 OsShellShowSchedStatistics(VOID)
+{
+    UINT32 taskLinkNum[LOSCFG_KERNEL_CORE_NUM];
+    UINT32 intSave;
+    LosTaskCB task;
+
+    SCHEDULER_LOCK(intSave);
+    for (UINT16 cpu = 0; cpu < LOSCFG_KERNEL_CORE_NUM; cpu++) {
+        SchedRunqueue *rq = OsSchedRunqueueByID(cpu);
+        taskLinkNum[cpu] = OsGetSortLinkNodeNum(&rq->timeoutQueue);
+    }
+    SCHEDULER_UNLOCK(intSave);
+
+    for (UINT16 cpu = 0; cpu < LOSCFG_KERNEL_CORE_NUM; cpu++) {
+        PRINTK("cpu: %u Task SortMax: %u\n", cpu, taskLinkNum[cpu]);
+    }
+
+    PRINTK("  Tid    AverRunTime(us)    SwitchCount  AverTimeSlice(us)    TimeSliceCount  AverReadyWait(us)  "
+           "AverPendTime(us)  TaskName \n");
+    for (UINT32 tid = 0; tid < g_taskMaxNum; tid++) {
+        LosTaskCB *taskCB = g_taskCBArray + tid;
+        SCHEDULER_LOCK(intSave);
+        if (OsTaskIsUnused(taskCB) || (taskCB->processID == OsGetIdleProcessID())) {
+            SCHEDULER_UNLOCK(intSave);
+            continue;
+        }
+
+        (VOID)memcpy_s(&task, sizeof(LosTaskCB), taskCB, sizeof(LosTaskCB));
+        SCHEDULER_UNLOCK(intSave);
+
+        UINT64 averRunTime = 0;
+        UINT64 averTimeSlice = 0;
+        UINT64 averPendTime = 0;
+        UINT64 averSchedWait = 0;
+
+        SchedDataGet(&task, &averRunTime, &averTimeSlice, &averPendTime, &averSchedWait);
+
+        PRINTK("%5u%19llu%15llu%19llu%18llu%19llu%18llu  %-32s\n", taskCB->taskID,
+               averRunTime, taskCB->schedStat.switchCount,
+               averTimeSlice, taskCB->schedStat.timeSliceCount - 1,
+               averSchedWait, averPendTime, taskCB->taskName);
+    }
+
+    return LOS_OK;
+}
+#endif
+

kernel/base/vm/los_vm_dump.c

@@ -121,17 +121,22 @@ UINT32 OsShellCmdProcessVmUsage(LosVmSpace *space)
 
     if (space == LOS_GetKVmSpace()) {
         OsShellCmdProcessPmUsage(space, NULL, &used);
-    } else {
-        RB_SCAN_SAFE(&space->regionRbTree, pstRbNode, pstRbNodeNext)
-            region = (LosVmMapRegion *)pstRbNode;
-            used += region->range.size;
-        RB_SCAN_SAFE_END(&space->regionRbTree, pstRbNode, pstRbNodeNext)
+        return used;
+    }
+    UINT32 ret = LOS_MuxAcquire(&space->regionMux);
+    if (ret != 0) {
+        return 0;
     }
 
+    RB_SCAN_SAFE(&space->regionRbTree, pstRbNode, pstRbNodeNext)
+        region = (LosVmMapRegion *)pstRbNode;
+        used += region->range.size;
+    RB_SCAN_SAFE_END(&space->regionRbTree, pstRbNode, pstRbNodeNext)
+    (VOID)LOS_MuxRelease(&space->regionMux);
     return used;
 }
 
-VOID OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
+UINT32 OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
 {
     UINT32 memUsed;
     UINT32 totalMem;
@@ -144,7 +149,7 @@ VOID OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
     UINT32 pmTmp;
 
     if (actualPm == NULL) {
-        return;
+        return 0;
     }
 
     memUsed = LOS_MemTotalUsedGet(m_aucSysMem1);
@@ -156,13 +161,16 @@ VOID OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
     memUsed = SYS_MEM_SIZE_DEFAULT - (totalCount << PAGE_SHIFT);
 
     spaceList = LOS_GetVmSpaceList();
+    LosMux *vmSpaceListMux = OsGVmSpaceMuxGet();
+    (VOID)LOS_MuxAcquire(vmSpaceListMux);
     LOS_DL_LIST_FOR_EACH_ENTRY(space, spaceList, LosVmSpace, node) {
         if (space == LOS_GetKVmSpace()) {
             continue;
         }
-        OsUProcessPmUsage(space, NULL, &pmTmp);
+        (VOID)OsUProcessPmUsage(space, NULL, &pmTmp);
         UProcessUsed += pmTmp;
     }
+    (VOID)LOS_MuxRelease(vmSpaceListMux);
 
     /* Kernel dynamic memory, include extended heap memory */
     memUsed += ((usedCount << PAGE_SHIFT) - UProcessUsed);
@@ -170,26 +178,26 @@ VOID OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
     memUsed -= freeMem;
 
     *actualPm = memUsed;
+    return memUsed;
 }
 
-VOID OsShellCmdProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
+UINT32 OsShellCmdProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
 {
     if (space == NULL) {
-        return;
+        return 0;
     }
 
     if ((sharePm == NULL) && (actualPm == NULL)) {
-        return;
+        return 0;
     }
 
     if (space == LOS_GetKVmSpace()) {
-        OsKProcessPmUsage(space, actualPm);
-    } else {
-        OsUProcessPmUsage(space, sharePm, actualPm);
+        return OsKProcessPmUsage(space, actualPm);
     }
+    return OsUProcessPmUsage(space, sharePm, actualPm);
 }
 
-VOID OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
+UINT32 OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
 {
     LosVmMapRegion *region = NULL;
     LosRbNode *pstRbNode = NULL;
@@ -209,6 +217,10 @@ VOID OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
         *actualPm = 0;
     }
 
+    ret = LOS_MuxAcquire(&space->regionMux);
+    if (ret != 0) {
+        return 0;
+    }
     RB_SCAN_SAFE(&space->regionRbTree, pstRbNode, pstRbNodeNext)
         region = (LosVmMapRegion *)pstRbNode;
         vaddr = region->range.base;
@@ -238,6 +250,9 @@ VOID OsUProcessPmUsage(LosVmSpace *space, UINT32 *sharePm, UINT32 *actualPm)
             }
         }
     RB_SCAN_SAFE_END(&oldVmSpace->regionRbTree, pstRbNode, pstRbNodeNext)
+
+    (VOID)LOS_MuxRelease(&space->regionMux);
+    return *actualPm;
 }
 
 LosProcessCB *OsGetPIDByAspace(LosVmSpace *space)

kernel/common/los_config.c

@@ -52,9 +52,6 @@
 #include "los_tick.h"
 #include "los_vm_boot.h"
 #include "los_smp.h"
-#ifdef LOSCFG_ENABLE_KERNEL_TEST
-#include "los_test_pri.h"
-#endif
 
 STATIC SystemRebootFunc g_rebootHook = NULL;
 
@@ -73,7 +70,7 @@ LITE_OS_SEC_TEXT_INIT STATIC UINT32 EarliestInit(VOID)
     /* Must be placed at the beginning of the boot process */
     OsSetMainTask();
     OsCurrTaskSet(OsGetMainTask());
-    OsSchedRunQueInit();
+    OsSchedRunqueueInit();
 
     g_sysClock = OS_SYS_CLOCK;
     g_tickPerSecond =  LOSCFG_BASE_CORE_TICK_PER_SECOND;
@@ -289,17 +286,14 @@ STATIC VOID SystemInit(VOID)
 extern VOID SystemInit(VOID);
 #endif
 
+#ifndef LOSCFG_ENABLE_KERNEL_TEST
 STATIC UINT32 OsSystemInitTaskCreate(VOID)
 {
     UINT32 taskID;
     TSK_INIT_PARAM_S sysTask;
 
     (VOID)memset_s(&sysTask, sizeof(TSK_INIT_PARAM_S), 0, sizeof(TSK_INIT_PARAM_S));
-#ifndef LOSCFG_ENABLE_KERNEL_TEST
     sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)SystemInit;
-#else
-    sysTask.pfnTaskEntry = (TSK_ENTRY_FUNC)TestSystemInit;
-#endif
     sysTask.uwStackSize = LOSCFG_BASE_CORE_TSK_DEFAULT_STACK_SIZE;
     sysTask.pcName = "SystemInit";
     sysTask.usTaskPrio = LOSCFG_BASE_CORE_TSK_DEFAULT_PRIO;
@@ -323,3 +317,4 @@ STATIC UINT32 OsSystemInit(VOID)
 }
 
 LOS_MODULE_INIT(OsSystemInit, LOS_INIT_LEVEL_KMOD_TASK);
+#endif

kernel/common/los_config.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -272,6 +272,15 @@ extern UINT32 __heap_end;
 #define LOSCFG_BASE_IPC_MUX
 #endif
 
+/****************************** rwlock module configuration ******************************/
+/**
+ * @ingroup los_config
+ * Configuration item for rwlock module tailoring
+ */
+#ifndef LOSCFG_BASE_IPC_RWLOCK
+#define LOSCFG_BASE_IPC_RWLOCK
+#endif
+
 /****************************** Queue module configuration ********************************/
 /**
  * @ingroup los_config

kernel/common/los_magickey.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -32,7 +32,7 @@
 #include "los_magickey.h"
 #include "console.h"
 #include "los_task_pri.h"
-
+#include "los_process_pri.h"
 
 #ifdef LOSCFG_ENABLE_MAGICKEY
 
@@ -97,9 +97,7 @@ STATIC VOID OsMagicHelp(VOID)
 
 STATIC VOID OsMagicTaskShow(VOID)
 {
-    const CHAR *arg = "-a";
-
-    (VOID)OsShellCmdDumpTask(1, &arg);
+    (VOID)OsShellCmdTskInfoGet(OS_ALL_TASK_MASK, NULL, OS_PROCESS_INFO_ALL);
     return;
 }
 

kernel/common/los_printf.c

@@ -198,6 +198,7 @@ __attribute__((noinline)) VOID UartPrintf(const CHAR *fmt, ...)
     va_end(ap);
 }
 
+#ifndef LOSCFG_LIBC_NEWLIB
 __attribute__((noinline)) VOID dprintf(const CHAR *fmt, ...)
 {
     va_list ap;
@@ -210,6 +211,7 @@ __attribute__((noinline)) VOID dprintf(const CHAR *fmt, ...)
 #endif
     va_end(ap);
 }
+#endif
 
 VOID LkDprintf(const CHAR *fmt, va_list ap)
 {
@@ -279,7 +281,7 @@ VOID LOS_LkPrint(INT32 level, const CHAR *func, INT32 line, const CHAR *fmt, ...
     }
 
     if ((level != LOS_COMMON_LEVEL) && ((level > LOS_EMG_LEVEL) && (level <= LOS_TRACE_LEVEL))) {
-        dprintf("[%s][%s:%s]", g_logString[level],
+        PRINTK("[%s][%s:%s]", g_logString[level],
                 ((OsCurrProcessGet() == NULL) ? "NULL" : OsCurrProcessGet()->processName),
                 ((OsCurrTaskGet() == NULL) ? "NULL" : OsCurrTaskGet()->taskName));
     }

kernel/extended/cpup/los_cpup.c

@@ -41,7 +41,7 @@
 LITE_OS_SEC_BSS STATIC UINT16 cpupSwtmrID;
 LITE_OS_SEC_BSS STATIC UINT16 cpupInitFlg = 0;
 LITE_OS_SEC_BSS OsIrqCpupCB *g_irqCpup = NULL;
-LITE_OS_SEC_BSS STATIC UINT16 cpupMaxNum;
+LITE_OS_SEC_BSS STATIC UINT32 cpupMaxNum;
 LITE_OS_SEC_BSS STATIC UINT16 cpupHisPos = 0; /* current Sampling point of historyTime */
 LITE_OS_SEC_BSS STATIC UINT64 cpuHistoryTime[OS_CPUP_HISTORY_RECORD_NUM + 1];
 LITE_OS_SEC_BSS STATIC UINT32 runningTasks[LOSCFG_KERNEL_CORE_NUM];
@@ -100,6 +100,9 @@ LITE_OS_SEC_TEXT_INIT VOID OsCpupGuard(VOID)
 
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
     for (loop = 0; loop < cpupMaxNum; loop++) {
+        if (g_irqCpup[loop].status == OS_CPUP_UNUSED) {
+            continue;
+        }
         g_irqCpup[loop].cpup.historyTime[prevPos] = g_irqCpup[loop].cpup.allTime;
     }
 #endif
@@ -160,7 +163,7 @@ LITE_OS_SEC_TEXT_INIT UINT32 OsCpupInit(VOID)
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
     UINT32 size;
 
-    cpupMaxNum = OS_HWI_MAX_NUM;
+    cpupMaxNum = OS_HWI_MAX_NUM * LOSCFG_KERNEL_CORE_NUM;
 
     /* every process has only one record, and it won't operated at the same time */
     size = cpupMaxNum * sizeof(OsIrqCpupCB);
@@ -227,6 +230,7 @@ LITE_OS_SEC_TEXT_INIT VOID LOS_CpupReset(VOID)
     if (g_irqCpup != NULL) {
         for (index = 0; index < cpupMaxNum; index++) {
             OsResetCpup(&g_irqCpup[index].cpup, cycle);
+            g_irqCpup[index].timeMax = 0;
         }
 
         for (index = 0; index < LOSCFG_KERNEL_CORE_NUM; index++) {
@@ -250,7 +254,7 @@ VOID OsCpupCycleEndStart(UINT32 runTaskID, UINT32 newTaskID)
     OsCpupBase *newTaskCpup = (OsCpupBase *)&(OS_TCB_FROM_TID(newTaskID)->taskCpup);
     OsCpupBase *processCpup = OS_PCB_FROM_PID(runTask->processID)->processCpup;
     UINT64 cpuCycle, cycleIncrement;
-    UINT16 cpuID = ArchCurrCpuid();
+    UINT16 cpuid = ArchCurrCpuid();
 
     if (cpupInitFlg == 0) {
         return;
@@ -260,8 +264,8 @@ VOID OsCpupCycleEndStart(UINT32 runTaskID, UINT32 newTaskID)
     if (runTaskCpup->startTime != 0) {
         cycleIncrement = cpuCycle - runTaskCpup->startTime;
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
-        cycleIncrement -= timeInIrqSwitch[cpuID];
-        timeInIrqSwitch[cpuID] = 0;
+        cycleIncrement -= timeInIrqSwitch[cpuid];
+        timeInIrqSwitch[cpuid] = 0;
 #endif
         runTaskCpup->allTime += cycleIncrement;
         if (processCpup != NULL) {
@@ -271,7 +275,7 @@ VOID OsCpupCycleEndStart(UINT32 runTaskID, UINT32 newTaskID)
     }
 
     newTaskCpup->startTime = cpuCycle;
-    runningTasks[cpuID] = newTaskID;
+    runningTasks[cpuid] = newTaskID;
 }
 
 LITE_OS_SEC_TEXT_MINOR STATIC VOID OsCpupGetPos(UINT16 mode, UINT16 *curPosPointer, UINT16 *prePosPointer)
@@ -520,31 +524,41 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsGetAllProcessAndTaskCpuUsageUnsafe(UINT16 mode,
 }
 
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
-LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqStart(VOID)
+LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqStart(UINT16 cpuid)
 {
     UINT32 high;
     UINT32 low;
 
     LOS_GetCpuCycle(&high, &low);
-    cpupIntTimeStart[ArchCurrCpuid()] = ((UINT64)high << HIGH_BITS) + low;
+    cpupIntTimeStart[cpuid] = ((UINT64)high << HIGH_BITS) + low;
     return;
 }
 
-LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT32 intNum)
+LITE_OS_SEC_TEXT_MINOR VOID OsCpupIrqEnd(UINT16 cpuid, UINT32 intNum)
 {
     UINT32 high;
     UINT32 low;
     UINT64 intTimeEnd;
-    UINT32 cpuID = ArchCurrCpuid();
+    UINT64 usedTime;
 
     LOS_GetCpuCycle(&high, &low);
     intTimeEnd = ((UINT64)high << HIGH_BITS) + low;
-
-    g_irqCpup[intNum].id = intNum;
-    g_irqCpup[intNum].status = OS_CPUP_USED;
-    timeInIrqSwitch[cpuID] += (intTimeEnd - cpupIntTimeStart[cpuID]);
-    g_irqCpup[intNum].cpup.allTime += (intTimeEnd - cpupIntTimeStart[cpuID]);
-
+    OsIrqCpupCB *irqCb = &g_irqCpup[(intNum * LOSCFG_KERNEL_CORE_NUM) + cpuid];
+    irqCb->id = intNum;
+    irqCb->status = OS_CPUP_USED;
+    usedTime = intTimeEnd - cpupIntTimeStart[cpuid];
+    timeInIrqSwitch[cpuid] += usedTime;
+    irqCb->cpup.allTime += usedTime;
+    if (irqCb->count <= 100) { /* Take 100 samples */
+        irqCb->allTime += usedTime;
+        irqCb->count++;
+    } else {
+        irqCb->allTime = 0;
+        irqCb->count = 0;
+    }
+    if (usedTime > irqCb->timeMax) {
+        irqCb->timeMax = usedTime;
+    }
     return;
 }
 

kernel/extended/cpup/los_cpup_pri.h

@@ -59,6 +59,9 @@ typedef struct {
 typedef struct {
     UINT32 id;         /**< irq ID */
     UINT16 status;     /**< irq status */
+    UINT64 allTime;
+    UINT64 timeMax;
+    UINT64 count;
     OsCpupBase cpup;   /**< irq cpup base */
 } OsIrqCpupCB;
 
@@ -70,8 +73,8 @@ extern UINT32 OsGetAllProcessCpuUsageUnsafe(UINT16 mode, CPUP_INFO_S *cpupInfo,
 extern UINT32 OsGetAllProcessAndTaskCpuUsageUnsafe(UINT16 mode, CPUP_INFO_S *cpupInfo, UINT32 len);
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
 extern UINT32 OsGetAllIrqCpuUsageUnsafe(UINT16 mode, CPUP_INFO_S *cpupInfo, UINT32 len);
-extern VOID OsCpupIrqStart(VOID);
-extern VOID OsCpupIrqEnd(UINT32);
+extern VOID OsCpupIrqStart(UINT16);
+extern VOID OsCpupIrqEnd(UINT16, UINT32);
 extern OsIrqCpupCB *OsGetIrqCpupArrayBase(VOID);
 #endif
 

kernel/extended/hilog/los_hilog.c

@@ -179,7 +179,7 @@ static ssize_t HiLogRead(struct file *filep, char *buffer, size_t bufLen)
     }
 
     if (bufLen < header.len + sizeof(header)) {
-        dprintf("buffer too small,bufLen=%d, header.len=%d,%d\n", bufLen, header.len, header.hdrSize);
+        PRINTK("buffer too small,bufLen=%d, header.len=%d,%d\n", bufLen, header.len, header.hdrSize);
         retval = -ENOMEM;
         goto out;
     }
@@ -238,7 +238,7 @@ static void HiLogHeadInit(struct HiLogEntry *header, size_t len)
 
     ret = clock_gettime(CLOCK_REALTIME, &now);
     if (ret != 0) {
-        dprintf("In %s line %d,clock_gettime fail\n", __FUNCTION__, __LINE__);
+        PRINTK("In %s line %d,clock_gettime fail\n", __FUNCTION__, __LINE__);
         return;
     }
 
@@ -274,7 +274,7 @@ static void HiLogCoverOldLog(size_t bufLen)
     if (isLastTimeFull == 1 && isThisTimeFull == 0) {
         /* so we can only print one log if hilog ring buffer is full in a short time */
         if (dropLogLines > 0) {
-            dprintf("hilog ringbuffer full, drop %d line(s) log\n", dropLogLines);
+            PRINTK("hilog ringbuffer full, drop %d line(s) log\n", dropLogLines);
         }
         isLastTimeFull = 0;
         dropLogLines = 0;
@@ -319,7 +319,7 @@ out:
         wake_up_interruptible(&g_hiLogDev.wq);
     }
     if (retval < 0) {
-        dprintf("write fail retval=%d\n", retval);
+        PRINTK("write fail retval=%d\n", retval);
     }
     return retval;
 }
@@ -328,7 +328,7 @@ static ssize_t HiLogWrite(struct file *filep, const char *buffer, size_t bufLen)
 {
     (void)filep;
     if (bufLen + sizeof(struct HiLogEntry) > HILOG_BUFFER) {
-        dprintf("input too large\n");
+        PRINTK("input too large\n");
         return -ENOMEM;
     }
 
@@ -339,7 +339,7 @@ static void HiLogDeviceInit(void)
 {
     g_hiLogDev.buffer = LOS_MemAlloc((VOID *)OS_SYS_MEM_ADDR, HILOG_BUFFER);
     if (g_hiLogDev.buffer == NULL) {
-        dprintf("In %s line %d,LOS_MemAlloc fail\n", __FUNCTION__, __LINE__);
+        PRINTK("In %s line %d,LOS_MemAlloc fail\n", __FUNCTION__, __LINE__);
     }
 
     init_waitqueue_head(&g_hiLogDev.wq);

kernel/extended/liteipc/hm_liteipc.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -63,6 +63,10 @@
 #define LITEIPC_TIMEOUT_MS 5000UL
 #define LITEIPC_TIMEOUT_NS 5000000000ULL
 
+#define MAJOR_VERSION (2)
+#define MINOR_VERSION (0)
+#define DRIVER_VERSION (MAJOR_VERSION | MINOR_VERSION << 16)
+
 typedef struct {
     LOS_DL_LIST list;
     VOID *ptr;
@@ -479,6 +483,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 AddServiceAccess(UINT32 taskID, UINT32 serviceHan
         PRINT_ERR("Liteipc AddServiceAccess GetTid failed\n");
         return ret;
     }
+
     LosTaskCB *tcb = OS_TCB_FROM_TID(serviceTid);
     UINT32 processID = OS_TCB_FROM_TID(taskID)->processID;
     LosProcessCB *pcb = OS_PCB_FROM_PID(processID);
@@ -758,22 +763,45 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandlePtr(UINT32 processID, SpecialObj *obj, BOOL
     return LOS_OK;
 }
 
-LITE_OS_SEC_TEXT STATIC UINT32 HandleSvc(UINT32 dstTid, const SpecialObj *obj, BOOL isRollback)
+LITE_OS_SEC_TEXT STATIC UINT32 HandleSvc(UINT32 dstTid, SpecialObj *obj, BOOL isRollback)
 {
     UINT32 taskID = 0;
     if (isRollback == FALSE) {
+        if (obj->content.svc.handle == -1) {
+            if (obj->content.svc.token != 1) {
+                PRINT_ERR("Liteipc HandleSvc wrong svc token\n");
+                return -EINVAL;
+            }
+            UINT32 selfTid = LOS_CurTaskIDGet();
+            LosTaskCB *tcb = OS_TCB_FROM_TID(selfTid);
+            if (tcb->ipcTaskInfo == NULL) {
+                tcb->ipcTaskInfo = LiteIpcTaskInit();
+            }
+            uint32_t serviceHandle = 0;
+            UINT32 ret = GenerateServiceHandle(selfTid, HANDLE_REGISTED, &serviceHandle);
+            if (ret != LOS_OK) {
+                PRINT_ERR("Liteipc GenerateServiceHandle failed.\n");
+                return ret;
+            }
+            obj->content.svc.handle = serviceHandle;
+            (VOID)LOS_MuxLock(&g_serviceHandleMapMux, LOS_WAIT_FOREVER);
+            AddServiceAccess(dstTid, serviceHandle);
+            (VOID)LOS_MuxUnlock(&g_serviceHandleMapMux);
+        }
         if (IsTaskAlive(obj->content.svc.handle) == FALSE) {
             PRINT_ERR("Liteipc HandleSvc wrong svctid\n");
             return -EINVAL;
         }
         if (HasServiceAccess(obj->content.svc.handle) == FALSE) {
-            PRINT_ERR("Liteipc %s, %d\n", __FUNCTION__, __LINE__);
+            PRINT_ERR("Liteipc %s, %d, svchandle:%d, tid:%d\n", __FUNCTION__, __LINE__, obj->content.svc.handle, LOS_CurTaskIDGet());
             return -EACCES;
         }
+        LosTaskCB *taskCb = OS_TCB_FROM_TID(obj->content.svc.handle);
+        if (taskCb->ipcTaskInfo == NULL) {
+            taskCb->ipcTaskInfo = LiteIpcTaskInit();
+        }
         if (GetTid(obj->content.svc.handle, &taskID) == 0) {
-            if (taskID == OS_PCB_FROM_PID(OS_TCB_FROM_TID(taskID)->processID)->ipcInfo->ipcTaskID) {
-                AddServiceAccess(dstTid, obj->content.svc.handle);
-            }
+            AddServiceAccess(dstTid, obj->content.svc.handle);
         }
     }
     return LOS_OK;
@@ -791,7 +819,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandleObj(UINT32 dstTid, SpecialObj *obj, BOOL is
             ret = HandlePtr(processID, obj, isRollback);
             break;
         case OBJ_SVC:
-            ret = HandleSvc(dstTid, (const SpecialObj *)obj, isRollback);
+            ret = HandleSvc(dstTid, (SpecialObj *)obj, isRollback);
             break;
         default:
             ret = -EINVAL;
@@ -865,7 +893,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 CheckMsgSize(IpcMsg *msg)
             totalSize += obj->content.ptr.buffSz;
         }
     }
-    (VOID)LOS_MuxUnlock(&g_serviceHandleMapMux);
+    (VOID)LOS_MuxLock(&g_serviceHandleMapMux, LOS_WAIT_FOREVER);
     if (totalSize > g_cmsTask.maxMsgSize) {
         (VOID)LOS_MuxUnlock(&g_serviceHandleMapMux);
         return -EINVAL;
@@ -1054,7 +1082,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 LiteIpcWrite(IpcContent *content)
     OsHookCall(LOS_HOOK_TYPE_IPC_WRITE, &buf->msg, dstTid, tcb->processID, tcb->waitFlag);
     if (tcb->waitFlag == OS_TASK_WAIT_LITEIPC) {
         OsTaskWakeClearPendMask(tcb);
-        OsSchedTaskWake(tcb);
+        tcb->ops->wake(tcb);
         SCHEDULER_UNLOCK(intSave);
         LOS_MpSchedule(OS_MP_CPU_ALL);
         LOS_Schedule();
@@ -1138,7 +1166,7 @@ LITE_OS_SEC_TEXT STATIC UINT32 LiteIpcRead(IpcContent *content)
         if (LOS_ListEmpty(listHead)) {
             OsTaskWaitSetPendMask(OS_TASK_WAIT_LITEIPC, OS_INVALID_VALUE, timeout);
             OsHookCall(LOS_HOOK_TYPE_IPC_TRY_READ, syncFlag ? MT_REPLY : MT_REQUEST, tcb->waitFlag);
-            ret = OsSchedTaskWait(&g_ipcPendlist, timeout, TRUE);
+            ret = tcb->ops->wait(tcb, &g_ipcPendlist, timeout);
             if (ret == LOS_ERRNO_TSK_TIMEOUT) {
                 OsHookCall(LOS_HOOK_TYPE_IPC_READ_TIMEOUT, syncFlag ? MT_REPLY : MT_REQUEST, tcb->waitFlag);
                 SCHEDULER_UNLOCK(intSave);
@@ -1288,6 +1316,22 @@ LITE_OS_SEC_TEXT STATIC UINT32 HandleCmsCmd(CmsCmdContent *content)
     return ret;
 }
 
+LITE_OS_SEC_TEXT STATIC UINT32 HandleGetVersion(IpcVersion *version)
+{
+    UINT32 ret = LOS_OK;
+    IpcVersion localIpcVersion;
+    if (version == NULL) {
+        return -EINVAL;
+    }
+
+    localIpcVersion.driverVersion = DRIVER_VERSION;
+    ret = copy_to_user((void *)version, (const void *)(&localIpcVersion), sizeof(IpcVersion));
+    if (ret != LOS_OK) {
+        PRINT_ERR("%s, %d\n", __FUNCTION__, __LINE__);
+    }
+    return ret; 
+}
+
 LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg)
 {
     UINT32 ret = LOS_OK;
@@ -1306,15 +1350,17 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
 
     switch (cmd) {
         case IPC_SET_CMS:
-            return SetCms(arg);
+            return (INT32)SetCms(arg);
         case IPC_CMS_CMD:
-            return HandleCmsCmd((CmsCmdContent *)(UINTPTR)arg);
+            return (INT32)HandleCmsCmd((CmsCmdContent *)(UINTPTR)arg);
+        case IPC_GET_VERSION:
+            return (INT32)HandleGetVersion((IpcVersion *)(UINTPTR)arg);
         case IPC_SET_IPC_THREAD:
             if (IsCmsSet() == FALSE) {
                 PRINT_ERR("Liteipc ServiceManager not set!\n");
                 return -EINVAL;
             }
-            return SetIpcTask();
+            return (INT32)SetIpcTask();
         case IPC_SEND_RECV_MSG:
             if (arg == 0) {
                 return -EINVAL;
@@ -1325,12 +1371,12 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
             }
             ret = LiteIpcMsgHandle((IpcContent *)(UINTPTR)arg);
             if (ret != LOS_OK) {
-                return ret;
+                return (INT32)ret;
             }
             break;
         default:
             PRINT_ERR("Unknow liteipc ioctl cmd:%d\n", cmd);
             return -EINVAL;
     }
-    return ret;
+    return (INT32)ret;
 }

kernel/extended/liteipc/hm_liteipc.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -114,12 +114,17 @@ typedef enum {
     MT_NUM
 } MsgType;
 
+typedef struct {
+    int32_t driverVersion;
+} IpcVersion;
+
 /* lite ipc ioctl */
 #define IPC_IOC_MAGIC       'i'
 #define IPC_SET_CMS         _IO(IPC_IOC_MAGIC, 1)
 #define IPC_CMS_CMD         _IOWR(IPC_IOC_MAGIC, 2, CmsCmdContent)
 #define IPC_SET_IPC_THREAD  _IO(IPC_IOC_MAGIC, 3)
 #define IPC_SEND_RECV_MSG   _IOWR(IPC_IOC_MAGIC, 4, IpcContent)
+#define IPC_GET_VERSION     _IOR(IPC_IOC_MAGIC, 5, IpcVersion)
 
 typedef enum {
     CMS_GEN_HANDLE,

kernel/extended/power/los_pm.c

@@ -207,8 +207,8 @@ STATIC UINT32 OsPmSuspendSleep(LosPmCB *pm)
 
     tickTimerStop = OsPmTickTimerStop(pm);
     if (!tickTimerStop) {
-        OsSchedResetSchedResponseTime(0);
-        OsSchedUpdateExpireTime();
+        OsSchedResponseTimeReset(0);
+        OsSchedExpireTimeUpdate();
     }
 
     OsPmCpuSuspend(pm);

kernel/extended/trace/cnv/trace_cnv.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -155,12 +155,25 @@ STATIC VOID LOS_TraceMuxDelete(const LosMux *muxCB)
 
 STATIC VOID LOS_TraceTaskCreate(const LosTaskCB *taskCB)
 {
-    LOS_TRACE(TASK_CREATE, taskCB->taskID, taskCB->taskStatus, taskCB->priority);
+#ifdef LOSCFG_KERNEL_TRACE
+    SchedParam param = { 0 };
+    taskCB->ops->schedParamGet(taskCB, &param);
+    LOS_TRACE(TASK_CREATE, taskCB->taskID, taskCB->taskStatus, param.priority);
+#else
+    (VOID)taskCB;
+#endif
 }
 
 STATIC VOID LOS_TraceTaskPriModify(const LosTaskCB *taskCB, UINT32 prio)
 {
-    LOS_TRACE(TASK_PRIOSET, taskCB->taskID, taskCB->taskStatus, taskCB->priority, prio);
+#ifdef LOSCFG_KERNEL_TRACE
+    SchedParam param = { 0 };
+    taskCB->ops->schedParamGet(taskCB, &param);
+    LOS_TRACE(TASK_PRIOSET, taskCB->taskID, taskCB->taskStatus, param.priority, prio);
+#else
+    (VOID)taskCB;
+    (VOID)prio;
+#endif
 }
 
 STATIC VOID LOS_TraceTaskDelete(const LosTaskCB *taskCB)
@@ -170,13 +183,28 @@ STATIC VOID LOS_TraceTaskDelete(const LosTaskCB *taskCB)
 
 STATIC VOID LOS_TraceTaskSwitchedIn(const LosTaskCB *newTask, const LosTaskCB *runTask)
 {
-    LOS_TRACE(TASK_SWITCH, newTask->taskID, runTask->priority, runTask->taskStatus,
-        newTask->priority, newTask->taskStatus);
+#ifdef LOSCFG_KERNEL_TRACE
+    SchedParam runParam = { 0 };
+    SchedParam newParam = { 0 };
+    runTask->ops->schedParamGet(runTask, &runParam);
+    newTask->ops->schedParamGet(newTask, &newParam);
+    LOS_TRACE(TASK_SWITCH, newTask->taskID, runParam.priority, runTask->taskStatus,
+              newParam.priority, newTask->taskStatus);
+#else
+    (VOID)newTask;
+    (VOID)runTask;
+#endif
 }
 
 STATIC VOID LOS_TraceTaskResume(const LosTaskCB *taskCB)
 {
-    LOS_TRACE(TASK_RESUME, taskCB->taskID, taskCB->taskStatus, taskCB->priority);
+#ifdef LOSCFG_KERNEL_TRACE
+    SchedParam param = { 0 };
+    taskCB->ops->schedParamGet(taskCB, &param);
+    LOS_TRACE(TASK_RESUME, taskCB->taskID, taskCB->taskStatus, param.priority);
+#else
+    (VOID)taskCB;
+#endif
 }
 
 STATIC VOID LOS_TraceTaskSuspend(const LosTaskCB *taskCB)

kernel/extended/trace/los_trace.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -101,7 +101,7 @@ STATIC VOID OsTraceSetFrame(TraceEventFrame *frame, UINT32 eventType, UINTPTR id
     frame->eventType = eventType;
 
 #ifdef LOSCFG_TRACE_FRAME_CORE_MSG
-    frame->core.cpuId      = ArchCurrCpuid();
+    frame->core.cpuid      = ArchCurrCpuid();
     frame->core.hwiActive  = OS_INT_ACTIVE ? TRUE : FALSE;
     frame->core.taskLockCnt = MIN(OsSchedLockCountGet(), 0xF); /* taskLockCnt is 4 bits, max value = 0xF */
     frame->core.paramCount = paramCount;
@@ -126,10 +126,12 @@ STATIC VOID OsTraceSetFrame(TraceEventFrame *frame, UINT32 eventType, UINTPTR id
 VOID OsTraceSetObj(ObjData *obj, const LosTaskCB *tcb)
 {
     errno_t ret;
+    SchedParam param = { 0 };
     (VOID)memset_s(obj, sizeof(ObjData), 0, sizeof(ObjData));
 
     obj->id   = OsTraceGetMaskTid(tcb->taskID);
-    obj->prio = tcb->priority;
+    tcb->ops->schedParamGet(tcb, &param);
+    obj->prio = param.priority;
 
     ret = strncpy_s(obj->name, LOSCFG_TRACE_OBJ_MAX_NAME_SIZE, tcb->taskName, LOSCFG_TRACE_OBJ_MAX_NAME_SIZE - 1);
     if (ret != EOK) {

kernel/extended/trace/trace_offline.c

@@ -157,7 +157,7 @@ STATIC VOID OsTraceInfoEventTitle(VOID)
 
     PRINTK("Index   Time(cycles)      EventType      CurPid   CurTask   Identity      ");
 #ifdef LOSCFG_TRACE_FRAME_CORE_MSG
-    PRINTK("cpuId    hwiActive    taskLockCnt    ");
+    PRINTK("cpuid    hwiActive    taskLockCnt    ");
 #endif
 #ifdef LOSCFG_TRACE_FRAME_EVENT_COUNT
     PRINTK("eventCount    ");
@@ -192,7 +192,7 @@ STATIC VOID OsTraceInfoEventData(VOID)
          */
         taskLockCnt -= 1;
 #endif
-        PRINTK("%-11u %-11u %-11u", frame->core.cpuId, frame->core.hwiActive, taskLockCnt);
+        PRINTK("%-11u %-11u %-11u", frame->core.cpuid, frame->core.hwiActive, taskLockCnt);
 #endif
 #ifdef LOSCFG_TRACE_FRAME_EVENT_COUNT
         PRINTK("%-11u", frame->eventCount);

kernel/extended/vdso/usr/los_vdso.ld

@@ -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:

kernel/include/los_printf.h

@@ -87,9 +87,9 @@ typedef VOID (*pf_OUTPUT)(const CHAR *fmt, ...);
  * <ul><li>los_printf.h: the header file that contains the API declaration.</li></ul>
  * @see printf
  */
+#ifndef LOSCFG_LIBC_NEWLIB
 extern void dprintf(const char *fmt, ...);
-
-#define diag_printf      dprintf
+#endif
 
 #define PRINT_DEBUG(fmt, args...)    LOS_LkPrint(LOS_DEBUG_LEVEL, __FUNCTION__, __LINE__, fmt, ##args)
 #define PRINT_INFO(fmt, args...)     LOS_LkPrint(LOS_INFO_LEVEL, __FUNCTION__, __LINE__, fmt, ##args)

kernel/include/los_trace.h

@@ -245,7 +245,7 @@ typedef struct {
     UINTPTR identity;                                /**< subject of the event description */
 #ifdef LOSCFG_TRACE_FRAME_CORE_MSG
     struct CoreStatus {
-        UINT32 cpuId      : 8,                       /**< cpuid */
+        UINT32 cpuid      : 8,                       /**< cpuid */
                hwiActive  : 4,                       /**< whether is in hwi response */
                taskLockCnt : 4,                      /**< task lock count */
                paramCount : 4,                       /**< event frame params' number */

lib/Kconfig

@@ -5,6 +5,20 @@ config LIB_LIBC
     help
       Answer Y to enable libc for full code.
 
+choice
+    prompt "choose libc"
+    default LIBC_MUSL
+    depends on LIB_LIBC
+    help
+      Choose libc.
+
+config LIBC_NEWLIB
+    bool "newlibc"
+
+config LIBC_MUSL
+    bool "musl libc"
+endchoice
+
 config LIB_ZLIB
     bool "Enable Zlib"
     default y

lib/libc/BUILD.gn

@@ -1,5 +1,5 @@
 # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
-# Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 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:
@@ -29,92 +29,16 @@
 
 import("//kernel/liteos_a/liteos.gni")
 
-MUSLDIR = "$LITEOSTHIRDPARTY/musl"
-
-import("//third_party/optimized-routines/optimized-routines.gni")
-import("$MUSLDIR/porting/liteos_a/kernel/musl.gni")
-
-module_switch = defined(LOSCFG_LIB_LIBC)
-module_name = get_path_info(rebase_path("."), "name")
-kernel_module(module_name) {
-  sources = MUSL_SRC_COMMON
-
-  if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
-    sources += MUSL_SRC_ARM
-    foreach(f, MUSL_SRC_ARM) {
-      sources -= [ string_replace(f, "/arm/", "/") ]
-    }
-  }
-
-  if (LOSCFG_ARCH_ARM_VER == "armv7-a") {
-    sources -= [
-      "$MUSLPORTINGDIR/src/string/memchr.c",
-      "$MUSLPORTINGDIR/src/string/memcpy.c",
-      "$MUSLPORTINGDIR/src/string/strcmp.c",
-      "$MUSLPORTINGDIR/src/string/strcpy.c",
-      "$MUSLPORTINGDIR/src/string/strlen.c",
-    ]
-    sources += OPTRT_STRING_ARM_SRC_FILES
-    asmflags = [
-      "-D__strlen_armv6t2=strlen",
-      "-D__strcmp_arm=strcmp",
-      "-D__memchr_arm=memchr",
-    ]
-    if (defined(LOSCFG_KERNEL_LMS)) {
-      asmflags += [
-        "-D__memcpy_arm=__memcpy",
-        "-D__strcpy_arm=__strcpy",
-      ]
-    } else {
-      asmflags += [
-        "-D__memcpy_arm=memcpy",
-        "-D__strcpy_arm=strcpy",
-      ]
-    }
-    sources += [
-      "src/arch/arm/memcmp.S",
-      "src/arch/arm/memset.S",
-    ]
-  } else {
-    sources += [
-      "src/memcmp.c",
-      "src/memset.c",
-    ]
-  }
-
-  include_dirs = [
-    "$MUSLPORTINGDIR/src/include",
-    "$MUSLPORTINGDIR/src/internal",
+group("libc") {
+  deps = [
+    "musl",
+    "newlib",
   ]
-
-  public_configs = [ ":public" ]
-  configs += [ ":private" ]
 }
 
 config("public") {
-  cflags = [
-    "-isystem",
-    rebase_path("$MUSLPORTINGDIR/include"),
-  ]
-}
-
-config("private") {
-  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
-    cflags = [
-      "-Wno-char-subscripts",
-      "-Wno-unknown-pragmas",
-    ]
-  } else {
-    cflags = [
-      "-frounding-math",
-      "-Wno-unused-but-set-variable",
-      "-Wno-unknown-pragmas",
-    ]
-  }
-
-  cflags += [
-    "-Wno-shift-op-parentheses",
-    "-Wno-logical-op-parentheses",
-    "-Wno-bitwise-op-parentheses",
+  configs = [
+    "musl:public",
+    "newlib:public",
   ]
 }

lib/libc/musl/BUILD.gn

@@ -0,0 +1,121 @@
+# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 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")
+
+MUSLDIR = "$LITEOSTHIRDPARTY/musl"
+
+import("//third_party/optimized-routines/optimized-routines.gni")
+import("$MUSLDIR/porting/liteos_a/kernel/musl.gni")
+
+module_switch = defined(LOSCFG_LIBC_MUSL)
+module_name = get_path_info(rebase_path("."), "name")
+kernel_module(module_name) {
+  sources = MUSL_SRC_COMMON
+
+  if (defined(LOSCFG_ARCH_ARM_AARCH32)) {
+    sources += MUSL_SRC_ARM
+    foreach(f, MUSL_SRC_ARM) {
+      sources -= [ string_replace(f, "/arm/", "/") ]
+    }
+  }
+
+  if (LOSCFG_ARCH_ARM_VER == "armv7-a") {
+    sources -= [
+      "$MUSLPORTINGDIR/src/string/memchr.c",
+      "$MUSLPORTINGDIR/src/string/memcpy.c",
+      "$MUSLPORTINGDIR/src/string/strcmp.c",
+      "$MUSLPORTINGDIR/src/string/strcpy.c",
+      "$MUSLPORTINGDIR/src/string/strlen.c",
+    ]
+    sources += [
+      "src/arch/arm/memcmp.S",
+      "src/arch/arm/memset.S",
+    ]
+    sources += OPTRT_STRING_ARM_SRC_FILES_FOR_ARMV7_A
+    asmflags = [
+      "-D__strlen_armv6t2=strlen",
+      "-D__strcmp_arm=strcmp",
+      "-D__memchr_arm=memchr",
+    ]
+    if (defined(LOSCFG_KERNEL_LMS)) {
+      asmflags += [
+        "-D__memcpy_arm=__memcpy",
+        "-D__strcpy_arm=__strcpy",
+      ]
+    } else {
+      asmflags += [
+        "-D__memcpy_arm=memcpy",
+        "-D__strcpy_arm=strcpy",
+      ]
+    }
+  } else {
+    # arch is not armv7-a
+    sources += [
+      "src/memcmp.c",
+      "src/memset.c",
+    ]
+  }
+
+  include_dirs = [
+    "$MUSLPORTINGDIR/src/include",
+    "$MUSLPORTINGDIR/src/internal",
+  ]
+
+  public_configs = [ ":public" ]
+  configs += [ ":private" ]
+}
+
+config("public") {
+  cflags = [
+    "-isystem",
+    rebase_path("$MUSLPORTINGDIR/include"),
+  ]
+}
+
+config("private") {
+  if (defined(LOSCFG_COMPILER_CLANG_LLVM)) {
+    cflags = [
+      "-Wno-char-subscripts",
+      "-Wno-unknown-pragmas",
+    ]
+  } else {
+    cflags = [
+      "-frounding-math",
+      "-Wno-unused-but-set-variable",
+      "-Wno-unknown-pragmas",
+    ]
+  }
+
+  cflags += [
+    "-Wno-shift-op-parentheses",
+    "-Wno-logical-op-parentheses",
+    "-Wno-bitwise-op-parentheses",
+  ]
+}

lib/libc/musl/src/memcmp.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2021-2022 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:
@@ -31,6 +31,9 @@
 #include <string.h>
 #include <stdint.h>
 
+#define SIZE_U64    (sizeof(uint64_t))
+#define SIZE_U32    (sizeof(uint32_t))
+
 int memcmp(const void *str1, const void *str2, size_t n)
 {
 
@@ -38,26 +41,26 @@ int memcmp(const void *str1, const void *str2, size_t n)
     const unsigned char *s2 = str2;
     size_t num = n;
 
-    while (num >= 8) { /* 8, compare size,  the number of chars of one uint64_t data */
+    while (num >= SIZE_U64) {
         if (*(const uint64_t *)(s1) != *(const uint64_t *)(s2)) {
-            goto L8_byte_diff;
+            goto L4_byte_cmp;
         }
-        s1 += 8; /* 8, compare size,  the number of chars of one uint64_t data */
-        s2 += 8; /* 8, compare size,  the number of chars of one uint64_t data */
-        num -= 8; /* 8, compare size,  the number of chars of one uint64_t data */
+        s1 += SIZE_U64;
+        s2 += SIZE_U64;
+        num -= SIZE_U64;
     }
     if (num == 0) {
         return 0;
     }
 
-    /* L4_byte_cmp */
-    if (num >= 4) { /* 4, compare size,  the number of chars of one uint32_t data */
+L4_byte_cmp:
+    if (num >= SIZE_U32) {
         if (*(const uint32_t *)(s1) != *(const uint32_t *)(s2)) {
             goto L4_byte_diff;
         }
-        s1 += 4; /* 4, compare size,  the number of chars of one uint32_t data */
-        s2 += 4; /* 4, compare size,  the number of chars of one uint32_t data */
-        num -= 4; /* 4, compare size,  the number of chars of one uint32_t data */
+        s1 += SIZE_U32;
+        s2 += SIZE_U32;
+        num -= SIZE_U32;
     }
     if (num == 0) {
         return 0;
@@ -66,13 +69,4 @@ L4_byte_diff:
     for (; num && (*s1 == *s2); num--, s1++, s2++) {
     }
     return num ? *s1 - *s2 : 0;
-
-L8_byte_diff:
-    if (*(const uint32_t *)(s1) != *(const uint32_t *)(s2)) {
-            goto L4_byte_diff;
-    }
-    s1 += 4; /* 4, compare size,  the number of chars of one uint32_t data */
-    s2 += 4; /* 4, compare size,  the number of chars of one uint32_t data */
-    num -= 4; /* 4, compare size,  the number of chars of one uint32_t data */
-    goto L4_byte_diff;
 }

lib/libc/newlib/BUILD.gn

@@ -0,0 +1,58 @@
+# Copyright (c) 2022-2022 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")
+import("//third_party/musl/porting/liteos_a_newlib/kernel/newlib.gni")
+
+module_switch = defined(LOSCFG_LIBC_NEWLIB)
+module_name = get_path_info(rebase_path("."), "name")
+kernel_module(module_name) {
+  sources = NEWLIB_ADAPT_SRC_COMMON
+  configs += [ "$LITEOSTOPDIR:warn_config" ]
+
+  configs += [ ":private" ]
+}
+
+config("public") {
+  include_dirs = [ "porting/include" ]
+  include_dirs += NEWLIB_ADAPT_INCLUDE_DIRS
+}
+
+config("private") {
+  cflags = [
+    "-frounding-math",
+    "-Wno-unused-but-set-variable",
+    "-Wno-unknown-pragmas",
+  ]
+
+  cflags += [
+    "-Wno-shift-op-parentheses",
+    "-Wno-logical-op-parentheses",
+    "-Wno-bitwise-op-parentheses",
+  ]
+}

platform/Kconfig

@@ -27,6 +27,7 @@ choice
        - hi3518ev300
       Qemu ARM Virt variants (based on different CPU types):
        - qemu_arm_virt_ca7
+       - stm32mp157
 
 config PLATFORM_HI3516DV300
     bool "hi3516dv300"
@@ -41,7 +42,9 @@ config PLATFORM_QEMU_ARM_VIRT_CA7
     select ARCH_CORTEX_A7
     help
         QEMU ARM Virtual Platform using Cortex-A7 CPU.
-
+config PLATFORM_STM32MP157
+    bool "stm32mp157"
+    select ARCH_CORTEX_A7
 endchoice
 
 choice
@@ -61,6 +64,9 @@ config PRODUCT_HISPARK_ARIES
 
 config PRODUCT_QEMU_ARM
     bool "arm_virt" if PLATFORM_QEMU_ARM_VIRT_CA7
+
+config LOSCFG_PRODUCT_BEARPI_HM_MICRO
+    bool "bearpi_hm_micro" if PLATFORM_STM32MP157
 endchoice
 
 config BOARD_CONFIG_PATH

shell/full/src/cmds/hwi_shellcmd.c

@@ -40,15 +40,54 @@
 
 
 #ifdef LOSCFG_CPUP_INCLUDE_IRQ
-STATIC CPUP_INFO_S hwiCpupAll[OS_HWI_MAX_NUM];
-STATIC CPUP_INFO_S hwiCpup10s[OS_HWI_MAX_NUM];
-STATIC CPUP_INFO_S hwiCpup1s[OS_HWI_MAX_NUM];
+#define IRQ_CPUP_INFO_SIZE     (sizeof(CPUP_INFO_S) * OS_HWI_MAX_NUM * LOSCFG_KERNEL_CORE_NUM)
+#define IRQ_CPUP_ALL_INFO_SIZE (3 * IRQ_CPUP_INFO_SIZE)
+#define IRQ_DATA_SZIE          (sizeof(OsIrqCpupCB) * LOSCFG_KERNEL_CORE_NUM)
+#define CPUP_PRECISION_MULT    LOS_CPUP_PRECISION_MULT
+
+STATIC VOID ShellCmdHwiInfoShow(OsIrqCpupCB *irqData, CPUP_INFO_S *hwiCpup1s,
+                                CPUP_INFO_S *hwiCpup10s, CPUP_INFO_S *hwiCpupAll)
+{
+    UINT32 intSave;
+    OsIrqCpupCB *irqDataBase = OsGetIrqCpupArrayBase();
+
+    for (UINT32 i = OS_HWI_FORM_EXC_NUM; i < OS_HWI_MAX_NUM + OS_HWI_FORM_EXC_NUM; i++) {
+        if (!HWI_IS_REGISTED(i)) {
+            continue;
+        }
+
+        intSave = LOS_IntLock();
+        (VOID)memcpy_s(irqData, IRQ_DATA_SZIE, &irqDataBase[i * LOSCFG_KERNEL_CORE_NUM], IRQ_DATA_SZIE);
+        LOS_IntRestore(intSave);
+
+        for (UINT32 cpu = 0; cpu < LOSCFG_KERNEL_CORE_NUM; cpu++) {
+            UINT64 cycles = 0;
+            UINT64 timeMax = 0;
+            OsIrqCpupCB *data = &irqData[cpu];
+            if (data->status == 0) {
+                continue;
+            }
+            UINT32 count = OsGetHwiFormCnt(cpu, i);
+            if (count != 0) {
+                if (data->count != 0) {
+                    cycles = (data->allTime * OS_NS_PER_CYCLE) / (data->count * OS_SYS_NS_PER_US);
+                }
+                timeMax = (data->timeMax * OS_NS_PER_CYCLE) / 1000;
+            }
+            CHAR *irqName = OsGetHwiFormName(i);
+            UINT32 index = (i * LOSCFG_KERNEL_CORE_NUM) + cpu;
+            PRINTK(" %10u:%5u%11u%11llu%10llu%6u.%-2u%8u.%-2u%7u.%-2u%7s %-12s\n", i, cpu, count, cycles, timeMax,
+                   hwiCpupAll[index].usage / CPUP_PRECISION_MULT, hwiCpupAll[index].usage % CPUP_PRECISION_MULT,
+                   hwiCpup10s[index].usage / CPUP_PRECISION_MULT, hwiCpup10s[index].usage % CPUP_PRECISION_MULT,
+                   hwiCpup1s[index].usage / CPUP_PRECISION_MULT, hwiCpup1s[index].usage % CPUP_PRECISION_MULT,
+                   (g_hwiForm[index].uwParam == IRQF_SHARED) ? "shared" : "normal", (irqName != NULL) ? irqName : "");
+        }
+    }
+}
+
 LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdHwi(INT32 argc, const CHAR **argv)
 {
-    UINT32 i;
-    UINT64 cycles;
-    size_t size = sizeof(CPUP_INFO_S) * OS_HWI_MAX_NUM;
-    OsIrqCpupCB *irqCpup = OsGetIrqCpupArrayBase();
+    UINT32 size;
 
     (VOID)argv;
     if (argc > 0) {
@@ -56,38 +95,24 @@ LITE_OS_SEC_TEXT_MINOR UINT32 OsShellCmdHwi(INT32 argc, const CHAR **argv)
         return OS_ERROR;
     }
 
+    size = IRQ_CPUP_ALL_INFO_SIZE + IRQ_DATA_SZIE;
+    CHAR *irqCpup = LOS_MemAlloc(m_aucSysMem0, size);
     if (irqCpup == NULL) {
         return OS_ERROR;
     }
 
-    (VOID)LOS_GetAllIrqCpuUsage(CPUP_ALL_TIME, hwiCpupAll, size);
-    (VOID)LOS_GetAllIrqCpuUsage(CPUP_LAST_TEN_SECONDS, hwiCpup10s, size);
-    (VOID)LOS_GetAllIrqCpuUsage(CPUP_LAST_ONE_SECONDS, hwiCpup1s, size);
+    CPUP_INFO_S *hwiCpupAll = (CPUP_INFO_S *)irqCpup;
+    CPUP_INFO_S *hwiCpup10s = (CPUP_INFO_S *)(irqCpup + IRQ_CPUP_INFO_SIZE);
+    CPUP_INFO_S *hwiCpup1s = (CPUP_INFO_S *)(irqCpup + 2 * IRQ_CPUP_INFO_SIZE); /* 2: offset */
+    OsIrqCpupCB *irqData = (OsIrqCpupCB *)(irqCpup + IRQ_CPUP_ALL_INFO_SIZE);
 
-    PRINTK(" InterruptNo      Count  ATime(us)   CPUUSE  CPUUSE10s  CPUUSE1s   Mode Name\n");
-    for (i = OS_HWI_FORM_EXC_NUM; i < OS_HWI_MAX_NUM + OS_HWI_FORM_EXC_NUM; i++) {
-        UINT32 count = OsGetHwiFormCnt(i);
-        if (count) {
-            cycles = (((OsIrqCpupCB *)(&irqCpup[i]))->cpup.allTime * OS_NS_PER_CYCLE) / (count * OS_SYS_NS_PER_US);
-        } else {
-            cycles = 0;
-        }
-        /* Different cores has different hwi form implementation */
-        if (HWI_IS_REGISTED(i)) {
-            PRINTK(" %10u:%11u%11llu", i, count, cycles);
-        } else {
-            continue;
-        }
-        PRINTK("%6u.%-2u%8u.%-2u%7u.%-2u%7s %-12s\n",
-               hwiCpupAll[i].usage / LOS_CPUP_PRECISION_MULT,
-               hwiCpupAll[i].usage % LOS_CPUP_PRECISION_MULT,
-               hwiCpup10s[i].usage / LOS_CPUP_PRECISION_MULT,
-               hwiCpup10s[i].usage % LOS_CPUP_PRECISION_MULT,
-               hwiCpup1s[i].usage / LOS_CPUP_PRECISION_MULT,
-               hwiCpup1s[i].usage % LOS_CPUP_PRECISION_MULT,
-               (g_hwiForm[i].uwParam == IRQF_SHARED) ? "shared" : "normal",
-               (OsGetHwiFormName(i) != NULL) ? OsGetHwiFormName(i) : "");
-    }
+    (VOID)LOS_GetAllIrqCpuUsage(CPUP_ALL_TIME, hwiCpupAll, IRQ_CPUP_INFO_SIZE);
+    (VOID)LOS_GetAllIrqCpuUsage(CPUP_LAST_TEN_SECONDS, hwiCpup10s, IRQ_CPUP_INFO_SIZE);
+    (VOID)LOS_GetAllIrqCpuUsage(CPUP_LAST_ONE_SECONDS, hwiCpup1s, IRQ_CPUP_INFO_SIZE);
+
+    PRINTK(" InterruptNo  cpu      Count  ATime(us) MTime(us)   CPUUSE  CPUUSE10s  CPUUSE1s   Mode Name\n");
+    ShellCmdHwiInfoShow(irqData, hwiCpup1s, hwiCpup10s, hwiCpupAll);
+    (VOID)LOS_MemFree(m_aucSysMem0, irqCpup);
     return 0;
 }
 #else

syscall/fs_syscall.c

@@ -2601,18 +2601,15 @@ int SysPselect6(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
     return ret;
 }
 
-int SysEpollCreate(int size)
+static int DoEpollCreate1(int flags)
 {
     int ret;
     int procFd;
 
-    if (size <= 0) {
-        return -EINVAL;
-    }
-
-    ret = epoll_create(size);
+    ret = epoll_create1(flags);
     if (ret < 0) {
         ret = -get_errno();
+        return ret;
     }
 
     procFd = AllocAndAssocProcessFd((INTPTR)(ret), MIN_START_FD);
@@ -2624,23 +2621,15 @@ int SysEpollCreate(int size)
     return procFd;
 }
 
+int SysEpollCreate(int size)
+{
+    (void)size;
+    return DoEpollCreate1(0);
+}
+
 int SysEpollCreate1(int flags)
 {
-    int ret;
-    int procFd;
-
-    ret = epoll_create(flags);
-    if (ret < 0) {
-        ret = -get_errno();
-    }
-
-    procFd = AllocAndAssocProcessFd((INTPTR)(ret), MIN_START_FD);
-    if (procFd == -1) {
-        epoll_close(ret);
-        return -EMFILE;
-    }
-
-    return procFd;
+    return DoEpollCreate1(flags);
 }
 
 int SysEpollCtl(int epfd, int op, int fd, struct epoll_event *ev)

syscall/process_syscall.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -64,6 +64,7 @@ static int OsUserTaskSchedulerSet(unsigned int tid, unsigned short policy, unsig
     int ret;
     unsigned int intSave;
     bool needSched = false;
+    SchedParam param = { 0 };
 
     if (OS_TID_CHECK_INVALID(tid)) {
         return EINVAL;
@@ -85,8 +86,10 @@ static int OsUserTaskSchedulerSet(unsigned int tid, unsigned short policy, unsig
         return ret;
     }
 
-    policy = (policyFlag == true) ? policy : taskCB->policy;
-    needSched = OsSchedModifyTaskSchedParam(taskCB, policy, priority);
+    taskCB->ops->schedParamGet(taskCB, &param);
+    param.policy = (policyFlag == true) ? policy : param.policy;
+    param.priority = priority;
+    needSched = taskCB->ops->schedParamModify(taskCB, &param);
     SCHEDULER_UNLOCK(intSave);
 
     LOS_MpSchedule(OS_MP_CPU_ALL);
@@ -108,7 +111,7 @@ void SysSchedYield(int type)
 int SysSchedGetScheduler(int id, int flag)
 {
     unsigned int intSave;
-    int policy;
+    SchedParam param = { 0 };
     int ret;
 
     if (flag < 0) {
@@ -124,9 +127,9 @@ int SysSchedGetScheduler(int id, int flag)
             return -ret;
         }
 
-        policy = (int)taskCB->policy;
+        taskCB->ops->schedParamGet(taskCB, &param);
         SCHEDULER_UNLOCK(intSave);
-        return policy;
+        return (int)param.policy;
     }
 
     return LOS_GetProcessScheduler(id);
@@ -158,7 +161,7 @@ int SysSchedSetScheduler(int id, int policy, int prio, int flag)
 
 int SysSchedGetParam(int id, int flag)
 {
-    int prio;
+    SchedParam param = { 0 };
     unsigned int intSave;
 
     if (flag < 0) {
@@ -168,15 +171,15 @@ int SysSchedGetParam(int id, int flag)
 
         LosTaskCB *taskCB = OS_TCB_FROM_TID(id);
         SCHEDULER_LOCK(intSave);
-        prio = OsUserTaskOperatePermissionsCheck(taskCB);
-        if (prio != LOS_OK) {
+        int ret = OsUserTaskOperatePermissionsCheck(taskCB);
+        if (ret != LOS_OK) {
             SCHEDULER_UNLOCK(intSave);
-            return -prio;
+            return -ret;
         }
 
-        prio = (int)taskCB->priority;
+        taskCB->ops->schedParamGet(taskCB, &param);
         SCHEDULER_UNLOCK(intSave);
-        return prio;
+        return (int)param.priority;
     }
 
     if (id == 0) {
@@ -250,6 +253,7 @@ int SysSchedRRGetInterval(int pid, struct timespec *tp)
 {
     unsigned int intSave;
     int ret;
+    SchedParam param = { 0 };
     time_t timeSlice = 0;
     struct timespec tv;
     LosTaskCB *taskCB = NULL;
@@ -277,8 +281,11 @@ int SysSchedRRGetInterval(int pid, struct timespec *tp)
     }
 
     LOS_DL_LIST_FOR_EACH_ENTRY(taskCB, &processCB->threadSiblingList, LosTaskCB, threadList) {
-        if (!OsTaskIsInactive(taskCB) && (taskCB->policy == LOS_SCHED_RR)) {
-            timeSlice += taskCB->initTimeSlice;
+        if (!OsTaskIsInactive(taskCB)) {
+            taskCB->ops->schedParamGet(taskCB, &param);
+            if (param.policy == LOS_SCHED_RR) {
+                timeSlice += param.timeSlice;
+            }
         }
     }
 

testsuites/BUILD.gn

@@ -29,9 +29,13 @@
 
 import("//kernel/liteos_a/liteos.gni")
 
-group("testsuites") {
-  deps = [
-    #"kernel",
-    "unittest",
-  ]
+declare_args() {
+  liteos_kernel_unittest = true
+}
+
+group("testsuites") {
+  deps = []
+  if (liteos_kernel_unittest) {
+    deps += [ "unittest" ]
+  }
 }

testsuites/kernel/BUILD.gn

@@ -27,122 +27,73 @@
 # 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")
+import("//kernel/liteos_a/liteos.gni")
 
-static_library("test_base") {
-  sources = [
-    "src/ChipTest.c",
-    "src/iCunit.c",
-    "src/osTest.c",
-    "src/testrun_shellcmd.c",
-    "src/testusb_shellcmd.c",
-  ]
+declare_args() {
+  LOSCFG_ENABLE_KERNEL_TEST = false
+  LOSCFG_TEST_KERNEL_BASE = true
+  LOSCFG_TEST_KERNEL_EXTEND_CPUP = false
+  LOSCFG_TEST_POSIX = false
+}
 
+config("liteos_kernel_test_public") {
+  cflags = [ "-Wno-error" ]
   include_dirs = [
-    "../kernel/base/includ",
-    "../kernel/include",
-    "../kernel/extended/include",
-    "include",
-    "../fs/vfs",
-    "../fs/proc/include",
-    "../fs/jffs2/include",
-    "../fs/nfs/include",
-    "../bsd/compat/linuxkpi/include",
+    "//kernel/liteos_a/kernel/include",
+    "//kernel/liteos_a/kernel/base/include",
+    "//kernel/liteos_a/kernel/common",
+    "//kernel/liteos_a/arch/arm/arm/include",
+    "//kernel/liteos_a/arch/arm/include",
+    "//kernel/liteos_a/extended/include",
+    "//third_party/musl/porting/liteos_a/kernel/include",
+    "//third_party/bounds_checking_function/include/",
+    "//kernel/liteos_a/lib/libscrew/include",
+    "//kernel/liteos_a/fs/vfs",
+    "//kernel/liteos_a/fs/proc/include",
+    "//kernel/liteos_a/fs/jffs2/include",
+    "//kernel/liteos_a/fs/nfs/include",
+    "//kernel/liteos_a/bsd/compat/linuxkpi/include",
+    "//kernel/liteos_a/testsuites/kernel/include",
   ]
 
-  public_configs = [ ":public" ]
-}
-
-config("public") {
-  include_dirs = [ "include" ]
-}
-
-lite_component("test") {
-  features = [ ":test_base" ]
-
-  # KERNEL BASE TEST
-  if (LOSCFG_TEST_KERNEL_BASE_IPC) {
-    features += [ "sample/kernel_base/ipc:test_ipc" ]
-  }
-  if (LOSCFG_TEST_KERNEL_BASE_CORE) {
-    features += [ "sample/kernel_base/core:test_core" ]
-  }
-  if (LOSCFG_TEST_KERNEL_BASE_MP) {
-    features += [ "sample/kernel_base/mp:test_mp" ]
-  }
-  if (LOSCFG_TEST_KERNEL_BASE_MEM) {
-    features += [ "sample/kernel_base/mem:test_mem" ]
-  }
-  if (LOSCFG_TEST_KERNEL_BASE_MISC) {
-    features += [ "sample/kernel_base/misc:test_misc" ]
-  }
-  if (LOSCFG_TEST_KERNEL_BASE_OM) {
-    features += [ "sample/kernel_base/om:test_om" ]
-  }
-  if (LOSCFG_TEST_KERNEL_BASE_ATOMIC) {
-    features += [ "sample/kernel_base/atomic:test_atomic" ]
-  }
-
-  # KERNEL EXTEND TEST
-  if (LOSCFG_TEST_KERNEL_EXTEND_CPP) {
-    features += [ "sample/kernel_extend/cpp:test_cpp" ]
+  if (LOSCFG_TEST_KERNEL_BASE) {
+    cflags += [ "-DLOSCFG_TEST_KERNEL_BASE=1" ]
   }
   if (LOSCFG_TEST_KERNEL_EXTEND_CPUP) {
-    features += [ "sample/kernel_extend/cpup:test_cpup" ]
+    cflags += [ "-DLOSCFG_TEST_KERNEL_EXTEND_CPUP=1" ]
   }
-  if (LOSCFG_TEST_KERNEL_EXTEND_MMU) {
-    features += [ "sample/kernel_extend/mmu:test_mmu" ]
-  }
-
-  # COMPAT TEST
   if (LOSCFG_TEST_POSIX) {
-    features += [
-      "sample/posix:test_posix",
-      # "sample/posix/smp:test_posix_smp",
-    ]
-  }
-
-  # if (LOSCFG_TEST_POSIX_MEM) {
-  #     features += [ "sample/posix/mem:test_posix_mem" ]
-  # }
-  # if (LOSCFG_TEST_POSIX_MQUEUE) {
-  #     features += [ "sample/posix/mqueue:test_posix_mqueue" ]
-  # }
-  # if (LOSCFG_TEST_POSIX_MUTEX) {
-  #     features += [ "sample/posix/mutex:test_posix_mutex" ]
-  # }
-  # if (LOSCFG_TEST_POSIX_PTHREAD) {
-  #     features += [ "sample/posix/pthread:test_posix_pthread" ]
-  # }
-  # if (LOSCFG_TEST_POSIX_SCHED) {
-  #     features += [ "sample/posix/sched:test_posix_sched" ]
-  # }
-  # if (LOSCFG_TEST_POSIX_SEM) {
-  #     features += [ "sample/posix/sem:test_posix_sem" ]
-  # }
-  # if (LOSCFG_TEST_POSIX_SWTMR) {
-  #     features += [ "sample/posix/swtmr:test_posix_swtmr" ]
-  # }
-  if (LOSCFG_TEST_LINUX) {
-    features += [ "sample/linux:test_linux" ]
-  }
-
-  #if (LOSCFG_TEST_LINUX_HRTIMER) {
-  #    features += [ "sample/linux/hrtimer:test_linux_hrtimer" ]
-  #}
-
-  # LIBC TEST
-  if (LOSCFG_TEST_LIBC) {
-    features += [ "sample/libc:test_libc" ]
-  }
-
-  # LIBM TEST
-  if (LOSCFG_TEST_LIBM) {
-    features += [ "sample/libm:test_libm" ]
-  }
-
-  # SHELL TEST
-  if (LOSCFG_TEST_SHELL) {
-    features += [ "sample/shell:test_shell" ]
+    cflags += [ "-DLOSCFG_TEST_POSIX=1" ]
   }
 }
+
+group("kernel_test") {
+  deps = []
+
+  if (LOSCFG_ENABLE_KERNEL_TEST) {
+    deps += [ ":test_base" ]
+
+    if (LOSCFG_TEST_KERNEL_BASE) {
+      deps += [ "sample/kernel_base:kernel_base" ]
+    }
+
+    # KERNEL EXTEND TEST
+    if (LOSCFG_TEST_KERNEL_EXTEND_CPUP) {
+      deps += [ "sample/kernel_extend/cpup:test_cpup" ]
+    }
+
+    # COMPAT TEST
+    if (LOSCFG_TEST_POSIX) {
+      deps += [ "sample/posix:test_posix" ]
+    }
+  }
+}
+
+kernel_module("test_base") {
+  sources = [
+    "src/iCunit.c",
+    "src/osTest.c",
+  ]
+
+  public_configs = [ ":liteos_kernel_test_public" ]
+}

testsuites/kernel/Makefile

@@ -35,12 +35,7 @@ MODULE_NAME := ktest
 LOCAL_INCLUDE := -I $(LITEOSTESTTOPDIR)/kernel/include
 
 LOCAL_SRCS := $(wildcard src/osTest.c) \
-              $(wildcard src/runstop_osTest.c) \
-              $(wildcard src/scatter_osTest.c) \
               $(wildcard src/iCunit.c) \
-              $(wildcard src/ChipTest.c) \
-              $(wildcard src/testusb_shellcmd.c) \
-              $(wildcard src/testrun_shellcmd.c)
 
 LOCAL_FLAGS :=  $(LOCAL_INCLUDE) -Wno-error  -I $(LITEOSTOPDIR)/../../$(LOSCFG_BOARD_CONFIG_PATH)/include \
                 -I $(LITEOSTOPDIR)/fs/fat/os_adapt

testsuites/kernel/include/osTest.h

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -36,7 +36,6 @@
 #define SWTMR_TEST
 #endif
 
-#include "test_menuconfig.h"
 #include "stdarg.h"
 #include "los_config.h"
 #include "iCunit.h"
@@ -74,6 +73,7 @@
 #include "los_process_pri.h"
 #include "pthread.h"
 
+#define LOSCFG_TEST 1
 #ifdef LOSCFG_PLATFORM_HI3516DV300
 #define TEST3516DV300
 #elif LOSCFG_PLATFORM_HI3518EV300
@@ -90,7 +90,7 @@ extern "C" {
     do {                                                           \
         memset(&testTask, 0, sizeof(TSK_INIT_PARAM_S));            \
         testTask.pfnTaskEntry = (TSK_ENTRY_FUNC)entry;             \
-        testTask.uwStackSize = LOS_TASK_MIN_STACK_SIZE;            \
+        testTask.uwStackSize = 0x1000;                             \
         testTask.pcName = task_name;                               \
         testTask.usTaskPrio = prio;                                \
         testTask.uwResved = LOS_TASK_STATUS_DETACHED;              \
@@ -108,8 +108,8 @@ extern "C" {
 #define JFFS_BASE_MTD_LEN 0x600000
 
 
-#define TASK_PRIO_TEST 25
-#define TASK_PRIO_TEST_TASK 4
+#define TASK_PRIO_TEST (LOS_TaskPriGet(LOS_CurTaskIDGet())) // 25
+#define TASK_PRIO_TEST_TASK 25
 #define TASK_PRIO_TEST_SWTMR 4
 #ifdef LOSCFG_AARCH64
 #define TASK_STACK_SIZE_TEST (LOS_TASK_MIN_STACK_SIZE * 3)
@@ -117,6 +117,7 @@ extern "C" {
 #define TASK_STACK_SIZE_TEST LOS_TASK_MIN_STACK_SIZE
 #endif
 #define LOS_MS_PER_TICK (OS_SYS_MS_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND)
+#define LOS_US_PER_TICK (OS_SYS_US_PER_SECOND / LOSCFG_BASE_CORE_TICK_PER_SECOND)
 
 #define HWI_NUM_INTVALID OS_HWI_MAX_NUM
 #define writel(g_value, address) WRITE_UINT32(g_value, address)
@@ -313,7 +314,7 @@ extern void msleep(unsigned int msecs);
 extern unsigned int sleep(unsigned int seconds);
 extern int usleep(unsigned useconds);
 
-#define OS_TASK_STATUS_DETACHED OS_TASK_FLAG_DETACHED
+#define OS_TASK_STATUS_DETACHED 0
 extern UINT32 LOS_MemTotalUsedGet(VOID *pool);
 extern VOID ptestTickConsume(VOID);
 extern UINT32 TEST_TskDelete(UINT32 taskID);
@@ -342,6 +343,8 @@ extern void TestSystemInit(void);
 extern void TEST_DT_COMMON(void);
 extern VOID dprintf(const char *fmt, ...);
 
+extern UINT32 OsSwtmrTaskIDGetByCpuid(UINT16 cpuid);
+
 #define BIG_FD 512
 typedef struct testrunParam {
     CHAR testcase_sequence[16];
@@ -365,6 +368,8 @@ typedef struct testrunParam {
 
 extern void InitRebootHook(void);
 
+#define LOSCFG_TEST_SMOKE
+#define LOSCFG_TEST_FULL
 #ifdef __cplusplus
 #if __cplusplus
 }

testsuites/kernel/sample/kernel_base/BUILD.gn

@@ -0,0 +1,37 @@
+# Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
+# Copyright (c) 2020-2022 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")
+
+group("kernel_base") {
+  deps = [
+    "core:test_core",
+    "ipc:test_ipc",
+  ]
+}

testsuites/kernel/sample/kernel_base/core/BUILD.gn

@@ -27,37 +27,238 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-static_library("test_core") {
+import("//kernel/liteos_a/liteos.gni")
+
+kernel_module("test_core") {
   sources = [
-    "hwi/It_smp_hwi.c",
-    "hwi_nesting/It_hwi_nesting.c",
     "swtmr/It_los_swtmr.c",
+    "swtmr/full/It_los_swtmr_001.c",
+    "swtmr/full/It_los_swtmr_002.c",
+    "swtmr/full/It_los_swtmr_003.c",
+    "swtmr/full/It_los_swtmr_005.c",
+    "swtmr/full/It_los_swtmr_006.c",
+    "swtmr/full/It_los_swtmr_007.c",
+    "swtmr/full/It_los_swtmr_008.c",
+    "swtmr/full/It_los_swtmr_009.c",
+    "swtmr/full/It_los_swtmr_010.c",
+    "swtmr/full/It_los_swtmr_011.c",
+    "swtmr/full/It_los_swtmr_012.c",
+    "swtmr/full/It_los_swtmr_013.c",
+    "swtmr/full/It_los_swtmr_014.c",
+    "swtmr/full/It_los_swtmr_015.c",
+    "swtmr/full/It_los_swtmr_016.c",
+    "swtmr/full/It_los_swtmr_017.c",
+    "swtmr/full/It_los_swtmr_018.c",
+    "swtmr/full/It_los_swtmr_019.c",
+    "swtmr/full/It_los_swtmr_020.c",
+    "swtmr/full/It_los_swtmr_021.c",
+    "swtmr/full/It_los_swtmr_030.c",
+    "swtmr/full/It_los_swtmr_036.c",
+    "swtmr/full/It_los_swtmr_037.c",
+    "swtmr/full/It_los_swtmr_042.c",
+    "swtmr/full/It_los_swtmr_044.c",
+    "swtmr/full/It_los_swtmr_045.c",
+    "swtmr/full/It_los_swtmr_046.c",
+    "swtmr/full/It_los_swtmr_047.c",
+    "swtmr/full/It_los_swtmr_048.c",
+    "swtmr/full/It_los_swtmr_049.c",
+    "swtmr/full/It_los_swtmr_050.c",
+    "swtmr/full/It_los_swtmr_051.c",
+    "swtmr/full/It_los_swtmr_052.c",
+    "swtmr/full/It_los_swtmr_054.c",
+    "swtmr/full/It_los_swtmr_055.c",
+    "swtmr/full/It_los_swtmr_056.c",
+    "swtmr/full/It_los_swtmr_057.c",
+    "swtmr/full/It_los_swtmr_059.c",
+    "swtmr/full/It_los_swtmr_061.c",
+    "swtmr/full/It_los_swtmr_062.c",
+    "swtmr/full/It_los_swtmr_063.c",
+    "swtmr/full/It_los_swtmr_066.c",
+    "swtmr/full/It_los_swtmr_067.c",
+    "swtmr/full/It_los_swtmr_068.c",
+    "swtmr/full/It_los_swtmr_069.c",
+    "swtmr/full/It_los_swtmr_070.c",
+    "swtmr/full/It_los_swtmr_071.c",
+    "swtmr/full/It_los_swtmr_075.c",
+    "swtmr/full/It_los_swtmr_076.c",
+    "swtmr/full/It_los_swtmr_077.c",
+    "swtmr/full/It_los_swtmr_078.c",
+    "swtmr/smoke/It_los_swtmr_053.c",
+    "swtmr/smoke/It_los_swtmr_058.c",
+    "swtmr/smp/It_smp_los_swtmr_001.c",
+    "swtmr/smp/It_smp_los_swtmr_002.c",
+    "swtmr/smp/It_smp_los_swtmr_003.c",
+    "swtmr/smp/It_smp_los_swtmr_004.c",
+    "swtmr/smp/It_smp_los_swtmr_005.c",
+    "swtmr/smp/It_smp_los_swtmr_006.c",
+    "swtmr/smp/It_smp_los_swtmr_007.c",
+    "swtmr/smp/It_smp_los_swtmr_008.c",
+    "swtmr/smp/It_smp_los_swtmr_009.c",
+    "swtmr/smp/It_smp_los_swtmr_010.c",
+    "swtmr/smp/It_smp_los_swtmr_011.c",
+    "swtmr/smp/It_smp_los_swtmr_012.c",
+    "swtmr/smp/It_smp_los_swtmr_013.c",
+    "swtmr/smp/It_smp_los_swtmr_014.c",
+    "swtmr/smp/It_smp_los_swtmr_015.c",
+    "swtmr/smp/It_smp_los_swtmr_016.c",
+    "swtmr/smp/It_smp_los_swtmr_017.c",
+    "swtmr/smp/It_smp_los_swtmr_018.c",
+    "swtmr/smp/It_smp_los_swtmr_019.c",
+    "swtmr/smp/It_smp_los_swtmr_020.c",
+    "swtmr/smp/It_smp_los_swtmr_021.c",
+    "swtmr/smp/It_smp_los_swtmr_022.c",
+    "swtmr/smp/It_smp_los_swtmr_023.c",
+    "swtmr/smp/It_smp_los_swtmr_024.c",
+    "swtmr/smp/It_smp_los_swtmr_025.c",
+    "swtmr/smp/It_smp_los_swtmr_026.c",
+    "swtmr/smp/It_smp_los_swtmr_027.c",
+    "swtmr/smp/It_smp_los_swtmr_028.c",
+    "swtmr/smp/It_smp_los_swtmr_029.c",
+    "swtmr/smp/It_smp_los_swtmr_030.c",
+    "swtmr/smp/It_smp_los_swtmr_031.c",
+    "swtmr/smp/It_smp_los_swtmr_032.c",
+    "swtmr/smp/It_smp_los_swtmr_033.c",
+    "swtmr/smp/It_smp_los_swtmr_034.c",
+    "swtmr/smp/It_smp_los_swtmr_035.c",
     "task/It_los_task.c",
+    "task/smoke/It_los_task_045.c",
+    "task/smoke/It_los_task_046.c",
+    "task/smoke/It_los_task_049.c",
+    "task/smoke/It_los_task_081.c",
+    "task/smoke/It_los_task_089.c",
+    "task/smoke/It_los_task_097.c",
+    "task/smoke/It_los_task_099.c",
+    "task/smoke/It_los_task_101.c",
+    "task/smoke/It_los_task_105.c",
+    "task/smoke/It_los_task_timeslice_001.c",
+    "task/smp/It_smp_los_task_001.c",
+    "task/smp/It_smp_los_task_002.c",
+    "task/smp/It_smp_los_task_003.c",
+    "task/smp/It_smp_los_task_004.c",
+    "task/smp/It_smp_los_task_021.c",
+    "task/smp/It_smp_los_task_022.c",
+    "task/smp/It_smp_los_task_023.c",
+    "task/smp/It_smp_los_task_024.c",
+    "task/smp/It_smp_los_task_025.c",
+    "task/smp/It_smp_los_task_026.c",
+    "task/smp/It_smp_los_task_027.c",
+    "task/smp/It_smp_los_task_028.c",
+    "task/smp/It_smp_los_task_029.c",
+    "task/smp/It_smp_los_task_030.c",
+    "task/smp/It_smp_los_task_032.c",
+    "task/smp/It_smp_los_task_033.c",
+    "task/smp/It_smp_los_task_034.c",
+    "task/smp/It_smp_los_task_035.c",
+    "task/smp/It_smp_los_task_036.c",
+    "task/smp/It_smp_los_task_037.c",
+    "task/smp/It_smp_los_task_040.c",
+    "task/smp/It_smp_los_task_042.c",
+    "task/smp/It_smp_los_task_043.c",
+    "task/smp/It_smp_los_task_044.c",
+    "task/smp/It_smp_los_task_046.c",
+    "task/smp/It_smp_los_task_047.c",
+    "task/smp/It_smp_los_task_048.c",
+    "task/smp/It_smp_los_task_049.c",
+    "task/smp/It_smp_los_task_050.c",
+    "task/smp/It_smp_los_task_052.c",
+    "task/smp/It_smp_los_task_053.c",
+    "task/smp/It_smp_los_task_054.c",
+    "task/smp/It_smp_los_task_055.c",
+    "task/smp/It_smp_los_task_056.c",
+    "task/smp/It_smp_los_task_057.c",
+    "task/smp/It_smp_los_task_058.c",
+    "task/smp/It_smp_los_task_059.c",
+    "task/smp/It_smp_los_task_060.c",
+    "task/smp/It_smp_los_task_061.c",
+    "task/smp/It_smp_los_task_062.c",
+    "task/smp/It_smp_los_task_063.c",
+    "task/smp/It_smp_los_task_064.c",
+    "task/smp/It_smp_los_task_065.c",
+    "task/smp/It_smp_los_task_066.c",
+    "task/smp/It_smp_los_task_067.c",
+    "task/smp/It_smp_los_task_068.c",
+    "task/smp/It_smp_los_task_069.c",
+    "task/smp/It_smp_los_task_070.c",
+    "task/smp/It_smp_los_task_071.c",
+    "task/smp/It_smp_los_task_072.c",
+    "task/smp/It_smp_los_task_073.c",
+    "task/smp/It_smp_los_task_074.c",
+    "task/smp/It_smp_los_task_075.c",
+    "task/smp/It_smp_los_task_076.c",
+    "task/smp/It_smp_los_task_077.c",
+    "task/smp/It_smp_los_task_078.c",
+    "task/smp/It_smp_los_task_079.c",
+    "task/smp/It_smp_los_task_081.c",
+    "task/smp/It_smp_los_task_084.c",
+    "task/smp/It_smp_los_task_087.c",
+    "task/smp/It_smp_los_task_088.c",
+    "task/smp/It_smp_los_task_089.c",
+    "task/smp/It_smp_los_task_090.c",
+    "task/smp/It_smp_los_task_091.c",
+    "task/smp/It_smp_los_task_092.c",
+    "task/smp/It_smp_los_task_093.c",
+    "task/smp/It_smp_los_task_094.c",
+    "task/smp/It_smp_los_task_095.c",
+    "task/smp/It_smp_los_task_096.c",
+    "task/smp/It_smp_los_task_098.c",
+    "task/smp/It_smp_los_task_099.c",
+    "task/smp/It_smp_los_task_100.c",
+    "task/smp/It_smp_los_task_101.c",
+    "task/smp/It_smp_los_task_102.c",
+    "task/smp/It_smp_los_task_103.c",
+    "task/smp/It_smp_los_task_105.c",
+    "task/smp/It_smp_los_task_106.c",
+    "task/smp/It_smp_los_task_107.c",
+    "task/smp/It_smp_los_task_108.c",
+    "task/smp/It_smp_los_task_109.c",
+    "task/smp/It_smp_los_task_110.c",
+    "task/smp/It_smp_los_task_112.c",
+    "task/smp/It_smp_los_task_113.c",
+    "task/smp/It_smp_los_task_114.c",
+    "task/smp/It_smp_los_task_115.c",
+    "task/smp/It_smp_los_task_117.c",
+    "task/smp/It_smp_los_task_126.c",
+    "task/smp/It_smp_los_task_127.c",
+    "task/smp/It_smp_los_task_128.c",
+    "task/smp/It_smp_los_task_129.c",
+    "task/smp/It_smp_los_task_130.c",
+    "task/smp/It_smp_los_task_131.c",
+    "task/smp/It_smp_los_task_132.c",
+    "task/smp/It_smp_los_task_133.c",
+    "task/smp/It_smp_los_task_134.c",
+    "task/smp/It_smp_los_task_135.c",
+    "task/smp/It_smp_los_task_136.c",
+    "task/smp/It_smp_los_task_137.c",
+    "task/smp/It_smp_los_task_138.c",
+    "task/smp/It_smp_los_task_139.c",
+    "task/smp/It_smp_los_task_141.c",
+    "task/smp/It_smp_los_task_142.c",
+    "task/smp/It_smp_los_task_143.c",
+    "task/smp/It_smp_los_task_144.c",
+    "task/smp/It_smp_los_task_145.c",
+    "task/smp/It_smp_los_task_146.c",
+    "task/smp/It_smp_los_task_147.c",
+    "task/smp/It_smp_los_task_148.c",
+    "task/smp/It_smp_los_task_149.c",
+    "task/smp/It_smp_los_task_150.c",
+    "task/smp/It_smp_los_task_151.c",
+    "task/smp/It_smp_los_task_152.c",
+    "task/smp/It_smp_los_task_153.c",
+    "task/smp/It_smp_los_task_154.c",
+    "task/smp/It_smp_los_task_155.c",
+    "task/smp/It_smp_los_task_156.c",
+    "task/smp/It_smp_los_task_157.c",
+    "task/smp/It_smp_los_task_158.c",
+    "task/smp/It_smp_los_task_159.c",
+    "task/smp/It_smp_los_task_160.c",
+    "task/smp/It_smp_los_task_161.c",
   ]
 
-  if (LOSCFG_TEST_SMOKE) {
-    sources += [
-      "swtmr/smoke/It_los_swtmr_053.c",
-      "swtmr/smoke/It_los_swtmr_058.c",
-      "task/smoke/It_los_task_045.c",
-      "task/smoke/It_los_task_046.c",
-      "task/smoke/It_los_task_049.c",
-      "task/smoke/It_los_task_081.c",
-      "task/smoke/It_los_task_089.c",
-      "task/smoke/It_los_task_097.c",
-      "task/smoke/It_los_task_099.c",
-      "task/smoke/It_los_task_101.c",
-      "task/smoke/It_los_task_105.c",
-      "task/smoke/It_los_task_timeslice_001.c",
-    ]
-  }
   include_dirs = [
-    "../../../include/",
     "task",
     "swtmr",
-    "hwi",
-    "hwi_nesting",
   ]
 
-  cflags = [ "-Wno-error" ]
+  public_configs =
+      [ "//kernel/liteos_a/testsuites/kernel:liteos_kernel_test_public" ]
 }

testsuites/kernel/sample/kernel_base/core/swtmr/It_los_swtmr.c

@@ -41,14 +41,6 @@ EVENT_CB_S g_eventCB1, g_eventCB2, g_eventCB3;
 
 VOID ItSuiteLosSwtmr(VOID)
 {
-    int ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, TASK_PRIO_TEST_SWTMR);
-    if (ret != LOS_OK) {
-        dprintf("%s set test process schedule failed! %d\n", ret);
-    }
-    ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST_SWTMR);
-    if (ret != LOS_OK) {
-        dprintf("%s set test task schedule failed! %d\n", ret);
-    }
 #if defined(LOSCFG_TEST_SMOKE)
     ItLosSwtmr053();
     ItLosSwtmr058();
@@ -75,10 +67,8 @@ VOID ItSuiteLosSwtmr(VOID)
     ItSmpLosSwtmr019();
     ItSmpLosSwtmr020();
     ItSmpLosSwtmr021();
-    ItSmpLosSwtmr022();
     ItSmpLosSwtmr023();
     ItSmpLosSwtmr024();
-    ItSmpLosSwtmr025();
     ItSmpLosSwtmr026();
     ItSmpLosSwtmr027();
     ItSmpLosSwtmr028();
@@ -86,7 +76,6 @@ VOID ItSuiteLosSwtmr(VOID)
     ItSmpLosSwtmr030();
     ItSmpLosSwtmr031();
     ItSmpLosSwtmr032();
-    ItSmpLosSwtmr033();
     ItSmpLosSwtmr034();
     ItSmpLosSwtmr035();
 #endif
@@ -112,16 +101,10 @@ VOID ItSuiteLosSwtmr(VOID)
     ItLosSwtmr019();
     ItLosSwtmr020();
     ItLosSwtmr021();
-    ItLosSwtmr022();
     ItLosSwtmr030();
-    ItLosSwtmr033();
     ItLosSwtmr036();
     ItLosSwtmr037();
-    ItLosSwtmr039();
-    ItLosSwtmr040();
-    ItLosSwtmr041();
     ItLosSwtmr042();
-    ItLosSwtmr043();
     ItLosSwtmr044();
     ItLosSwtmr045();
     ItLosSwtmr046();
@@ -136,12 +119,9 @@ VOID ItSuiteLosSwtmr(VOID)
     ItLosSwtmr056();
     ItLosSwtmr057();
     ItLosSwtmr059();
-    ItLosSwtmr060();
     ItLosSwtmr061();
     ItLosSwtmr062();
     ItLosSwtmr063();
-    ItLosSwtmr064();
-    ItLosSwtmr065();
     ItLosSwtmr066();
     ItLosSwtmr067();
     ItLosSwtmr068();
@@ -179,14 +159,6 @@ VOID ItSuiteLosSwtmr(VOID)
     ItLosSwtmr080();
     ItLosSwtmr023();
 #endif
-    ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, 20); // 20, set a reasonable priority.
-    if (ret != LOS_OK) {
-        dprintf("%s set test process schedule failed! %d\n", ret);
-    }
-    ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST);
-    if (ret != LOS_OK) {
-        dprintf("%s set test task schedule failed! %d\n", ret);
-    }
 }
 
 #ifdef __cplusplus

testsuites/kernel/sample/kernel_base/core/swtmr/full/It_los_swtmr_036.c

@@ -36,20 +36,22 @@
 extern "C" {
 #endif /* __cpluscplus */
 #endif /* __cpluscplus */
+
+static UINT32 g_testSwtmrCount;
 static VOID SwtmrF01(UINT32 arg)
 {
     if (arg != 0xffff) {
         return;
     }
 
-    g_testCount++;
+    g_testSwtmrCount++;
     return;
 }
 static UINT32 Testcase(VOID)
 {
     UINT32 ret;
     UINT16 swTmrID;
-    g_testCount = 0;
+    g_testSwtmrCount = 0;
 
     ret = LOS_SwtmrCreate(1, LOS_SWTMR_MODE_ONCE, SwtmrF01, &swTmrID, 0xffff);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
@@ -62,7 +64,8 @@ static UINT32 Testcase(VOID)
 
     ret = LOS_TaskDelay(10); // 10, set delay time
     ICUNIT_GOTO_EQUAL(ret, LOS_OK, ret, EXIT);
-    ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
+    ICUNIT_GOTO_EQUAL(g_testSwtmrCount, 1, g_testSwtmrCount, EXIT);
+
 #if SELF_DELETED
     ret = LOS_SwtmrDelete(swTmrID);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);

testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_002.c

@@ -82,11 +82,14 @@ static UINT32 Testcase(void)
         TEST_TASK_PARAM_INIT(testTask, "it_swtmr_002_task", TaskF01,
             TASK_PRIO_TEST_SWTMR + 1); // not set cpuaffi
         testTask.auwArgs[0] = g_swtmrHandle[i];
+        testTask.usCpuAffiMask = CPUID_TO_AFFI_MASK(i);
         ret = LOS_TaskCreate(&testid, &testTask);
         ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
     }
 
+    UINT64 startTime = LOS_CurrNanosec();
     LOS_TaskDelay(g_testPeriod * g_testTimes + 5); // g_testPeriod * g_testTimes + 5, set delay time
+    UINT64 usedTime = LOS_CurrNanosec() - startTime;
 
     ICUNIT_ASSERT_EQUAL(g_testCount, g_testTimes * LOSCFG_KERNEL_CORE_NUM, g_testCount);
 

testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_003.c

@@ -71,7 +71,8 @@ static UINT32 Testcase(void)
         CPUID_TO_AFFI_MASK(ArchCurrCpuid()));
     ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
-    LOS_TaskDelay(g_testPeriod + 1);
+
+    LOS_TaskDelay(g_testPeriod + 10); // period is 10
 
     ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
 

testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_024.c

@@ -88,13 +88,15 @@ static UINT32 Testcase(void)
     ret = LOS_SwtmrCreate(g_testPeriod, LOS_SWTMR_MODE_PERIOD, (SWTMR_PROC_FUNC)SwtmrF01, &g_swTmrID, 0);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
 
-    TEST_TASK_PARAM_INIT(testTask, "it_swtmr_024_task1", TaskF01,
-        TASK_PRIO_TEST_SWTMR + 1); // not set cpuaffi
+    TEST_TASK_PARAM_INIT_AFFI(testTask, "it_swtmr_024_task1", TaskF01,
+        TASK_PRIO_TEST_SWTMR + 1, CPUID_TO_AFFI_MASK(ArchCurrCpuid()));
+    testTask.uwResved = LOS_TASK_ATTR_JOINABLE;
     ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
 
-    TEST_TASK_PARAM_INIT(testTask, "it_swtmr_024_task2", TaskF02,
-        TASK_PRIO_TEST_SWTMR + 1); // not set cpuaffi
+    TEST_TASK_PARAM_INIT_AFFI(testTask, "it_swtmr_024_task2", TaskF02,
+        TASK_PRIO_TEST_SWTMR + 1, CPUID_TO_AFFI_MASK((ArchCurrCpuid() + 1) % LOSCFG_KERNEL_CORE_NUM));
+    testTask.uwResved = LOS_TASK_ATTR_JOINABLE;
     ret = LOS_TaskCreate(&g_testTaskID02, &testTask);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
 
@@ -102,6 +104,12 @@ static UINT32 Testcase(void)
 
     ICUNIT_GOTO_EQUAL(g_testCount, 1, g_testCount, EXIT);
 
+    ret = LOS_TaskJoin(g_testTaskID01, NULL);
+    ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
+
+    ret = LOS_TaskJoin(g_testTaskID02, NULL);
+    ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
+
     LOS_SwtmrDelete(g_swTmrID);
     ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
 

testsuites/kernel/sample/kernel_base/core/swtmr/smp/It_smp_los_swtmr_025.c

@@ -38,10 +38,10 @@ extern "C" {
 #endif /* __cpluscplus */
 
 static UINT32 g_szId[LOSCFG_KERNEL_CORE_NUM] = {0};
-
+static UINT32 g_testSwtmtCount = 0;
 static VOID SwtmrF01(void)
 {
-    LOS_AtomicInc(&g_testCount);
+    LOS_AtomicInc(&g_testSwtmtCount);
 }
 
 static void TaskF01(UINT32 index)
@@ -61,26 +61,31 @@ static UINT32 Testcase(void)
     UINT32 ret;
     UINT32 currCpuid;
     UINT32 i;
-
-    g_testCount = 0;
+    UINT32 taskID[LOSCFG_KERNEL_CORE_NUM];
+    g_testSwtmtCount = 0;
     g_testPeriod = 10; // period is 10
 
     for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
         TEST_TASK_PARAM_INIT_AFFI(testTask, "it_swtmr_025_task1", TaskF01, TASK_PRIO_TEST_SWTMR + 1, CPUID_TO_AFFI_MASK(i));
         testTask.auwArgs[0] = i;
-        ret = LOS_TaskCreate(&g_testTaskID01, &testTask);
+        testTask.uwResved = LOS_TASK_ATTR_JOINABLE;
+        ret = LOS_TaskCreate(&taskID[i], &testTask);
         ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
     }
 
-    LOS_TaskDelay(1);
-
     for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
-        LOS_SwtmrStart(g_szId[i]);
+        ret = LOS_TaskJoin(taskID[i], NULL);
+        ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
     }
 
-    LOS_TaskDelay(g_testPeriod);
+    for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
+        ret = LOS_SwtmrStart(g_szId[i]);
+        ICUNIT_ASSERT_EQUAL(ret, LOS_OK, ret);
+    }
 
-    ICUNIT_GOTO_EQUAL(g_testCount, LOSCFG_KERNEL_CORE_NUM, g_testCount, EXIT);
+    LOS_TaskDelay(g_testPeriod + 5); /* 5 ticks */
+
+    ICUNIT_GOTO_EQUAL(g_testSwtmtCount, LOSCFG_KERNEL_CORE_NUM, g_testSwtmtCount, EXIT);
 
     for (i = 0; i < LOSCFG_KERNEL_CORE_NUM; i++) {
         ret = LOS_SwtmrDelete(g_szId[i]);

testsuites/kernel/sample/kernel_base/core/task/It_los_task.c

@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved.
- * Copyright (c) 2020-2021 Huawei Device Co., Ltd. All rights reserved.
+ * Copyright (c) 2020-2022 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:
@@ -43,27 +43,15 @@ volatile INT32 g_timesliceTestCount = 0;
 
 void ItSuiteLosTask(void)
 {
-    int ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, TASK_PRIO_TEST_TASK);
-    if (ret != LOS_OK) {
-        dprintf("%s set test process schedule failed! %d\n", ret);
-    }
-    ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST_TASK);
-    if (ret != LOS_OK) {
-        dprintf("%s set test task schedule failed! %d\n", ret);
-    }
 #if defined(LOSCFG_TEST_SMOKE)
     ItLosTask045();
     ItLosTask046();
-    ItLosTask049();
-    ItLosTask081();
     ItLosTask089();
     ItLosTask097();
     ItLosTask101();
-    ItLosTask105();
     ItLosTask099();
     ItLosTaskTimeslice001();
 #ifdef LOSCFG_KERNEL_SMP
-    // reserved 20 for smoke test
     ItSmpLosTask001(); /* Task Affinity */
     ItSmpLosTask002(); /* Task Deletion Across Cores */
     ItSmpLosTask003(); /* Task Suspend Across Cores */
@@ -72,138 +60,6 @@ void ItSuiteLosTask(void)
 #endif
 
 #if defined(LOSCFG_TEST_FULL)
-    ItLosTask001();
-    ItLosTask002();
-    ItLosTask004();
-    ItLosTask007();
-    ItLosTask008();
-    ItLosTask009();
-    ItLosTask010();
-    ItLosTask011();
-    ItLosTask012();
-    ItLosTask013();
-    ItLosTask014();
-    ItLosTask015();
-    ItLosTask016();
-    ItLosTask017();
-    ItLosTask018();
-    ItLosTask019();
-    ItLosTask020();
-    ItLosTask021();
-    ItLosTask022();
-    ItLosTask023();
-    ItLosTask024();
-    ItLosTask025();
-    ItLosTask026();
-    ItLosTask027();
-    ItLosTask028();
-    ItLosTask029();
-    ItLosTask031();
-    ItLosTask032();
-    ItLosTask033();
-    ItLosTask034();
-    ItLosTask035();
-    ItLosTask036();
-    ItLosTask037();
-    ItLosTask038();
-    ItLosTask039();
-#ifndef TESTHI1980IMU
-    ItLosTask040();
-#endif
-    ItLosTask041();
-    ItLosTask042();
-    ItLosTask043();
-    ItLosTask047();
-    ItLosTask048();
-    ItLosTask050();
-    ItLosTask051();
-    ItLosTask052();
-    ItLosTask053();
-    ItLosTask054();
-    ItLosTask055();
-    ItLosTask056();
-    ItLosTask057();
-    ItLosTask058();
-    ItLosTask060();
-    ItLosTask061();
-    ItLosTask063();
-    ItLosTask064();
-    ItLosTask065();
-    ItLosTask066();
-    ItLosTask067();
-    ItLosTask068();
-    ItLosTask069();
-    ItLosTask071();
-    ItLosTask072();
-    ItLosTask073();
-    ItLosTask074();
-#ifndef LOSCFG_KERNEL_SMP
-    ItLosTask075();
-#endif
-    ItLosTask076();
-    ItLosTask077();
-    ItLosTask078();
-    ItLosTask079();
-    ItLosTask080(); // LOS_TaskYeild is not allowed in irq
-    ItLosTask082();
-    ItLosTask090();
-    ItLosTask092();
-    ItLosTask093();
-    ItLosTask094();
-    ItLosTask095();
-    ItLosTask096();
-    ItLosTask098();
-    ItLosTask100();
-    ItLosTask102();
-    ItLosTask103();
-    ItLosTask104();
-    ItLosTask106();
-    ItLosTask107();
-    ItLosTask108();
-    ItLosTask109();
-    ItLosTask110();
-    ItLosTask111();
-    ItLosTask112();
-    ItLosTask113();
-    ItLosTask114();
-    ItLosTask115();
-    ItLosTask116(); // Not used the API LOS_CurTaskPriSet to change the task priority for the software timer
-    ItLosTask119();
-    ItLosTask120();
-    ItLosTask121();
-    ItLosTask122();
-    ItLosTask123();
-    ItLosTask124();
-    ItLosTask125();
-    ItLosTask126();
-    ItLosTask127();
-    ItLosTask128();
-    ItLosTask129();
-    ItLosTask130();
-    ItLosTask131();
-    ItLosTask132();
-    ItLosTask133();
-    ItLosTask134();
-    ItLosTask135();
-    ItLosTask136();
-#ifndef LOSCFG_ARCH_FPU_DISABLE
-    ItLosTask141(); /* fpu regs check in task switch */
-    ItLosTask142(); /* fpu regs check in irq context switch */
-#endif
-    ItLosTaskTimeslice002();
-    ItLosTaskTimeslice003();
-    ItLosTaskTimeslice004();
-#ifdef LOSCFG_KERNEL_SMP
-#ifndef LOSCFG_ARCH_FPU_DISABLE
-
-    ItSmpLosFloatSwitch001();
-    ItSmpLosFloatSwitch002();
-    ItSmpLosFloatSwitch003();
-    ItSmpLosFloatSwitch004();
-    ItSmpLosFloatSwitch005();
-    ItSmpLosFloatSwitch006();
-    ItSmpLosFloatSwitch007();
-#endif
     // fixed
     ItSmpLosTask099();
     ItSmpLosTask049();
@@ -211,7 +67,6 @@ void ItSuiteLosTask(void)
     ItSmpLosTask159();
     ItSmpLosTask161();
     ItSmpLosTask137();
-    ItSmpLosTask158();
     ItSmpLosTask021();
     ItSmpLosTask022();
     ItSmpLosTask023();
@@ -235,7 +90,6 @@ void ItSuiteLosTask(void)
     ItSmpLosTask047();
     ItSmpLosTask048();
     ItSmpLosTask050();
-    ItSmpLosTask051();
     ItSmpLosTask052();
     ItSmpLosTask053();
     ItSmpLosTask054();
@@ -263,7 +117,6 @@ void ItSuiteLosTask(void)
     ItSmpLosTask078();
     ItSmpLosTask079();
     ItSmpLosTask081();
-    ItSmpLosTask082();
     ItSmpLosTask084();
     ItSmpLosTask087();
     ItSmpLosTask088();
@@ -275,7 +128,6 @@ void ItSuiteLosTask(void)
     ItSmpLosTask094();
     ItSmpLosTask095();
     ItSmpLosTask096();
-    ItSmpLosTask097();
     ItSmpLosTask098();
     ItSmpLosTask100();
     ItSmpLosTask101();
@@ -323,21 +175,6 @@ void ItSuiteLosTask(void)
     ItSmpLosTask156();
     ItSmpLosTask157();
 #endif
-#endif
-
-#ifdef LOSCFG_KERNEL_SMP
-    HalIrqSetAffinity(HWI_NUM_TEST, 1);
-    HalIrqSetAffinity(HWI_NUM_TEST1, 1);
-    HalIrqSetAffinity(HWI_NUM_TEST3, 1);
-#endif
-    ret = LOS_SetProcessScheduler(LOS_GetCurrProcessID(), LOS_SCHED_RR, 20); // 20, set a reasonable priority.
-    if (ret != LOS_OK) {
-        dprintf("%s set test process schedule failed! %d\n", ret);
-    }
-    ret = LOS_SetTaskScheduler(LOS_CurTaskIDGet(), LOS_SCHED_RR, TASK_PRIO_TEST);
-    if (ret != LOS_OK) {
-        dprintf("%s set test task schedule failed! %d\n", ret);
-    }
 }
 #ifdef __cplusplus
 #if __cplusplus