joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge "Move Interface stats map dump to NetworkStatsService"

Browse source
This commit is contained in:
Motomu Utsumi 2022-10-07 10:27:04 +00:00 • committed by Gerrit Code Review
commit 480ddf35f4
4 changed files with 61 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

32
service-t/src/com/android/server/net/NetworkStatsService.java
View file

@ -254,6 +254,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
"/sys/fs/bpf/netd_shared/map_netd_stats_map_A";
private static final String STATS_MAP_B_PATH =
"/sys/fs/bpf/netd_shared/map_netd_stats_map_B";
private static final String IFACE_STATS_MAP_PATH =
"/sys/fs/bpf/netd_shared/map_netd_iface_stats_map";
/**
* DeviceConfig flag used to indicate whether the files should be stored in the apex data
@ -413,6 +415,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
private final IBpfMap<StatsMapKey, StatsMapValue> mStatsMapA;
private final IBpfMap<StatsMapKey, StatsMapValue> mStatsMapB;
private final IBpfMap<UidStatsMapKey, StatsMapValue> mAppUidStatsMap;
private final IBpfMap<S32, StatsMapValue> mIfaceStatsMap;
/** Data layer operation counters for splicing into other structures. */
private NetworkStats mUidOperations = new NetworkStats(0L, 10);
@ -592,6 +595,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
mStatsMapA = mDeps.getStatsMapA();
mStatsMapB = mDeps.getStatsMapB();
mAppUidStatsMap = mDeps.getAppUidStatsMap();
mIfaceStatsMap = mDeps.getIfaceStatsMap();
// TODO: Remove bpfNetMaps creation and always start SkDestroyListener
// Following code is for the experiment to verify the SkDestroyListener refactoring. Based
@ -795,6 +799,16 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
}
}
/** Gets interface stats map */
public IBpfMap<S32, StatsMapValue> getIfaceStatsMap() {
try {
return new BpfMap<S32, StatsMapValue>(IFACE_STATS_MAP_PATH,
BpfMap.BPF_F_RDWR, S32.class, StatsMapValue.class);
} catch (ErrnoException e) {
throw new IllegalStateException("Failed to open interface stats map", e);
}
}
/** Gets whether the build is userdebug. */
public boolean isDebuggable() {
return Build.isDebuggable();
@ -2763,6 +2777,7 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
dumpAppUidStatsMapLocked(pw);
dumpStatsMapLocked(mStatsMapA, pw, "mStatsMapA");
dumpStatsMapLocked(mStatsMapB, pw, "mStatsMapB");
dumpIfaceStatsMapLocked(pw);
pw.decreaseIndent();
}
}
@ -2850,6 +2865,8 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
pw.println("mAppUidStatsMap: " + getMapStatus(mAppUidStatsMap, APP_UID_STATS_MAP_PATH));
pw.println("mStatsMapA: " + getMapStatus(mStatsMapA, STATS_MAP_A_PATH));
pw.println("mStatsMapB: " + getMapStatus(mStatsMapB, STATS_MAP_B_PATH));
// mIfaceStatsMap is always not null but dump status to be consistent with other maps.
pw.println("mIfaceStatsMap: " + getMapStatus(mIfaceStatsMap, IFACE_STATS_MAP_PATH));
}
@GuardedBy("mStatsLock")
@ -2909,6 +2926,21 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
});
}
@GuardedBy("mStatsLock")
private void dumpIfaceStatsMapLocked(final IndentingPrintWriter pw) {
BpfDump.dumpMap(mIfaceStatsMap, pw, "mIfaceStatsMap",
"ifaceIndex ifaceName rxBytes rxPackets txBytes txPackets",
(key, value) -> {
final String ifName = mInterfaceMapUpdater.getIfNameByIndex(key.val);
return key.val + " "
+ (ifName != null ? ifName : "unknown") + " "
+ value.rxBytes + " "
+ value.rxPackets + " "
+ value.txBytes + " "
+ value.txPackets;
});
}
private NetworkStats readNetworkStatsSummaryDev() {
try {
return mStatsFactory.readNetworkStatsSummaryDev();

19
service/native/TrafficController.cpp
View file

@ -647,25 +647,6 @@ void TrafficController::dump(int fd, bool verbose) {
dw.println("mCookieTagMap print end with error: %s", res.error().message().c_str());
}
// Print ifaceStatsMap content
std::string ifaceStatsHeader = StringPrintf("ifaceIndex ifaceName rxBytes rxPackets txBytes"
" txPackets");
dumpBpfMap("mIfaceStatsMap:", dw, ifaceStatsHeader);
const auto printIfaceStatsInfo = [&dw, this](const uint32_t& key, const StatsValue& value,
const BpfMap<uint32_t, StatsValue>&) {
auto ifname = mIfaceIndexNameMap.readValue(key);
if (!ifname.ok()) {
ifname = IfaceValue{"unknown"};
}
dw.println("%u %s %" PRIu64 " %" PRIu64 " %" PRIu64 " %" PRIu64, key, ifname.value().name,
value.rxBytes, value.rxPackets, value.txBytes, value.txPackets);
return base::Result<void>();
};
res = mIfaceStatsMap.iterateWithValue(printIfaceStatsInfo);
if (!res.ok()) {
dw.println("mIfaceStatsMap print end with error: %s", res.error().message().c_str());
}
dw.blankline();
}

3
service/native/TrafficControllerTest.cpp
View file

@ -805,8 +805,7 @@ TEST_F(TrafficControllerTest, dumpsysInvalidMaps) {
"Read value of map -1 failed: Bad file descriptor";
std::vector<std::string> expectedLines = {
fmt::format("mCookieTagMap {}", kErrIterate),
fmt::format("mIfaceStatsMap {}", kErrIterate)};
fmt::format("mCookieTagMap {}", kErrIterate)};
EXPECT_TRUE(expectDumpsysContains(expectedLines));
}

