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 <ptesarik@suse.com>
ptesarik · Oct 2, 2020 · ebd2820 · ebd2820
1 parent 04a94fa
commit ebd2820
Show file tree

Hide file tree

Showing 55 changed files with 76 additions and 0 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
 @rootpgt: PGT
   target_as=MACHPHYSADDR
   root=NOADDR
+  pte_mask=0x0
   pte_format=x86_64
   fields=12,9,9,9,9