commit bc4a15f91f97fbfcbfdc9dc19d73226f380bc977
author Chenbo Feng <fengc@google.com> Fri May 11 19:15:15 2018 -0700
committer Chenbo Feng <fengc@google.com> Tue May 29 20:15:36 2018 -0700
tree 8870f6e47fb4e508de2aa0ac4851c4c9bd0b141a
parent 4f6c237759e8bdc3ace937ad0eaaf9be893702da

Use a separate map to store per app stats

To avoid iterating through the eBPF map to get the total stats of a
specific uid. A new bpf map called appUidStatsMap is added to the
trafficController so that TrafficStats API can directly read that map
for per uid total stats regardless of tag, counterSet and iface
information. This could make this call more efficient and solve the
possible racing problem.

Bug: 79171384
Test: netd_unit_test, libbpf_test, netd_integration_test
Change-Id: I47a4ac3466caa729c5730a498a2de226303d6b77

tests/bpf_base_test.cpp

diff --git a/tests/bpf_base_test.cpp b/tests/bpf_base_test.cpp
index fa7de0d..e023052 100644
--- a/tests/bpf_base_test.cpp
+++ b/tests/bpf_base_test.cpp
@@ -102,6 +102,33 @@
     ASSERT_EQ(ENOENT, tagResult.status().code());
 }
 
+TEST_F(BpfBasicTest, TestCloseSocketWithoutUntag) {
+    SKIP_IF_BPF_NOT_SUPPORTED;
+
+    BpfMap<uint64_t, UidTag> cookieTagMap(mapRetrieve(COOKIE_TAG_MAP_PATH, 0));
+    ASSERT_LE(0, cookieTagMap.getMap());
+    int sock = socket(AF_INET6, SOCK_STREAM, 0);
+    ASSERT_LE(0, sock);
+    uint64_t cookie = getSocketCookie(sock);
+    ASSERT_NE(NONEXISTENT_COOKIE, cookie);
+    ASSERT_EQ(0, qtaguid_tagSocket(sock, TEST_TAG, TEST_UID));
+    StatusOr<UidTag> tagResult = cookieTagMap.readValue(cookie);
+    ASSERT_TRUE(isOk(tagResult));
+    ASSERT_EQ(TEST_UID, tagResult.value().uid);
+    ASSERT_EQ(TEST_TAG, tagResult.value().tag);
+    ASSERT_EQ(0, close(sock));
+    // Check map periodically until sk destroy handler have done its job.
+    for (int i = 0; i < 10; i++) {
+        tagResult = cookieTagMap.readValue(cookie);
+        if (!isOk(tagResult)) {
+            ASSERT_EQ(ENOENT, tagResult.status().code());
+            return;
+        }
+        usleep(50);
+    }
+    FAIL() << "socket tag still exist after 500ms";
+}
+
 TEST_F(BpfBasicTest, TestChangeCounterSet) {
     SKIP_IF_BPF_NOT_SUPPORTED;
 
@@ -125,6 +152,8 @@
     ASSERT_LE(0, uidStatsMap.getMap());
     BpfMap<StatsKey, StatsValue> tagStatsMap(mapRetrieve(TAG_STATS_MAP_PATH, 0));
     ASSERT_LE(0, tagStatsMap.getMap());
+    BpfMap<uint32_t, StatsValue> appUidStatsMap(mapRetrieve(APP_UID_STATS_MAP_PATH, 0));
+    ASSERT_LE(0, appUidStatsMap.getMap());
 
     StatsKey key = {.uid = TEST_UID, .tag = TEST_TAG, .counterSet = TEST_COUNTERSET,
                     .ifaceIndex = 1};
@@ -132,10 +161,14 @@
     EXPECT_TRUE(isOk(tagStatsMap.writeValue(key, statsMapValue, BPF_ANY)));
     key.tag = 0;
     EXPECT_TRUE(isOk(uidStatsMap.writeValue(key, statsMapValue, BPF_ANY)));
+    EXPECT_TRUE(isOk(appUidStatsMap.writeValue(TEST_UID, statsMapValue, BPF_ANY)));
     ASSERT_EQ(0, qtaguid_deleteTagData(0, TEST_UID));
     StatusOr<StatsValue> statsResult = uidStatsMap.readValue(key);
     ASSERT_FALSE(isOk(statsResult));
     ASSERT_EQ(ENOENT, statsResult.status().code());
+    statsResult = appUidStatsMap.readValue(TEST_UID);
+    ASSERT_FALSE(isOk(statsResult));
+    ASSERT_EQ(ENOENT, statsResult.status().code());
     key.tag = TEST_TAG;
     statsResult = tagStatsMap.readValue(key);
     ASSERT_FALSE(isOk(statsResult));