Return-Path: From: Tvrtko Ursulin Date: Wed, 10 Feb 2021 09:37:55 +0000 Message-Id: <20210210093756.61424-2-tvrtko.ursulin@linux.intel.com> In-Reply-To: <20210210093756.61424-1-tvrtko.ursulin@linux.intel.com> References: <20210210093756.61424-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH i-g-t 2/3] intel_gpu_top: Aggregate clients by PID by default List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: igt-dev@lists.freedesktop.org Cc: Intel-gfx@lists.freedesktop.org List-ID: RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCkltcGxlbWVu dCBhIGRlZmF1bHQgdmlldyB3aGVyZSBjbGllbnRzIGFyZSBhZ2dyZWdhdGVkIGJ5IHRoZWlyIFBJ RC4KClRvZ2dsZWQgYnkgcHJlc3NpbmcgJ0gnIHNpbWlsYXIgdG8gdG9wKDEpLgoKU2lnbmVkLW9m Zi1ieTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KLS0tCiBtYW4v aW50ZWxfZ3B1X3RvcC5yc3QgfCAgIDEgKwogdG9vbHMvaW50ZWxfZ3B1X3RvcC5jIHwgMTA5ICsr KysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKysrKystLS0tLQogMiBmaWxlcyBjaGFuZ2Vk LCA5NyBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9tYW4vaW50 ZWxfZ3B1X3RvcC5yc3QgYi9tYW4vaW50ZWxfZ3B1X3RvcC5yc3QKaW5kZXggYjE0NWQ4NWMwNDQw Li4yMDY1OGUyOTFkYjAgMTAwNjQ0Ci0tLSBhL21hbi9pbnRlbF9ncHVfdG9wLnJzdAorKysgYi9t YW4vaW50ZWxfZ3B1X3RvcC5yc3QKQEAgLTU4LDYgKzU4LDcgQEAgU3VwcG9ydGVkIGtleXM6CiAg ICAgJ24nICAgIFRvZ2dsZSBkaXNwbGF5IG9mIG51bWVyaWMgY2xpZW50IGJ1c3luZXNzIG92ZXJs YXkuCiAgICAgJ3MnICAgIFRvZ2dsZSBiZXR3ZWVuIHNvcnQgbW9kZXMgKHJ1bnRpbWUsIHRvdGFs IHJ1bnRpbWUsIHBpZCwgY2xpZW50IGlkKS4KICAgICAnaScgICAgVG9nZ2xlIGRpc3BsYXkgb2Yg Y2xpZW50cyB3aGljaCB1c2VkIG5vIEdQVSB0aW1lLgorICAgICdIJyAgICBUb2dnbGUgYmV0d2Vl biBwZXIgUElEIGFnZ3JlZ2F0aW9uIGFuZCBpbmRpdmlkdWFsIGNsaWVudHMuCiAKIERFVklDRSBT RUxFQ1RJT04KID09PT09PT09PT09PT09PT0KZGlmZiAtLWdpdCBhL3Rvb2xzL2ludGVsX2dwdV90 b3AuYyBiL3Rvb2xzL2ludGVsX2dwdV90b3AuYwppbmRleCA2M2VmNzcwNTYzNDEuLjAxOGUyOGE2 NmMxMCAxMDA2NDQKLS0tIGEvdG9vbHMvaW50ZWxfZ3B1X3RvcC5jCisrKyBiL3Rvb2xzL2ludGVs X2dwdV90b3AuYwpAQCAtOTc5LDE3ICs5NzksMTggQEAgc3RhdGljIGludCBjbGllbnRfcGlkX2Nt cChjb25zdCB2b2lkICpfYSwgY29uc3Qgdm9pZCAqX2IpCiAKIHN0YXRpYyBpbnQgKCpjbGllbnRf Y21wKShjb25zdCB2b2lkICosIGNvbnN0IHZvaWQgKikgPSBjbGllbnRfbGFzdF9jbXA7CiAKLXN0 YXRpYyB2b2lkIHNvcnRfY2xpZW50cyhzdHJ1Y3QgY2xpZW50cyAqY2xpZW50cykKK3N0YXRpYyBz dHJ1Y3QgY2xpZW50cyAqc29ydF9jbGllbnRzKHN0cnVjdCBjbGllbnRzICpjbGllbnRzLAorCQkJ CSAgICBpbnQgKCpjbXApKGNvbnN0IHZvaWQgKiwgY29uc3Qgdm9pZCAqKSkKIHsKIAl1bnNpZ25l ZCBpbnQgYWN0aXZlLCBmcmVlOwogCXN0cnVjdCBjbGllbnQgKmM7CiAJaW50IHRtcDsKIAogCWlm ICghY2xpZW50cykKLQkJcmV0dXJuOworCQlyZXR1cm4gY2xpZW50czsKIAogCXFzb3J0KGNsaWVu dHMtPmNsaWVudCwgY2xpZW50cy0+bnVtX2NsaWVudHMsIHNpemVvZigqY2xpZW50cy0+Y2xpZW50 KSwKLQkgICAgICBjbGllbnRfY21wKTsKKwkgICAgICBjbXApOwogCiAJLyogVHJpbSBleGNlc3Np dmUgYXJyYXkgc3BhY2UuICovCiAJYWN0aXZlID0gMDsKQEAgLTEwMTEsOSArMTAxMiw3NiBAQCBz dGF0aWMgdm9pZCBzb3J0X2NsaWVudHMoc3RydWN0IGNsaWVudHMgKmNsaWVudHMpCiAJCQkJCQkg IHNpemVvZigqYykpOwogCQl9CiAJfQorCisJcmV0dXJuIGNsaWVudHM7Cit9CisKK3N0YXRpYyBz dHJ1Y3QgY2xpZW50cyAqYWdncmVnYXRlZF9jbGllbnRzKHN0cnVjdCBjbGllbnRzICpjbGllbnRz KQoreworCXN0cnVjdCBjbGllbnQgKmFjLCAqYywgKmNwID0gTlVMTDsKKwlzdHJ1Y3QgY2xpZW50 cyAqYWdncmVnYXRlZDsKKwlpbnQgdG1wLCBudW0gPSAwOworCisJLyogU29ydCBieSBwaWQgZmly c3QgdG8gbWFrZSBpdCBlYXN5IHRvIGFnZ3JlZ2F0ZSB3aGlsZSB3YWxraW5nLiAqLworCXNvcnRf Y2xpZW50cyhjbGllbnRzLCBjbGllbnRfcGlkX2NtcCk7CisKKwlhZ2dyZWdhdGVkID0gY2FsbG9j KDEsIHNpemVvZigqY2xpZW50cykpOworCWFzc2VydChhZ2dyZWdhdGVkKTsKKworCWFjID0gY2Fs bG9jKGNsaWVudHMtPm51bV9jbGllbnRzLCBzaXplb2YoKmMpKTsKKwlhc3NlcnQoYWMpOworCisJ YWdncmVnYXRlZC0+bnVtX2NsYXNzZXMgPSBjbGllbnRzLT5udW1fY2xhc3NlczsKKwlhZ2dyZWdh dGVkLT5jbGFzcyA9IGNsaWVudHMtPmNsYXNzOworCWFnZ3JlZ2F0ZWQtPmNsaWVudCA9IGFjOwor CisJZm9yX2VhY2hfY2xpZW50KGNsaWVudHMsIGMsIHRtcCkgeworCQl1bnNpZ25lZCBpbnQgaTsK KworCQlpZiAoYy0+c3RhdHVzID09IEZSRUUpCisJCQlicmVhazsKKworCQlhc3NlcnQoYy0+c3Rh dHVzID09IEFMSVZFKTsKKworCQlpZiAoKGNwICYmIGMtPnBpZCAhPSBjcC0+cGlkKSB8fCAhY3Ap IHsKKwkJCWFjID0gJmFnZ3JlZ2F0ZWQtPmNsaWVudFtudW1dOworCisJCQkvKiBOZXcgcGlkLiAq LworCQkJYWMtPmNsaWVudHMgPSBhZ2dyZWdhdGVkOworCQkJYWMtPnN0YXR1cyA9IEFMSVZFOwor CQkJYWMtPmlkID0gKytudW07CisJCQlhYy0+cGlkID0gYy0+cGlkOworCQkJc3RyY3B5KGFjLT5u YW1lLCBjLT5uYW1lKTsKKwkJCXN0cmNweShhYy0+cHJpbnRfbmFtZSwgYy0+cHJpbnRfbmFtZSk7 CisJCQlhYy0+ZW5naW5lcyA9IGMtPmVuZ2luZXM7CisJCQlhYy0+dmFsID0gY2FsbG9jKGNsaWVu dHMtPm51bV9jbGFzc2VzLAorCQkJCQkgc2l6ZW9mKGFjLT52YWxbMF0pKTsKKwkJCWFzc2VydChh Yy0+dmFsKTsKKwkJCWFjLT5zYW1wbGVzID0gMTsKKwkJfQorCisJCWNwID0gYzsKKworCQlpZiAo Yy0+c2FtcGxlcyA8IDIpCisJCQljb250aW51ZTsKKworCQlhYy0+c2FtcGxlcyA9IDI7IC8qIEFs bCB3aGF0IG1hdHRlcnMgZm9yIGRpc3BsYXkuICovCisJCWFjLT50b3RhbF9ydW50aW1lICs9IGMt PnRvdGFsX3J1bnRpbWU7CisJCWFjLT5sYXN0X3J1bnRpbWUgKz0gYy0+bGFzdF9ydW50aW1lOwor CisJCWZvciAoaSA9IDA7IGkgPCBjbGllbnRzLT5udW1fY2xhc3NlczsgaSsrKQorCQkJYWMtPnZh bFtpXSArPSBjLT52YWxbaV07CisJfQorCisJYWdncmVnYXRlZC0+bnVtX2NsaWVudHMgPSBudW07 CisJYWdncmVnYXRlZC0+YWN0aXZlX2NsaWVudHMgPSBudW07CisKKwlyZXR1cm4gc29ydF9jbGll bnRzKGFnZ3JlZ2F0ZWQsIGNsaWVudF9jbXApOwogfQogCi1zdGF0aWMgdm9pZCBzY2FuX2NsaWVu dHMoc3RydWN0IGNsaWVudHMgKmNsaWVudHMpCitzdGF0aWMgYm9vbCBhZ2dyZWdhdGVfcGlkcyA9 IHRydWU7CisKK3N0YXRpYyBzdHJ1Y3QgY2xpZW50cyAqc2Nhbl9jbGllbnRzKHN0cnVjdCBjbGll bnRzICpjbGllbnRzKQogewogCXN0cnVjdCBkaXJlbnQgKmRlbnQ7CiAJc3RydWN0IGNsaWVudCAq YzsKQEAgLTEwMjIsNyArMTA5MCw3IEBAIHN0YXRpYyB2b2lkIHNjYW5fY2xpZW50cyhzdHJ1Y3Qg Y2xpZW50cyAqY2xpZW50cykKIAlESVIgKmQ7CiAKIAlpZiAoIWNsaWVudHMpCi0JCXJldHVybjsK KwkJcmV0dXJuIGNsaWVudHM7CiAKIAlmb3JfZWFjaF9jbGllbnQoY2xpZW50cywgYywgdG1wKSB7 CiAJCWFzc2VydChjLT5zdGF0dXMgIT0gUFJPQkUpOwpAQCAtMTAzNCw3ICsxMTAyLDcgQEAgc3Rh dGljIHZvaWQgc2Nhbl9jbGllbnRzKHN0cnVjdCBjbGllbnRzICpjbGllbnRzKQogCiAJZCA9IG9w ZW5kaXIoY2xpZW50cy0+c3lzZnNfcm9vdCk7CiAJaWYgKCFkKQotCQlyZXR1cm47CisJCXJldHVy biBjbGllbnRzOwogCiAJd2hpbGUgKChkZW50ID0gcmVhZGRpcihkKSkgIT0gTlVMTCkgewogCQlj aGFyIG5hbWVbMjRdLCBwaWRbMjRdOwpAQCAtMTA3Nyw3ICsxMTQ1LDEwIEBAIHN0YXRpYyB2b2lk IHNjYW5fY2xpZW50cyhzdHJ1Y3QgY2xpZW50cyAqY2xpZW50cykKIAkJCWJyZWFrOwogCX0KIAot CXNvcnRfY2xpZW50cyhjbGllbnRzKTsKKwlpZiAoYWdncmVnYXRlX3BpZHMpCisJCXJldHVybiBh Z2dyZWdhdGVkX2NsaWVudHMoY2xpZW50cyk7CisJZWxzZQorCQlyZXR1cm4gc29ydF9jbGllbnRz KGNsaWVudHMsIGNsaWVudF9jbXApOwogfQogCiBzdGF0aWMgY29uc3QgY2hhciAqYmFyc1tdID0g eyAiICIsICLilo8iLCAi4paOIiwgIuKWjSIsICLilowiLCAi4paLIiwgIuKWiiIsICLilokiLCAi 4paIIiB9OwpAQCAtMjIyNyw2ICsyMjk4LDEzIEBAIHN0YXRpYyB2b2lkIHByb2Nlc3Nfc3RkaW4o dW5zaWduZWQgaW50IHRpbWVvdXRfdXMpCiAJCWNhc2UgJ3MnOgogCQkJc2VsZWN0X2NsaWVudF9z b3J0KCk7CiAJCQlicmVhazsKKwkJY2FzZSAnSCc6CisJCQlhZ2dyZWdhdGVfcGlkcyBePSB0cnVl OworCQkJaWYgKGFnZ3JlZ2F0ZV9waWRzKQorCQkJCWhlYWRlcl9tc2cgPSAiQWdncmVnYXRpbmcg Y2xpZW50cy4iOworCQkJZWxzZQorCQkJCWhlYWRlcl9tc2cgPSAiU2hvd2luZyBpbmRpdmlkdWFs IGNsaWVudHMuIjsKKwkJCWJyZWFrOwogCQl9OwogCX0KIH0KQEAgLTIzNzgsNiArMjQ1Niw3IEBA IGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAljb2RlbmFtZSA9IGlndF9kZXZpY2Vf Z2V0X3ByZXR0eV9uYW1lKCZjYXJkLCBmYWxzZSk7CiAKIAl3aGlsZSAoIXN0b3BfdG9wKSB7CisJ CXN0cnVjdCBjbGllbnRzICpkaXNwX2NsaWVudHM7CiAJCWJvb2wgY29uc3VtZWQgPSBmYWxzZTsK IAkJaW50IGosIGxpbmVzID0gMDsKIAkJc3RydWN0IHdpbnNpemUgd3M7CkBAIC0yNDAwLDcgKzI0 NzksNyBAQCBpbnQgbWFpbihpbnQgYXJnYywgY2hhciAqKmFyZ3YpCiAJCXBtdV9zYW1wbGUoZW5n aW5lcyk7CiAJCXQgPSAoZG91YmxlKShlbmdpbmVzLT50cy5jdXIgLSBlbmdpbmVzLT50cy5wcmV2 KSAvIDFlOTsKIAotCQlzY2FuX2NsaWVudHMoY2xpZW50cyk7CisJCWRpc3BfY2xpZW50cyA9IHNj YW5fY2xpZW50cyhjbGllbnRzKTsKIAogCQlpZiAoc3RvcF90b3ApCiAJCQlicmVhazsKQEAgLTI0 MTYsMTQgKzI0OTUsMTQgQEAgaW50IG1haW4oaW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCiAJCQls aW5lcyA9IHByaW50X2VuZ2luZXMoZW5naW5lcywgdCwgbGluZXMsIGNvbl93LCBjb25faCk7CiAK LQkJCWlmIChjbGllbnRzKSB7CisJCQlpZiAoZGlzcF9jbGllbnRzKSB7CiAJCQkJaW50IGNsYXNz X3c7CiAKLQkJCQlsaW5lcyA9IHByaW50X2NsaWVudHNfaGVhZGVyKGNsaWVudHMsIGxpbmVzLAor CQkJCWxpbmVzID0gcHJpbnRfY2xpZW50c19oZWFkZXIoZGlzcF9jbGllbnRzLCBsaW5lcywKIAkJ CQkJCQkgICAgIGNvbl93LCBjb25faCwKIAkJCQkJCQkgICAgICZjbGFzc193KTsKIAotCQkJCWZv cl9lYWNoX2NsaWVudChjbGllbnRzLCBjLCBqKSB7CisJCQkJZm9yX2VhY2hfY2xpZW50KGRpc3Bf Y2xpZW50cywgYywgaikgewogCQkJCQlhc3NlcnQoYy0+c3RhdHVzICE9IFBST0JFKTsKIAkJCQkJ aWYgKGMtPnN0YXR1cyAhPSBBTElWRSkKIAkJCQkJCWJyZWFrOyAvKiBBY3RpdmUgY2xpZW50cyBh cmUgZmlyc3QgaW4gdGhlIGFycmF5LiAqLwpAQCAtMjQzNyw4ICsyNTE2LDkgQEAgaW50IG1haW4o aW50IGFyZ2MsIGNoYXIgKiphcmd2KQogCQkJCQkJCSAgICAgJmNsYXNzX3cpOwogCQkJCX0KIAot CQkJCWxpbmVzID0gcHJpbnRfY2xpZW50c19mb290ZXIoY2xpZW50cywgdCwgbGluZXMsCi0JCQkJ CQkJICAgICBjb25fdywgY29uX2gpOworCQkJCWxpbmVzID0gcHJpbnRfY2xpZW50c19mb290ZXIo ZGlzcF9jbGllbnRzLCB0LAorCQkJCQkJCSAgICAgbGluZXMsIGNvbl93LAorCQkJCQkJCSAgICAg Y29uX2gpOwogCQkJfQogCiAJCQlwb3BzLT5jbG9zZV9zdHJ1Y3QoKTsKQEAgLTI0NDcsNiArMjUy Nyw5IEBAIGludCBtYWluKGludCBhcmdjLCBjaGFyICoqYXJndikKIAkJaWYgKHN0b3BfdG9wKQog CQkJYnJlYWs7CiAKKwkJaWYgKGRpc3BfY2xpZW50cyAhPSBjbGllbnRzKQorCQkJZnJlZShkaXNw X2NsaWVudHMpOworCiAJCWlmIChvdXRwdXRfbW9kZSA9PSBJTlRFUkFDVElWRSkKIAkJCXByb2Nl c3Nfc3RkaW4ocGVyaW9kX3VzKTsKIAkJZWxzZQotLSAKMi4yNy4wCgpfX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0Cklu dGVsLWdmeEBsaXN0cy5mcmVlZGVza3RvcC5vcmcKaHR0cHM6Ly9saXN0cy5mcmVlZGVza3RvcC5v cmcvbWFpbG1hbi9saXN0aW5mby9pbnRlbC1nZngK