@@ -2147,6 +2147,81 @@ static void test_seal_discard_madvise_advice(void)
REPORT_TEST_PASS();
}
+static void test_munmap_free_multiple_ranges(bool seal)
+{
+ void *ptr;
+ unsigned long page_size = getpagesize();
+ unsigned long size = 8 * page_size;
+ int ret;
+ int prot;
+
+ setup_single_address(size, &ptr);
+ FAIL_TEST_IF_FALSE(ptr != (void *)-1);
+
+ /* unmap one page from beginning. */
+ ret = sys_munmap(ptr, page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ /* unmap one page from middle. */
+ ret = sys_munmap(ptr + 4 * page_size, page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr + page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 3 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 5 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 3 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+
+ /* seal the last page */
+ if (seal) {
+ ret = sys_mseal(ptr + 7 * page_size, page_size);
+ FAIL_TEST_IF_FALSE(!ret);
+
+ size = get_vma_size(ptr + 1 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 3 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 5 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 2 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 7 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 1 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+ }
+
+ /* munmap all 8 pages from beginning */
+ ret = sys_munmap(ptr, 8 * page_size);
+ if (seal) {
+ FAIL_TEST_IF_FALSE(ret);
+
+ /* verify mapping are not changed */
+ size = get_vma_size(ptr + 1 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 3 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 5 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 2 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+
+ size = get_vma_size(ptr + 7 * page_size, &prot);
+ FAIL_TEST_IF_FALSE(size == 1 * page_size);
+ FAIL_TEST_IF_FALSE(prot == 4);
+ } else {
+ FAIL_TEST_IF_FALSE(!ret);
+
+ for (int i = 0; i < 8; i++) {
+ size = get_vma_size(ptr, &prot);
+ FAIL_TEST_IF_FALSE(size == 0);
+ }
+ }
+
+ REPORT_TEST_PASS();
+}
+
int main(int argc, char **argv)
{
bool test_seal = seal_support();
@@ -2168,7 +2243,7 @@ int main(int argc, char **argv)
if (!get_vma_size_supported())
ksft_exit_skip("get_vma_size not supported\n");
- ksft_set_plan(89);
+ ksft_set_plan(91);
test_seal_addseal();
test_seal_unmapped_start();
@@ -2279,5 +2354,8 @@ int main(int argc, char **argv)
test_seal_discard_madvise_advice();
+ test_munmap_free_multiple_ranges(false);
+ test_munmap_free_multiple_ranges(true);
+
ksft_finished();
}