From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 1/3] gnttab: Drop the frame parameter from acquire_grant_for_copy() Date: Thu, 24 Aug 2017 18:55:53 +0100 Message-ID: <1503597355-21334-2-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 SXQgaXMgcmVkdW5kYW50IHdpdGggdGhlICpwYWdlIHBhcmFtZXRlci4gIFJlbmFtZSB0aGUgZ3Jh bnRfZnJhbWUgcGFyYW1ldGVyIHRvCmluZGljYXRlIHRoYXQgaXQgaXMgbG9jYWwsIGFuZCBoaWdo bGlnaHQgdGhlIGNvcnJlY3RuZXNzIG9mIHRoZSBjaGFuZ2UuCgpTaWduZWQtb2ZmLWJ5OiBBbmRy ZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEdlb3JnZSBEdW5s YXAgPEdlb3JnZS5EdW5sYXBAZXUuY2l0cml4LmNvbT4KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGlj aEBzdXNlLmNvbT4KQ0M6IEtvbnJhZCBSemVzenV0ZWsgV2lsayA8a29ucmFkLndpbGtAb3JhY2xl LmNvbT4KQ0M6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ0M6 IFRpbSBEZWVnYW4gPHRpbUB4ZW4ub3JnPgpDQzogV2VpIExpdSA8d2VpLmxpdTJAY2l0cml4LmNv bT4KLS0tCiB4ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgfCA0MiArKysrKysrKysrKysrKysrKysr KysrLS0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAyMiBpbnNlcnRpb25zKCsp LCAyMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMg Yi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKaW5kZXggMzY4OTVhYS4uMTg4YzQ3NyAxMDA2NDQK LS0tIGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jCisrKyBiL3hlbi9jb21tb24vZ3JhbnRfdGFi bGUuYwpAQCAtMjE0MiwxNSArMjE0MiwxNyBAQCBzdGF0aWMgdm9pZCBmaXh1cF9zdGF0dXNfZm9y X2NvcHlfcGluKGNvbnN0IHN0cnVjdCBhY3RpdmVfZ3JhbnRfZW50cnkgKmFjdCwKICAgICAgICAg Z250dGFiX2NsZWFyX2ZsYWcoX0dURl9yZWFkaW5nLCBzdGF0dXMpOwogfQogCi0vKiBHcmFiIGEg ZnJhbWUgbnVtYmVyIGZyb20gYSBncmFudCBlbnRyeSBhbmQgdXBkYXRlIHRoZSBmbGFncyBhbmQg cGluCi0gICBjb3VudCBhcyBhcHByb3ByaWF0ZS4gSWYgcmMgPT0gR05UU1Rfb2theSwgbm90ZSB0 aGF0IHRoaXMgKmRvZXMqCi0gICB0YWtlIG9uZSByZWYgY291bnQgb24gdGhlIHRhcmdldCBwYWdl LCBzdG9yZWQgaW4gKnBhZ2UuCi0gICBJZiB0aGVyZSBpcyBhbnkgZXJyb3IsICpwYWdlID0gTlVM TCwgbm8gcmVmIHRha2VuLiAqLworLyoKKyAqIEdyYWIgYSBmcmFtZSBudW1iZXIgZnJvbSBhIGdy YW50IGVudHJ5IGFuZCB1cGRhdGUgdGhlIGZsYWdzIGFuZCBwaW4KKyAqIGNvdW50IGFzIGFwcHJv cHJpYXRlLiBJZiByYyA9PSBHTlRTVF9va2F5LCBub3RlIHRoYXQgdGhpcyAqZG9lcyoKKyAqIHRh a2Ugb25lIHJlZiBjb3VudCBvbiB0aGUgdGFyZ2V0IHBhZ2UsIHN0b3JlZCBpbiAqcGFnZS4KKyAq IElmIHRoZXJlIGlzIGFueSBlcnJvciwgKnBhZ2UgPSBOVUxMLCBubyByZWYgdGFrZW4uCisgKi8K IHN0YXRpYyBpbnQKIGFjcXVpcmVfZ3JhbnRfZm9yX2NvcHkoCiAgICAgc3RydWN0IGRvbWFpbiAq cmQsIGdyYW50X3JlZl90IGdyZWYsIGRvbWlkX3QgbGRvbSwgYm9vbCByZWFkb25seSwKLSAgICB1 bnNpZ25lZCBsb25nICpmcmFtZSwgc3RydWN0IHBhZ2VfaW5mbyAqKnBhZ2UsCi0gICAgdWludDE2 X3QgKnBhZ2Vfb2ZmLCB1aW50MTZfdCAqbGVuZ3RoLCBib29sIGFsbG93X3RyYW5zaXRpdmUpCisg ICAgc3RydWN0IHBhZ2VfaW5mbyAqKnBhZ2UsIHVpbnQxNl90ICpwYWdlX29mZiwgdWludDE2X3Qg Kmxlbmd0aCwKKyAgICBib29sIGFsbG93X3RyYW5zaXRpdmUpCiB7CiAgICAgc3RydWN0IGdyYW50 X3RhYmxlICpyZ3QgPSByZC0+Z3JhbnRfdGFibGU7CiAgICAgZ3JhbnRfZW50cnlfdjJfdCAqc2hh MjsKQEAgLTIxNjEsNyArMjE2Myw3IEBAIGFjcXVpcmVfZ3JhbnRfZm9yX2NvcHkoCiAgICAgZG9t aWRfdCB0cmFuc19kb21pZDsKICAgICBncmFudF9yZWZfdCB0cmFuc19ncmVmOwogICAgIHN0cnVj dCBkb21haW4gKnRkOwotICAgIHVuc2lnbmVkIGxvbmcgZ3JhbnRfZnJhbWU7CisgICAgdW5zaWdu ZWQgbG9uZyBmcmFtZTsKICAgICB1aW50MTZfdCB0cmFuc19wYWdlX29mZjsKICAgICB1aW50MTZf dCB0cmFuc19sZW5ndGg7CiAgICAgYm9vbCBpc19zdWJfcGFnZTsKQEAgLTIyMzgsMTAgKzIyNDAs OSBAQCBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAogICAgICAgICBhY3RpdmVfZW50cnlfcmVsZWFz ZShhY3QpOwogICAgICAgICBncmFudF9yZWFkX3VubG9jayhyZ3QpOwogCi0gICAgICAgIHJjID0g YWNxdWlyZV9ncmFudF9mb3JfY29weSh0ZCwgdHJhbnNfZ3JlZiwgcmQtPmRvbWFpbl9pZCwKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWRvbmx5LCAmZ3JhbnRfZnJhbWUs IHBhZ2UsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmdHJhbnNfcGFnZV9v ZmYsICZ0cmFuc19sZW5ndGgsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBm YWxzZSk7CisgICAgICAgIHJjID0gYWNxdWlyZV9ncmFudF9mb3JfY29weSgKKyAgICAgICAgICAg IHRkLCB0cmFuc19ncmVmLCByZC0+ZG9tYWluX2lkLCByZWFkb25seSwgcGFnZSwgJnRyYW5zX3Bh Z2Vfb2ZmLAorICAgICAgICAgICAgJnRyYW5zX2xlbmd0aCwgZmFsc2UpOwogCiAgICAgICAgIGdy YW50X3JlYWRfbG9jayhyZ3QpOwogICAgICAgICBhY3QgPSBhY3RpdmVfZW50cnlfYWNxdWlyZShy Z3QsIGdyZWYpOwpAQCAtMjI1NSw2ICsyMjU2LDggQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgK ICAgICAgICAgICAgIHJldHVybiByYzsKICAgICAgICAgfQogCisgICAgICAgIGZyYW1lID0gcGFn ZV90b19tZm4oKnBhZ2UpOworCiAgICAgICAgIC8qCiAgICAgICAgICAqIFdlIGRyb3BwZWQgdGhl IGxvY2ssIHNvIHdlIGhhdmUgdG8gY2hlY2sgdGhhdCB0aGUgZ3JhbnQgZGlkbid0CiAgICAgICAg ICAqIGNoYW5nZSwgYW5kIHRoYXQgbm9ib2R5IGVsc2UgdHJpZWQgdG8gcGluL3VucGluIGl0LiBJ ZiBhbnl0aGluZwpAQCAtMjI2Miw3ICsyMjY1LDcgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgK ICAgICAgICAgICovCiAgICAgICAgIGlmICggcmd0LT5ndF92ZXJzaW9uICE9IDIgfHwKICAgICAg ICAgICAgICBhY3QtPnBpbiAhPSBvbGRfcGluIHx8Ci0gICAgICAgICAgICAgKG9sZF9waW4gJiYg KGFjdC0+ZG9taWQgIT0gbGRvbSB8fCBhY3QtPmZyYW1lICE9IGdyYW50X2ZyYW1lIHx8CisgICAg ICAgICAgICAgKG9sZF9waW4gJiYgKGFjdC0+ZG9taWQgIT0gbGRvbSB8fCBhY3QtPmZyYW1lICE9 IGZyYW1lIHx8CiAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdC0+c3RhcnQgIT0gdHJhbnNf cGFnZV9vZmYgfHwKICAgICAgICAgICAgICAgICAgICAgICAgICAgYWN0LT5sZW5ndGggIT0gdHJh bnNfbGVuZ3RoIHx8CiAgICAgICAgICAgICAgICAgICAgICAgICAgIGFjdC0+dHJhbnNfZG9tYWlu ICE9IHRkIHx8CkBAIC0yMjg2LDcgKzIyODksNyBAQCBhY3F1aXJlX2dyYW50X2Zvcl9jb3B5KAog ICAgICAgICAgICAgYWN0LT5sZW5ndGggPSB0cmFuc19sZW5ndGg7CiAgICAgICAgICAgICBhY3Qt PnRyYW5zX2RvbWFpbiA9IHRkOwogICAgICAgICAgICAgYWN0LT50cmFuc19ncmVmID0gdHJhbnNf Z3JlZjsKLSAgICAgICAgICAgIGFjdC0+ZnJhbWUgPSBncmFudF9mcmFtZTsKKyAgICAgICAgICAg IGFjdC0+ZnJhbWUgPSBmcmFtZTsKICAgICAgICAgICAgIGFjdF9zZXRfZ2ZuKGFjdCwgSU5WQUxJ RF9HRk4pOwogICAgICAgICAgICAgLyoKICAgICAgICAgICAgICAqIFRoZSBhY3R1YWwgcmVtb3Rl IHJlbW90ZSBncmFudCBtYXkgb3IgbWF5IG5vdCBiZSBhIHN1Yi1wYWdlLApAQCAtMjMxMCw3ICsy MzEzLDcgQEAgYWNxdWlyZV9ncmFudF9mb3JfY29weSgKICAgICAgICAgewogICAgICAgICAgICAg dW5zaWduZWQgbG9uZyBnZm4gPSBzaGFyZWRfZW50cnlfdjEocmd0LCBncmVmKS5mcmFtZTsKIAot ICAgICAgICAgICAgcmMgPSBnZXRfcGFnZWRfZnJhbWUoZ2ZuLCAmZ3JhbnRfZnJhbWUsIHBhZ2Us IHJlYWRvbmx5LCByZCk7CisgICAgICAgICAgICByYyA9IGdldF9wYWdlZF9mcmFtZShnZm4sICZm cmFtZSwgcGFnZSwgcmVhZG9ubHksIHJkKTsKICAgICAgICAgICAgIGlmICggcmMgIT0gR05UU1Rf b2theSApCiAgICAgICAgICAgICAgICAgZ290byB1bmxvY2tfb3V0X2NsZWFyOwogICAgICAgICAg ICAgYWN0X3NldF9nZm4oYWN0LCBfZ2ZuKGdmbikpOwpAQCAtMjMyMCw3ICsyMzIzLDcgQEAgYWNx dWlyZV9ncmFudF9mb3JfY29weSgKICAgICAgICAgfQogICAgICAgICBlbHNlIGlmICggIShzaGEy LT5oZHIuZmxhZ3MgJiBHVEZfc3ViX3BhZ2UpICkKICAgICAgICAgewotICAgICAgICAgICAgcmMg PSBnZXRfcGFnZWRfZnJhbWUoc2hhMi0+ZnVsbF9wYWdlLmZyYW1lLCAmZ3JhbnRfZnJhbWUsIHBh Z2UsCisgICAgICAgICAgICByYyA9IGdldF9wYWdlZF9mcmFtZShzaGEyLT5mdWxsX3BhZ2UuZnJh bWUsICZmcmFtZSwgcGFnZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHJlYWRv bmx5LCByZCk7CiAgICAgICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQogICAgICAgICAg ICAgICAgIGdvdG8gdW5sb2NrX291dF9jbGVhcjsKQEAgLTIzMzEsNyArMjMzNCw3IEBAIGFjcXVp cmVfZ3JhbnRfZm9yX2NvcHkoCiAgICAgICAgIH0KICAgICAgICAgZWxzZQogICAgICAgICB7Ci0g ICAgICAgICAgICByYyA9IGdldF9wYWdlZF9mcmFtZShzaGEyLT5zdWJfcGFnZS5mcmFtZSwgJmdy YW50X2ZyYW1lLCBwYWdlLAorICAgICAgICAgICAgcmMgPSBnZXRfcGFnZWRfZnJhbWUoc2hhMi0+ c3ViX3BhZ2UuZnJhbWUsICZmcmFtZSwgcGFnZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHJlYWRvbmx5LCByZCk7CiAgICAgICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkg KQogICAgICAgICAgICAgICAgIGdvdG8gdW5sb2NrX291dF9jbGVhcjsKQEAgLTIzNDksNyArMjM1 Miw3IEBAIGFjcXVpcmVfZ3JhbnRfZm9yX2NvcHkoCiAgICAgICAgICAgICBhY3QtPmxlbmd0aCA9 IHRyYW5zX2xlbmd0aDsKICAgICAgICAgICAgIGFjdC0+dHJhbnNfZG9tYWluID0gdGQ7CiAgICAg ICAgICAgICBhY3QtPnRyYW5zX2dyZWYgPSB0cmFuc19ncmVmOwotICAgICAgICAgICAgYWN0LT5m cmFtZSA9IGdyYW50X2ZyYW1lOworICAgICAgICAgICAgYWN0LT5mcmFtZSA9IGZyYW1lOwogICAg ICAgICB9CiAgICAgfQogICAgIGVsc2UKQEAgLTIzNjgsNyArMjM3MSw2IEBAIGFjcXVpcmVfZ3Jh bnRfZm9yX2NvcHkoCiAKICAgICAqcGFnZV9vZmYgPSBhY3QtPnN0YXJ0OwogICAgICpsZW5ndGgg PSBhY3QtPmxlbmd0aDsKLSAgICAqZnJhbWUgPSBhY3QtPmZyYW1lOwogCiAgICAgYWN0aXZlX2Vu dHJ5X3JlbGVhc2UoYWN0KTsKICAgICBncmFudF9yZWFkX3VubG9jayhyZ3QpOwpAQCAtMjUwMywx MSArMjUwNSwxMSBAQCBzdGF0aWMgaW50IGdudHRhYl9jb3B5X2NsYWltX2J1Zihjb25zdCBzdHJ1 Y3QgZ250dGFiX2NvcHkgKm9wLAogICAgIHsKICAgICAgICAgcmMgPSBhY3F1aXJlX2dyYW50X2Zv cl9jb3B5KGJ1Zi0+ZG9tYWluLCBwdHItPnUucmVmLAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgY3VycmVudC0+ZG9tYWluLT5kb21haW5faWQsCi0gICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBidWYtPnJlYWRfb25seSwKLSAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICZidWYtPmZyYW1lLCAmYnVmLT5wYWdlLAorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgYnVmLT5yZWFkX29ubHksICZidWYtPnBhZ2UsCiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAmYnVmLT5wdHIub2Zmc2V0LCAmYnVmLT5sZW4s IHRydWUpOwogICAgICAgICBpZiAoIHJjICE9IEdOVFNUX29rYXkgKQogICAgICAgICAgICAgZ290 byBvdXQ7CisgICAgICAgIGJ1Zi0+ZnJhbWUgPSBwYWdlX3RvX21mbihidWYtPnBhZ2UpOwogICAg ICAgICBidWYtPnB0ci51LnJlZiA9IHB0ci0+dS5yZWY7CiAgICAgICAgIGJ1Zi0+aGF2ZV9ncmFu dCA9IDE7CiAgICAgfQotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBsaXN0cy54 ZW4ub3JnCmh0dHBzOi8vbGlzdHMueGVuLm9yZy94ZW4tZGV2ZWwK