lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening PHC | |
Open Source and information security mailing list archives
| ||
|
Date: Sat, 9 Oct 2021 09:32:48 +0800 From: "Longpeng(Mike)" <longpeng2@...wei.com> To: <andraprs@...zon.com>, <lexnv@...zon.com>, <alcioa@...zon.com> CC: <arei.gonglei@...wei.com>, <gregkh@...uxfoundation.org>, <kamal@...onical.com>, <pbonzini@...hat.com>, <sgarzare@...hat.com>, <stefanha@...hat.com>, <vkuznets@...hat.com>, <linux-kernel@...r.kernel.org>, <ne-devel-upstream@...zon.com>, Longpeng <longpeng2@...wei.com> Subject: [PATCH v3 4/4] nitro_enclaves: Add KUnit tests for contiguous physical memory regions merging From: Longpeng <longpeng2@...wei.com> Add KUnit tests for the contiguous physical memory regions merging functionality from the Nitro Enclaves misc device logic. We'll see the following message using dmesg if everything goes well: [...] # Subtest: ne_misc_dev_test [...] 1..1 [...] (NULL device *): Physical mem region address is not 2 MiB aligned [...] (NULL device *): Physical mem region size is not multiple of 2 MiB [...] (NULL device *): Physical mem region address is not 2 MiB aligned [...] ok 1 - ne_misc_dev_test_merge_phys_contig_memory_regions [...] ok 1 - ne_misc_dev_test Signed-off-by: Longpeng <longpeng2@...wei.com> --- Changes v2 -> v3: - update the commit title and commit message. [Andra] - align the fileds in 'struct phys_regions_test'. [Andra] - rename 'phys_regions_testcases' to 'phys_regions_test_cases'. [Andra] - add comments before each test cases. [Andra] - initialize the variables in ne_misc_dev_test_merge_phys_contig_memory_regions. [Andra] --- drivers/virt/nitro_enclaves/ne_misc_dev_test.c | 136 +++++++++++++++++++++++++ 1 file changed, 136 insertions(+) diff --git a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c index bcb755e..7bd6b34 100644 --- a/drivers/virt/nitro_enclaves/ne_misc_dev_test.c +++ b/drivers/virt/nitro_enclaves/ne_misc_dev_test.c @@ -2,7 +2,143 @@ #include <kunit/test.h> +#define MAX_PHYS_REGIONS 16 +#define INVALID_VALUE (~0ull) + +struct phys_regions_test { + u64 paddr; + u64 size; + int expect_rc; + int expect_num; + u64 expect_last_paddr; + u64 expect_last_size; +} phys_regions_test_cases[] = { + /* + * Add the region from 0x1000 to (0x1000 + 0x200000 - 1): + * Expected result: + * Failed, start address is not 2M-aligned + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 0 + * region = {} + */ + {0x1000, 0x200000, -EINVAL, 0, INVALID_VALUE, INVALID_VALUE}, + + /* + * Add the region from 0x200000 to (0x200000 + 0x1000 - 1): + * Expected result: + * Failed, size is not 2M-aligned + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 0 + * region = {} + */ + {0x200000, 0x1000, -EINVAL, 0, INVALID_VALUE, INVALID_VALUE}, + + /* + * Add the region from 0x200000 to (0x200000 + 0x200000 - 1): + * Expected result: + * Successful + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 1 + * region = { + * {start=0x200000, end=0x3fffff}, // len=0x200000 + * } + */ + {0x200000, 0x200000, 0, 1, 0x200000, 0x200000}, + + /* + * Add the region from 0x0 to (0x0 + 0x200000 - 1): + * Expected result: + * Successful + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 2 + * region = { + * {start=0x200000, end=0x3fffff}, // len=0x200000 + * {start=0x0, end=0x1fffff}, // len=0x200000 + * } + */ + {0x0, 0x200000, 0, 2, 0x0, 0x200000}, + + /* + * Add the region from 0x600000 to (0x600000 + 0x400000 - 1): + * Expected result: + * Successful + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 3 + * region = { + * {start=0x200000, end=0x3fffff}, // len=0x200000 + * {start=0x0, end=0x1fffff}, // len=0x200000 + * {start=0x600000, end=0x9fffff}, // len=0x400000 + * } + */ + {0x600000, 0x400000, 0, 3, 0x600000, 0x400000}, + + /* + * Add the region from 0xa00000 to (0xa00000 + 0x400000 - 1): + * Expected result: + * Successful, merging case! + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 3 + * region = { + * {start=0x200000, end=0x3fffff}, // len=0x200000 + * {start=0x0, end=0x1fffff}, // len=0x200000 + * {start=0x600000, end=0xdfffff}, // len=0x800000 + * } + */ + {0xa00000, 0x400000, 0, 3, 0x600000, 0x800000}, + + /* + * Add the region from 0x1000 to (0x1000 + 0x200000 - 1): + * Expected result: + * Failed, start address is not 2M-aligned + * + * Now the instance of struct phys_contig_mem_regions is: + * num = 3 + * region = { + * {start=0x200000, end=0x3fffff}, // len=0x200000 + * {start=0x0, end=0x1fffff}, // len=0x200000 + * {start=0x600000, end=0xdfffff}, // len=0x800000 + * } + */ + {0x1000, 0x200000, -EINVAL, 3, 0x600000, 0x800000}, +}; + +static void ne_misc_dev_test_merge_phys_contig_memory_regions(struct kunit *test) +{ + struct phys_contig_mem_regions *regions; + size_t sz = 0; + int rc = 0; + int i = 0; + + sz = sizeof(*regions) + MAX_PHYS_REGIONS * sizeof(struct range); + regions = kunit_kzalloc(test, sz, GFP_KERNEL); + KUNIT_ASSERT_TRUE(test, regions != NULL); + + for (i = 0; i < ARRAY_SIZE(phys_regions_test_cases); i++) { + struct phys_regions_test *entry = phys_regions_test_cases + i; + + rc = ne_merge_phys_contig_memory_regions(regions, + entry->paddr, entry->size); + KUNIT_EXPECT_EQ(test, rc, entry->expect_rc); + KUNIT_EXPECT_EQ(test, regions->num, entry->expect_num); + + if (entry->expect_last_paddr == INVALID_VALUE) + continue; + + KUNIT_EXPECT_EQ(test, regions->region[regions->num - 1].start, + entry->expect_last_paddr); + KUNIT_EXPECT_EQ(test, range_len(®ions->region[regions->num - 1]), + entry->expect_last_size); + } +} + static struct kunit_case ne_misc_dev_test_cases[] = { + KUNIT_CASE(ne_misc_dev_test_merge_phys_contig_memory_regions), {} }; -- 1.8.3.1
Powered by blists - more mailing lists