From mboxrd@z Thu Jan 1 00:00:00 1970 From: Roger Pau Monne Subject: [PATCH v3 3/3] xen: rework paging_log_dirty_op to work with hvm guests Date: Fri, 10 Apr 2015 19:29:19 +0200 Message-ID: <1428686959-2890-4-git-send-email-roger.pau@citrix.com> References: <1428686959-2890-1-git-send-email-roger.pau@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1YgckA-0002f9-Sl for xen-devel@lists.xenproject.org; Fri, 10 Apr 2015 17:29:27 +0000 In-Reply-To: <1428686959-2890-1-git-send-email-roger.pau@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , Tim Deegan , Jan Beulich , Roger Pau Monne List-Id: xen-devel@lists.xenproject.org V2hlbiB0aGUgY2FsbGVyIG9mIHBhZ2luZ19sb2dfZGlydHlfb3AgaXMgYSBodm0gZ3Vlc3QgWGVu IHdvdWxkIGNob2tlIHdoZW4KdHJ5aW5nIHRvIGNvcHkgdGhlIGRpcnR5IGJpdG1hcCB0byB0aGUg Z3Vlc3QgYmVjYXVzZSB0aGUgcGFnaW5nIGxvY2sgaXMKYWxyZWFkeSBoZWxkLgoKRml4IHRoaXMg YnkgaW5kZXBlbmRlbnRseSBtYXBwaW5nIGVhY2ggcGFnZSBvZiB0aGUgZ3Vlc3QgYml0bWFwIGFz IG5lZWRlZAp3aXRob3V0IHRoZSBwYWdpbmcgbG9jayBoZWxkLgoKU2lnbmVkLW9mZi1ieTogUm9n ZXIgUGF1IE1vbm7DqSA8cm9nZXIucGF1QGNpdHJpeC5jb20+CkNjOiBUaW0gRGVlZ2FuIDx0aW1A eGVuLm9yZz4KQ2M6IEphbiBCZXVsaWNoIDxqYmV1bGljaEBzdXNlLmNvbT4KQ2M6IEFuZHJldyBD b29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDaGFuZ2VzIHNpbmNlIHYyOgog LSBBZGQgY2hlY2tzIGZvciBwMm1faXNfcmFtIGFuZCBwMm1faXNfZGlzY2FyZF93cml0ZSB3aGVu IG1hcHBpbmcgYSBndWVzdAogICBwYWdlLgogLSBSZW1vdmUgZXJyb3IgY2hlY2tpbmcgZnJvbSBt ZW1zZXQvbWVtY3B5LCB0aGV5IHVuY29uZGl0aW9uYWxseSByZXR1cm4KICAgZHN0LgotLS0KIHhl bi9hcmNoL3g4Ni9tbS9wYWdpbmcuYyB8IDEwMyArKysrKysrKysrKysrKysrKysrKysrKysrKysr KysrKysrKysrKysrKy0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDkxIGluc2VydGlvbnMoKyksIDEy IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9tbS9wYWdpbmcuYyBiL3hl bi9hcmNoL3g4Ni9tbS9wYWdpbmcuYwppbmRleCBiNTRkNzZhLi5jYjVmZWI4IDEwMDY0NAotLS0g YS94ZW4vYXJjaC94ODYvbW0vcGFnaW5nLmMKKysrIGIveGVuL2FyY2gveDg2L21tL3BhZ2luZy5j CkBAIC0zOTcsNiArMzk3LDUzIEBAIGludCBwYWdpbmdfbWZuX2lzX2RpcnR5KHN0cnVjdCBkb21h aW4gKmQsIG1mbl90IGdtZm4pCiAgICAgcmV0dXJuIHJ2OwogfQogCitzdGF0aWMgaW5saW5lIHZv aWQgKm1hcF9kaXJ0eV9iaXRtYXAoWEVOX0dVRVNUX0hBTkRMRV82NCh1aW50OCkgZGlydHlfYml0 bWFwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGxvbmcg cGFnZXMsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3RydWN0IHBhZ2Vf aW5mbyAqKnBhZ2UsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdW5zaWdu ZWQgbG9uZyAqbWFwcGVkX3BhZ2UpCit7CisgICAgcDJtX3R5cGVfdCBwMm10OworICAgIHVpbnQz Ml90IHBmZWM7CisgICAgdW5zaWduZWQgbG9uZyBnZm47CisKKyAgICBnZm4gPSBwYWdpbmdfZ3Zh X3RvX2dmbihjdXJyZW50LAorICAgICAgICAgICAgICAgICAgICAgICAgICAgIChwYWRkcl90KSgo KGNoYXIgKilkaXJ0eV9iaXRtYXAucCkgKyAocGFnZXMgPj4gMykpLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICZwZmVjKTsKKyAgICBpZiAoIGdmbiA9PSBJTlZBTElEX0dGTiApCisgICAg ICAgIHJldHVybiBOVUxMOworCisgICAgKnBhZ2UgPSBnZXRfcGFnZV9mcm9tX2dmbihjdXJyZW50 LT5kb21haW4sIGdmbiwgJnAybXQsIFAyTV9VTlNIQVJFKTsKKworICAgIGlmICggIXAybV9pc19y YW0ocDJtdCkgKQorICAgIHsKKyAgICAgICAgcHV0X3BhZ2UoKnBhZ2UpOworICAgICAgICByZXR1 cm4gTlVMTDsKKyAgICB9CisgICAgaWYgKCBwMm1faXNfcGFnaW5nKHAybXQpICkKKyAgICB7Cisg ICAgICAgIHB1dF9wYWdlKCpwYWdlKTsKKyAgICAgICAgcDJtX21lbV9wYWdpbmdfcG9wdWxhdGUo Y3VycmVudC0+ZG9tYWluLCBnZm4pOworICAgICAgICByZXR1cm4gTlVMTDsKKyAgICB9CisgICAg aWYgKCBwMm1faXNfc2hhcmVkKHAybXQpIHx8IHAybV9pc19kaXNjYXJkX3dyaXRlKHAybXQpICkK KyAgICB7CisgICAgICAgIHB1dF9wYWdlKCpwYWdlKTsKKyAgICAgICAgcmV0dXJuIE5VTEw7Cisg ICAgfQorCisgICAgKm1hcHBlZF9wYWdlID0gcGFnZXM7CisgICAgcmV0dXJuIF9fbWFwX2RvbWFp bl9wYWdlKCpwYWdlKTsKK30KKworc3RhdGljIGlubGluZSB2b2lkIHVubWFwX2RpcnR5X2JpdG1h cCh2b2lkICphZGRyLCBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlKQoreworICAgIGlmICggYWRkciAh PSBOVUxMICkKKyAgICB7CisgICAgICAgIHVubWFwX2RvbWFpbl9wYWdlKGFkZHIpOworICAgICAg ICBwdXRfcGFnZShwYWdlKTsKKyAgICB9Cit9CisKIAogLyogUmVhZCBhIGRvbWFpbidzIGxvZy1k aXJ0eSBiaXRtYXAgYW5kIHN0YXRzLiAgSWYgdGhlIG9wZXJhdGlvbiBpcyBhIENMRUFOLAogICog Y2xlYXIgdGhlIGJpdG1hcCBhbmQgc3RhdHMgYXMgd2VsbC4gKi8KQEAgLTQwOSw5ICs0NTYsMjMg QEAgc3RhdGljIGludCBwYWdpbmdfbG9nX2RpcnR5X29wKHN0cnVjdCBkb21haW4gKmQsCiAgICAg bWZuX3QgKmw0ID0gTlVMTCwgKmwzID0gTlVMTCwgKmwyID0gTlVMTDsKICAgICB1bnNpZ25lZCBs b25nICpsMSA9IE5VTEw7CiAgICAgaW50IGk0LCBpMywgaTI7CisgICAgdWludDhfdCAqZGlydHlf Yml0bWFwID0gTlVMTDsKKyAgICBzdHJ1Y3QgcGFnZV9pbmZvICpwYWdlOworICAgIHVuc2lnbmVk IGxvbmcgaW5kZXhfbWFwcGVkID0gMDsKIAogICAgIGlmICggIXJlc3VtaW5nICkKICAgICAgICAg ZG9tYWluX3BhdXNlKGQpOworCisgICAgZGlydHlfYml0bWFwID0gbWFwX2RpcnR5X2JpdG1hcChz Yy0+ZGlydHlfYml0bWFwLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVz dW1pbmcgPworICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGQtPmFyY2gu cGFnaW5nLnByZWVtcHQubG9nX2RpcnR5LmRvbmUgOgorICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIDAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAm cGFnZSwgJmluZGV4X21hcHBlZCk7CisgICAgaWYgKCBkaXJ0eV9iaXRtYXAgPT0gTlVMTCApCisg ICAgeworICAgICAgICBkb21haW5fdW5wYXVzZShkKTsKKyAgICAgICAgcmV0dXJuIC1FRkFVTFQ7 CisgICAgfQogICAgIHBhZ2luZ19sb2NrKGQpOwogCiAgICAgaWYgKCAhZC0+YXJjaC5wYWdpbmcu cHJlZW1wdC5kb20gKQpAQCAtNDQ4LDIxICs1MDksMjMgQEAgc3RhdGljIGludCBwYWdpbmdfbG9n X2RpcnR5X29wKHN0cnVjdCBkb21haW4gKmQsCiAgICAgICAgIGdvdG8gb3V0OwogICAgIH0KIAot ICAgIGw0ID0gcGFnaW5nX21hcF9sb2dfZGlydHlfYml0bWFwKGQpOwogICAgIGk0ID0gZC0+YXJj aC5wYWdpbmcucHJlZW1wdC5sb2dfZGlydHkuaTQ7CiAgICAgaTMgPSBkLT5hcmNoLnBhZ2luZy5w cmVlbXB0LmxvZ19kaXJ0eS5pMzsKKyAgICBpMiA9IDA7CiAgICAgcGFnZXMgPSBkLT5hcmNoLnBh Z2luZy5wcmVlbXB0LmxvZ19kaXJ0eS5kb25lOwogCisgYWdhaW46CisgICAgbDQgPSBwYWdpbmdf bWFwX2xvZ19kaXJ0eV9iaXRtYXAoZCk7CisKICAgICBmb3IgKCA7IChwYWdlcyA8IHNjLT5wYWdl cykgJiYgKGk0IDwgTE9HRElSVFlfTk9ERV9FTlRSSUVTKTsgaTQrKywgaTMgPSAwICkKICAgICB7 CiAgICAgICAgIGwzID0gKGw0ICYmIG1mbl92YWxpZChsNFtpNF0pKSA/IG1hcF9kb21haW5fcGFn ZShtZm5feChsNFtpNF0pKSA6IE5VTEw7Ci0gICAgICAgIGZvciAoIDsgKHBhZ2VzIDwgc2MtPnBh Z2VzKSAmJiAoaTMgPCBMT0dESVJUWV9OT0RFX0VOVFJJRVMpOyBpMysrICkKKyAgICAgICAgZm9y ICggOyAocGFnZXMgPCBzYy0+cGFnZXMpICYmIChpMyA8IExPR0RJUlRZX05PREVfRU5UUklFUyk7 CisgICAgICAgICAgICAgaTMrKywgaTIgPSAwICkKICAgICAgICAgewogICAgICAgICAgICAgbDIg PSAoKGwzICYmIG1mbl92YWxpZChsM1tpM10pKSA/CiAgICAgICAgICAgICAgICAgICBtYXBfZG9t YWluX3BhZ2UobWZuX3gobDNbaTNdKSkgOiBOVUxMKTsKLSAgICAgICAgICAgIGZvciAoIGkyID0g MDsKLSAgICAgICAgICAgICAgICAgIChwYWdlcyA8IHNjLT5wYWdlcykgJiYgKGkyIDwgTE9HRElS VFlfTk9ERV9FTlRSSUVTKTsKLSAgICAgICAgICAgICAgICAgIGkyKysgKQorICAgICAgICAgICAg Zm9yICggOyAocGFnZXMgPCBzYy0+cGFnZXMpICYmIChpMiA8IExPR0RJUlRZX05PREVfRU5UUklF Uyk7IGkyKysgKQogICAgICAgICAgICAgewogICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBi eXRlcyA9IFBBR0VfU0laRTsKICAgICAgICAgICAgICAgICBsMSA9ICgobDIgJiYgbWZuX3ZhbGlk KGwyW2kyXSkpID8KQEAgLTQ3MSwxNSArNTM0LDI5IEBAIHN0YXRpYyBpbnQgcGFnaW5nX2xvZ19k aXJ0eV9vcChzdHJ1Y3QgZG9tYWluICpkLAogICAgICAgICAgICAgICAgICAgICBieXRlcyA9ICh1 bnNpZ25lZCBpbnQpKChzYy0+cGFnZXMgLSBwYWdlcyArIDcpID4+IDMpOwogICAgICAgICAgICAg ICAgIGlmICggbGlrZWx5KHBlZWspICkKICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAg ICAgICAgIGlmICggKGwxID8gY29weV90b19ndWVzdF9vZmZzZXQoc2MtPmRpcnR5X2JpdG1hcCwK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYWdl cyA+PiAzLCAodWludDhfdCAqKWwxLAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgIGJ5dGVzKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICA6 IGNsZWFyX2d1ZXN0X29mZnNldChzYy0+ZGlydHlfYml0bWFwLAotICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBwYWdlcyA+PiAzLCBieXRlcykpICE9IDAg KQorICAgICAgICAgICAgICAgICAgICBpZiAoIHBhZ2VzID4+ICgzICsgUEFHRV9TSElGVCkgIT0K KyAgICAgICAgICAgICAgICAgICAgICAgICBpbmRleF9tYXBwZWQgPj4gKDMgKyBQQUdFX1NISUZU KSApCiAgICAgICAgICAgICAgICAgICAgIHsKLSAgICAgICAgICAgICAgICAgICAgICAgIHJ2ID0g LUVGQVVMVDsKLSAgICAgICAgICAgICAgICAgICAgICAgIGdvdG8gb3V0OworICAgICAgICAgICAg ICAgICAgICAgICAgLyogV2UgbmVlZCB0byBtYXAgbmV4dCBwYWdlICovCisgICAgICAgICAgICAg ICAgICAgICAgICBwYWdpbmdfdW5sb2NrKGQpOworICAgICAgICAgICAgICAgICAgICAgICAgdW5t YXBfZGlydHlfYml0bWFwKGRpcnR5X2JpdG1hcCwgcGFnZSk7CisgICAgICAgICAgICAgICAgICAg ICAgICBkaXJ0eV9iaXRtYXAgPSBtYXBfZGlydHlfYml0bWFwKHNjLT5kaXJ0eV9iaXRtYXAsIHBh Z2VzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAmcGFnZSwgJmluZGV4X21hcHBlZCk7CisgICAgICAgICAgICAgICAgICAgICAgICBwYWdp bmdfbG9jayhkKTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmICggZGlydHlfYml0bWFwID09 IE5VTEwgKQorICAgICAgICAgICAgICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJ2ID0gLUVGQVVMVDsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBnb3RvIG91 dDsKKyAgICAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgICAgIGdv dG8gYWdhaW47CiAgICAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgQlVH X09OKCgocGFnZXMgPj4gMykgJSBQQUdFX1NJWkUpICsgYnl0ZXMgPiBQQUdFX1NJWkUpOworICAg ICAgICAgICAgICAgICAgICBpZiAoIGwxICkKKyAgICAgICAgICAgICAgICAgICAgICAgIG1lbWNw eShkaXJ0eV9iaXRtYXAgKyAoKHBhZ2VzID4+IDMpICUgUEFHRV9TSVpFKSwKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAodWludDhfdCAqKWwxLCBieXRlcyk7CisgICAgICAgICAgICAg ICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIG1lbXNldChkaXJ0eV9iaXRtYXAg KyAoKHBhZ2VzID4+IDMpICUgUEFHRV9TSVpFKSwgMCwKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBieXRlcyk7CiAgICAgICAgICAgICAgICAgfQogICAgICAgICAgICAgICAgIHBhZ2Vz ICs9IGJ5dGVzIDw8IDM7CiAgICAgICAgICAgICAgICAgaWYgKCBsMSApCkBAIC01NDksMTIgKzYy NiwxNCBAQCBzdGF0aWMgaW50IHBhZ2luZ19sb2dfZGlydHlfb3Aoc3RydWN0IGRvbWFpbiAqZCwK ICAgICAgICAgICogcGFnaW5nIG1vZGVzIChzaGFkb3cgb3IgaGFwKS4gIFNhZmUgYmVjYXVzZSB0 aGUgZG9tYWluIGlzIHBhdXNlZC4gKi8KICAgICAgICAgZC0+YXJjaC5wYWdpbmcubG9nX2RpcnR5 LmNsZWFuX2RpcnR5X2JpdG1hcChkKTsKICAgICB9CisgICAgdW5tYXBfZGlydHlfYml0bWFwKGRp cnR5X2JpdG1hcCwgcGFnZSk7CiAgICAgZG9tYWluX3VucGF1c2UoZCk7CiAgICAgcmV0dXJuIHJ2 OwogCiAgb3V0OgogICAgIGQtPmFyY2gucGFnaW5nLnByZWVtcHQuZG9tID0gTlVMTDsKICAgICBw YWdpbmdfdW5sb2NrKGQpOworICAgIHVubWFwX2RpcnR5X2JpdG1hcChkaXJ0eV9iaXRtYXAsIHBh Z2UpOwogICAgIGRvbWFpbl91bnBhdXNlKGQpOwogCiAgICAgaWYgKCBsMSApCi0tIAoxLjkuNSAo QXBwbGUgR2l0LTUwLjMpCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpo dHRwOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK