MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
From: Bret Barkelew <Bret.Barkelew@microsoft.com>
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901
The original logic is ASSERT if fail to create HOB. But
that doesn't make sense for release version. So it is required
to set the Buffer to null to indicate the failure.
Cc: Jian J Wang <jian.j.wang@intel.com>
Cc: Hao Wu <hao.a.wu@intel.com>
Cc: Ray Ni <ray.ni@intel.com>
Cc: Star Zeng <star.zeng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Sean Brogan <sean.brogan@microsoft.com>
Cc: Michael Turner <Michael.Turner@microsoft.com>
Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>
Signed-off-by: Zhichao Gao <zhichao.gao@intel.com>
---
MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
index 42f79ab076..37b0cfa3cf 100644
--- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
+++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c
@@ -802,7 +802,12 @@ PeiAllocatePool (
(VOID **)&Hob
);
ASSERT_EFI_ERROR (Status);
- *Buffer = Hob+1;
+
+ if (EFI_ERROR (Status)) {
+ *Buffer = NULL;
+ } else {
+ *Buffer = Hob+1;
+ }
return Status;
}
--
2.21.0.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#42253): https://edk2.groups.io/g/devel/message/42253
Mute This Topic: https://groups.io/mt/32038027/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Hi Zhichao, On 06/12/19 06:50, Gao, Zhichao wrote: > From: Bret Barkelew <Bret.Barkelew@microsoft.com> > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901 > > The original logic is ASSERT if fail to create HOB. But > that doesn't make sense for release version. So it is required > to set the Buffer to null to indicate the failure. this patch may or may not be worthwhile; that's for the PEI Core maintainers to evaluate. Either way, the subject line is completely useless. "Substantial change" means nothing at all. Please write a subject line that reflects what this patch *actually does*. For example: MdeModulePkg/PeiMain: PeiAllocatePool: output NULL if HOB creation fails (72 characters). Thanks Laszlo > Cc: Jian J Wang <jian.j.wang@intel.com> > Cc: Hao Wu <hao.a.wu@intel.com> > Cc: Ray Ni <ray.ni@intel.com> > Cc: Star Zeng <star.zeng@intel.com> > Cc: Liming Gao <liming.gao@intel.com> > Cc: Sean Brogan <sean.brogan@microsoft.com> > Cc: Michael Turner <Michael.Turner@microsoft.com> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com> > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> > --- > MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > index 42f79ab076..37b0cfa3cf 100644 > --- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > +++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > @@ -802,7 +802,12 @@ PeiAllocatePool ( > (VOID **)&Hob > ); > ASSERT_EFI_ERROR (Status); > - *Buffer = Hob+1; > + > + if (EFI_ERROR (Status)) { > + *Buffer = NULL; > + } else { > + *Buffer = Hob+1; > + } > > return Status; > } > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42272): https://edk2.groups.io/g/devel/message/42272 Mute This Topic: https://groups.io/mt/32038027/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
> -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Laszlo Ersek > Sent: Wednesday, June 12, 2019 4:34 PM > To: devel@edk2.groups.io; Gao, Zhichao > Cc: Bret Barkelew; Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming; > Sean Brogan; Michael Turner > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial > change for PeiAllocatePool > > Hi Zhichao, > > On 06/12/19 06:50, Gao, Zhichao wrote: > > From: Bret Barkelew <Bret.Barkelew@microsoft.com> > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901 > > > > The original logic is ASSERT if fail to create HOB. But > > that doesn't make sense for release version. So it is required > > to set the Buffer to null to indicate the failure. > > this patch may or may not be worthwhile; that's for the PEI Core > maintainers to evaluate. Looks to me like a valid enhancement for error handling. Liming, Do you have any comment on this one? Best Regards, Hao Wu > > Either way, the subject line is completely useless. "Substantial change" > means nothing at all. Please write a subject line that reflects what > this patch *actually does*. > > For example: > > MdeModulePkg/PeiMain: PeiAllocatePool: output NULL if HOB creation fails > > (72 characters). > > Thanks > Laszlo > > > Cc: Jian J Wang <jian.j.wang@intel.com> > > Cc: Hao Wu <hao.a.wu@intel.com> > > Cc: Ray Ni <ray.ni@intel.com> > > Cc: Star Zeng <star.zeng@intel.com> > > Cc: Liming Gao <liming.gao@intel.com> > > Cc: Sean Brogan <sean.brogan@microsoft.com> > > Cc: Michael Turner <Michael.Turner@microsoft.com> > > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com> > > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> > > --- > > MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > index 42f79ab076..37b0cfa3cf 100644 > > --- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > +++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > @@ -802,7 +802,12 @@ PeiAllocatePool ( > > (VOID **)&Hob > > ); > > ASSERT_EFI_ERROR (Status); > > - *Buffer = Hob+1; > > + > > + if (EFI_ERROR (Status)) { > > + *Buffer = NULL; > > + } else { > > + *Buffer = Hob+1; > > + } > > > > return Status; > > } > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42528): https://edk2.groups.io/g/devel/message/42528 Mute This Topic: https://groups.io/mt/32038027/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
>-----Original Message----- >From: Wu, Hao A >Sent: Tuesday, June 18, 2019 1:15 PM >To: devel@edk2.groups.io; lersek@redhat.com; Gao, Zhichao ><zhichao.gao@intel.com>; Gao, Liming <liming.gao@intel.com> >Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>; Wang, Jian J ><jian.j.wang@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star ><star.zeng@intel.com>; Sean Brogan <sean.brogan@microsoft.com>; Michael >Turner <Michael.Turner@microsoft.com> >Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial >change for PeiAllocatePool > >> -----Original Message----- >> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of >> Laszlo Ersek >> Sent: Wednesday, June 12, 2019 4:34 PM >> To: devel@edk2.groups.io; Gao, Zhichao >> Cc: Bret Barkelew; Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, Liming; >> Sean Brogan; Michael Turner >> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial >> change for PeiAllocatePool >> >> Hi Zhichao, >> >> On 06/12/19 06:50, Gao, Zhichao wrote: >> > From: Bret Barkelew <Bret.Barkelew@microsoft.com> >> > >> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901 >> > >> > The original logic is ASSERT if fail to create HOB. But >> > that doesn't make sense for release version. So it is required >> > to set the Buffer to null to indicate the failure. >> >> this patch may or may not be worthwhile; that's for the PEI Core >> maintainers to evaluate. > > >Looks to me like a valid enhancement for error handling. > >Liming, >Do you have any comment on this one? > I agree the code change. With subject update, Reviewed-by: Liming Gao <liming.gao@intel.com> >Best Regards, >Hao Wu > > >> >> Either way, the subject line is completely useless. "Substantial change" >> means nothing at all. Please write a subject line that reflects what >> this patch *actually does*. >> >> For example: >> >> MdeModulePkg/PeiMain: PeiAllocatePool: output NULL if HOB creation fails >> >> (72 characters). >> >> Thanks >> Laszlo >> >> > Cc: Jian J Wang <jian.j.wang@intel.com> >> > Cc: Hao Wu <hao.a.wu@intel.com> >> > Cc: Ray Ni <ray.ni@intel.com> >> > Cc: Star Zeng <star.zeng@intel.com> >> > Cc: Liming Gao <liming.gao@intel.com> >> > Cc: Sean Brogan <sean.brogan@microsoft.com> >> > Cc: Michael Turner <Michael.Turner@microsoft.com> >> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com> >> > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> >> > --- >> > MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++- >> > 1 file changed, 6 insertions(+), 1 deletion(-) >> > >> > diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c >> b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c >> > index 42f79ab076..37b0cfa3cf 100644 >> > --- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c >> > +++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c >> > @@ -802,7 +802,12 @@ PeiAllocatePool ( >> > (VOID **)&Hob >> > ); >> > ASSERT_EFI_ERROR (Status); >> > - *Buffer = Hob+1; >> > + >> > + if (EFI_ERROR (Status)) { >> > + *Buffer = NULL; >> > + } else { >> > + *Buffer = Hob+1; >> > + } >> > >> > return Status; >> > } >> > >> >> >> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42529): https://edk2.groups.io/g/devel/message/42529 Mute This Topic: https://groups.io/mt/32038027/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
> -----Original Message----- > From: Gao, Liming > Sent: Tuesday, June 18, 2019 1:16 PM > To: Wu, Hao A; devel@edk2.groups.io; lersek@redhat.com; Gao, Zhichao > Cc: Bret Barkelew; Wang, Jian J; Ni, Ray; Zeng, Star; Sean Brogan; Michael > Turner > Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial > change for PeiAllocatePool > > > >-----Original Message----- > >From: Wu, Hao A > >Sent: Tuesday, June 18, 2019 1:15 PM > >To: devel@edk2.groups.io; lersek@redhat.com; Gao, Zhichao > ><zhichao.gao@intel.com>; Gao, Liming <liming.gao@intel.com> > >Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>; Wang, Jian J > ><jian.j.wang@intel.com>; Ni, Ray <ray.ni@intel.com>; Zeng, Star > ><star.zeng@intel.com>; Sean Brogan <sean.brogan@microsoft.com>; > Michael > >Turner <Michael.Turner@microsoft.com> > >Subject: RE: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial > >change for PeiAllocatePool > > > >> -----Original Message----- > >> From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > >> Laszlo Ersek > >> Sent: Wednesday, June 12, 2019 4:34 PM > >> To: devel@edk2.groups.io; Gao, Zhichao > >> Cc: Bret Barkelew; Wang, Jian J; Wu, Hao A; Ni, Ray; Zeng, Star; Gao, > Liming; > >> Sean Brogan; Michael Turner > >> Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial > >> change for PeiAllocatePool > >> > >> Hi Zhichao, > >> > >> On 06/12/19 06:50, Gao, Zhichao wrote: > >> > From: Bret Barkelew <Bret.Barkelew@microsoft.com> > >> > > >> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901 > >> > > >> > The original logic is ASSERT if fail to create HOB. But > >> > that doesn't make sense for release version. So it is required > >> > to set the Buffer to null to indicate the failure. > >> > >> this patch may or may not be worthwhile; that's for the PEI Core > >> maintainers to evaluate. > > > > > >Looks to me like a valid enhancement for error handling. > > > >Liming, > >Do you have any comment on this one? > > > I agree the code change. With subject update, Reviewed-by: Liming Gao > <liming.gao@intel.com> Acked-by: Hao A Wu <hao.a.wu@intel.com> Pushed via commit 8797683f96. (With subject updated.) Best Regards, Hao Wu > > > >Best Regards, > >Hao Wu > > > > > >> > >> Either way, the subject line is completely useless. "Substantial change" > >> means nothing at all. Please write a subject line that reflects what > >> this patch *actually does*. > >> > >> For example: > >> > >> MdeModulePkg/PeiMain: PeiAllocatePool: output NULL if HOB creation > fails > >> > >> (72 characters). > >> > >> Thanks > >> Laszlo > >> > >> > Cc: Jian J Wang <jian.j.wang@intel.com> > >> > Cc: Hao Wu <hao.a.wu@intel.com> > >> > Cc: Ray Ni <ray.ni@intel.com> > >> > Cc: Star Zeng <star.zeng@intel.com> > >> > Cc: Liming Gao <liming.gao@intel.com> > >> > Cc: Sean Brogan <sean.brogan@microsoft.com> > >> > Cc: Michael Turner <Michael.Turner@microsoft.com> > >> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com> > >> > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> > >> > --- > >> > MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++- > >> > 1 file changed, 6 insertions(+), 1 deletion(-) > >> > > >> > diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > >> b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > >> > index 42f79ab076..37b0cfa3cf 100644 > >> > --- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > >> > +++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > >> > @@ -802,7 +802,12 @@ PeiAllocatePool ( > >> > (VOID **)&Hob > >> > ); > >> > ASSERT_EFI_ERROR (Status); > >> > - *Buffer = Hob+1; > >> > + > >> > + if (EFI_ERROR (Status)) { > >> > + *Buffer = NULL; > >> > + } else { > >> > + *Buffer = Hob+1; > >> > + } > >> > > >> > return Status; > >> > } > >> > > >> > >> > >> -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42728): https://edk2.groups.io/g/devel/message/42728 Mute This Topic: https://groups.io/mt/32038027/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
Thanks for the comments. Your example makes the purpose clear. I would update the subject like that. Thanks, Zhichao > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of > Laszlo Ersek > Sent: Wednesday, June 12, 2019 4:34 PM > To: devel@edk2.groups.io; Gao, Zhichao <zhichao.gao@intel.com> > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com>; Wang, Jian J > <jian.j.wang@intel.com>; Wu, Hao A <hao.a.wu@intel.com>; Ni, Ray > <ray.ni@intel.com>; Zeng, Star <star.zeng@intel.com>; Gao, Liming > <liming.gao@intel.com>; Sean Brogan <sean.brogan@microsoft.com>; > Michael Turner <Michael.Turner@microsoft.com> > Subject: Re: [edk2-devel] [PATCH] MdeModulePkg/PeiMain: Substantial > change for PeiAllocatePool > > Hi Zhichao, > > On 06/12/19 06:50, Gao, Zhichao wrote: > > From: Bret Barkelew <Bret.Barkelew@microsoft.com> > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=1901 > > > > The original logic is ASSERT if fail to create HOB. But that doesn't > > make sense for release version. So it is required to set the Buffer to > > null to indicate the failure. > > this patch may or may not be worthwhile; that's for the PEI Core maintainers > to evaluate. > > Either way, the subject line is completely useless. "Substantial change" > means nothing at all. Please write a subject line that reflects what this patch > *actually does*. > > For example: > > MdeModulePkg/PeiMain: PeiAllocatePool: output NULL if HOB creation fails > > (72 characters). > > Thanks > Laszlo > > > Cc: Jian J Wang <jian.j.wang@intel.com> > > Cc: Hao Wu <hao.a.wu@intel.com> > > Cc: Ray Ni <ray.ni@intel.com> > > Cc: Star Zeng <star.zeng@intel.com> > > Cc: Liming Gao <liming.gao@intel.com> > > Cc: Sean Brogan <sean.brogan@microsoft.com> > > Cc: Michael Turner <Michael.Turner@microsoft.com> > > Cc: Bret Barkelew <Bret.Barkelew@microsoft.com> > > Signed-off-by: Zhichao Gao <zhichao.gao@intel.com> > > --- > > MdeModulePkg/Core/Pei/Memory/MemoryServices.c | 7 ++++++- > > 1 file changed, 6 insertions(+), 1 deletion(-) > > > > diff --git a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > index 42f79ab076..37b0cfa3cf 100644 > > --- a/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > +++ b/MdeModulePkg/Core/Pei/Memory/MemoryServices.c > > @@ -802,7 +802,12 @@ PeiAllocatePool ( > > (VOID **)&Hob > > ); > > ASSERT_EFI_ERROR (Status); > > - *Buffer = Hob+1; > > + > > + if (EFI_ERROR (Status)) { > > + *Buffer = NULL; > > + } else { > > + *Buffer = Hob+1; > > + } > > > > return Status; > > } > > > > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#42318): https://edk2.groups.io/g/devel/message/42318 Mute This Topic: https://groups.io/mt/32038027/1787277 Group Owner: devel+owner@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org] -=-=-=-=-=-=-=-=-=-=-=-
© 2016 - 2024 Red Hat, Inc.