From ebd28204b5d2bed9507c5c03d9296a475a174ad8 Mon Sep 17 00:00:00 2001 From: Petr Tesarik Date: Fri, 2 Oct 2020 10:19:42 +0200 Subject: [PATCH] tests: Report pte_mask translation parameter The pte_mask parameter is set to zero for all OS-specific initialisation, but it is not checked. Note that this also requires extending the parser in sys-xlat, because it takes the xlat-*.expect files as input. Signed-off-by: Petr Tesarik --- tests/sys-xlat.c | 10 ++++++++++ tests/xlat-linux-ia32-pae.expect | 1 + tests/xlat-linux-ia32.expect | 1 + tests/xlat-linux-ppc64-64k.expect | 2 ++ tests/xlat-linux-s390x-2l.expect | 1 + tests/xlat-linux-s390x-3l.expect | 1 + tests/xlat-linux-s390x-4l.expect | 1 + tests/xlat-linux-x86_64-2.6.11-nover.expect | 1 + tests/xlat-linux-x86_64-2.6.11.expect | 2 ++ tests/xlat-linux-x86_64-2.6.27-cr3-xen.expect | 1 + tests/xlat-linux-x86_64-2.6.27-nover.expect | 1 + tests/xlat-linux-x86_64-2.6.27.expect | 2 ++ tests/xlat-linux-x86_64-2.6.31-cr3.expect | 1 + tests/xlat-linux-x86_64-2.6.31-kvaddr.expect | 1 + tests/xlat-linux-x86_64-2.6.31-nover-reloc.expect | 1 + tests/xlat-linux-x86_64-2.6.31-nover-xen.expect | 2 ++ tests/xlat-linux-x86_64-2.6.31-nover.expect | 1 + tests/xlat-linux-x86_64-2.6.31-reloc.expect | 1 + tests/xlat-linux-x86_64-2.6.31.expect | 2 ++ tests/xlat-linux-x86_64-4.13-kaslr.expect | 1 + tests/xlat-linux-x86_64-4.13-nover.expect | 1 + tests/xlat-linux-x86_64-5l.expect | 1 + tests/xlat-linux-x86_64-ktext-128M.expect | 1 + tests/xlat-linux-x86_64-ktext-130M-nonlinear.expect | 1 + tests/xlat-linux-x86_64-ktext-130M.expect | 1 + tests/xlat-linux-x86_64-ktext-1G.expect | 1 + tests/xlat-linux-x86_64-ktext-40M.expect | 1 + tests/xlat-linux-x86_64-ktext-512M.expect | 1 + tests/xlat-linux-x86_64-ktext-520M.expect | 1 + tests/xlat-linux-x86_64-ktext-crosspage.expect | 1 + tests/xlat-linux-x86_64-ktext-pgt.expect | 2 ++ tests/xlat-linux-x86_64-old-nover.expect | 1 + tests/xlat-linux-x86_64-old.expect | 2 ++ tests/xlat-os-ia32-none.expect | 1 + tests/xlat-os-ia32-pae-none.expect | 1 + tests/xlat-os-s390x-2l.expect | 1 + tests/xlat-os-s390x-3l.expect | 1 + tests/xlat-os-s390x-4l.expect | 1 + tests/xlat-os-s390x-5l.expect | 1 + tests/xlat-os-x86_64-none.expect | 1 + tests/xlat-os.c | 2 ++ tests/xlat-xen-ia32-pae.expect | 1 + tests/xlat-xen-ia32.expect | 1 + tests/xlat-xen-x86_64-3.2-nover.expect | 1 + tests/xlat-xen-x86_64-3.2.expect | 2 ++ tests/xlat-xen-x86_64-4.0-nover.expect | 1 + tests/xlat-xen-x86_64-4.0.expect | 2 ++ tests/xlat-xen-x86_64-4.0dev-nover.expect | 1 + tests/xlat-xen-x86_64-4.3-nover.expect | 1 + tests/xlat-xen-x86_64-4.3.expect | 2 ++ tests/xlat-xen-x86_64-4.4-nover.expect | 1 + tests/xlat-xen-x86_64-4.4.expect | 2 ++ tests/xlat-xen-x86_64-4.6-bigmem.expect | 1 + tests/xlat-xen-x86_64-old-nover.expect | 1 + tests/xlat-xen-x86_64-old.expect | 1 + 55 files changed, 76 insertions(+) diff --git a/tests/sys-xlat.c b/tests/sys-xlat.c index 04075522..e413de8e 100644 --- a/tests/sys-xlat.c +++ b/tests/sys-xlat.c @@ -142,6 +142,7 @@ enum param_index { /* Page tables */ pgt_root, + pgt_pte_mask, pgt_pte_format, pgt_fields, @@ -169,6 +170,7 @@ static const kw_pair_t linear_param[] = { static const kw_pair_t pgt_param[] = { {"root", pgt_root }, + {"pte_mask", pgt_pte_mask }, {"pte_format", pgt_pte_format }, {"fields", pgt_fields }, {NULL} @@ -464,6 +466,14 @@ parse_meth_param(const char *spec, addrxlat_meth_t *meth) res = parse_fulladdr(p, &meth->param.pgt.root); break; + case pgt_pte_mask: + meth->param.pgt.pte_mask = strtoull(p, (char**)&endp, 0); + if (endp != p && !*endp) + res = TEST_OK; + else + fprintf(stderr, "Invalid number: %s", p); + break; + case pgt_pte_format: res = parse_pte_format(p, &meth->param.pgt.pf.pte_format); break; diff --git a/tests/xlat-linux-ia32-pae.expect b/tests/xlat-linux-ia32-pae.expect index 325f6f27..2569c602 100644 --- a/tests/xlat-linux-ia32-pae.expect +++ b/tests/xlat-linux-ia32-pae.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x926000 + pte_mask=0x0 pte_format=ia32_pae fields=12,9,9,2 diff --git a/tests/xlat-linux-ia32.expect b/tests/xlat-linux-ia32.expect index e9d12221..ac765ead 100644 --- a/tests/xlat-linux-ia32.expect +++ b/tests/xlat-linux-ia32.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x911000 + pte_mask=0x0 pte_format=ia32 fields=12,10,10 diff --git a/tests/xlat-linux-ppc64-64k.expect b/tests/xlat-linux-ppc64-64k.expect index 78da7782..a8aabbd5 100644 --- a/tests/xlat-linux-ppc64-64k.expect +++ b/tests/xlat-linux-ppc64-64k.expect @@ -1,12 +1,14 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=ppc64_linux_rpn30 fields=16,12,12,4 @userpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=ppc64_linux_rpn30 fields=16,12,12,4 diff --git a/tests/xlat-linux-s390x-2l.expect b/tests/xlat-linux-s390x-2l.expect index e37c6516..2d6f323a 100644 --- a/tests/xlat-linux-s390x-2l.expect +++ b/tests/xlat-linux-s390x-2l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11 diff --git a/tests/xlat-linux-s390x-3l.expect b/tests/xlat-linux-s390x-3l.expect index 9a1191d0..2c78be57 100644 --- a/tests/xlat-linux-s390x-3l.expect +++ b/tests/xlat-linux-s390x-3l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11,11 diff --git a/tests/xlat-linux-s390x-4l.expect b/tests/xlat-linux-s390x-4l.expect index a3cc3375..eab8c528 100644 --- a/tests/xlat-linux-s390x-4l.expect +++ b/tests/xlat-linux-s390x-4l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11,11,11 diff --git a/tests/xlat-linux-x86_64-2.6.11-nover.expect b/tests/xlat-linux-x86_64-2.6.11-nover.expect index 39f2153f..7b48edac 100644 --- a/tests/xlat-linux-x86_64-2.6.11-nover.expect +++ b/tests/xlat-linux-x86_64-2.6.11-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.11.expect b/tests/xlat-linux-x86_64-2.6.11.expect index f2bd6aa6..196facf9 100644 --- a/tests/xlat-linux-x86_64-2.6.11.expect +++ b/tests/xlat-linux-x86_64-2.6.11.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.27-cr3-xen.expect b/tests/xlat-linux-x86_64-2.6.27-cr3-xen.expect index f4261a2d..b7a8e123 100644 --- a/tests/xlat-linux-x86_64-2.6.27-cr3-xen.expect +++ b/tests/xlat-linux-x86_64-2.6.27-cr3-xen.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x401af000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.27-nover.expect b/tests/xlat-linux-x86_64-2.6.27-nover.expect index 6e173903..a089e852 100644 --- a/tests/xlat-linux-x86_64-2.6.27-nover.expect +++ b/tests/xlat-linux-x86_64-2.6.27-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.27.expect b/tests/xlat-linux-x86_64-2.6.27.expect index 176e8f80..c3fb99d5 100644 --- a/tests/xlat-linux-x86_64-2.6.27.expect +++ b/tests/xlat-linux-x86_64-2.6.27.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31-cr3.expect b/tests/xlat-linux-x86_64-2.6.31-cr3.expect index 429f701a..a176e61e 100644 --- a/tests/xlat-linux-x86_64-2.6.31-cr3.expect +++ b/tests/xlat-linux-x86_64-2.6.31-cr3.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x2e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31-kvaddr.expect b/tests/xlat-linux-x86_64-2.6.31-kvaddr.expect index a4818b7b..c31d4369 100644 --- a/tests/xlat-linux-x86_64-2.6.31-kvaddr.expect +++ b/tests/xlat-linux-x86_64-2.6.31-kvaddr.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31-nover-reloc.expect b/tests/xlat-linux-x86_64-2.6.31-nover-reloc.expect index b29de634..2768de96 100644 --- a/tests/xlat-linux-x86_64-2.6.31-nover-reloc.expect +++ b/tests/xlat-linux-x86_64-2.6.31-nover-reloc.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31-nover-xen.expect b/tests/xlat-linux-x86_64-2.6.31-nover-xen.expect index b1c2a64e..66d99ad4 100644 --- a/tests/xlat-linux-x86_64-2.6.31-nover-xen.expect +++ b/tests/xlat-linux-x86_64-2.6.31-nover-xen.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -26,6 +27,7 @@ @kphys_machphys: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x3abc000 + pte_mask=0x0 pte_format=pfn64 fields=12,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31-nover.expect b/tests/xlat-linux-x86_64-2.6.31-nover.expect index 7bc86674..2e8b921a 100644 --- a/tests/xlat-linux-x86_64-2.6.31-nover.expect +++ b/tests/xlat-linux-x86_64-2.6.31-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31-reloc.expect b/tests/xlat-linux-x86_64-2.6.31-reloc.expect index b29de634..2768de96 100644 --- a/tests/xlat-linux-x86_64-2.6.31-reloc.expect +++ b/tests/xlat-linux-x86_64-2.6.31-reloc.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-2.6.31.expect b/tests/xlat-linux-x86_64-2.6.31.expect index 0e85ccf5..0ac52f9a 100644 --- a/tests/xlat-linux-x86_64-2.6.31.expect +++ b/tests/xlat-linux-x86_64-2.6.31.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-4.13-kaslr.expect b/tests/xlat-linux-x86_64-4.13-kaslr.expect index 14b9d9fd..67ea2eca 100644 --- a/tests/xlat-linux-x86_64-4.13-kaslr.expect +++ b/tests/xlat-linux-x86_64-4.13-kaslr.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff92c09000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-4.13-nover.expect b/tests/xlat-linux-x86_64-4.13-nover.expect index eeaa2f40..7568b285 100644 --- a/tests/xlat-linux-x86_64-4.13-nover.expect +++ b/tests/xlat-linux-x86_64-4.13-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81c09000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-5l.expect b/tests/xlat-linux-x86_64-5l.expect index 2e5d535a..3e302dc8 100644 --- a/tests/xlat-linux-x86_64-5l.expect +++ b/tests/xlat-linux-x86_64-5l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff8b40a000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-128M.expect b/tests/xlat-linux-x86_64-ktext-128M.expect index 6a7ae1ba..93395b80 100644 --- a/tests/xlat-linux-x86_64-ktext-128M.expect +++ b/tests/xlat-linux-x86_64-ktext-128M.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-130M-nonlinear.expect b/tests/xlat-linux-x86_64-ktext-130M-nonlinear.expect index d5cb9225..df81a7a2 100644 --- a/tests/xlat-linux-x86_64-ktext-130M-nonlinear.expect +++ b/tests/xlat-linux-x86_64-ktext-130M-nonlinear.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff99e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-130M.expect b/tests/xlat-linux-x86_64-ktext-130M.expect index 26e59e64..2868d3d0 100644 --- a/tests/xlat-linux-x86_64-ktext-130M.expect +++ b/tests/xlat-linux-x86_64-ktext-130M.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-1G.expect b/tests/xlat-linux-x86_64-ktext-1G.expect index cea06928..a81e06d6 100644 --- a/tests/xlat-linux-x86_64-ktext-1G.expect +++ b/tests/xlat-linux-x86_64-ktext-1G.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-40M.expect b/tests/xlat-linux-x86_64-ktext-40M.expect index e40c1c74..bb15ab20 100644 --- a/tests/xlat-linux-x86_64-ktext-40M.expect +++ b/tests/xlat-linux-x86_64-ktext-40M.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-512M.expect b/tests/xlat-linux-x86_64-ktext-512M.expect index 9f22953d..6accfacd 100644 --- a/tests/xlat-linux-x86_64-ktext-512M.expect +++ b/tests/xlat-linux-x86_64-ktext-512M.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-520M.expect b/tests/xlat-linux-x86_64-ktext-520M.expect index 6cdd438b..28d6eb6e 100644 --- a/tests/xlat-linux-x86_64-ktext-520M.expect +++ b/tests/xlat-linux-x86_64-ktext-520M.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-crosspage.expect b/tests/xlat-linux-x86_64-ktext-crosspage.expect index f9a5a43a..ec702722 100644 --- a/tests/xlat-linux-x86_64-ktext-crosspage.expect +++ b/tests/xlat-linux-x86_64-ktext-crosspage.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-ktext-pgt.expect b/tests/xlat-linux-x86_64-ktext-pgt.expect index 36d5cbee..7f0ef721 100644 --- a/tests/xlat-linux-x86_64-ktext-pgt.expect +++ b/tests/xlat-linux-x86_64-ktext-pgt.expect @@ -1,12 +1,14 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @ktext: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-old-nover.expect b/tests/xlat-linux-x86_64-old-nover.expect index 748bd4cf..0f4f58fc 100644 --- a/tests/xlat-linux-x86_64-old-nover.expect +++ b/tests/xlat-linux-x86_64-old-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=KVADDR:0xffffffff81e10000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-linux-x86_64-old.expect b/tests/xlat-linux-x86_64-old.expect index 579d807a..10ff4aa6 100644 --- a/tests/xlat-linux-x86_64-old.expect +++ b/tests/xlat-linux-x86_64-old.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-os-ia32-none.expect b/tests/xlat-os-ia32-none.expect index b04b5755..3cfc5a2c 100644 --- a/tests/xlat-os-ia32-none.expect +++ b/tests/xlat-os-ia32-none.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=ia32 fields=12,10,10 diff --git a/tests/xlat-os-ia32-pae-none.expect b/tests/xlat-os-ia32-pae-none.expect index 642a16d6..24bc768c 100644 --- a/tests/xlat-os-ia32-pae-none.expect +++ b/tests/xlat-os-ia32-pae-none.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=ia32_pae fields=12,9,9,2 diff --git a/tests/xlat-os-s390x-2l.expect b/tests/xlat-os-s390x-2l.expect index dfc64944..69b9d894 100644 --- a/tests/xlat-os-s390x-2l.expect +++ b/tests/xlat-os-s390x-2l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11 diff --git a/tests/xlat-os-s390x-3l.expect b/tests/xlat-os-s390x-3l.expect index 6442b30e..62aa36cc 100644 --- a/tests/xlat-os-s390x-3l.expect +++ b/tests/xlat-os-s390x-3l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11,11 diff --git a/tests/xlat-os-s390x-4l.expect b/tests/xlat-os-s390x-4l.expect index 221dff52..fa4cc52a 100644 --- a/tests/xlat-os-s390x-4l.expect +++ b/tests/xlat-os-s390x-4l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11,11,11 diff --git a/tests/xlat-os-s390x-5l.expect b/tests/xlat-os-s390x-5l.expect index 29262bdf..1abe1bd2 100644 --- a/tests/xlat-os-s390x-5l.expect +++ b/tests/xlat-os-s390x-5l.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x8b5000 + pte_mask=0x0 pte_format=s390x fields=12,8,11,11,11,11 diff --git a/tests/xlat-os-x86_64-none.expect b/tests/xlat-os-x86_64-none.expect index c7e09505..12409be6 100644 --- a/tests/xlat-os-x86_64-none.expect +++ b/tests/xlat-os-x86_64-none.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-os.c b/tests/xlat-os.c index c1583920..04da4901 100644 --- a/tests/xlat-os.c +++ b/tests/xlat-os.c @@ -259,6 +259,8 @@ print_pgt(const addrxlat_meth_t *meth) fputs(" root=", stdout); print_fulladdr(&meth->param.pgt.root); putchar('\n'); + printf(" pte_mask=0x%"ADDRXLAT_PRIxPTE"\n", + meth->param.pgt.pte_mask); fputs(" pte_format=", stdout); if (pf->pte_format < ARRAY_SIZE(pte_formats) && pte_formats[pf->pte_format]) diff --git a/tests/xlat-xen-ia32-pae.expect b/tests/xlat-xen-ia32-pae.expect index 9eaf3c3f..4663754c 100644 --- a/tests/xlat-xen-ia32-pae.expect +++ b/tests/xlat-xen-ia32-pae.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x100120 + pte_mask=0x0 pte_format=ia32_pae fields=12,9,9,2 diff --git a/tests/xlat-xen-ia32.expect b/tests/xlat-xen-ia32.expect index 303c0429..00a590e3 100644 --- a/tests/xlat-xen-ia32.expect +++ b/tests/xlat-xen-ia32.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0x1e3000 + pte_mask=0x0 pte_format=ia32 fields=12,10,10 diff --git a/tests/xlat-xen-x86_64-3.2-nover.expect b/tests/xlat-xen-x86_64-3.2-nover.expect index 9e0ea3b5..decf0619 100644 --- a/tests/xlat-xen-x86_64-3.2-nover.expect +++ b/tests/xlat-xen-x86_64-3.2-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-3.2.expect b/tests/xlat-xen-x86_64-3.2.expect index e27dd271..02b6ec24 100644 --- a/tests/xlat-xen-x86_64-3.2.expect +++ b/tests/xlat-xen-x86_64-3.2.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.0-nover.expect b/tests/xlat-xen-x86_64-4.0-nover.expect index 6963f12e..5235583e 100644 --- a/tests/xlat-xen-x86_64-4.0-nover.expect +++ b/tests/xlat-xen-x86_64-4.0-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.0.expect b/tests/xlat-xen-x86_64-4.0.expect index 6d53eaad..0c0d8739 100644 --- a/tests/xlat-xen-x86_64-4.0.expect +++ b/tests/xlat-xen-x86_64-4.0.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.0dev-nover.expect b/tests/xlat-xen-x86_64-4.0dev-nover.expect index 28cf7075..eaf31b33 100644 --- a/tests/xlat-xen-x86_64-4.0dev-nover.expect +++ b/tests/xlat-xen-x86_64-4.0dev-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.3-nover.expect b/tests/xlat-xen-x86_64-4.3-nover.expect index db3e743f..3bd32b47 100644 --- a/tests/xlat-xen-x86_64-4.3-nover.expect +++ b/tests/xlat-xen-x86_64-4.3-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.3.expect b/tests/xlat-xen-x86_64-4.3.expect index f90f4bed..dcd18e77 100644 --- a/tests/xlat-xen-x86_64-4.3.expect +++ b/tests/xlat-xen-x86_64-4.3.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.4-nover.expect b/tests/xlat-xen-x86_64-4.4-nover.expect index 7905e606..fc609ddb 100644 --- a/tests/xlat-xen-x86_64-4.4-nover.expect +++ b/tests/xlat-xen-x86_64-4.4-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.4.expect b/tests/xlat-xen-x86_64-4.4.expect index a5ddf619..93be6cc4 100644 --- a/tests/xlat-xen-x86_64-4.4.expect +++ b/tests/xlat-xen-x86_64-4.4.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 @@ -11,6 +12,7 @@ @ktext: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-4.6-bigmem.expect b/tests/xlat-xen-x86_64-4.6-bigmem.expect index 7d51a3d9..2265a4aa 100644 --- a/tests/xlat-xen-x86_64-4.6-bigmem.expect +++ b/tests/xlat-xen-x86_64-4.6-bigmem.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-old-nover.expect b/tests/xlat-xen-x86_64-old-nover.expect index 2d39ac5b..dae53fff 100644 --- a/tests/xlat-xen-x86_64-old-nover.expect +++ b/tests/xlat-xen-x86_64-old-nover.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=MACHPHYSADDR:0xffc94000 + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9 diff --git a/tests/xlat-xen-x86_64-old.expect b/tests/xlat-xen-x86_64-old.expect index c77c3de9..4f99aaf2 100644 --- a/tests/xlat-xen-x86_64-old.expect +++ b/tests/xlat-xen-x86_64-old.expect @@ -1,6 +1,7 @@ @rootpgt: PGT target_as=MACHPHYSADDR root=NOADDR + pte_mask=0x0 pte_format=x86_64 fields=12,9,9,9,9