!877 LiteOS-A内核jffs2文件系统停止使用third_party下的Linux_Kernel

Merge pull request !877 from Far/master

BUILD.gn

@@ -75,7 +75,6 @@ generate_notice_file("kernel_notice_file") {
     "$LITEOSTHIRDPARTY/musl",
     "$LITEOSTHIRDPARTY/zlib",
     "$LITEOSTHIRDPARTY/FatFs",
-    "$LITEOSTHIRDPARTY/Linux_Kernel",
     "$LITEOSTHIRDPARTY/lwip",
     "$LITEOSTHIRDPARTY/NuttX",
     "$LITEOSTHIRDPARTY/mtd-utils",

bundle.json

@@ -43,7 +43,6 @@
                 "bounds_checking_function",
                 "toybox",
                 "NuttX",
-                "Linux_Kernel",
                 "FatFs",
                 "mksh",
                 "musl",
@@ -63,4 +62,4 @@
             "test": []
         }
     }
-}
+}

fs/BUILD.gn

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

fs/Kconfig

@@ -4,7 +4,7 @@ source "fs/ramfs/Kconfig"
 source "fs/romfs/Kconfig"
 source "fs/nfs/Kconfig"
 source "fs/proc/Kconfig"
-source "fs/jffs2/Kconfig"
+#source "fs/jffs2/Kconfig"
 source "fs/rootfs/Kconfig"
 source "fs/patchfs/Kconfig"
-source "fs/zpfs/Kconfig"
+source "fs/zpfs/Kconfig"

fs/jffs2/BUILD.gn

@@ -28,7 +28,6 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import("//kernel/liteos_a/liteos.gni")
-import("//third_party/Linux_Kernel/Linux_Kernel.gni")
 
 module_switch = defined(LOSCFG_FS_JFFS)
 module_name = get_path_info(rebase_path("."), "name")

fs/jffs2/Makefile

@@ -32,11 +32,11 @@ include $(LITEOSTOPDIR)/config.mk
 MODULE_NAME := $(notdir $(shell pwd))
 
 LOCAL_SRCS := $(wildcard src/*.c) \
-		$(wildcard $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2/*.c)
+		$(wildcard $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2/*.c)
 LOCAL_INCLUDE := \
 		-I $(LITEOSTOPDIR)/fs/jffs2/include \
-		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs/jffs2 \
-		-I $(LITEOSTHIRDPARTY)/Linux_Kernel/fs
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs/jffs2 \
+		-I $(LITEOSTOPDIR)/../linux/linux-5.10/fs
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

kernel/base/core/los_process.c

@@ -995,7 +995,6 @@ 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;
@@ -1011,14 +1010,13 @@ 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;
     }
 
     LosTaskCB *taskCB = OS_TCB_FROM_TID(processCB->threadGroupID);
     taskCB->ops->schedParamGet(taskCB, &param);
 
-OUT:
     SCHEDULER_UNLOCK(intSave);
     return param.basePrio;
 }

kernel/extended/liteipc/hm_liteipc.c

@@ -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;
@@ -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;
@@ -1309,6 +1353,8 @@ LITE_OS_SEC_TEXT int LiteIpcIoctl(struct file *filep, int cmd, unsigned long arg
             return (INT32)SetCms(arg);
         case IPC_CMS_CMD:
             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");

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,

tools/build/mk/los_config.mk

@@ -306,8 +306,8 @@ endif
 
 
 ifeq ($(LOSCFG_FS_JFFS), y)
-    LITEOS_BASELIB  += -ljffs2
-    LIB_SUBDIRS     += fs/jffs2
+#    LITEOS_BASELIB  += -ljffs2
+#    LIB_SUBDIRS     += fs/jffs2
 endif
 
 ifeq ($(LOSCFG_PLATFORM_ROOTFS), y)