date:20211123

[edk2-devel] 回复: [Patch V2 0/3] Remove git reset and optimize

2021-11-23 Thread gaoliming

Reviewed-by: Liming Gao 

> -邮件原件-
> 发件人: Michael D Kinney 
> 发送时间: 2021年11月24日 0:31
> 收件人: devel@edk2.groups.io
> 抄送: Sean Brogan ; Bret Barkelew
> ; Liming Gao ;
> Michael Kubacki 
> 主题: [Patch V2 0/3] Remove git reset and optimize
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=2986
> 
> New in V2
> --
> * Change temp directory path from Build/ecctemp to
>   Build/.pytool/Plugin/EccCheck to provide a unique
>   temp directory location for any .pytool Plugin.
> * Set working directory when ECC runs to temp directory
>   to guarantee all temp files created by EccCheck are
>   cleaned up.
> 
> * Use temp directory for all operations to prevent any
>   changed to git state.
> * Remove git reset operation that could corrupt staged
>   and local changes.
> * Improve performance by removing redundant directory scans
> * Improve performance and reduce log file sizes by using
>   --output option of git diff to a temp file instead of
>   using stdout.
> 
> Cc: Sean Brogan 
> Cc: Bret Barkelew 
> Cc: Liming Gao 
> Cc: Michael Kubacki 
> Signed-off-by: Michael D Kinney 
> 
> Michael D Kinney (3):
>   .pytool/Plugin/EccCheck: Remove RevertCode()
>   .pytool/Plugin/EccCheck: Remove temp directory on exception
>   .pytool/Plugin/EccCheck: Add performance optimizations
> 
>  .pytool/Plugin/EccCheck/EccCheck.py | 242 +++-
>  1 file changed, 169 insertions(+), 73 deletions(-)
> 
> --
> 2.32.0.windows.1







-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84020): https://edk2.groups.io/g/devel/message/84020
Mute This Topic: https://groups.io/mt/87276465/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] 回复: [Patch V2 1/1] .pytools/Plugin/LicenseCheck: Use temp directory for git diff output

2021-11-23 Thread gaoliming

Reviewed-by: Liming Gao 

> -邮件原件-
> 发件人: Michael D Kinney 
> 发送时间: 2021年11月24日 1:32
> 收件人: devel@edk2.groups.io
> 抄送: Sean Brogan ; Bret Barkelew
> ; Liming Gao ;
> Michael Kubacki 
> 主题: [Patch V2 1/1] .pytools/Plugin/LicenseCheck: Use temp directory for
git
> diff output
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3746
> 
> Use --output option in git diff command to remove code diffs
> from build log on stdout when LicenseCheck plugin is run.
> Instead, create a temp directory for the diff output file and
> remove the temp directory after the diff output is processed.
> 
> Cc: Sean Brogan 
> Cc: Bret Barkelew 
> Cc: Liming Gao 
> Cc: Michael Kubacki 
> Signed-off-by: Michael D Kinney 
> ---
>  .pytool/Plugin/LicenseCheck/LicenseCheck.py | 20 ++--
>  1 file changed, 14 insertions(+), 6 deletions(-)
> 
> diff --git a/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> b/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> index 5733f7bf4ec0..7b998daf6f6b 100644
> --- a/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> +++ b/.pytool/Plugin/LicenseCheck/LicenseCheck.py
> @@ -5,6 +5,7 @@
>  ##
> 
>  import os
> +import shutil
>  import logging
>  import re
>  from io import StringIO
> @@ -61,12 +62,19 @@ class LicenseCheck(ICiBuildPlugin):
>  #   - Junit Logger
>  #   - output_stream the StringIO output stream from this plugin via
> logging
>  def RunBuildPlugin(self, packagename, Edk2pathObj, pkgconfig,
> environment, PLM, PLMHelper, tc, output_stream=None):
> -return_buffer = StringIO()
> -params = "diff --unified=0 origin/master HEAD"
> -RunCmd("git", params, outstream=return_buffer)
> -p = return_buffer.getvalue().strip()
> -patch = p.split("\n")
> -return_buffer.close()
> +# Create temp directory
> +temp_path = os.path.join(Edk2pathObj.WorkspacePath, 'Build',
> '.pytool', 'Plugin', 'LicenseCheck')
> +if not os.path.exists(temp_path):
> +os.makedirs(temp_path)
> +# Output file to use for git diff operations
> +temp_diff_output = os.path.join (temp_path, 'diff.txt')
> +params = "diff --output={} --unified=0 origin/master
> HEAD".format(temp_diff_output)
> +RunCmd("git", params)
> +with open(temp_diff_output) as file:
> +patch = file.read().strip().split("\n")
> +# Delete temp directory
> +if os.path.exists(temp_path):
> +shutil.rmtree(temp_path)
> 
>  ignore_files = []
>  if "IgnoreFiles" in pkgconfig:
> --
> 2.32.0.windows.1







