From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Subject: [PATCH 5/8] PM: suspend_block: Add suspend_blocker stats Date: Fri, 30 Apr 2010 15:36:58 -0700 Message-ID: <1272667021-21312-6-git-send-email-arve@android.com> References: <1272667021-21312-1-git-send-email-arve@android.com> <1272667021-21312-2-git-send-email-arve@android.com> <1272667021-21312-3-git-send-email-arve@android.com> <1272667021-21312-4-git-send-email-arve@android.com> <1272667021-21312-5-git-send-email-arve@android.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1272667021-21312-5-git-send-email-arve@android.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-pm-bounces@lists.linux-foundation.org Errors-To: linux-pm-bounces@lists.linux-foundation.org To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: Len Brown , Oleg Nesterov , Jesse Barnes , Tejun Heo , Magnus Damm , Andrew Morton , Wu Fengguang List-Id: linux-pm@vger.kernel.org UmVwb3J0IHN1c3BlbmQgYmxvY2sgc3RhdHMgaW4gL3N5cy9rZXJuZWwvZGVidWcvc3VzcGVuZF9i bG9ja2Vycy4KClNpZ25lZC1vZmYtYnk6IEFydmUgSGrDuG5uZXbDpWcgPGFydmVAYW5kcm9pZC5j b20+Ci0tLQogaW5jbHVkZS9saW51eC9zdXNwZW5kX2Jsb2NrZXIuaCB8ICAgMjEgKysrKy0KIGtl cm5lbC9wb3dlci9LY29uZmlnICAgICAgICAgICAgfCAgICA3ICsrCiBrZXJuZWwvcG93ZXIvcG93 ZXIuaCAgICAgICAgICAgIHwgICAgNSArCiBrZXJuZWwvcG93ZXIvc3VzcGVuZC5jICAgICAgICAg IHwgICAgNCArLQoga2VybmVsL3Bvd2VyL3N1c3BlbmRfYmxvY2tlci5jICB8ICAxOTAgKysrKysr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKy0tCiA1IGZpbGVzIGNoYW5nZWQsIDIxOCBp bnNlcnRpb25zKCspLCA5IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvbGludXgv c3VzcGVuZF9ibG9ja2VyLmggYi9pbmNsdWRlL2xpbnV4L3N1c3BlbmRfYmxvY2tlci5oCmluZGV4 IGY5OTI4Y2MuLmM4MDc2NGMgMTAwNzU1Ci0tLSBhL2luY2x1ZGUvbGludXgvc3VzcGVuZF9ibG9j a2VyLmgKKysrIGIvaW5jbHVkZS9saW51eC9zdXNwZW5kX2Jsb2NrZXIuaApAQCAtMTcsMTIgKzE3 LDIxIEBACiAjZGVmaW5lIF9MSU5VWF9TVVNQRU5EX0JMT0NLRVJfSAogCiAjaW5jbHVkZSA8bGlu dXgvbGlzdC5oPgorI2luY2x1ZGUgPGxpbnV4L2t0aW1lLmg+CiAKIC8qKgogICogc3RydWN0IHN1 c3BlbmRfYmxvY2tlciAtIHRoZSBiYXNpYyBzdXNwZW5kX2Jsb2NrZXIgc3RydWN0dXJlCiAgKiBA bGluazoJTGlzdCBlbnRyeSBmb3IgYWN0aXZlIG9yIGluYWN0aXZlIGxpc3QuCi0gKiBAZmxhZ3M6 CVRyYWNrcyBpbml0aWFsaXplZCBhbmQgYWN0aXZlIHN0YXRlLgorICogQGZsYWdzOglUcmFja3Mg aW5pdGlhbGl6ZWQsIGFjdGl2ZSBhbmQgc3RhdHMgc3RhdGUuCiAgKiBAbmFtZToJTmFtZSB1c2Vk IGZvciBkZWJ1Z2dpbmcuCisgKiBAY291bnQ6CU51bWJlciBvZiB0aW1lcyB0aGlzIGJsb2NrZXIg aGFzIGJlZW4gZGVhY2l2YXRlZAorICogQHdha2V1cF9jb3VudDogTnVtYmVyIG9mIHRpbWVzIHRo aXMgYmxvY2tlciB3YXMgdGhlIGZpcnN0IHRvIGJsb2NrIHN1c3BlbmQKKyAqCQlhZnRlciByZXN1 bWUuCisgKiBAdG90YWxfdGltZToJVG90YWwgdGltZSB0aGlzIHN1c3BlbmQgYmxvY2tlciBoYXMg cHJldmVudGVkIHN1c3BlbmQuCisgKiBAcHJldmVudF9zdXNwZW5kX3RpbWU6IFRpbWUgdGhpcyBz dXNwZW5kIGJsb2NrZXIgaGFzIHByZXZlbnRlZCBzdXNwZW5kIHdoaWxlCisgKgkJdXNlci1zcGFj ZSByZXF1ZXN0ZWQgc3VzcGVuZC4KKyAqIEBtYXhfdGltZToJTWF4IHRpbWUgdGhpcyBzdXNwZW5k IGJsb2NrZXIgaGFzIGJlZW4gY29udGludW91c2x5IGFjdGl2ZQorICogQGxhc3RfdGltZToJTW9u b3RvbmljIGNsb2NrIHdoZW4gdGhlIGFjdGl2ZSBzdGF0ZSBsYXN0IGNoYW5nZWQuCiAgKgogICog V2hlbiBhIHN1c3BlbmRfYmxvY2tlciBpcyBhY3RpdmUgaXQgcHJldmVudHMgdGhlIHN5c3RlbSBm cm9tIGVudGVyaW5nCiAgKiBvcHBvcnR1bmlzdGljIHN1c3BlbmQuCkBAIC0zNSw2ICs0NCwxNiBA QCBzdHJ1Y3Qgc3VzcGVuZF9ibG9ja2VyIHsKIAlzdHJ1Y3QgbGlzdF9oZWFkICAgIGxpbms7CiAJ aW50ICAgICAgICAgICAgICAgICBmbGFnczsKIAljb25zdCBjaGFyICAgICAgICAgKm5hbWU7Cisj aWZkZWYgQ09ORklHX1NVU1BFTkRfQkxPQ0tFUl9TVEFUUworCXN0cnVjdCB7CisJCWludCAgICAg ICAgICAgICBjb3VudDsKKwkJaW50ICAgICAgICAgICAgIHdha2V1cF9jb3VudDsKKwkJa3RpbWVf dCAgICAgICAgIHRvdGFsX3RpbWU7CisJCWt0aW1lX3QgICAgICAgICBwcmV2ZW50X3N1c3BlbmRf dGltZTsKKwkJa3RpbWVfdCAgICAgICAgIG1heF90aW1lOworCQlrdGltZV90ICAgICAgICAgbGFz dF90aW1lOworCX0gc3RhdDsKKyNlbmRpZgogI2VuZGlmCiB9OwogCmRpZmYgLS1naXQgYS9rZXJu ZWwvcG93ZXIvS2NvbmZpZyBiL2tlcm5lbC9wb3dlci9LY29uZmlnCmluZGV4IGZlNWEyZjIuLjRi Y2JhMDcgMTAwNjQ0Ci0tLSBhL2tlcm5lbC9wb3dlci9LY29uZmlnCisrKyBiL2tlcm5lbC9wb3dl ci9LY29uZmlnCkBAIC0xNDYsNiArMTQ2LDEzIEBAIGNvbmZpZyBPUFBPUlRVTklTVElDX1NVU1BF TkQKIAkgIGRldGVybWluZXMgdGhlIHNsZWVwIHN0YXRlIHRoZSBzeXN0ZW0gd2lsbCBiZSBwdXQg aW50byB3aGVuIHRoZXJlIGFyZQogCSAgbm8gYWN0aXZlIHN1c3BlbmQgYmxvY2tlcnMuCiAKK2Nv bmZpZyBTVVNQRU5EX0JMT0NLRVJfU1RBVFMKKwlib29sICJTdXNwZW5kIGJsb2NrIHN0YXRzIgor CWRlcGVuZHMgb24gT1BQT1JUVU5JU1RJQ19TVVNQRU5ECisJZGVmYXVsdCB5CisJLS0taGVscC0t LQorCSAgUmVwb3J0IHN1c3BlbmQgYmxvY2sgc3RhdHMgaW4gL3N5cy9rZXJuZWwvZGVidWcvc3Vz cGVuZF9ibG9ja2VycworCiBjb25maWcgVVNFUl9TVVNQRU5EX0JMT0NLRVJTCiAJYm9vbCAiVXNl cnNwYWNlIHN1c3BlbmQgYmxvY2tlcnMiCiAJZGVwZW5kcyBvbiBPUFBPUlRVTklTVElDX1NVU1BF TkQKZGlmZiAtLWdpdCBhL2tlcm5lbC9wb3dlci9wb3dlci5oIGIva2VybmVsL3Bvd2VyL3Bvd2Vy LmgKaW5kZXggNjdkMTBmZC4uODk3YzExNiAxMDA2NDQKLS0tIGEva2VybmVsL3Bvd2VyL3Bvd2Vy LmgKKysrIGIva2VybmVsL3Bvd2VyL3Bvd2VyLmgKQEAgLTI0NSwzICsyNDUsOCBAQCBleHRlcm4g dm9pZCBfX2luaXQgc3VzcGVuZF9ibG9ja19pbml0KHZvaWQpOwogI2Vsc2UKIHN0YXRpYyBpbmxp bmUgdm9pZCBzdXNwZW5kX2Jsb2NrX2luaXQodm9pZCkge30KICNlbmRpZgorI2lmZGVmIENPTkZJ R19TVVNQRU5EX0JMT0NLRVJfU1RBVFMKK3ZvaWQgYWJvdXRfdG9fZW50ZXJfc3VzcGVuZCh2b2lk KTsKKyNlbHNlCitzdGF0aWMgaW5saW5lIHZvaWQgYWJvdXRfdG9fZW50ZXJfc3VzcGVuZCh2b2lk KSB7fQorI2VuZGlmCmRpZmYgLS1naXQgYS9rZXJuZWwvcG93ZXIvc3VzcGVuZC5jIGIva2VybmVs L3Bvd2VyL3N1c3BlbmQuYwppbmRleCBkYzQyMDA2Li42ZDMyN2VhIDEwMDY0NAotLS0gYS9rZXJu ZWwvcG93ZXIvc3VzcGVuZC5jCisrKyBiL2tlcm5lbC9wb3dlci9zdXNwZW5kLmMKQEAgLTE1OSw4 ICsxNTksMTAgQEAgc3RhdGljIGludCBzdXNwZW5kX2VudGVyKHN1c3BlbmRfc3RhdGVfdCBzdGF0 ZSkKIAogCWVycm9yID0gc3lzZGV2X3N1c3BlbmQoUE1TR19TVVNQRU5EKTsKIAlpZiAoIWVycm9y KSB7Ci0JCWlmICghc3VzcGVuZF9pc19ibG9ja2VkKCkgJiYgIXN1c3BlbmRfdGVzdChURVNUX0NP UkUpKQorCQlpZiAoIXN1c3BlbmRfaXNfYmxvY2tlZCgpICYmICFzdXNwZW5kX3Rlc3QoVEVTVF9D T1JFKSkgeworCQkJYWJvdXRfdG9fZW50ZXJfc3VzcGVuZCgpOwogCQkJZXJyb3IgPSBzdXNwZW5k X29wcy0+ZW50ZXIoc3RhdGUpOworCQl9CiAJCXN5c2Rldl9yZXN1bWUoKTsKIAl9CiAKZGlmZiAt LWdpdCBhL2tlcm5lbC9wb3dlci9zdXNwZW5kX2Jsb2NrZXIuYyBiL2tlcm5lbC9wb3dlci9zdXNw ZW5kX2Jsb2NrZXIuYwppbmRleCBjZWQ0OTkzLi43NzkyMGU2IDEwMDY0NAotLS0gYS9rZXJuZWwv cG93ZXIvc3VzcGVuZF9ibG9ja2VyLmMKKysrIGIva2VybmVsL3Bvd2VyL3N1c3BlbmRfYmxvY2tl ci5jCkBAIC0zNCw2ICszNCw3IEBAIG1vZHVsZV9wYXJhbV9uYW1lZChkZWJ1Z19tYXNrLCBkZWJ1 Z19tYXNrLCBpbnQsIFNfSVJVR08gfCBTX0lXVVNSIHwgU19JV0dSUCk7CiAKICNkZWZpbmUgU0Jf SU5JVElBTElaRUQgICAgICAgICAgICAoMVUgPDwgOCkKICNkZWZpbmUgU0JfQUNUSVZFICAgICAg ICAgICAgICAgICAoMVUgPDwgOSkKKyNkZWZpbmUgU0JfUFJFVkVOVElOR19TVVNQRU5EICAgICAo MVUgPDwgMTApCiAKIHN0YXRpYyBERUZJTkVfU1BJTkxPQ0sobGlzdF9sb2NrKTsKIHN0YXRpYyBE RUZJTkVfU1BJTkxPQ0soc3RhdGVfbG9jayk7CkBAIC00Myw2ICs0NCw3IEBAIHN0YXRpYyBpbnQg Y3VycmVudF9ldmVudF9udW07CiBzdHJ1Y3Qgc3VzcGVuZF9ibG9ja2VyIG1haW5fc3VzcGVuZF9i bG9ja2VyOwogc3RhdGljIHN1c3BlbmRfc3RhdGVfdCByZXF1ZXN0ZWRfc3VzcGVuZF9zdGF0ZSA9 IFBNX1NVU1BFTkRfTUVNOwogc3RhdGljIGJvb2wgZW5hYmxlX3N1c3BlbmRfYmxvY2tlcnM7Citz dGF0aWMgc3RydWN0IHN1c3BlbmRfYmxvY2tlciB1bmtub3duX3dha2V1cDsKIHN0YXRpYyBzdHJ1 Y3QgZGVudHJ5ICpzdXNwZW5kX2Jsb2NrZXJfc3RhdHNfZGVudHJ5OwogCiAjZGVmaW5lIHByX2lu Zm9fdGltZShmbXQsIGFyZ3MuLi4pIFwKQEAgLTU3LDYgKzU5LDE1MyBAQCBzdGF0aWMgc3RydWN0 IGRlbnRyeSAqc3VzcGVuZF9ibG9ja2VyX3N0YXRzX2RlbnRyeTsKIAkJCXRtLnRtX2hvdXIsIHRt LnRtX21pbiwgdG0udG1fc2VjLCB0cy50dl9uc2VjKTsgXAogCX0gd2hpbGUgKDApOwogCisjaWZk ZWYgQ09ORklHX1NVU1BFTkRfQkxPQ0tFUl9TVEFUUworc3RhdGljIHN0cnVjdCBzdXNwZW5kX2Js b2NrZXIgZGVsZXRlZF9zdXNwZW5kX2Jsb2NrZXJzOworc3RhdGljIGt0aW1lX3QgbGFzdF9zbGVl cF90aW1lX3VwZGF0ZTsKK3N0YXRpYyBib29sIHdhaXRfZm9yX3dha2V1cDsKKworc3RhdGljIGlu dCBwcmludF9ibG9ja2VyX3N0YXQoc3RydWN0IHNlcV9maWxlICptLAorCQkJICAgICAgc3RydWN0 IHN1c3BlbmRfYmxvY2tlciAqYmxvY2tlcikKK3sKKwlpbnQgbG9ja19jb3VudCA9IGJsb2NrZXIt PnN0YXQuY291bnQ7CisJa3RpbWVfdCBhY3RpdmVfdGltZSA9IGt0aW1lX3NldCgwLCAwKTsKKwlr dGltZV90IHRvdGFsX3RpbWUgPSBibG9ja2VyLT5zdGF0LnRvdGFsX3RpbWU7CisJa3RpbWVfdCBt YXhfdGltZSA9IGJsb2NrZXItPnN0YXQubWF4X3RpbWU7CisJa3RpbWVfdCBwcmV2ZW50X3N1c3Bl bmRfdGltZSA9IGJsb2NrZXItPnN0YXQucHJldmVudF9zdXNwZW5kX3RpbWU7CisJaWYgKGJsb2Nr ZXItPmZsYWdzICYgU0JfQUNUSVZFKSB7CisJCWt0aW1lX3Qgbm93LCBhZGRfdGltZTsKKwkJbm93 ID0ga3RpbWVfZ2V0KCk7CisJCWFkZF90aW1lID0ga3RpbWVfc3ViKG5vdywgYmxvY2tlci0+c3Rh dC5sYXN0X3RpbWUpOworCQlsb2NrX2NvdW50Kys7CisJCWFjdGl2ZV90aW1lID0gYWRkX3RpbWU7 CisJCXRvdGFsX3RpbWUgPSBrdGltZV9hZGQodG90YWxfdGltZSwgYWRkX3RpbWUpOworCQlpZiAo YmxvY2tlci0+ZmxhZ3MgJiBTQl9QUkVWRU5USU5HX1NVU1BFTkQpCisJCQlwcmV2ZW50X3N1c3Bl bmRfdGltZSA9IGt0aW1lX2FkZChwcmV2ZW50X3N1c3BlbmRfdGltZSwKKwkJCQkJa3RpbWVfc3Vi KG5vdywgbGFzdF9zbGVlcF90aW1lX3VwZGF0ZSkpOworCQlpZiAoYWRkX3RpbWUudHY2NCA+IG1h eF90aW1lLnR2NjQpCisJCQltYXhfdGltZSA9IGFkZF90aW1lOworCX0KKworCXJldHVybiBzZXFf cHJpbnRmKG0sICJcIiVzXCJcdCVkXHQlZFx0JWxsZFx0JWxsZFx0JWxsZFx0JWxsZFx0JWxsZFxu IiwKKwkJICAgICAgIGJsb2NrZXItPm5hbWUsIGxvY2tfY291bnQsIGJsb2NrZXItPnN0YXQud2Fr ZXVwX2NvdW50LAorCQkgICAgICAga3RpbWVfdG9fbnMoYWN0aXZlX3RpbWUpLCBrdGltZV90b19u cyh0b3RhbF90aW1lKSwKKwkJICAgICAgIGt0aW1lX3RvX25zKHByZXZlbnRfc3VzcGVuZF90aW1l KSwga3RpbWVfdG9fbnMobWF4X3RpbWUpLAorCQkgICAgICAga3RpbWVfdG9fbnMoYmxvY2tlci0+ c3RhdC5sYXN0X3RpbWUpKTsKK30KKworCitzdGF0aWMgaW50IHN1c3BlbmRfYmxvY2tlcl9zdGF0 c19zaG93KHN0cnVjdCBzZXFfZmlsZSAqbSwgdm9pZCAqdW51c2VkKQoreworCXVuc2lnbmVkIGxv bmcgaXJxZmxhZ3M7CisJc3RydWN0IHN1c3BlbmRfYmxvY2tlciAqYmxvY2tlcjsKKworCXNlcV9w dXRzKG0sICJuYW1lXHRjb3VudFx0d2FrZV9jb3VudFx0YWN0aXZlX3NpbmNlIgorCQkgIlx0dG90 YWxfdGltZVx0c2xlZXBfdGltZVx0bWF4X3RpbWVcdGxhc3RfY2hhbmdlXG4iKTsKKwlzcGluX2xv Y2tfaXJxc2F2ZSgmbGlzdF9sb2NrLCBpcnFmbGFncyk7CisJbGlzdF9mb3JfZWFjaF9lbnRyeShi bG9ja2VyLCAmaW5hY3RpdmVfYmxvY2tlcnMsIGxpbmspCisJCXByaW50X2Jsb2NrZXJfc3RhdCht LCBibG9ja2VyKTsKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGJsb2NrZXIsICZhY3RpdmVfYmxvY2tl cnMsIGxpbmspCisJCXByaW50X2Jsb2NrZXJfc3RhdChtLCBibG9ja2VyKTsKKwlzcGluX3VubG9j a19pcnFyZXN0b3JlKCZsaXN0X2xvY2ssIGlycWZsYWdzKTsKKwlyZXR1cm4gMDsKK30KKworc3Rh dGljIHZvaWQgc3VzcGVuZF9ibG9ja2VyX3N0YXRfaW5pdF9sb2NrZWQoc3RydWN0IHN1c3BlbmRf YmxvY2tlciAqYmxvY2tlcikKK3sKKwlibG9ja2VyLT5zdGF0LmNvdW50ID0gMDsKKwlibG9ja2Vy LT5zdGF0Lndha2V1cF9jb3VudCA9IDA7CisJYmxvY2tlci0+c3RhdC50b3RhbF90aW1lID0ga3Rp bWVfc2V0KDAsIDApOworCWJsb2NrZXItPnN0YXQucHJldmVudF9zdXNwZW5kX3RpbWUgPSBrdGlt ZV9zZXQoMCwgMCk7CisJYmxvY2tlci0+c3RhdC5tYXhfdGltZSA9IGt0aW1lX3NldCgwLCAwKTsK KwlibG9ja2VyLT5zdGF0Lmxhc3RfdGltZSA9IGt0aW1lX3NldCgwLCAwKTsKK30KKworc3RhdGlj IHZvaWQgc3VzcGVuZF9ibG9ja2VyX3N0YXRfZGVzdHJveV9sb2NrZWQoc3RydWN0IHN1c3BlbmRf YmxvY2tlciAqYmwpCit7CisJaWYgKCFibC0+c3RhdC5jb3VudCkKKwkJcmV0dXJuOworCWRlbGV0 ZWRfc3VzcGVuZF9ibG9ja2Vycy5zdGF0LmNvdW50ICs9IGJsLT5zdGF0LmNvdW50OworCWRlbGV0 ZWRfc3VzcGVuZF9ibG9ja2Vycy5zdGF0LnRvdGFsX3RpbWUgPSBrdGltZV9hZGQoCisJCWRlbGV0 ZWRfc3VzcGVuZF9ibG9ja2Vycy5zdGF0LnRvdGFsX3RpbWUsIGJsLT5zdGF0LnRvdGFsX3RpbWUp OworCWRlbGV0ZWRfc3VzcGVuZF9ibG9ja2Vycy5zdGF0LnByZXZlbnRfc3VzcGVuZF90aW1lID0g a3RpbWVfYWRkKAorCQlkZWxldGVkX3N1c3BlbmRfYmxvY2tlcnMuc3RhdC5wcmV2ZW50X3N1c3Bl bmRfdGltZSwKKwkJYmwtPnN0YXQucHJldmVudF9zdXNwZW5kX3RpbWUpOworCWRlbGV0ZWRfc3Vz cGVuZF9ibG9ja2Vycy5zdGF0Lm1heF90aW1lID0ga3RpbWVfYWRkKAorCQlkZWxldGVkX3N1c3Bl bmRfYmxvY2tlcnMuc3RhdC5tYXhfdGltZSwgYmwtPnN0YXQubWF4X3RpbWUpOworfQorCitzdGF0 aWMgdm9pZCBzdXNwZW5kX3VuYmxvY2tfc3RhdF9sb2NrZWQoc3RydWN0IHN1c3BlbmRfYmxvY2tl ciAqYmxvY2tlcikKK3sKKwlrdGltZV90IGR1cmF0aW9uOworCWt0aW1lX3Qgbm93OworCWlmICgh KGJsb2NrZXItPmZsYWdzICYgU0JfQUNUSVZFKSkKKwkJcmV0dXJuOworCW5vdyA9IGt0aW1lX2dl dCgpOworCWJsb2NrZXItPnN0YXQuY291bnQrKzsKKwlkdXJhdGlvbiA9IGt0aW1lX3N1Yihub3cs IGJsb2NrZXItPnN0YXQubGFzdF90aW1lKTsKKwlibG9ja2VyLT5zdGF0LnRvdGFsX3RpbWUgPQor CQlrdGltZV9hZGQoYmxvY2tlci0+c3RhdC50b3RhbF90aW1lLCBkdXJhdGlvbik7CisJaWYgKGt0 aW1lX3RvX25zKGR1cmF0aW9uKSA+IGt0aW1lX3RvX25zKGJsb2NrZXItPnN0YXQubWF4X3RpbWUp KQorCQlibG9ja2VyLT5zdGF0Lm1heF90aW1lID0gZHVyYXRpb247CisJYmxvY2tlci0+c3RhdC5s YXN0X3RpbWUgPSBrdGltZV9nZXQoKTsKKwlpZiAoYmxvY2tlci0+ZmxhZ3MgJiBTQl9QUkVWRU5U SU5HX1NVU1BFTkQpIHsKKwkJZHVyYXRpb24gPSBrdGltZV9zdWIobm93LCBsYXN0X3NsZWVwX3Rp bWVfdXBkYXRlKTsKKwkJYmxvY2tlci0+c3RhdC5wcmV2ZW50X3N1c3BlbmRfdGltZSA9IGt0aW1l X2FkZCgKKwkJCWJsb2NrZXItPnN0YXQucHJldmVudF9zdXNwZW5kX3RpbWUsIGR1cmF0aW9uKTsK KwkJYmxvY2tlci0+ZmxhZ3MgJj0gflNCX1BSRVZFTlRJTkdfU1VTUEVORDsKKwl9Cit9CisKK3N0 YXRpYyB2b2lkIHN1c3BlbmRfYmxvY2tfc3RhdF9sb2NrZWQoc3RydWN0IHN1c3BlbmRfYmxvY2tl ciAqYmxvY2tlcikKK3sKKwlpZiAod2FpdF9mb3Jfd2FrZXVwKSB7CisJCWlmIChkZWJ1Z19tYXNr ICYgREVCVUdfV0FLRVVQKQorCQkJcHJfaW5mbygid2FrZXVwIHN1c3BlbmQgYmxvY2tlcjogJXNc biIsIGJsb2NrZXItPm5hbWUpOworCQl3YWl0X2Zvcl93YWtldXAgPSBmYWxzZTsKKwkJYmxvY2tl ci0+c3RhdC53YWtldXBfY291bnQrKzsKKwl9CisJaWYgKCEoYmxvY2tlci0+ZmxhZ3MgJiBTQl9B Q1RJVkUpKQorCQlibG9ja2VyLT5zdGF0Lmxhc3RfdGltZSA9IGt0aW1lX2dldCgpOworfQorCitz dGF0aWMgdm9pZCB1cGRhdGVfc2xlZXBfd2FpdF9zdGF0c19sb2NrZWQoYm9vbCBkb25lKQorewor CXN0cnVjdCBzdXNwZW5kX2Jsb2NrZXIgKmJsb2NrZXI7CisJa3RpbWVfdCBub3csIGVsYXBzZWQs IGFkZDsKKworCW5vdyA9IGt0aW1lX2dldCgpOworCWVsYXBzZWQgPSBrdGltZV9zdWIobm93LCBs YXN0X3NsZWVwX3RpbWVfdXBkYXRlKTsKKwlsaXN0X2Zvcl9lYWNoX2VudHJ5KGJsb2NrZXIsICZh Y3RpdmVfYmxvY2tlcnMsIGxpbmspIHsKKwkJaWYgKGJsb2NrZXItPmZsYWdzICYgU0JfUFJFVkVO VElOR19TVVNQRU5EKSB7CisJCQlhZGQgPSBlbGFwc2VkOworCQkJYmxvY2tlci0+c3RhdC5wcmV2 ZW50X3N1c3BlbmRfdGltZSA9IGt0aW1lX2FkZCgKKwkJCQlibG9ja2VyLT5zdGF0LnByZXZlbnRf c3VzcGVuZF90aW1lLCBhZGQpOworCQl9CisJCWlmIChkb25lKQorCQkJYmxvY2tlci0+ZmxhZ3Mg Jj0gflNCX1BSRVZFTlRJTkdfU1VTUEVORDsKKwkJZWxzZQorCQkJYmxvY2tlci0+ZmxhZ3MgfD0g U0JfUFJFVkVOVElOR19TVVNQRU5EOworCX0KKwlsYXN0X3NsZWVwX3RpbWVfdXBkYXRlID0gbm93 OworfQorCit2b2lkIGFib3V0X3RvX2VudGVyX3N1c3BlbmQodm9pZCkKK3sKKwl3YWl0X2Zvcl93 YWtldXAgPSB0cnVlOworfQorCisjZWxzZQorCitzdGF0aWMgaW5saW5lIHZvaWQgc3VzcGVuZF9i bG9ja2VyX3N0YXRfaW5pdF9sb2NrZWQoCisJCQkJCXN0cnVjdCBzdXNwZW5kX2Jsb2NrZXIgKmJs b2NrZXIpIHt9CitzdGF0aWMgaW5saW5lIHZvaWQgc3VzcGVuZF9ibG9ja2VyX3N0YXRfZGVzdHJv eV9sb2NrZWQoCisJCQkJCXN0cnVjdCBzdXNwZW5kX2Jsb2NrZXIgKmJsb2NrZXIpIHt9CitzdGF0 aWMgaW5saW5lIHZvaWQgc3VzcGVuZF9ibG9ja19zdGF0X2xvY2tlZCgKKwkJCQkJc3RydWN0IHN1 c3BlbmRfYmxvY2tlciAqYmxvY2tlcikge30KK3N0YXRpYyBpbmxpbmUgdm9pZCBzdXNwZW5kX3Vu YmxvY2tfc3RhdF9sb2NrZWQoCisJCQkJCXN0cnVjdCBzdXNwZW5kX2Jsb2NrZXIgKmJsb2NrZXIp IHt9CitzdGF0aWMgaW5saW5lIHZvaWQgdXBkYXRlX3NsZWVwX3dhaXRfc3RhdHNfbG9ja2VkKGJv b2wgZG9uZSkge30KKwogc3RhdGljIGludCBzdXNwZW5kX2Jsb2NrZXJfc3RhdHNfc2hvdyhzdHJ1 Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIHsKIAl1bnNpZ25lZCBsb25nIGlycWZsYWdz OwpAQCAtNzIsNiArMjIxLDggQEAgc3RhdGljIGludCBzdXNwZW5kX2Jsb2NrZXJfc3RhdHNfc2hv dyhzdHJ1Y3Qgc2VxX2ZpbGUgKm0sIHZvaWQgKnVudXNlZCkKIAlyZXR1cm4gMDsKIH0KIAorI2Vu ZGlmCisKIHN0YXRpYyB2b2lkIHByaW50X2FjdGl2ZV9ibG9ja2Vyc19sb2NrZWQodm9pZCkKIHsK IAlzdHJ1Y3Qgc3VzcGVuZF9ibG9ja2VyICpibG9ja2VyOwpAQCAtMTAyLDIwICsyNTMsMzEgQEAg c3RhdGljIHZvaWQgc3VzcGVuZF93b3JrZXIoc3RydWN0IHdvcmtfc3RydWN0ICp3b3JrKQogCWlu dCBlbnRyeV9ldmVudF9udW07CiAKIAllbmFibGVfc3VzcGVuZF9ibG9ja2VycyA9IHRydWU7Ci0J d2hpbGUgKCFzdXNwZW5kX2lzX2Jsb2NrZWQoKSkgewotCQllbnRyeV9ldmVudF9udW0gPSBjdXJy ZW50X2V2ZW50X251bTsKIAorCWlmIChzdXNwZW5kX2lzX2Jsb2NrZWQoKSkgewogCQlpZiAoZGVi dWdfbWFzayAmIERFQlVHX1NVU1BFTkQpCi0JCQlwcl9pbmZvKCJzdXNwZW5kOiBlbnRlciBzdXNw ZW5kXG4iKTsKKwkJCXByX2luZm8oInN1c3BlbmQ6IGFib3J0IHN1c3BlbmRcbiIpOworCQlnb3Rv IGFib3J0OworCX0KKworCWVudHJ5X2V2ZW50X251bSA9IGN1cnJlbnRfZXZlbnRfbnVtOwogCi0J CXJldCA9IHBtX3N1c3BlbmQocmVxdWVzdGVkX3N1c3BlbmRfc3RhdGUpOworCWlmIChkZWJ1Z19t YXNrICYgREVCVUdfU1VTUEVORCkKKwkJcHJfaW5mbygic3VzcGVuZDogZW50ZXIgc3VzcGVuZFxu Iik7CiAKLQkJaWYgKGRlYnVnX21hc2sgJiBERUJVR19FWElUX1NVU1BFTkQpCi0JCQlwcl9pbmZv X3RpbWUoInN1c3BlbmQ6IGV4aXQgc3VzcGVuZCwgcmV0ID0gJWQgIiwgcmV0KTsKKwlyZXQgPSBw bV9zdXNwZW5kKHJlcXVlc3RlZF9zdXNwZW5kX3N0YXRlKTsKIAotCQlpZiAoY3VycmVudF9ldmVu dF9udW0gPT0gZW50cnlfZXZlbnRfbnVtKQorCWlmIChkZWJ1Z19tYXNrICYgREVCVUdfRVhJVF9T VVNQRU5EKQorCQlwcl9pbmZvX3RpbWUoInN1c3BlbmQ6IGV4aXQgc3VzcGVuZCwgcmV0ID0gJWQg IiwgcmV0KTsKKworCWlmIChjdXJyZW50X2V2ZW50X251bSA9PSBlbnRyeV9ldmVudF9udW0pIHsK KwkJaWYgKGRlYnVnX21hc2sgJiBERUJVR19TVVNQRU5EKQogCQkJcHJfaW5mbygic3VzcGVuZDog cG1fc3VzcGVuZCByZXR1cm5lZCB3aXRoIG5vIGV2ZW50XG4iKTsKKworCQlzdXNwZW5kX2Jsb2Nr KCZ1bmtub3duX3dha2V1cCk7CisJCXN1c3BlbmRfdW5ibG9jaygmdW5rbm93bl93YWtldXApOwog CX0KK2Fib3J0OgogCWVuYWJsZV9zdXNwZW5kX2Jsb2NrZXJzID0gZmFsc2U7CiB9CiBzdGF0aWMg REVDTEFSRV9XT1JLKHN1c3BlbmRfd29yaywgc3VzcGVuZF93b3JrZXIpOwpAQCAtMTQyLDYgKzMw NCw3IEBAIHZvaWQgc3VzcGVuZF9ibG9ja2VyX2luaXQoc3RydWN0IHN1c3BlbmRfYmxvY2tlciAq YmxvY2tlciwgY29uc3QgY2hhciAqbmFtZSkKIAlJTklUX0xJU1RfSEVBRCgmYmxvY2tlci0+bGlu ayk7CiAKIAlzcGluX2xvY2tfaXJxc2F2ZSgmbGlzdF9sb2NrLCBpcnFmbGFncyk7CisJc3VzcGVu ZF9ibG9ja2VyX3N0YXRfaW5pdF9sb2NrZWQoYmxvY2tlcik7CiAJbGlzdF9hZGQoJmJsb2NrZXIt PmxpbmssICZpbmFjdGl2ZV9ibG9ja2Vycyk7CiAJc3Bpbl91bmxvY2tfaXJxcmVzdG9yZSgmbGlz dF9sb2NrLCBpcnFmbGFncyk7CiB9CkBAIC0xNjEsNiArMzI0LDcgQEAgdm9pZCBzdXNwZW5kX2Js b2NrZXJfZGVzdHJveShzdHJ1Y3Qgc3VzcGVuZF9ibG9ja2VyICpibG9ja2VyKQogCQlwcl9pbmZv KCJzdXNwZW5kX2Jsb2NrZXJfZGVzdHJveSBuYW1lPSVzXG4iLCBibG9ja2VyLT5uYW1lKTsKIAog CXNwaW5fbG9ja19pcnFzYXZlKCZsaXN0X2xvY2ssIGlycWZsYWdzKTsKKwlzdXNwZW5kX2Jsb2Nr ZXJfc3RhdF9kZXN0cm95X2xvY2tlZChibG9ja2VyKTsKIAlibG9ja2VyLT5mbGFncyAmPSB+U0Jf SU5JVElBTElaRUQ7CiAJbGlzdF9kZWwoJmJsb2NrZXItPmxpbmspOwogCWlmICgoYmxvY2tlci0+ ZmxhZ3MgJiBTQl9BQ1RJVkUpICYmIGxpc3RfZW1wdHkoJmFjdGl2ZV9ibG9ja2VycykpCkBAIC0x ODcsOSArMzUxLDE0IEBAIHZvaWQgc3VzcGVuZF9ibG9jayhzdHJ1Y3Qgc3VzcGVuZF9ibG9ja2Vy ICpibG9ja2VyKQogCWlmIChkZWJ1Z19tYXNrICYgREVCVUdfU1VTUEVORF9CTE9DS0VSKQogCQlw cl9pbmZvKCJzdXNwZW5kX2Jsb2NrOiAlc1xuIiwgYmxvY2tlci0+bmFtZSk7CiAKKwlzdXNwZW5k X2Jsb2NrX3N0YXRfbG9ja2VkKGJsb2NrZXIpOwogCWJsb2NrZXItPmZsYWdzIHw9IFNCX0FDVElW RTsKIAlsaXN0X21vdmUoJmJsb2NrZXItPmxpbmssICZhY3RpdmVfYmxvY2tlcnMpOwogCWN1cnJl bnRfZXZlbnRfbnVtKys7CisJaWYgKGJsb2NrZXIgPT0gJm1haW5fc3VzcGVuZF9ibG9ja2VyKQor CQl1cGRhdGVfc2xlZXBfd2FpdF9zdGF0c19sb2NrZWQodHJ1ZSk7CisJZWxzZSBpZiAoIXN1c3Bl bmRfYmxvY2tlcl9pc19hY3RpdmUoJm1haW5fc3VzcGVuZF9ibG9ja2VyKSkKKwkJdXBkYXRlX3Ns ZWVwX3dhaXRfc3RhdHNfbG9ja2VkKGZhbHNlKTsKIAogCXNwaW5fdW5sb2NrX2lycXJlc3RvcmUo Jmxpc3RfbG9jaywgaXJxZmxhZ3MpOwogfQpAQCAtMjE1LDYgKzM4NCw3IEBAIHZvaWQgc3VzcGVu ZF91bmJsb2NrKHN0cnVjdCBzdXNwZW5kX2Jsb2NrZXIgKmJsb2NrZXIpCiAJaWYgKGRlYnVnX21h c2sgJiBERUJVR19TVVNQRU5EX0JMT0NLRVIpCiAJCXByX2luZm8oInN1c3BlbmRfdW5ibG9jazog JXNcbiIsIGJsb2NrZXItPm5hbWUpOwogCisJc3VzcGVuZF91bmJsb2NrX3N0YXRfbG9ja2VkKGJs b2NrZXIpOwogCWxpc3RfbW92ZSgmYmxvY2tlci0+bGluaywgJmluYWN0aXZlX2Jsb2NrZXJzKTsK IAogCWlmICgoYmxvY2tlci0+ZmxhZ3MgJiBTQl9BQ1RJVkUpICYmIGxpc3RfZW1wdHkoJmFjdGl2 ZV9ibG9ja2VycykpCkBAIC0yMjMsNiArMzkzLDcgQEAgdm9pZCBzdXNwZW5kX3VuYmxvY2soc3Ry dWN0IHN1c3BlbmRfYmxvY2tlciAqYmxvY2tlcikKIAlpZiAoYmxvY2tlciA9PSAmbWFpbl9zdXNw ZW5kX2Jsb2NrZXIpIHsKIAkJaWYgKGRlYnVnX21hc2sgJiBERUJVR19TVVNQRU5EKQogCQkJcHJp bnRfYWN0aXZlX2Jsb2NrZXJzX2xvY2tlZCgpOworCQl1cGRhdGVfc2xlZXBfd2FpdF9zdGF0c19s b2NrZWQoZmFsc2UpOwogCX0KIAlzcGluX3VubG9ja19pcnFyZXN0b3JlKCZsaXN0X2xvY2ssIGly cWZsYWdzKTsKIH0KQEAgLTI4OCw2ICs0NTksMTEgQEAgdm9pZCBfX2luaXQgc3VzcGVuZF9ibG9j a19pbml0KHZvaWQpCiB7CiAJc3VzcGVuZF9ibG9ja2VyX2luaXQoJm1haW5fc3VzcGVuZF9ibG9j a2VyLCAibWFpbiIpOwogCXN1c3BlbmRfYmxvY2soJm1haW5fc3VzcGVuZF9ibG9ja2VyKTsKKwlz dXNwZW5kX2Jsb2NrZXJfaW5pdCgmdW5rbm93bl93YWtldXAsICJ1bmtub3duX3dha2V1cHMiKTsK KyNpZmRlZiBDT05GSUdfU1VTUEVORF9CTE9DS0VSX1NUQVRTCisJc3VzcGVuZF9ibG9ja2VyX2lu aXQoJmRlbGV0ZWRfc3VzcGVuZF9ibG9ja2VycywKKwkJCQkiZGVsZXRlZF9zdXNwZW5kX2Jsb2Nr ZXJzIik7CisjZW5kaWYKIH0KIAogc3RhdGljIGludCBfX2luaXQgc3VzcGVuZF9ibG9ja19wb3N0 Y29yZV9pbml0KHZvaWQpCi0tIAoxLjYuNS4xCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fXwpsaW51eC1wbSBtYWlsaW5nIGxpc3QKbGludXgtcG1AbGlzdHMu bGludXgtZm91bmRhdGlvbi5vcmcKaHR0cHM6Ly9saXN0cy5saW51eC1mb3VuZGF0aW9uLm9yZy9t YWlsbWFuL2xpc3RpbmZvL2xpbnV4LXBt From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933076Ab0D3WjB (ORCPT ); Fri, 30 Apr 2010 18:39:01 -0400 Received: from mail-yx0-f171.google.com ([209.85.210.171]:41056 "EHLO mail-yx0-f171.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1759875Ab0D3Wh2 (ORCPT ); Fri, 30 Apr 2010 18:37:28 -0400 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= To: linux-pm@lists.linux-foundation.org, linux-kernel@vger.kernel.org Cc: "Rafael J. Wysocki" , Alan Stern , Tejun Heo , Oleg Nesterov , =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= , Pavel Machek , Len Brown , Jesse Barnes , Magnus Damm , Wu Fengguang , Andrew Morton , Maxim Levitsky Subject: [PATCH 5/8] PM: suspend_block: Add suspend_blocker stats Date: Fri, 30 Apr 2010 15:36:58 -0700 Message-Id: <1272667021-21312-6-git-send-email-arve@android.com> X-Mailer: git-send-email 1.6.5.1 In-Reply-To: <1272667021-21312-5-git-send-email-arve@android.com> References: <1272667021-21312-1-git-send-email-arve@android.com> <1272667021-21312-2-git-send-email-arve@android.com> <1272667021-21312-3-git-send-email-arve@android.com> <1272667021-21312-4-git-send-email-arve@android.com> <1272667021-21312-5-git-send-email-arve@android.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Report suspend block stats in /sys/kernel/debug/suspend_blockers. Signed-off-by: Arve Hjønnevåg --- include/linux/suspend_blocker.h | 21 ++++- kernel/power/Kconfig | 7 ++ kernel/power/power.h | 5 + kernel/power/suspend.c | 4 +- kernel/power/suspend_blocker.c | 190 +++++++++++++++++++++++++++++++++++++-- 5 files changed, 218 insertions(+), 9 deletions(-) diff --git a/include/linux/suspend_blocker.h b/include/linux/suspend_blocker.h index f9928cc..c80764c 100755 --- a/include/linux/suspend_blocker.h +++ b/include/linux/suspend_blocker.h @@ -17,12 +17,21 @@ #define _LINUX_SUSPEND_BLOCKER_H #include +#include /** * struct suspend_blocker - the basic suspend_blocker structure * @link: List entry for active or inactive list. - * @flags: Tracks initialized and active state. + * @flags: Tracks initialized, active and stats state. * @name: Name used for debugging. + * @count: Number of times this blocker has been deacivated + * @wakeup_count: Number of times this blocker was the first to block suspend + * after resume. + * @total_time: Total time this suspend blocker has prevented suspend. + * @prevent_suspend_time: Time this suspend blocker has prevented suspend while + * user-space requested suspend. + * @max_time: Max time this suspend blocker has been continuously active + * @last_time: Monotonic clock when the active state last changed. * * When a suspend_blocker is active it prevents the system from entering * opportunistic suspend. @@ -35,6 +44,16 @@ struct suspend_blocker { struct list_head link; int flags; const char *name; +#ifdef CONFIG_SUSPEND_BLOCKER_STATS + struct { + int count; + int wakeup_count; + ktime_t total_time; + ktime_t prevent_suspend_time; + ktime_t max_time; + ktime_t last_time; + } stat; +#endif #endif }; diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig index fe5a2f2..4bcba07 100644 --- a/kernel/power/Kconfig +++ b/kernel/power/Kconfig @@ -146,6 +146,13 @@ config OPPORTUNISTIC_SUSPEND determines the sleep state the system will be put into when there are no active suspend blockers. +config SUSPEND_BLOCKER_STATS + bool "Suspend block stats" + depends on OPPORTUNISTIC_SUSPEND + default y + ---help--- + Report suspend block stats in /sys/kernel/debug/suspend_blockers + config USER_SUSPEND_BLOCKERS bool "Userspace suspend blockers" depends on OPPORTUNISTIC_SUSPEND diff --git a/kernel/power/power.h b/kernel/power/power.h index 67d10fd..897c116 100644 --- a/kernel/power/power.h +++ b/kernel/power/power.h @@ -245,3 +245,8 @@ extern void __init suspend_block_init(void); #else static inline void suspend_block_init(void) {} #endif +#ifdef CONFIG_SUSPEND_BLOCKER_STATS +void about_to_enter_suspend(void); +#else +static inline void about_to_enter_suspend(void) {} +#endif diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index dc42006..6d327ea 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -159,8 +159,10 @@ static int suspend_enter(suspend_state_t state) error = sysdev_suspend(PMSG_SUSPEND); if (!error) { - if (!suspend_is_blocked() && !suspend_test(TEST_CORE)) + if (!suspend_is_blocked() && !suspend_test(TEST_CORE)) { + about_to_enter_suspend(); error = suspend_ops->enter(state); + } sysdev_resume(); } diff --git a/kernel/power/suspend_blocker.c b/kernel/power/suspend_blocker.c index ced4993..77920e6 100644 --- a/kernel/power/suspend_blocker.c +++ b/kernel/power/suspend_blocker.c @@ -34,6 +34,7 @@ module_param_named(debug_mask, debug_mask, int, S_IRUGO | S_IWUSR | S_IWGRP); #define SB_INITIALIZED (1U << 8) #define SB_ACTIVE (1U << 9) +#define SB_PREVENTING_SUSPEND (1U << 10) static DEFINE_SPINLOCK(list_lock); static DEFINE_SPINLOCK(state_lock); @@ -43,6 +44,7 @@ static int current_event_num; struct suspend_blocker main_suspend_blocker; static suspend_state_t requested_suspend_state = PM_SUSPEND_MEM; static bool enable_suspend_blockers; +static struct suspend_blocker unknown_wakeup; static struct dentry *suspend_blocker_stats_dentry; #define pr_info_time(fmt, args...) \ @@ -57,6 +59,153 @@ static struct dentry *suspend_blocker_stats_dentry; tm.tm_hour, tm.tm_min, tm.tm_sec, ts.tv_nsec); \ } while (0); +#ifdef CONFIG_SUSPEND_BLOCKER_STATS +static struct suspend_blocker deleted_suspend_blockers; +static ktime_t last_sleep_time_update; +static bool wait_for_wakeup; + +static int print_blocker_stat(struct seq_file *m, + struct suspend_blocker *blocker) +{ + int lock_count = blocker->stat.count; + ktime_t active_time = ktime_set(0, 0); + ktime_t total_time = blocker->stat.total_time; + ktime_t max_time = blocker->stat.max_time; + ktime_t prevent_suspend_time = blocker->stat.prevent_suspend_time; + if (blocker->flags & SB_ACTIVE) { + ktime_t now, add_time; + now = ktime_get(); + add_time = ktime_sub(now, blocker->stat.last_time); + lock_count++; + active_time = add_time; + total_time = ktime_add(total_time, add_time); + if (blocker->flags & SB_PREVENTING_SUSPEND) + prevent_suspend_time = ktime_add(prevent_suspend_time, + ktime_sub(now, last_sleep_time_update)); + if (add_time.tv64 > max_time.tv64) + max_time = add_time; + } + + return seq_printf(m, "\"%s\"\t%d\t%d\t%lld\t%lld\t%lld\t%lld\t%lld\n", + blocker->name, lock_count, blocker->stat.wakeup_count, + ktime_to_ns(active_time), ktime_to_ns(total_time), + ktime_to_ns(prevent_suspend_time), ktime_to_ns(max_time), + ktime_to_ns(blocker->stat.last_time)); +} + + +static int suspend_blocker_stats_show(struct seq_file *m, void *unused) +{ + unsigned long irqflags; + struct suspend_blocker *blocker; + + seq_puts(m, "name\tcount\twake_count\tactive_since" + "\ttotal_time\tsleep_time\tmax_time\tlast_change\n"); + spin_lock_irqsave(&list_lock, irqflags); + list_for_each_entry(blocker, &inactive_blockers, link) + print_blocker_stat(m, blocker); + list_for_each_entry(blocker, &active_blockers, link) + print_blocker_stat(m, blocker); + spin_unlock_irqrestore(&list_lock, irqflags); + return 0; +} + +static void suspend_blocker_stat_init_locked(struct suspend_blocker *blocker) +{ + blocker->stat.count = 0; + blocker->stat.wakeup_count = 0; + blocker->stat.total_time = ktime_set(0, 0); + blocker->stat.prevent_suspend_time = ktime_set(0, 0); + blocker->stat.max_time = ktime_set(0, 0); + blocker->stat.last_time = ktime_set(0, 0); +} + +static void suspend_blocker_stat_destroy_locked(struct suspend_blocker *bl) +{ + if (!bl->stat.count) + return; + deleted_suspend_blockers.stat.count += bl->stat.count; + deleted_suspend_blockers.stat.total_time = ktime_add( + deleted_suspend_blockers.stat.total_time, bl->stat.total_time); + deleted_suspend_blockers.stat.prevent_suspend_time = ktime_add( + deleted_suspend_blockers.stat.prevent_suspend_time, + bl->stat.prevent_suspend_time); + deleted_suspend_blockers.stat.max_time = ktime_add( + deleted_suspend_blockers.stat.max_time, bl->stat.max_time); +} + +static void suspend_unblock_stat_locked(struct suspend_blocker *blocker) +{ + ktime_t duration; + ktime_t now; + if (!(blocker->flags & SB_ACTIVE)) + return; + now = ktime_get(); + blocker->stat.count++; + duration = ktime_sub(now, blocker->stat.last_time); + blocker->stat.total_time = + ktime_add(blocker->stat.total_time, duration); + if (ktime_to_ns(duration) > ktime_to_ns(blocker->stat.max_time)) + blocker->stat.max_time = duration; + blocker->stat.last_time = ktime_get(); + if (blocker->flags & SB_PREVENTING_SUSPEND) { + duration = ktime_sub(now, last_sleep_time_update); + blocker->stat.prevent_suspend_time = ktime_add( + blocker->stat.prevent_suspend_time, duration); + blocker->flags &= ~SB_PREVENTING_SUSPEND; + } +} + +static void suspend_block_stat_locked(struct suspend_blocker *blocker) +{ + if (wait_for_wakeup) { + if (debug_mask & DEBUG_WAKEUP) + pr_info("wakeup suspend blocker: %s\n", blocker->name); + wait_for_wakeup = false; + blocker->stat.wakeup_count++; + } + if (!(blocker->flags & SB_ACTIVE)) + blocker->stat.last_time = ktime_get(); +} + +static void update_sleep_wait_stats_locked(bool done) +{ + struct suspend_blocker *blocker; + ktime_t now, elapsed, add; + + now = ktime_get(); + elapsed = ktime_sub(now, last_sleep_time_update); + list_for_each_entry(blocker, &active_blockers, link) { + if (blocker->flags & SB_PREVENTING_SUSPEND) { + add = elapsed; + blocker->stat.prevent_suspend_time = ktime_add( + blocker->stat.prevent_suspend_time, add); + } + if (done) + blocker->flags &= ~SB_PREVENTING_SUSPEND; + else + blocker->flags |= SB_PREVENTING_SUSPEND; + } + last_sleep_time_update = now; +} + +void about_to_enter_suspend(void) +{ + wait_for_wakeup = true; +} + +#else + +static inline void suspend_blocker_stat_init_locked( + struct suspend_blocker *blocker) {} +static inline void suspend_blocker_stat_destroy_locked( + struct suspend_blocker *blocker) {} +static inline void suspend_block_stat_locked( + struct suspend_blocker *blocker) {} +static inline void suspend_unblock_stat_locked( + struct suspend_blocker *blocker) {} +static inline void update_sleep_wait_stats_locked(bool done) {} + static int suspend_blocker_stats_show(struct seq_file *m, void *unused) { unsigned long irqflags; @@ -72,6 +221,8 @@ static int suspend_blocker_stats_show(struct seq_file *m, void *unused) return 0; } +#endif + static void print_active_blockers_locked(void) { struct suspend_blocker *blocker; @@ -102,20 +253,31 @@ static void suspend_worker(struct work_struct *work) int entry_event_num; enable_suspend_blockers = true; - while (!suspend_is_blocked()) { - entry_event_num = current_event_num; + if (suspend_is_blocked()) { if (debug_mask & DEBUG_SUSPEND) - pr_info("suspend: enter suspend\n"); + pr_info("suspend: abort suspend\n"); + goto abort; + } + + entry_event_num = current_event_num; - ret = pm_suspend(requested_suspend_state); + if (debug_mask & DEBUG_SUSPEND) + pr_info("suspend: enter suspend\n"); - if (debug_mask & DEBUG_EXIT_SUSPEND) - pr_info_time("suspend: exit suspend, ret = %d ", ret); + ret = pm_suspend(requested_suspend_state); - if (current_event_num == entry_event_num) + if (debug_mask & DEBUG_EXIT_SUSPEND) + pr_info_time("suspend: exit suspend, ret = %d ", ret); + + if (current_event_num == entry_event_num) { + if (debug_mask & DEBUG_SUSPEND) pr_info("suspend: pm_suspend returned with no event\n"); + + suspend_block(&unknown_wakeup); + suspend_unblock(&unknown_wakeup); } +abort: enable_suspend_blockers = false; } static DECLARE_WORK(suspend_work, suspend_worker); @@ -142,6 +304,7 @@ void suspend_blocker_init(struct suspend_blocker *blocker, const char *name) INIT_LIST_HEAD(&blocker->link); spin_lock_irqsave(&list_lock, irqflags); + suspend_blocker_stat_init_locked(blocker); list_add(&blocker->link, &inactive_blockers); spin_unlock_irqrestore(&list_lock, irqflags); } @@ -161,6 +324,7 @@ void suspend_blocker_destroy(struct suspend_blocker *blocker) pr_info("suspend_blocker_destroy name=%s\n", blocker->name); spin_lock_irqsave(&list_lock, irqflags); + suspend_blocker_stat_destroy_locked(blocker); blocker->flags &= ~SB_INITIALIZED; list_del(&blocker->link); if ((blocker->flags & SB_ACTIVE) && list_empty(&active_blockers)) @@ -187,9 +351,14 @@ void suspend_block(struct suspend_blocker *blocker) if (debug_mask & DEBUG_SUSPEND_BLOCKER) pr_info("suspend_block: %s\n", blocker->name); + suspend_block_stat_locked(blocker); blocker->flags |= SB_ACTIVE; list_move(&blocker->link, &active_blockers); current_event_num++; + if (blocker == &main_suspend_blocker) + update_sleep_wait_stats_locked(true); + else if (!suspend_blocker_is_active(&main_suspend_blocker)) + update_sleep_wait_stats_locked(false); spin_unlock_irqrestore(&list_lock, irqflags); } @@ -215,6 +384,7 @@ void suspend_unblock(struct suspend_blocker *blocker) if (debug_mask & DEBUG_SUSPEND_BLOCKER) pr_info("suspend_unblock: %s\n", blocker->name); + suspend_unblock_stat_locked(blocker); list_move(&blocker->link, &inactive_blockers); if ((blocker->flags & SB_ACTIVE) && list_empty(&active_blockers)) @@ -223,6 +393,7 @@ void suspend_unblock(struct suspend_blocker *blocker) if (blocker == &main_suspend_blocker) { if (debug_mask & DEBUG_SUSPEND) print_active_blockers_locked(); + update_sleep_wait_stats_locked(false); } spin_unlock_irqrestore(&list_lock, irqflags); } @@ -288,6 +459,11 @@ void __init suspend_block_init(void) { suspend_blocker_init(&main_suspend_blocker, "main"); suspend_block(&main_suspend_blocker); + suspend_blocker_init(&unknown_wakeup, "unknown_wakeups"); +#ifdef CONFIG_SUSPEND_BLOCKER_STATS + suspend_blocker_init(&deleted_suspend_blockers, + "deleted_suspend_blockers"); +#endif } static int __init suspend_block_postcore_init(void) -- 1.6.5.1