[edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Rebecca Cran via groups.io]

I noticed recent commits by Jeff Brasen, Jake Garver, Joey Vagades and 
Michael Roth have funky Author lines, which I think means .mailmap needs 
updated?

commit 7a5823f85be99b9a92751fcf4141f7982fa5cc80
Author: Jeff Brasen via groups.io <jbrasen=nvidia.com@groups.io>
Date:   Thu Dec 28 12:47:08 2023 -0800

     EmbeddedPkg: Add DtPlatformLoaderLib gmock support

     Add Google Mock Library for DtPlatformLoaderDtbLib

     Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>



commit 9f0061a03b61d282fbc0ba5be22155d06a5e64a1
Author: Joey Vagedes via groups.io <joeyvagedes=microsoft.com@groups.io>
Date:   Wed Dec 6 12:27:02 2023 -0800

     BaseTools: Resolve regex syntax warnings

     Switches regex patterns to raw text to resolve python 3.12 syntax
     warnings in regards to invalid escape sequences, as is suggested by the
     re (regex) module in python.

     Cc: Rebecca Cran <rebecca@bsdio.com>
     Cc: Liming Gao <gaoliming@byosoft.com.cn>
     Cc: Bob Feng <bob.c.feng@intel.com>
     Cc: Yuwei Chen <yuwei.chen@intel.com>
     Signed-off-by: Joey Vagedes <joey.vagedes@gmail.com>
     Reviewed-by: Rebecca Cran <rebecca@bsdio.com>


Author: Jake Garver via groups.io <jake=nvidia.com@groups.io>
Date:   Tue Oct 3 23:04:54 2023 +0800

     MdeModulePkg/RegularExpressinoDxe: Fix clang error

     Ignore old style declaration warnings in oniguruma/src/st.c.  This was
     already ignored for MSFT, but newer versions of clang complain as well.

     Signed-off-by: Jake Garver <jake@nvidia.com>
     Reviewed-by: Nhi Pham <nhi@os.amperecomputing.com>
     Tested-by: Nhi Pham <nhi@os.amperecomputing.com>
     Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

commit f008890ae55929f7f17e7d2f8aff929255007d33
Author: Roth, Michael via groups.io <Michael.Roth=amd.com@groups.io>
Date:   Wed Aug 16 15:11:45 2023 -0500

     OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot

     Booting an SEV guest with AmdSev OVMF package currently triggers the
     following assertion with QEMU:

       InstallQemuFwCfgTables: installed 7 tables
       PcRtc: Write 0x20 to CMOS location 0x32
       [Variable]END_OF_DXE is signaled
       Initialize variable error flag (FF)

       ASSERT_EFI_ERROR (Status = Not Found)
       ASSERT [BdsDxe] 
/home/VT_BUILD/ovmf/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c(1711): 
!(((INTN)(RETURN_STATUS)(Status)) < 0)

     This seems to be due to commit 81dc0d8b4c, which switched to using
     PlatformBootManagerLib instead of PlatformBootManagerLibGrub. That 
pulls
     in a dependency on gEfiS3SaveStateProtocolGuid provider being available
     (which is asserted for in
     BdsPlatform.c:PlatformBootManagerBeforeConsole()/SaveS3BootScript()),
     but the libraries that provide it aren't currently included in the
     build. Add them similarly to what's done for OvmfPkg.

     Fixes: 81dc0d8b4c ("OvmfPkg/AmdSev: stop using 
PlatformBootManagerLibGrub")
     Signed-off-by: Michael Roth <michael.roth@amd.com>
     Acked-by: Gerd Hoffmann <kraxel@redhat.com>
     Acked-by: Jiewen Yao <Jiewen.yao@intel.com>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113201): https://edk2.groups.io/g/devel/message/113201
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Joey Vagedes via groups.io]

Hi Rebecca. I will investigate this for my account. Joey.vagedes@gmail.com is correct on the mail map as it is my preference. Both my personal and professional emails are linked to Bugzilla and github and joey.vagedes@gmail.com is what should be showing up as the author for commits.

Thanks for bringing this to my attention.

Joey

-----Original Message-----
From: Rebecca Cran <rebecca@os.amperecomputing.com> 
Sent: Thursday, January 4, 2024 4:06 PM
To: devel@edk2.groups.io; Jeff Brasen <jbrasen@nvidia.com>; jake@nvidia.com; Michael.Roth@amd.com; Joey Vagedes <joeyvagedes@microsoft.com>
Subject: [EXTERNAL] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[You don't often get email from rebecca@os.amperecomputing.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]

I noticed recent commits by Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth have funky Author lines, which I think means .mailmap needs updated?

commit 7a5823f85be99b9a92751fcf4141f7982fa5cc80
Author: Jeff Brasen via groups.io <jbrasen=nvidia.com@groups.io>
Date:   Thu Dec 28 12:47:08 2023 -0800

     EmbeddedPkg: Add DtPlatformLoaderLib gmock support

     Add Google Mock Library for DtPlatformLoaderDtbLib

     Signed-off-by: Jeff Brasen <jbrasen@nvidia.com>



commit 9f0061a03b61d282fbc0ba5be22155d06a5e64a1
Author: Joey Vagedes via groups.io <joeyvagedes=microsoft.com@groups.io>
Date:   Wed Dec 6 12:27:02 2023 -0800

     BaseTools: Resolve regex syntax warnings

     Switches regex patterns to raw text to resolve python 3.12 syntax
     warnings in regards to invalid escape sequences, as is suggested by the
     re (regex) module in python.

     Cc: Rebecca Cran <rebecca@bsdio.com>
     Cc: Liming Gao <gaoliming@byosoft.com.cn>
     Cc: Bob Feng <bob.c.feng@intel.com>
     Cc: Yuwei Chen <yuwei.chen@intel.com>
     Signed-off-by: Joey Vagedes <joey.vagedes@gmail.com>
     Reviewed-by: Rebecca Cran <rebecca@bsdio.com>


Author: Jake Garver via groups.io <jake=nvidia.com@groups.io>
Date:   Tue Oct 3 23:04:54 2023 +0800

     MdeModulePkg/RegularExpressinoDxe: Fix clang error

     Ignore old style declaration warnings in oniguruma/src/st.c.  This was
     already ignored for MSFT, but newer versions of clang complain as well.

     Signed-off-by: Jake Garver <jake@nvidia.com>
     Reviewed-by: Nhi Pham <nhi@os.amperecomputing.com>
     Tested-by: Nhi Pham <nhi@os.amperecomputing.com>
     Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

commit f008890ae55929f7f17e7d2f8aff929255007d33
Author: Roth, Michael via groups.io <Michael.Roth=amd.com@groups.io>
Date:   Wed Aug 16 15:11:45 2023 -0500

     OvmfPkg/AmdSev: fix BdsPlatform.c assertion failure during boot

     Booting an SEV guest with AmdSev OVMF package currently triggers the
     following assertion with QEMU:

       InstallQemuFwCfgTables: installed 7 tables
       PcRtc: Write 0x20 to CMOS location 0x32
       [Variable]END_OF_DXE is signaled
       Initialize variable error flag (FF)

       ASSERT_EFI_ERROR (Status = Not Found)
       ASSERT [BdsDxe]
/home/VT_BUILD/ovmf/OvmfPkg/Library/PlatformBootManagerLib/BdsPlatform.c(1711):
!(((INTN)(RETURN_STATUS)(Status)) < 0)

     This seems to be due to commit 81dc0d8b4c, which switched to using
     PlatformBootManagerLib instead of PlatformBootManagerLibGrub. That pulls
     in a dependency on gEfiS3SaveStateProtocolGuid provider being available
     (which is asserted for in
     BdsPlatform.c:PlatformBootManagerBeforeConsole()/SaveS3BootScript()),
     but the libraries that provide it aren't currently included in the
     build. Add them similarly to what's done for OvmfPkg.

     Fixes: 81dc0d8b4c ("OvmfPkg/AmdSev: stop using
PlatformBootManagerLibGrub")
     Signed-off-by: Michael Roth <michael.roth@amd.com>
     Acked-by: Gerd Hoffmann <kraxel@redhat.com>
     Acked-by: Jiewen Yao <Jiewen.yao@intel.com>


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113405): https://edk2.groups.io/g/devel/message/113405
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Laszlo Ersek]