-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84019): https://edk2.groups.io/g/devel/message/84019
Mute This Topic: https://groups.io/mt/87276462/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

回复: [edk2-devel] [Patch 1/1] EmulatorPkg/Win/Host: Update CC_FLAGS

2021-11-23 Thread gaoliming

Reviewed-by: Liming Gao 

> -邮件原件-
> 发件人: devel@edk2.groups.io  代表 Michael D
> Kinney
> 发送时间: 2021年11月24日 1:26
> 收件人: devel@edk2.groups.io
> 抄送: Andrew Fish ; Ray Ni ; Michael
> Kubacki 
> 主题: [edk2-devel] [Patch 1/1] EmulatorPkg/Win/Host: Update CC_FLAGS
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3747
> 
> * Remove deprecated option /Gm that generates a warning.
> * Remove /Zi and use '=' instead of '== to let DEBUG/RELEASE/NOOPT
>   profile from tools_def.txt enable debug information
> * Remove /Gs8192 option that is overriding the larger setting of
>   /GS32768 from tools_def.txt that generates a warning.
> 
> Cc: Andrew Fish 
> Cc: Ray Ni 
> Cc: Michael Kubacki 
> Signed-off-by: Michael D Kinney 
> ---
>  EmulatorPkg/Win/Host/WinHost.inf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/EmulatorPkg/Win/Host/WinHost.inf
> b/EmulatorPkg/Win/Host/WinHost.inf
> index 4d2ce19620a1..2030ac084702 100644
> --- a/EmulatorPkg/Win/Host/WinHost.inf
> +++ b/EmulatorPkg/Win/Host/WinHost.inf
> @@ -86,7 +86,7 @@ [Pcd]
> 
>  [BuildOptions]
>MSFT:*_*_*_DLINK_FLAGS==
> /out:"$(BIN_DIR)\$(BASE_NAME).exe" /base:0x1000
> /pdb:"$(BIN_DIR)\$(BASE_NAME).pdb"
> -  MSFT:*_*_*_CC_FLAGS   == /nologo /W4 /WX /Gy /c /D
> UNICODE /Od /Oy- /FIAutoGen.h /EHs-c- /GF /Gs8192 /Zi /Gm /D
> _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
> +  MSFT:*_*_*_CC_FLAGS= /nologo /W4 /WX /Gy /c /D
> UNICODE /Od /Oy- /FIAutoGen.h /EHs-c- /GF /D
> _CRT_SECURE_NO_WARNINGS /D _CRT_SECURE_NO_DEPRECATE
>MSFT:*_*_*_PP_FLAGS   == /nologo /E /TC /FIAutoGen.h
> 
>MSFT:*_VS2015_IA32_DLINK_FLAGS =
> /LIBPATH:"%VS2015_PREFIX%Lib" /LIBPATH:"%VS2015_PREFIX%VC\Lib"
> /LIBPATH:"%UniversalCRTSdkDir%lib\%UCRTVersion%\ucrt\x86"
> /LIBPATH:"%WindowsSdkDir%lib\%WindowsSDKLibVersion%\um\x86"
> /NOLOGO /SUBSYSTEM:CONSOLE /NODEFAULTLIB /IGNORE:4086 /MAP
> /OPT:REF /DEBUG /MACHINE:I386 /LTCG Kernel32.lib MSVCRTD.lib Gdi32.lib
> User32.lib Winmm.lib Advapi32.lib vcruntimed.lib ucrtd.lib
> --
> 2.32.0.windows.1
> 
> 
> 
> 
> 







-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84018): https://edk2.groups.io/g/devel/message/84018
Mute This Topic: https://groups.io/mt/87276445/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

回复: edk2-stable202111 Re: [edk2-devel] [PATCH] MdeModulePkg AtaAtapiPassThru: Skip the potential NULL pointer access

2021-11-23 Thread gaoliming

Leif:
  Thanks for your suggestion. I am OK to merge this patch into stable
tag20211.

