Integrate 202311 release branches

Platforms/QemuQ35Pkg/Library/BaseMemEncryptSevLib/X64/SnpPageStateChangeInternal.c

@@ -20,7 +20,6 @@
 
 #include "SnpPageStateChange.h"
 
-#define IS_ALIGNED(x, y)  ((((x) & (y - 1)) == 0))
 #define PAGES_PER_LARGE_ENTRY  512
 
 STATIC

Platforms/QemuQ35Pkg/Plugins/QemuRunner/QemuRunner.py

@@ -8,19 +8,13 @@
 
 import logging
 import os
-import threading
 import datetime
-import subprocess
 import re
 import io
 import shutil
 from pathlib import Path
-from edk2toolext.environment import plugin_manager
 from edk2toolext.environment.plugintypes import uefi_helper_plugin
 from edk2toollib import utility_functions
-from edk2toollib.uefi.edk2.parsers.dsc_parser import DscParser
-from edk2toollib.uefi.edk2.parsers.inf_parser import InfParser
-from edk2toolext.environment.multiple_workspace import MultipleWorkspace
 
 class QemuRunner(uefi_helper_plugin.IUefiHelperPlugin):
 
@@ -220,8 +214,7 @@ def Runner(env):
             args += " -monitor tcp:127.0.0.1:" + monitor_port + ",server,nowait"
 
         # Run QEMU
-        #ret = QemuRunner.RunCmd(executable, args,  thread_target=QemuRunner.QemuCmdReader)
-        ret = utility_functions.RunCmd(executable, args)
+        ret = utility_functions.RunCmd(executable, args, logging_level=logging.CRITICAL)
         if ret != 0 and os.name != 'nt':
             # Linux version of QEMU will mess with the print if its run failed, this is to restore it
             utility_functions.RunCmd ('stty', 'echo')
@@ -237,153 +230,3 @@ def Runner(env):
             ret = 0
 
         return ret
