github/acrn-hypervisor
1
0
Fork 0
mirror of https://github.com/projectacrn/acrn-hypervisor.git synced 2026-06-08 10:04:42 +00:00
Code Issues Projects Releases Wiki Activity

tools: acrn-crashlog: Limit the log size of kmsg

Browse Source 
Dmesg collects too much log when kernel meets log storm.
This patch reads kernel log from "/dev/kmsg" intead of dmesg and limits
the generated log size.

Tracked-On: #1024
Signed-off-by: Liu, Xinwu <xinwu.liu@intel.com>
Reviewed-by: Zhi Jin <zhi.jin@intel.com>
Acked-by: Chen, Gang <gang.c.chen@intel.com>
This commit is contained in:
Liu, Xinwu
2019-01-08 16:22:17 +08:00
committed by acrnsi
parent 156ea70821
commit d5b578fd84
6 changed files with 58 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
tools/acrn-crashlog/common/fsutils.c
View File

@@ -528,44 +528,57 @@ int file_update_int(const char *filename, unsigned int current,
*
* @param src Path of source file.
* @param dest Path of destin file.
* @param limitsize Bytes will copy from src at most.
*
* @return 0 if successful, or a negative value if not.
* @return 0 if successful, or -1 if not.
*/
int do_copy_eof(const char *src, const char *des)
int do_copy_limit(const char *src, const char *des, size_t limitsize)
{
char buffer[CPBUFFERSIZE];
int rc = 0;
int fd1 = -1, fd2 = -1;
struct stat info;
int r_count, w_count = 0;
int fd1;
int fd2;
size_t dsize = 0;
size_t rbsize = CPBUFFERSIZE;
ssize_t r_count;
ssize_t w_count;
if (src == NULL || des == NULL)
return -EINVAL;
return -1;
if (stat(src, &info) < 0) {
LOGE("can not open file: %s\n", src);
return -errno;
fd1 = open(src, O_RDONLY | O_NONBLOCK);
if (fd1 < 0) {
LOGE("failed to open file: %s, err: %s\n", src,
strerror(errno));
return -1;
}
fd1 = open(src, O_RDONLY);
if (fd1 < 0)
return -errno;
fd2 = open(des, O_WRONLY | O_CREAT | O_TRUNC, 0660);
if (fd2 < 0) {
LOGE("can not open file: %s\n", des);
LOGE("failed to open file: %s, err: %s\n", des,
strerror(errno));
close(fd1);
return -errno;
return -1;
}
/* Start copy loop */
while (1) {
if (limitsize > 0) {
if (dsize >= limitsize)
break;
rbsize = MIN(limitsize - dsize, CPBUFFERSIZE);
}
/* Read data from src */
r_count = read(fd1, buffer, CPBUFFERSIZE);
r_count = read(fd1, buffer, rbsize);
if (r_count < 0) {
LOGE("read failed, err:%s\n", strerror(errno));
rc = -1;
break;
if (errno == EAGAIN) {
break;
} else {
LOGE("read failed, err:%s\n", strerror(errno));
rc = -1;
break;
}
}
if (r_count == 0)
@@ -579,11 +592,13 @@ int do_copy_eof(const char *src, const char *des)
break;
}
if (r_count != w_count) {
LOGE("write failed, r_count:%d w_count:%d\n",
LOGE("write failed, r_count:%zd w_count:%zd\n",
r_count, w_count);
rc = -1;
break;
}
dsize += w_count;
}
if (fd1 >= 0)

2
tools/acrn-crashlog/common/include/fsutils.h
View File

@@ -92,7 +92,7 @@ void file_reset_init(const char *filename);
int file_read_int(const char *filename, unsigned int *pcurrent);
int file_update_int(const char *filename, unsigned int current,
unsigned int max);
int do_copy_eof(const char *src, const char *des);
int do_copy_limit(const char *src, const char *des, size_t limitsize);
int space_available(const char *path, int quota);
int count_lines_in_file(const char *filename);
int read_full_binary_file(const char *path, unsigned long *size,