Thanks
Liming
> -邮件原件-
> 发件人: devel@edk2.groups.io  代表 Leif Lindholm
> 发送时间: 2021年11月23日 21:19
> 收件人: Rebecca Cran ; gaolim...@byosoft.com.cn
> 抄送: devel@edk2.groups.io; Hao A Wu ; Ray Ni
> ; Andrew Fish ; Michael D Kinney
> 
> 主题: edk2-stable202111 Re: [edk2-devel] [PATCH] MdeModulePkg
> AtaAtapiPassThru: Skip the potential NULL pointer access
> 
> Since BZ3732 has been triggered by a standard build of a platform in
> edk2-platforms, I would request that this fix is brought into the
> upcoming stable tag.
> 
> SbsaQemu isn't a "real" platform, so I don't consider that in itself
> sufficient reason, but I feel the risk of it affecting other
> (including out-of-tree) platforms justifies it.
> 
> Best Regards,
> 
> Leif
> 
> On Tue, Nov 23, 2021 at 06:10:14 -0700, Rebecca Cran wrote:
> > Acked-by: Rebecca Cran 
> >
> >
> > I've confirmed that this patch fixes the exception I was seeing when
running
> > the DEBUG build of SbsaQemu.
> >
> >
> > --
> >
> > Rebecca Cran
> >
> >
> > On 11/15/21 7:53 PM, gaoliming wrote:
> > > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3732
> > > Recent change c974257821208fc6191779d1ddea918499f165b8 exposes
> this potential issue.
> > >
> > > Signed-off-by: Liming Gao 
> > > Cc: Hao A Wu 
> > > Cc: Ray Ni 
> > > ---
> > >   MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c | 7 +++
> > >   1 file changed, 7 insertions(+)
> > >
> > > diff --git a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
> b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
> > > index 7626bac38d..bda900a161 100644
> > > --- a/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
> > > +++ b/MdeModulePkg/Bus/Ata/AtaAtapiPassThru/AhciMode.c
> > > @@ -885,6 +885,13 @@ AhciPrintStatusBlock (
> > > IN UINT32DebugLevel
> > > )
> > >   {
> > > +  //
> > > +  // Skip NULL pointer
> > > +  //
> > > +  if (AtaStatusBlock == NULL) {
> > > +return;
> > > +  }
> > > +
> > > //
> > > // Only print status and error since we have all of the rest
printed as
> > > // a part of command block print.
> 
> 
> 
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84017): https://edk2.groups.io/g/devel/message/84017
Mute This Topic: https://groups.io/mt/87276422/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] [Patch 09/12] ShellPkg: Update YAML to ignore specific ECC files/errors

2021-11-23 Thread Gao, Zhichao

Acked-by: Zhichao Gao 

Thanks,
Zhichao

