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

Commit 8ffa7ecf authored by Martijn Coenen's avatar Martijn Coenen Committed by Automerger Merge Worker
Browse files

Merge "Repeat proxy limit callbacks if we keep going above the limit." am: c8600dc1 

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1818234

Change-Id: Ibd065d561a9b491ee7c9054e633e80354fcd5f06
parents e8f1eed4 c8600dc1

libs/binder/BpBinder.cpp

+20 −2
Original line number Original line Diff line number Diff line
@@ -37,6 +37,7 @@ namespace android { 




Mutex BpBinder::sTrackingLock;

Mutex BpBinder::sTrackingLock;

std::unordered_map<int32_t, uint32_t> BpBinder::sTrackingMap;

std::unordered_map<int32_t, uint32_t> BpBinder::sTrackingMap;

std::unordered_map<int32_t, uint32_t> BpBinder::sLastLimitCallbackMap;

int BpBinder::sNumTrackedUids = 0;

int BpBinder::sNumTrackedUids = 0;

std::atomic_bool BpBinder::sCountByUidEnabled(false);

std::atomic_bool BpBinder::sCountByUidEnabled(false);

binder_proxy_limit_callback BpBinder::sLimitCallback;

binder_proxy_limit_callback BpBinder::sLimitCallback;
@@ -47,6 +48,10 @@ uint32_t BpBinder::sBinderProxyCountHighWatermark = 2500; 
// Another arbitrary value a binder count needs to drop below before another callback will be called

// Another arbitrary value a binder count needs to drop below before another callback will be called

uint32_t BpBinder::sBinderProxyCountLowWatermark = 2000;

uint32_t BpBinder::sBinderProxyCountLowWatermark = 2000;





// Once the limit has been exceeded, keep calling the limit callback for every this many new proxies

// created over the limit.

constexpr uint32_t REPEAT_LIMIT_CALLBACK_INTERVAL = 1000;



enum {

enum {

    LIMIT_REACHED_MASK = 0x80000000,        // A flag denoting that the limit has been reached

    LIMIT_REACHED_MASK = 0x80000000,        // A flag denoting that the limit has been reached

    COUNTING_VALUE_MASK = 0x7FFFFFFF,       // A mask of the remaining bits for the count value

    COUNTING_VALUE_MASK = 0x7FFFFFFF,       // A mask of the remaining bits for the count value
@@ -120,12 +125,24 @@ sp<BpBinder> BpBinder::create(int32_t handle) { 
            if (sBinderProxyThrottleCreate) {

            if (sBinderProxyThrottleCreate) {

                return nullptr;

                return nullptr;

            }

            }

            trackedValue = trackedValue & COUNTING_VALUE_MASK;

            uint32_t lastLimitCallbackAt = sLastLimitCallbackMap[trackedUid];



            if (trackedValue > lastLimitCallbackAt &&

                (trackedValue - lastLimitCallbackAt > REPEAT_LIMIT_CALLBACK_INTERVAL)) {

                ALOGE("Still too many binder proxy objects sent to uid %d from uid %d (%d proxies "

                      "held)",

                      getuid(), trackedUid, trackedValue);

                if (sLimitCallback) sLimitCallback(trackedUid);

                sLastLimitCallbackMap[trackedUid] = trackedValue;

            }

        } else {

        } else {

            if ((trackedValue & COUNTING_VALUE_MASK) >= sBinderProxyCountHighWatermark) {

            if ((trackedValue & COUNTING_VALUE_MASK) >= sBinderProxyCountHighWatermark) {

                ALOGE("Too many binder proxy objects sent to uid %d from uid %d (%d proxies held)",

                ALOGE("Too many binder proxy objects sent to uid %d from uid %d (%d proxies held)",

                      getuid(), trackedUid, trackedValue);

                      getuid(), trackedUid, trackedValue);

                sTrackingMap[trackedUid] |= LIMIT_REACHED_MASK;

                sTrackingMap[trackedUid] |= LIMIT_REACHED_MASK;

                if (sLimitCallback) sLimitCallback(trackedUid);

                if (sLimitCallback) sLimitCallback(trackedUid);

                sLastLimitCallbackMap[trackedUid] = trackedValue & COUNTING_VALUE_MASK;

                if (sBinderProxyThrottleCreate) {

                if (sBinderProxyThrottleCreate) {

                    ALOGI("Throttling binder proxy creates from uid %d in uid %d until binder proxy"

                    ALOGI("Throttling binder proxy creates from uid %d in uid %d until binder proxy"

                          " count drops below %d",

                          " count drops below %d",
@@ -465,8 +482,9 @@ BpBinder::~BpBinder() 
                ((trackedValue & COUNTING_VALUE_MASK) <= sBinderProxyCountLowWatermark)

                ((trackedValue & COUNTING_VALUE_MASK) <= sBinderProxyCountLowWatermark)

                )) {

                )) {

                ALOGI("Limit reached bit reset for uid %d (fewer than %d proxies from uid %d held)",

                ALOGI("Limit reached bit reset for uid %d (fewer than %d proxies from uid %d held)",

                                   getuid(), mTrackedUid, sBinderProxyCountLowWatermark);

                      getuid(), sBinderProxyCountLowWatermark, mTrackedUid);

                sTrackingMap[mTrackedUid] &= ~LIMIT_REACHED_MASK;

                sTrackingMap[mTrackedUid] &= ~LIMIT_REACHED_MASK;

                sLastLimitCallbackMap.erase(mTrackedUid);

            }

            }

            if (--sTrackingMap[mTrackedUid] == 0) {

            if (--sTrackingMap[mTrackedUid] == 0) {

                sTrackingMap.erase(mTrackedUid);

                sTrackingMap.erase(mTrackedUid);

libs/binder/include/binder/BpBinder.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -194,6 +194,7 @@ private: 
    static uint32_t                             sBinderProxyCountHighWatermark;

    static uint32_t                             sBinderProxyCountHighWatermark;

    static uint32_t                             sBinderProxyCountLowWatermark;

    static uint32_t                             sBinderProxyCountLowWatermark;

    static bool                                 sBinderProxyThrottleCreate;

    static bool                                 sBinderProxyThrottleCreate;

    static std::unordered_map<int32_t,uint32_t> sLastLimitCallbackMap;

};

};





} // namespace android

} // namespace android