From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 2/3] gnttab: Drop the frame parameter from get_paged_frame() Date: Thu, 24 Aug 2017 18:55:54 +0100 Message-ID: <1503597355-21334-3-git-send-email-andrew.cooper3@citrix.com> References: <1503597355-21334-1-git-send-email-andrew.cooper3@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1503597355-21334-1-git-send-email-andrew.cooper3@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: Xen-devel Cc: Stefano Stabellini , Wei Liu , George Dunlap , Andrew Cooper , Tim Deegan , Jan Beulich List-Id: xen-devel@lists.xenproject.org SXQgaXMgcmVkdW5kYW50IHdpdGggdGhlICpwYWdlIHBhcmFtZXRlci4KClNpZ25lZC1vZmYtYnk6 IEFuZHJldyBDb29wZXIgPGFuZHJldy5jb29wZXIzQGNpdHJpeC5jb20+Ci0tLQpDQzogR2Vvcmdl IER1bmxhcCA8R2VvcmdlLkR1bmxhcEBldS5jaXRyaXguY29tPgpDQzogSmFuIEJldWxpY2ggPEpC ZXVsaWNoQHN1c2UuY29tPgpDQzogS29ucmFkIFJ6ZXN6dXRlayBXaWxrIDxrb25yYWQud2lsa0Bv cmFjbGUuY29tPgpDQzogU3RlZmFubyBTdGFiZWxsaW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3Jn PgpDQzogVGltIERlZWdhbiA8dGltQHhlbi5vcmc+CkNDOiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRy aXguY29tPgotLS0KIHhlbi9jb21tb24vZ3JhbnRfdGFibGUuYyB8IDUwICsrKysrKysrKysrKysr KysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDIyIGlu c2VydGlvbnMoKyksIDI4IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vZ3Jh bnRfdGFibGUuYyBiL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYwppbmRleCAxODhjNDc3Li5kODMw N2I3IDEwMDY0NAotLS0gYS94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKKysrIGIveGVuL2NvbW1v bi9ncmFudF90YWJsZS5jCkBAIC0yNTcsMTMgKzI1NywxMyBAQCBzdGF0aWMgaW5saW5lIHZvaWQg YWN0aXZlX2VudHJ5X3JlbGVhc2Uoc3RydWN0IGFjdGl2ZV9ncmFudF9lbnRyeSAqYWN0KQogICAg IHNwaW5fdW5sb2NrKCZhY3QtPmxvY2spOwogfQogCi0vKiBDaGVjayBpZiB0aGUgcGFnZSBoYXMg YmVlbiBwYWdlZCBvdXQsIG9yIG5lZWRzIHVuc2hhcmluZy4KLSAgIElmIHJjID09IEdOVFNUX29r YXksICpwYWdlIGNvbnRhaW5zIHRoZSBwYWdlIHN0cnVjdCB3aXRoIGEgcmVmIHRha2VuLgotICAg Q2FsbGVyIG11c3QgZG8gcHV0X3BhZ2UoKnBhZ2UpLgotICAgSWYgYW55IGVycm9yLCAqcGFnZSA9 IE5VTEwsICpmcmFtZSA9IElOVkFMSURfTUZOLCBubyByZWYgdGFrZW4uICovCi1zdGF0aWMgaW50 IGdldF9wYWdlZF9mcmFtZSh1bnNpZ25lZCBsb25nIGdmbiwgdW5zaWduZWQgbG9uZyAqZnJhbWUs Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICBzdHJ1Y3QgcGFnZV9pbmZvICoqcGFnZSwgYm9v bCByZWFkb25seSwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0cnVjdCBkb21haW4gKnJk KQorLyoKKyAqIENoZWNrIGlmIHRoZSBwYWdlIGhhcyBiZWVuIHBhZ2VkIG91dCwgb3IgbmVlZHMg dW5zaGFyaW5nLgorICogSWYgcmMgPT0gR05UU1Rfb2theSwgKnBhZ2UgY29udGFpbnMgdGhlIHBh Z2Ugc3RydWN0IHdpdGggYSByZWYgdGFrZW4uCisgKiBDYWxsZXIgbXVzdCBkbyBwdXRfcGFnZSgq cGFnZSkuIElmIGFueSBlcnJvciwgKnBhZ2UgPSBOVUxMLCBubyByZWYgdGFrZW4uCisgKi8KK3N0 YXRpYyBpbnQgZ2V0X3BhZ2VkX2ZyYW1lKHVuc2lnbmVkIGxvbmcgZ2ZuLCBzdHJ1Y3QgcGFnZV9p bmZvICoqcGFnZSwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgIGJvb2wgcmVhZG9ubHksIHN0 cnVjdCBkb21haW4gKnJkKQogewogICAgIGludCByYyA9IEdOVFNUX29rYXk7CiAjaWYgZGVmaW5l ZChQMk1fUEFHRURfVFlQRVMpIHx8IGRlZmluZWQoUDJNX1NIQVJFRF9UWVBFUykKQEAgLTI3Myw3 ICsyNzMsNiBAQCBzdGF0aWMgaW50IGdldF9wYWdlZF9mcmFtZSh1bnNpZ25lZCBsb25nIGdmbiwg dW5zaWduZWQgbG9uZyAqZnJhbWUsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAocmVh ZG9ubHkpID8gUDJNX0FMTE9DIDogUDJNX1VOU0hBUkUpOwogICAgIGlmICggISgqcGFnZSkgKQog ICAgIHsKLSAgICAgICAgKmZyYW1lID0gbWZuX3goSU5WQUxJRF9NRk4pOwogICAgICAgICBpZiAo IHAybV9pc19zaGFyZWQocDJtdCkgKQogICAgICAgICAgICAgcmV0dXJuIEdOVFNUX2VhZ2FpbjsK ICAgICAgICAgaWYgKCBwMm1faXNfcGFnaW5nKHAybXQpICkKQEAgLTI4MywxMyArMjgyLDEyIEBA IHN0YXRpYyBpbnQgZ2V0X3BhZ2VkX2ZyYW1lKHVuc2lnbmVkIGxvbmcgZ2ZuLCB1bnNpZ25lZCBs b25nICpmcmFtZSwKICAgICAgICAgfQogICAgICAgICByZXR1cm4gR05UU1RfYmFkX3BhZ2U7CiAg ICAgfQotICAgICpmcmFtZSA9IHBhZ2VfdG9fbWZuKCpwYWdlKTsKICNlbHNlCi0gICAgKmZyYW1l ID0gbWZuX3goZ2ZuX3RvX21mbihyZCwgX2dmbihnZm4pKSk7Ci0gICAgKnBhZ2UgPSBtZm5fdmFs aWQoX21mbigqZnJhbWUpKSA/IG1mbl90b19wYWdlKCpmcmFtZSkgOiBOVUxMOworICAgIG1mbl90 IG1mbiA9IGdmbl90b19tZm4ocmQsIF9nZm4oZ2ZuKSk7CisKKyAgICAqcGFnZSA9IG1mbl92YWxp ZChtZm4pID8gbWZuX3RvX3BhZ2UobWZuX3gobWZuKSkgOiBOVUxMOwogICAgIGlmICggKCEoKnBh Z2UpKSB8fCAoIWdldF9wYWdlKCpwYWdlLCByZCkpICkKICAgICB7Ci0gICAgICAgICpmcmFtZSA9 IG1mbl94KElOVkFMSURfTUZOKTsKICAgICAgICAgKnBhZ2UgPSBOVUxMOwogICAgICAgICByYyA9 IEdOVFNUX2JhZF9wYWdlOwogICAgIH0KQEAgLTgwNCw3ICs4MDIsNyBAQCBtYXBfZ3JhbnRfcmVm KAogICAgIHN0cnVjdCBncmFudF90YWJsZSAqbGd0LCAqcmd0OwogICAgIHN0cnVjdCB2Y3B1ICAg KmxlZDsKICAgICBncmFudF9oYW5kbGVfdCBoYW5kbGU7Ci0gICAgdW5zaWduZWQgbG9uZyAgZnJh bWUgPSAwOworICAgIHVuc2lnbmVkIGxvbmcgIGZyYW1lOwogICAgIHN0cnVjdCBwYWdlX2luZm8g KnBnID0gTlVMTDsKICAgICBpbnQgICAgICAgICAgICByYyA9IEdOVFNUX29rYXk7CiAgICAgdTMy ICAgICAgICAgICAgb2xkX3BpbjsKQEAgLTg5NiwxMyArODk0LDEyIEBAIG1hcF9ncmFudF9yZWYo CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHNoYXJlZF9lbnRyeV92MShyZ3QsIG9w LT5yZWYpLmZyYW1lIDoKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc2hhcmVkX2Vu dHJ5X3YyKHJndCwgb3AtPnJlZikuZnVsbF9wYWdlLmZyYW1lOwogCi0gICAgICAgICAgICByYyA9 IGdldF9wYWdlZF9mcmFtZShnZm4sICZmcmFtZSwgJnBnLAotICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgb3AtPmZsYWdzICYgR05UTUFQX3JlYWRvbmx5LCByZCk7CisgICAgICAgICAg ICByYyA9IGdldF9wYWdlZF9mcmFtZShnZm4sICZwZywgb3AtPmZsYWdzICYgR05UTUFQX3JlYWRv bmx5LCByZCk7CiAgICAgICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQogICAgICAgICAg ICAgICAgIGdvdG8gdW5sb2NrX291dF9jbGVhcjsKICAgICAgICAgICAgIGFjdF9zZXRfZ2ZuKGFj dCwgX2dmbihnZm4pKTsKICAgICAgICAgICAgIGFjdC0+ZG9taWQgPSBsZC0+ZG9tYWluX2lkOwot ICAgICAgICAgICAgYWN0LT5mcmFtZSA9IGZyYW1lOworICAgICAgICAgICAgYWN0LT5mcmFtZSA9 IHBhZ2VfdG9fbWZuKHBnKTsKICAgICAgICAgICAgIGFjdC0+c3RhcnQgPSAwOwogICAgICAgICAg ICAgYWN0LT5sZW5ndGggPSBQQUdFX1NJWkU7CiAgICAgICAgICAgICBhY3QtPmlzX3N1Yl9wYWdl ID0gZmFsc2U7CkBAIC0yMTYzLDcgKzIxNjAsNiBAQCBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAog ICAgIGRvbWlkX3QgdHJhbnNfZG9taWQ7CiAgICAgZ3JhbnRfcmVmX3QgdHJhbnNfZ3JlZjsKICAg ICBzdHJ1Y3QgZG9tYWluICp0ZDsKLSAgICB1bnNpZ25lZCBsb25nIGZyYW1lOwogICAgIHVpbnQx Nl90IHRyYW5zX3BhZ2Vfb2ZmOwogICAgIHVpbnQxNl90IHRyYW5zX2xlbmd0aDsKICAgICBib29s IGlzX3N1Yl9wYWdlOwpAQCAtMjI1Niw4ICsyMjUyLDYgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29w eSgKICAgICAgICAgICAgIHJldHVybiByYzsKICAgICAgICAgfQogCi0gICAgICAgIGZyYW1lID0g cGFnZV90b19tZm4oKnBhZ2UpOwotCiAgICAgICAgIC8qCiAgICAgICAgICAqIFdlIGRyb3BwZWQg dGhlIGxvY2ssIHNvIHdlIGhhdmUgdG8gY2hlY2sgdGhhdCB0aGUgZ3JhbnQgZGlkbid0CiAgICAg ICAgICAqIGNoYW5nZSwgYW5kIHRoYXQgbm9ib2R5IGVsc2UgdHJpZWQgdG8gcGluL3VucGluIGl0 LiBJZiBhbnl0aGluZwpAQCAtMjI2NSw3ICsyMjU5LDggQEAgYWNxdWlyZV9ncmFudF9mb3JfY29w eSgKICAgICAgICAgICovCiAgICAgICAgIGlmICggcmd0LT5ndF92ZXJzaW9uICE9IDIgfHwKICAg ICAgICAgICAgICBhY3QtPnBpbiAhPSBvbGRfcGluIHx8Ci0gICAgICAgICAgICAgKG9sZF9waW4g JiYgKGFjdC0+ZG9taWQgIT0gbGRvbSB8fCBhY3QtPmZyYW1lICE9IGZyYW1lIHx8CisgICAgICAg ICAgICAgKG9sZF9waW4gJiYgKGFjdC0+ZG9taWQgIT0gbGRvbSB8fAorICAgICAgICAgICAgICAg ICAgICAgICAgICBhY3QtPmZyYW1lICE9IHBhZ2VfdG9fbWZuKCpwYWdlKSB8fAogICAgICAgICAg ICAgICAgICAgICAgICAgICBhY3QtPnN0YXJ0ICE9IHRyYW5zX3BhZ2Vfb2ZmIHx8CiAgICAgICAg ICAgICAgICAgICAgICAgICAgIGFjdC0+bGVuZ3RoICE9IHRyYW5zX2xlbmd0aCB8fAogICAgICAg ICAgICAgICAgICAgICAgICAgICBhY3QtPnRyYW5zX2RvbWFpbiAhPSB0ZCB8fApAQCAtMjI4OSw3 ICsyMjg0LDcgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgKICAgICAgICAgICAgIGFjdC0+bGVu Z3RoID0gdHJhbnNfbGVuZ3RoOwogICAgICAgICAgICAgYWN0LT50cmFuc19kb21haW4gPSB0ZDsK ICAgICAgICAgICAgIGFjdC0+dHJhbnNfZ3JlZiA9IHRyYW5zX2dyZWY7Ci0gICAgICAgICAgICBh Y3QtPmZyYW1lID0gZnJhbWU7CisgICAgICAgICAgICBhY3QtPmZyYW1lID0gcGFnZV90b19tZm4o KnBhZ2UpOwogICAgICAgICAgICAgYWN0X3NldF9nZm4oYWN0LCBJTlZBTElEX0dGTik7CiAgICAg ICAgICAgICAvKgogICAgICAgICAgICAgICogVGhlIGFjdHVhbCByZW1vdGUgcmVtb3RlIGdyYW50 IG1heSBvciBtYXkgbm90IGJlIGEgc3ViLXBhZ2UsCkBAIC0yMzEzLDcgKzIzMDgsNyBAQCBhY3F1 aXJlX2dyYW50X2Zvcl9jb3B5KAogICAgICAgICB7CiAgICAgICAgICAgICB1bnNpZ25lZCBsb25n IGdmbiA9IHNoYXJlZF9lbnRyeV92MShyZ3QsIGdyZWYpLmZyYW1lOwogCi0gICAgICAgICAgICBy YyA9IGdldF9wYWdlZF9mcmFtZShnZm4sICZmcmFtZSwgcGFnZSwgcmVhZG9ubHksIHJkKTsKKyAg ICAgICAgICAgIHJjID0gZ2V0X3BhZ2VkX2ZyYW1lKGdmbiwgcGFnZSwgcmVhZG9ubHksIHJkKTsK ICAgICAgICAgICAgIGlmICggcmMgIT0gR05UU1Rfb2theSApCiAgICAgICAgICAgICAgICAgZ290 byB1bmxvY2tfb3V0X2NsZWFyOwogICAgICAgICAgICAgYWN0X3NldF9nZm4oYWN0LCBfZ2ZuKGdm bikpOwpAQCAtMjMyMyw4ICsyMzE4LDcgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgKICAgICAg ICAgfQogICAgICAgICBlbHNlIGlmICggIShzaGEyLT5oZHIuZmxhZ3MgJiBHVEZfc3ViX3BhZ2Up ICkKICAgICAgICAgewotICAgICAgICAgICAgcmMgPSBnZXRfcGFnZWRfZnJhbWUoc2hhMi0+ZnVs bF9wYWdlLmZyYW1lLCAmZnJhbWUsIHBhZ2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICByZWFkb25seSwgcmQpOworICAgICAgICAgICAgcmMgPSBnZXRfcGFnZWRfZnJhbWUoc2hh Mi0+ZnVsbF9wYWdlLmZyYW1lLCBwYWdlLCByZWFkb25seSwgcmQpOwogICAgICAgICAgICAgaWYg KCByYyAhPSBHTlRTVF9va2F5ICkKICAgICAgICAgICAgICAgICBnb3RvIHVubG9ja19vdXRfY2xl YXI7CiAgICAgICAgICAgICBhY3Rfc2V0X2dmbihhY3QsIF9nZm4oc2hhMi0+ZnVsbF9wYWdlLmZy YW1lKSk7CkBAIC0yMzM0LDggKzIzMjgsNyBAQCBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAogICAg ICAgICB9CiAgICAgICAgIGVsc2UKICAgICAgICAgewotICAgICAgICAgICAgcmMgPSBnZXRfcGFn ZWRfZnJhbWUoc2hhMi0+c3ViX3BhZ2UuZnJhbWUsICZmcmFtZSwgcGFnZSwKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHJlYWRvbmx5LCByZCk7CisgICAgICAgICAgICByYyA9IGdl dF9wYWdlZF9mcmFtZShzaGEyLT5zdWJfcGFnZS5mcmFtZSwgcGFnZSwgcmVhZG9ubHksIHJkKTsK ICAgICAgICAgICAgIGlmICggcmMgIT0gR05UU1Rfb2theSApCiAgICAgICAgICAgICAgICAgZ290 byB1bmxvY2tfb3V0X2NsZWFyOwogICAgICAgICAgICAgYWN0X3NldF9nZm4oYWN0LCBfZ2ZuKHNo YTItPnN1Yl9wYWdlLmZyYW1lKSk7CkBAIC0yMzUyLDcgKzIzNDUsNyBAQCBhY3F1aXJlX2dyYW50 X2Zvcl9jb3B5KAogICAgICAgICAgICAgYWN0LT5sZW5ndGggPSB0cmFuc19sZW5ndGg7CiAgICAg ICAgICAgICBhY3QtPnRyYW5zX2RvbWFpbiA9IHRkOwogICAgICAgICAgICAgYWN0LT50cmFuc19n cmVmID0gdHJhbnNfZ3JlZjsKLSAgICAgICAgICAgIGFjdC0+ZnJhbWUgPSBmcmFtZTsKKyAgICAg ICAgICAgIGFjdC0+ZnJhbWUgPSBwYWdlX3RvX21mbigqcGFnZSk7CiAgICAgICAgIH0KICAgICB9 CiAgICAgZWxzZQpAQCAtMjUxNSwxMiArMjUwOCwxMyBAQCBzdGF0aWMgaW50IGdudHRhYl9jb3B5 X2NsYWltX2J1Zihjb25zdCBzdHJ1Y3QgZ250dGFiX2NvcHkgKm9wLAogICAgIH0KICAgICBlbHNl CiAgICAgewotICAgICAgICByYyA9IGdldF9wYWdlZF9mcmFtZShwdHItPnUuZ21mbiwgJmJ1Zi0+ ZnJhbWUsICZidWYtPnBhZ2UsCisgICAgICAgIHJjID0gZ2V0X3BhZ2VkX2ZyYW1lKHB0ci0+dS5n bWZuLCAmYnVmLT5wYWdlLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICBidWYtPnJlYWRf b25seSwgYnVmLT5kb21haW4pOwogICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQogICAg ICAgICAgICAgUElOX0ZBSUwob3V0LCByYywKICAgICAgICAgICAgICAgICAgICAgICJzb3VyY2Ug ZnJhbWUgJSJQUklfeGVuX3BmbiIgaW52YWxpZC5cbiIsIHB0ci0+dS5nbWZuKTsKIAorICAgICAg ICBidWYtPmZyYW1lID0gcGFnZV90b19tZm4oYnVmLT5wYWdlKTsKICAgICAgICAgYnVmLT5wdHIu dS5nbWZuID0gcHRyLT51LmdtZm47CiAgICAgICAgIGJ1Zi0+cHRyLm9mZnNldCA9IDA7CiAgICAg ICAgIGJ1Zi0+bGVuID0gUEFHRV9TSVpFOwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1k ZXZlbEBsaXN0cy54ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK