tests: fw_cfg: add reboot-timeout test case
cover tests: fw_cfg: add reboot-timeout test case
The first patch adds a util function to get
the fw_cfg file entry.
And second adds a reboot-timeout test case.
Li Qiang (2):
tests: fw_cfg: add a function to get the fw_cfg file entry
tests: fw_cfg: add reboot_timeout test case
tests/fw_cfg-test.c | 13 ++++++++++++- tests/libqos/fw_cfg.c | 33 +++++++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 2 ++ 3 files changed, 47 insertions(+), 1 deletion(-)
Signature · 1 line
2.17.1
PATCH 1/2 tests: fw_cfg: add a function to get the fw_cfg file entry
This is useful to write qtest about fw_cfg file entry.
--- tests/libqos/fw_cfg.c | 33 +++++++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 2 ++ 2 files changed, 35 insertions(+)
tests/libqos/fw_cfg.c +33 -0
@@ -16,6 +16,7 @@#include "libqos/fw_cfg.h" #include "libqtest.h" #include "qemu/bswap.h" +#include "standard-headers/linux/qemu_fw_cfg.h" void qfw_cfg_select (QFWCFG *fw_cfg,uint16_t key) {
@@ -54,6 +55,38 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key)return le64_to_cpu (value); } +size_t qfw_cfg_get_file (QFWCFG *fw_cfg,const char *filename, +void *data,size_t buflen) +{ +uint32_t count; +uint32_t i; +unsigned char *filesbuf =NULL ; +uint32_t dsize; +struct fw_cfg_file *p; +size_t filesize =0 ; + +qfw_cfg_get (fw_cfg,FW_CFG_FILE_DIR , &count,sizeof (count)); + count =be32_to_cpu (count); + dsize =sizeof (uint32_t ) + count *sizeof (struct fw_cfg_file ); + filesbuf =g_malloc0 (dsize); +qfw_cfg_get (fw_cfg,FW_CFG_FILE_DIR , filesbuf, dsize); + p = (struct fw_cfg_file *)(filesbuf +sizeof (uint32_t )); +for (i =0 ; i < count; ++i, ++p) { +if (!strcmp (p->name, filename)) { +uint32_t len =be32_to_cpu (p->size); +uint16_t sel =be16_to_cpu (p->select); + filesize = len; +if (len > buflen) { + len = buflen; + } +qfw_cfg_get (fw_cfg, sel, data, len); +break ; + } + } +g_free (filesbuf); +return filesize; +} +static void mm_fw_cfg_select (QFWCFG *fw_cfg,uint16_t key) {qtest_writew (fw_cfg->qts, fw_cfg->base, key);
tests/libqos/fw_cfg.h +2 -0
@@ -31,6 +31,8 @@ void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len);uint16_t qfw_cfg_get_u16 (QFWCFG *fw_cfg,uint16_t key);uint32_t qfw_cfg_get_u32 (QFWCFG *fw_cfg,uint16_t key);uint64_t qfw_cfg_get_u64 (QFWCFG *fw_cfg,uint16_t key); +size_t qfw_cfg_get_file (QFWCFG *fw_cfg,const char *filename, +void *data,size_t buflen);QFWCFG *mm_fw_cfg_init (QTestState *qts,uint64_t base);QFWCFG *io_fw_cfg_init (QTestState *qts,uint16_t base);
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH 1/2] tests: fw_cfg: add a function to get the fw_cfg file entry
Quoted 21 lines · Li Qiang
This is useful to write qtest about
fw_cfgfile entry.Signed-off-by Li Qiang <[email protected]>--- tests/libqos/fw_cfg.c | 33 +++++++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 2 ++ 2 files changed, 35 insertions(+)tests/libqos/fw_cfg.c +1
-0@@ -16,6 +16,7 @@#include "libqos/fw_cfg.h" #include "libqtest.h" #include "qemu/bswap.h" +#include "standard-headers/linux/qemu_fw_cfg.h" void qfw_cfg_select (QFWCFG *fw_cfg,uint16_t key) {
tests/libqos/fw_cfg.c uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) · line 64
Quoted 10 lines
tests/libqos/fw_cfg.c +7
-0@@ -54,6 +55,38 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key)return le64_to_cpu (value); } +size_t qfw_cfg_get_file (QFWCFG *fw_cfg,const char *filename, +void *data,size_t buflen) +{ +uint32_t count; +uint32_t i; +unsigned char *filesbuf =NULL ; +uint32_t dsize;
dsize should be size_t
tests/libqos/fw_cfg.c uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) · line 65
Quoted 1 line
tests/libqos/fw_cfg.c +1
-0+struct fw_cfg_file *p;
Please use a better variable name, such as "dir_entry" or similar.
tests/libqos/fw_cfg.c uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) · line 70
Quoted 5 lines
tests/libqos/fw_cfg.c +5
-0+size_t filesize =0 ; + +qfw_cfg_get (fw_cfg,FW_CFG_FILE_DIR , &count,sizeof (count)); + count =be32_to_cpu (count); + dsize =sizeof (uint32_t ) + count *sizeof (struct fw_cfg_file );
where does "struct fw_cfg_file" come from?
... more precisely: why use it over the "FWCfgFile" typedef? (applies to the declaration of "p" as well).
Quoted 28 lines
tests/libqos/fw_cfg.c +19
-0+ filesbuf =g_malloc0 (dsize); +qfw_cfg_get (fw_cfg,FW_CFG_FILE_DIR , filesbuf, dsize); + p = (struct fw_cfg_file *)(filesbuf +sizeof (uint32_t )); +for (i =0 ; i < count; ++i, ++p) { +if (!strcmp (p->name, filename)) { +uint32_t len =be32_to_cpu (p->size); +uint16_t sel =be16_to_cpu (p->select); + filesize = len; +if (len > buflen) { + len = buflen; + } +qfw_cfg_get (fw_cfg, sel, data, len); +break ; + } + } +g_free (filesbuf); +return filesize; +} +static void mm_fw_cfg_select (QFWCFG *fw_cfg,uint16_t key) {qtest_writew (fw_cfg->qts, fw_cfg->base, key);tests/libqos/fw_cfg.h +0
-0
tests/libqos/fw_cfg.h void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len); · line 38
Quoted 8 lines
tests/libqos/fw_cfg.h +2
-0@@ -31,6 +31,8 @@ void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len);uint16_t qfw_cfg_get_u16 (QFWCFG *fw_cfg,uint16_t key);uint32_t qfw_cfg_get_u32 (QFWCFG *fw_cfg,uint16_t key);uint64_t qfw_cfg_get_u64 (QFWCFG *fw_cfg,uint16_t key); +size_t qfw_cfg_get_file (QFWCFG *fw_cfg,const char *filename, +void *data,size_t buflen);QFWCFG *mm_fw_cfg_init (QTestState *qts,uint64_t base);QFWCFG *io_fw_cfg_init (QTestState *qts,uint16_t base);
Looks OK to me otherwise.
Thanks,
Laszlo
Re: [Qemu-devel] [PATCH 1/2] tests: fw_cfg: add a function to get the fw_cfg file entry
Quoted 25 lines · Laszlo Ersek <[email protected]> 于2019年1月22日周二 上午5:32写道:
Quoted 24 lines · Li Qiang
This is useful to write qtest about
fw_cfgfile entry.Signed-off-by Li Qiang <[email protected]>--- tests/libqos/fw_cfg.c | 33 +++++++++++++++++++++++++++++++++ tests/libqos/fw_cfg.h | 2 ++ 2 files changed, 35 insertions(+)tests/libqos/fw_cfg.c +1
-0@@ -16,6 +16,7 @@#include "libqos/fw_cfg.h" #include "libqtest.h" #include "qemu/bswap.h" +#include "standard-headers/linux/qemu_fw_cfg.h" void qfw_cfg_select (QFWCFG *fw_cfg,uint16_t key) {@@ -54,6 +55,38 @@ uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key)return le64_to_cpu (value); }
Quoted 11 lines
tests/libqos/fw_cfg.c uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) · line 64
Quoted 7 lines
tests/libqos/fw_cfg.c +7
-0+size_t qfw_cfg_get_file (QFWCFG *fw_cfg,const char *filename, +void *data,size_t buflen) +{ +uint32_t count; +uint32_t i; +unsigned char *filesbuf =NULL ; +uint32_t dsize;dsize should be
size_t
OK.
Quoted 5 lines
tests/libqos/fw_cfg.c uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) · line 65
Quoted 1 line
tests/libqos/fw_cfg.c +1
-0+struct fw_cfg_file *p;Please use a better variable name, such as "
dir_entry" or similar.
OK.
Quoted 6 lines
tests/libqos/fw_cfg.c uint64_t qfw_cfg_get_u64(QFWCFG *fw_cfg, uint16_t key) · line 70
Quoted 5 lines
tests/libqos/fw_cfg.c +5
-0+size_t filesize =0 ; + +qfw_cfg_get (fw_cfg,FW_CFG_FILE_DIR , &count,sizeof (count)); + count =be32_to_cpu (count); + dsize =sizeof (uint32_t ) + count *sizeof (struct fw_cfg_file );
Quoted 10 lines
where does "struct
fw_cfg_file" come from?From
include/standard-headers/linux/qemu_fw_cfg.h... more precisely: why use it over the "FWCfgFile" typedef? (applies to the declaration of "p" as well).
Ok, I think we should use include/hw/nvram/fw_cfg.h.
Thanks,
Li Qiang
Quoted 43 lines
tests/libqos/fw_cfg.h void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void
Quoted 27 lines
tests/libqos/fw_cfg.c +19
-0+ filesbuf =g_malloc0 (dsize); +qfw_cfg_get (fw_cfg,FW_CFG_FILE_DIR , filesbuf, dsize); + p = (struct fw_cfg_file *)(filesbuf +sizeof (uint32_t )); +for (i =0 ; i < count; ++i, ++p) { +if (!strcmp (p->name, filename)) { +uint32_t len =be32_to_cpu (p->size); +uint16_t sel =be16_to_cpu (p->select); + filesize = len; +if (len > buflen) { + len = buflen; + } +qfw_cfg_get (fw_cfg, sel, data, len); +break ; + } + } +g_free (filesbuf); +return filesize; +} +static void mm_fw_cfg_select (QFWCFG *fw_cfg,uint16_t key) {qtest_writew (fw_cfg->qts, fw_cfg->base, key);tests/libqos/fw_cfg.h +0
-0@@ -31,6 +31,8 @@ void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void*data,
size_tlen);tests/libqos/fw_cfg.h void qfw_cfg_get(QFWCFG *fw_cfg, uint16_t key, void *data, size_t len); · line 38
Quoted 9 lines
tests/libqos/fw_cfg.h +2
-0uint16_t qfw_cfg_get_u16 (QFWCFG *fw_cfg,uint16_t key);uint32_t qfw_cfg_get_u32 (QFWCFG *fw_cfg,uint16_t key);uint64_t qfw_cfg_get_u64 (QFWCFG *fw_cfg,uint16_t key); +size_t qfw_cfg_get_file (QFWCFG *fw_cfg,const char *filename, +void *data,size_t buflen);QFWCFG *mm_fw_cfg_init (QTestState *qts,uint64_t base);QFWCFG *io_fw_cfg_init (QTestState *qts,uint16_t base);Looks OK to me otherwise.
Thanks,
Laszlo
PATCH 2/2 tests: fw_cfg: add reboot_timeout test case
In reply to Li Qiang--- tests/fw_cfg-test.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
tests/fw_cfg-test.c +12 -1
@@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==, boot_menu); } +static void test_fw_cfg_reboot_timeout (void ) +{ +uint32_t reboot_timeout; + +qfw_cfg_get_file (fw_cfg,"etc/boot-fail-wait" , + &reboot_timeout,sizeof (reboot_timeout)); + g_assert_cmpint(reboot_timeout, ==, 15); +} +int main (int argc,char **argv) {QTestState *s;
@@ -106,7 +115,8 @@ int main(int argc, char **argv)g_test_init (&argc, &argv,NULL ); - s =qtest_init ("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8" ); + s =qtest_init ("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 " +"-boot reboot-timeout=15" ); fw_cfg =pc_fw_cfg_init (s);
@@ -125,6 +135,7 @@ int main(int argc, char **argv)qtest_add_func ("fw_cfg/max_cpus" , test_fw_cfg_max_cpus);qtest_add_func ("fw_cfg/numa" , test_fw_cfg_numa);qtest_add_func ("fw_cfg/boot_menu" , test_fw_cfg_boot_menu); +qtest_add_func ("fw_cfg/reboot_timeout" , test_fw_cfg_reboot_timeout); ret =g_test_run ();
Signature · 1 line
2.17.1
Re: [Qemu-devel] [PATCH 2/2] tests: fw_cfg: add reboot_timeout test case
Quoted 12 lines · Li Qiang
Signed-off-by Li Qiang <[email protected]>--- tests/fw_cfg-test.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)tests/fw_cfg-test.c +0
-0@@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==, boot_menu); }
tests/fw_cfg-test.c static void test_fw_cfg_boot_menu(void) · line 110
Quoted 10 lines
tests/fw_cfg-test.c +9
-0+static void test_fw_cfg_reboot_timeout (void ) +{ +uint32_t reboot_timeout; + +qfw_cfg_get_file (fw_cfg,"etc/boot-fail-wait" , + &reboot_timeout,sizeof (reboot_timeout)); + g_assert_cmpint(reboot_timeout, ==, 15); +} +
You don't check the return status of qfw_cfg_get_file(), before reading "reboot_timeout". If the qfw_cfg_get_file() fails (returning 0), then the comparison will refer to an indeterminate value. Also, it's theoretically possible for qfw_cfg_get_file() to overwrite only part of the "reboot_timeout" object.
So I think we need the function to transfer exactly (sizeof reboot_timeout) bytes.
BTW, this reminds me, qfw_cfg_get_file() seems to return the number of bytes that would be necessary for transferring the entire file. That looks like a good idea, but it should be documented. Please add some docs on top of qfw_cfg_get_file().
Quoted 15 lines
tests/fw_cfg-test.c +2
-1int main (int argc,char **argv) {QTestState *s;@@ -106,7 +115,8 @@ int main(int argc, char **argv)g_test_init (&argc, &argv,NULL ); - s =qtest_init ("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8" ); + s =qtest_init ("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 " +"-boot reboot-timeout=15" ); fw_cfg =pc_fw_cfg_init (s);
tests/fw_cfg-test.c int main(int argc, char **argv) · line 141
Quoted 7 lines
tests/fw_cfg-test.c +1
-0@@ -125,6 +135,7 @@ int main(int argc, char **argv)qtest_add_func ("fw_cfg/max_cpus" , test_fw_cfg_max_cpus);qtest_add_func ("fw_cfg/numa" , test_fw_cfg_numa);qtest_add_func ("fw_cfg/boot_menu" , test_fw_cfg_boot_menu); +qtest_add_func ("fw_cfg/reboot_timeout" , test_fw_cfg_reboot_timeout); ret =g_test_run ();
Looks OK otherwise.
Thanks
Laszlo
Re: [Qemu-devel] [PATCH 2/2] tests: fw_cfg: add reboot_timeout test case
Quoted 15 lines · Laszlo Ersek <[email protected]> 于2019年1月22日周二 上午5:38写道:
tests/fw_cfg-test.c static void test_fw_cfg_boot_menu(void) · line 99
Quoted 11 lines · Li Qiang
Signed-off-by Li Qiang <[email protected]>--- tests/fw_cfg-test.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)tests/fw_cfg-test.c +0
-0@@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==,
boot_menu);Quoted 2 lines
tests/fw_cfg-test.c +0
-0}
Quoted 17 lines
tests/fw_cfg-test.c static void test_fw_cfg_boot_menu(void) · line 110
Quoted 9 lines
tests/fw_cfg-test.c +9
-0+static void test_fw_cfg_reboot_timeout (void ) +{ +uint32_t reboot_timeout; + +qfw_cfg_get_file (fw_cfg,"etc/boot-fail-wait" , + &reboot_timeout,sizeof (reboot_timeout)); + g_assert_cmpint(reboot_timeout, ==, 15); +} +You don't check the return status of
qfw_cfg_get_file(), before reading "reboot_timeout". If theqfw_cfg_get_file()fails (returning 0), then the comparison will refer to an indeterminate value. Also, it's theoretically possible forqfw_cfg_get_file()to overwrite only part of the "reboot_timeout" object.
Right. I will change in the next revision.
Quoted 4 lines
So I think we need the function to transfer exactly (sizeof
reboot_timeout) bytes.
What does this mean? check the return of 'qfw_cfg_get_file' if it is sizeof(reboot_timeout)?
Quoted 6 lines
BTW, this reminds me,
qfw_cfg_get_file()seems to return the number of bytes that would be necessary for transferring the entire file. That looks like a good idea, but it should be documented. Please add some docs on top ofqfw_cfg_get_file().
The docs like "return 0 means failed and non-zero means successful but the caller need check the exactly size to avoid partially file size" ?
Thanks,
Li Qiang
Quoted 28 lines
Quoted 15 lines
tests/fw_cfg-test.c +2
-1int main (int argc,char **argv) {QTestState *s;@@ -106,7 +115,8 @@ int main(int argc, char **argv)g_test_init (&argc, &argv,NULL ); - s =qtest_init ("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8" ); + s =qtest_init ("-uuid 4600cb32-38ec-4b2f-8acb-81c6ea54f2d8 " +"-boot reboot-timeout=15" ); fw_cfg =pc_fw_cfg_init (s);tests/fw_cfg-test.c int main(int argc, char **argv) · line 141
Quoted 7 lines
tests/fw_cfg-test.c +1
-0@@ -125,6 +135,7 @@ int main(int argc, char **argv)qtest_add_func ("fw_cfg/max_cpus" , test_fw_cfg_max_cpus);qtest_add_func ("fw_cfg/numa" , test_fw_cfg_numa);qtest_add_func ("fw_cfg/boot_menu" , test_fw_cfg_boot_menu); +qtest_add_func ("fw_cfg/reboot_timeout" , test_fw_cfg_reboot_timeout); ret =g_test_run ();Looks OK otherwise.
Thanks
Laszlo
Re: [Qemu-devel] [PATCH 2/2] tests: fw_cfg: add reboot_timeout test case
Quoted 38 lines · Li Qiang
Quoted 15 lines · Laszlo Ersek <[email protected]> 于2019年1月22日周二 上午5:38写道:
tests/fw_cfg-test.c static void test_fw_cfg_boot_menu(void) · line 99
Quoted 11 lines · Li Qiang
Signed-off-by Li Qiang <[email protected]>--- tests/fw_cfg-test.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)tests/fw_cfg-test.c +0
-0@@ -99,6 +99,15 @@ static void test_fw_cfg_boot_menu(void) g_assert_cmpint(qfw_cfg_get_u16(fw_cfg, FW_CFG_BOOT_MENU), ==,
boot_menu);Quoted 2 lines
tests/fw_cfg-test.c +0
-0}Quoted 17 lines
tests/fw_cfg-test.c static void test_fw_cfg_boot_menu(void) · line 110
Quoted 9 lines
tests/fw_cfg-test.c +9
-0+static void test_fw_cfg_reboot_timeout (void ) +{ +uint32_t reboot_timeout; + +qfw_cfg_get_file (fw_cfg,"etc/boot-fail-wait" , + &reboot_timeout,sizeof (reboot_timeout)); + g_assert_cmpint(reboot_timeout, ==, 15); +} +You don't check the return status of
qfw_cfg_get_file(), before reading "reboot_timeout". If theqfw_cfg_get_file()fails (returning 0), then the comparison will refer to an indeterminate value. Also, it's theoretically possible forqfw_cfg_get_file()to overwrite only part of the "reboot_timeout" object.Right. I will change in the next revision.
Quoted 6 lines
Quoted 4 lines
So I think we need the function to transfer exactly (sizeof
reboot_timeout) bytes.What does this mean? check the return of '
qfw_cfg_get_file' if it issizeof(reboot_timeout)?
Yes, that's what I meant.
Quoted 8 lines
Quoted 6 lines
BTW, this reminds me,
qfw_cfg_get_file()seems to return the number of bytes that would be necessary for transferring the entire file. That looks like a good idea, but it should be documented. Please add some docs on top ofqfw_cfg_get_file().The docs like "return 0 means failed and non-zero means successful but the caller need check the exactly size to avoid partially file size" ?
Yes. A bit more precisely, when the return value is nonzero, it means that some bytes have been transferred. If the fw_cfg file in question is smaller than the allocated & passed-in buffer, then the buffer has been populated only in part.
Vice versa, if the fw_cfg file in question is larger than the passed-in buffer, then the return value explains how much room would have been necessary in total. And, while the caller's buffer has been fully populated, it has received only a starting slice of the fw_cfg file.
In the comparison that follows qfw_cfg_get_file(), we want to be sure that the "reboot_timeout" integer object has been fully populated, *plus* that we aren't ignoring any trailing bytes from the fw_cfg file. Hence the strict equality on the size.
Thanks
Laszlo