Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16353980 authored by Connor O'Brien's avatar Connor O'Brien Committed by Automerger Merge Worker
Browse files

Merge "libtimeinstate: check for invalid buckets when reading map" am: 3d67213a 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1468306

Change-Id: Iec76bcbf94f6b9203723a7e86cfee9933709bdaf
parents 497493d2 3d67213a

libs/cputimeinstate/cputimeinstate.cpp

+1 −0
Original line number Diff line number Diff line
@@ -425,6 +425,7 @@ std::optional<std::unordered_map<uint32_t, concurrent_time_t>> getUidsUpdatedCon 


    uint64_t newLastUpdate = lastUpdate ? *lastUpdate : 0;

    do {

        if (key.bucket > (gNCpus - 1) / CPUS_PER_ENTRY) return {};

        if (lastUpdate) {

            auto uidUpdated = uidUpdatedSince(key.uid, *lastUpdate, &newLastUpdate);

            if (!uidUpdated.has_value()) return {};

libs/cputimeinstate/testtimeinstate.cpp

+22 −0
Original line number Diff line number Diff line
@@ -387,6 +387,28 @@ TEST(TimeInStateTest, AllUidConcurrentTimesSanityCheck) { 
    }

}



TEST(TimeInStateTest, AllUidConcurrentTimesFailsOnInvalidBucket) {

    uint32_t uid = 0;

    {

        // Find an unused UID

        auto map = getUidsConcurrentTimes();

        ASSERT_TRUE(map.has_value());

        ASSERT_FALSE(map->empty());

        for (const auto &kv : *map) uid = std::max(uid, kv.first);

        ++uid;

    }

    android::base::unique_fd fd{

        bpf_obj_get(BPF_FS_PATH "map_time_in_state_uid_concurrent_times_map")};

    ASSERT_GE(fd, 0);

    uint32_t nCpus = get_nprocs_conf();

    uint32_t maxBucket = (nCpus - 1) / CPUS_PER_ENTRY;

    time_key_t key = {.uid = uid, .bucket = maxBucket + 1};

    std::vector<concurrent_val_t> vals(nCpus);

    ASSERT_FALSE(writeToMapEntry(fd, &key, vals.data(), BPF_NOEXIST));

    EXPECT_FALSE(getUidsConcurrentTimes().has_value());

    ASSERT_FALSE(deleteMapEntry(fd, &key));

}



TEST(TimeInStateTest, AllUidTimesConsistent) {

    auto tisMap = getUidsCpuFreqTimes();

    ASSERT_TRUE(tisMap.has_value());