From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dzmOK-0004bV-J3 for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:25 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dzmOH-0004z6-Ax for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:24 -0400 Received: from smtp02.citrix.com ([66.165.176.63]:9557) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1dzmOH-0004yD-5Q for qemu-devel@nongnu.org; Wed, 04 Oct 2017 12:19:21 -0400 From: Ian Jackson Date: Wed, 4 Oct 2017 17:18:05 +0100 Message-ID: <1507133891-26013-3-git-send-email-ian.jackson@eu.citrix.com> In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> References: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH 2/8] xen: restrict: use xentoolcore_restrict_all List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org, Juergen Gross , Stefano Stabellini , Ian Jackson , xen-devel@nongnu.org, Ian Jackson And insist that it works. Drop individual use of xendevicemodel_restrict and xenforeignmemory_restrict. These are not actually effective in this version of qemu, because qemu has a large number of fds open onto various Xen control devices. The restriction arrangements are still not right, because the restriction needs to be done very late - after qemu has opened all of its control fds. xentoolcore_restrict_all and xentoolcore.h are available in Xen 4.10 and later, only. Provide a compatibility stub. And drop the compatibility stubs for the old functions. Signed-off-by: Ian Jackson --- v2: Modify the compatibility code, too. Bump this patch ahead of "defer call to xen_restrict until running" Retain call to xentoolcore_restrict_all Signed-off-by: Ian Jackson --- include/hw/xen/xen_common.h | 46 +++++++++++---------------------------------- 1 file changed, 11 insertions(+), 35 deletions(-) diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index 86c7f26..3f44a63 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -91,6 +91,16 @@ static inline void *xenforeignmemory_map2(xenforeignmemory_handle *h, return xenforeignmemory_map(h, dom, prot, pages, arr, err); } +static inline int xentoolcore_restrict_all(domid_t domid) +{ + errno = ENOTTY; + return -1; +} + +#else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 41000 */ + +#include + #endif #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40900 @@ -218,20 +228,6 @@ static inline int xendevicemodel_set_mem_type( return xc_hvm_set_mem_type(dmod, domid, mem_type, first_pfn, nr); } -static inline int xendevicemodel_restrict( - xendevicemodel_handle *dmod, domid_t domid) -{ - errno = ENOTTY; - return -1; -} - -static inline int xenforeignmemory_restrict( - xenforeignmemory_handle *fmem, domid_t domid) -{ - errno = ENOTTY; - return -1; -} - #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */ #undef XC_WANT_COMPAT_DEVICEMODEL_API @@ -290,28 +286,8 @@ static inline int xen_modified_memory(domid_t domid, uint64_t first_pfn, static inline int xen_restrict(domid_t domid) { int rc; - - /* Attempt to restrict devicemodel operations */ - rc = xendevicemodel_restrict(xen_dmod, domid); + rc = xentoolcore_restrict_all(domid); trace_xen_domid_restrict(rc ? errno : 0); - - if (rc < 0) { - /* - * If errno is ENOTTY then restriction is not implemented so - * there's no point in trying to restrict other types of - * operation, but it should not be treated as a failure. - */ - if (errno == ENOTTY) { - return 0; - } - - return rc; - } - - /* Restrict foreignmemory operations */ - rc = xenforeignmemory_restrict(xen_fmem, domid); - trace_xen_domid_restrict(rc ? errno : 0); - return rc; } -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [PATCH 2/8] xen: restrict: use xentoolcore_restrict_all Date: Wed, 4 Oct 2017 17:18:05 +0100 Message-ID: <1507133891-26013-3-git-send-email-ian.jackson@eu.citrix.com> References: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.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 1dzmOJ-00078M-Ie for xen-devel@lists.xenproject.org; Wed, 04 Oct 2017 16:19:23 +0000 In-Reply-To: <1507133891-26013-1-git-send-email-ian.jackson@eu.citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org Cc: Juergen Gross , Stefano Stabellini , Ian Jackson , Ross Lagerwall , Anthony PERARD , xen-devel@lists.xenproject.org, xen-devel@nongnu.org List-Id: xen-devel@lists.xenproject.org QW5kIGluc2lzdCB0aGF0IGl0IHdvcmtzLgoKRHJvcCBpbmRpdmlkdWFsIHVzZSBvZiB4ZW5kZXZp Y2Vtb2RlbF9yZXN0cmljdCBhbmQKeGVuZm9yZWlnbm1lbW9yeV9yZXN0cmljdC4gIFRoZXNlIGFy ZSBub3QgYWN0dWFsbHkgZWZmZWN0aXZlIGluIHRoaXMKdmVyc2lvbiBvZiBxZW11LCBiZWNhdXNl IHFlbXUgaGFzIGEgbGFyZ2UgbnVtYmVyIG9mIGZkcyBvcGVuIG9udG8KdmFyaW91cyBYZW4gY29u dHJvbCBkZXZpY2VzLgoKVGhlIHJlc3RyaWN0aW9uIGFycmFuZ2VtZW50cyBhcmUgc3RpbGwgbm90 IHJpZ2h0LCBiZWNhdXNlIHRoZQpyZXN0cmljdGlvbiBuZWVkcyB0byBiZSBkb25lIHZlcnkgbGF0 ZSAtIGFmdGVyIHFlbXUgaGFzIG9wZW5lZCBhbGwgb2YKaXRzIGNvbnRyb2wgZmRzLgoKeGVudG9v bGNvcmVfcmVzdHJpY3RfYWxsIGFuZCB4ZW50b29sY29yZS5oIGFyZSBhdmFpbGFibGUgaW4gWGVu IDQuMTAKYW5kIGxhdGVyLCBvbmx5LiAgUHJvdmlkZSBhIGNvbXBhdGliaWxpdHkgc3R1Yi4gIEFu ZCBkcm9wIHRoZQpjb21wYXRpYmlsaXR5IHN0dWJzIGZvciB0aGUgb2xkIGZ1bmN0aW9ucy4KClNp Z25lZC1vZmYtYnk6IElhbiBKYWNrc29uIDxJYW4uSmFja3NvbkBldS5jaXRyaXguY29tPgotLS0K djI6IE1vZGlmeSB0aGUgY29tcGF0aWJpbGl0eSBjb2RlLCB0b28uCiAgICBCdW1wIHRoaXMgcGF0 Y2ggYWhlYWQgb2YgImRlZmVyIGNhbGwgdG8geGVuX3Jlc3RyaWN0IHVudGlsIHJ1bm5pbmciCiAg ICBSZXRhaW4gY2FsbCB0byB4ZW50b29sY29yZV9yZXN0cmljdF9hbGwKClNpZ25lZC1vZmYtYnk6 IElhbiBKYWNrc29uIDxJYW4uSmFja3NvbkBldS5jaXRyaXguY29tPgotLS0KIGluY2x1ZGUvaHcv eGVuL3hlbl9jb21tb24uaCB8IDQ2ICsrKysrKysrKysrLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogMSBmaWxlIGNoYW5nZWQsIDExIGluc2VydGlvbnMoKyksIDM1IGRlbGV0aW9u cygtKQoKZGlmZiAtLWdpdCBhL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCBiL2luY2x1ZGUv aHcveGVuL3hlbl9jb21tb24uaAppbmRleCA4NmM3ZjI2Li4zZjQ0YTYzIDEwMDY0NAotLS0gYS9p bmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmgKKysrIGIvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1v bi5oCkBAIC05MSw2ICs5MSwxNiBAQCBzdGF0aWMgaW5saW5lIHZvaWQgKnhlbmZvcmVpZ25tZW1v cnlfbWFwMih4ZW5mb3JlaWdubWVtb3J5X2hhbmRsZSAqaCwKICAgICByZXR1cm4geGVuZm9yZWln bm1lbW9yeV9tYXAoaCwgZG9tLCBwcm90LCBwYWdlcywgYXJyLCBlcnIpOwogfQogCitzdGF0aWMg aW5saW5lIGludCB4ZW50b29sY29yZV9yZXN0cmljdF9hbGwoZG9taWRfdCBkb21pZCkKK3sKKyAg ICBlcnJubyA9IEVOT1RUWTsKKyAgICByZXR1cm4gLTE7Cit9CisKKyNlbHNlIC8qIENPTkZJR19Y RU5fQ1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA+PSA0MTAwMCAqLworCisjaW5jbHVkZSA8eGVudG9v bGNvcmUuaD4KKwogI2VuZGlmCiAKICNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZFUlNJ T04gPCA0MDkwMApAQCAtMjE4LDIwICsyMjgsNiBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW5kZXZp Y2Vtb2RlbF9zZXRfbWVtX3R5cGUoCiAgICAgcmV0dXJuIHhjX2h2bV9zZXRfbWVtX3R5cGUoZG1v ZCwgZG9taWQsIG1lbV90eXBlLCBmaXJzdF9wZm4sIG5yKTsKIH0KIAotc3RhdGljIGlubGluZSBp bnQgeGVuZGV2aWNlbW9kZWxfcmVzdHJpY3QoCi0gICAgeGVuZGV2aWNlbW9kZWxfaGFuZGxlICpk bW9kLCBkb21pZF90IGRvbWlkKQotewotICAgIGVycm5vID0gRU5PVFRZOwotICAgIHJldHVybiAt MTsKLX0KLQotc3RhdGljIGlubGluZSBpbnQgeGVuZm9yZWlnbm1lbW9yeV9yZXN0cmljdCgKLSAg ICB4ZW5mb3JlaWdubWVtb3J5X2hhbmRsZSAqZm1lbSwgZG9taWRfdCBkb21pZCkKLXsKLSAgICBl cnJubyA9IEVOT1RUWTsKLSAgICByZXR1cm4gLTE7Ci19Ci0KICNlbHNlIC8qIENPTkZJR19YRU5f Q1RSTF9JTlRFUkZBQ0VfVkVSU0lPTiA+PSA0MDkwMCAqLwogCiAjdW5kZWYgWENfV0FOVF9DT01Q QVRfREVWSUNFTU9ERUxfQVBJCkBAIC0yOTAsMjggKzI4Niw4IEBAIHN0YXRpYyBpbmxpbmUgaW50 IHhlbl9tb2RpZmllZF9tZW1vcnkoZG9taWRfdCBkb21pZCwgdWludDY0X3QgZmlyc3RfcGZuLAog c3RhdGljIGlubGluZSBpbnQgeGVuX3Jlc3RyaWN0KGRvbWlkX3QgZG9taWQpCiB7CiAgICAgaW50 IHJjOwotCi0gICAgLyogQXR0ZW1wdCB0byByZXN0cmljdCBkZXZpY2Vtb2RlbCBvcGVyYXRpb25z ICovCi0gICAgcmMgPSB4ZW5kZXZpY2Vtb2RlbF9yZXN0cmljdCh4ZW5fZG1vZCwgZG9taWQpOwor ICAgIHJjID0geGVudG9vbGNvcmVfcmVzdHJpY3RfYWxsKGRvbWlkKTsKICAgICB0cmFjZV94ZW5f ZG9taWRfcmVzdHJpY3QocmMgPyBlcnJubyA6IDApOwotCi0gICAgaWYgKHJjIDwgMCkgewotICAg ICAgICAvKgotICAgICAgICAgKiBJZiBlcnJubyBpcyBFTk9UVFkgdGhlbiByZXN0cmljdGlvbiBp cyBub3QgaW1wbGVtZW50ZWQgc28KLSAgICAgICAgICogdGhlcmUncyBubyBwb2ludCBpbiB0cnlp bmcgdG8gcmVzdHJpY3Qgb3RoZXIgdHlwZXMgb2YKLSAgICAgICAgICogb3BlcmF0aW9uLCBidXQg aXQgc2hvdWxkIG5vdCBiZSB0cmVhdGVkIGFzIGEgZmFpbHVyZS4KLSAgICAgICAgICovCi0gICAg ICAgIGlmIChlcnJubyA9PSBFTk9UVFkpIHsKLSAgICAgICAgICAgIHJldHVybiAwOwotICAgICAg ICB9Ci0KLSAgICAgICAgcmV0dXJuIHJjOwotICAgIH0KLQotICAgIC8qIFJlc3RyaWN0IGZvcmVp Z25tZW1vcnkgb3BlcmF0aW9ucyAqLwotICAgIHJjID0geGVuZm9yZWlnbm1lbW9yeV9yZXN0cmlj dCh4ZW5fZm1lbSwgZG9taWQpOwotICAgIHRyYWNlX3hlbl9kb21pZF9yZXN0cmljdChyYyA/IGVy cm5vIDogMCk7Ci0KICAgICByZXR1cm4gcmM7CiB9CiAKLS0gCjIuMS40CgoKX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KWGVuLWRldmVsIG1haWxpbmcgbGlz dApYZW4tZGV2ZWxAbGlzdHMueGVuLm9yZwpodHRwczovL2xpc3RzLnhlbi5vcmcveGVuLWRldmVs Cg==