From: Longpeng <[email protected]>
Add the initial setup for the KUnit tests that will target the Nitro
Enclaves misc device functionality.
Signed-off-by: Longpeng <[email protected]>
---
Changes v3 -> v4:
- Nitro enclaves -> Nitro Enclaves [Andra]
- check the return code of "ne_misc_dev_test_init()" [Andra]
- GPL-2.0-or-later -> GPL-2.0 [Andra]
Changes v2 -> v3:
- update the commit title and commit message. [Andra]
- use "misc_dev"/"misc device"/"MISC_DEV" to be more specific. [Andra]
---
drivers/virt/nitro_enclaves/Kconfig | 9 ++++++++
drivers/virt/nitro_enclaves/ne_misc_dev.c | 31 ++++++++++++++++++++++++++
drivers/virt/nitro_enclaves/ne_misc_dev_test.c | 17 ++++++++++++++
3 files changed, 57 insertions(+)
create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev_test.c
diff --git a/drivers/virt/nitro_enclaves/Kconfig b/drivers/virt/nitro_enclaves/Kconfig
index 8c9387a..a7e5020 100644
--- a/drivers/virt/nitro_enclaves/Kconfig
+++ b/drivers/virt/nitro_enclaves/Kconfig
@@ -18,3 +18,12 @@ config NITRO_ENCLAVES
To compile this driver as a module, choose M here.
The module will be called nitro_enclaves.
+
+config NITRO_ENCLAVES_MISC_DEV_TEST
+ bool "Tests for the misc device functionality of the Nitro Enclaves"
+ depends on NITRO_ENCLAVES && KUNIT=y
+ help
+ Enable KUnit tests for the misc device functionality of the Nitro
+ Enclaves. Select this option only if you will boot the kernel for
+ the purpose of running unit tests (e.g. under UML or qemu). If
+ unsure, say N.
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
index 3741ae7..ec46c12 100644
--- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
@@ -1754,8 +1754,37 @@ static long ne_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
return 0;
}
+#if defined(CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST)
+#include "ne_misc_dev_test.c"
+
+static inline int ne_misc_dev_test_init(void)
+{
+ return __kunit_test_suites_init(ne_misc_dev_test_suites);
+}
+
+static inline void ne_misc_dev_test_exit(void)
+{
+ __kunit_test_suites_exit(ne_misc_dev_test_suites);
+}
+#else
+static inline int ne_misc_dev_test_init(void)
+{
+ return 0;
+}
+
+static inline void ne_misc_dev_test_exit(void)
+{
+}
+#endif
+
static int __init ne_init(void)
{
+ int rc = 0;
+
+ rc = ne_misc_dev_test_init();
+ if (rc < 0)
+ return rc;
+
mutex_init(&ne_cpu_pool.mutex);
return pci_register_driver(&ne_pci_driver);
@@ -1766,6 +1795,8 @@ static void __exit ne_exit(void)
pci_unregister_driver(&ne_pci_driver);
ne_teardown_cpu_pool();
+
+ ne_misc_dev_test_exit();
}
module_init(ne_init);
diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
new file mode 100644
index 0000000..6862e99
--- /dev/null
+++ b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: GPL-2.0
+
+#include <kunit/test.h>
+
+static struct kunit_case ne_misc_dev_test_cases[] = {
+ {}
+};
+
+static struct kunit_suite ne_misc_dev_test_suite = {
+ .name = "ne_misc_dev_test",
+ .test_cases = ne_misc_dev_test_cases,
+};
+
+static struct kunit_suite *ne_misc_dev_test_suites[] = {
+ &ne_misc_dev_test_suite,
+ NULL
+};
--
1.8.3.1
On 03/11/2021 16:00, Longpeng(Mike) wrote:
>
> From: Longpeng <[email protected]>
>
> Add the initial setup for the KUnit tests that will target the Nitro
> Enclaves misc device functionality.
>
> Signed-off-by: Longpeng <[email protected]>
> ---
> Changes v3 -> v4:
> - Nitro enclaves -> Nitro Enclaves [Andra]
> - check the return code of "ne_misc_dev_test_init()" [Andra]
> - GPL-2.0-or-later -> GPL-2.0 [Andra]
>
> Changes v2 -> v3:
> - update the commit title and commit message. [Andra]
> - use "misc_dev"/"misc device"/"MISC_DEV" to be more specific. [Andra]
> ---
> drivers/virt/nitro_enclaves/Kconfig | 9 ++++++++
> drivers/virt/nitro_enclaves/ne_misc_dev.c | 31 ++++++++++++++++++++++++++
> drivers/virt/nitro_enclaves/ne_misc_dev_test.c | 17 ++++++++++++++
> 3 files changed, 57 insertions(+)
> create mode 100644 drivers/virt/nitro_enclaves/ne_misc_dev_test.c
Reviewed-by: Andra Paraschiv <[email protected]>
Thanks,
Andra
>
> diff --git a/drivers/virt/nitro_enclaves/Kconfig b/drivers/virt/nitro_enclaves/Kconfig
> index 8c9387a..a7e5020 100644
> --- a/drivers/virt/nitro_enclaves/Kconfig
> +++ b/drivers/virt/nitro_enclaves/Kconfig
> @@ -18,3 +18,12 @@ config NITRO_ENCLAVES
>
> To compile this driver as a module, choose M here.
> The module will be called nitro_enclaves.
> +
> +config NITRO_ENCLAVES_MISC_DEV_TEST
> + bool "Tests for the misc device functionality of the Nitro Enclaves"
> + depends on NITRO_ENCLAVES && KUNIT=y
> + help
> + Enable KUnit tests for the misc device functionality of the Nitro
> + Enclaves. Select this option only if you will boot the kernel for
> + the purpose of running unit tests (e.g. under UML or qemu). If
> + unsure, say N.
> diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev.c b/drivers/virt/nitro_enclaves/ne_misc_dev.c
> index 3741ae7..ec46c12 100644
> --- a/drivers/virt/nitro_enclaves/ne_misc_dev.c
> +++ b/drivers/virt/nitro_enclaves/ne_misc_dev.c
> @@ -1754,8 +1754,37 @@ static long ne_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
> return 0;
> }
>
> +#if defined(CONFIG_NITRO_ENCLAVES_MISC_DEV_TEST)
> +#include "ne_misc_dev_test.c"
> +
> +static inline int ne_misc_dev_test_init(void)
> +{
> + return __kunit_test_suites_init(ne_misc_dev_test_suites);
> +}
> +
> +static inline void ne_misc_dev_test_exit(void)
> +{
> + __kunit_test_suites_exit(ne_misc_dev_test_suites);
> +}
> +#else
> +static inline int ne_misc_dev_test_init(void)
> +{
> + return 0;
> +}
> +
> +static inline void ne_misc_dev_test_exit(void)
> +{
> +}
> +#endif
> +
> static int __init ne_init(void)
> {
> + int rc = 0;
> +
> + rc = ne_misc_dev_test_init();
> + if (rc < 0)
> + return rc;
> +
> mutex_init(&ne_cpu_pool.mutex);
>
> return pci_register_driver(&ne_pci_driver);
> @@ -1766,6 +1795,8 @@ static void __exit ne_exit(void)
> pci_unregister_driver(&ne_pci_driver);
>
> ne_teardown_cpu_pool();
> +
> + ne_misc_dev_test_exit();
> }
>
> module_init(ne_init);
> diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
> new file mode 100644
> index 0000000..6862e99
> --- /dev/null
> +++ b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c
> @@ -0,0 +1,17 @@
> +// SPDX-License-Identifier: GPL-2.0
> +
> +#include <kunit/test.h>
> +
> +static struct kunit_case ne_misc_dev_test_cases[] = {
> + {}
> +};
> +
> +static struct kunit_suite ne_misc_dev_test_suite = {
> + .name = "ne_misc_dev_test",
> + .test_cases = ne_misc_dev_test_cases,
> +};
> +
> +static struct kunit_suite *ne_misc_dev_test_suites[] = {
> + &ne_misc_dev_test_suite,
> + NULL
> +};
> --
> 1.8.3.1
>
Amazon Development Center (Romania) S.R.L. registered office: 27A Sf. Lazar Street, UBC5, floor 2, Iasi, Iasi County, 700045, Romania. Registered in Romania. Registration number J22/2621/2005.