Skip to content

Null check each cpuinfo_get_processor call. #319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Null check each cpuinfo_get_processor call. #319

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions ruy/cpuinfo.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ void QueryCacheParams(CpuCacheParams* cache_params) {
int local_cache_size = 0;
int last_level_cache_size = 0;
const cpuinfo_processor* processor = cpuinfo_get_processor(i);
if (!processor) continue;
// Loop over cache levels. Ignoring L4 for now: it seems that in CPUs that
// have L4, we would still prefer to stay in lower-latency L3.
for (const cpuinfo_cache* cache :
Expand All @@ -56,14 +57,16 @@ void QueryCacheParams(CpuCacheParams* cache_params) {
continue; // continue, not break, it is possible to have L1+L3 but no
// L2.
}
if (!cache->processor_count) {
if (!cache->processor_count || !cache->processor_start) {
continue; // crashes from Chrome on Android suggests that might happen?
}
const bool is_local =
cpuinfo_get_processor(cache->processor_start)->core ==
cpuinfo_get_processor(cache->processor_start +
cache->processor_count - 1)
->core;
const cpuinfo_processor* start_processor =
cpuinfo_get_processor(cache->processor_start);
const cpuinfo_processor* end_processor = cpuinfo_get_processor(
cache->processor_start + cache->processor_count - 1);
if (!start_processor || !end_processor) continue;
const bool is_local = start_processor->core == end_processor->core;

if (is_local) {
local_cache_size = cache->size;
}
Expand Down