From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Lai Subject: [PATCH Altp2m cleanup 2/3 v12 2/3] Altp2m cleanup: cleaning up partial memory allocations in hap_enable(). Date: Thu, 10 Nov 2016 15:45:51 -0800 Message-ID: <1478821552-1497-3-git-send-email-paul.c.lai@intel.com> References: <1478821552-1497-1-git-send-email-paul.c.lai@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1478821552-1497-1-git-send-email-paul.c.lai@intel.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: xen-devel@lists.xensource.com Cc: ravi.sahita@intel.com, george.dunlap@citrix.com, jbeulich@suse.com List-Id: xen-devel@lists.xenproject.org SW4gaGFwX2VuYWJsZSgpLCBjbGVhbiB1cCBtZW1vcnkgbGVha3MgdXBvbiBmYWlsdXJlIG9mIGFs dHAybV9kb21haW5faW5pdCgpLgpDb21tZW50IHRoZSBtZW1vcnkgZXJyb3IgaGFuZGxpbmcgdG8g aGVscCBtYXRjaCBhbGxvY3Mgd2l0aCBjbGVhbnVwcy4KQ29uc29saWRhdGUgdGhlIG1lbW9yeSBl cnJvciBoYW5kaW5nIGludG8gc2luZ2xlIGNvZGUgcGF0aC4KLS0tCiB4ZW4vYXJjaC94ODYvbW0v aGFwL2hhcC5jIHwgNDIgKysrKysrKysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0t CiAxIGZpbGUgY2hhbmdlZCwgMjIgaW5zZXJ0aW9ucygrKSwgMjAgZGVsZXRpb25zKC0pCgpkaWZm IC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL2hhcC9oYXAuYyBiL3hlbi9hcmNoL3g4Ni9tbS9oYXAv aGFwLmMKaW5kZXggN2ZlNmY4My4uZTYzZmZiMCAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L21t L2hhcC9oYXAuYworKysgYi94ZW4vYXJjaC94ODYvbW0vaGFwL2hhcC5jCkBAIC0zNyw2ICszNyw3 IEBACiAjaW5jbHVkZSA8YXNtL2hhcC5oPgogI2luY2x1ZGUgPGFzbS9wYWdpbmcuaD4KICNpbmNs dWRlIDxhc20vcDJtLmg+CisjaW5jbHVkZSA8YXNtL2FsdHAybS5oPgogI2luY2x1ZGUgPGFzbS9k b21haW4uaD4KICNpbmNsdWRlIDx4ZW4vbnVtYS5oPgogI2luY2x1ZGUgPGFzbS9odm0vbmVzdGVk aHZtLmg+CkBAIC00ODgsNDMgKzQ4OSw0NCBAQCBpbnQgaGFwX2VuYWJsZShzdHJ1Y3QgZG9tYWlu ICpkLCB1MzIgbW9kZSkKICAgICAvKiBhbGxvY2F0ZSBQMm0gdGFibGUgKi8KICAgICBpZiAoIG1v ZGUgJiBQR190cmFuc2xhdGUgKQogICAgIHsKKyAgICAgICAgLyogcDJtX2FsbG9jX3RhYmxlKCkg IzEgKi8KICAgICAgICAgcnYgPSBwMm1fYWxsb2NfdGFibGUocDJtX2dldF9ob3N0cDJtKGQpKTsK ICAgICAgICAgaWYgKCBydiAhPSAwICkKICAgICAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAog ICAgIGZvciAoaSA9IDA7IGkgPCBNQVhfTkVTVEVEUDJNOyBpKyspIHsKKyAgICAgICAgLyogbmVz dGVkIHAybV9hbGxvY190YWJsZSgpICMyICovCiAgICAgICAgIHJ2ID0gcDJtX2FsbG9jX3RhYmxl KGQtPmFyY2gubmVzdGVkX3AybVtpXSk7CiAgICAgICAgIGlmICggcnYgIT0gMCApCiAgICAgICAg ICAgIGdvdG8gb3V0OwogICAgIH0KIAotICAgIGlmICggaHZtX2FsdHAybV9zdXBwb3J0ZWQoKSAp Ci0gICAgewotICAgICAgICAvKiBJbml0IGFsdGVybmF0ZSBwMm0gZGF0YSAqLwotICAgICAgICBp ZiAoIChkLT5hcmNoLmFsdHAybV9lcHRwID0gYWxsb2NfeGVuaGVhcF9wYWdlKCkpID09IE5VTEwg KQotICAgICAgICB7Ci0gICAgICAgICAgICBydiA9IC1FTk9NRU07Ci0gICAgICAgICAgICBnb3Rv IG91dDsKLSAgICAgICAgfQorICAgIGlmICggKHJ2ID0gYWx0cDJtX2RvbWFpbl9pbml0KGQpKSA8 IDAgKQorICAgICAgICBnb3RvIG91dDsKIAotICAgICAgICBmb3IgKCBpID0gMDsgaSA8IE1BWF9F UFRQOyBpKysgKQotICAgICAgICAgICAgZC0+YXJjaC5hbHRwMm1fZXB0cFtpXSA9IG1mbl94KElO VkFMSURfTUZOKTsKKyAgICAvKiBOb3cgbGV0IG90aGVyIHVzZXJzIHNlZSB0aGUgbmV3IG1vZGUg Ki8KKyAgICBkLT5hcmNoLnBhZ2luZy5tb2RlID0gbW9kZSB8IFBHX0hBUF9lbmFibGU7CiAKLSAg ICAgICAgZm9yICggaSA9IDA7IGkgPCBNQVhfQUxUUDJNOyBpKysgKQotICAgICAgICB7Ci0gICAg ICAgICAgICBydiA9IHAybV9hbGxvY190YWJsZShkLT5hcmNoLmFsdHAybV9wMm1baV0pOwotICAg ICAgICAgICAgaWYgKCBydiAhPSAwICkKLSAgICAgICAgICAgICAgIGdvdG8gb3V0OwotICAgICAg ICB9CisgICAgZG9tYWluX3VucGF1c2UoZCk7CisgICAgcmV0dXJuIHJ2OwogCi0gICAgICAgIGQt PmFyY2guYWx0cDJtX2FjdGl2ZSA9IDA7Cisgb3V0OgorICAgIC8qIFVucmF2ZWwgdGhlIHBhcnRp YWwgbmVzdGVkIHAybV9hbGxvY190YWJsZSgpICMyIGFib3ZlICovCisgICAgZm9yICggaSA9IDA7 IGkgPCBNQVhfTkVTVEVEUDJNOyBpKysgKQorICAgIHsKKyAgICAgICAgcDJtX3RlYXJkb3duKGQt PmFyY2gubmVzdGVkX3AybVtpXSk7CiAgICAgfQogCi0gICAgLyogTm93IGxldCBvdGhlciB1c2Vy cyBzZWUgdGhlIG5ldyBtb2RlICovCi0gICAgZC0+YXJjaC5wYWdpbmcubW9kZSA9IG1vZGUgfCBQ R19IQVBfZW5hYmxlOworICAgIC8qIFVucmF2ZWwgcDJtX2FsbG9jX3RhYmxlKCkgIzEgYWJvdmUg Ki8KKyAgICBwMm1fdGVhcmRvd24ocDJtX2dldF9ob3N0cDJtKGQpKTsKKworICAgIC8qIFVucmF2 ZWwgdGhlIGhhcF9zZXRfYWxsb2NhdGlvbihkLCAyNTYsIE5VTEwpIGFib3ZlICovCisgICAgcGFn aW5nX2xvY2soZCk7CisgICAgaGFwX3NldF9hbGxvY2F0aW9uKGQsIDAsIE5VTEwpOworICAgIEFT U0VSVChkLT5hcmNoLnBhZ2luZy5oYXAucDJtX3BhZ2VzID09IDApOworICAgIHBhZ2luZ191bmxv Y2soZCk7CiAKLSBvdXQ6CiAgICAgZG9tYWluX3VucGF1c2UoZCk7CiAgICAgcmV0dXJuIHJ2Owog fQotLSAKMi43LjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBz Oi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK