From: Alexandru Stefan ISAILA Subject: [PATCH RFC v4] x86/mm: Clean up p2m_finish_type_change return value Date: Wed, 27 Mar 2019 15:21:22 +0000 Message-ID: <20190327152107.29288-1-aisaila@bitdefender.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1h9AMo-0006tO-GK for xen-devel@lists.xenproject.org; Wed, 27 Mar 2019 15:21:26 +0000 Content-Language: en-US List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: "xen-devel@lists.xenproject.org" Cc: "kevin.tian@intel.com" , "wei.liu2@citrix.com" , "jun.nakajima@intel.com" , "george.dunlap@eu.citrix.com" , "andrew.cooper3@citrix.com" , "Paul.Durrant@citrix.com" , "jbeulich@suse.com" , Alexandru Stefan ISAILA , "roger.pau@citrix.com" List-Id: xen-devel@lists.xenproject.org SW4gdGhlIGNhc2Ugb2YgYW55IGVycm9ycywgZmluaXNoX3R5cGVfY2hhbmdlKCkgcGFzc2VzIHZh bHVlcyByZXR1cm5lZApmcm9tIHAybS0+cmVjYWxjKCkgdXAgdGhlIHN0YWNrICh3aXRoIHNvbWUg ZXhjZXB0aW9ucyBpbiB0aGUgY2FzZSB3aGVyZQphbiBlcnJvciBpcyBleHBlY3RlZCk7IHRoaXMg ZXZlbnR1YWxseSBlbmRzIHVwIGJlaW5nIHJldHVybmVkIHRvIHRoZQpYRU5fRE9NT1BfbWFwX21l bV90eXBlX3RvX2lvcmVxX3NlcnZlciBoeXBlcmNhbGwuCgpIb3dldmVyLCBvbiBJbnRlbCBwcm9j ZXNzb3JzIChidXQgbm90IG9uIEFNRCBwcm9jZXNzb3IpLCBwMm0tPnJlY2FsYygpCmNhbiBhbHNv IHJldHVybiAnMScgYXMgd2VsbCBhcyAnMCcuICBUaGlzIGNhc2UgaXMgaGFuZGxlZCB2ZXJ5Cmlu Y29uc2lzdGVudGx5OiBmaW5pc2hfdHlwZV9jaGFuZ2UoKSB3aWxsIHJldHVybiB0aGUgdmFsdWUg b2YgdGhlIGZpbmFsCmVudHJ5IGl0IGF0dGVtcHRzLCBkaXNjYXJkaW5nIHJlc3VsdHMgZm9yIG90 aGVyIGVudHJpZXM7CnAybV9maW5pc2hfdHlwZV9jaGFuZ2UoKSB3aWxsIGF0dGVtcHQgdG8gYWNj dW11bGF0ZSAnMSdzLCBzbyB0aGF0IGl0CnJldHVybnMgJzEnIGlmIGFueSBvZiB0aGUgY2FsbHMg dG8gZmluaXNoX3R5cGVfY2hhbmdlKCkgcmV0dXJucyAnMSc7IGFuZApkbV9vcCgpIHdpbGwgYWdh aW4gcmV0dXJuICcxJyBvbmx5IGlmIHRoZSB2ZXJ5IGxhc3QgY2FsbCB0bwpwMm1fZmluaXNoX3R5 cGVfY2hhbmdlKCkgcmV0dXJucyAnMScuICBUaGUgcmVzdWx0IGlzIHRoYXQgdGhlClhFTl9ETU9Q X21hcF9tZW1fdHlwZV90b19pb3JlcV9zZXJ2ZXIoKSBoeXBlcmNhbGwgd2lsbCBzb21ldGltZXMg cmV0dXJuCjAgYW5kIHNvbWV0aW1lcyByZXR1cm4gMSBvbiBzdWNjZXNzLCBpbiBhbiB1bnByZWRp Y3RhYmxlIG1hbm5lci4KClRoZSBoeXBlcmNhbGwgZG9jdW1lbnRhdGlvbiBkb2Vzbid0IG1lbnRp b24gcmV0dXJuIHZhbHVlczsgYnV0IGl0J3Mgbm90CmNsZWFyIHdoYXQgdGhlIGNhbGxlciBjb3Vs ZCBkbyB3aXRoIHRoZSBpbmZvcm1hdGlvbiBhYm91dCB3aGV0aGVyCmVudHJpZXMgaGFkIGJlZW4g Y2hhbmdlZCBvciBub3QuICBBdCB0aGUgbW9tZW50IGl0J3MgYWx3YXlzIDAgb24gQU1ECmJveGVz LCBhbmQgKnVzdWFsbHkqIDEgb24gSW50ZWwgYm94ZXM7IHNvIG5vdGhpbmcgY2FuIGJlIHJlbHlp bmcgb24gYQonMScgcmV0dXJuIHZhbHVlIGZvciBjb3JyZWN0bmVzcyAob3IgaWYgaXQgaXMsIGl0 J3MgYnJva2VuKS4KCk1ha2UgdGhlIHJldHVybiB2YWx1ZSBvbiBzdWNjZXNzIGNvbnNpc3RlbnRs eSAnMCcgYnkgb25seSByZXR1cm5pbmcKMC8tRVJST1IgZnJvbSBmaW5pc2hfdHlwZV9jaGFuZ2Uo KS4gIEFsc28gcmVtb3ZlIHRoZSBhY2N1bXVsYXRpb24gY29kZQpmcm9tIHAybV9maW5pc2hfdHlw ZV9jaGFuZ2UoKS4KClN1Z2dlc3RlZC1ieTogR2VvcmdlIER1bmxhcCA8Z2VvcmdlLmR1bmxhcEBl dS5jaXRyaXguY29tPgpTaWduZWQtb2ZmLWJ5OiBBbGV4YW5kcnUgSXNhaWxhIDxhaXNhaWxhQGJp dGRlZmVuZGVyLmNvbT4KCi0tLQpDaGFuZ2VzIHNpbmNlIFYzOgoJLSBSZW1vdmUgcG9zaXRpdmUg cmV0dXJuZWQgdmFsdWVzIGZyb20gcDJtLT5yZWNhbGMuCi0tLQogeGVuL2FyY2gveDg2L21tL3Ay bS1lcHQuYyB8IDEwICsrKysrKy0tLS0KIHhlbi9hcmNoL3g4Ni9tbS9wMm0uYyAgICAgfCAxNSAr KysrKy0tLS0tLS0tLS0KIDIgZmlsZXMgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgMTQgZGVs ZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYyBiL3hlbi9h cmNoL3g4Ni9tbS9wMm0tZXB0LmMKaW5kZXggZTMwNDRiZWUyZS4uZDMzNmMxMzhiMCAxMDA2NDQK LS0tIGEveGVuL2FyY2gveDg2L21tL3AybS1lcHQuYworKysgYi94ZW4vYXJjaC94ODYvbW0vcDJt LWVwdC5jCkBAIC00NTksOCArNDU5LDcgQEAgc3RhdGljIGludCBlcHRfaW52YWxpZGF0ZV9lbXRf cmFuZ2Uoc3RydWN0IHAybV9kb21haW4gKnAybSwKICAqICAgZm9yIGVudHJpZXMgbm90IGludm9s dmVkIGluIHRoZSB0cmFuc2xhdGlvbiBvZiB0aGUgZ2l2ZW4gR0ZOLgogICogUmV0dXJuczoKICAq IC0gbmVnYXRpdmUgZXJybm8gdmFsdWVzIGluIGVycm9yLAotICogLSB6ZXJvIGlmIG5vIGFkanVz dG1lbnQgd2FzIGRvbmUsCi0gKiAtIGEgcG9zaXRpdmUgdmFsdWUgaWYgYXQgbGVhc3Qgb25lIGFk anVzdG1lbnQgd2FzIGRvbmUuCisgKiAtIHplcm8gZm9yIG9rCiAgKi8KIHN0YXRpYyBpbnQgcmVz b2x2ZV9taXNjb25maWcoc3RydWN0IHAybV9kb21haW4gKnAybSwgdW5zaWduZWQgbG9uZyBnZm4p CiB7CkBAIC02MDAsNiArNTk5LDkgQEAgc3RhdGljIGludCByZXNvbHZlX21pc2NvbmZpZyhzdHJ1 Y3QgcDJtX2RvbWFpbiAqcDJtLCB1bnNpZ25lZCBsb25nIGdmbikKICAgICAgICAgICAgIHYtPmFy Y2guaHZtLnZteC5lcHRfc3B1cmlvdXNfbWlzY29uZmlnID0gMTsKICAgICB9CiAKKyAgICBpZiAo IHJjID4gMCApCisgICAgICAgIHJjID0gMDsKKwogICAgIHJldHVybiByYzsKIH0KIApAQCAtNjIx LDcgKzYyMyw3IEBAIGJvb2xfdCBlcHRfaGFuZGxlX21pc2NvbmZpZyh1aW50NjRfdCBncGEpCiAK ICAgICBwMm1fdW5sb2NrKHAybSk7CiAKLSAgICByZXR1cm4gc3B1cmlvdXMgPyAocmMgPj0gMCkg OiAocmMgPiAwKTsKKyAgICByZXR1cm4gc3B1cmlvdXMgJiYgIXJjOwogfQogCiAvKgpAQCAtNjY4 LDcgKzY3MCw3IEBAIGVwdF9zZXRfZW50cnkoc3RydWN0IHAybV9kb21haW4gKnAybSwgZ2ZuX3Qg Z2ZuXywgbWZuX3QgbWZuLAogCiAgICAgLyogQ2Fycnkgb3V0IGFueSBldmVudHVhbGx5IHBlbmRp bmcgZWFybGllciBjaGFuZ2VzIGZpcnN0LiAqLwogICAgIHJldCA9IHJlc29sdmVfbWlzY29uZmln KHAybSwgZ2ZuKTsKLSAgICBpZiAoIHJldCA8IDAgKQorICAgIGlmICggcmV0ICkKICAgICAgICAg cmV0dXJuIHJldDsKIAogICAgIEFTU0VSVCgodGFyZ2V0ID09IDIgJiYgaGFwX2hhc18xZ2IpIHx8 CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0vcDJtLmMgYi94ZW4vYXJjaC94ODYvbW0vcDJt LmMKaW5kZXggYjliYmI4ZjQ4NS4uZDU2OTBiOTZiZiAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2 L21tL3AybS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tbS9wMm0uYwpAQCAtMTE3Miw3ICsxMTcyLDcg QEAgc3RhdGljIGludCBmaW5pc2hfdHlwZV9jaGFuZ2Uoc3RydWN0IHAybV9kb21haW4gKnAybSwK ICAgICB7CiAgICAgICAgIHJjID0gcDJtLT5yZWNhbGMocDJtLCBnZm4pOwogICAgICAgICAvKgot ICAgICAgICAgKiBlcHQtPnJlY2FsYyBjb3VsZCByZXR1cm4gMC8xLy1FTk9NRU0uIHB0LT5yZWNh bGMgY291bGQgcmV0dXJuCisgICAgICAgICAqIGVwdC0+cmVjYWxjIGNvdWxkIHJldHVybiAwLy1F Tk9NRU0uIHB0LT5yZWNhbGMgY291bGQgcmV0dXJuCiAgICAgICAgICAqIDAvLUVOT01FTS8tRU5P RU5ULCAtRU5PRU5UIGlzbid0IGFuIGVycm9yIGFzIHdlIGFyZSBsb29waW5nCiAgICAgICAgICAq IGdmbiBoZXJlLgogICAgICAgICAgKi8KQEAgLTEyMDEsNyArMTIwMSw3IEBAIGludCBwMm1fZmlu aXNoX3R5cGVfY2hhbmdlKHN0cnVjdCBkb21haW4gKmQsCiAKICAgICByYyA9IGZpbmlzaF90eXBl X2NoYW5nZShob3N0cDJtLCBmaXJzdF9nZm4sIG1heF9ucik7CiAKLSAgICBpZiAoIHJjIDwgMCAp CisgICAgaWYgKCByYyApCiAgICAgICAgIGdvdG8gb3V0OwogCiAjaWZkZWYgQ09ORklHX0hWTQpA QCAtMTIxMywyMiArMTIxMywxNyBAQCBpbnQgcDJtX2ZpbmlzaF90eXBlX2NoYW5nZShzdHJ1Y3Qg ZG9tYWluICpkLAogICAgICAgICAgICAgaWYgKCBkLT5hcmNoLmFsdHAybV9lcHRwW2ldICE9IG1m bl94KElOVkFMSURfTUZOKSApCiAgICAgICAgICAgICB7CiAgICAgICAgICAgICAgICAgc3RydWN0 IHAybV9kb21haW4gKmFsdHAybSA9IGQtPmFyY2guYWx0cDJtX3AybVtpXTsKLSAgICAgICAgICAg ICAgICBpbnQgcmMxOwogCiAgICAgICAgICAgICAgICAgcDJtX2xvY2soYWx0cDJtKTsKLSAgICAg ICAgICAgICAgICByYzEgPSBmaW5pc2hfdHlwZV9jaGFuZ2UoYWx0cDJtLCBmaXJzdF9nZm4sIG1h eF9ucik7CisgICAgICAgICAgICAgICAgcmMgPSBmaW5pc2hfdHlwZV9jaGFuZ2UoYWx0cDJtLCBm aXJzdF9nZm4sIG1heF9ucik7CiAgICAgICAgICAgICAgICAgcDJtX3VubG9jayhhbHRwMm0pOwog Ci0gICAgICAgICAgICAgICAgaWYgKCByYzEgPCAwICkKLSAgICAgICAgICAgICAgICB7Ci0gICAg ICAgICAgICAgICAgICAgIHJjID0gcmMxOworICAgICAgICAgICAgICAgIGlmICggcmMgPCAwICkK ICAgICAgICAgICAgICAgICAgICAgZ290byBvdXQ7Ci0gICAgICAgICAgICAgICAgfQotCi0gICAg ICAgICAgICAgICAgcmMgfD0gcmMxOwogICAgICAgICAgICAgfQogICAgIH0KICNlbmRpZgorICAg IHJjID0gMDsKIAogIG91dDoKICAgICBwMm1fdW5sb2NrKGhvc3RwMm0pOwotLSAKMi4xNy4xCgoK X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVs IG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5vcmcKaHR0cHM6Ly9saXN0 cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZlbA==