!1093 Fix : 内核告警清理挑单到monthly_20221018

Merge pull request !1093 from yinjiaming/cherry-pick-1672881303

Makefile

@@ -82,6 +82,9 @@ endif
 ifeq ($(LOSCFG_STORAGE_SPINAND), y)
 FSTYPE = yaffs2
 endif
+ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
+FSTYPE = jffs2
+endif
 ROOTFS_DIR = $(OUT)/rootfs
 ROOTFS_ZIP = $(OUT)/rootfs.zip
 

apps/shell/src/main.c

@@ -49,7 +49,7 @@ ShellCB *OsGetShellCb()
     return g_shellCB;
 }
 
-void ShellDeinit(ShellCB *shellCB)
+static void ShellDeinit(ShellCB *shellCB)
 {
     (void)pthread_mutex_destroy(&shellCB->historyMutex);
     (void)pthread_mutex_destroy(&shellCB->keyMutex);
@@ -65,27 +65,23 @@ static int OsShellCreateTask(ShellCB *shellCB)
 
     ret = sched_getparam(getpid(), &param);
     if (ret != SH_OK) {
-        goto OUT;
+        return ret;
     }
 
     param.sched_priority = SHELL_PROCESS_PRIORITY_INIT;
 
     ret = sched_setparam(getpid(), &param);
     if (ret != SH_OK) {
-        goto OUT;
+        return ret;
     }
 
     ret = ShellTaskInit(shellCB);
     if (ret != SH_OK) {
-        goto OUT;
+        return ret;
     }
 
     shellCB->shellEntryHandle = pthread_self();
     return 0;
-
-OUT:
-    ShellDeinit(shellCB);
-    return ret;
 }
 
 static int DoShellExec(char **argv)
@@ -148,7 +144,7 @@ int main(int argc, char **argv)
 
     shellCB = (ShellCB *)malloc(sizeof(ShellCB));
     if (shellCB == NULL) {
-        goto ERR_OUT1;
+        return SH_NOK;
     }
     ret = memset_s(shellCB, sizeof(ShellCB), 0, sizeof(ShellCB));
     if (ret != SH_OK) {
@@ -176,7 +172,9 @@ int main(int argc, char **argv)
     g_shellCB = shellCB;
     ret = OsShellCreateTask(shellCB);
     if (ret != SH_OK) {
-        goto ERR_OUT3;
+        ShellDeinit(shellCB);
+        g_shellCB = NULL;
+        return ret;
     }
 
     ShellEntry(shellCB);

drivers/block/disk/src/disk.c

@@ -1465,7 +1465,7 @@ INT32 los_disk_init(const CHAR *diskName, const struct block_operations *bops,
     ret = VnodeLookup(diskName, &blkDriver, 0);
     if (ret < 0) {
         VnodeDrop();
-        ret = ENOENT;
+        PRINT_ERR("disk_init : %s, failed to find the vnode, ERRNO=%d\n", diskName, ret);
         goto DISK_FIND_ERROR;
     }
     struct block_operations *bops2 = (struct block_operations *)((struct drv_data *)blkDriver->data)->ops;

drivers/mtd/multi_partition/BUILD.gn

@@ -39,6 +39,10 @@ kernel_module(module_name) {
 
   include_dirs = [ "$LITEOSTOPDIR/fs/jffs2/include" ]
 
+  if (defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)) {
+    include_dirs += [ "//device/qemu/drivers/cfiflash" ]
+  }
+
   public_configs = [ ":public" ]
 }
 

drivers/mtd/multi_partition/Makefile

@@ -36,6 +36,10 @@ LOCAL_SRCS :=  $(wildcard src/*.c)
 LOCAL_INCLUDE := \
     -I $(LITEOSTOPDIR)/fs/jffs2/include
 
+ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
+LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
+endif
+
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

drivers/mtd/multi_partition/src/mtd_partition.c

@@ -39,6 +39,11 @@
 #include "fs/driver.h"
 #include "mtd/mtd_legacy_lite.h"
 
+#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
+#include "cfiflash.h"
+#endif
+
+
 #define DRIVER_NAME_ADD_SIZE    3
 pthread_mutex_t g_mtdPartitionLock = PTHREAD_MUTEX_INITIALIZER;
 
@@ -129,10 +134,17 @@ static VOID MtdNorParamAssign(partition_param *spinorParam, const struct MtdDev
      * you can change the SPIBLK_NAME or SPICHR_NAME to NULL.
      */
     spinorParam->flash_mtd = (struct MtdDev *)spinorMtd;
+#ifndef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
     spinorParam->flash_ops = GetDevSpinorOps();
     spinorParam->char_ops = GetMtdCharFops();
     spinorParam->blockname = SPIBLK_NAME;
     spinorParam->charname = SPICHR_NAME;
+#else
+    spinorParam->flash_ops = GetCfiBlkOps();
+    spinorParam->char_ops = NULL;
+    spinorParam->blockname = CFI_DRIVER;
+    spinorParam->charname = NULL;
+#endif
     spinorParam->partition_head = g_spinorPartitionHead;
     spinorParam->block_size = spinorMtd->eraseSize;
 }
@@ -146,7 +158,11 @@ static VOID MtdDeinitSpinorParam(VOID)
 
 static partition_param *MtdInitSpinorParam(partition_param *spinorParam)
 {
+#ifndef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
     struct MtdDev *spinorMtd = GetMtd("spinor");
+#else
+    struct MtdDev *spinorMtd = GetCfiMtdDev();
+#endif
     if (spinorMtd == NULL) {
         return NULL;
     }

fs/jffs2/jffs2.patch

@@ -2778,11 +2778,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  	ri->version = cpu_to_je32(++f->highest_version);
 +	ri->uid = cpu_to_je16(inode->i_uid);
 +	ri->gid = cpu_to_je16(inode->i_gid);
- 
--	ri->uid = cpu_to_je16((ivalid & ATTR_UID)?
--		from_kuid(&init_user_ns, iattr->ia_uid):i_uid_read(inode));
--	ri->gid = cpu_to_je16((ivalid & ATTR_GID)?
--		from_kgid(&init_user_ns, iattr->ia_gid):i_gid_read(inode));
++
 +	if (ivalid & CHG_UID) {
 +		if (((c_uid != inode->i_uid) || (attr->attr_chg_uid != inode->i_uid)) && (!IsCapPermit(CAP_CHOWN))) {
 +			jffs2_complete_reservation(c);
@@ -2804,7 +2800,16 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 +			ri->gid = cpu_to_je16(attr->attr_chg_gid);
 +		}
 +	}
-+
+ 
+-	ri->uid = cpu_to_je16((ivalid & ATTR_UID)?
+-		from_kuid(&init_user_ns, iattr->ia_uid):i_uid_read(inode));
+-	ri->gid = cpu_to_je16((ivalid & ATTR_GID)?
+-		from_kgid(&init_user_ns, iattr->ia_gid):i_gid_read(inode));
+-
+-	if (ivalid & ATTR_MODE)
+-		ri->mode = cpu_to_jemode(iattr->ia_mode);
+-	else
+-		ri->mode = cpu_to_jemode(inode->i_mode);
 +	if (ivalid & CHG_MODE) {
 +		if (!IsCapPermit(CAP_FOWNER) && (c_uid != inode->i_uid)) {
 +			jffs2_complete_reservation(c);
@@ -2818,10 +2823,6 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 +		}
 +	}
  
--	if (ivalid & ATTR_MODE)
--		ri->mode = cpu_to_jemode(iattr->ia_mode);
--	else
--		ri->mode = cpu_to_jemode(inode->i_mode);
 +	if (ivalid & CHG_ATIME) {
 +		if ((c_uid != inode->i_uid) || (attr->attr_chg_uid != inode->i_uid)) {
 +			return -EPERM;
@@ -2831,7 +2832,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 +	} else {
 +		ri->atime = cpu_to_je32(inode->i_atime);
 +	}
- 
++
 +	if (ivalid & CHG_MTIME) {
 +		if ((c_uid != inode->i_uid) || (attr->attr_chg_uid != inode->i_uid)) {
 +			return -EPERM;
@@ -2883,7 +2884,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  	if (IS_ERR(new_metadata)) {
  		jffs2_complete_reservation(c);
  		jffs2_free_raw_inode(ri);
-@@ -147,23 +140,20 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
+@@ -147,23 +140,20 @@ int jffs2_do_setattr (struct inode *inod
  		return PTR_ERR(new_metadata);
  	}
  	/* It worked. Update the inode */
@@ -2916,7 +2917,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  		f->metadata = NULL;
  	} else {
  		f->metadata = new_metadata;
-@@ -182,315 +172,201 @@ int jffs2_do_setattr (struct inode *inode, struct iattr *iattr)
+@@ -182,315 +172,201 @@ int jffs2_do_setattr (struct inode *inod
  	   We are protected from a simultaneous write() extending i_size
  	   back past iattr->ia_size, because do_truncate() holds the
  	   generic inode semaphore. */
@@ -2935,43 +2936,31 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  {
 -	struct inode *inode = d_inode(dentry);
 -	int rc;
+-
+-	rc = setattr_prepare(dentry, iattr);
+-	if (rc)
+-		return rc;
+-
+-	rc = jffs2_do_setattr(inode, iattr);
+-	if (!rc && (iattr->ia_valid & ATTR_MODE))
+-		rc = posix_acl_chmod(inode, inode->i_mode);
 +	/* We can forget about this inode for now - drop all
 +	 *  the nodelists associated with it, etc.
 +	 */
 +	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 +	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
-+
-+	jffs2_do_clear_inode(c, f);
-+}
- 
--	rc = setattr_prepare(dentry, iattr);
--	if (rc)
--		return rc;
-+static struct jffs2_inode *ilookup(struct super_block *sb, uint32_t ino)
-+{
-+	struct jffs2_inode *node = NULL;
- 
--	rc = jffs2_do_setattr(inode, iattr);
--	if (!rc && (iattr->ia_valid & ATTR_MODE))
--		rc = posix_acl_chmod(inode, inode->i_mode);
-+	if (sb->s_root == NULL) {
-+		return NULL;
-+	}
  
 -	return rc;
-+	// Check for this inode in the cache
-+	Jffs2NodeLock();
-+	(void)Jffs2HashGet(&sb->s_node_hash_lock, &sb->s_node_hash[0], sb, ino, &node);
-+	Jffs2NodeUnlock();
-+	return node;
++	jffs2_do_clear_inode(c, f);
  }
  
 -int jffs2_statfs(struct dentry *dentry, struct kstatfs *buf)
-+struct jffs2_inode *new_inode(struct super_block *sb)
++static struct jffs2_inode *ilookup(struct super_block *sb, uint32_t ino)
  {
 -	struct jffs2_sb_info *c = JFFS2_SB_INFO(dentry->d_sb);
 -	unsigned long avail;
--
++	struct jffs2_inode *node = NULL;
+ 
 -	buf->f_type = JFFS2_SUPER_MAGIC;
 -	buf->f_bsize = 1 << PAGE_SHIFT;
 -	buf->f_blocks = c->flash_size >> PAGE_SHIFT;
@@ -2990,35 +2979,47 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 -	spin_unlock(&c->erase_completion_lock);
 -
 -	buf->f_bavail = buf->f_bfree = avail >> PAGE_SHIFT;
-+	struct jffs2_inode *inode = NULL;
++	if (sb->s_root == NULL) {
++		return NULL;
++	}
  
 -	return 0;
--}
-+	inode = zalloc(sizeof (struct jffs2_inode));
-+	if (inode == NULL)
-+		return 0;
- 
-+	D2(PRINTK("malloc new_inode %x ####################################\n",
-+		inode));
++	// Check for this inode in the cache
++	Jffs2NodeLock();
++	(void)Jffs2HashGet(&sb->s_node_hash_lock, &sb->s_node_hash[0], sb, ino, &node);
++	Jffs2NodeUnlock();
++	return node;
+ }
  
+-
 -void jffs2_evict_inode (struct inode *inode)
--{
++struct jffs2_inode *new_inode(struct super_block *sb)
+ {
 -	/* We can forget about this inode for now - drop all
 -	 *  the nodelists associated with it, etc.
 -	 */
 -	struct jffs2_sb_info *c = JFFS2_SB_INFO(inode->i_sb);
 -	struct jffs2_inode_info *f = JFFS2_INODE_INFO(inode);
-+	inode->i_sb = sb;
-+	inode->i_ino = 1;
-+	inode->i_nlink = 1;    // Let JFFS2 manage the link count
-+	inode->i_size = 0;
-+	LOS_ListInit((&(inode->i_hashlist)));
++	struct jffs2_inode *inode = NULL;
  
 -	jffs2_dbg(1, "%s(): ino #%lu mode %o\n",
 -		  __func__, inode->i_ino, inode->i_mode);
 -	truncate_inode_pages_final(&inode->i_data);
 -	clear_inode(inode);
 -	jffs2_do_clear_inode(c, f);
++	inode = zalloc(sizeof (struct jffs2_inode));
++	if (inode == NULL)
++		return 0;
++
++	D2(PRINTK("malloc new_inode %x ####################################\n",
++		inode));
++
++	inode->i_sb = sb;
++	inode->i_ino = 1;
++	inode->i_nlink = 1;    // Let JFFS2 manage the link count
++	inode->i_size = 0;
++	LOS_ListInit((&(inode->i_hashlist)));
++
 +	return inode;
  }
  
@@ -3083,16 +3084,16 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 -	inode->i_ctime = ITIME(je32_to_cpu(latest_node.ctime));
 -
 -	set_nlink(inode, f->inocache->pino_nlink);
--
--	inode->i_blocks = (inode->i_size + 511) >> 9;
 +	inode->i_atime = je32_to_cpu(latest_node.atime);
 +	inode->i_mtime = je32_to_cpu(latest_node.mtime);
 +	inode->i_ctime = je32_to_cpu(latest_node.ctime);
 +	inode->i_nlink = f->inocache->pino_nlink;
  
--	switch (inode->i_mode & S_IFMT) {
+-	inode->i_blocks = (inode->i_size + 511) >> 9;
 +	(void)mutex_unlock(&f->sem);
  
+-	switch (inode->i_mode & S_IFMT) {
+-
 -	case S_IFLNK:
 -		inode->i_op = &jffs2_symlink_inode_operations;
 -		inode->i_link = f->target;
@@ -3162,21 +3163,20 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  	jffs2_dbg(1, "jffs2_read_inode() returning\n");
 -	unlock_new_inode(inode);
 -	return inode;
-+	Jffs2NodeUnlock();
- 
+-
 -error_io:
 -	ret = -EIO;
 -error:
 -	mutex_unlock(&f->sem);
 -	iget_failed(inode);
 -	return ERR_PTR(ret);
-+	return inode;
- }
+-}
++	Jffs2NodeUnlock();
  
 -void jffs2_dirty_inode(struct inode *inode, int flags)
 -{
 -	struct iattr iattr;
- 
+-
 -	if (!(inode->i_state & I_DIRTY_DATASYNC)) {
 -		jffs2_dbg(2, "%s(): not calling setattr() for ino #%lu\n",
 -			  __func__, inode->i_ino);
@@ -3195,19 +3195,16 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 -	iattr.ia_ctime = inode->i_ctime;
 -
 -	jffs2_do_setattr(inode, &iattr);
--}
-+// -------------------------------------------------------------------------
-+// Decrement the reference count on an inode. If this makes the ref count
-+// zero, then this inode can be freed.
++	return inode;
+ }
  
 -int jffs2_do_remount_fs(struct super_block *sb, struct fs_context *fc)
-+int jffs2_iput(struct jffs2_inode *i)
- {
+-{
 -	struct jffs2_sb_info *c = JFFS2_SB_INFO(sb);
 -
 -	if (c->flags & JFFS2_SB_FLAG_RO && !sb_rdonly(sb))
 -		return -EROFS;
--
+ 
 -	/* We stop if it was running, then restart if it needs to.
 -	   This also catches the case where it was stopped and this
 -	   is just a remount to restart it.
@@ -3218,9 +3215,12 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 -		jffs2_flush_wbuf_pad(c);
 -		mutex_unlock(&c->alloc_sem);
 -	}
--
--	if (!(fc->sb_flags & SB_RDONLY))
--		jffs2_start_garbage_collect_thread(c);
++// -------------------------------------------------------------------------
++// Decrement the reference count on an inode. If this makes the ref count
++// zero, then this inode can be freed.
++
++int jffs2_iput(struct jffs2_inode *i)
++{
 +	// Called in jffs2_find
 +	// (and jffs2_open and jffs2_ops_mkdir?)
 +	// super.c jffs2_fill_super,
@@ -3242,6 +3242,9 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 +	free(i);
 +	Jffs2NodeUnlock();
  
+-	if (!(fc->sb_flags & SB_RDONLY))
+-		jffs2_start_garbage_collect_thread(c);
+-
 -	fc->sb_flags |= SB_NOATIME;
  	return 0;
  }
@@ -3348,7 +3351,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  {
  	/*
  	 * Pick a inocache hash size based on the size of the medium.
-@@ -510,117 +386,17 @@ static int calculate_inocache_hashsize(uint32_t flash_size)
+@@ -510,117 +386,17 @@ static int calculate_inocache_hashsize(u
  	return hashsize;
  }
  
@@ -3444,8 +3447,8 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 -	jffs2_free_ino_caches(c);
 -	jffs2_free_raw_node_refs(c);
 -	kvfree(c->blocks);
--	jffs2_clear_xattr_subsystem(c);
 - out_inohash:
+-	jffs2_clear_xattr_subsystem(c);
 -	kfree(c->inocache_list);
 - out_wbuf:
 -	jffs2_flash_cleanup(c);
@@ -3454,7 +3457,8 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
 -}
 -
  void jffs2_gc_release_inode(struct jffs2_sb_info *c,
- 				   struct jffs2_inode_info *f)
+-				   struct jffs2_inode_info *f)
++		   	    struct jffs2_inode_info *f)
  {
 -	iput(OFNI_EDONI_2SFFJ(f));
 +	struct jffs2_inode *node = OFNI_EDONI_2SFFJ(f);
@@ -3469,7 +3473,7 @@ diff -Nupr old/fs/jffs2/fs.c new/fs/jffs2/fs.c
  	struct jffs2_inode_cache *ic;
  
  	if (unlinked) {
-@@ -668,72 +444,9 @@ struct jffs2_inode_info *jffs2_gc_fetch_inode(struct jffs2_sb_info *c,
+@@ -668,72 +444,9 @@ struct jffs2_inode_info *jffs2_gc_fetch_
  		   Just iget() it, and if read_inode() is necessary that's OK.
  		*/
  		inode = jffs2_iget(OFNI_BS_2SFFJ(c), inum);
@@ -5561,7 +5565,7 @@ diff -Nupr old/fs/jffs2/scan.c new/fs/jffs2/scan.c
  
  #define DEFAULT_EMPTY_SCAN_SIZE 256
  
-@@ -74,7 +73,7 @@ static int file_dirty(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
+@@ -74,7 +73,7 @@ static int file_dirty(struct jffs2_sb_in
  		return ret;
  	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
  		return ret;
@@ -5570,13 +5574,15 @@ diff -Nupr old/fs/jffs2/scan.c new/fs/jffs2/scan.c
  	   think it's recoverable now. */
  	jeb->dirty_size += jeb->wasted_size;
  	c->dirty_size += jeb->wasted_size;
-@@ -95,40 +94,26 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
+@@ -95,40 +94,26 @@ int jffs2_scan_medium(struct jffs2_sb_in
  	unsigned char *flashbuf = NULL;
  	uint32_t buf_size = 0;
  	struct jffs2_summary *s = NULL; /* summary info collected by the scan process */
 -#ifndef __ECOS
 -	size_t pointlen, try_size;
--
++	struct super_block *sb = NULL;
++	struct MtdNorDev *device = NULL;
+ 
 -	ret = mtd_point(c->mtd, 0, c->mtd->size, &pointlen,
 -			(void **)&flashbuf, NULL);
 -	if (!ret && pointlen < c->mtd->size) {
@@ -5589,9 +5595,6 @@ diff -Nupr old/fs/jffs2/scan.c new/fs/jffs2/scan.c
 -	if (ret && ret != -EOPNOTSUPP)
 -		jffs2_dbg(1, "MTD point failed %d\n", ret);
 -#endif
-+	struct super_block *sb = NULL;
-+	struct MtdNorDev *device = NULL;
-+
  	if (!flashbuf) {
  		/* For NAND it's quicker to read a whole eraseblock at a time,
  		   apparently */
@@ -5619,7 +5622,7 @@ diff -Nupr old/fs/jffs2/scan.c new/fs/jffs2/scan.c
  	}
  
  	if (jffs2_sum_active()) {
-@@ -140,7 +125,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
+@@ -140,7 +125,9 @@ int jffs2_scan_medium(struct jffs2_sb_in
  		}
  	}
  
@@ -5630,7 +5633,7 @@ diff -Nupr old/fs/jffs2/scan.c new/fs/jffs2/scan.c
  		struct jffs2_eraseblock *jeb = &c->blocks[i];
  
  		cond_resched();
-@@ -269,14 +256,10 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
+@@ -269,19 +256,12 @@ int jffs2_scan_medium(struct jffs2_sb_in
  			ret = -EIO;
  			goto out;
  		}
@@ -5640,254 +5643,20 @@ diff -Nupr old/fs/jffs2/scan.c new/fs/jffs2/scan.c
  	}
  	ret = 0;
   out:
--	jffs2_sum_reset_collected(s);
--	kfree(s);
-+	kfree(flashbuf);
-  out_buf:
- 	if (buf_size)
- 		kfree(flashbuf);
-@@ -413,7 +396,7 @@ static int jffs2_scan_xref_node(struct jffs2_sb_info *c, struct jffs2_eraseblock
- 	if (!ref)
- 		return -ENOMEM;
- 
--	/* BEFORE jffs2_build_xattr_subsystem() called, 
-+	/* BEFORE jffs2_build_xattr_subsystem() called,
- 	 * and AFTER xattr_ref is marked as a dead xref,
- 	 * ref->xid is used to store 32bit xid, xd is not used
- 	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -486,10 +469,10 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 		struct jffs2_sum_marker *sm;
- 		void *sumptr = NULL;
- 		uint32_t sumlen;
--	      
-+
- 		if (!buf_size) {
- 			/* XIP case. Just look, point at the summary if it's there */
--			sm = (void *)buf + c->sector_size - sizeof(*sm);
-+			sm = (struct jffs2_sum_marker *)((uint8_t *)buf + c->sector_size - sizeof(*sm));
- 			if (je32_to_cpu(sm->magic) == JFFS2_SUM_MAGIC) {
- 				sumptr = buf + je32_to_cpu(sm->offset);
- 				sumlen = c->sector_size - je32_to_cpu(sm->offset);
-@@ -502,13 +485,13 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 				buf_len = sizeof(*sm);
- 
- 			/* Read as much as we want into the _end_ of the preallocated buffer */
--			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len, 
-+			err = jffs2_fill_scan_buf(c, buf + buf_size - buf_len,
- 						  jeb->offset + c->sector_size - buf_len,
--						  buf_len);				
-+						  buf_len);
- 			if (err)
- 				return err;
- 
--			sm = (void *)buf + buf_size - sizeof(*sm);
-+			sm = (struct jffs2_sum_marker *)((uint8_t *)buf + buf_size - sizeof(*sm));
- 			if (je32_to_cpu(sm->magic) == JFFS2_SUM_MAGIC) {
- 				sumlen = c->sector_size - je32_to_cpu(sm->offset);
- 				sumptr = buf + buf_size - sumlen;
-@@ -523,18 +506,15 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 					sumptr = kmalloc(sumlen, GFP_KERNEL);
- 					if (!sumptr)
- 						return -ENOMEM;
--					memcpy(sumptr + sumlen - buf_len, buf + buf_size - buf_len, buf_len);
-+					memcpy((uint8_t *)sumptr + sumlen - buf_len, buf + buf_size - buf_len, buf_len);
- 				}
- 				if (buf_len < sumlen) {
- 					/* Need to read more so that the entire summary node is present */
--					err = jffs2_fill_scan_buf(c, sumptr, 
-+					err = jffs2_fill_scan_buf(c, sumptr,
- 								  jeb->offset + c->sector_size - sumlen,
--								  sumlen - buf_len);				
--					if (err) {
--						if (sumlen > buf_size)
--							kfree(sumptr);
-+								  sumlen - buf_len);
-+					if (err)
- 						return err;
--					}
- 				}
- 			}
- 
-@@ -545,7 +525,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 
- 			if (buf_size && sumlen > buf_size)
- 				kfree(sumptr);
--			/* If it returns with a real error, bail. 
-+			/* If it returns with a real error, bail.
- 			   If it returns positive, that's a block classification
- 			   (i.e. BLK_STATE_xxx) so return that too.
- 			   If it returns zero, fall through to full scan. */
-@@ -607,7 +587,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 	/* Now ofs is a complete physical flash offset as it always was... */
- 	ofs += jeb->offset;
- 
--	noise = 10;
-+	noise = 1;
- 
- 	dbg_summary("no summary found in jeb 0x%08x. Apply original scan.\n",jeb->offset);
- 
-@@ -700,7 +680,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 				scan_end = buf_len;
- 				goto more_empty;
- 			}
--			
-+
- 			/* See how much more there is to read in this eraseblock... */
- 			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
- 			if (!buf_len) {
-@@ -950,7 +930,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
- 	jffs2_dbg(1, "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
- 		  jeb->offset, jeb->free_size, jeb->dirty_size,
- 		  jeb->unchecked_size, jeb->used_size, jeb->wasted_size);
--	
-+
- 	/* mark_node_obsolete can add to wasted !! */
- 	if (jeb->wasted_size) {
- 		jeb->dirty_size += jeb->wasted_size;
-@@ -978,7 +958,6 @@ struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uin
- 		pr_notice("%s(): allocation of inode cache failed\n", __func__);
- 		return NULL;
- 	}
--	memset(ic, 0, sizeof(*ic));
- 
- 	ic->ino = ino;
- 	ic->nodes = (void *)ic;
-@@ -1069,7 +1048,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
- 	pseudo_random += je32_to_cpu(rd->version);
- 
- 	/* Should never happen. Did. (OLPC trac #4184)*/
--	checkedlen = strnlen(rd->name, rd->nsize);
-+	checkedlen = strnlen((const char *)rd->name, rd->nsize);
- 	if (checkedlen < rd->nsize) {
- 		pr_err("Dirent at %08x has zeroes in name. Truncating to %d chars\n",
- 		       ofs, checkedlen);
-@@ -1081,7 +1060,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
- 	memcpy(&fd->name, rd->name, checkedlen);
- 	fd->name[checkedlen] = 0;
- 
--	crc = crc32(0, fd->name, checkedlen);
-+	crc = crc32(0, fd->name, rd->nsize);
- 	if (crc != je32_to_cpu(rd->name_crc)) {
- 		pr_notice("%s(): Name CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",
- 			  __func__, ofs, je32_to_cpu(rd->name_crc), crc);
-@@ -1106,7 +1085,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
- 	fd->next = NULL;
- 	fd->version = je32_to_cpu(rd->version);
- 	fd->ino = je32_to_cpu(rd->ino);
--	fd->nhash = full_name_hash(NULL, fd->name, checkedlen);
-+	fd->nhash = full_name_hash(fd->name, checkedlen);
- 	fd->type = rd->type;
- 	jffs2_add_fd_to_list(c, fd, &ic->scan_dents);
- 
-diff
-@@ -9,18 +9,17 @@
-  *
-  */
- 
--#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
--
- #include <linux/kernel.h>
- #include <linux/sched.h>
- #include <linux/slab.h>
--#include <linux/mtd/mtd.h>
- #include <linux/pagemap.h>
--#include <linux/crc32.h>
- #include <linux/compiler.h>
- #include "nodelist.h"
- #include "summary.h"
- #include "debug.h"
-+#include "mtd_dev.h"
-+#include "los_typedef.h"
-+#include "los_crc32.h"
- 
- #define DEFAULT_EMPTY_SCAN_SIZE 256
- 
-@@ -74,7 +73,7 @@ static int file_dirty(struct jffs2_sb_info *c, struct jffs2_eraseblock *jeb)
- 		return ret;
- 	if ((ret = jffs2_scan_dirty_space(c, jeb, jeb->free_size)))
- 		return ret;
--	/* Turned wasted size into dirty, since we apparently 
-+	/* Turned wasted size into dirty, since we apparently
- 	   think it's recoverable now. */
- 	jeb->dirty_size += jeb->wasted_size;
- 	c->dirty_size += jeb->wasted_size;
-@@ -95,40 +94,26 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
- 	unsigned char *flashbuf = NULL;
- 	uint32_t buf_size = 0;
- 	struct jffs2_summary *s = NULL; /* summary info collected by the scan process */
+-	if (buf_size)
+-		kfree(flashbuf);
 -#ifndef __ECOS
--	size_t pointlen, try_size;
--
--	ret = mtd_point(c->mtd, 0, c->mtd->size, &pointlen,
--			(void **)&flashbuf, NULL);
--	if (!ret && pointlen < c->mtd->size) {
--		/* Don't muck about if it won't let us point to the whole flash */
--		jffs2_dbg(1, "MTD point returned len too short: 0x%zx\n",
--			  pointlen);
--		mtd_unpoint(c->mtd, 0, pointlen);
--		flashbuf = NULL;
--	}
--	if (ret && ret != -EOPNOTSUPP)
--		jffs2_dbg(1, "MTD point failed %d\n", ret);
+-	else
+-		mtd_unpoint(c->mtd, 0, c->mtd->size);
 -#endif
-+	struct super_block *sb = NULL;
-+	struct MtdNorDev *device = NULL;
-+
- 	if (!flashbuf) {
- 		/* For NAND it's quicker to read a whole eraseblock at a time,
- 		   apparently */
- 		if (jffs2_cleanmarker_oob(c))
--			try_size = c->sector_size;
-+			buf_size = c->sector_size;
- 		else
--			try_size = PAGE_SIZE;
-+			buf_size = PAGE_SIZE;
- 
- 		jffs2_dbg(1, "Trying to allocate readbuf of %zu "
--			  "bytes\n", try_size);
-+			  "bytes\n", buf_size);
- 
--		flashbuf = mtd_kmalloc_up_to(c->mtd, &try_size);
-+		flashbuf = kmalloc(buf_size, GFP_KERNEL);
- 		if (!flashbuf)
- 			return -ENOMEM;
- 
- 		jffs2_dbg(1, "Allocated readbuf of %zu bytes\n",
--			  try_size);
--
--		buf_size = (uint32_t)try_size;
-+			  buf_size);
- 	}
- 
- 	if (jffs2_sum_active()) {
-@@ -140,7 +125,9 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
- 		}
- 	}
- 
--	for (i=0; i<c->nr_blocks; i++) {
-+	sb = OFNI_BS_2SFFJ(c);
-+	device = (struct MtdNorDev*)(sb->s_dev);
-+	for (i=device->blockStart; i<c->nr_blocks + device->blockStart; i++) {
- 		struct jffs2_eraseblock *jeb = &c->blocks[i];
- 
- 		cond_resched();
-@@ -269,14 +256,10 @@ int jffs2_scan_medium(struct jffs2_sb_info *c)
- 			ret = -EIO;
- 			goto out;
- 		}
--		spin_lock(&c->erase_completion_lock);
--		jffs2_garbage_collect_trigger(c);
--		spin_unlock(&c->erase_completion_lock);
- 	}
- 	ret = 0;
-  out:
--	jffs2_sum_reset_collected(s);
 -	kfree(s);
++
 +	kfree(flashbuf);
-  out_buf:
- 	if (buf_size)
- 		kfree(flashbuf);
-@@ -413,7 +396,7 @@ static int jffs2_scan_xref_node(struct jffs2_sb_info *c, struct jffs2_eraseblock
++
+ 	return ret;
+ }
+ 
+@@ -411,7 +391,7 @@ static int jffs2_scan_xref_node(struct j
  	if (!ref)
  		return -ENOMEM;
  
@@ -5896,7 +5665,7 @@ diff
  	 * and AFTER xattr_ref is marked as a dead xref,
  	 * ref->xid is used to store 32bit xid, xd is not used
  	 * ref->ino is used to store 32bit inode-number, ic is not used
-@@ -486,10 +469,10 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -484,10 +464,10 @@ static int jffs2_scan_eraseblock (struct
  		struct jffs2_sum_marker *sm;
  		void *sumptr = NULL;
  		uint32_t sumlen;
@@ -5909,7 +5678,7 @@ diff
  			if (je32_to_cpu(sm->magic) == JFFS2_SUM_MAGIC) {
  				sumptr = buf + je32_to_cpu(sm->offset);
  				sumlen = c->sector_size - je32_to_cpu(sm->offset);
-@@ -502,13 +485,13 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -500,13 +480,13 @@ static int jffs2_scan_eraseblock (struct
  				buf_len = sizeof(*sm);
  
  			/* Read as much as we want into the _end_ of the preallocated buffer */
@@ -5926,7 +5695,7 @@ diff
  			if (je32_to_cpu(sm->magic) == JFFS2_SUM_MAGIC) {
  				sumlen = c->sector_size - je32_to_cpu(sm->offset);
  				sumptr = buf + buf_size - sumlen;
-@@ -523,18 +506,15 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -521,18 +501,15 @@ static int jffs2_scan_eraseblock (struct
  					sumptr = kmalloc(sumlen, GFP_KERNEL);
  					if (!sumptr)
  						return -ENOMEM;
@@ -5949,7 +5718,7 @@ diff
  				}
  			}
  
-@@ -545,7 +525,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -543,7 +520,7 @@ static int jffs2_scan_eraseblock (struct
  
  			if (buf_size && sumlen > buf_size)
  				kfree(sumptr);
@@ -5958,7 +5727,7 @@ diff
  			   If it returns positive, that's a block classification
  			   (i.e. BLK_STATE_xxx) so return that too.
  			   If it returns zero, fall through to full scan. */
-@@ -607,7 +587,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -605,7 +582,7 @@ full_scan:
  	/* Now ofs is a complete physical flash offset as it always was... */
  	ofs += jeb->offset;
  
@@ -5967,7 +5736,7 @@ diff
  
  	dbg_summary("no summary found in jeb 0x%08x. Apply original scan.\n",jeb->offset);
  
-@@ -700,7 +680,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -698,7 +675,7 @@ scan_more:
  				scan_end = buf_len;
  				goto more_empty;
  			}
@@ -5976,7 +5745,7 @@ diff
  			/* See how much more there is to read in this eraseblock... */
  			buf_len = min_t(uint32_t, buf_size, jeb->offset + c->sector_size - ofs);
  			if (!buf_len) {
-@@ -950,7 +930,7 @@ static int jffs2_scan_eraseblock (struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -948,7 +925,7 @@ scan_more:
  	jffs2_dbg(1, "Block at 0x%08x: free 0x%08x, dirty 0x%08x, unchecked 0x%08x, used 0x%08x, wasted 0x%08x\n",
  		  jeb->offset, jeb->free_size, jeb->dirty_size,
  		  jeb->unchecked_size, jeb->used_size, jeb->wasted_size);
@@ -5985,7 +5754,7 @@ diff
  	/* mark_node_obsolete can add to wasted !! */
  	if (jeb->wasted_size) {
  		jeb->dirty_size += jeb->wasted_size;
-@@ -978,7 +958,6 @@ struct jffs2_inode_cache *jffs2_scan_make_ino_cache(struct jffs2_sb_info *c, uin
+@@ -976,7 +953,6 @@ struct jffs2_inode_cache *jffs2_scan_mak
  		pr_notice("%s(): allocation of inode cache failed\n", __func__);
  		return NULL;
  	}
@@ -5993,7 +5762,7 @@ diff
  
  	ic->ino = ino;
  	ic->nodes = (void *)ic;
-@@ -1069,7 +1048,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -1067,7 +1043,7 @@ static int jffs2_scan_dirent_node(struct
  	pseudo_random += je32_to_cpu(rd->version);
  
  	/* Should never happen. Did. (OLPC trac #4184)*/
@@ -6002,7 +5771,7 @@ diff
  	if (checkedlen < rd->nsize) {
  		pr_err("Dirent at %08x has zeroes in name. Truncating to %d chars\n",
  		       ofs, checkedlen);
-@@ -1081,7 +1060,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -1079,7 +1055,7 @@ static int jffs2_scan_dirent_node(struct
  	memcpy(&fd->name, rd->name, checkedlen);
  	fd->name[checkedlen] = 0;
  
@@ -6011,7 +5780,7 @@ diff
  	if (crc != je32_to_cpu(rd->name_crc)) {
  		pr_notice("%s(): Name CRC failed on node at 0x%08x: Read 0x%08x, calculated 0x%08x\n",
  			  __func__, ofs, je32_to_cpu(rd->name_crc), crc);
-@@ -1106,7 +1085,7 @@ static int jffs2_scan_dirent_node(struct jffs2_sb_info *c, struct jffs2_eraseblo
+@@ -1104,7 +1080,7 @@ static int jffs2_scan_dirent_node(struct
  	fd->next = NULL;
  	fd->version = je32_to_cpu(rd->version);
  	fd->ino = je32_to_cpu(rd->ino);

fs/rootfs/Makefile

@@ -33,6 +33,10 @@ MODULE_NAME := rootfs
 
 LOCAL_SRCS := $(wildcard los_rootfs.c los_bootargs.c)
 
+ifeq ($(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7), y)
+LOCAL_INCLUDE += -I $(LITEOSTOPDIR)/../../device/qemu/drivers/cfiflash
+endif
+
 LOCAL_FLAGS := $(LOCAL_INCLUDE)
 
 include $(MODULE)

fs/rootfs/los_bootargs.c

@@ -32,10 +32,14 @@
 #include "los_base.h"
 #include "string.h"
 
-#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND)
+#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)
 #include "mtd_list.h"
 #endif
 
+#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
+#include "cfiflash.h"
+#endif
+
 #ifdef LOSCFG_STORAGE_EMMC
 #include "disk.h"
 #endif
@@ -94,6 +98,19 @@ INT32 LOS_GetCmdLine(VOID)
     }
 #endif
 
+#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
+    struct MtdDev *mtd = GetCfiMtdDev();
+    if (mtd == NULL) {
+        PRINT_ERR("Get CFI mtd failed!\n");
+        goto ERROUT;
+    }
+    g_alignSize = mtd->eraseSize;
+    ret = mtd->read(mtd, CFIFLASH_BOOTARGS_ADDR, COMMAND_LINE_SIZE, g_cmdLine);
+    if (ret == COMMAND_LINE_SIZE) {
+        return LOS_OK;
+    }
+#endif
+
     PRINT_ERR("Read cmdline error!\n");
 ERROUT:
     free(g_cmdLine);

fs/rootfs/los_rootfs.c

@@ -37,11 +37,15 @@
 #include "sys/stat.h"
 #include "sys/types.h"
 
-#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND)
+#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)
 #include "mtd_list.h"
 #include "mtd_partition.h"
 #endif
 
+#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
+#include "cfiflash.h"
+#endif
+
 #ifdef LOSCFG_STORAGE_EMMC
 #include "disk.h"
 #include "ff.h"
@@ -124,7 +128,14 @@ STATIC INT32 AddEmmcParts(INT32 rootAddr, INT32 rootSize, INT32 userAddr, INT32
 
 STATIC INT32 AddPartitions(CHAR *dev, UINT64 rootAddr, UINT64 rootSize, UINT64 userAddr, UINT64 userSize)
 {
-#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND)
+#ifdef LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7
+    if ((strcmp(dev, "cfi-flash") == 0) && (rootAddr != CFIFLASH_ROOT_ADDR)) {
+        PRINT_ERR("Error rootAddr, must be %#0x!\n", CFIFLASH_ROOT_ADDR);
+        return LOS_NOK;
+    }
+#endif
+
+#if defined(LOSCFG_STORAGE_SPINOR) || defined(LOSCFG_STORAGE_SPINAND) || defined(LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)
     INT32 ret;
     INT32 blk0 = 0;
     INT32 blk2 = 2;

fs/rootfs/los_rootfs.h

@@ -59,6 +59,12 @@
 #define ROOTFS_ADDR             0x600000
 #define ROOTFS_SIZE             0x800000
 #define USERFS_SIZE             0x80000
+#elif defined (LOSCFG_PLATFORM_QEMU_ARM_VIRT_CA7)
+#define ROOT_DEV_NAME           "/dev/cfiflash0"
+#define USER_DEV_NAME           "/dev/cfiflash2"
+#define ROOTFS_ADDR             CFIFLASH_ROOT_ADDR
+#define ROOTFS_SIZE             0x1B00000
+#define USERFS_SIZE             (CFIFLASH_CAPACITY - ROOTFS_ADDR - ROOTFS_SIZE)
 #elif defined (LOSCFG_STORAGE_EMMC)
 #define ROOT_DEV_NAME           "/dev/mmcblk0p0"
 #ifdef LOSCFG_PLATFORM_PATCHFS

kernel/base/vm/los_vm_dump.c

@@ -146,7 +146,6 @@ UINT32 OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
     LosVmSpace *space = NULL;
     LOS_DL_LIST *spaceList = NULL;
     UINT32 UProcessUsed = 0;
-    UINT32 pmTmp;
 
     if (actualPm == NULL) {
         return 0;
@@ -167,8 +166,7 @@ UINT32 OsKProcessPmUsage(LosVmSpace *kSpace, UINT32 *actualPm)
         if (space == LOS_GetKVmSpace()) {
             continue;
         }
-        (VOID)OsUProcessPmUsage(space, NULL, &pmTmp);
-        UProcessUsed += pmTmp;
+        UProcessUsed += OsUProcessPmUsage(space, NULL, NULL);
     }
     (VOID)LOS_MuxRelease(vmSpaceListMux);
 

kernel/extended/hilog/los_hilog.c

@@ -233,14 +233,8 @@ static int HiLogWriteRingBuffer(unsigned char *buffer, size_t bufLen)
 
 static void HiLogHeadInit(struct HiLogEntry *header, size_t len)
 {
-    struct timespec now;
-    int ret;
-
-    ret = clock_gettime(CLOCK_REALTIME, &now);
-    if (ret != 0) {
-        PRINTK("In %s line %d,clock_gettime fail\n", __FUNCTION__, __LINE__);
-        return;
-    }
+    struct timespec now = {0};
+    (void)clock_gettime(CLOCK_REALTIME, &now);
 
     header->len = len;
     header->pid = LOS_GetCurrProcessID();

net/lwip-2.1/enhancement/src/api_shell.c

@@ -2175,8 +2175,6 @@ u32_t osShellPing6(int argc, const char **argv)
     /* Setting the start time of the entire ping task for statistics */
     (void)clock_gettime(CLOCK_MONOTONIC_RAW, &first);
 
-    nsent = 0;
-
     for (nsent = 0; nsent < ping6_params.pingcount; nsent++) {
         /* capture the start tick to calculate rtt */
         (void)clock_gettime(CLOCK_MONOTONIC_RAW, &start);
@@ -3170,7 +3168,6 @@ void netstat_internal(void *ctx)
         }
 
         /* For listen PCBs */
-        recvQlen = 0;
         sendQlen = 0;
 
         for (lpcb = tcp_listen_pcbs.listen_pcbs; lpcb != NULL; lpcb = lpcb->next) {
@@ -3670,7 +3667,7 @@ u32_t netdebug_sock(int argc, const char **argv)
     int idx;
     u32_t ret = LOS_NOK;
 
-    if (argc == 2) {
+    if (argc == 2) { /* 2: Number of command parameters */
         if (!strcmp("-i", argv[1])) {
             /* netdebug sock -i */
             for (idx = 0; idx < (int)LWIP_CONFIG_NUM_SOCKETS; idx++) {
@@ -3678,10 +3675,9 @@ u32_t netdebug_sock(int argc, const char **argv)
             }
             ret = LOS_OK;
         }
-    } else if (argc == 3) {
+    } else if (argc == 3) { /* 3: Number of command parameters */
         if (!strcmp("-d", argv[1])) {
-            /* netdebug sock -d <idx> */
-            idx = atoi(argv[2]);
+            idx = atoi(argv[2]); /* 2: netdebug sock -d <idx> */
             if (idx >= 0) {
                 debug_socket_info(idx, 1, 1);
                 ret = LOS_OK;

syscall/time_syscall.c

@@ -109,7 +109,7 @@ int SysSetiTimer(int which, const struct itimerval *value, struct itimerval *ova
 {
     int ret;
     struct itimerval svalue;
-    struct itimerval sovalue;
+    struct itimerval sovalue = { 0 };
 
     if (value == NULL) {
         errno = EINVAL;
@@ -137,7 +137,7 @@ int SysSetiTimer(int which, const struct itimerval *value, struct itimerval *ova
 int SysGetiTimer(int which, struct itimerval *value)
 {
     int ret;
-    struct itimerval svalue;
+    struct itimerval svalue = { 0 };
 
     if (value == NULL) {
         errno = EINVAL;
@@ -189,7 +189,7 @@ int SysTimerCreate(clockid_t clockID, struct ksigevent *evp, timer_t *timerID)
 int SysTimerGettime(timer_t timerID, struct itimerspec *value)
 {
     int ret;
-    struct itimerspec svalue;
+    struct itimerspec svalue = { 0 };
 
     if (value == NULL) {
         errno = EINVAL;
@@ -213,7 +213,7 @@ int SysTimerSettime(timer_t timerID, int flags, const struct itimerspec *value,
 {
     int ret;
     struct itimerspec svalue;
-    struct itimerspec soldValue;
+    struct itimerspec soldValue = { 0 };
 
     if (value == NULL) {
         errno = EINVAL;
@@ -285,7 +285,7 @@ int SysClockSettime(clockid_t clockID, const struct timespec *tp)
 int SysClockGettime(clockid_t clockID, struct timespec *tp)
 {
     int ret;
-    struct timespec stp;
+    struct timespec stp = { 0 };
 
     if (tp == NULL) {
         errno = EINVAL;
@@ -308,7 +308,7 @@ int SysClockGettime(clockid_t clockID, struct timespec *tp)
 int SysClockGetres(clockid_t clockID, struct timespec *tp)
 {
     int ret;
-    struct timespec stp;
+    struct timespec stp = { 0 };
 
     if (tp == NULL) {
         errno = EINVAL;
@@ -356,7 +356,7 @@ int SysNanoSleep(const struct timespec *rqtp, struct timespec *rmtp)
 {
     int ret;
     struct timespec srqtp;
-    struct timespec srmtp;
+    struct timespec srmtp = { 0 };
 
     if (!rqtp || LOS_ArchCopyFromUser(&srqtp, rqtp, sizeof(struct timespec))) {
         errno = EFAULT;
@@ -384,7 +384,7 @@ int SysNanoSleep(const struct timespec *rqtp, struct timespec *rmtp)
 clock_t SysTimes(struct tms *buf)
 {
     clock_t ret;
-    struct tms sbuf;
+    struct tms sbuf = { 0 };
 
     if (buf == NULL) {
         errno = EFAULT;
@@ -436,7 +436,7 @@ int SysClockGettime64(clockid_t clockID, struct timespec64 *tp)
 {
     int ret;
     struct timespec t;
-    struct timespec64 stp;
+    struct timespec64 stp = { 0 };
 
     if (tp == NULL) {
         errno = EINVAL;
@@ -463,7 +463,7 @@ int SysClockGetres64(clockid_t clockID, struct timespec64 *tp)
 {
     int ret;
     struct timespec t;
-    struct timespec64 stp;
+    struct timespec64 stp = { 0 };
 
     if (tp == NULL) {
         errno = EINVAL;
@@ -525,7 +525,7 @@ int SysTimerGettime64(timer_t timerID, struct itimerspec64 *value)
 {
     int ret;
     struct itimerspec val;
-    struct itimerspec64 svalue;
+    struct itimerspec64 svalue = { 0 };
 
     if (value == NULL) {
         errno = EINVAL;
@@ -584,6 +584,7 @@ int SysTimerSettime64(timer_t timerID, int flags, const struct itimerspec64 *val
     }
 
     if (oldValue != NULL) {
+        (void)memset_s(&soldValue, sizeof(struct itimerspec64), 0, sizeof(struct itimerspec64));
         soldValue.it_interval.tv_sec = oldVal.it_interval.tv_sec;
         soldValue.it_interval.tv_nsec = oldVal.it_interval.tv_nsec;
         soldValue.it_value.tv_sec = oldVal.it_value.tv_sec;

testsuites/unittest/libc/posix/pthread/It_posix_pthread.h

@@ -56,7 +56,7 @@
 #define TEST_HwiTrigger(HWI_NUM_TEST)
 #define LOS_TaskLock()
 #define LOS_TaskUnlock()
-#define LOS_MS2Tick(ms) (ms / 10)
+#define LOS_MS2Tick(ms) ((ms) / 10)
 #define OS_TASK_PRIORITY_HIGHEST 0
 #define OS_TASK_PRIORITY_LOWEST 31
 
@@ -228,12 +228,7 @@ struct testdata {
 };
 extern struct testdata g_td;
 
-
-extern unsigned int sleep(unsigned int seconds);
-extern unsigned int alarm(unsigned int seconds);
-
 extern int map_errno(UINT32 err);
-extern long sysconf(int name);
 extern void posix_signal_start(void);
 
 VOID ScenarInit(VOID);