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

Commit 6030b668 authored by Hui Yu's avatar Hui Yu
Browse files

NPMS lock improvement. 

Fix NPMS lock contention:
Between 'com.android.server.net.NetworkPolicyManagerService$NetworkPolicyManagerInternalImpl.isUidNetworkingBlocked(int, java.lang.String)' and 'com.android.server.net.NetworkPolicyManagerService$NetworkPolicyManagerInternalImpl.getSubscriptionPlan(android.net.NetworkTemplate) on lock mNetworkPoliciesSecondLock.

Bug: 162350812
Test: regresstion test.
Change-Id: Ibbb4325c7380a2febf3682b3ae3436647ae82e16
parent a5351cef

services/core/java/com/android/server/net/NetworkPolicyManagerService.java

+19 −10
Original line number Diff line number Diff line
@@ -518,8 +518,9 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
    private final SparseBooleanArray mRestrictBackgroundAllowlistRevokedUids =

            new SparseBooleanArray();



    final Object mMeteredIfacesLock = new Object();

    /** Set of ifaces that are metered. */

    @GuardedBy("mNetworkPoliciesSecondLock")

    @GuardedBy("mMeteredIfacesLock")

    private ArraySet<String> mMeteredIfaces = new ArraySet<>();

    /** Set of over-limit templates that have been notified. */

    @GuardedBy("mNetworkPoliciesSecondLock")
@@ -1972,6 +1973,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
        }



        // Remove quota from any interfaces that are no longer metered.

        synchronized (mMeteredIfacesLock) {

            for (int i = mMeteredIfaces.size() - 1; i >= 0; i--) {

                final String iface = mMeteredIfaces.valueAt(i);

                if (!newMeteredIfaces.contains(iface)) {
@@ -1979,6 +1981,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                }

            }

            mMeteredIfaces = newMeteredIfaces;

        }



        final ContentResolver cr = mContext.getContentResolver();

        final boolean quotaEnabled = Settings.Global.getInt(cr,
@@ -2030,7 +2033,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
            mSubscriptionOpportunisticQuota.put(subId, quotaBytes);

        }



        final String[] meteredIfaces = mMeteredIfaces.toArray(new String[mMeteredIfaces.size()]);

        final String[] meteredIfaces;

        synchronized (mMeteredIfacesLock) {

            meteredIfaces = mMeteredIfaces.toArray(new String[mMeteredIfaces.size()]);

        }

        mHandler.obtainMessage(MSG_METERED_IFACES_CHANGED, meteredIfaces).sendToTarget();



        mHandler.obtainMessage(MSG_ADVISE_PERSIST_THRESHOLD, lowestRule).sendToTarget();
@@ -3436,7 +3442,10 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                fout.print("Restrict background: "); fout.println(mRestrictBackground);

                fout.print("Restrict power: "); fout.println(mRestrictPower);

                fout.print("Device idle: "); fout.println(mDeviceIdleMode);

                fout.print("Metered ifaces: "); fout.println(mMeteredIfaces);

                synchronized (mMeteredIfacesLock) {

                    fout.print("Metered ifaces: ");

                    fout.println(mMeteredIfaces);

                }



                fout.println();

                fout.print("mRestrictBackgroundLowPowerMode: " + mRestrictBackgroundLowPowerMode);
@@ -4632,7 +4641,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                }

                case MSG_LIMIT_REACHED: {

                    final String iface = (String) msg.obj;

                    synchronized (mNetworkPoliciesSecondLock) {

                    synchronized (mMeteredIfacesLock) {

                        // fast return if not needed.

                        if (!mMeteredIfaces.contains(iface)) {

                            return true;
@@ -5274,7 +5283,7 @@ public class NetworkPolicyManagerService extends INetworkPolicyManager.Stub { 
                isBackgroundRestricted = mRestrictBackground;

            }

            final boolean isNetworkMetered;

            synchronized (mNetworkPoliciesSecondLock) {

            synchronized (mMeteredIfacesLock) {

                isNetworkMetered = mMeteredIfaces.contains(ifname);

            }

            final boolean ret = isUidNetworkingBlockedInternal(uid, uidRules, isNetworkMetered,