Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
btwise
OpenCorePKG_MOD
提交
2d824fbc
O
OpenCorePKG_MOD
项目概览
btwise
/
OpenCorePKG_MOD
通知
26
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
OpenCorePKG_MOD
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
2d824fbc
编写于
4月 04, 2020
作者:
V
vit9696
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
OcMemoryLib: Fix corruption after ShrinkMemoryMap and add OcDeduplicateDescriptors
上级
58673b0c
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
107 addition
and
2 deletion
+107
-2
Include/Library/OcMemoryLib.h
Include/Library/OcMemoryLib.h
+21
-1
Library/OcMemoryLib/MemoryMap.c
Library/OcMemoryLib/MemoryMap.c
+86
-1
未找到文件。
Include/Library/OcMemoryLib.h
浏览文件 @
2d824fbc
...
...
@@ -140,14 +140,34 @@ OcSortMemoryMap (
@param[in,out] MemoryMapSize Memory map size in bytes, updated on shrink.
@param[in,out] MemoryMap Memory map to shrink.
@param[in] DescriptorSize Memory map descriptor size in bytes.
@retval EFI_SUCCESS on success.
@retval EFI_NOT_FOUND when cannot join anything.
**/
VOID
EFI_STATUS
OcShrinkMemoryMap
(
IN
OUT
UINTN
*
MemoryMapSize
,
IN
OUT
EFI_MEMORY_DESCRIPTOR
*
MemoryMap
,
IN
UINTN
DescriptorSize
);
/**
Deduplicate memory descriptors. Requires sorted entry list.
@param[in,out] EntryCount Memory map size in entries, updated on shrink.
@param[in,out] MemoryMap Memory map to shrink.
@param[in] DescriptorSize Memory map descriptor size in bytes.
@retval EFI_SUCCESS on success.
@retval EFI_NOT_FOUND when cannot join anything.
**/
EFI_STATUS
OcDeduplicateDescriptors
(
IN
OUT
UINTN
*
EntryCount
,
IN
OUT
EFI_MEMORY_DESCRIPTOR
*
MemoryMap
,
IN
UINTN
DescriptorSize
);
/**
Check range allocation compatibility callback.
...
...
Library/OcMemoryLib/MemoryMap.c
浏览文件 @
2d824fbc
...
...
@@ -257,13 +257,14 @@ OcSortMemoryMap (
}
}
VOID
EFI_STATUS
OcShrinkMemoryMap
(
IN
OUT
UINTN
*
MemoryMapSize
,
IN
OUT
EFI_MEMORY_DESCRIPTOR
*
MemoryMap
,
IN
UINTN
DescriptorSize
)
{
EFI_STATUS
Status
;
UINTN
SizeFromDescToEnd
;
UINT64
Bytes
;
EFI_MEMORY_DESCRIPTOR
*
PrevDesc
;
...
...
@@ -272,6 +273,12 @@ OcShrinkMemoryMap (
BOOLEAN
CanBeJoinedRt
;
BOOLEAN
HasEntriesToRemove
;
Status
=
EFI_NOT_FOUND
;
if
(
*
MemoryMapSize
<=
DescriptorSize
)
{
return
Status
;
}
PrevDesc
=
MemoryMap
;
Desc
=
NEXT_MEMORY_DESCRIPTOR
(
PrevDesc
,
DescriptorSize
);
SizeFromDescToEnd
=
*
MemoryMapSize
-
DescriptorSize
;
...
...
@@ -318,9 +325,11 @@ OcShrinkMemoryMap (
PrevDesc
->
Type
=
EfiConventionalMemory
;
PrevDesc
->
NumberOfPages
+=
Desc
->
NumberOfPages
;
HasEntriesToRemove
=
TRUE
;
Status
=
EFI_SUCCESS
;
}
else
if
(
CanBeJoinedRt
)
{
PrevDesc
->
NumberOfPages
+=
Desc
->
NumberOfPages
;
HasEntriesToRemove
=
TRUE
;
Status
=
EFI_SUCCESS
;
}
else
{
//
// Cannot be joined - we need to move to next
...
...
@@ -341,6 +350,82 @@ OcShrinkMemoryMap (
Desc
=
NEXT_MEMORY_DESCRIPTOR
(
Desc
,
DescriptorSize
);
SizeFromDescToEnd
-=
DescriptorSize
;
}
//
// Handle last entries if they were merged.
//
if
(
HasEntriesToRemove
)
{
*
MemoryMapSize
+=
DescriptorSize
;
}
return
EFI_SUCCESS
;
}
EFI_STATUS
OcDeduplicateDescriptors
(
IN
OUT
UINTN
*
EntryCount
,
IN
OUT
EFI_MEMORY_DESCRIPTOR
*
MemoryMap
,
IN
UINTN
DescriptorSize
)
{
EFI_STATUS
Status
;
UINTN
EntriesToGo
;
EFI_MEMORY_DESCRIPTOR
*
PrevDesc
;
EFI_MEMORY_DESCRIPTOR
*
Desc
;
BOOLEAN
IsDuplicate
;
BOOLEAN
HasEntriesToRemove
;
Status
=
EFI_NOT_FOUND
;
if
(
*
EntryCount
<=
1
)
{
return
Status
;
}
PrevDesc
=
MemoryMap
;
Desc
=
NEXT_MEMORY_DESCRIPTOR
(
PrevDesc
,
DescriptorSize
);
EntriesToGo
=
*
EntryCount
-
1
;
*
EntryCount
=
1
;
HasEntriesToRemove
=
FALSE
;
while
(
EntriesToGo
>
0
)
{
IsDuplicate
=
Desc
->
PhysicalStart
==
PrevDesc
->
PhysicalStart
&&
Desc
->
NumberOfPages
==
PrevDesc
->
NumberOfPages
;
if
(
IsDuplicate
)
{
//
// Two entries are duplicate, remove them.
//
Status
=
EFI_SUCCESS
;
HasEntriesToRemove
=
TRUE
;
}
else
{
//
// Not duplicates - we need to move to next
//
++
(
*
EntryCount
);
PrevDesc
=
NEXT_MEMORY_DESCRIPTOR
(
PrevDesc
,
DescriptorSize
);
if
(
HasEntriesToRemove
)
{
//
// Have same entries between PrevDesc and Desc which are replaced by PrevDesc,
// we need to copy [Desc, end of list] to PrevDesc + 1.
//
CopyMem
(
PrevDesc
,
Desc
,
EntriesToGo
*
DescriptorSize
);
Desc
=
PrevDesc
;
HasEntriesToRemove
=
FALSE
;
}
}
Desc
=
NEXT_MEMORY_DESCRIPTOR
(
Desc
,
DescriptorSize
);
--
EntriesToGo
;
}
//
// Handle last entries if they were deduplicated.
//
if
(
HasEntriesToRemove
)
{
++
(
*
EntryCount
);
}
return
Status
;
}
EFI_STATUS
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录