29
tests/unit/java/com/android/server/net/NetworkStatsServiceTest.java
View file

@ -263,7 +263,8 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
StatsMapValue.class);
private TestBpfMap<UidStatsMapKey, StatsMapValue> mAppUidStatsMap = new TestBpfMap<>(
UidStatsMapKey.class, StatsMapValue.class);
private TestBpfMap<S32, StatsMapValue> mIfaceStatsMap = new TestBpfMap<>(
S32.class, StatsMapValue.class);
private NetworkStatsService mService;
private INetworkStatsSession mSession;
private AlertObserver mAlertObserver;
@ -502,6 +503,11 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
return mAppUidStatsMap;
}
@Override
public IBpfMap<S32, StatsMapValue> getIfaceStatsMap() {
return mIfaceStatsMap;
}
@Override
public boolean isDebuggable() {
return mIsDebuggable == Boolean.TRUE;
@ -2552,4 +2558,25 @@ public class NetworkStatsServiceTest extends NetworkStatsBaseTest {
doReturn(null).when(mBpfInterfaceMapUpdater).getIfNameByIndex(10 /* index */);
doTestDumpStatsMap("unknown");
}
void doTestDumpIfaceStatsMap(final String expectedIfaceName) throws Exception {
mIfaceStatsMap.insertEntry(new S32(10), new StatsMapValue(3, 3000, 3, 3000));
final String dump = getDump();
assertDumpContains(dump, "mIfaceStatsMap: OK");
assertDumpContains(dump, "ifaceIndex ifaceName rxBytes rxPackets txBytes txPackets");
assertDumpContains(dump, "10 " + expectedIfaceName + " 3000 3 3000 3");
}
@Test
public void testDumpIfaceStatsMap() throws Exception {
doReturn("wlan0").when(mBpfInterfaceMapUpdater).getIfNameByIndex(10 /* index */);
doTestDumpIfaceStatsMap("wlan0");
}
@Test
public void testDumpIfaceStatsMapUnknownInterface() throws Exception {
doReturn(null).when(mBpfInterfaceMapUpdater).getIfNameByIndex(10 /* index */);
doTestDumpIfaceStatsMap("unknown");
}
}