From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH RFC v1 16/74] x86/fixmap: Modify fix_to_virt() to return a void pointer Date: Thu, 4 Jan 2018 13:05:27 +0000 Message-ID: <20180104130625.28605-17-wei.liu2@citrix.com> References: <20180104130625.28605-1-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from all-amaz-eas1.inumbo.com ([34.197.232.57]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eX5Zm-00048d-QZ for xen-devel@lists.xenproject.org; Thu, 04 Jan 2018 13:28:54 +0000 In-Reply-To: <20180104130625.28605-1-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" To: Xen-devel Cc: wei.liu2@citrix.com List-Id: xen-devel@lists.xenproject.org RnJvbTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0cml4LmNvbT4KCkFsbW9zdCBh bGwgdXNlcnMgb2YgZml4X3RvX3ZpcnQoKSBhY3R1YWxseSB3YW50IGEgcG9pbnRlci4gIEluY2x1 ZGUgdGhlIGNhc3QKd2l0aGluIHRoZSBkZWZpbml0aW9uLCBzbyB0aGUgY2FsbGVycyBkb24ndCBu ZWVkIHRvLgoKVHdvIHVzZXJzIHdoaWNoIG5lZWQgdGhlIGludGVnZXIgdmFsdWUgYXJlIHN3aXRj aGVkIHRvIHVzaW5nIF9fZml4X3RvX3ZpcnQoKQpkaXJlY3RseS4gIEEgZmV3IHVzZXJzIHN0YXkg ZnVsbHkgdW5jaGFuZ2VkLCBkdWUgdG8gR0NDJ3Mgdm9pZCBwb2ludGVyCmFyaXRobWV0aWMgZXh0 ZW5zaW9uIGNhdXNpbmcgdGhlIHNhbWUgYmVoYXZpb3VyLiAgTW9zdCB1c2VycyBob3dldmVyIGhh dmUKdGhlaXIgZXhwbGljaXQgY2FzdGluZyBkcm9wcGVkLgoKTm8gZnVuY3Rpb25hbCBjaGFuZ2Uu CgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29t PgpSZXZpZXdlZC1ieTogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNvbT4KLS0tCiB4ZW4vYXJj aC94ODYvYWNwaS9saWIuYyAgICAgICAgIHwgMiArLQogeGVuL2FyY2gveDg2L21tLmMgICAgICAg ICAgICAgICB8IDQgKystLQogeGVuL2FyY2gveDg2L21wcGFyc2UuYyAgICAgICAgICB8IDIgKy0K IHhlbi9hcmNoL3g4Ni9tc2kuYyAgICAgICAgICAgICAgfCAzICstLQogeGVuL2FyY2gveDg2L3Ri b290LmMgICAgICAgICAgICB8IDQgKystLQogeGVuL2RyaXZlcnMvYWNwaS9hcGVpL2FwZWktaW8u YyB8IDIgKy0KIHhlbi9kcml2ZXJzL2NoYXIvZWhjaS1kYmdwLmMgICAgfCAyICstCiB4ZW4vZHJp dmVycy9jaGFyL25zMTY1NTAuYyAgICAgIHwgMiArLQogeGVuL2luY2x1ZGUvYXNtLXg4Ni9hcGlj ZGVmLmggICB8IDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYvZml4bWFwLmggICAgfCAyICstCiAx MCBmaWxlcyBjaGFuZ2VkLCAxMiBpbnNlcnRpb25zKCspLCAxMyBkZWxldGlvbnMoLSkKCmRpZmYg LS1naXQgYS94ZW4vYXJjaC94ODYvYWNwaS9saWIuYyBiL3hlbi9hcmNoL3g4Ni9hY3BpL2xpYi5j CmluZGV4IDdkN2M3MTg0OGIuLjI2NWI5YWQ4MTkgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9h Y3BpL2xpYi5jCisrKyBiL3hlbi9hcmNoL3g4Ni9hY3BpL2xpYi5jCkBAIC00OSw3ICs0OSw3IEBA IGNoYXIgKl9fYWNwaV9tYXBfdGFibGUocGFkZHJfdCBwaHlzLCB1bnNpZ25lZCBsb25nIHNpemUp CiAJb2Zmc2V0ID0gcGh5cyAmIChQQUdFX1NJWkUgLSAxKTsKIAltYXBwZWRfc2l6ZSA9IFBBR0Vf U0laRSAtIG9mZnNldDsKIAlzZXRfZml4bWFwKEZJWF9BQ1BJX0VORCwgcGh5cyk7Ci0JYmFzZSA9 IGZpeF90b192aXJ0KEZJWF9BQ1BJX0VORCk7CisJYmFzZSA9IF9fZml4X3RvX3ZpcnQoRklYX0FD UElfRU5EKTsKIAogCS8qCiAJICogTW9zdCBjYXNlcyBjYW4gYmUgY292ZXJlZCBieSB0aGUgYmVs b3cuCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbW0uYyBiL3hlbi9hcmNoL3g4Ni9tbS5jCmlu ZGV4IGE1NmY4NzVkNDUuLmY3M2ZlZTIyNWUgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9tbS5j CisrKyBiL3hlbi9hcmNoL3g4Ni9tbS5jCkBAIC01MjI3LDEyICs1MjI3LDEyIEBAIHZvaWQgX19z ZXRfZml4bWFwKAogICAgIGVudW0gZml4ZWRfYWRkcmVzc2VzIGlkeCwgdW5zaWduZWQgbG9uZyBt Zm4sIHVuc2lnbmVkIGxvbmcgZmxhZ3MpCiB7CiAgICAgQlVHX09OKGlkeCA+PSBfX2VuZF9vZl9m aXhlZF9hZGRyZXNzZXMpOwotICAgIG1hcF9wYWdlc190b194ZW4oZml4X3RvX3ZpcnQoaWR4KSwg bWZuLCAxLCBmbGFncyk7CisgICAgbWFwX3BhZ2VzX3RvX3hlbihfX2ZpeF90b192aXJ0KGlkeCks IG1mbiwgMSwgZmxhZ3MpOwogfQogCiB2b2lkICpfX2luaXQgYXJjaF92bWFwX3ZpcnRfZW5kKHZv aWQpCiB7Ci0gICAgcmV0dXJuICh2b2lkICopZml4X3RvX3ZpcnQoX19lbmRfb2ZfZml4ZWRfYWRk cmVzc2VzKTsKKyAgICByZXR1cm4gZml4X3RvX3ZpcnQoX19lbmRfb2ZfZml4ZWRfYWRkcmVzc2Vz KTsKIH0KIAogdm9pZCBfX2lvbWVtICppb3JlbWFwKHBhZGRyX3QgcGEsIHNpemVfdCBsZW4pCmRp ZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbXBwYXJzZS5jIGIveGVuL2FyY2gveDg2L21wcGFyc2Uu YwppbmRleCBhMWEwNzM4YTE5Li40OTE0MGU0NmYwIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYv bXBwYXJzZS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tcHBhcnNlLmMKQEAgLTcwMyw3ICs3MDMsNyBA QCBzdGF0aWMgdm9pZCBfX2luaXQgZWZpX2NoZWNrX2NvbmZpZyh2b2lkKQogCQlyZXR1cm47CiAK IAlfX3NldF9maXhtYXAoRklYX0VGSV9NUEYsIFBGTl9ET1dOKGVmaS5tcHMpLCBfX1BBR0VfSFlQ RVJWSVNPUik7Ci0JbXBmID0gKHZvaWQgKilmaXhfdG9fdmlydChGSVhfRUZJX01QRikgKyAoKGxv bmcpZWZpLm1wcyAmIChQQUdFX1NJWkUtMSkpOworCW1wZiA9IGZpeF90b192aXJ0KEZJWF9FRklf TVBGKSArICgobG9uZyllZmkubXBzICYgKFBBR0VfU0laRS0xKSk7CiAKIAlpZiAobWVtY21wKG1w Zi0+bXBmX3NpZ25hdHVyZSwgIl9NUF8iLCA0KSA9PSAwICYmCiAJICAgIG1wZi0+bXBmX2xlbmd0 aCA9PSAxICYmCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvbXNpLmMgYi94ZW4vYXJjaC94ODYv bXNpLmMKaW5kZXggMDk1YmQzY2FlNy4uOGM4OWYwNzJhOCAxMDA2NDQKLS0tIGEveGVuL2FyY2gv eDg2L21zaS5jCisrKyBiL3hlbi9hcmNoL3g4Ni9tc2kuYwpAQCAtOTYwLDggKzk2MCw3IEBAIHN0 YXRpYyBpbnQgbXNpeF9jYXBhYmlsaXR5X2luaXQoc3RydWN0IHBjaV9kZXYgKmRldiwKICAgICAg ICAgICAgIHhmcmVlKGVudHJ5KTsKICAgICAgICAgICAgIHJldHVybiBpZHg7CiAgICAgICAgIH0K LSAgICAgICAgYmFzZSA9ICh2b2lkICopKGZpeF90b192aXJ0KGlkeCkgKwotICAgICAgICAgICAg ICAgICAgICAgICAgKCh1bnNpZ25lZCBsb25nKWVudHJ5X3BhZGRyICYgKFBBR0VfU0laRSAtIDEp KSk7CisgICAgICAgIGJhc2UgPSBmaXhfdG9fdmlydChpZHgpICsgKGVudHJ5X3BhZGRyICYgKFBB R0VfU0laRSAtIDEpKTsKIAogICAgICAgICAvKiBNYXNrIGludGVycnVwdCBoZXJlICovCiAgICAg ICAgIHdyaXRlbCgxLCBiYXNlICsgUENJX01TSVhfRU5UUllfVkVDVE9SX0NUUkxfT0ZGU0VUKTsK ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni90Ym9vdC5jIGIveGVuL2FyY2gveDg2L3Rib290LmMK aW5kZXggNTlkN2M0NzdmNC4uZDM2YmYzMzQwNyAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3Ri b290LmMKKysrIGIveGVuL2FyY2gveDg2L3Rib290LmMKQEAgLTgyLDcgKzgyLDcgQEAgc3RhdGlj IHZvaWQgX19pbml0IHRib290X2NvcHlfbWVtb3J5KHVuc2lnbmVkIGNoYXIgKnZhLCB1aW50MzJf dCBzaXplLAogICAgICAgICB7CiAgICAgICAgICAgICBtYXBfYmFzZSA9IFBGTl9ET1dOKHBhICsg aSk7CiAgICAgICAgICAgICBzZXRfZml4bWFwKEZJWF9UQk9PVF9NQVBfQUREUkVTUywgbWFwX2Jh c2UgPDwgUEFHRV9TSElGVCk7Ci0gICAgICAgICAgICBtYXBfYWRkciA9ICh1bnNpZ25lZCBjaGFy ICopZml4X3RvX3ZpcnQoRklYX1RCT09UX01BUF9BRERSRVNTKTsKKyAgICAgICAgICAgIG1hcF9h ZGRyID0gZml4X3RvX3ZpcnQoRklYX1RCT09UX01BUF9BRERSRVNTKTsKICAgICAgICAgfQogICAg ICAgICB2YVtpXSA9IG1hcF9hZGRyW3BhICsgaSAtIChtYXBfYmFzZSA8PCBQQUdFX1NISUZUKV07 CiAgICAgfQpAQCAtOTgsNyArOTgsNyBAQCB2b2lkIF9faW5pdCB0Ym9vdF9wcm9iZSh2b2lkKQog CiAgICAgLyogTWFwIGFuZCBjaGVjayBmb3IgdGJvb3QgVVVJRC4gKi8KICAgICBzZXRfZml4bWFw KEZJWF9UQk9PVF9TSEFSRURfQkFTRSwgb3B0X3Rib290X3BhKTsKLSAgICB0Ym9vdF9zaGFyZWQg PSAodGJvb3Rfc2hhcmVkX3QgKilmaXhfdG9fdmlydChGSVhfVEJPT1RfU0hBUkVEX0JBU0UpOwor ICAgIHRib290X3NoYXJlZCA9IGZpeF90b192aXJ0KEZJWF9UQk9PVF9TSEFSRURfQkFTRSk7CiAg ICAgaWYgKCB0Ym9vdF9zaGFyZWQgPT0gTlVMTCApCiAgICAgICAgIHJldHVybjsKICAgICBpZiAo IG1lbWNtcCgmdGJvb3Rfc2hhcmVkX3V1aWQsICh1dWlkX3QgKil0Ym9vdF9zaGFyZWQsIHNpemVv Zih1dWlkX3QpKSApCmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9hY3BpL2FwZWkvYXBlaS1pby5j IGIveGVuL2RyaXZlcnMvYWNwaS9hcGVpL2FwZWktaW8uYwppbmRleCA4OTU1ZGU5MzVlLi44OWI3 MGY0NWVmIDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9hY3BpL2FwZWkvYXBlaS1pby5jCisrKyBi L3hlbi9kcml2ZXJzL2FjcGkvYXBlaS9hcGVpLWlvLmMKQEAgLTkyLDcgKzkyLDcgQEAgc3RhdGlj IHZvaWQgX19pb21lbSAqX19pbml0IGFwZWlfcmFuZ2VfbWFwKHBhZGRyX3QgcGFkZHIsIHVuc2ln bmVkIGxvbmcgc2l6ZSkKIAkJYXBlaV9yYW5nZV9ucisrOwogCX0KIAotCXJldHVybiAodm9pZCBf X2lvbWVtICopZml4X3RvX3ZpcnQoRklYX0FQRUlfUkFOR0VfQkFTRSArIHN0YXJ0X25yKTsKKwly ZXR1cm4gZml4X3RvX3ZpcnQoRklYX0FQRUlfUkFOR0VfQkFTRSArIHN0YXJ0X25yKTsKIH0KIAog LyoKZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL2NoYXIvZWhjaS1kYmdwLmMgYi94ZW4vZHJpdmVy cy9jaGFyL2VoY2ktZGJncC5jCmluZGV4IGQ0OGU3NzdjMzQuLmQwMDcxZDMxMTQgMTAwNjQ0Ci0t LSBhL3hlbi9kcml2ZXJzL2NoYXIvZWhjaS1kYmdwLmMKKysrIGIveGVuL2RyaXZlcnMvY2hhci9l aGNpLWRiZ3AuYwpAQCAtMTMyNyw3ICsxMzI3LDcgQEAgc3RhdGljIHZvaWQgX19pbml0IGVoY2lf ZGJncF9pbml0X3ByZWlycShzdHJ1Y3Qgc2VyaWFsX3BvcnQgKnBvcnQpCiAgICAgICogdGhhbiBl bm91Z2guICAxayBpcyB0aGUgYmlnZ2VzdCB0aGF0IHdhcyBzZWVuLgogICAgICAqLwogICAgIHNl dF9maXhtYXBfbm9jYWNoZShGSVhfRUhDSV9EQkdQLCBkYmdwLT5iYXJfdmFsKTsKLSAgICBlaGNp X2JhciA9ICh2b2lkIF9faW9tZW0gKilmaXhfdG9fdmlydChGSVhfRUhDSV9EQkdQKTsKKyAgICBl aGNpX2JhciA9IGZpeF90b192aXJ0KEZJWF9FSENJX0RCR1ApOwogICAgIGVoY2lfYmFyICs9IGRi Z3AtPmJhcl92YWwgJiB+UEFHRV9NQVNLOwogICAgIGRiZ3BfcHJpbnRrKCJlaGNpX2JhcjogJXBc biIsIGVoY2lfYmFyKTsKIApkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvY2hhci9uczE2NTUwLmMg Yi94ZW4vZHJpdmVycy9jaGFyL25zMTY1NTAuYwppbmRleCBlMGY4MTk5Zjk4Li5mMzJkYmQzMjQ3 IDEwMDY0NAotLS0gYS94ZW4vZHJpdmVycy9jaGFyL25zMTY1NTAuYworKysgYi94ZW4vZHJpdmVy cy9jaGFyL25zMTY1NTAuYwpAQCAtNjk3LDcgKzY5Nyw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBu czE2NTUwX2luaXRfcHJlaXJxKHN0cnVjdCBzZXJpYWxfcG9ydCAqcG9ydCkKICAgICAgICAgZW51 bSBmaXhlZF9hZGRyZXNzZXMgaWR4ID0gRklYX0NPTV9CRUdJTiArICh1YXJ0IC0gbnMxNjU1MF9j b20pOwogCiAgICAgICAgIHNldF9maXhtYXBfbm9jYWNoZShpZHgsIHVhcnQtPmlvX2Jhc2UpOwot ICAgICAgICB1YXJ0LT5yZW1hcHBlZF9pb19iYXNlID0gKHZvaWQgX19pb21lbSAqKWZpeF90b192 aXJ0KGlkeCk7CisgICAgICAgIHVhcnQtPnJlbWFwcGVkX2lvX2Jhc2UgPSBmaXhfdG9fdmlydChp ZHgpOwogICAgICAgICB1YXJ0LT5yZW1hcHBlZF9pb19iYXNlICs9IHVhcnQtPmlvX2Jhc2UgJiB+ UEFHRV9NQVNLOwogI2Vsc2UKICAgICAgICAgdWFydC0+cmVtYXBwZWRfaW9fYmFzZSA9IChjaGFy ICopaW9yZW1hcCh1YXJ0LT5pb19iYXNlLCB1YXJ0LT5pb19zaXplKTsKZGlmZiAtLWdpdCBhL3hl bi9pbmNsdWRlL2FzbS14ODYvYXBpY2RlZi5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9hcGljZGVm LmgKaW5kZXggZWVkNTA0YTMxYS4uY2U1MGM1M2YxOCAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUv YXNtLXg4Ni9hcGljZGVmLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9hcGljZGVmLmgKQEAg LTExOSw3ICsxMTksNyBAQAogLyogT25seSBhdmFpbGFibGUgaW4geDJBUElDIG1vZGUgKi8KICNk ZWZpbmUJCUFQSUNfU0VMRl9JUEkJMHgzRjAKIAotI2RlZmluZSBBUElDX0JBU0UgKGZpeF90b192 aXJ0KEZJWF9BUElDX0JBU0UpKQorI2RlZmluZSBBUElDX0JBU0UgKF9fZml4X3RvX3ZpcnQoRklY X0FQSUNfQkFTRSkpCiAKIC8qIEl0J3Mgb25seSB1c2VkIGluIHgyQVBJQyBtb2RlIG9mIGFuIHgy QVBJQyB1bml0LiAqLwogI2RlZmluZSBBUElDX01TUl9CQVNFIDB4ODAwCmRpZmYgLS1naXQgYS94 ZW4vaW5jbHVkZS9hc20teDg2L2ZpeG1hcC5oIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9maXhtYXAu aAppbmRleCA4OWJmNmNiNjExLi41MWIwZTdlOTQ1IDEwMDY0NAotLS0gYS94ZW4vaW5jbHVkZS9h c20teDg2L2ZpeG1hcC5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvZml4bWFwLmgKQEAgLTc5 LDcgKzc5LDcgQEAgZXh0ZXJuIHZvaWQgX19zZXRfZml4bWFwKAogI2RlZmluZSBfX2ZpeF90b192 aXJ0KHgpIChGSVhBRERSX1RPUCAtICgoeCkgPDwgUEFHRV9TSElGVCkpCiAjZGVmaW5lIF9fdmly dF90b19maXgoeCkgKChGSVhBRERSX1RPUCAtICgoeCkmUEFHRV9NQVNLKSkgPj4gUEFHRV9TSElG VCkKIAotI2RlZmluZSBmaXhfdG9fdmlydCh4KSAgIChfX2ZpeF90b192aXJ0KHgpKQorI2RlZmlu ZSBmaXhfdG9fdmlydCh4KSAgICgodm9pZCAqKV9fZml4X3RvX3ZpcnQoeCkpCiAKIHN0YXRpYyBp bmxpbmUgdW5zaWduZWQgbG9uZyB2aXJ0X3RvX2ZpeChjb25zdCB1bnNpZ25lZCBsb25nIHZhZGRy KQogewotLSAKMi4xMS4wCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVj dC5vcmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1k ZXZlbA==