yuzu/breakpad
1
0
Fork 0
mirror of https://github.com/yuzu-emu/breakpad.git synced 2025-07-03 14:28:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix minidump on ChromeOS

Browse source 
Chrome somehow changed the memory mapping with hugepage enabled.
This makes the hack in CrOSPostProcessMappings more general.

BUG=chromium:793452
TEST=with this patch on Chromium,
         minidump_dump *dmp shows the right information on chrome

Change-Id: Iff58bf1a712a6e66cbd2d813422db7549a3080a5
Reviewed-on: https://chromium-review.googlesource.com/837963
Reviewed-by: Mark Mentovai <mark@chromium.org>
This commit is contained in:
Yunlian Jiang 2017-12-20 12:16:34 -08:00 committed by Mark Mentovai
parent c283630201
commit 4af3e83b10
1 changed files with 25 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/client/linux/minidump_writer/linux_dumper.cc
View file

@ -230,20 +230,21 @@ void CrOSPostProcessMappings(wasteful_vector<MappingInfo*>& mappings) {
l = m + 1; l = m + 1;
} }
// Try to merge segments into the first. // Shows the range that contains the entry point is
if (next < mappings.size()) { // [first_start_addr, first_end_addr)
TryRecoverMappings(mappings[0], mappings[next]); size_t first_start_addr = mappings[0]->start_addr;
if (next - 1 > 0) size_t first_end_addr = mappings[0]->start_addr + mappings[0]->size;
TryRecoverMappings(mappings[next - 1], mappings[0], mappings[next]);
} // Put the out-of-order segment in order.
std::rotate(mappings.begin(), mappings.begin() + 1, mappings.begin() + next);
// Iterate through normal, sorted cases. // Iterate through normal, sorted cases.
// Normal case 1. // Normal case 1.
for (size_t i = 1; i < mappings.size() - 1; i++) for (size_t i = 0; i < mappings.size() - 1; i++)
TryRecoverMappings(mappings[i], mappings[i + 1]); TryRecoverMappings(mappings[i], mappings[i + 1]);
// Normal case 2. // Normal case 2.
for (size_t i = 1; i < mappings.size() - 2; i++) for (size_t i = 0; i < mappings.size() - 2; i++)
TryRecoverMappings(mappings[i], mappings[i + 1], mappings[i + 2]); TryRecoverMappings(mappings[i], mappings[i + 1], mappings[i + 2]);
// Collect merged (size == 0) segments. // Collect merged (size == 0) segments.
@ -252,6 +253,22 @@ void CrOSPostProcessMappings(wasteful_vector<MappingInfo*>& mappings) {
if (mappings[e]->size > 0) if (mappings[e]->size > 0)
mappings[f++] = mappings[e]; mappings[f++] = mappings[e];
mappings.resize(f); mappings.resize(f);
// The entry point is in the first mapping. We want to find the location
// of the entry point after merging segment. To do this, we want to find
// the mapping that covers the first mapping from the original mapping list.
// If the mapping is not in the beginning, we move it to the begining via
// a right rotate by using reverse iterators.
for (l = 0; l < mappings.size(); l++) {
if (mappings[l]->start_addr <= first_start_addr
&& (mappings[l]->start_addr + mappings[l]->size >= first_end_addr))
break;
}
if (l > 0) {
r = mappings.size();
std::rotate(mappings.rbegin() + r - l - 1, mappings.rbegin() + r - l,
mappings.rend());
}
} }
#endif // __CHROMEOS__ #endif // __CHROMEOS__