> -Original Message-
> From: Kinney, Michael D 
> Sent: Wednesday, November 24, 2021 5:21 AM
> To: devel@edk2.groups.io
> Cc: Ni, Ray ; Gao, Zhichao ; Sean
> Brogan ; Bret Barkelew
> ; Liming Gao ;
> Michael Kubacki 
> Subject: [Patch 09/12] ShellPkg: Update YAML to ignore specific ECC
> files/errors
> 
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3749
> 
> Update package YAML files to ignore ECC errors that are already present.
> These issues must be fixed in the future, but should not block source code
> changes for these known issues.
> 
> Cc: Ray Ni 
> Cc: Zhichao Gao 
> Cc: Sean Brogan 
> Cc: Bret Barkelew 
> Cc: Liming Gao 
> Cc: Michael Kubacki 
> Signed-off-by: Michael D Kinney 
> ---
>  ShellPkg/ShellPkg.ci.yaml | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/ShellPkg/ShellPkg.ci.yaml b/ShellPkg/ShellPkg.ci.yaml index
> 30894d44bc3a..e741402459e5 100644
> --- a/ShellPkg/ShellPkg.ci.yaml
> +++ b/ShellPkg/ShellPkg.ci.yaml
> @@ -15,6 +15,7 @@
>  ## "", ""
>  ## ]
>  "ExceptionList": [
> +"8001", "ShellCommandLineParse"
>  ],
>  ## Both file path and directory path are accepted.
>  "IgnoreFiles": [
> --
> 2.32.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#84016): https://edk2.groups.io/g/devel/message/84016
Mute This Topic: https://groups.io/mt/87268743/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-

[edk2-devel] Uncrustify Conversion Detailed Plan and Extended Hard Freeze

2021-11-23 Thread Michael D Kinney

Hello,

Michael Kubacki and I have prepared the patches required to apply the
uncrustify changes and enable EDK II CI to check all submitted
patches have been run through uncrustify.

There are a couple minor updates expected over the next day.
New versions of this email will be sent with the latest links and
updates based on feedback from the community.

We have verified through the CompareBuild GitHub Action that the
format changes performed by uncrustify have no functional changes.
All of the OBJ, LIB, DLL, EFI, FFS, FV, and FD files match 100%
across 70 VS2019/GCC5 builds of all package/platform DSC files in
the edk2 repo.

The hard freeze will be extended after the edk2-stable202111 tag until
all uncrustify related changes are committed. We do not expect this
to take more than a few days. Do not push any PRs until the hard
freeze is lifted.

The changes are broken up into 7 patch series/PRs. The PRs are ordered
so they can be submitted using the normal submission process and EDK II
CI will pass for each one. Details are listed below.

Uncrustify 73.0.3 for EDK II
=
* Sources: https://dev.azure.com/projectmu/_git/Uncrustify
* Documentation:
https://dev.azure.com/projectmu/Uncrustify/_wiki/wikis/Uncrustify.wiki/1/Project-Mu-(EDK-II)-Fork-Readme
* Download:
https://dev.azure.com/projectmu/Uncrustify/_packaging?_a=package&feed=mu_uncrustify&package=mu-uncrustify-release&protocolType=NuGet&version=73.0.3

Installing Uncrustify
==
The Uncrustify tool is installed automatically when the Pytools
environment is used and the stuart* commands are run to complete the
environment setup. Please see:

https://github.com/tianocore/edk2/tree/master/.pytool#running-ci-locally

Uncrustify can also be installed from the download page listed above
or built from sources from the source link above.

The Documentation link provides instruction on how to run uncrustify from
the command line or install as a Visual Studio Code plugin. The main
uncrustify documentation also describes how to integrate with a few other
editors.

We have also discussed a client side githook. That effort has not started.
Let us know if that is a feature you would find useful.

Developer impact for new code reviews
==
Once the uncrustify checker is active in EDK II CI, developers must
make sure their patches are run through the uncrustify tool before
sending the patches for review.

Developers must install and run uncrustify against changes files before
sending patch review emails or submitting PR for EDK II CI. If EDK II CI
detects and differences in soure formatting, then EDK II CI will fail
and the developer must run uncrustify and resubmit the patches.

Developer impact to patch series/PRs reviewed during edk2-stable201121
soft/hard freeze
===
Developers must rebase their changes after the uncrustify source changes are
committed. The branch with a preview of the uncrustify changes can be used
to start this rebase work.

https://github.com/mdkinney/edk2/tree/Bug_3737_3739_ApplyUncrustifyChanges_V5

Impacts to tracing history across the uncrusity changes
===
<>
<>

Order of PRs to apply during extended hard freeze
==
1) Update EmulatorPkg Win Host [BuildOptions] MSFT CC_FLAGS to not force debug
information
* https://bugzilla.tianocore.org/show_bug.cgi?id=3747
*
https://github.com/mdkinney/edk2/tree/Bug_3747_EmulatorPkg_WinHost_ReproducibleBuild
* https://github.com/tianocore/edk2/pull/2215
* Required for EmulatorPkg to pass CompareBuild for VS2019 IA32/X64 builds.

2) EccCheck should not revert staged and local changes
* https://bugzilla.tianocore.org/show_bug.cgi?id=2986
* https://github.com/mdkinney/edk2/tree/Bug_2986_EccCheckRemoveGitRevert_V2
* https://github.com/tianocore/edk2/pull/2216
* Required for EDK II CI to complete in a reasonable period of time when
processing the 4000+ source file style changes made by uncrustify.
* Also fixes critical bugs that can potentially corrupt git state when
EccCheck is run locally.

3) Update pytool LicenseCheck plugin to use temp directory for diff output file
* https://bugzilla.tianocore.org/show_bug.cgi?id=3746
*
https://github.com/mdkinney/edk2/tree/Bug_3746_LicenseCheckUseDiffOutputFile_V2
* https://github.com/tianocore/edk2/pull/2217
* Required to reduce EDK II CI build times.

4) Update Package YAML to ignore specific ECC files/errors
* https://bugzilla.tianocore.org/show_bug.cgi?id=3749
* https://github.com/mdkinney/edk2/tree/Bug_3749_EccCheckIgnoreFilesErrors
* https://github.com/tianocore/edk2/pull/2218
* Required to pass EccCheck

92 matches

Mail list logo