From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: [PATCH v2 06/12] xen/gnttab: Pass max_{grant, maptrack}_frames into grant_table_create() Date: Mon, 13 Aug 2018 11:01:03 +0100 Message-ID: <1534154469-6076-7-git-send-email-andrew.cooper3@citrix.com> References: <1534154469-6076-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: <1534154469-6076-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 , Wei Liu , Jan Beulich List-Id: xen-devel@lists.xenproject.org Li4uIHJhdGhlciB0aGFuIHNldHRpbmcgdGhlIGxpbWl0cyB1cCBhZnRlciBkb21haW5fY3JlYXRl KCkgaGFzIGNvbXBsZXRlZC4KClRoaXMgcmVtb3ZlcyBhbGwgdGhlIGdudHRhYiBpbmZyYXN0cnVj dHVyZSBmb3IgY2FsY3VsYXRpbmcgdGhlIG51bWJlciBvZiBkb20wCmdyYW50IGZyYW1lcywgb3B0 aW5nIGluc3RlYWQgdG8gcmVxdWlyZSB0aGUgZG9tMCBjb25zdHJ1Y3Rpb24gY29kZSB0byBwYXNz IGEKc2FuZSB2YWx1ZSBpbiB2aWEgdGhlIGNvbmZpZ3VyYXRpb24uCgpJbiBwcmFjdGljZSwgdGhp cyBub3cgbWVhbnMgdGhhdCB0aGVyZSBpcyBuZXZlciBhIHBhcnRpYWxseSBjb25zdHJ1Y3RlZCBn cmFudAp0YWJsZSBmb3IgYSByZWZlcmVuY2UtYWJsZSBkb21haW4uCgpTaWduZWQtb2ZmLWJ5OiBB bmRyZXcgQ29vcGVyIDxhbmRyZXcuY29vcGVyM0BjaXRyaXguY29tPgotLS0KQ0M6IEphbiBCZXVs aWNoIDxKQmV1bGljaEBzdXNlLmNvbT4KQ0M6IFN0ZWZhbm8gU3RhYmVsbGluaSA8c3N0YWJlbGxp bmlAa2VybmVsLm9yZz4KQ0M6IEp1bGllbiBHcmFsbCA8anVsaWVuLmdyYWxsQGFybS5jb20+CkND OiBXZWkgTGl1IDx3ZWkubGl1MkBjaXRyaXguY29tPgoKdjI6CiAqIFNwbGl0L3JlYXJyYW5nZSB0 byBhdm9pZCB0aGUgcG9zdC1kb21haW4tY3JlYXRlIGVycm9yIHBhdGguCi0tLQogeGVuL2FyY2gv YXJtL2RvbWFpbl9idWlsZC5jICAgICAgIHwgIDMgKystCiB4ZW4vYXJjaC9hcm0vc2V0dXAuYyAg ICAgICAgICAgICAgfCAxMiArKysrKysrKysrKysKIHhlbi9hcmNoL3g4Ni9zZXR1cC5jICAgICAg ICAgICAgICB8ICAzICsrKwogeGVuL2NvbW1vbi9kb21haW4uYyAgICAgICAgICAgICAgIHwgIDMg KystCiB4ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgICAgICAgICAgfCAxNiArKystLS0tLS0tLS0t LS0tCiB4ZW4vaW5jbHVkZS9hc20tYXJtL2dyYW50X3RhYmxlLmggfCAxMiAtLS0tLS0tLS0tLS0K IHhlbi9pbmNsdWRlL2FzbS14ODYvZ3JhbnRfdGFibGUuaCB8ICA1IC0tLS0tCiB4ZW4vaW5jbHVk ZS94ZW4vZ3JhbnRfdGFibGUuaCAgICAgfCAgNiArKy0tLS0KIDggZmlsZXMgY2hhbmdlZCwgMjQg aW5zZXJ0aW9ucygrKSwgMzYgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEveGVuL2FyY2gvYXJt L2RvbWFpbl9idWlsZC5jIGIveGVuL2FyY2gvYXJtL2RvbWFpbl9idWlsZC5jCmluZGV4IDEzNTE1 NzIuLjczN2UwZjMgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9kb21haW5fYnVpbGQuYworKysg Yi94ZW4vYXJjaC9hcm0vZG9tYWluX2J1aWxkLmMKQEAgLTIwNzksNyArMjA3OSw4IEBAIHN0YXRp YyB2b2lkIF9faW5pdCBmaW5kX2dudHRhYl9yZWdpb24oc3RydWN0IGRvbWFpbiAqZCwKICAgICAg KiBlbm91Z2ggc3BhY2UgZm9yIGEgbGFyZ2UgZ3JhbnQgdGFibGUKICAgICAgKi8KICAgICBraW5m by0+Z250dGFiX3N0YXJ0ID0gX19wYShfc3RleHQpOwotICAgIGtpbmZvLT5nbnR0YWJfc2l6ZSA9 IGdudHRhYl9kb20wX2ZyYW1lcygpIDw8IFBBR0VfU0hJRlQ7CisgICAga2luZm8tPmdudHRhYl9z aXplID0gbWluX3QodW5zaWduZWQgaW50LCBvcHRfbWF4X2dyYW50X2ZyYW1lcywKKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICBQRk5fRE9XTihfZXRleHQgLSBfc3RleHQpKSA8PCBQQUdF X1NISUZUOwogCiAjaWZkZWYgQ09ORklHX0FSTV8zMgogICAgIC8qCmRpZmYgLS1naXQgYS94ZW4v YXJjaC9hcm0vc2V0dXAuYyBiL3hlbi9hcmNoL2FybS9zZXR1cC5jCmluZGV4IDQ1ZjM4NDEuLjNk M2IzMGMgMTAwNjQ0Ci0tLSBhL3hlbi9hcmNoL2FybS9zZXR1cC5jCisrKyBiL3hlbi9hcmNoL2Fy bS9zZXR1cC5jCkBAIC0yMCw2ICsyMCw3IEBACiAjaW5jbHVkZSA8eGVuL2NvbXBpbGUuaD4KICNp bmNsdWRlIDx4ZW4vZGV2aWNlX3RyZWUuaD4KICNpbmNsdWRlIDx4ZW4vZG9tYWluX3BhZ2UuaD4K KyNpbmNsdWRlIDx4ZW4vZ3JhbnRfdGFibGUuaD4KICNpbmNsdWRlIDx4ZW4vdHlwZXMuaD4KICNp bmNsdWRlIDx4ZW4vc3RyaW5nLmg+CiAjaW5jbHVkZSA8eGVuL3NlcmlhbC5oPgpAQCAtNjkzLDYg KzY5NCwxNyBAQCB2b2lkIF9faW5pdCBzdGFydF94ZW4odW5zaWduZWQgbG9uZyBib290X3BoeXNf b2Zmc2V0LAogICAgIHN0cnVjdCBkb21haW4gKmRvbTA7CiAgICAgc3RydWN0IHhlbl9kb21jdGxf Y3JlYXRlZG9tYWluIGRvbTBfY2ZnID0gewogICAgICAgICAubWF4X2V2dGNobl9wb3J0ID0gLTEs CisKKyAgICAgICAgLyoKKyAgICAgICAgICogVGhlIHJlZ2lvbiB1c2VkIGJ5IFhlbiBvbiB0aGUg bWVtb3J5IHdpbGwgbmV2ZXIgYmUgbWFwcGVkIGluIERPTTAKKyAgICAgICAgICogbWVtb3J5IGxh eW91dC4gVGhlcmVmb3JlIGl0IGNhbiBiZSB1c2VkIGZvciB0aGUgZ3JhbnQgdGFibGUuCisgICAg ICAgICAqCisgICAgICAgICAqIE9ubHkgdXNlIHRoZSB0ZXh0IHNlY3Rpb24gYXMgaXQncyBhbHdh eXMgcHJlc2VudCBhbmQgd2lsbCBjb250YWluCisgICAgICAgICAqIGVub3VnaCBzcGFjZSBmb3Ig YSBsYXJnZSBncmFudCB0YWJsZQorICAgICAgICAgKi8KKyAgICAgICAgLm1heF9ncmFudF9mcmFt ZXMgPSBtaW5fdCh1bnNpZ25lZCBpbnQsIG9wdF9tYXhfZ3JhbnRfZnJhbWVzLAorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIFBGTl9ET1dOKF9ldGV4dCAtIF9zdGV4dCkpLAorICAg ICAgICAubWF4X21hcHRyYWNrX2ZyYW1lcyA9IG9wdF9tYXhfbWFwdHJhY2tfZnJhbWVzLAogICAg IH07CiAKICAgICBkY2FjaGVfbGluZV9ieXRlcyA9IHJlYWRfZGNhY2hlX2xpbmVfYnl0ZXMoKTsK ZGlmZiAtLWdpdCBhL3hlbi9hcmNoL3g4Ni9zZXR1cC5jIGIveGVuL2FyY2gveDg2L3NldHVwLmMK aW5kZXggMDE1MDk5Zi4uMmNmYWU4OSAxMDA2NDQKLS0tIGEveGVuL2FyY2gveDg2L3NldHVwLmMK KysrIGIveGVuL2FyY2gveDg2L3NldHVwLmMKQEAgLTEsNiArMSw3IEBACiAjaW5jbHVkZSA8eGVu L2luaXQuaD4KICNpbmNsdWRlIDx4ZW4vbGliLmg+CiAjaW5jbHVkZSA8eGVuL2Vyci5oPgorI2lu Y2x1ZGUgPHhlbi9ncmFudF90YWJsZS5oPgogI2luY2x1ZGUgPHhlbi9zY2hlZC5oPgogI2luY2x1 ZGUgPHhlbi9zY2hlZC1pZi5oPgogI2luY2x1ZGUgPHhlbi9kb21haW4uaD4KQEAgLTY4Miw2ICs2 ODMsOCBAQCB2b2lkIF9faW5pdCBub3JldHVybiBfX3N0YXJ0X3hlbih1bnNpZ25lZCBsb25nIG1i aV9wKQogICAgIHN0cnVjdCB4ZW5fZG9tY3RsX2NyZWF0ZWRvbWFpbiBkb20wX2NmZyA9IHsKICAg ICAgICAgLmZsYWdzID0gWEVOX0RPTUNUTF9DREZfczNfaW50ZWdyaXR5LAogICAgICAgICAubWF4 X2V2dGNobl9wb3J0ID0gLTEsCisgICAgICAgIC5tYXhfZ3JhbnRfZnJhbWVzID0gb3B0X21heF9n cmFudF9mcmFtZXMsCisgICAgICAgIC5tYXhfbWFwdHJhY2tfZnJhbWVzID0gb3B0X21heF9tYXB0 cmFja19mcmFtZXMsCiAgICAgfTsKIAogICAgIC8qIENyaXRpY2FsIHJlZ2lvbiB3aXRob3V0IElE VCBvciBUU1MuICBBbnkgZmF1bHQgaXMgZGVhZGx5ISAqLwpkaWZmIC0tZ2l0IGEveGVuL2NvbW1v bi9kb21haW4uYyBiL3hlbi9jb21tb24vZG9tYWluLmMKaW5kZXggMTcxZDI1ZS4uMWRjYWI4ZCAx MDA2NDQKLS0tIGEveGVuL2NvbW1vbi9kb21haW4uYworKysgYi94ZW4vY29tbW9uL2RvbWFpbi5j CkBAIC0zNjYsNyArMzY2LDggQEAgc3RydWN0IGRvbWFpbiAqZG9tYWluX2NyZWF0ZShkb21pZF90 IGRvbWlkLAogICAgICAgICAgICAgZ290byBmYWlsOwogICAgICAgICBpbml0X3N0YXR1cyB8PSBJ TklUX2V2dGNobjsKIAotICAgICAgICBpZiAoIChlcnIgPSBncmFudF90YWJsZV9jcmVhdGUoZCkp ICE9IDAgKQorICAgICAgICBpZiAoIChlcnIgPSBncmFudF90YWJsZV9jcmVhdGUoZCwgY29uZmln LT5tYXhfZ3JhbnRfZnJhbWVzLAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgY29uZmlnLT5tYXhfbWFwdHJhY2tfZnJhbWVzKSkgIT0gMCApCiAgICAgICAgICAgICBnb3Rv IGZhaWw7CiAgICAgICAgIGluaXRfc3RhdHVzIHw9IElOSVRfZ250dGFiOwogCmRpZmYgLS1naXQg YS94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMgYi94ZW4vY29tbW9uL2dyYW50X3RhYmxlLmMKaW5k ZXggOGI4NDNiMS4uMzIwMDU0MiAxMDA2NDQKLS0tIGEveGVuL2NvbW1vbi9ncmFudF90YWJsZS5j CisrKyBiL3hlbi9jb21tb24vZ3JhbnRfdGFibGUuYwpAQCAtMzU2Myw5ICszNTYzLDggQEAgZG9f Z3JhbnRfdGFibGVfb3AoCiAjaW5jbHVkZSAiY29tcGF0L2dyYW50X3RhYmxlLmMiCiAjZW5kaWYK IAotaW50Ci1ncmFudF90YWJsZV9jcmVhdGUoCi0gICAgc3RydWN0IGRvbWFpbiAqZCkKK2ludCBn cmFudF90YWJsZV9jcmVhdGUoc3RydWN0IGRvbWFpbiAqZCwgdW5zaWduZWQgaW50IG1heF9ncmFu dF9mcmFtZXMsCisgICAgICAgICAgICAgICAgICAgICAgIHVuc2lnbmVkIGludCBtYXhfbWFwdHJh Y2tfZnJhbWVzKQogewogICAgIHN0cnVjdCBncmFudF90YWJsZSAqdDsKICAgICBpbnQgcmV0ID0g MDsKQEAgLTM1ODMsMTEgKzM1ODIsNyBAQCBncmFudF90YWJsZV9jcmVhdGUoCiAgICAgdC0+ZG9t YWluID0gZDsKICAgICBkLT5ncmFudF90YWJsZSA9IHQ7CiAKLSAgICBpZiAoIGQtPmRvbWFpbl9p ZCA9PSAwICkKLSAgICB7Ci0gICAgICAgIHJldCA9IGdyYW50X3RhYmxlX2luaXQoZCwgdCwgZ250 dGFiX2RvbTBfZnJhbWVzKCksCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgb3B0X21h eF9tYXB0cmFja19mcmFtZXMpOwotICAgIH0KKyAgICByZXQgPSBncmFudF90YWJsZV9zZXRfbGlt aXRzKGQsIG1heF9tYXB0cmFja19mcmFtZXMsIG1heF9tYXB0cmFja19mcmFtZXMpOwogCiAgICAg cmV0dXJuIHJldDsKIH0KQEAgLTQwNDUsMTEgKzQwNDAsNiBAQCBzdGF0aWMgaW50IF9faW5pdCBn bnR0YWJfdXNhZ2VfaW5pdCh2b2lkKQogfQogX19pbml0Y2FsbChnbnR0YWJfdXNhZ2VfaW5pdCk7 CiAKLXVuc2lnbmVkIGludCBfX2luaXQgZ250dGFiX2RvbTBfZnJhbWVzKHZvaWQpCi17Ci0gICAg cmV0dXJuIG1pbihvcHRfbWF4X2dyYW50X2ZyYW1lcywgZ250dGFiX2RvbTBfbWF4KCkpOwotfQot CiAvKgogICogTG9jYWwgdmFyaWFibGVzOgogICogbW9kZTogQwpkaWZmIC0tZ2l0IGEveGVuL2lu Y2x1ZGUvYXNtLWFybS9ncmFudF90YWJsZS5oIGIveGVuL2luY2x1ZGUvYXNtLWFybS9ncmFudF90 YWJsZS5oCmluZGV4IDljMmM4MTUuLmVlMTFjMzggMTAwNjQ0Ci0tLSBhL3hlbi9pbmNsdWRlL2Fz bS1hcm0vZ3JhbnRfdGFibGUuaAorKysgYi94ZW4vaW5jbHVkZS9hc20tYXJtL2dyYW50X3RhYmxl LmgKQEAgLTIzLDE4ICsyMyw2IEBAIHZvaWQgZ250dGFiX21hcmtfZGlydHkoc3RydWN0IGRvbWFp biAqZCwgbWZuX3QgbWZuKTsKICNkZWZpbmUgZ250dGFiX2NyZWF0ZV9zdGF0dXNfcGFnZShkLCB0 LCBpKSBkbyB7fSB3aGlsZSAoMCkKICNkZWZpbmUgZ250dGFiX3JlbGVhc2VfaG9zdF9tYXBwaW5n cyhkb21haW4pIDEKIAotLyoKLSAqIFRoZSByZWdpb24gdXNlZCBieSBYZW4gb24gdGhlIG1lbW9y eSB3aWxsIG5ldmVyIGJlIG1hcHBlZCBpbiBET00wCi0gKiBtZW1vcnkgbGF5b3V0LiBUaGVyZWZv cmUgaXQgY2FuIGJlIHVzZWQgZm9yIHRoZSBncmFudCB0YWJsZS4KLSAqCi0gKiBPbmx5IHVzZSB0 aGUgdGV4dCBzZWN0aW9uIGFzIGl0J3MgYWx3YXlzIHByZXNlbnQgYW5kIHdpbGwgY29udGFpbgot ICogZW5vdWdoIHNwYWNlIGZvciBhIGxhcmdlIGdyYW50IHRhYmxlCi0gKi8KLXN0YXRpYyBpbmxp bmUgdW5zaWduZWQgaW50IGdudHRhYl9kb20wX21heCh2b2lkKQotewotICAgIHJldHVybiBQRk5f RE9XTihfZXRleHQgLSBfc3RleHQpOwotfQotCiAjZGVmaW5lIGdudHRhYl9pbml0X2FyY2goZ3Qp ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgXAogKHsgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIFwKICAgICB1bnNpZ25lZCBpbnQgbmdmXyA9IChndCktPm1heF9ncmFudF9mcmFtZXM7 ICAgICAgICAgICAgICAgICAgICAgICAgICBcCmRpZmYgLS1naXQgYS94ZW4vaW5jbHVkZS9hc20t eDg2L2dyYW50X3RhYmxlLmggYi94ZW4vaW5jbHVkZS9hc20teDg2L2dyYW50X3RhYmxlLmgKaW5k ZXggNzZlYzVkZC4uNzYxYThjMyAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUvYXNtLXg4Ni9ncmFu dF90YWJsZS5oCisrKyBiL3hlbi9pbmNsdWRlL2FzbS14ODYvZ3JhbnRfdGFibGUuaApAQCAtMzks MTEgKzM5LDYgQEAgc3RhdGljIGlubGluZSBpbnQgcmVwbGFjZV9ncmFudF9ob3N0X21hcHBpbmco dWludDY0X3QgYWRkciwgbWZuX3QgZnJhbWUsCiAgICAgcmV0dXJuIHJlcGxhY2VfZ3JhbnRfcHZf bWFwcGluZyhhZGRyLCBmcmFtZSwgbmV3X2FkZHIsIGZsYWdzKTsKIH0KIAotc3RhdGljIGlubGlu ZSB1bnNpZ25lZCBpbnQgZ250dGFiX2RvbTBfbWF4KHZvaWQpCi17Ci0gICAgcmV0dXJuIFVJTlRf TUFYOwotfQotCiAjZGVmaW5lIGdudHRhYl9pbml0X2FyY2goZ3QpIDAKICNkZWZpbmUgZ250dGFi X2Rlc3Ryb3lfYXJjaChndCkgZG8ge30gd2hpbGUgKCAwICkKICNkZWZpbmUgZ250dGFiX3NldF9m cmFtZV9nZm4oZ3QsIHN0LCBpZHgsIGdmbikgZG8ge30gd2hpbGUgKCAwICkKZGlmZiAtLWdpdCBh L3hlbi9pbmNsdWRlL3hlbi9ncmFudF90YWJsZS5oIGIveGVuL2luY2x1ZGUveGVuL2dyYW50X3Rh YmxlLmgKaW5kZXggYzg4MTQxNC4uYjQ2YmIwYSAxMDA2NDQKLS0tIGEveGVuL2luY2x1ZGUveGVu L2dyYW50X3RhYmxlLmgKKysrIGIveGVuL2luY2x1ZGUveGVuL2dyYW50X3RhYmxlLmgKQEAgLTM1 LDggKzM1LDggQEAgZXh0ZXJuIHVuc2lnbmVkIGludCBvcHRfbWF4X2dyYW50X2ZyYW1lczsKIGV4 dGVybiB1bnNpZ25lZCBpbnQgb3B0X21heF9tYXB0cmFja19mcmFtZXM7CiAKIC8qIENyZWF0ZS9k ZXN0cm95IHBlci1kb21haW4gZ3JhbnQgdGFibGUgY29udGV4dC4gKi8KLWludCBncmFudF90YWJs ZV9jcmVhdGUoCi0gICAgc3RydWN0IGRvbWFpbiAqZCk7CitpbnQgZ3JhbnRfdGFibGVfY3JlYXRl KHN0cnVjdCBkb21haW4gKmQsIHVuc2lnbmVkIGludCBtYXhfZ3JhbnRfZnJhbWVzLAorICAgICAg ICAgICAgICAgICAgICAgICB1bnNpZ25lZCBpbnQgbWF4X21hcHRyYWNrX2ZyYW1lcyk7CiB2b2lk IGdyYW50X3RhYmxlX2Rlc3Ryb3koCiAgICAgc3RydWN0IGRvbWFpbiAqZCk7CiB2b2lkIGdyYW50 X3RhYmxlX2luaXRfdmNwdShzdHJ1Y3QgdmNwdSAqdik7CkBAIC02Myw2ICs2Myw0IEBAIGludCBn bnR0YWJfZ2V0X3NoYXJlZF9mcmFtZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25lZCBsb25nIGlk eCwKIGludCBnbnR0YWJfZ2V0X3N0YXR1c19mcmFtZShzdHJ1Y3QgZG9tYWluICpkLCB1bnNpZ25l ZCBsb25nIGlkeCwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBtZm5fdCAqbWZuKTsKIAot dW5zaWduZWQgaW50IGdudHRhYl9kb20wX2ZyYW1lcyh2b2lkKTsKLQogI2VuZGlmIC8qIF9fWEVO X0dSQU5UX1RBQkxFX0hfXyAqLwotLSAKMi4xLjQKCgpfX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fXwpYZW4tZGV2ZWwgbWFpbGluZyBsaXN0Clhlbi1kZXZlbEBs aXN0cy54ZW5wcm9qZWN0Lm9yZwpodHRwczovL2xpc3RzLnhlbnByb2plY3Qub3JnL21haWxtYW4v bGlzdGluZm8veGVuLWRldmVs