From: Juergen Gross Subject: [PATCH v2 3/5] xen: add grant interface version dependent constants to gnttab_ops Date: Thu, 2 Nov 2017 10:19:19 +0100 Message-ID: <20171102091921.32344-4-jgross@suse.com> References: <20171102091921.32344-1-jgross@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eABeq-0003wg-BL for xen-devel@lists.xenproject.org; Thu, 02 Nov 2017 09:19:28 +0000 In-Reply-To: <20171102091921.32344-1-jgross@suse.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Cc: Juergen Gross , boris.ostrovsky@oracle.com List-Id: xen-devel@lists.xenproject.org SW5zdGVhZCBvZiBoYXZpbmcgbXVsdGlwbGUgdmFyaWFibGVzIHdpdGggY29uc3RhbnRzIGxpa2UK Z3JhbnRfdGFibGVfdmVyc2lvbiBvciBncmVmc19wZXJfZ3JhbnRfZnJhbWUgYWRkIHRob3NlIHRv IHN0cnVjdApnbnR0YWJfb3BzIGFuZCBhY2Nlc3MgdGhlbSBqdXN0IHZpYSB0aGUgZ250dGFiX2lu dGVyZmFjZSBwb2ludGVyLgoKU2lnbmVkLW9mZi1ieTogSnVlcmdlbiBHcm9zcyA8amdyb3NzQHN1 c2UuY29tPgpSZXZpZXdlZC1ieTogQm9yaXMgT3N0cm92c2t5IDxib3Jpcy5vc3Ryb3Zza3lAb3Jh Y2xlLmNvbT4KLS0tCiBkcml2ZXJzL3hlbi9ncmFudC10YWJsZS5jIHwgNzMgKysrKysrKysrKysr KysrKysrKysrKysrKysrKy0tLS0tLS0tLS0tLS0tLS0tLS0KIDEgZmlsZSBjaGFuZ2VkLCA0MyBp bnNlcnRpb25zKCspLCAzMCBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL3hlbi9n cmFudC10YWJsZS5jIGIvZHJpdmVycy94ZW4vZ3JhbnQtdGFibGUuYwppbmRleCBkYjZhMWI5ZWZk MTEuLjU3M2U3ZmU5YjE0NyAxMDA2NDQKLS0tIGEvZHJpdmVycy94ZW4vZ3JhbnQtdGFibGUuYwor KysgYi9kcml2ZXJzL3hlbi9ncmFudC10YWJsZS5jCkBAIC03OCw2ICs3OCwxNCBAQCBzdGF0aWMg dW5pb24gewogLypUaGlzIGlzIGEgc3RydWN0dXJlIG9mIGZ1bmN0aW9uIHBvaW50ZXJzIGZvciBn cmFudCB0YWJsZSovCiBzdHJ1Y3QgZ250dGFiX29wcyB7CiAJLyoKKwkgKiBWZXJzaW9uIG9mIHRo ZSBncmFudCBpbnRlcmZhY2UuCisJICovCisJdW5zaWduZWQgaW50IHZlcnNpb247CisJLyoKKwkg KiBHcmFudCByZWZzIHBlciBncmFudCBmcmFtZS4KKwkgKi8KKwl1bnNpZ25lZCBpbnQgZ3JlZnNf cGVyX2dyYW50X2ZyYW1lOworCS8qCiAJICogTWFwcGluZyBhIGxpc3Qgb2YgZnJhbWVzIGZvciBz dG9yaW5nIGdyYW50IGVudHJpZXMuIEZyYW1lcyBwYXJhbWV0ZXIKIAkgKiBpcyB1c2VkIHRvIHN0 b3JlIGdyYW50IHRhYmxlIGFkZHJlc3Mgd2hlbiBncmFudCB0YWJsZSBiZWluZyBzZXR1cCwKIAkg KiBucl9nZnJhbWVzIGlzIHRoZSBudW1iZXIgb2YgZnJhbWVzIHRvIG1hcCBncmFudCB0YWJsZS4g UmV0dXJuaW5nCkBAIC0xMzQsOSArMTQyLDYgQEAgc3RhdGljIGNvbnN0IHN0cnVjdCBnbnR0YWJf b3BzICpnbnR0YWJfaW50ZXJmYWNlOwogLyogVGhpcyByZWZsZWN0cyBzdGF0dXMgb2YgZ3JhbnQg ZW50cmllcywgc28gYWN0IGFzIGEgZ2xvYmFsIHZhbHVlLiAqLwogc3RhdGljIGdyYW50X3N0YXR1 c190ICpncnN0YXR1czsKIAotc3RhdGljIGludCBncmFudF90YWJsZV92ZXJzaW9uOwotc3RhdGlj IGludCBncmVmc19wZXJfZ3JhbnRfZnJhbWU7Ci0KIHN0YXRpYyBzdHJ1Y3QgZ250dGFiX2ZyZWVf Y2FsbGJhY2sgKmdudHRhYl9mcmVlX2NhbGxiYWNrX2xpc3Q7CiAKIHN0YXRpYyBpbnQgZ250dGFi X2V4cGFuZCh1bnNpZ25lZCBpbnQgcmVxX2VudHJpZXMpOwpAQCAtNjM2LDE5ICs2NDEsMjYgQEAg dm9pZCBnbnR0YWJfY2FuY2VsX2ZyZWVfY2FsbGJhY2soc3RydWN0IGdudHRhYl9mcmVlX2NhbGxi YWNrICpjYWxsYmFjaykKIH0KIEVYUE9SVF9TWU1CT0xfR1BMKGdudHRhYl9jYW5jZWxfZnJlZV9j YWxsYmFjayk7CiAKK3N0YXRpYyB1bnNpZ25lZCBpbnQgZ250dGFiX2ZyYW1lcyh1bnNpZ25lZCBp bnQgZnJhbWVzLCB1bnNpZ25lZCBpbnQgYWxpZ24pCit7CisJcmV0dXJuIChmcmFtZXMgKiBnbnR0 YWJfaW50ZXJmYWNlLT5ncmVmc19wZXJfZ3JhbnRfZnJhbWUgKyBhbGlnbiAtIDEpIC8KKwkgICAg ICAgYWxpZ247Cit9CisKIHN0YXRpYyBpbnQgZ3Jvd19nbnR0YWJfbGlzdCh1bnNpZ25lZCBpbnQg bW9yZV9mcmFtZXMpCiB7CiAJdW5zaWduZWQgaW50IG5ld19ucl9ncmFudF9mcmFtZXMsIGV4dHJh X2VudHJpZXMsIGk7CiAJdW5zaWduZWQgaW50IG5yX2dsaXN0X2ZyYW1lcywgbmV3X25yX2dsaXN0 X2ZyYW1lczsKKwl1bnNpZ25lZCBpbnQgZ3JlZnNfcGVyX2ZyYW1lOwogCi0JQlVHX09OKGdyZWZz X3Blcl9ncmFudF9mcmFtZSA9PSAwKTsKKwlCVUdfT04oZ250dGFiX2ludGVyZmFjZSA9PSBOVUxM KTsKKwlncmVmc19wZXJfZnJhbWUgPSBnbnR0YWJfaW50ZXJmYWNlLT5ncmVmc19wZXJfZ3JhbnRf ZnJhbWU7CiAKIAluZXdfbnJfZ3JhbnRfZnJhbWVzID0gbnJfZ3JhbnRfZnJhbWVzICsgbW9yZV9m cmFtZXM7Ci0JZXh0cmFfZW50cmllcyAgICAgICA9IG1vcmVfZnJhbWVzICogZ3JlZnNfcGVyX2dy YW50X2ZyYW1lOworCWV4dHJhX2VudHJpZXMgPSBtb3JlX2ZyYW1lcyAqIGdyZWZzX3Blcl9mcmFt ZTsKIAotCW5yX2dsaXN0X2ZyYW1lcyA9IChucl9ncmFudF9mcmFtZXMgKiBncmVmc19wZXJfZ3Jh bnRfZnJhbWUgKyBSUFAgLSAxKSAvIFJQUDsKLQluZXdfbnJfZ2xpc3RfZnJhbWVzID0KLQkJKG5l d19ucl9ncmFudF9mcmFtZXMgKiBncmVmc19wZXJfZ3JhbnRfZnJhbWUgKyBSUFAgLSAxKSAvIFJQ UDsKKwlucl9nbGlzdF9mcmFtZXMgPSBnbnR0YWJfZnJhbWVzKG5yX2dyYW50X2ZyYW1lcywgUlBQ KTsKKwluZXdfbnJfZ2xpc3RfZnJhbWVzID0gZ250dGFiX2ZyYW1lcyhuZXdfbnJfZ3JhbnRfZnJh bWVzLCBSUFApOwogCWZvciAoaSA9IG5yX2dsaXN0X2ZyYW1lczsgaSA8IG5ld19ucl9nbGlzdF9m cmFtZXM7IGkrKykgewogCQlnbnR0YWJfbGlzdFtpXSA9IChncmFudF9yZWZfdCAqKV9fZ2V0X2Zy ZWVfcGFnZShHRlBfQVRPTUlDKTsKIAkJaWYgKCFnbnR0YWJfbGlzdFtpXSkKQEAgLTY1NiwxMiAr NjY4LDEyIEBAIHN0YXRpYyBpbnQgZ3Jvd19nbnR0YWJfbGlzdCh1bnNpZ25lZCBpbnQgbW9yZV9m cmFtZXMpCiAJfQogCiAKLQlmb3IgKGkgPSBncmVmc19wZXJfZ3JhbnRfZnJhbWUgKiBucl9ncmFu dF9mcmFtZXM7Ci0JICAgICBpIDwgZ3JlZnNfcGVyX2dyYW50X2ZyYW1lICogbmV3X25yX2dyYW50 X2ZyYW1lcyAtIDE7IGkrKykKKwlmb3IgKGkgPSBncmVmc19wZXJfZnJhbWUgKiBucl9ncmFudF9m cmFtZXM7CisJICAgICBpIDwgZ3JlZnNfcGVyX2ZyYW1lICogbmV3X25yX2dyYW50X2ZyYW1lcyAt IDE7IGkrKykKIAkJZ250dGFiX2VudHJ5KGkpID0gaSArIDE7CiAKIAlnbnR0YWJfZW50cnkoaSkg PSBnbnR0YWJfZnJlZV9oZWFkOwotCWdudHRhYl9mcmVlX2hlYWQgPSBncmVmc19wZXJfZ3JhbnRf ZnJhbWUgKiBucl9ncmFudF9mcmFtZXM7CisJZ250dGFiX2ZyZWVfaGVhZCA9IGdyZWZzX3Blcl9m cmFtZSAqIG5yX2dyYW50X2ZyYW1lczsKIAlnbnR0YWJfZnJlZV9jb3VudCArPSBleHRyYV9lbnRy aWVzOwogCiAJbnJfZ3JhbnRfZnJhbWVzID0gbmV3X25yX2dyYW50X2ZyYW1lczsKQEAgLTEwMTMs OCArMTAyNSw4IEBAIEVYUE9SVF9TWU1CT0xfR1BMKGdudHRhYl91bm1hcF9yZWZzX3N5bmMpOwog CiBzdGF0aWMgdW5zaWduZWQgaW50IG5yX3N0YXR1c19mcmFtZXModW5zaWduZWQgaW50IG5yX2dy YW50X2ZyYW1lcykKIHsKLQlCVUdfT04oZ3JlZnNfcGVyX2dyYW50X2ZyYW1lID09IDApOwotCXJl dHVybiAobnJfZ3JhbnRfZnJhbWVzICogZ3JlZnNfcGVyX2dyYW50X2ZyYW1lICsgU1BQIC0gMSkg LyBTUFA7CisJQlVHX09OKGdudHRhYl9pbnRlcmZhY2UgPT0gTlVMTCk7CisJcmV0dXJuIGdudHRh Yl9mcmFtZXMobnJfZ3JhbnRfZnJhbWVzLCBTUFApOwogfQogCiBzdGF0aWMgaW50IGdudHRhYl9t YXBfZnJhbWVzX3YxKHhlbl9wZm5fdCAqZnJhbWVzLCB1bnNpZ25lZCBpbnQgbnJfZ2ZyYW1lcykK QEAgLTExNDIsNiArMTE1NCw5IEBAIHN0YXRpYyBpbnQgZ250dGFiX21hcCh1bnNpZ25lZCBpbnQg c3RhcnRfaWR4LCB1bnNpZ25lZCBpbnQgZW5kX2lkeCkKIH0KIAogc3RhdGljIGNvbnN0IHN0cnVj dCBnbnR0YWJfb3BzIGdudHRhYl92MV9vcHMgPSB7CisJLnZlcnNpb24JCQk9IDEsCisJLmdyZWZz X3Blcl9ncmFudF9mcmFtZQkJPSBYRU5fUEFHRV9TSVpFIC8KKwkJCQkJICBzaXplb2Yoc3RydWN0 IGdyYW50X2VudHJ5X3YxKSwKIAkubWFwX2ZyYW1lcwkJCT0gZ250dGFiX21hcF9mcmFtZXNfdjEs CiAJLnVubWFwX2ZyYW1lcwkJCT0gZ250dGFiX3VubWFwX2ZyYW1lc192MSwKIAkudXBkYXRlX2Vu dHJ5CQkJPSBnbnR0YWJfdXBkYXRlX2VudHJ5X3YxLApAQCAtMTE1MSw2ICsxMTY2LDkgQEAgc3Rh dGljIGNvbnN0IHN0cnVjdCBnbnR0YWJfb3BzIGdudHRhYl92MV9vcHMgPSB7CiB9OwogCiBzdGF0 aWMgY29uc3Qgc3RydWN0IGdudHRhYl9vcHMgZ250dGFiX3YyX29wcyA9IHsKKwkudmVyc2lvbgkJ CT0gMiwKKwkuZ3JlZnNfcGVyX2dyYW50X2ZyYW1lCQk9IFhFTl9QQUdFX1NJWkUgLworCQkJCQkg IHNpemVvZih1bmlvbiBncmFudF9lbnRyeV92MiksCiAJLm1hcF9mcmFtZXMJCQk9IGdudHRhYl9t YXBfZnJhbWVzX3YyLAogCS51bm1hcF9mcmFtZXMJCQk9IGdudHRhYl91bm1hcF9mcmFtZXNfdjIs CiAJLnVwZGF0ZV9lbnRyeQkJCT0gZ250dGFiX3VwZGF0ZV9lbnRyeV92MiwKQEAgLTExNjcsMTgg KzExODUsMTIgQEAgc3RhdGljIHZvaWQgZ250dGFiX3JlcXVlc3RfdmVyc2lvbih2b2lkKQogCWdz di52ZXJzaW9uID0gMTsKIAogCXJjID0gSFlQRVJWSVNPUl9ncmFudF90YWJsZV9vcChHTlRUQUJP UF9zZXRfdmVyc2lvbiwgJmdzdiwgMSk7Ci0JaWYgKHJjID09IDAgJiYgZ3N2LnZlcnNpb24gPT0g MikgewotCQlncmFudF90YWJsZV92ZXJzaW9uID0gMjsKLQkJZ3JlZnNfcGVyX2dyYW50X2ZyYW1l ID0gWEVOX1BBR0VfU0laRSAvCi0JCQkJCXNpemVvZih1bmlvbiBncmFudF9lbnRyeV92Mik7CisJ aWYgKHJjID09IDAgJiYgZ3N2LnZlcnNpb24gPT0gMikKIAkJZ250dGFiX2ludGVyZmFjZSA9ICZn bnR0YWJfdjJfb3BzOwotCX0gZWxzZSB7Ci0JCWdyYW50X3RhYmxlX3ZlcnNpb24gPSAxOwotCQln cmVmc19wZXJfZ3JhbnRfZnJhbWUgPSBYRU5fUEFHRV9TSVpFIC8KLQkJCQkJc2l6ZW9mKHN0cnVj dCBncmFudF9lbnRyeV92MSk7CisJZWxzZQogCQlnbnR0YWJfaW50ZXJmYWNlID0gJmdudHRhYl92 MV9vcHM7Ci0JfQotCXByX2luZm8oIkdyYW50IHRhYmxlcyB1c2luZyB2ZXJzaW9uICVkIGxheW91 dFxuIiwgZ3JhbnRfdGFibGVfdmVyc2lvbik7CisJcHJfaW5mbygiR3JhbnQgdGFibGVzIHVzaW5n IHZlcnNpb24gJWQgbGF5b3V0XG4iLAorCQlnbnR0YWJfaW50ZXJmYWNlLT52ZXJzaW9uKTsKIH0K IAogc3RhdGljIGludCBnbnR0YWJfc2V0dXAodm9pZCkKQEAgLTEyMTgsMTAgKzEyMzAsMTAgQEAg c3RhdGljIGludCBnbnR0YWJfZXhwYW5kKHVuc2lnbmVkIGludCByZXFfZW50cmllcykKIAlpbnQg cmM7CiAJdW5zaWduZWQgaW50IGN1ciwgZXh0cmE7CiAKLQlCVUdfT04oZ3JlZnNfcGVyX2dyYW50 X2ZyYW1lID09IDApOworCUJVR19PTihnbnR0YWJfaW50ZXJmYWNlID09IE5VTEwpOwogCWN1ciA9 IG5yX2dyYW50X2ZyYW1lczsKLQlleHRyYSA9ICgocmVxX2VudHJpZXMgKyAoZ3JlZnNfcGVyX2dy YW50X2ZyYW1lLTEpKSAvCi0JCSBncmVmc19wZXJfZ3JhbnRfZnJhbWUpOworCWV4dHJhID0gKChy ZXFfZW50cmllcyArIGdudHRhYl9pbnRlcmZhY2UtPmdyZWZzX3Blcl9ncmFudF9mcmFtZSAtIDEp IC8KKwkJIGdudHRhYl9pbnRlcmZhY2UtPmdyZWZzX3Blcl9ncmFudF9mcmFtZSk7CiAJaWYgKGN1 ciArIGV4dHJhID4gZ250dGFiX21heF9ncmFudF9mcmFtZXMoKSkgewogCQlwcl93YXJuX3JhdGVs aW1pdGVkKCJ4ZW4vZ3JhbnQtdGFibGU6IG1heF9ncmFudF9mcmFtZXMgcmVhY2hlZCIKIAkJCQkg ICAgIiBjdXI9JXUgZXh0cmE9JXUgbGltaXQ9JXUiCkBAIC0xMjUzLDE2ICsxMjY1LDE2IEBAIGlu dCBnbnR0YWJfaW5pdCh2b2lkKQogCS8qIERldGVybWluZSB0aGUgbWF4aW11bSBudW1iZXIgb2Yg ZnJhbWVzIHJlcXVpcmVkIGZvciB0aGUKIAkgKiBncmFudCByZWZlcmVuY2UgZnJlZSBsaXN0IG9u IHRoZSBjdXJyZW50IGh5cGVydmlzb3IuCiAJICovCi0JQlVHX09OKGdyZWZzX3Blcl9ncmFudF9m cmFtZSA9PSAwKTsKKwlCVUdfT04oZ250dGFiX2ludGVyZmFjZSA9PSBOVUxMKTsKIAltYXhfbnJf Z2xpc3RfZnJhbWVzID0gKG1heF9ucl9ncmFudF9mcmFtZXMgKgotCQkJICAgICAgIGdyZWZzX3Bl cl9ncmFudF9mcmFtZSAvIFJQUCk7CisJCQkgICAgICAgZ250dGFiX2ludGVyZmFjZS0+Z3JlZnNf cGVyX2dyYW50X2ZyYW1lIC8gUlBQKTsKIAogCWdudHRhYl9saXN0ID0ga21hbGxvYyhtYXhfbnJf Z2xpc3RfZnJhbWVzICogc2l6ZW9mKGdyYW50X3JlZl90ICopLAogCQkJICAgICAgR0ZQX0tFUk5F TCk7CiAJaWYgKGdudHRhYl9saXN0ID09IE5VTEwpCiAJCXJldHVybiAtRU5PTUVNOwogCi0JbnJf Z2xpc3RfZnJhbWVzID0gKG5yX2dyYW50X2ZyYW1lcyAqIGdyZWZzX3Blcl9ncmFudF9mcmFtZSAr IFJQUCAtIDEpIC8gUlBQOworCW5yX2dsaXN0X2ZyYW1lcyA9IGdudHRhYl9mcmFtZXMobnJfZ3Jh bnRfZnJhbWVzLCBSUFApOwogCWZvciAoaSA9IDA7IGkgPCBucl9nbGlzdF9mcmFtZXM7IGkrKykg ewogCQlnbnR0YWJfbGlzdFtpXSA9IChncmFudF9yZWZfdCAqKV9fZ2V0X2ZyZWVfcGFnZShHRlBf S0VSTkVMKTsKIAkJaWYgKGdudHRhYl9saXN0W2ldID09IE5VTEwpIHsKQEAgLTEyODEsNyArMTI5 Myw4IEBAIGludCBnbnR0YWJfaW5pdCh2b2lkKQogCQlnb3RvIGluaV9ub21lbTsKIAl9CiAKLQlu cl9pbml0X2dyZWZzID0gbnJfZ3JhbnRfZnJhbWVzICogZ3JlZnNfcGVyX2dyYW50X2ZyYW1lOwor CW5yX2luaXRfZ3JlZnMgPSBucl9ncmFudF9mcmFtZXMgKgorCQkJZ250dGFiX2ludGVyZmFjZS0+ Z3JlZnNfcGVyX2dyYW50X2ZyYW1lOwogCiAJZm9yIChpID0gTlJfUkVTRVJWRURfRU5UUklFUzsg aSA8IG5yX2luaXRfZ3JlZnMgLSAxOyBpKyspCiAJCWdudHRhYl9lbnRyeShpKSA9IGkgKyAxOwot LSAKMi4xMi4zCgoKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X18KWGVuLWRldmVsIG1haWxpbmcgbGlzdApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczov L2xpc3RzLnhlbi5vcmcveGVuLWRldmVsCg==