LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge changes I289d935f,I0121a4ac am: 8366a33efa

Browse Source 
Change-Id: I7c413c9e1f2efc3aba55453c6b98bf682f3d4116
This commit is contained in:
Treehugger Robot
2020-05-28 10:55:48 +00:00
committed by Automerger Merge Worker
parent 394c0003a1 8366a33efa
commit fc00838335
3 changed files with 9 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/java/android/net/NetworkStats.java
View File

@@ -16,8 +16,6 @@
package android.net; package android.net;
import static android.os.Process.CLAT_UID;
import android.annotation.IntDef; import android.annotation.IntDef;
import android.annotation.NonNull; import android.annotation.NonNull;
import android.annotation.Nullable; import android.annotation.Nullable;
@@ -1069,11 +1067,10 @@ public final class NetworkStats implements Parcelable {
* @param baseTraffic Traffic on the base interfaces. Will be mutated. * @param baseTraffic Traffic on the base interfaces. Will be mutated.
* @param stackedTraffic Stats with traffic stacked on top of our ifaces. Will also be mutated. * @param stackedTraffic Stats with traffic stacked on top of our ifaces. Will also be mutated.
* @param stackedIfaces Mapping ipv6if -> ipv4if interface where traffic is counted on both. * @param stackedIfaces Mapping ipv6if -> ipv4if interface where traffic is counted on both.
* @param useBpfStats True if eBPF is in use.
* @hide * @hide
*/ */
public static void apply464xlatAdjustments(NetworkStats baseTraffic, public static void apply464xlatAdjustments(NetworkStats baseTraffic,
NetworkStats stackedTraffic, Map<String, String> stackedIfaces, boolean useBpfStats) { NetworkStats stackedTraffic, Map<String, String> stackedIfaces) {
// For recycling // For recycling
Entry entry = null; Entry entry = null;
for (int i = 0; i < stackedTraffic.size; i++) { for (int i = 0; i < stackedTraffic.size; i++) {
@@ -1096,12 +1093,6 @@ public final class NetworkStats implements Parcelable {
entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA; entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA;
stackedTraffic.setValues(i, entry); stackedTraffic.setValues(i, entry);
} }
// Theoretically there should be no traffic accounted to the clat daemon's uid:
// see ebpf program 'netd.c's early returns
// and iptables '-m owner --uid-owner clat -j RETURN' rules prior to accounting
// TODO: remove this - should definitely be safe once ebpf only.
baseTraffic.removeUids(new int[] {CLAT_UID});
} }
/** /**
@@ -1113,8 +1104,8 @@ public final class NetworkStats implements Parcelable {
* @param stackedIfaces Mapping ipv6if -> ipv4if interface where traffic is counted on both. * @param stackedIfaces Mapping ipv6if -> ipv4if interface where traffic is counted on both.
* @hide * @hide
*/ */
public void apply464xlatAdjustments(Map<String, String> stackedIfaces, boolean useBpfStats) { public void apply464xlatAdjustments(Map<String, String> stackedIfaces) {
apply464xlatAdjustments(this, this, stackedIfaces, useBpfStats); apply464xlatAdjustments(this, this, stackedIfaces);
} }
/** /**

10
services/core/java/com/android/server/net/NetworkStatsFactory.java
View File

@@ -152,12 +152,10 @@ public class NetworkStatsFactory {
/** /**
* Applies 464xlat adjustments with ifaces noted with {@link #noteStackedIface(String, String)}. * Applies 464xlat adjustments with ifaces noted with {@link #noteStackedIface(String, String)}.
* @see NetworkStats#apply464xlatAdjustments(NetworkStats, NetworkStats, Map, boolean) * @see NetworkStats#apply464xlatAdjustments(NetworkStats, NetworkStats, Map)
*/ */
public void apply464xlatAdjustments(NetworkStats baseTraffic, public void apply464xlatAdjustments(NetworkStats baseTraffic, NetworkStats stackedTraffic) {
NetworkStats stackedTraffic, boolean useBpfStats) { NetworkStats.apply464xlatAdjustments(baseTraffic, stackedTraffic, mStackedIfaces);
NetworkStats.apply464xlatAdjustments(baseTraffic, stackedTraffic, mStackedIfaces,
useBpfStats);
} }
public NetworkStatsFactory() { public NetworkStatsFactory() {
@@ -380,7 +378,7 @@ public class NetworkStatsFactory {
// network, the overhead is their fault. // network, the overhead is their fault.
// No locking here: apply464xlatAdjustments behaves fine with an add-only // No locking here: apply464xlatAdjustments behaves fine with an add-only
// ConcurrentHashMap. // ConcurrentHashMap.
delta.apply464xlatAdjustments(mStackedIfaces, mUseBpfStats); delta.apply464xlatAdjustments(mStackedIfaces);
// Migrate data usage over a VPN to the TUN network. // Migrate data usage over a VPN to the TUN network.
for (VpnInfo info : vpnArray) { for (VpnInfo info : vpnArray) {

5
services/core/java/com/android/server/net/NetworkStatsService.java
View File

@@ -1877,14 +1877,13 @@ public class NetworkStatsService extends INetworkStatsService.Stub {
// fold tethering stats and operations into uid snapshot // fold tethering stats and operations into uid snapshot
final NetworkStats tetherSnapshot = getNetworkStatsTethering(STATS_PER_UID); final NetworkStats tetherSnapshot = getNetworkStatsTethering(STATS_PER_UID);
tetherSnapshot.filter(UID_ALL, ifaces, TAG_ALL); tetherSnapshot.filter(UID_ALL, ifaces, TAG_ALL);
mStatsFactory.apply464xlatAdjustments(uidSnapshot, tetherSnapshot, mStatsFactory.apply464xlatAdjustments(uidSnapshot, tetherSnapshot);
mUseBpfTrafficStats);
uidSnapshot.combineAllValues(tetherSnapshot); uidSnapshot.combineAllValues(tetherSnapshot);
// get a stale copy of uid stats snapshot provided by providers. // get a stale copy of uid stats snapshot provided by providers.
final NetworkStats providerStats = getNetworkStatsFromProviders(STATS_PER_UID); final NetworkStats providerStats = getNetworkStatsFromProviders(STATS_PER_UID);
providerStats.filter(UID_ALL, ifaces, TAG_ALL); providerStats.filter(UID_ALL, ifaces, TAG_ALL);
mStatsFactory.apply464xlatAdjustments(uidSnapshot, providerStats, mUseBpfTrafficStats); mStatsFactory.apply464xlatAdjustments(uidSnapshot, providerStats);
uidSnapshot.combineAllValues(providerStats); uidSnapshot.combineAllValues(providerStats);
uidSnapshot.combineAllValues(mUidOperations); uidSnapshot.combineAllValues(mUidOperations);