From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH v2 13/62] x86/fixmap: Modify fix_to_virt() to return a void pointer Date: Fri, 12 Jan 2018 11:28:21 +0000 Message-ID: <20180112112910.16762-14-wei.liu2@citrix.com> References: <20180112112910.16762-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 1eZxzO-0003bT-Ma for xen-devel@lists.xenproject.org; Fri, 12 Jan 2018 11:59:14 +0000 In-Reply-To: <20180112112910.16762-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 dmUKdGhlaXIgZXhwbGljaXQgY2FzdGluZyBkcm9wcGVkLgoKU2luY2UgX19pb21lbSBpcyBub3Qg dXNlZCBjb25zaXN0ZW50bHkgaW4gWGVuLCB3ZSBkcm9wIGl0IHRvby4KCk5vIGZ1bmN0aW9uYWwg Y2hhbmdlLgoKU2lnbmVkLW9mZi1ieTogQW5kcmV3IENvb3BlciA8YW5kcmV3LmNvb3BlcjNAY2l0 cml4LmNvbT4KUmV2aWV3ZWQtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+ClNpZ25l ZC1vZmYtYnk6IFdlaSBMaXUgPHdlaS5saXUyQGNpdHJpeC5jb20+Ci0tLQp2MjogdXBkYXRlIGNv bW1pdCBtZXNzYWdlIGFuZCByZW1vdmUgdW5uZWNlc3NhcnkgcGFyZW50aGVzZXMuCi0tLQogeGVu L2FyY2gveDg2L2FjcGkvbGliLmMgICAgICAgICB8IDIgKy0KIHhlbi9hcmNoL3g4Ni9tbS5jICAg ICAgICAgICAgICAgfCA0ICsrLS0KIHhlbi9hcmNoL3g4Ni9tcHBhcnNlLmMgICAgICAgICAgfCAy ICstCiB4ZW4vYXJjaC94ODYvbXNpLmMgICAgICAgICAgICAgIHwgMyArLS0KIHhlbi9hcmNoL3g4 Ni90Ym9vdC5jICAgICAgICAgICAgfCA0ICsrLS0KIHhlbi9kcml2ZXJzL2FjcGkvYXBlaS9hcGVp LWlvLmMgfCAyICstCiB4ZW4vZHJpdmVycy9jaGFyL2VoY2ktZGJncC5jICAgIHwgMiArLQogeGVu L2RyaXZlcnMvY2hhci9uczE2NTUwLmMgICAgICB8IDIgKy0KIHhlbi9pbmNsdWRlL2FzbS14ODYv YXBpY2RlZi5oICAgfCAyICstCiB4ZW4vaW5jbHVkZS9hc20teDg2L2ZpeG1hcC5oICAgIHwgMiAr LQogMTAgZmlsZXMgY2hhbmdlZCwgMTIgaW5zZXJ0aW9ucygrKSwgMTMgZGVsZXRpb25zKC0pCgpk aWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2FjcGkvbGliLmMgYi94ZW4vYXJjaC94ODYvYWNwaS9s aWIuYwppbmRleCA3ZDdjNzE4NDhiLi4yNjViOWFkODE5IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94 ODYvYWNwaS9saWIuYworKysgYi94ZW4vYXJjaC94ODYvYWNwaS9saWIuYwpAQCAtNDksNyArNDks NyBAQCBjaGFyICpfX2FjcGlfbWFwX3RhYmxlKHBhZGRyX3QgcGh5cywgdW5zaWduZWQgbG9uZyBz aXplKQogCW9mZnNldCA9IHBoeXMgJiAoUEFHRV9TSVpFIC0gMSk7CiAJbWFwcGVkX3NpemUgPSBQ QUdFX1NJWkUgLSBvZmZzZXQ7CiAJc2V0X2ZpeG1hcChGSVhfQUNQSV9FTkQsIHBoeXMpOwotCWJh c2UgPSBmaXhfdG9fdmlydChGSVhfQUNQSV9FTkQpOworCWJhc2UgPSBfX2ZpeF90b192aXJ0KEZJ WF9BQ1BJX0VORCk7CiAKIAkvKgogCSAqIE1vc3QgY2FzZXMgY2FuIGJlIGNvdmVyZWQgYnkgdGhl IGJlbG93LgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21tLmMgYi94ZW4vYXJjaC94ODYvbW0u YwppbmRleCBhNTZmODc1ZDQ1Li5mNzNmZWUyMjVlIDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYv bW0uYworKysgYi94ZW4vYXJjaC94ODYvbW0uYwpAQCAtNTIyNywxMiArNTIyNywxMiBAQCB2b2lk IF9fc2V0X2ZpeG1hcCgKICAgICBlbnVtIGZpeGVkX2FkZHJlc3NlcyBpZHgsIHVuc2lnbmVkIGxv bmcgbWZuLCB1bnNpZ25lZCBsb25nIGZsYWdzKQogewogICAgIEJVR19PTihpZHggPj0gX19lbmRf b2ZfZml4ZWRfYWRkcmVzc2VzKTsKLSAgICBtYXBfcGFnZXNfdG9feGVuKGZpeF90b192aXJ0KGlk eCksIG1mbiwgMSwgZmxhZ3MpOworICAgIG1hcF9wYWdlc190b194ZW4oX19maXhfdG9fdmlydChp ZHgpLCBtZm4sIDEsIGZsYWdzKTsKIH0KIAogdm9pZCAqX19pbml0IGFyY2hfdm1hcF92aXJ0X2Vu ZCh2b2lkKQogewotICAgIHJldHVybiAodm9pZCAqKWZpeF90b192aXJ0KF9fZW5kX29mX2ZpeGVk X2FkZHJlc3Nlcyk7CisgICAgcmV0dXJuIGZpeF90b192aXJ0KF9fZW5kX29mX2ZpeGVkX2FkZHJl c3Nlcyk7CiB9CiAKIHZvaWQgX19pb21lbSAqaW9yZW1hcChwYWRkcl90IHBhLCBzaXplX3QgbGVu KQpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21wcGFyc2UuYyBiL3hlbi9hcmNoL3g4Ni9tcHBh cnNlLmMKaW5kZXggYTFhMDczOGExOS4uNDkxNDBlNDZmMCAxMDA2NDQKLS0tIGEveGVuL2FyY2gv eDg2L21wcGFyc2UuYworKysgYi94ZW4vYXJjaC94ODYvbXBwYXJzZS5jCkBAIC03MDMsNyArNzAz LDcgQEAgc3RhdGljIHZvaWQgX19pbml0IGVmaV9jaGVja19jb25maWcodm9pZCkKIAkJcmV0dXJu OwogCiAJX19zZXRfZml4bWFwKEZJWF9FRklfTVBGLCBQRk5fRE9XTihlZmkubXBzKSwgX19QQUdF X0hZUEVSVklTT1IpOwotCW1wZiA9ICh2b2lkICopZml4X3RvX3ZpcnQoRklYX0VGSV9NUEYpICsg KChsb25nKWVmaS5tcHMgJiAoUEFHRV9TSVpFLTEpKTsKKwltcGYgPSBmaXhfdG9fdmlydChGSVhf RUZJX01QRikgKyAoKGxvbmcpZWZpLm1wcyAmIChQQUdFX1NJWkUtMSkpOwogCiAJaWYgKG1lbWNt cChtcGYtPm1wZl9zaWduYXR1cmUsICJfTVBfIiwgNCkgPT0gMCAmJgogCSAgICBtcGYtPm1wZl9s ZW5ndGggPT0gMSAmJgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L21zaS5jIGIveGVuL2FyY2gv eDg2L21zaS5jCmluZGV4IDA5NWJkM2NhZTcuLjhjODlmMDcyYTggMTAwNjQ0Ci0tLSBhL3hlbi9h cmNoL3g4Ni9tc2kuYworKysgYi94ZW4vYXJjaC94ODYvbXNpLmMKQEAgLTk2MCw4ICs5NjAsNyBA QCBzdGF0aWMgaW50IG1zaXhfY2FwYWJpbGl0eV9pbml0KHN0cnVjdCBwY2lfZGV2ICpkZXYsCiAg ICAgICAgICAgICB4ZnJlZShlbnRyeSk7CiAgICAgICAgICAgICByZXR1cm4gaWR4OwogICAgICAg ICB9Ci0gICAgICAgIGJhc2UgPSAodm9pZCAqKShmaXhfdG9fdmlydChpZHgpICsKLSAgICAgICAg ICAgICAgICAgICAgICAgICgodW5zaWduZWQgbG9uZyllbnRyeV9wYWRkciAmIChQQUdFX1NJWkUg LSAxKSkpOworICAgICAgICBiYXNlID0gZml4X3RvX3ZpcnQoaWR4KSArIChlbnRyeV9wYWRkciAm IChQQUdFX1NJWkUgLSAxKSk7CiAKICAgICAgICAgLyogTWFzayBpbnRlcnJ1cHQgaGVyZSAqLwog ICAgICAgICB3cml0ZWwoMSwgYmFzZSArIFBDSV9NU0lYX0VOVFJZX1ZFQ1RPUl9DVFJMX09GRlNF VCk7CmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvdGJvb3QuYyBiL3hlbi9hcmNoL3g4Ni90Ym9v dC5jCmluZGV4IDU5ZDdjNDc3ZjQuLmQzNmJmMzM0MDcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4 Ni90Ym9vdC5jCisrKyBiL3hlbi9hcmNoL3g4Ni90Ym9vdC5jCkBAIC04Miw3ICs4Miw3IEBAIHN0 YXRpYyB2b2lkIF9faW5pdCB0Ym9vdF9jb3B5X21lbW9yeSh1bnNpZ25lZCBjaGFyICp2YSwgdWlu dDMyX3Qgc2l6ZSwKICAgICAgICAgewogICAgICAgICAgICAgbWFwX2Jhc2UgPSBQRk5fRE9XTihw YSArIGkpOwogICAgICAgICAgICAgc2V0X2ZpeG1hcChGSVhfVEJPT1RfTUFQX0FERFJFU1MsIG1h cF9iYXNlIDw8IFBBR0VfU0hJRlQpOwotICAgICAgICAgICAgbWFwX2FkZHIgPSAodW5zaWduZWQg Y2hhciAqKWZpeF90b192aXJ0KEZJWF9UQk9PVF9NQVBfQUREUkVTUyk7CisgICAgICAgICAgICBt YXBfYWRkciA9IGZpeF90b192aXJ0KEZJWF9UQk9PVF9NQVBfQUREUkVTUyk7CiAgICAgICAgIH0K ICAgICAgICAgdmFbaV0gPSBtYXBfYWRkcltwYSArIGkgLSAobWFwX2Jhc2UgPDwgUEFHRV9TSElG VCldOwogICAgIH0KQEAgLTk4LDcgKzk4LDcgQEAgdm9pZCBfX2luaXQgdGJvb3RfcHJvYmUodm9p ZCkKIAogICAgIC8qIE1hcCBhbmQgY2hlY2sgZm9yIHRib290IFVVSUQuICovCiAgICAgc2V0X2Zp eG1hcChGSVhfVEJPT1RfU0hBUkVEX0JBU0UsIG9wdF90Ym9vdF9wYSk7Ci0gICAgdGJvb3Rfc2hh cmVkID0gKHRib290X3NoYXJlZF90ICopZml4X3RvX3ZpcnQoRklYX1RCT09UX1NIQVJFRF9CQVNF KTsKKyAgICB0Ym9vdF9zaGFyZWQgPSBmaXhfdG9fdmlydChGSVhfVEJPT1RfU0hBUkVEX0JBU0Up OwogICAgIGlmICggdGJvb3Rfc2hhcmVkID09IE5VTEwgKQogICAgICAgICByZXR1cm47CiAgICAg aWYgKCBtZW1jbXAoJnRib290X3NoYXJlZF91dWlkLCAodXVpZF90ICopdGJvb3Rfc2hhcmVkLCBz aXplb2YodXVpZF90KSkgKQpkaWZmIC0tZ2l0IGEveGVuL2RyaXZlcnMvYWNwaS9hcGVpL2FwZWkt aW8uYyBiL3hlbi9kcml2ZXJzL2FjcGkvYXBlaS9hcGVpLWlvLmMKaW5kZXggODk1NWRlOTM1ZS4u ODliNzBmNDVlZiAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvYWNwaS9hcGVpL2FwZWktaW8uYwor KysgYi94ZW4vZHJpdmVycy9hY3BpL2FwZWkvYXBlaS1pby5jCkBAIC05Miw3ICs5Miw3IEBAIHN0 YXRpYyB2b2lkIF9faW9tZW0gKl9faW5pdCBhcGVpX3JhbmdlX21hcChwYWRkcl90IHBhZGRyLCB1 bnNpZ25lZCBsb25nIHNpemUpCiAJCWFwZWlfcmFuZ2VfbnIrKzsKIAl9CiAKLQlyZXR1cm4gKHZv aWQgX19pb21lbSAqKWZpeF90b192aXJ0KEZJWF9BUEVJX1JBTkdFX0JBU0UgKyBzdGFydF9ucik7 CisJcmV0dXJuIGZpeF90b192aXJ0KEZJWF9BUEVJX1JBTkdFX0JBU0UgKyBzdGFydF9ucik7CiB9 CiAKIC8qCmRpZmYgLS1naXQgYS94ZW4vZHJpdmVycy9jaGFyL2VoY2ktZGJncC5jIGIveGVuL2Ry aXZlcnMvY2hhci9laGNpLWRiZ3AuYwppbmRleCBkNDhlNzc3YzM0Li5kMDA3MWQzMTE0IDEwMDY0 NAotLS0gYS94ZW4vZHJpdmVycy9jaGFyL2VoY2ktZGJncC5jCisrKyBiL3hlbi9kcml2ZXJzL2No YXIvZWhjaS1kYmdwLmMKQEAgLTEzMjcsNyArMTMyNyw3IEBAIHN0YXRpYyB2b2lkIF9faW5pdCBl aGNpX2RiZ3BfaW5pdF9wcmVpcnEoc3RydWN0IHNlcmlhbF9wb3J0ICpwb3J0KQogICAgICAqIHRo YW4gZW5vdWdoLiAgMWsgaXMgdGhlIGJpZ2dlc3QgdGhhdCB3YXMgc2Vlbi4KICAgICAgKi8KICAg ICBzZXRfZml4bWFwX25vY2FjaGUoRklYX0VIQ0lfREJHUCwgZGJncC0+YmFyX3ZhbCk7Ci0gICAg ZWhjaV9iYXIgPSAodm9pZCBfX2lvbWVtICopZml4X3RvX3ZpcnQoRklYX0VIQ0lfREJHUCk7Cisg ICAgZWhjaV9iYXIgPSBmaXhfdG9fdmlydChGSVhfRUhDSV9EQkdQKTsKICAgICBlaGNpX2JhciAr PSBkYmdwLT5iYXJfdmFsICYgflBBR0VfTUFTSzsKICAgICBkYmdwX3ByaW50aygiZWhjaV9iYXI6 ICVwXG4iLCBlaGNpX2Jhcik7CiAKZGlmZiAtLWdpdCBhL3hlbi9kcml2ZXJzL2NoYXIvbnMxNjU1 MC5jIGIveGVuL2RyaXZlcnMvY2hhci9uczE2NTUwLmMKaW5kZXggZTBmODE5OWY5OC4uZjMyZGJk MzI0NyAxMDA2NDQKLS0tIGEveGVuL2RyaXZlcnMvY2hhci9uczE2NTUwLmMKKysrIGIveGVuL2Ry aXZlcnMvY2hhci9uczE2NTUwLmMKQEAgLTY5Nyw3ICs2OTcsNyBAQCBzdGF0aWMgdm9pZCBfX2lu aXQgbnMxNjU1MF9pbml0X3ByZWlycShzdHJ1Y3Qgc2VyaWFsX3BvcnQgKnBvcnQpCiAgICAgICAg IGVudW0gZml4ZWRfYWRkcmVzc2VzIGlkeCA9IEZJWF9DT01fQkVHSU4gKyAodWFydCAtIG5zMTY1 NTBfY29tKTsKIAogICAgICAgICBzZXRfZml4bWFwX25vY2FjaGUoaWR4LCB1YXJ0LT5pb19iYXNl KTsKLSAgICAgICAgdWFydC0+cmVtYXBwZWRfaW9fYmFzZSA9ICh2b2lkIF9faW9tZW0gKilmaXhf dG9fdmlydChpZHgpOworICAgICAgICB1YXJ0LT5yZW1hcHBlZF9pb19iYXNlID0gZml4X3RvX3Zp cnQoaWR4KTsKICAgICAgICAgdWFydC0+cmVtYXBwZWRfaW9fYmFzZSArPSB1YXJ0LT5pb19iYXNl ICYgflBBR0VfTUFTSzsKICNlbHNlCiAgICAgICAgIHVhcnQtPnJlbWFwcGVkX2lvX2Jhc2UgPSAo Y2hhciAqKWlvcmVtYXAodWFydC0+aW9fYmFzZSwgdWFydC0+aW9fc2l6ZSk7CmRpZmYgLS1naXQg YS94ZW4vaW5jbHVkZS9hc20teDg2L2FwaWNkZWYuaCBiL3hlbi9pbmNsdWRlL2FzbS14ODYvYXBp Y2RlZi5oCmluZGV4IGVlZDUwNGEzMWEuLjJmYTBiNzdhOGEgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNs dWRlL2FzbS14ODYvYXBpY2RlZi5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvYXBpY2RlZi5o CkBAIC0xMTksNyArMTE5LDcgQEAKIC8qIE9ubHkgYXZhaWxhYmxlIGluIHgyQVBJQyBtb2RlICov CiAjZGVmaW5lCQlBUElDX1NFTEZfSVBJCTB4M0YwCiAKLSNkZWZpbmUgQVBJQ19CQVNFIChmaXhf dG9fdmlydChGSVhfQVBJQ19CQVNFKSkKKyNkZWZpbmUgQVBJQ19CQVNFIF9fZml4X3RvX3ZpcnQo RklYX0FQSUNfQkFTRSkKIAogLyogSXQncyBvbmx5IHVzZWQgaW4geDJBUElDIG1vZGUgb2YgYW4g eDJBUElDIHVuaXQuICovCiAjZGVmaW5lIEFQSUNfTVNSX0JBU0UgMHg4MDAKZGlmZiAtLWdpdCBh L3hlbi9pbmNsdWRlL2FzbS14ODYvZml4bWFwLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2ZpeG1h cC5oCmluZGV4IDg5YmY2Y2I2MTEuLjUxYjBlN2U5NDUgMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRl L2FzbS14ODYvZml4bWFwLmgKKysrIGIveGVuL2luY2x1ZGUvYXNtLXg4Ni9maXhtYXAuaApAQCAt NzksNyArNzksNyBAQCBleHRlcm4gdm9pZCBfX3NldF9maXhtYXAoCiAjZGVmaW5lIF9fZml4X3Rv X3ZpcnQoeCkgKEZJWEFERFJfVE9QIC0gKCh4KSA8PCBQQUdFX1NISUZUKSkKICNkZWZpbmUgX192 aXJ0X3RvX2ZpeCh4KSAoKEZJWEFERFJfVE9QIC0gKCh4KSZQQUdFX01BU0spKSA+PiBQQUdFX1NI SUZUKQogCi0jZGVmaW5lIGZpeF90b192aXJ0KHgpICAgKF9fZml4X3RvX3ZpcnQoeCkpCisjZGVm aW5lIGZpeF90b192aXJ0KHgpICAgKCh2b2lkICopX19maXhfdG9fdmlydCh4KSkKIAogc3RhdGlj IGlubGluZSB1bnNpZ25lZCBsb25nIHZpcnRfdG9fZml4KGNvbnN0IHVuc2lnbmVkIGxvbmcgdmFk ZHIpCiB7Ci0tIAoyLjExLjAKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54ZW5wcm9q ZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4vbGlzdGluZm8veGVu LWRldmVs