From mboxrd@z Thu Jan 1 00:00:00 1970 From: Haozhong Zhang Subject: [PATCH v2 4/4] nestedhvm: replace VMCX_EADDR by INVALID_PADDR Date: Wed, 14 Dec 2016 18:11:45 +0800 Message-ID: <20161214101145.11171-5-haozhong.zhang@intel.com> References: <20161214101145.11171-1-haozhong.zhang@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20161214101145.11171-1-haozhong.zhang@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.xen.org Cc: Haozhong Zhang , Kevin Tian , Jun Nakajima , Andrew Cooper , Jan Beulich List-Id: xen-devel@lists.xenproject.org Li4uIGJlY2F1c2UgSU5WQUxJRF9QQUREUiBpcyBhIG1vcmUgZ2VuZXJhbCBvbmUuCgpTdWdnZXN0 ZWQtYnk6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KU2lnbmVkLW9mZi1ieTogSGFv emhvbmcgWmhhbmcgPGhhb3pob25nLnpoYW5nQGludGVsLmNvbT4KLS0tCiB4ZW4vYXJjaC94ODYv aHZtL25lc3RlZGh2bS5jICAgICB8ICAyICstCiB4ZW4vYXJjaC94ODYvaHZtL3N2bS9uZXN0ZWRz dm0uYyB8IDE4ICsrKysrKysrKy0tLS0tLS0tLQogeGVuL2FyY2gveDg2L2h2bS9zdm0vdm1jYi5j ICAgICAgfCAgMiArLQogeGVuL2FyY2gveDg2L2h2bS92bXgvdnZteC5jICAgICAgfCAxNiArKysr KysrKy0tLS0tLS0tCiB4ZW4vaW5jbHVkZS9hc20teDg2L2h2bS92Y3B1LmggICB8ICAyIC0tCiA1 IGZpbGVzIGNoYW5nZWQsIDE5IGluc2VydGlvbnMoKyksIDIxIGRlbGV0aW9ucygtKQoKZGlmZiAt LWdpdCBhL3hlbi9hcmNoL3g4Ni9odm0vbmVzdGVkaHZtLmMgYi94ZW4vYXJjaC94ODYvaHZtL25l c3RlZGh2bS5jCmluZGV4IGM0NjcxZDguLmMwOWM1YjIgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4 Ni9odm0vbmVzdGVkaHZtLmMKKysrIGIveGVuL2FyY2gveDg2L2h2bS9uZXN0ZWRodm0uYwpAQCAt NTQsNyArNTQsNyBAQCBuZXN0ZWRodm1fdmNwdV9yZXNldChzdHJ1Y3QgdmNwdSAqdikKIAogICAg IGh2bV91bm1hcF9ndWVzdF9mcmFtZShudi0+bnZfdnZtY3gsIDEpOwogICAgIG52LT5udl92dm1j eCA9IE5VTEw7Ci0gICAgbnYtPm52X3Z2bWN4YWRkciA9IFZNQ1hfRUFERFI7CisgICAgbnYtPm52 X3Z2bWN4YWRkciA9IElOVkFMSURfUEFERFI7CiAgICAgbnYtPm52X2ZsdXNocDJtID0gMDsKICAg ICBudi0+bnZfcDJtID0gTlVMTDsKIApkaWZmIC0tZ2l0IGEveGVuL2FyY2gveDg2L2h2bS9zdm0v bmVzdGVkc3ZtLmMgYi94ZW4vYXJjaC94ODYvaHZtL3N2bS9uZXN0ZWRzdm0uYwppbmRleCA4Yzli MDczLi40ZDlkZTg2IDEwMDY0NAotLS0gYS94ZW4vYXJjaC94ODYvaHZtL3N2bS9uZXN0ZWRzdm0u YworKysgYi94ZW4vYXJjaC94ODYvaHZtL3N2bS9uZXN0ZWRzdm0uYwpAQCAtNjgsMTAgKzY4LDEw IEBAIGludCBuZXN0ZWRzdm1fdm1jYl9tYXAoc3RydWN0IHZjcHUgKnYsIHVpbnQ2NF90IHZtY2Jh ZGRyKQogICAgIHN0cnVjdCBuZXN0ZWR2Y3B1ICpudiA9ICZ2Y3B1X25lc3RlZGh2bSh2KTsKIAog ICAgIGlmIChudi0+bnZfdnZtY3ggIT0gTlVMTCAmJiBudi0+bnZfdnZtY3hhZGRyICE9IHZtY2Jh ZGRyKSB7Ci0gICAgICAgIEFTU0VSVChudi0+bnZfdnZtY3hhZGRyICE9IFZNQ1hfRUFERFIpOwor ICAgICAgICBBU1NFUlQobnYtPm52X3Z2bWN4YWRkciAhPSBJTlZBTElEX1BBRERSKTsKICAgICAg ICAgaHZtX3VubWFwX2d1ZXN0X2ZyYW1lKG52LT5udl92dm1jeCwgMSk7CiAgICAgICAgIG52LT5u dl92dm1jeCA9IE5VTEw7Ci0gICAgICAgIG52LT5udl92dm1jeGFkZHIgPSBWTUNYX0VBRERSOwor ICAgICAgICBudi0+bnZfdnZtY3hhZGRyID0gSU5WQUxJRF9QQUREUjsKICAgICB9CiAKICAgICBp ZiAoICFudi0+bnZfdnZtY3ggKQpAQCAtMTU0LDcgKzE1NCw3IEBAIHZvaWQgbnN2bV92Y3B1X2Rl c3Ryb3koc3RydWN0IHZjcHUgKnYpCiAgICAgaWYgKG52LT5udl9uMnZtY3gpIHsKICAgICAgICAg ZnJlZV92bWNiKG52LT5udl9uMnZtY3gpOwogICAgICAgICBudi0+bnZfbjJ2bWN4ID0gTlVMTDsK LSAgICAgICAgbnYtPm52X24ydm1jeF9wYSA9IFZNQ1hfRUFERFI7CisgICAgICAgIG52LT5udl9u MnZtY3hfcGEgPSBJTlZBTElEX1BBRERSOwogICAgIH0KICAgICBpZiAoc3ZtLT5uc19pb21hcCkK ICAgICAgICAgc3ZtLT5uc19pb21hcCA9IE5VTEw7CkBAIC0xNjQsOCArMTY0LDggQEAgaW50IG5z dm1fdmNwdV9yZXNldChzdHJ1Y3QgdmNwdSAqdikKIHsKICAgICBzdHJ1Y3QgbmVzdGVkc3ZtICpz dm0gPSAmdmNwdV9uZXN0ZWRzdm0odik7CiAKLSAgICBzdm0tPm5zX21zcl9oc2F2ZXBhID0gVk1D WF9FQUREUjsKLSAgICBzdm0tPm5zX292dm1jYl9wYSA9IFZNQ1hfRUFERFI7CisgICAgc3ZtLT5u c19tc3JfaHNhdmVwYSA9IElOVkFMSURfUEFERFI7CisgICAgc3ZtLT5uc19vdnZtY2JfcGEgPSBJ TlZBTElEX1BBRERSOwogCiAgICAgc3ZtLT5uc190c2NyYXRpbyA9IERFRkFVTFRfVFNDX1JBVElP OwogCkBAIC00MjUsNyArNDI1LDcgQEAgc3RhdGljIGludCBuc3ZtX3ZtY2JfcHJlcGFyZTR2bXJ1 bihzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAKICAgICAvKiBD aGVjayBpZiB2aXJ0dWFsIFZNQ0IgY2xlYW5iaXRzIGFyZSB2YWxpZCAqLwogICAgIHZjbGVhbmJp dHNfdmFsaWQgPSAxOwotICAgIGlmIChzdm0tPm5zX292dm1jYl9wYSA9PSBWTUNYX0VBRERSKQor ICAgIGlmICggc3ZtLT5uc19vdnZtY2JfcGEgPT0gSU5WQUxJRF9QQUREUiApCiAgICAgICAgIHZj bGVhbmJpdHNfdmFsaWQgPSAwOwogICAgIGlmIChzdm0tPm5zX292dm1jYl9wYSAhPSBudi0+bnZf dnZtY3hhZGRyKQogICAgICAgICB2Y2xlYW5iaXRzX3ZhbGlkID0gMDsKQEAgLTY3NCw3ICs2NzQs NyBAQCBuc3ZtX3ZjcHVfdm1lbnRyeShzdHJ1Y3QgdmNwdSAqdiwgc3RydWN0IGNwdV91c2VyX3Jl Z3MgKnJlZ3MsCiAgICAgbnNfdm1jYiA9IG52LT5udl92dm1jeDsKICAgICBBU1NFUlQobnNfdm1j YiAhPSBOVUxMKTsKICAgICBBU1NFUlQobnYtPm52X24ydm1jeCAhPSBOVUxMKTsKLSAgICBBU1NF UlQobnYtPm52X24ydm1jeF9wYSAhPSBWTUNYX0VBRERSKTsKKyAgICBBU1NFUlQobnYtPm52X24y dm1jeF9wYSAhPSBJTlZBTElEX1BBRERSKTsKIAogICAgIC8qIFNhdmUgdmFsdWVzIGZvciBsYXRl ciB1c2UuIE5lZWRlZCBmb3IgTmVzdGVkLW9uLU5lc3RlZCBhbmQKICAgICAgKiBTaGFkb3ctb24t U2hhZG93IHBhZ2luZy4KQEAgLTE0OTAsOCArMTQ5MCw4IEBAIHZvaWQgbnN2bV92Y3B1X3N3aXRj aChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICBBU1NFUlQodi0+YXJjaC5odm1fc3Zt LnZtY2IgIT0gTlVMTCk7CiAgICAgQVNTRVJUKG52LT5udl9uMXZtY3ggIT0gTlVMTCk7CiAgICAg QVNTRVJUKG52LT5udl9uMnZtY3ggIT0gTlVMTCk7Ci0gICAgQVNTRVJUKG52LT5udl9uMXZtY3hf cGEgIT0gVk1DWF9FQUREUik7Ci0gICAgQVNTRVJUKG52LT5udl9uMnZtY3hfcGEgIT0gVk1DWF9F QUREUik7CisgICAgQVNTRVJUKG52LT5udl9uMXZtY3hfcGEgIT0gSU5WQUxJRF9QQUREUik7Cisg ICAgQVNTRVJUKG52LT5udl9uMnZtY3hfcGEgIT0gSU5WQUxJRF9QQUREUik7CiAKICAgICBpZiAo bnYtPm52X3ZtZXhpdF9wZW5kaW5nKSB7CiAgdm1leGl0OgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gv eDg2L2h2bS9zdm0vdm1jYi5jIGIveGVuL2FyY2gveDg2L2h2bS9zdm0vdm1jYi5jCmluZGV4IDll YTAxNGYuLjcwZDc1ZTcgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL3g4Ni9odm0vc3ZtL3ZtY2IuYwor KysgYi94ZW4vYXJjaC94ODYvaHZtL3N2bS92bWNiLmMKQEAgLTI3Myw3ICsyNzMsNyBAQCB2b2lk IHN2bV9kZXN0cm95X3ZtY2Ioc3RydWN0IHZjcHUgKnYpCiAgICAgfQogCiAgICAgbnYtPm52X24x dm1jeCA9IE5VTEw7Ci0gICAgbnYtPm52X24xdm1jeF9wYSA9IFZNQ1hfRUFERFI7CisgICAgbnYt Pm52X24xdm1jeF9wYSA9IElOVkFMSURfUEFERFI7CiAgICAgYXJjaF9zdm0tPnZtY2IgPSBOVUxM OwogfQogCmRpZmYgLS1naXQgYS94ZW4vYXJjaC94ODYvaHZtL3ZteC92dm14LmMgYi94ZW4vYXJj aC94ODYvaHZtL3ZteC92dm14LmMKaW5kZXggNTUyMzE0Ni4uYzRmMTlhMCAxMDA2NDQKLS0tIGEv eGVuL2FyY2gveDg2L2h2bS92bXgvdnZteC5jCisrKyBiL3hlbi9hcmNoL3g4Ni9odm0vdm14L3Z2 bXguYwpAQCAtMTE0LDcgKzExNCw3IEBAIGludCBudm14X3ZjcHVfaW5pdGlhbGlzZShzdHJ1Y3Qg dmNwdSAqdikKICAgICBudm14LT5ndWVzdF92cGlkID0gMDsKICAgICBudm14LT52bXhvbl9yZWdp b25fcGEgPSBJTlZBTElEX1BBRERSOwogICAgIG52Y3B1LT5udl92dm1jeCA9IE5VTEw7Ci0gICAg bnZjcHUtPm52X3Z2bWN4YWRkciA9IFZNQ1hfRUFERFI7CisgICAgbnZjcHUtPm52X3Z2bWN4YWRk ciA9IElOVkFMSURfUEFERFI7CiAgICAgbnZteC0+aW50ci5pbnRyX2luZm8gPSAwOwogICAgIG52 bXgtPmludHIuZXJyb3JfY29kZSA9IDA7CiAgICAgbnZteC0+aW9iaXRtYXBbMF0gPSBOVUxMOwpA QCAtNzY2LDEwICs3NjYsMTAgQEAgc3RhdGljIHZvaWQgbnZteF9wdXJnZV92dm1jcyhzdHJ1Y3Qg dmNwdSAqdikKICAgICBpbnQgaTsKIAogICAgIF9fY2xlYXJfY3VycmVudF92dm1jcyh2KTsKLSAg ICBpZiAoIG52Y3B1LT5udl92dm1jeGFkZHIgIT0gVk1DWF9FQUREUiApCisgICAgaWYgKCBudmNw dS0+bnZfdnZtY3hhZGRyICE9IElOVkFMSURfUEFERFIgKQogICAgICAgICBodm1fdW5tYXBfZ3Vl c3RfZnJhbWUobnZjcHUtPm52X3Z2bWN4LCAxKTsKICAgICBudmNwdS0+bnZfdnZtY3ggPSBOVUxM OwotICAgIG52Y3B1LT5udl92dm1jeGFkZHIgPSBWTUNYX0VBRERSOworICAgIG52Y3B1LT5udl92 dm1jeGFkZHIgPSBJTlZBTElEX1BBRERSOwogICAgIHYtPmFyY2guaHZtX3ZteC52bWNzX3NoYWRv d19tYWRkciA9IDA7CiAgICAgZm9yIChpPTA7IGk8MjsgaSsrKSB7CiAgICAgICAgIGlmICggbnZt eC0+aW9iaXRtYXBbaV0gKSB7CkBAIC0xMzkzLDcgKzEzOTMsNyBAQCBpbnQgbnZteF9oYW5kbGVf dm14b24oc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAgICAgaWYgKCBudm14X3ZjcHVfaW5f dm14KHYpICkKICAgICB7CiAgICAgICAgIHZtcmV0dXJuKHJlZ3MsCi0gICAgICAgICAgICAgICAg IG52Y3B1LT5udl92dm1jeGFkZHIgIT0gVk1DWF9FQUREUiA/CisgICAgICAgICAgICAgICAgIG52 Y3B1LT5udl92dm1jeGFkZHIgIT0gSU5WQUxJRF9QQUREUiA/CiAgICAgICAgICAgICAgICAgIFZN RkFJTF9WQUxJRCA6IFZNRkFJTF9JTlZBTElEKTsKICAgICAgICAgcmV0dXJuIFg4NkVNVUxfT0tB WTsKICAgICB9CkBAIC0xNTA5LDcgKzE1MDksNyBAQCBzdGF0aWMgaW50IG52bXhfdm1yZXN1bWUo c3RydWN0IHZjcHUgKnYsIHN0cnVjdCBjcHVfdXNlcl9yZWdzICpyZWdzKQogICAgIHN0cnVjdCBu ZXN0ZWR2Y3B1ICpudmNwdSA9ICZ2Y3B1X25lc3RlZGh2bSh2KTsKIAogICAgIC8qIGNoZWNrIFZN Q1MgaXMgdmFsaWQgYW5kIElPIEJJVE1BUCBpcyBzZXQgKi8KLSAgICBpZiAoIChudmNwdS0+bnZf dnZtY3hhZGRyICE9IFZNQ1hfRUFERFIpICYmCisgICAgaWYgKCAobnZjcHUtPm52X3Z2bWN4YWRk ciAhPSBJTlZBTElEX1BBRERSKSAmJgogICAgICAgICAgICAgKChudm14LT5pb2JpdG1hcFswXSAm JiBudm14LT5pb2JpdG1hcFsxXSkgfHwKICAgICAgICAgICAgICEoX19uMl9leGVjX2NvbnRyb2wo dikgJiBDUFVfQkFTRURfQUNUSVZBVEVfSU9fQklUTUFQKSApICkKICAgICAgICAgbnZjcHUtPm52 X3ZtZW50cnlfcGVuZGluZyA9IDE7CkBAIC0xNTI5LDcgKzE1MjksNyBAQCBpbnQgbnZteF9oYW5k bGVfdm1yZXN1bWUoc3RydWN0IGNwdV91c2VyX3JlZ3MgKnJlZ3MpCiAgICAgaWYgKCByYyAhPSBY ODZFTVVMX09LQVkgKQogICAgICAgICByZXR1cm4gcmM7CiAKLSAgICBpZiAoIHZjcHVfbmVzdGVk aHZtKHYpLm52X3Z2bWN4YWRkciA9PSBWTUNYX0VBRERSICkKKyAgICBpZiAoIHZjcHVfbmVzdGVk aHZtKHYpLm52X3Z2bWN4YWRkciA9PSBJTlZBTElEX1BBRERSICkKICAgICB7CiAgICAgICAgIHZt cmV0dXJuIChyZWdzLCBWTUZBSUxfSU5WQUxJRCk7CiAgICAgICAgIHJldHVybiBYODZFTVVMX09L QVk7ICAgICAgICAKQEAgLTE1NTQsNyArMTU1NCw3IEBAIGludCBudm14X2hhbmRsZV92bWxhdW5j aChzdHJ1Y3QgY3B1X3VzZXJfcmVncyAqcmVncykKICAgICBpZiAoIHJjICE9IFg4NkVNVUxfT0tB WSApCiAgICAgICAgIHJldHVybiByYzsKIAotICAgIGlmICggdmNwdV9uZXN0ZWRodm0odikubnZf dnZtY3hhZGRyID09IFZNQ1hfRUFERFIgKQorICAgIGlmICggdmNwdV9uZXN0ZWRodm0odikubnZf dnZtY3hhZGRyID09IElOVkFMSURfUEFERFIgKQogICAgIHsKICAgICAgICAgdm1yZXR1cm4gKHJl Z3MsIFZNRkFJTF9JTlZBTElEKTsKICAgICAgICAgcmV0dXJuIFg4NkVNVUxfT0tBWTsKQEAgLTE1 OTksNyArMTU5OSw3IEBAIGludCBudm14X2hhbmRsZV92bXB0cmxkKHN0cnVjdCBjcHVfdXNlcl9y ZWdzICpyZWdzKQogICAgIGlmICggbnZjcHUtPm52X3Z2bWN4YWRkciAhPSBncGEgKQogICAgICAg ICBudm14X3B1cmdlX3Z2bWNzKHYpOwogCi0gICAgaWYgKCBudmNwdS0+bnZfdnZtY3hhZGRyID09 IFZNQ1hfRUFERFIgKQorICAgIGlmICggbnZjcHUtPm52X3Z2bWN4YWRkciA9PSBJTlZBTElEX1BB RERSICkKICAgICB7CiAgICAgICAgIGJvb2xfdCB3cml0YWJsZTsKICAgICAgICAgdm9pZCAqdnZt Y3ggPSBodm1fbWFwX2d1ZXN0X2ZyYW1lX3J3KHBhZGRyX3RvX3BmbihncGEpLCAxLCAmd3JpdGFi bGUpOwpkaWZmIC0tZ2l0IGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9odm0vdmNwdS5oIGIveGVuL2lu Y2x1ZGUvYXNtLXg4Ni9odm0vdmNwdS5oCmluZGV4IGQ0ODU1MzYuLjdiNDExYTggMTAwNjQ0Ci0t LSBhL3hlbi9pbmNsdWRlL2FzbS14ODYvaHZtL3ZjcHUuaAorKysgYi94ZW4vaW5jbHVkZS9hc20t eDg2L2h2bS92Y3B1LmgKQEAgLTk3LDggKzk3LDYgQEAgc3RhdGljIGlubGluZSBib29sX3QgaHZt X3ZjcHVfaW9fbmVlZF9jb21wbGV0aW9uKGNvbnN0IHN0cnVjdCBodm1fdmNwdV9pbyAqdmlvKQog ICAgICAgICAgICAhdmlvLT5pb19yZXEuZGF0YV9pc19wdHI7CiB9CiAKLSNkZWZpbmUgVk1DWF9F QUREUiAgICAofjBVTEwpCi0KIHN0cnVjdCBuZXN0ZWR2Y3B1IHsKICAgICBib29sX3QgbnZfZ3Vl c3Rtb2RlOyAvKiB2Y3B1IGluIGd1ZXN0bW9kZT8gKi8KICAgICB2b2lkICpudl92dm1jeDsgLyog bDEgZ3Vlc3QgdmlydHVhbCBWTUNCL1ZNQ1MgKi8KLS0gCjIuMTAuMQoKCl9fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QK WGVuLWRldmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=