From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mx.groups.io with SMTP id smtpd.web10.3553.1585880776475387738 for ; Thu, 02 Apr 2020 19:26:16 -0700 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.20, mailfrom: zhijux.fan@intel.com) IronPort-SDR: WMnOi69LBnYuGBId6OI/v71XwXtx1kI9UUtGIgsgHhB97/0KZTAcZf65oDxMIqJKq5hegUoALW LoOt2YjNbhfg== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga003.jf.intel.com ([10.7.209.27]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Apr 2020 19:26:16 -0700 IronPort-SDR: AvNFq5zspygItZCwJEJFcwDoiLVElnaxy0Pp3Qb+1R9sEssJOwiP6G9x1PrOot3x5kpwCLFnn4 Q6m/pnraAjRQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.72,337,1580803200"; d="scan'208";a="250028386" Received: from zhijufax-mobl.ccr.corp.intel.com ([10.238.4.120]) by orsmga003.jf.intel.com with ESMTP; 02 Apr 2020 19:26:14 -0700 From: "Fan, ZhijuX" To: devel@edk2.groups.io Cc: Liming Gao , Bob Feng , "Zhiju . Fan" Subject: [PATCH 1/1] BaseTools:Add the spare space FV image size checker Date: Fri, 3 Apr 2020 10:25:50 +0800 Message-Id: <20200403022550.23020-1-zhijux.fan@intel.com> X-Mailer: git-send-email 2.18.0.windows.1 REF:https://bugzilla.tianocore.org/show_bug.cgi?id=2654 If FV is placed in FD region, its FV image size is fixed. When FV image size exceeds it, it will trig the build break. To alert the developer to adjust FV image size earlier, I request to add new checker for the the spare FV space. When the spare FV space is less than the specified threshold, build tool will report the error. This checker is the optional. It can be enabled by -D FV_SPARE_SPACE_THRESHOLD=10000. Macro is the value of the spare space threshold size. It can be decimal or hex format. If it is enabled, BaseTools will check every FV with the fixed size. If FV doesn't meet with the size requirement, Build tool will report error message to say there is no enough spare space. Cc: Liming Gao Cc: Bob Feng Signed-off-by: Zhiju.Fan --- BaseTools/Source/Python/Common/BuildToolError.py | 2 ++ BaseTools/Source/Python/GenFds/GenFds.py | 32 +++++++++++++++++++++--- 2 files changed, 31 insertions(+), 3 deletions(-) diff --git a/BaseTools/Source/Python/Common/BuildToolError.py b/BaseTools/Source/Python/Common/BuildToolError.py index ecc83d0f48bd..21549683cd19 100644 --- a/BaseTools/Source/Python/Common/BuildToolError.py +++ b/BaseTools/Source/Python/Common/BuildToolError.py @@ -64,6 +64,8 @@ COMMAND_FAILURE = 0x7000 PERMISSION_FAILURE = 0x8000 +FV_FREESIZE_ERROR = 0x9000 + CODE_ERROR = 0xC0DE AUTOGEN_ERROR = 0xF000 diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py index d5511f4c40e5..c4782e89111b 100644 --- a/BaseTools/Source/Python/GenFds/GenFds.py +++ b/BaseTools/Source/Python/GenFds/GenFds.py @@ -29,7 +29,7 @@ from Common.Misc import DirCache, PathClass, GuidStructureStringToGuidString from Common.Misc import SaveFileOnChange, ClearDuplicatedInf from Common.BuildVersion import gBUILD_VERSION from Common.MultipleWorkspace import MultipleWorkspace as mws -from Common.BuildToolError import FatalError, GENFDS_ERROR, CODE_ERROR, FORMAT_INVALID, RESOURCE_NOT_AVAILABLE, FILE_NOT_FOUND, OPTION_MISSING, FORMAT_NOT_SUPPORTED, OPTION_VALUE_INVALID, PARAMETER_INVALID +from Common.BuildToolError import FatalError, GENFDS_ERROR, CODE_ERROR, FORMAT_INVALID, RESOURCE_NOT_AVAILABLE, FILE_NOT_FOUND, OPTION_MISSING, FORMAT_NOT_SUPPORTED, OPTION_VALUE_INVALID, PARAMETER_INVALID, FV_FREESIZE_ERROR from Workspace.WorkspaceDatabase import WorkspaceDatabase from .FdfParser import FdfParser, Warning @@ -374,7 +374,8 @@ def GenFdsApi(FdsCommandDict, WorkSpaceDataBase=None): GenFds.GenerateGuidXRefFile(BuildWorkSpace, ArchList, FdfParserObj) """Display FV space info.""" - GenFds.DisplayFvSpaceInfo(FdfParserObj) + Threshold = GenFds.GetFreeSizeThreshold() + GenFds.DisplayFvSpaceInfo(FdfParserObj, Threshold) except Warning as X: EdkLogger.error(X.ToolName, FORMAT_INVALID, File=X.FileName, Line=X.LineNumber, ExtraData=X.Message, RaiseError=False) @@ -584,13 +585,31 @@ class GenFds(object): return ElementRegion.BlockSizeOfRegion(ElementFd.BlockSizeList) return DefaultBlockSize + ## GetFreeSizeThreshold() + # + # @retval int Threshold value + # + @staticmethod + def GetFreeSizeThreshold(): + Threshold = None + Threshold_Str = GlobalData.gCommandLineDefines.get('FV_SPARE_SPACE_THRESHOLD') + if Threshold_Str: + try: + if Threshold_Str.lower().startswith('0x'): + Threshold = int(Threshold_Str, 16) + else: + Threshold = int(Threshold_Str) + except: + EdkLogger.warn("GenFds", 'incorrect value for FV_SPARE_SPACE_THRESHOLD %s. It can be decimal or hex format' % Threshold_Str) + return Threshold + ## DisplayFvSpaceInfo() # # @param FvObj Whose block size to get # @retval None # @staticmethod - def DisplayFvSpaceInfo(FdfParserObject): + def DisplayFvSpaceInfo(FdfParserObject, Threshold): FvSpaceInfoList = [] MaxFvNameLength = 0 @@ -623,6 +642,10 @@ class GenFds(object): FvSpaceInfoList.append((FvName, Total, Used, Free)) GenFdsGlobalVariable.InfLogger('\nFV Space Information') + if Threshold: + FvRegionNameList = [FvName for FvName in FdfParserObject.Profile.FvDict if FdfParserObject.Profile.FvDict[FvName].FvRegionInFD] + else: + FvRegionNameList = [] for FvSpaceInfo in FvSpaceInfoList: Name = FvSpaceInfo[0] TotalSizeValue = int(FvSpaceInfo[1], 0) @@ -634,6 +657,9 @@ class GenFds(object): Percentage = str((UsedSizeValue + 0.0) / TotalSizeValue)[0:4].lstrip('0.') GenFdsGlobalVariable.InfLogger(Name + ' ' + '[' + Percentage + '%Full] ' + str(TotalSizeValue) + ' total, ' + str(UsedSizeValue) + ' used, ' + str(FreeSizeValue) + ' free') + if Threshold and Name in FvRegionNameList and FreeSizeValue < Threshold: + EdkLogger.error("GenFds", FV_FREESIZE_ERROR, 'Freespace of %s FV is smaller than threshold, The value of FV_SPARE_SPACE_THRESHOLD is %d' % ( + Name, Threshold)) ## PreprocessImage() # -- 2.14.1.windows.1