Merge branch 'devel-armv8a' into devel-merge-armv8

Commit 161ca81.

- Unit tests pass (except mugentau0cmds)
  o entry point problem
- libpaging TEntry problem fixed
- Unit tests for mucfgexpand adjusted

Author: reet-

Makefile

@@ -31,6 +31,9 @@ TOOLS =             \
 	mucheckstack    \
 	mugenacpi       \
 	mugenmsrstore   \
+	mugends         \
+	mugendts        \
+	mugenpt         \
 	mugensinfo      \
 	mugensolo5      \
 	mugenspec       \

libmucfgcheck/data/test_policy.xml

@@ -277,6 +277,9 @@
   <memory alignment="16#1000#" caching="WB" name="linux|acpi_empty" physicalAddress="16#006f_2000#" size="16#c000#" type="subject"/>
   <memory alignment="16#1000#" caching="WB" name="linux|lowmem" physicalAddress="16#0fe0_0000#" size="16#0009_b000#" type="subject"/>
   <memory alignment="16#1000#" caching="WB" name="linux|bios" physicalAddress="16#006c_2000#" size="16#0001_0000#" type="subject_bios"/>
+  <memory alignment="16#1000#" caching="WB" name="linux|dtb" physicalAddress="16#2004_0000#" size="16#0004_0000#" type="subject_devicetree">
+   <file filename="devicetree_linux.dtb" offset="none"/>
+  </memory>
   <memory alignment="16#1000#" caching="WB" name="virtual_time" physicalAddress="16#0fea_b000#" size="16#1000#" type="subject_channel"/>
   <memory alignment="16#1000#" caching="WB" name="linux_keyboard" physicalAddress="16#0fea_5000#" size="16#1000#" type="subject_channel"/>
   <memory alignment="16#1000#" caching="WB" name="linux_console" physicalAddress="16#006b_2000#" size="16#0001_0000#" type="subject_channel"/>

libmucfgcheck/src/mucfgcheck-device_domains.adb

@@ -23,6 +23,7 @@ with McKae.XML.XPath.XIA;
 
 with Mulog;
 with Muxml.Utils;
+with Mutools.System_Config;
 with Mutools.Types;
 with Mutools.Utils;
 with Mutools.XML_Utils;
@@ -170,15 +171,23 @@ is
 
    procedure Domain_PT_Region_Presence (XML_Data : Muxml.XML_Data_Type)
    is
-      Domains   : constant DOM.Core.Node_List
+      Domains    : constant DOM.Core.Node_List
         := McKae.XML.XPath.XIA.XPath_Query
           (N     => XML_Data.Doc,
            XPath => "/system/deviceDomains/domain");
       PT_Regions : constant DOM.Core.Node_List
         := McKae.XML.XPath.XIA.XPath_Query
           (N     => XML_Data.Doc,
            XPath => "/system/memory/memory[@type='system_pt']");
-      Dom_Count : constant Natural := DOM.Core.Nodes.Length (List => Domains);
+      Dom_Count  : constant Natural := DOM.Core.Nodes.Length (List => Domains);
+
+      Is_ARM_System : constant Boolean
+        := Mutools.System_Config.Has_Boolean
+          (Data => XML_Data,
+           Name => "armv8") and then
+          Mutools.System_Config.Get_Value
+            (Data => XML_Data,
+             Name => "armv8");
    begin
       Mulog.Log (Msg => "Checking presence of" & Dom_Count'Img
                  & " security domain PT memory region(s)");
@@ -194,11 +203,13 @@ is
               := DOM.Core.Elements.Get_Attribute
                 (Elem => Dom_Node,
                  Name => "name");
+            Prefix   : constant String
+              := (if Is_ARM_System then "smmu_" else "vtd_");
             PT_Node  : constant DOM.Core.Node
               := Muxml.Utils.Get_Element
                 (Nodes     => PT_Regions,
                  Ref_Attr  => "name",
-                 Ref_Value => "vtd_" & Dom_Name & "_pt");
+                 Ref_Value => Prefix & Dom_Name & "_pt");
          begin
             if PT_Node = null then
                Validation_Errors.Insert

libmucfgcheck/src/mucfgcheck-hardware.adb

@@ -98,10 +98,11 @@ is
                Validation_Errors.Insert
                  (Msg => Device_Type & " device '"
                   & Dev_Name & "' has no memory region");
-            elsif Mem_Count > 1 then
-               Validation_Errors.Insert
-                 (Msg => Device_Type & " device '"
-                  & Dev_Name & "' has multiple memory regions");
+            -- TODO: MOA: SMMU has two iomem regions.
+            -- elsif Mem_Count > 1 then
+            --    Validation_Errors.Insert
+            --      (Msg => Device_Type & " device '"
+            --       & Dev_Name & "' has multiple memory regions");
             end if;
          end;
       end loop;

libmucfgcheck/src/mucfgcheck-kernel.adb

@@ -466,29 +466,30 @@ is
                           Error_Msg => "differs");
       end Stack;
 
-      Interrupt_Stack :
-      declare
-         Nodes : constant DOM.Core.Node_List
-           := Muxml.Utils.Get_Elements
-             (Nodes     => Mem_Nodes,
-              Ref_Attr  => "logical",
-              Ref_Value => "interrupt_stack");
-         Addr  : constant Interfaces.Unsigned_64
-           := Interfaces.Unsigned_64'Value
-             (DOM.Core.Elements.Get_Attribute
-                (Elem => DOM.Core.Nodes.Item
-                   (List  => Nodes,
-                    Index => 0),
-                 Name => "virtualAddress"));
-      begin
-         Check_Attribute (Nodes     => Nodes,
-                          Node_Type => "kernel interrupt stack memory",
-                          Attr      => "virtualAddress",
-                          Name_Attr => "physical",
-                          Test      => Equals'Access,
-                          B         => Addr,
-                          Error_Msg => "differs");
-      end Interrupt_Stack;
+      -- TODO: MOA: No interrupt stack.
+      -- Interrupt_Stack :
+      -- declare
+      --    Nodes : constant DOM.Core.Node_List
+      --      := Muxml.Utils.Get_Elements
+      --        (Nodes     => Mem_Nodes,
+      --         Ref_Attr  => "logical",
+      --         Ref_Value => "interrupt_stack");
+      --    Addr  : constant Interfaces.Unsigned_64
+      --      := Interfaces.Unsigned_64'Value
+      --        (DOM.Core.Elements.Get_Attribute
+      --           (Elem => DOM.Core.Nodes.Item
+      --              (List  => Nodes,
+      --               Index => 0),
+      --            Name => "virtualAddress"));
+      -- begin
+      --    Check_Attribute (Nodes     => Nodes,
+      --                     Node_Type => "kernel interrupt stack memory",
+      --                     Attr      => "virtualAddress",
+      --                     Name_Attr => "physical",
+      --                     Test      => Equals'Access,
+      --                     B         => Addr,
+      --                     Error_Msg => "differs");
+      -- end Interrupt_Stack;
    end Stack_Address_Equality;
 
    -------------------------------------------------------------------------

libmucfgcheck/src/mucfgcheck-memory.adb

@@ -1174,6 +1174,60 @@ is
 
    -------------------------------------------------------------------------
 
+   procedure Subject_Linux_Image_Alignment (XML_Data : Muxml.XML_Data_Type)
+   is
+      Linux_DT    : constant Muxml.Utils.Matching_Pairs_Type
+        := Muxml.Utils.Get_Matching
+          (XML_Data       => XML_Data,
+           Left_XPath     => "/system/subjects/subject/memory/memory",
+           Right_XPath    =>
+             "/system/memory/memory[@type='subject_devicetree']",
+           Match_Multiple => True,
+           Match          => Mutools.Match.Is_Valid_Reference'Access);
+      Physical_SB : constant DOM.Core.Node_List
+        := McKae.XML.XPath.XIA.XPath_Query
+          (N     => XML_Data.Doc,
+           XPath => "/system/memory/memory[@type='subject_binary']");
+   begin
+      for I in 0 .. DOM.Core.Nodes.Length (List => Linux_DT.Left) - 1 loop
+         declare
+            Subject   : constant DOM.Core.Node
+              := DOM.Core.Nodes.Parent_Node
+                (N => DOM.Core.Nodes.Parent_Node
+                  (N => DOM.Core.Nodes.Item (List  => Linux_DT.Left,
+                                             Index => I)));
+            Subj_Name : constant String
+              := DOM.Core.Elements.Get_Attribute
+                (Elem => Subject,
+                 Name => "name");
+            Subj_Mem  : constant DOM.Core.Node_List
+              := McKae.XML.XPath.XIA.XPath_Query
+                (N     => Subject,
+                 XPath => "memory/memory");
+            Linux_SB : constant Muxml.Utils.Matching_Pairs_Type
+              := Muxml.Utils.Get_Matching
+                (Left_Nodes     => Subj_Mem,
+                 Right_Nodes    => Physical_SB,
+                 Match_Multiple => True,
+                 Match          => Mutools.Match.Is_Valid_Reference'Access);
+         begin
+            Mulog.Log (Msg => "Checking subject binary alignment of Linux "
+                       & "subject '" & Subj_Name & "'");
+
+            Check_Attribute (Nodes     => Linux_SB.Left,
+                             Node_Type => "logical memory",
+                             Attr      => "virtualAddress",
+                             Name_Attr => "logical",
+                             Test      => Mod_Equal_Zero'Access,
+                             B         => 16#0020_0000#,
+                             Error_Msg => "is not 2MB aligned for Linux "
+                             & "subject '" & Subj_Name & "'");
+         end;
+      end loop;
+   end Subject_Linux_Image_Alignment;
+
+   -------------------------------------------------------------------------
+
    procedure Subject_MSR_Store_Mappings (XML_Data : Muxml.XML_Data_Type)
    is
    begin

libmucfgcheck/src/mucfgcheck-memory.ads

@@ -221,6 +221,10 @@ is
    --D scheduling partition.
    procedure Subject_Sched_Info_Mappings (XML_Data : Muxml.XML_Data_Type);
 
+   --D @Item List => validators_mem
+   --D Validate that Linux subjects have the subject binary properly aligned.
+   procedure Subject_Linux_Image_Alignment (XML_Data : Muxml.XML_Data_Type);
+
    --D @Item List => validators_mem
    --D Validate that subject state, timed event and pending interrupts memory
    --D regions are only mapped writable by subjects in the same scheduling group

libmucfgcheck/tests/mucfgcheck-hardware-test_data-tests.adb

@@ -52,7 +52,7 @@ package body Mucfgcheck.Hardware.Test_Data.Tests is
 
       Memory_Space (XML_Data => Data);
       Assert (Condition => Validation_Errors.Contains
-              (Msg => "Allocated 16#13ed_c000# bytes of physical memory but "
+              (Msg => "Allocated 16#13f1_c000# bytes of physical memory but "
                & "only 16#042a_1000# bytes available by the hardware"),
               Message   => "Exception mismatch");
 --  begin read only

libmucfgcheck/tests/mucfgcheck-kernel-test_data-tests.adb

@@ -193,25 +193,25 @@ package body Mucfgcheck.Kernel.Test_Data.Tests is
                & "'kernel_stack_1' kernel stack memory element differs"),
               Message   => "Exception mismatch (1)");
 
-      Muxml.Utils.Set_Attribute
-        (Doc   => Data.Doc,
-         XPath => "/system/kernel/memory/cpu/memory"
-         & "[@physical='kernel_stack_1']",
-         Name  => "virtualAddress",
-         Value => "16#0011_3000#");
-      Muxml.Utils.Set_Attribute
-        (Doc   => Data.Doc,
-         XPath => "/system/kernel/memory/cpu/memory"
-         & "[@physical='kernel_interrupt_stack_1']",
-         Name  => "virtualAddress",
-         Value => "16#0051_0000#");
-
-      Stack_Address_Equality (XML_Data => Data);
-      Assert (Condition => Validation_Errors.Contains
-              (Msg => "Attribute 'virtualAddress => 16#0051_0000#' of "
-               & "'kernel_interrupt_stack_1' kernel interrupt stack "
-               & "memory element differs"),
-              Message   => "Exception mismatch (2)");
+      -- Muxml.Utils.Set_Attribute
+      --   (Doc   => Data.Doc,
+      --    XPath => "/system/kernel/memory/cpu/memory"
+      --    & "[@physical='kernel_stack_1']",
+      --    Name  => "virtualAddress",
+      --    Value => "16#0011_3000#");
+      -- Muxml.Utils.Set_Attribute
+      --   (Doc   => Data.Doc,
+      --    XPath => "/system/kernel/memory/cpu/memory"
+      --    & "[@physical='kernel_interrupt_stack_1']",
+      --    Name  => "virtualAddress",
+      --    Value => "16#0051_0000#");
+
+      -- Stack_Address_Equality (XML_Data => Data);
+      -- Assert (Condition => Validation_Errors.Contains
+      --         (Msg => "Attribute 'virtualAddress => 16#0051_0000#' of "
+      --          & "'kernel_interrupt_stack_1' kernel interrupt stack "
+      --          & "memory element differs"),
+      --         Message   => "Exception mismatch (2)");
 --  begin read only
    end Test_Stack_Address_Equality;
 --  end read only

libmucfgcheck/tests/mucfgcheck-memory-test_data-tests.adb

@@ -2088,6 +2088,79 @@ package body Mucfgcheck.Memory.Test_Data.Tests is
 --  end read only
 
 
+--  begin read only
+   procedure Test_Subject_Linux_Image_Alignment (Gnattest_T : in out Test);
+   procedure Test_Subject_Linux_Image_Alignment_086ed4 (Gnattest_T : in out Test) renames Test_Subject_Linux_Image_Alignment;
+--  id:2.2/086ed40c4cee268e/Subject_Linux_Image_Alignment/1/0/
+   procedure Test_Subject_Linux_Image_Alignment (Gnattest_T : in out Test) is
+--  end read only
+
+      pragma Unreferenced (Gnattest_T);
+
+      Data : Muxml.XML_Data_Type;
+      DT   : DOM.Core.Node;
+   begin
+      Muxml.Parse (Data => Data,
+                   Kind => Muxml.Format_B,
+                   File => "data/test_policy.xml");
+
+      --  Add device tree node to Linux subject.
+      DT := DOM.Core.Documents.Create_Element
+        (Doc      => Data.Doc,
+         Tag_Name => "memory");
+      DOM.Core.Elements.Set_Attribute
+        (Elem  => DT,
+         Name  => "executable",
+         Value => "true");
+      DOM.Core.Elements.Set_Attribute
+        (Elem  => DT,
+         Name  => "logical",
+         Value => "dtb");
+      DOM.Core.Elements.Set_Attribute
+        (Elem  => DT,
+         Name  => "physical",
+         Value => "linux|dtb");
+      DOM.Core.Elements.Set_Attribute
+        (Elem  => DT,
+         Name  => "virtualAddress",
+         Value => "16#0010_0000#");
+      DOM.Core.Elements.Set_Attribute
+        (Elem  => DT,
+         Name  => "writable",
+         Value => "true");
+
+      Muxml.Utils.Append_Child
+        (Node      => Muxml.Utils.Get_Element
+          (Doc   => Data.Doc,
+           XPath => "/system/subjects/subject[@name='linux']/memory"),
+         New_Child => DT);
+
+      --  Positive test, must not raise an exception.
+
+      Subject_Linux_Image_Alignment (XML_Data => Data);
+      Assert (Condition => Validation_Errors.Is_Empty,
+              Message   => "Unexpected error in positive test");
+
+      --  Misalign the subject binary of the Linux kernel.
+
+      Muxml.Utils.Set_Attribute
+        (Doc   => Data.Doc,
+         XPath => "/system/subjects/subject[@name='linux']/memory/memory[@logical='binary']",
+         Name  => "virtualAddress",
+         Value => "16#0008_0000#");
+
+      Subject_Linux_Image_Alignment (XML_Data => Data);
+      Assert (Condition => Validation_Errors.Contains
+              (Msg => "Attribute 'virtualAddress => 16#0008_0000#' of "
+               & "'binary' logical memory element is not 2MB aligned "
+               & "for Linux subject 'linux'"),
+              Message   => "Exception mismatch");
+
+--  begin read only
+   end Test_Subject_Linux_Image_Alignment;
+--  end read only
+
+
 --  begin read only
    procedure Test_Monitor_Subject_Region_Mappings (Gnattest_T : in out Test);
    procedure Test_Monitor_Subject_Region_Mappings_11712e (Gnattest_T : in out Test) renames Test_Monitor_Subject_Region_Mappings;