On 1/5/24 01:05, Rebecca Cran via groups.io wrote:
> I noticed recent commits by Jeff Brasen, Jake Garver, Joey Vagades and
> Michael Roth have funky Author lines, which I think means .mailmap needs
> updated?
> 
> Author: Jeff Brasen via groups.io <jbrasen=nvidia.com@groups.io>
> Author: Joey Vagedes via groups.io <joeyvagedes=microsoft.com@groups.io>
> Author: Jake Garver via groups.io <jake=nvidia.com@groups.io>
> Author: Roth, Michael via groups.io <Michael.Roth=amd.com@groups.io>

I'm sure I'm confusing the terms here, but this is a consequence of
DMARC / DKIM / whatever, for some senders. groups.io cannot resend some
kind of messages to list subscribers where the original sender domain
(such as nvidia.com, microsoft.com, amd.com) is cryptographically
authenticated. If groups.io resent those messages with identical "from",
then the recipients (list subscribers) would reject those messages,
because they'd perceive the messages as fakes (the crypto check would
catch that the messages came from groups.io but claimed to originate
from nvidia.com, microsoft.com, amd.com -- that's exactly what DKIM /
DMARC etc etc are supposed to prevent). Therefore groups.io rewrites the
sender email addresses like seen above, and then "git-am" picks up those
rewritten addresses verbatim. That's how they end up in the git commit
history.

This can be manually fixed by whoever applies such patches from the
list: after the initial "git-am", a git-rebase is needed, and each patch
needs to have its author meta-datum fixed with "git commit --amend
--author='corrected email address'". It's a lot of manual and error
prone work (unless someone scripts it, effectively "decoding" the
rewriting format that groups.io employs). As much as it pains me to
admit it, this is definitely an argument in favor of git forge-based
contributions, and against mailing list-based patches.

".mailmap" can be used to mitigate this issue, per gitmailmap(5); it'd
be better just not to permit such mangled "From:" fields to seep into
the git log, in the future. :/

Laszlo



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113436): https://edk2.groups.io/g/devel/message/113436
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Ard Biesheuvel]

On Tue, 9 Jan 2024 at 10:17, Laszlo Ersek <lersek@redhat.com> wrote:
>
> On 1/5/24 01:05, Rebecca Cran via groups.io wrote:
> > I noticed recent commits by Jeff Brasen, Jake Garver, Joey Vagades and
> > Michael Roth have funky Author lines, which I think means .mailmap needs
> > updated?
> >
> > Author: Jeff Brasen via groups.io <jbrasen=nvidia.com@groups.io>
> > Author: Joey Vagedes via groups.io <joeyvagedes=microsoft.com@groups.io>
> > Author: Jake Garver via groups.io <jake=nvidia.com@groups.io>
> > Author: Roth, Michael via groups.io <Michael.Roth=amd.com@groups.io>
>
> I'm sure I'm confusing the terms here, but this is a consequence of
> DMARC / DKIM / whatever, for some senders. groups.io cannot resend some
> kind of messages to list subscribers where the original sender domain
> (such as nvidia.com, microsoft.com, amd.com) is cryptographically
> authenticated. If groups.io resent those messages with identical "from",
> then the recipients (list subscribers) would reject those messages,
> because they'd perceive the messages as fakes (the crypto check would
> catch that the messages came from groups.io but claimed to originate
> from nvidia.com, microsoft.com, amd.com -- that's exactly what DKIM /
> DMARC etc etc are supposed to prevent). Therefore groups.io rewrites the
> sender email addresses like seen above, and then "git-am" picks up those
> rewritten addresses verbatim. That's how they end up in the git commit
> history.
>
> This can be manually fixed by whoever applies such patches from the
> list: after the initial "git-am", a git-rebase is needed, and each patch
> needs to have its author meta-datum fixed with "git commit --amend
> --author='corrected email address'". It's a lot of manual and error
> prone work (unless someone scripts it, effectively "decoding" the
> rewriting format that groups.io employs). As much as it pains me to
> admit it, this is definitely an argument in favor of git forge-based
> contributions, and against mailing list-based patches.
>
> ".mailmap" can be used to mitigate this issue, per gitmailmap(5); it'd
> be better just not to permit such mangled "From:" fields to seep into
> the git log, in the future. :/
>

