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

Commit e0f17680 authored by Maciej Żenczykowski's avatar Maciej Żenczykowski Committed by Automerger Merge Worker
Browse files

Merge changes Ie73ba058,I4393afcb,Ifebd946e,Ib12ee882,Ia171b779 am: e2730424 

Change-Id: I7b9ae6590c67f89b023417e511fa823b79ad53b1
parents d8f4f5b4 e2730424

core/java/android/net/NetworkStats.java

+26 −38
Original line number Diff line number Diff line
@@ -1047,22 +1047,22 @@ public final class NetworkStats implements Parcelable { 
    }



    /**

     * Calculate and apply adjustments to captured statistics for 464xlat traffic counted twice.

     * Calculate and apply adjustments to captured statistics for 464xlat traffic.

     *

     * <p>This mutates stacked traffic stats, to account for IPv4/IPv6 header size difference.

     *

     * <p>This mutates both base and stacked traffic stats, to account respectively for

     * double-counted traffic and IPv4/IPv6 header size difference.

     * <p>UID stats, which are only accounted on the stacked interface, need to be increased

     * by 20 bytes/packet to account for translation overhead.

     *

     * <p>For 464xlat traffic, xt_qtaguid sees every IPv4 packet twice, once as a native IPv4

     * packet on the stacked interface, and once as translated to an IPv6 packet on the

     * base interface. For correct stats accounting on the base interface, if using xt_qtaguid,

     * every rx 464xlat packet needs to be subtracted from the root UID on the base interface

     * (http://b/12249687, http:/b/33681750), and every tx 464xlat packet which was counted onto

     * clat uid should be ignored.

     * <p>The potential additional overhead of 8 bytes/packet for ip fragments is ignored.

     *

     * As for eBPF, the per uid stats is collected by different hook, the rx packets on base

     * interface will not be counted. Thus, the adjustment on root uid is not needed. However, the

     * tx traffic counted in the same way xt_qtaguid does, so the traffic on clat uid still

     * needs to be ignored.

     * <p>Interface stats need to sum traffic on both stacked and base interface because:

     *   - eBPF offloaded packets appear only on the stacked interface

     *   - Non-offloaded ingress packets appear only on the stacked interface

     *     (due to iptables raw PREROUTING drop rules)

     *   - Non-offloaded egress packets appear only on the stacked interface

     *     (due to ignoring traffic from clat daemon by uid match)

     * (and of course the 20 bytes/packet overhead needs to be applied to stacked interface stats)

     *

     * <p>This method will behave fine if {@code stackedIfaces} is an non-synchronized but add-only

     * {@code ConcurrentHashMap}
@@ -1074,46 +1074,34 @@ public final class NetworkStats implements Parcelable { 
     */

    public static void apply464xlatAdjustments(NetworkStats baseTraffic,

            NetworkStats stackedTraffic, Map<String, String> stackedIfaces, boolean useBpfStats) {

        // Total 464xlat traffic to subtract from uid 0 on all base interfaces.

        // stackedIfaces may grow afterwards, but NetworkStats will just be resized automatically.

        final NetworkStats adjustments = new NetworkStats(0, stackedIfaces.size());



        // For recycling

        Entry entry = null;

        Entry adjust = new NetworkStats.Entry(IFACE_ALL, 0, 0, 0, 0, 0, 0, 0L, 0L, 0L, 0L, 0L);



        for (int i = 0; i < stackedTraffic.size; i++) {

            entry = stackedTraffic.getValues(i, entry);

            if (entry.iface == null || !entry.iface.startsWith(CLATD_INTERFACE_PREFIX)) {

                continue;

            }

            final String baseIface = stackedIfaces.get(entry.iface);

            if (baseIface == null) {

                continue;

            }

            // Subtract xt_qtaguid 464lat rx traffic seen for the root UID on the current base

            // interface. As for eBPF, the per uid stats is collected by different hook, the rx

            // packets on base interface will not be counted.

            adjust.iface = baseIface;

            if (!useBpfStats) {

                adjust.rxBytes = -(entry.rxBytes + entry.rxPackets * IPV4V6_HEADER_DELTA);

                adjust.rxPackets = -entry.rxPackets;

            }

            adjustments.combineValues(adjust);

            if (entry == null) continue;

            if (entry.iface == null) continue;

            if (!entry.iface.startsWith(CLATD_INTERFACE_PREFIX)) continue;



            // For 464xlat traffic, per uid stats only counts the bytes of the native IPv4 packet

            // sent on the stacked interface with prefix "v4-" and drops the IPv6 header size after

            // unwrapping. To account correctly for on-the-wire traffic, add the 20 additional bytes

            // difference for all packets (http://b/12249687, http:/b/33681750).

            //

            // Note: this doesn't account for LRO/GRO/GSO/TSO (ie. >mtu) traffic correctly, nor

            // does it correctly account for the 8 extra bytes in the IPv6 fragmentation header.

            //

            // While the ebpf code path does try to simulate proper post segmentation packet

            // counts, we have nothing of the sort of xt_qtaguid stats.

            entry.rxBytes += entry.rxPackets * IPV4V6_HEADER_DELTA;

            entry.txBytes += entry.txPackets * IPV4V6_HEADER_DELTA;

            stackedTraffic.setValues(i, entry);

        }



        // Traffic on clat uid is v6 tx traffic that is already counted with app uid on the stacked

        // v4 interface, so it needs to be removed to avoid double-counting.

        // 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});

        baseTraffic.combineAllValues(adjustments);

    }



    /**

tests/net/java/android/net/NetworkStatsTest.java

+4 −15
Original line number Diff line number Diff line
@@ -909,8 +909,8 @@ public class NetworkStatsTest { 
                13805 /* txPackets */,

                0 /* operations */);



        // Traffic measured for the root uid on the base interface if eBPF is in use.

        final NetworkStats.Entry ebpfRootUidEntry = new NetworkStats.Entry(

        // Traffic measured for the root uid on the base interface.

        final NetworkStats.Entry rootUidEntry = new NetworkStats.Entry(

                baseIface, rootUid, SET_DEFAULT, TAG_NONE,

                163577 /* rxBytes */,

                187 /* rxPackets */,
@@ -918,17 +918,6 @@ public class NetworkStatsTest { 
                97 /* txPackets */,

                0 /* operations */);



        // Traffic measured for the root uid on the base interface if xt_qtaguid is in use.

        // Incorrectly includes appEntry's bytes and packets, plus IPv4-IPv6 translation

        // overhead (20 bytes per packet), in rx direction.

        final NetworkStats.Entry xtRootUidEntry = new NetworkStats.Entry(

                baseIface, rootUid, SET_DEFAULT, TAG_NONE,

                31113087 /* rxBytes */,

                22588 /* rxPackets */,

                17607 /* txBytes */,

                97 /* txPackets */,

                0 /* operations */);



        final NetworkStats.Entry otherEntry = new NetworkStats.Entry(

                otherIface, appUid, SET_DEFAULT, TAG_NONE,

                2600  /* rxBytes */,
@@ -939,12 +928,12 @@ public class NetworkStatsTest { 


        final NetworkStats statsXt = new NetworkStats(TEST_START, 3)

                .insertEntry(appEntry)

                .insertEntry(xtRootUidEntry)

                .insertEntry(rootUidEntry)

                .insertEntry(otherEntry);



        final NetworkStats statsEbpf = new NetworkStats(TEST_START, 3)

                .insertEntry(appEntry)

                .insertEntry(ebpfRootUidEntry)

                .insertEntry(rootUidEntry)

                .insertEntry(otherEntry);



        statsXt.apply464xlatAdjustments(stackedIface, false);

tests/net/java/com/android/server/net/NetworkStatsFactoryTest.java

+4 −6
Original line number Diff line number Diff line
@@ -446,7 +446,7 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { 
        assertStatsEntry(stats, "v4-wlan0", 1000, SET_DEFAULT, 0x0, 30812L, 2310L);

        assertStatsEntry(stats, "v4-wlan0", 10102, SET_DEFAULT, 0x0, 10022L, 3330L);

        assertStatsEntry(stats, "v4-wlan0", 10060, SET_DEFAULT, 0x0, 9532772L, 254112L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, 15229L, 0L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, 0L, 0L);

        assertStatsEntry(stats, "wlan0", 1000, SET_DEFAULT, 0x0, 6126L, 2013L);

        assertStatsEntry(stats, "wlan0", 10013, SET_DEFAULT, 0x0, 0L, 144L);

        assertStatsEntry(stats, "wlan0", 10018, SET_DEFAULT, 0x0, 5980263L, 167667L);
@@ -468,9 +468,7 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { 
        long appRxBytesAfter = 439237478L;

        assertEquals("App traffic should be ~100MB", 110553449, appRxBytesAfter - appRxBytesBefore);



        long rootRxBytesBefore = 1394011L;

        long rootRxBytesAfter = 1398634L;

        assertEquals("UID 0 traffic should be ~0", 4623, rootRxBytesAfter - rootRxBytesBefore);

        long rootRxBytes = 330187296L;



        mFactory.noteStackedIface("v4-wlan0", "wlan0");

        NetworkStats stats;
@@ -478,12 +476,12 @@ public class NetworkStatsFactoryTest extends NetworkStatsBaseTest { 
        // Stats snapshot before the download

        stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat_100mb_download_before);

        assertStatsEntry(stats, "v4-wlan0", 10106, SET_FOREGROUND, 0x0, appRxBytesBefore, 5199872L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesBefore, 0L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytes, 0L);



        // Stats snapshot after the download

        stats = parseDetailedStats(R.raw.xt_qtaguid_with_clat_100mb_download_after);

        assertStatsEntry(stats, "v4-wlan0", 10106, SET_FOREGROUND, 0x0, appRxBytesAfter, 7867488L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytesAfter, 0L);

        assertStatsEntry(stats, "wlan0", 0, SET_DEFAULT, 0x0, rootRxBytes, 0L);

    }



    /**

tests/net/res/raw/xt_qtaguid_with_clat

+1 −1
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 
7 v4-wlan0 0x0 10060 1 1448660 1041 31192 753 1448660 1041 0 0 0 0 31192 753 0 0 0 0

8 v4-wlan0 0x0 10102 0 9702 16 2870 23 9702 16 0 0 0 0 2870 23 0 0 0 0

9 v4-wlan0 0x0 10102 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

10 wlan0 0x0 0 0 11058671 7892 0 0 11043898 7811 13117 61 1656 20 0 0 0 0 0 0

10 wlan0 0x0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

11 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

12 wlan0 0x0 1000 0 6126 13 2013 16 5934 11 192 2 0 0 1821 14 192 2 0 0

13 wlan0 0x0 1000 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

tests/net/res/raw/xt_qtaguid_with_clat_100mb_download_after

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ idx iface acct_tag_hex uid_tag_int cnt_set rx_bytes rx_packets tx_bytes tx_packe 
9 v4-wlan0 0x0 10057 1 728 7 392 7 0 0 728 7 0 0 0 0 392 7 0 0

10 v4-wlan0 0x0 10106 0 2232 18 2232 18 0 0 2232 18 0 0 0 0 2232 18 0 0

11 v4-wlan0 0x0 10106 1 432952718 314238 5442288 121260 432950238 314218 2480 20 0 0 5433900 121029 8388 231 0 0

12 wlan0 0x0 0 0 440746376 329772 0 0 439660007 315369 232001 1276 854368 13127 0 0 0 0 0 0

12 wlan0 0x0 0 0 330187296 250652 0 0 329106990 236273 226202 1255 854104 13124 0 0 0 0 0 0

13 wlan0 0x0 0 1 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

14 wlan0 0x0 1000 0 77113 272 56151 575 77113 272 0 0 0 0 19191 190 36960 385 0 0

15 wlan0 0x0 1000 1 20227 80 8356 72 18539 74 1688 6 0 0 7562 66 794 6 0 0