From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH 17/20] xen/gnttab: Fold grant_table_{create, set_limits}() into grant_table_init() Date: Mon, 19 Mar 2018 19:13:56 +0000 Message-ID: <1521486839-25617-18-git-send-email-andrew.cooper3@citrix.com> References: <1521486839-25617-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: <1521486839-25617-1-git-send-email-andrew.cooper3@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: Andrew Cooper , Julien Grall , Stefano Stabellini , Jan Beulich List-Id: xen-devel@lists.xenproject.org Tm93IHRoYXQgdGhlIG1heF97Z3JhbnQsbWFwdHJhY2t9X2ZyYW1lcyBhcmUgc3BlY2lmaWVkIGZy b20gdGhlIHZlcnkgYmVnaW5uaW5nCm9mIGdyYW50IHRhYmxlIGNvbnN0cnVjdGlvbiwgdGhlIHZh cmlvdXMgaW5pdGlhbGlzYXRpb24gZnVuY3Rpb25zIGNhbiBiZQpmb2xkZWQgdG9nZXRoZXIgYW5k IHNpbXBsaWZpZWQgYXMgYSByZXN1bHQuCgpMZWF2ZSBncmFudF90YWJsZV9pbml0KCkgYXMgdGhl IHB1YmxpYyBpbnRlcmZhY2UsIHdoaWNoIGlzIG1vcmUgY29uc2lzdGVudAp3aXRoIG90aGVyIHN1 YnN5c3RlbXMuCgpTaWduZWQtb2ZmLWJ5OiBBbmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0Bj aXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVsaWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KQ0M6IFN0 ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxpbmlAa2VybmVsLm9yZz4KQ0M6IEp1bGllbiBHcmFs bCA8anVsaWVuLmdyYWxsQGFybS5jb20+Ci0tLQogeGVuL2NvbW1vbi9kb21haW4uYyAgICAgICAg ICAgfCAgNCArLS0KIHhlbi9jb21tb24vZ3JhbnRfdGFibGUuYyAgICAgIHwgNzEgKysrKysrKysr KysrKy0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLQogeGVuL2luY2x1ZGUveGVuL2dyYW50 X3RhYmxlLmggfCAgNiArKy0tCiAzIGZpbGVzIGNoYW5nZWQsIDI1IGluc2VydGlvbnMoKyksIDU2 IGRlbGV0aW9ucygtKQoKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vZG9tYWluLmMgYi94ZW4vY29t bW9uL2RvbWFpbi5jCmluZGV4IDQ1MzljMzkuLmM4NmNmNDcgMTAwNjQ0Ci0tLSBhL3hlbi9jb21t b24vZG9tYWluLmMKKysrIGIveGVuL2NvbW1vbi9kb21haW4uYwpAQCAtMzY0LDggKzM2NCw4IEBA IHN0cnVjdCBkb21haW4gKmRvbWFpbl9jcmVhdGUoZG9taWRfdCBkb21pZCwKICAgICAgICAgICAg IGdvdG8gZmFpbDsKICAgICAgICAgaW5pdF9zdGF0dXMgfD0gSU5JVF9ldnRjaG47CiAKLSAgICAg ICAgaWYgKCAoZXJyID0gZ3JhbnRfdGFibGVfY3JlYXRlKGQsIGNvbmZpZy0+bWF4X2dyYW50X2Zy YW1lcywKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbmZpZy0+bWF4 X21hcHRyYWNrX2ZyYW1lcykpICE9IDAgKQorICAgICAgICBpZiAoIChlcnIgPSBncmFudF90YWJs ZV9pbml0KGQsIGNvbmZpZy0+bWF4X2dyYW50X2ZyYW1lcywKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICBjb25maWctPm1heF9tYXB0cmFja19mcmFtZXMpKSAhPSAwICkKICAg ICAgICAgICAgIGdvdG8gZmFpbDsKICAgICAgICAgaW5pdF9zdGF0dXMgfD0gSU5JVF9nbnR0YWI7 CiAKZGlmZiAtLWdpdCBhL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYyBiL3hlbi9jb21tb24vZ3Jh bnRfdGFibGUuYwppbmRleCBjZjQ3Yzc4Li5jYjZlODc1IDEwMDY0NAotLS0gYS94ZW4vY29tbW9u L2dyYW50X3RhYmxlLmMKKysrIGIveGVuL2NvbW1vbi9ncmFudF90YWJsZS5jCkBAIC0xODA4LDIy ICsxODA4LDI4IEBAIGdudHRhYl9ncm93X3RhYmxlKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVk IGludCByZXFfbnJfZnJhbWVzKQogICAgIHJldHVybiAtRU5PTUVNOwogfQogCi1zdGF0aWMgaW50 Ci1ncmFudF90YWJsZV9pbml0KHN0cnVjdCBkb21haW4gKmQsIHN0cnVjdCBncmFudF90YWJsZSAq Z3QsCi0gICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBncmFudF9mcmFtZXMsIHVuc2lnbmVk IGludCBtYXB0cmFja19mcmFtZXMpCitpbnQgZ3JhbnRfdGFibGVfaW5pdChzdHJ1Y3QgZG9tYWlu ICpkLCB1bnNpZ25lZCBpbnQgbWF4X2dyYW50X2ZyYW1lcywKKyAgICAgICAgICAgICAgICAgICAg IHVuc2lnbmVkIGludCBtYXhfbWFwdHJhY2tfZnJhbWVzKQogeworICAgIHN0cnVjdCBncmFudF90 YWJsZSAqZ3Q7CiAgICAgaW50IHJldCA9IC1FTk9NRU07CiAKLSAgICBncmFudF93cml0ZV9sb2Nr KGd0KTsKKyAgICBpZiAoIG1heF9ncmFudF9mcmFtZXMgPCBJTklUSUFMX05SX0dSQU5UX0ZSQU1F UyB8fAorICAgICAgICAgbWF4X2dyYW50X2ZyYW1lcyA+IG9wdF9tYXhfZ3JhbnRfZnJhbWVzIHx8 CisgICAgICAgICBtYXhfbWFwdHJhY2tfZnJhbWVzID4gb3B0X21heF9tYXB0cmFja19mcmFtZXMg KQorICAgICAgICByZXR1cm4gLUVJTlZBTDsKIAotICAgIGlmICggZ3QtPmFjdGl2ZSApCi0gICAg ewotICAgICAgICByZXQgPSAtRUJVU1k7Ci0gICAgICAgIGdvdG8gb3V0X25vX2NsZWFudXA7Ci0g ICAgfQorICAgIGlmICggKGd0ID0geHphbGxvYyhzdHJ1Y3QgZ3JhbnRfdGFibGUpKSA9PSBOVUxM ICkKKyAgICAgICAgcmV0dXJuIC1FTk9NRU07CisKKyAgICAvKiBTaW1wbGUgc3R1ZmYuICovCisg ICAgcGVyY3B1X3J3bG9ja19yZXNvdXJjZV9pbml0KCZndC0+bG9jaywgZ3JhbnRfcndsb2NrKTsK KyAgICBzcGluX2xvY2tfaW5pdCgmZ3QtPm1hcHRyYWNrX2xvY2spOworCisgICAgZ3JhbnRfd3Jp dGVfbG9jayhndCk7CiAKLSAgICBndC0+bWF4X2dyYW50X2ZyYW1lcyA9IGdyYW50X2ZyYW1lczsK LSAgICBndC0+bWF4X21hcHRyYWNrX2ZyYW1lcyA9IG1hcHRyYWNrX2ZyYW1lczsKKyAgICBndC0+ bWF4X2dyYW50X2ZyYW1lcyA9IG1heF9ncmFudF9mcmFtZXM7CisgICAgZ3QtPm1heF9tYXB0cmFj a19mcmFtZXMgPSBtYXhfbWFwdHJhY2tfZnJhbWVzOwogCiAgICAgLyogQWN0aXZlIGdyYW50IHRh YmxlLiAqLwogICAgIGd0LT5hY3RpdmUgPSB4emFsbG9jX2FycmF5KHN0cnVjdCBhY3RpdmVfZ3Jh bnRfZW50cnkgKiwKQEAgLTE4NTQsNiArMTg2MCwxMCBAQCBncmFudF90YWJsZV9pbml0KHN0cnVj dCBkb21haW4gKmQsIHN0cnVjdCBncmFudF90YWJsZSAqZ3QsCiAgICAgaWYgKCByZXQgKQogICAg ICAgICBnb3RvIG91dDsKIAorICAgIC8qIE9rYXksIGluc3RhbGwgdGhlIHN0cnVjdHVyZS4gKi8K KyAgICBndC0+ZG9tYWluID0gZDsKKyAgICBkLT5ncmFudF90YWJsZSA9IGd0OworCiAgICAgLyog Z250dGFiX2dyb3dfdGFibGUoKSBhbGxvY2F0ZXMgYSBtaW4gbnVtYmVyIG9mIGZyYW1lcywgc28g MCBpcyBva2F5LiAqLwogICAgIHJldCA9IGdudHRhYl9ncm93X3RhYmxlKGQsIDApOwogCkBAIC0x ODcxLDcgKzE4ODEsNiBAQCBncmFudF90YWJsZV9pbml0KHN0cnVjdCBkb21haW4gKmQsIHN0cnVj dCBncmFudF90YWJsZSAqZ3QsCiAgICAgICAgIGd0LT5hY3RpdmUgPSBOVUxMOwogICAgIH0KIAot IG91dF9ub19jbGVhbnVwOgogICAgIGdyYW50X3dyaXRlX3VubG9jayhndCk7CiAKICAgICByZXR1 cm4gcmV0OwpAQCAtMzU3MiwyOCArMzU4MSw2IEBAIGRvX2dyYW50X3RhYmxlX29wKAogI2luY2x1 ZGUgImNvbXBhdC9ncmFudF90YWJsZS5jIgogI2VuZGlmCiAKLWludCBncmFudF90YWJsZV9jcmVh dGUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IG1heF9ncmFudF9mcmFtZXMsCi0gICAg ICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBtYXhfbWFwdHJhY2tfZnJhbWVzKQotewot ICAgIHN0cnVjdCBncmFudF90YWJsZSAqdDsKLSAgICBpbnQgcmV0ID0gMDsKLQotICAgIGlmICgg KHQgPSB4emFsbG9jKHN0cnVjdCBncmFudF90YWJsZSkpID09IE5VTEwgKQotICAgICAgICByZXR1 cm4gLUVOT01FTTsKLQotICAgIC8qIFNpbXBsZSBzdHVmZi4gKi8KLSAgICBwZXJjcHVfcndsb2Nr X3Jlc291cmNlX2luaXQoJnQtPmxvY2ssIGdyYW50X3J3bG9jayk7Ci0gICAgc3Bpbl9sb2NrX2lu aXQoJnQtPm1hcHRyYWNrX2xvY2spOwotCi0gICAgLyogT2theSwgaW5zdGFsbCB0aGUgc3RydWN0 dXJlLiAqLwotICAgIHQtPmRvbWFpbiA9IGQ7Ci0gICAgZC0+Z3JhbnRfdGFibGUgPSB0OwotCi0g ICAgcmV0ID0gZ3JhbnRfdGFibGVfc2V0X2xpbWl0cyhkLCBtYXhfbWFwdHJhY2tfZnJhbWVzLCBt YXhfbWFwdHJhY2tfZnJhbWVzKTsKLQotICAgIHJldHVybiByZXQ7Ci19Ci0KIHZvaWQKIGdudHRh Yl9yZWxlYXNlX21hcHBpbmdzKAogICAgIHN0cnVjdCBkb21haW4gKmQpCkBAIC0zNzg0LDIyICsz NzcxLDYgQEAgdm9pZCBncmFudF90YWJsZV9pbml0X3ZjcHUoc3RydWN0IHZjcHUgKnYpCiAgICAg di0+bWFwdHJhY2tfdGFpbCA9IE1BUFRSQUNLX1RBSUw7CiB9CiAKLWludCBncmFudF90YWJsZV9z ZXRfbGltaXRzKHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBncmFudF9mcmFtZXMsCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbWFwdHJhY2tfZnJhbWVzKQot ewotICAgIHN0cnVjdCBncmFudF90YWJsZSAqZ3QgPSBkLT5ncmFudF90YWJsZTsKLQotICAgIGlm ICggZ3JhbnRfZnJhbWVzIDwgSU5JVElBTF9OUl9HUkFOVF9GUkFNRVMgfHwKLSAgICAgICAgIGdy YW50X2ZyYW1lcyA+IG9wdF9tYXhfZ3JhbnRfZnJhbWVzIHx8Ci0gICAgICAgICBtYXB0cmFja19m cmFtZXMgPiBvcHRfbWF4X21hcHRyYWNrX2ZyYW1lcyApCi0gICAgICAgIHJldHVybiAtRUlOVkFM OwotICAgIGlmICggIWd0ICkKLSAgICAgICAgcmV0dXJuIC1FTk9FTlQ7Ci0KLSAgICAvKiBTZXQg bGltaXRzLiAqLwotICAgIHJldHVybiBncmFudF90YWJsZV9pbml0KGQsIGd0LCBncmFudF9mcmFt ZXMsIG1hcHRyYWNrX2ZyYW1lcyk7Ci19Ci0KICNpZmRlZiBDT05GSUdfSEFTX01FTV9TSEFSSU5H CiBpbnQgbWVtX3NoYXJpbmdfZ3JlZl90b19nZm4oc3RydWN0IGdyYW50X3RhYmxlICpndCwgZ3Jh bnRfcmVmX3QgcmVmLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdmbl90ICpnZm4sIHVp bnQxNl90ICpzdGF0dXMpCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS94ZW4vZ3JhbnRfdGFibGUu aCBiL3hlbi9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oCmluZGV4IGViZDUwMjQuLjQyNGFmZTAg MTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oCisrKyBiL3hlbi9pbmNs dWRlL3hlbi9ncmFudF90YWJsZS5oCkBAIC0zNSwxMyArMzUsMTEgQEAgZXh0ZXJuIHVuc2lnbmVk IGludCBvcHRfbWF4X2dyYW50X2ZyYW1lczsKIGV4dGVybiB1bnNpZ25lZCBpbnQgb3B0X21heF9t YXB0cmFja19mcmFtZXM7CiAKIC8qIENyZWF0ZS9kZXN0cm95IHBlci1kb21haW4gZ3JhbnQgdGFi bGUgY29udGV4dC4gKi8KLWludCBncmFudF90YWJsZV9jcmVhdGUoc3RydWN0IGRvbWFpbiAqZCwg dW5zaWduZWQgaW50IG1heF9ncmFudF9mcmFtZXMsCi0gICAgICAgICAgICAgICAgICAgICAgIHVu c2lnbmVkIGludCBtYXhfbWFwdHJhY2tfZnJhbWVzKTsKK2ludCBncmFudF90YWJsZV9pbml0KHN0 cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBtYXhfZ3JhbnRfZnJhbWVzLAorICAgICAgICAg ICAgICAgICAgICAgdW5zaWduZWQgaW50IG1heF9tYXB0cmFja19mcmFtZXMpOwogdm9pZCBncmFu dF90YWJsZV9kZXN0cm95KAogICAgIHN0cnVjdCBkb21haW4gKmQpOwogdm9pZCBncmFudF90YWJs ZV9pbml0X3ZjcHUoc3RydWN0IHZjcHUgKnYpOwotaW50IGdyYW50X3RhYmxlX3NldF9saW1pdHMo c3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IGdyYW50X2ZyYW1lcywKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBtYXB0cmFja19mcmFtZXMpOwogCiAvKgogICog Q2hlY2sgaWYgZG9tYWluIGhhcyBhY3RpdmUgZ3JhbnRzIGFuZCBsb2cgZmlyc3QgMTAgb2YgdGhl bS4KLS0gCjIuMS40CgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVucHJvamVjdC5v cmcKaHR0cHM6Ly9saXN0cy54ZW5wcm9qZWN0Lm9yZy9tYWlsbWFuL2xpc3RpbmZvL3hlbi1kZXZl bA==