-
-    ####
-    # Helper functions for running commands from the shell in python environment
-    # Don't use directly
-    #
-    # process output stream and write to log.
-    # part of the threading pattern.
-    #
-    #  http://stackoverflow.com/questions/19423008/logged-subprocess-communicate
-    ####
-    @staticmethod
-    def QemuCmdReader(filepath, outstream, stream, logging_level=logging.INFO):
-        f = None
-        # open file if caller provided path
-        error_found = False
-        if(filepath):
-            f = open(filepath, "w")
-        while True:
-            try:
-                s = stream.readline().decode()
-                ss = s.rstrip() # string stripped
-            except UnicodeDecodeError as e:
-                logging.error(str(e))
-            if not s:
-                break
-            if(f is not None):
-                # write to file if caller provided file
-                f.write(ss)
-                f.write("\n")
-            if(outstream is not None):
-                # write to stream object if caller provided object
-                outstream.write(ss)
-                f.write("\n")
-            logging.log(logging_level, ss)
-            if s.startswith("ASSERT "):
-                message = "ASSERT DETECTED, killing QEMU process: " + ss
-                logging.error(message)
-                if (outstream is not None):
-                    outstream.write(message)
-                if (f is not None):
-                    f.write(message)
-                error_found = True
-                break
-        stream.close()
-        if(f is not None):
-            f.close()
-        return None if not error_found else 1
-
-    ####
-    # Run a shell command and print the output to the log file
-    # This is the public function that should be used to run commands from the shell in python environment
-    # @param cmd - command being run, either quoted or not quoted
-    # @param parameters - parameters string taken as is
-    # @param capture - boolean to determine if caller wants the output captured in any format.
-    # @param workingdir - path to set to the working directory before running the command.
-    # @param outfile - capture output to file of given path.
-    # @param outstream - capture output to a stream.
-    # @param environ - shell environment variables dictionary that replaces the one inherited from the
-    #                  current process.
-    # @param target - a function to call. It must accept four parameters: filepath, outstream, stream, logging_level
-    # @param logging_level - log level to log output at.  Default is INFO
-    # @param raise_exception_on_nonzero - Setting to true causes exception to be raised if the cmd
-    #                                     return code is not zero.
-    #
-    # @return returncode of called cmd
-    ####
-    @staticmethod
-    def RunCmd(cmd, parameters, capture=True, workingdir=None, outfile=None, outstream=None, environ=None, thread_target=None, logging_level=logging.INFO, raise_exception_on_nonzero=False):
-        cmd = cmd.strip('"\'')
-        if " " in cmd:
-            cmd = '"' + cmd + '"'
-        if parameters is not None:
-            parameters = parameters.strip()
-            cmd += " " + parameters
-        if thread_target is None:
-            thread_target = utility_functions.reader
-        starttime = datetime.datetime.now()
-        logging.log(logging_level, "Cmd to run is: " + cmd)
-        logging.log(logging_level, "------------------------------------------------")
-        logging.log(logging_level, "--------------Cmd Output Starting---------------")
-        logging.log(logging_level, "------------------------------------------------")
-        wait_delay = 0.5 # we check about every second
-        c = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, cwd=workingdir, shell=True, env=environ)
-        if(capture):
-            thread = PropagatingThread(target=thread_target, args=(outfile, outstream, c.stdout, logging_level))
-            thread.start()
-            while True:
-                try:
-                    c.wait(wait_delay)
-                except subprocess.TimeoutExpired:
-                    # we expect this to throw and this is safe behavior
-                    pass
-                ret = thread.join(wait_delay)
-                if c.poll() is not None or not thread.is_alive() or ret is not None:
-                    break
-            # if the propagating thread exited but the cmd is still going
-            if c.poll() is None and not thread.is_alive():
-                logging.log(logging_level,"WARNING: Terminating the process early due to target")
-                c.kill()
-                if thread.ret != None:
-                    c.returncode = thread.ret # force the return code to be non zero
-            if c.poll() is None and not thread.is_alive():
-                logging.log(logging_level,"WARNING: Killing the process early due to target")
-                c.terminate()
-                if thread.ret != None:
-                    c.returncode = thread.ret # force the return code to be non zero
-        else:
-            c.wait()
-        endtime = datetime.datetime.now()
-        delta = endtime - starttime
-        endtime_str = "{0[0]:02}:{0[1]:02}".format(divmod(delta.seconds, 60))
-        returncode_str = "{0:#010x}".format(c.returncode)
-        logging.log(logging_level, "------------------------------------------------")
-        logging.log(logging_level, "--------------Cmd Output Finished---------------")
-        logging.log(logging_level, "--------- Running Time (mm:ss): " + endtime_str + " ----------")
-        logging.log(logging_level, "----------- Return Code: " + returncode_str + " ------------")
-        logging.log(logging_level, "------------------------------------------------")
-
-        if raise_exception_on_nonzero and c.returncode != 0:
-            raise Exception("{0} failed with Return Code: {1}".format(cmd, returncode_str))
-        return c.returncode
-
-####
-# Class to support running commands from the shell in a python environment.
-# Don't use directly.
-#
-# PropagatingThread copied from sample here:
-# https://stackoverflow.com/questions/2829329/catch-a-threads-exception-in-the-caller-thread-in-python
-####
-class PropagatingThread(threading.Thread):
-    def run(self):
-        self.exc = None
-        self.ret = None
-        try:
-            if hasattr(self, '_Thread__target'):
-                # Thread uses name mangling prior to Python 3.
-                self.ret = self._Thread__target(*self._Thread__args, **self._Thread__kwargs)
-            else:
-                self.ret = self._target(*self._args, **self._kwargs)
-        except SystemExit as e:
-            self.ret = e.code
-        except BaseException as e:
-            self.exc = e
-
-    def join(self, timeout=0.5):
-        ''' timeout is the number of seconds to timeout '''
-        super(PropagatingThread, self).join(timeout)
-        if self.exc:
-            raise self.exc
-        return self.ret

Platforms/QemuQ35Pkg/QemuQ35Pkg.dsc

@@ -44,9 +44,10 @@
   DEFINE NETWORK_ALLOW_HTTP_CONNECTIONS = TRUE
 
   # Configure Shared Crypto
-  !ifndef ENABLE_SHARED_CRYPTO # by default true
-    ENABLE_SHARED_CRYPTO = TRUE
-  !endif
+  # !ifndef ENABLE_SHARED_CRYPTO # by default true
+  #   ENABLE_SHARED_CRYPTO = TRUE
+  # !endif
+  ENABLE_SHARED_CRYPTO = FALSE
   !if $(ENABLE_SHARED_CRYPTO) == TRUE
     PEI_CRYPTO_SERVICES = TINY_SHA
     DXE_CRYPTO_SERVICES = STANDARD
@@ -332,7 +333,7 @@
             NULL|MdePkg/Library/VsIntrinsicLib/VsIntrinsicLib.inf
           !endif
           IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-          OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf # Contains openSSL library used by BaseCryptoLib
+          OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFull.inf # Contains openSSL library used by BaseCryptoLib
         <PcdsFixedAtBuild>
           !include CryptoPkg/Driver/Bin/Crypto.pcd.TINY_SHA.inc.dsc
     }
@@ -343,7 +344,7 @@
           BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
           TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
           IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-          OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf # Contains openSSL library used by BaseCryptoLib
+          OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf # Contains openSSL library used by BaseCryptoLib
         <PcdsFixedAtBuild>
           !include CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
     }
@@ -352,7 +353,7 @@
           BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
           TlsLib|CryptoPkg/Library/TlsLibNull/TlsLibNull.inf
           IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-          OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf # Contains openSSL library used by BaseCryptoLib
+          OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf # Contains openSSL library used by BaseCryptoLib
         <PcdsFixedAtBuild>
           !include CryptoPkg/Driver/Bin/Crypto.pcd.STANDARD.inc.dsc
     }
@@ -564,6 +565,8 @@
   SmmPolicyGateLib|MmSupervisorPkg/Library/SmmPolicyGateLib/SmmPolicyGateLib.inf
   HwResetSystemLib|QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf
   IhvSmmSaveStateSupervisionLib|MmSupervisorPkg/Library/IhvMmSaveStateSupervisionLib/IhvMmSaveStateSupervisionLib.inf
+  MmServicesTableLib|MmSupervisorPkg/Library/StandaloneMmServicesTableLib/StandaloneMmServicesTableLibCore.inf
+  MmSaveStateLib|UefiCpuPkg/Library/MmSaveStateLib/AmdMmSaveStateLib.inf
 
 [LibraryClasses.common.MM_STANDALONE]
   TimerLib|QemuQ35Pkg/Library/AcpiTimerLib/DxeAcpiTimerLib.inf
@@ -578,7 +581,7 @@
   StandaloneMmDriverEntryPoint|MmSupervisorPkg/Library/StandaloneMmDriverEntryPoint/StandaloneMmDriverEntryPoint.inf
   # TODO: ShareCrypto support
   BaseCryptLib|CryptoPkg/Library/BaseCryptLib/SmmCryptLib.inf
-  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf
+  OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf
   IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
   AdvLoggerAccessLib|AdvLoggerPkg/Library/AdvLoggerMmAccessLib/AdvLoggerMmAccessLib.inf
   DevicePathLib|MdePkg/Library/UefiDevicePathLib/UefiDevicePathLibStandaloneMm.inf
@@ -870,7 +873,7 @@
   # UefiCpuPkg PCDs related to initial AP bringup and general AP management.
   gUefiCpuPkgTokenSpaceGuid.PcdCpuBootLogicalProcessorNumber|0
 
-  gUefiQemuQ35PkgTokenSpaceGuid.PcdQ35TsegMbytes|8
+  gUefiQemuQ35PkgTokenSpaceGuid.PcdQ35TsegMbytes|32
   gUefiQemuQ35PkgTokenSpaceGuid.PcdQ35SmramAtDefaultSmbase|FALSE
 
 
@@ -1378,7 +1381,7 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf
   CryptoPkg/Test/UnitTest/Library/BaseCryptLib/BaseCryptLibUnitTestApp.inf {
     <LibraryClasses>
       BaseCryptLib|CryptoPkg/Library/BaseCryptLib/BaseCryptLib.inf
-      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf # Contains openSSL library used by BaseCryptoLib
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf # Contains openSSL library used by BaseCryptoLib
       IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
     <PcdsPatchableInModule>
       #Turn off Halt on Assert and Print Assert so that libraries can
@@ -1495,7 +1498,7 @@ QemuQ35Pkg/Library/ResetSystemLib/StandaloneMmResetSystemLib.inf
       BaseCryptLib|CryptoPkg/Library/BaseCryptLib/RuntimeCryptLib.inf
       TlsLib|CryptoPkg/Library/TlsLib/TlsLib.inf
       IntrinsicLib|CryptoPkg/Library/IntrinsicLib/IntrinsicLib.inf
-      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLibFullAccel.inf # Contains openSSL library used by BaseCryptoLib
+      OpensslLib|CryptoPkg/Library/OpensslLib/OpensslLib.inf # Contains openSSL library used by BaseCryptoLib
   }
 
   #

Platforms/QemuQ35Pkg/ResetVector/Ia16/ResetVectorVtf0.asm

@@ -159,23 +159,13 @@ sevEsResetBlockEnd:
 guidedStructureEnd:
 
 ALIGN   16
-
-applicationProcessorEntryPoint:
-;
-; Application Processors entry point
 ;
-; GenFv generates code aligned on a 4k boundary which will jump to this
-; location.  (0xffffffe0)  This allows the Local APIC Startup IPI to be
-; used to wake up the application processors.
+; 0xffffffe0
 ;
-    jmp     EarlyApInitReal16
-
-ALIGN   8
-
-    DD      0
+   DD      0, 0, 0
 
 ;
-; The VTF signature
+; The VTF signature (0xffffffec)
 ;
 ; VTF-0 means that the VTF (Volume Top File) code does not require
 ; any fixups.