Agreed, and I think this came up somewhere last year perhaps? Mike
Kinney (cc'ed) might remember if that went anywhere, but the idea was
for PatchCheck.py (which is also used in CI) to reject patches using
an email address in this format.

Note that git am does support a 'From: ' header as the first line of
the commit log, and will use it correctly to supersede the From:
header in the SMTP envelope.


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113438): https://edk2.groups.io/g/devel/message/113438
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Laszlo Ersek]

On 1/9/24 11:45, Ard Biesheuvel wrote:
> On Tue, 9 Jan 2024 at 10:17, Laszlo Ersek <lersek@redhat.com> wrote:
>>
>> On 1/5/24 01:05, Rebecca Cran via groups.io wrote:
>>> I noticed recent commits by Jeff Brasen, Jake Garver, Joey Vagades and
>>> Michael Roth have funky Author lines, which I think means .mailmap needs
>>> updated?
>>>
>>> Author: Jeff Brasen via groups.io <jbrasen=nvidia.com@groups.io>
>>> Author: Joey Vagedes via groups.io <joeyvagedes=microsoft.com@groups.io>
>>> Author: Jake Garver via groups.io <jake=nvidia.com@groups.io>
>>> Author: Roth, Michael via groups.io <Michael.Roth=amd.com@groups.io>
>>
>> I'm sure I'm confusing the terms here, but this is a consequence of
>> DMARC / DKIM / whatever, for some senders. groups.io cannot resend some
>> kind of messages to list subscribers where the original sender domain
>> (such as nvidia.com, microsoft.com, amd.com) is cryptographically
>> authenticated. If groups.io resent those messages with identical "from",
>> then the recipients (list subscribers) would reject those messages,
>> because they'd perceive the messages as fakes (the crypto check would
>> catch that the messages came from groups.io but claimed to originate
>> from nvidia.com, microsoft.com, amd.com -- that's exactly what DKIM /
>> DMARC etc etc are supposed to prevent). Therefore groups.io rewrites the
>> sender email addresses like seen above, and then "git-am" picks up those
>> rewritten addresses verbatim. That's how they end up in the git commit
>> history.
>>
>> This can be manually fixed by whoever applies such patches from the
>> list: after the initial "git-am", a git-rebase is needed, and each patch
>> needs to have its author meta-datum fixed with "git commit --amend
>> --author='corrected email address'". It's a lot of manual and error
>> prone work (unless someone scripts it, effectively "decoding" the
>> rewriting format that groups.io employs). As much as it pains me to
>> admit it, this is definitely an argument in favor of git forge-based
>> contributions, and against mailing list-based patches.
>>
>> ".mailmap" can be used to mitigate this issue, per gitmailmap(5); it'd
>> be better just not to permit such mangled "From:" fields to seep into
>> the git log, in the future. :/
>>
> 
> Agreed, and I think this came up somewhere last year perhaps? Mike
> Kinney (cc'ed) might remember if that went anywhere, but the idea was
> for PatchCheck.py (which is also used in CI) to reject patches using
> an email address in this format.

Oh, great idea. When CI runs PatchCheck.py on the final "push" PR, that
would definitely catch this issue just in time!

> 
> Note that git am does support a 'From: ' header as the first line of
> the commit log, and will use it correctly to supersede the From:
> header in the SMTP envelope.

OTOH, that doesn't help in this case, IIUC. When the poster originally
formats and sends the patch, their gitconfig says
user.email=foobar@example.com, and the author meta-datum on the patch
most likely *also* says foobar@example.com. (I.e., they are formatting a
patch they have authored themselves.) Therefore
git-format-patch/git-send-email have no reason to include an explicit
"From:" line at the top of the commit message body. I agree that
"From:", if present, mitigates the issue, but in most cases, I reckon,
it's not present.

Laszlo



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113445): https://edk2.groups.io/g/devel/message/113445
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Michael Brown]

On 09/01/2024 12:13, Laszlo Ersek wrote:
> On 1/9/24 11:45, Ard Biesheuvel wrote:
>> Note that git am does support a 'From: ' header as the first line of
>> the commit log, and will use it correctly to supersede the From:
>> header in the SMTP envelope.
> 
> OTOH, that doesn't help in this case, IIUC. When the poster originally
> formats and sends the patch, their gitconfig says
> user.email=foobar@example.com, and the author meta-datum on the patch
> most likely *also* says foobar@example.com. (I.e., they are formatting a
> patch they have authored themselves.) Therefore
> git-format-patch/git-send-email have no reason to include an explicit
> "From:" line at the top of the commit message body. I agree that
> "From:", if present, mitigates the issue, but in most cases, I reckon,
> it's not present.

Is there a way to configure git to force git-format-patch to 
unconditionally include the inline "From:" header?  I tried:

   git config format.forceInBodyFrom true

which is described in the man page as "may help if the mailing list 
software mangles the sender’s identity", but it seems to have an effect 
only if "--from" is also specified.

Thanks,

Michael



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113446): https://edk2.groups.io/g/devel/message/113446
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-

Re: [edk2-devel] Updates to .mailmap needed for Jeff Brasen, Jake Garver, Joey Vagades and Michael Roth?

[Laszlo Ersek]

On 1/9/24 13:28, Michael Brown wrote:
> On 09/01/2024 12:13, Laszlo Ersek wrote:
>> On 1/9/24 11:45, Ard Biesheuvel wrote:
>>> Note that git am does support a 'From: ' header as the first line of
>>> the commit log, and will use it correctly to supersede the From:
>>> header in the SMTP envelope.
>>
>> OTOH, that doesn't help in this case, IIUC. When the poster originally
>> formats and sends the patch, their gitconfig says
>> user.email=foobar@example.com, and the author meta-datum on the patch
>> most likely *also* says foobar@example.com. (I.e., they are formatting a
>> patch they have authored themselves.) Therefore
>> git-format-patch/git-send-email have no reason to include an explicit
>> "From:" line at the top of the commit message body. I agree that
>> "From:", if present, mitigates the issue, but in most cases, I reckon,
>> it's not present.
> 
> Is there a way to configure git to force git-format-patch to
> unconditionally include the inline "From:" header?  I tried:
> 
>   git config format.forceInBodyFrom true
> 
> which is described in the man page as "may help if the mailing list
> software mangles the sender’s identity", but it seems to have an effect
> only if "--from" is also specified.

That still sounds great; I (and I expect many others) use alias(es)
around git-format-patch anyway (because of [1] eg.), so wiring "--from"
into that could work. (Not that I personally need this quirk right at
the moment.)

[1]
https://github.com/tianocore/tianocore.github.io/wiki/Laszlo%27s-unkempt-git-guide-for-edk2-contributors-and-maintainers#contrib-23

What confuses me is that git-format-patch(1) specifically advises
against the "--from" option "if you are feeding the result to git
send-email". Huh.

Thanks!
Laszlo



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#113448): https://edk2.groups.io/g/devel/message/113448
Mute This Topic: https://groups.io/mt/103534194/7686176
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/leave/12367111/7686176/1913456212/xyzzy [rebecca@openfw.io]
-=-=-=-=-=-=-=-=-=-=-=-