From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:57313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1corxe-00061J-EO for qemu-devel@nongnu.org; Fri, 17 Mar 2017 09:30:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1corxa-0006aY-6Q for qemu-devel@nongnu.org; Fri, 17 Mar 2017 09:30:30 -0400 Received: from smtp.citrix.com ([66.165.176.89]:38084) by eggs.gnu.org with esmtps (TLS1.0:RSA_ARCFOUR_SHA1:16) (Exim 4.71) (envelope-from ) id 1corxZ-0006aB-Vv for qemu-devel@nongnu.org; Fri, 17 Mar 2017 09:30:26 -0400 From: Paul Durrant Date: Fri, 17 Mar 2017 13:30:19 +0000 Message-ID: <1489757419-8179-1-git-send-email-paul.durrant@citrix.com> MIME-Version: 1.0 Content-Type: text/plain Subject: [Qemu-devel] [PATCH] xen: use libxendevice model to restrict operations List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org Cc: Paul Durrant , Stefano Stabellini , Anthony Perard , Paolo Bonzini This patch adds a command-line option (-xen-domid-restrict) which will use the new libxendevicemodel API to restrict devicemodel operations to the specified domid. This patch also adds a tracepoint to allow successful enabling of the restriction to be monitored. Signed-off-by: Paul Durrant --- Cc: Stefano Stabellini Cc: Anthony Perard Cc: Paolo Bonzini NOTE: This is already re-based on Juergen Gross's patch "xen: use 5 digit xen versions" and so should not be applied until after that patch has been applied. --- hw/xen/trace-events | 1 + include/hw/xen/xen.h | 1 + include/hw/xen/xen_common.h | 23 +++++++++++++++++++++++ qemu-options.hx | 6 ++++++ vl.c | 8 ++++++++ xen-hvm.c | 8 ++++++++ 6 files changed, 47 insertions(+) diff --git a/hw/xen/trace-events b/hw/xen/trace-events index c4fb6f1..a5b5e8b 100644 --- a/hw/xen/trace-events +++ b/hw/xen/trace-events @@ -11,3 +11,4 @@ xen_map_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: % xen_unmap_portio_range(uint32_t id, uint64_t start_addr, uint64_t end_addr) "id: %u start: %#"PRIx64" end: %#"PRIx64 xen_map_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" xen_unmap_pcidev(uint32_t id, uint8_t bus, uint8_t dev, uint8_t func) "id: %u bdf: %02x.%02x.%02x" +xen_domid_restrict(void) "" diff --git a/include/hw/xen/xen.h b/include/hw/xen/xen.h index 2b1733b..7efcdaa 100644 --- a/include/hw/xen/xen.h +++ b/include/hw/xen/xen.h @@ -21,6 +21,7 @@ enum xen_mode { extern uint32_t xen_domid; extern enum xen_mode xen_mode; +extern bool xen_domid_restrict; extern bool xen_allowed; diff --git a/include/hw/xen/xen_common.h b/include/hw/xen/xen_common.h index df098c7..5962bc4 100644 --- a/include/hw/xen/xen_common.h +++ b/include/hw/xen/xen_common.h @@ -152,6 +152,13 @@ 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; +} + #else /* CONFIG_XEN_CTRL_INTERFACE_VERSION >= 40900 */ #include @@ -206,6 +213,22 @@ static inline int xen_modified_memory(domid_t domid, uint64_t first_pfn, return xendevicemodel_modified_memory(xen_dmod, domid, first_pfn, nr); } +static inline int xen_restrict(domid_t domid) +{ + int rc = xendevicemodel_restrict(xen_dmod, domid); + + if (rc == 0) { + trace_xen_domid_restrict(); + return 0; + } + + if (errno == ENOTTY) { + return 0; + } + + return rc; +} + /* Xen 4.2 through 4.6 */ #if CONFIG_XEN_CTRL_INTERFACE_VERSION < 40701 diff --git a/qemu-options.hx b/qemu-options.hx index 99af8ed..4aab077 100644 --- a/qemu-options.hx +++ b/qemu-options.hx @@ -3354,6 +3354,10 @@ DEF("xen-attach", 0, QEMU_OPTION_xen_attach, "-xen-attach attach to existing xen domain\n" " xend will use this when starting QEMU\n", QEMU_ARCH_ALL) +DEF("xen-domid-restrict", 0, QEMU_OPTION_xen_domid_restrict, + "-xen-domid-restrict restrict set of available xen operations\n" + " to specified domain id\n", + QEMU_ARCH_ALL) STEXI @item -xen-domid @var{id} @findex -xen-domid @@ -3366,6 +3370,8 @@ Warning: should not be used when xend is in use (XEN only). @findex -xen-attach Attach to existing xen domain. xend will use this when starting QEMU (XEN only). +@findex -xen-domid-restrict +Restrict set of available xen operations to specified domain id (XEN only). ETEXI DEF("no-reboot", 0, QEMU_OPTION_no_reboot, \ diff --git a/vl.c b/vl.c index 0b4ed52..f46e070 100644 --- a/vl.c +++ b/vl.c @@ -205,6 +205,7 @@ static NotifierList machine_init_done_notifiers = bool xen_allowed; uint32_t xen_domid; enum xen_mode xen_mode = XEN_EMULATE; +bool xen_domid_restrict; static int has_defaults = 1; static int default_serial = 1; @@ -3933,6 +3934,13 @@ int main(int argc, char **argv, char **envp) } xen_mode = XEN_ATTACH; break; + case QEMU_OPTION_xen_domid_restrict: + if (!(xen_available())) { + error_report("Option not supported for this target"); + exit(1); + } + xen_domid_restrict = true; + break; case QEMU_OPTION_trace: g_free(trace_file); trace_file = trace_opt_parse(optarg); diff --git a/xen-hvm.c b/xen-hvm.c index 4b928cf..335e263 100644 --- a/xen-hvm.c +++ b/xen-hvm.c @@ -1226,6 +1226,14 @@ void xen_hvm_init(PCMachineState *pcms, MemoryRegion **ram_memory) goto err; } + if (xen_domid_restrict) { + rc = xen_restrict(xen_domid); + if (rc < 0) { + error_report("failed to restrict: error %d", errno); + goto err; + } + } + xen_create_ioreq_server(xen_domid, &state->ioservid); state->exit.notify = xen_exit_notifier; -- 2.1.4 From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Durrant Subject: [PATCH] xen: use libxendevice model to restrict operations Date: Fri, 17 Mar 2017 13:30:19 +0000 Message-ID: <1489757419-8179-1-git-send-email-paul.durrant@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1corxa-0007Fg-MS for xen-devel@lists.xenproject.org; Fri, 17 Mar 2017 13:30:26 +0000 List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" To: qemu-devel@nongnu.org, xen-devel@lists.xenproject.org Cc: Anthony Perard , Paolo Bonzini , Paul Durrant , Stefano Stabellini List-Id: xen-devel@lists.xenproject.org VGhpcyBwYXRjaCBhZGRzIGEgY29tbWFuZC1saW5lIG9wdGlvbiAoLXhlbi1kb21pZC1yZXN0cmlj dCkgd2hpY2ggd2lsbAp1c2UgdGhlIG5ldyBsaWJ4ZW5kZXZpY2Vtb2RlbCBBUEkgdG8gcmVzdHJp Y3QgZGV2aWNlbW9kZWwgb3BlcmF0aW9ucyB0bwp0aGUgc3BlY2lmaWVkIGRvbWlkLgoKVGhpcyBw YXRjaCBhbHNvIGFkZHMgYSB0cmFjZXBvaW50IHRvIGFsbG93IHN1Y2Nlc3NmdWwgZW5hYmxpbmcg b2YgdGhlCnJlc3RyaWN0aW9uIHRvIGJlIG1vbml0b3JlZC4KClNpZ25lZC1vZmYtYnk6IFBhdWwg RHVycmFudCA8cGF1bC5kdXJyYW50QGNpdHJpeC5jb20+Ci0tLQpDYzogU3RlZmFubyBTdGFiZWxs aW5pIDxzc3RhYmVsbGluaUBrZXJuZWwub3JnPgpDYzogQW50aG9ueSBQZXJhcmQgPGFudGhvbnku cGVyYXJkQGNpdHJpeC5jb20+CkNjOiBQYW9sbyBCb256aW5pIDxwYm9uemluaUByZWRoYXQuY29t PgoKTk9URTogVGhpcyBpcyBhbHJlYWR5IHJlLWJhc2VkIG9uIEp1ZXJnZW4gR3Jvc3MncyBwYXRj aCAieGVuOiB1c2UgNSBkaWdpdAogICAgICB4ZW4gdmVyc2lvbnMiIGFuZCBzbyBzaG91bGQgbm90 IGJlIGFwcGxpZWQgdW50aWwgYWZ0ZXIgdGhhdCBwYXRjaAogICAgICBoYXMgYmVlbiBhcHBsaWVk LgotLS0KIGh3L3hlbi90cmFjZS1ldmVudHMgICAgICAgICB8ICAxICsKIGluY2x1ZGUvaHcveGVu L3hlbi5oICAgICAgICB8ICAxICsKIGluY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaCB8IDIzICsr KysrKysrKysrKysrKysrKysrKysrCiBxZW11LW9wdGlvbnMuaHggICAgICAgICAgICAgfCAgNiAr KysrKysKIHZsLmMgICAgICAgICAgICAgICAgICAgICAgICB8ICA4ICsrKysrKysrCiB4ZW4taHZt LmMgICAgICAgICAgICAgICAgICAgfCAgOCArKysrKysrKwogNiBmaWxlcyBjaGFuZ2VkLCA0NyBp bnNlcnRpb25zKCspCgpkaWZmIC0tZ2l0IGEvaHcveGVuL3RyYWNlLWV2ZW50cyBiL2h3L3hlbi90 cmFjZS1ldmVudHMKaW5kZXggYzRmYjZmMS4uYTViNWU4YiAxMDA2NDQKLS0tIGEvaHcveGVuL3Ry YWNlLWV2ZW50cworKysgYi9ody94ZW4vdHJhY2UtZXZlbnRzCkBAIC0xMSwzICsxMSw0IEBAIHhl bl9tYXBfcG9ydGlvX3JhbmdlKHVpbnQzMl90IGlkLCB1aW50NjRfdCBzdGFydF9hZGRyLCB1aW50 NjRfdCBlbmRfYWRkcikgImlkOiAlCiB4ZW5fdW5tYXBfcG9ydGlvX3JhbmdlKHVpbnQzMl90IGlk LCB1aW50NjRfdCBzdGFydF9hZGRyLCB1aW50NjRfdCBlbmRfYWRkcikgImlkOiAldSBzdGFydDog JSMiUFJJeDY0IiBlbmQ6ICUjIlBSSXg2NAogeGVuX21hcF9wY2lkZXYodWludDMyX3QgaWQsIHVp bnQ4X3QgYnVzLCB1aW50OF90IGRldiwgdWludDhfdCBmdW5jKSAiaWQ6ICV1IGJkZjogJTAyeC4l MDJ4LiUwMngiCiB4ZW5fdW5tYXBfcGNpZGV2KHVpbnQzMl90IGlkLCB1aW50OF90IGJ1cywgdWlu dDhfdCBkZXYsIHVpbnQ4X3QgZnVuYykgImlkOiAldSBiZGY6ICUwMnguJTAyeC4lMDJ4IgoreGVu X2RvbWlkX3Jlc3RyaWN0KHZvaWQpICIiCmRpZmYgLS1naXQgYS9pbmNsdWRlL2h3L3hlbi94ZW4u aCBiL2luY2x1ZGUvaHcveGVuL3hlbi5oCmluZGV4IDJiMTczM2IuLjdlZmNkYWEgMTAwNjQ0Ci0t LSBhL2luY2x1ZGUvaHcveGVuL3hlbi5oCisrKyBiL2luY2x1ZGUvaHcveGVuL3hlbi5oCkBAIC0y MSw2ICsyMSw3IEBAIGVudW0geGVuX21vZGUgewogCiBleHRlcm4gdWludDMyX3QgeGVuX2RvbWlk OwogZXh0ZXJuIGVudW0geGVuX21vZGUgeGVuX21vZGU7CitleHRlcm4gYm9vbCB4ZW5fZG9taWRf cmVzdHJpY3Q7CiAKIGV4dGVybiBib29sIHhlbl9hbGxvd2VkOwogCmRpZmYgLS1naXQgYS9pbmNs dWRlL2h3L3hlbi94ZW5fY29tbW9uLmggYi9pbmNsdWRlL2h3L3hlbi94ZW5fY29tbW9uLmgKaW5k ZXggZGYwOThjNy4uNTk2MmJjNCAxMDA2NDQKLS0tIGEvaW5jbHVkZS9ody94ZW4veGVuX2NvbW1v bi5oCisrKyBiL2luY2x1ZGUvaHcveGVuL3hlbl9jb21tb24uaApAQCAtMTUyLDYgKzE1MiwxMyBA QCBzdGF0aWMgaW5saW5lIGludCB4ZW5kZXZpY2Vtb2RlbF9zZXRfbWVtX3R5cGUoCiAgICAgcmV0 dXJuIHhjX2h2bV9zZXRfbWVtX3R5cGUoZG1vZCwgZG9taWQsIG1lbV90eXBlLCBmaXJzdF9wZm4s IG5yKTsKIH0KIAorc3RhdGljIGlubGluZSBpbnQgeGVuZGV2aWNlbW9kZWxfcmVzdHJpY3QoCisg ICAgeGVuZGV2aWNlbW9kZWxfaGFuZGxlICpkbW9kLCBkb21pZF90IGRvbWlkKQoreworICAgIGVy cm5vID0gRU5PVFRZOworICAgIHJldHVybiAtMTsKK30KKwogI2Vsc2UgLyogQ09ORklHX1hFTl9D VFJMX0lOVEVSRkFDRV9WRVJTSU9OID49IDQwOTAwICovCiAKICNpbmNsdWRlIDx4ZW5kZXZpY2Vt b2RlbC5oPgpAQCAtMjA2LDYgKzIxMywyMiBAQCBzdGF0aWMgaW5saW5lIGludCB4ZW5fbW9kaWZp ZWRfbWVtb3J5KGRvbWlkX3QgZG9taWQsIHVpbnQ2NF90IGZpcnN0X3BmbiwKICAgICByZXR1cm4g eGVuZGV2aWNlbW9kZWxfbW9kaWZpZWRfbWVtb3J5KHhlbl9kbW9kLCBkb21pZCwgZmlyc3RfcGZu LCBucik7CiB9CiAKK3N0YXRpYyBpbmxpbmUgaW50IHhlbl9yZXN0cmljdChkb21pZF90IGRvbWlk KQoreworICAgIGludCByYyA9IHhlbmRldmljZW1vZGVsX3Jlc3RyaWN0KHhlbl9kbW9kLCBkb21p ZCk7CisKKyAgICBpZiAocmMgPT0gMCkgeworICAgICAgICB0cmFjZV94ZW5fZG9taWRfcmVzdHJp Y3QoKTsKKyAgICAgICAgcmV0dXJuIDA7CisgICAgfQorCisgICAgaWYgKGVycm5vID09IEVOT1RU WSkgeworICAgICAgICByZXR1cm4gMDsKKyAgICB9CisKKyAgICByZXR1cm4gcmM7Cit9CisKIC8q IFhlbiA0LjIgdGhyb3VnaCA0LjYgKi8KICNpZiBDT05GSUdfWEVOX0NUUkxfSU5URVJGQUNFX1ZF UlNJT04gPCA0MDcwMQogCmRpZmYgLS1naXQgYS9xZW11LW9wdGlvbnMuaHggYi9xZW11LW9wdGlv bnMuaHgKaW5kZXggOTlhZjhlZC4uNGFhYjA3NyAxMDA2NDQKLS0tIGEvcWVtdS1vcHRpb25zLmh4 CisrKyBiL3FlbXUtb3B0aW9ucy5oeApAQCAtMzM1NCw2ICszMzU0LDEwIEBAIERFRigieGVuLWF0 dGFjaCIsIDAsIFFFTVVfT1BUSU9OX3hlbl9hdHRhY2gsCiAgICAgIi14ZW4tYXR0YWNoICAgICBh dHRhY2ggdG8gZXhpc3RpbmcgeGVuIGRvbWFpblxuIgogICAgICIgICAgICAgICAgICAgICAgeGVu ZCB3aWxsIHVzZSB0aGlzIHdoZW4gc3RhcnRpbmcgUUVNVVxuIiwKICAgICBRRU1VX0FSQ0hfQUxM KQorREVGKCJ4ZW4tZG9taWQtcmVzdHJpY3QiLCAwLCBRRU1VX09QVElPTl94ZW5fZG9taWRfcmVz dHJpY3QsCisgICAgIi14ZW4tZG9taWQtcmVzdHJpY3QgICAgIHJlc3RyaWN0IHNldCBvZiBhdmFp bGFibGUgeGVuIG9wZXJhdGlvbnNcbiIKKyAgICAiICAgICAgICAgICAgICAgICAgICAgICAgdG8g c3BlY2lmaWVkIGRvbWFpbiBpZFxuIiwKKyAgICBRRU1VX0FSQ0hfQUxMKQogU1RFWEkKIEBpdGVt IC14ZW4tZG9taWQgQHZhcntpZH0KIEBmaW5kZXggLXhlbi1kb21pZApAQCAtMzM2Niw2ICszMzcw LDggQEAgV2FybmluZzogc2hvdWxkIG5vdCBiZSB1c2VkIHdoZW4geGVuZCBpcyBpbiB1c2UgKFhF TiBvbmx5KS4KIEBmaW5kZXggLXhlbi1hdHRhY2gKIEF0dGFjaCB0byBleGlzdGluZyB4ZW4gZG9t YWluLgogeGVuZCB3aWxsIHVzZSB0aGlzIHdoZW4gc3RhcnRpbmcgUUVNVSAoWEVOIG9ubHkpLgor QGZpbmRleCAteGVuLWRvbWlkLXJlc3RyaWN0CitSZXN0cmljdCBzZXQgb2YgYXZhaWxhYmxlIHhl biBvcGVyYXRpb25zIHRvIHNwZWNpZmllZCBkb21haW4gaWQgKFhFTiBvbmx5KS4KIEVURVhJCiAK IERFRigibm8tcmVib290IiwgMCwgUUVNVV9PUFRJT05fbm9fcmVib290LCBcCmRpZmYgLS1naXQg YS92bC5jIGIvdmwuYwppbmRleCAwYjRlZDUyLi5mNDZlMDcwIDEwMDY0NAotLS0gYS92bC5jCisr KyBiL3ZsLmMKQEAgLTIwNSw2ICsyMDUsNyBAQCBzdGF0aWMgTm90aWZpZXJMaXN0IG1hY2hpbmVf aW5pdF9kb25lX25vdGlmaWVycyA9CiBib29sIHhlbl9hbGxvd2VkOwogdWludDMyX3QgeGVuX2Rv bWlkOwogZW51bSB4ZW5fbW9kZSB4ZW5fbW9kZSA9IFhFTl9FTVVMQVRFOworYm9vbCB4ZW5fZG9t aWRfcmVzdHJpY3Q7CiAKIHN0YXRpYyBpbnQgaGFzX2RlZmF1bHRzID0gMTsKIHN0YXRpYyBpbnQg ZGVmYXVsdF9zZXJpYWwgPSAxOwpAQCAtMzkzMyw2ICszOTM0LDEzIEBAIGludCBtYWluKGludCBh cmdjLCBjaGFyICoqYXJndiwgY2hhciAqKmVudnApCiAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIHhlbl9tb2RlID0gWEVOX0FUVEFDSDsKICAgICAgICAgICAgICAgICBicmVhazsK KyAgICAgICAgICAgIGNhc2UgUUVNVV9PUFRJT05feGVuX2RvbWlkX3Jlc3RyaWN0OgorICAgICAg ICAgICAgICAgIGlmICghKHhlbl9hdmFpbGFibGUoKSkpIHsKKyAgICAgICAgICAgICAgICAgICAg ZXJyb3JfcmVwb3J0KCJPcHRpb24gbm90IHN1cHBvcnRlZCBmb3IgdGhpcyB0YXJnZXQiKTsKKyAg ICAgICAgICAgICAgICAgICAgZXhpdCgxKTsKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAg ICAgICAgeGVuX2RvbWlkX3Jlc3RyaWN0ID0gdHJ1ZTsKKyAgICAgICAgICAgICAgICBicmVhazsK ICAgICAgICAgICAgIGNhc2UgUUVNVV9PUFRJT05fdHJhY2U6CiAgICAgICAgICAgICAgICAgZ19m cmVlKHRyYWNlX2ZpbGUpOwogICAgICAgICAgICAgICAgIHRyYWNlX2ZpbGUgPSB0cmFjZV9vcHRf cGFyc2Uob3B0YXJnKTsKZGlmZiAtLWdpdCBhL3hlbi1odm0uYyBiL3hlbi1odm0uYwppbmRleCA0 YjkyOGNmLi4zMzVlMjYzIDEwMDY0NAotLS0gYS94ZW4taHZtLmMKKysrIGIveGVuLWh2bS5jCkBA IC0xMjI2LDYgKzEyMjYsMTQgQEAgdm9pZCB4ZW5faHZtX2luaXQoUENNYWNoaW5lU3RhdGUgKnBj bXMsIE1lbW9yeVJlZ2lvbiAqKnJhbV9tZW1vcnkpCiAgICAgICAgIGdvdG8gZXJyOwogICAgIH0K IAorICAgIGlmICh4ZW5fZG9taWRfcmVzdHJpY3QpIHsKKyAgICAgICAgcmMgPSB4ZW5fcmVzdHJp Y3QoeGVuX2RvbWlkKTsKKyAgICAgICAgaWYgKHJjIDwgMCkgeworICAgICAgICAgICAgZXJyb3Jf cmVwb3J0KCJmYWlsZWQgdG8gcmVzdHJpY3Q6IGVycm9yICVkIiwgZXJybm8pOworICAgICAgICAg ICAgZ290byBlcnI7CisgICAgICAgIH0KKyAgICB9CisKICAgICB4ZW5fY3JlYXRlX2lvcmVxX3Nl cnZlcih4ZW5fZG9taWQsICZzdGF0ZS0+aW9zZXJ2aWQpOwogCiAgICAgc3RhdGUtPmV4aXQubm90 aWZ5ID0geGVuX2V4aXRfbm90aWZpZXI7Ci0tIAoyLjEuNAoKCl9fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fClhlbi1kZXZlbCBtYWlsaW5nIGxpc3QKWGVuLWRl dmVsQGxpc3RzLnhlbi5vcmcKaHR0cHM6Ly9saXN0cy54ZW4ub3JnL3hlbi1kZXZlbAo=