From patchwork Wed Oct 18 13:42:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Lagerwall X-Patchwork-Id: 10014719 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 84CAD60215 for ; Wed, 18 Oct 2017 13:45:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7662128AC7 for ; Wed, 18 Oct 2017 13:45:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6A6F628ACB; Wed, 18 Oct 2017 13:45:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8903028AC7 for ; Wed, 18 Oct 2017 13:45:04 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4ocZ-00050W-QB; Wed, 18 Oct 2017 13:42:55 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e4ocZ-00050M-2v for xen-devel@lists.xen.org; Wed, 18 Oct 2017 13:42:55 +0000 Received: from [85.158.139.211] by server-15.bemta-5.messagelabs.com id 8E/BA-23912-E5A57E95; Wed, 18 Oct 2017 13:42:54 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrOLMWRWlGSWpSXmKPExsXitHRDpG5s1PN Ig8fTdSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oznr/YyFny0qrjxdAtjA+MUoy5GTg4JAX+J 3w/7WUFsNgEDiVuXvjOD2CIC6hKnOy4Cxbk4mAUWMEpsXP+fESQhLBAhcbj5JVCCg4NFQFVi6 81wEJNXwE5i/3N7iJFyEnsuzmAHsYUE1CTeLj/DAmLzCghKnJz5BMxmFpCQOPjiBfMERu5ZSF KzkKQWMDKtYlQvTi0qSy3SNdZLKspMzyjJTczM0TU0MNXLTS0uTkxPzUlMKtZLzs/dxAgMBAY g2MG495/TIUZJDiYlUV7dA88ihfiS8lMqMxKLM+KLSnNSiw8xynBwKEnwVkY+jxQSLEpNT61I y8wBhiRMWoKDR0mENyoCKM1bXJCYW5yZDpE6xajL0XHz7h8mIZa8/LxUKXHeSJAZAiBFGaV5c CNg8XGJUVZKmJcR6CghnoLUotzMElT5V4ziHIxKwrx+IFN4MvNK4Da9AjqCCeiIdU5PQI4oSU RISTUw5kjJe4hFrg+Pnr3vhnTzN58LrmwHw/uW1NbsNBUT2TZRKEX52BpBlyVrzpzcnfRBw2x WxZkdj6Y8el/28MjuFhM1jfvXHin3lj7JP53Is2ER4/8KqRLhxHMK2l8ficYddnaZKX/W98WD prNRVcFd7hfUrqp+1D/kdrHRQ0n22fTutbU+1iuDlViKMxINtZiLihMB+i4V5YoCAAA= X-Env-Sender: prvs=457f25213=ross.lagerwall@citrix.com X-Msg-Ref: server-5.tower-206.messagelabs.com!1508334171!105924587!1 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 36236 invoked from network); 18 Oct 2017 13:42:53 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-5.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 18 Oct 2017 13:42:53 -0000 X-IronPort-AV: E=Sophos;i="5.43,397,1503360000"; d="scan'208";a="446879439" From: Ross Lagerwall To: Xen-devel Date: Wed, 18 Oct 2017 14:42:32 +0100 Message-ID: <20171018134233.11973-1-ross.lagerwall@citrix.com> X-Mailer: git-send-email 2.9.5 MIME-Version: 1.0 Cc: Ross Lagerwall , Julien Grall , Ian Jackson , Wei Liu Subject: [Xen-devel] [PATCH v2 for-4.10 1/2] tools/libs/evtchn: Add support for restricting a handle X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Implement support for restricting evtchn handles to a particular domain on Linux by calling the IOCTL_EVTCHN_RESTRICT_DOMID ioctl (support added in Linux v4.8). Signed-off-by: Ross Lagerwall Acked-by: Ian Jackson Release-acked-by: Julien Grall --- No change since v1. tools/include/xen-sys/Linux/evtchn.h | 15 +++++++++++++++ tools/libs/evtchn/Makefile | 2 +- tools/libs/evtchn/core.c | 5 +++++ tools/libs/evtchn/freebsd.c | 6 ++++++ tools/libs/evtchn/include/xenevtchn.h | 10 ++++++++++ tools/libs/evtchn/libxenevtchn.map | 4 ++++ tools/libs/evtchn/linux.c | 9 +++++++++ tools/libs/evtchn/minios.c | 6 ++++++ tools/libs/evtchn/netbsd.c | 6 ++++++ tools/libs/evtchn/private.h | 3 +++ tools/libs/evtchn/solaris.c | 6 ++++++ tools/libvchan/init.c | 1 + tools/libvchan/libxenvchan.h | 1 + 13 files changed, 73 insertions(+), 1 deletion(-) diff --git a/tools/include/xen-sys/Linux/evtchn.h b/tools/include/xen-sys/Linux/evtchn.h index 938d4da..08ee0b7 100644 --- a/tools/include/xen-sys/Linux/evtchn.h +++ b/tools/include/xen-sys/Linux/evtchn.h @@ -85,4 +85,19 @@ struct ioctl_evtchn_notify { #define IOCTL_EVTCHN_RESET \ _IOC(_IOC_NONE, 'E', 5, 0) +/* + * Restrict this file descriptor so that it can only be used to bind + * new interdomain events from one domain. + * + * Once a file descriptor has been restricted it cannot be + * de-restricted, and must be closed and re-opened. Event channels + * which were bound before restricting remain bound afterwards, and + * can be notified as usual. + */ +#define IOCTL_EVTCHN_RESTRICT_DOMID \ + _IOC(_IOC_NONE, 'E', 6, sizeof(struct ioctl_evtchn_restrict_domid)) +struct ioctl_evtchn_restrict_domid { + domid_t domid; +}; + #endif /* __LINUX_PUBLIC_EVTCHN_H__ */ diff --git a/tools/libs/evtchn/Makefile b/tools/libs/evtchn/Makefile index 5444ec7..bc98aed 100644 --- a/tools/libs/evtchn/Makefile +++ b/tools/libs/evtchn/Makefile @@ -2,7 +2,7 @@ XEN_ROOT = $(CURDIR)/../../.. include $(XEN_ROOT)/tools/Rules.mk MAJOR = 1 -MINOR = 0 +MINOR = 1 SHLIB_LDFLAGS += -Wl,--version-script=libxenevtchn.map CFLAGS += -Werror -Wmissing-prototypes diff --git a/tools/libs/evtchn/core.c b/tools/libs/evtchn/core.c index c31e08c..41621ff 100644 --- a/tools/libs/evtchn/core.c +++ b/tools/libs/evtchn/core.c @@ -61,6 +61,11 @@ int xenevtchn_close(xenevtchn_handle *xce) return rc; } +int xenevtchn_restrict(xenevtchn_handle *xce, domid_t domid) +{ + return osdep_evtchn_restrict(xce, domid); +} + /* * Local variables: * mode: C diff --git a/tools/libs/evtchn/freebsd.c b/tools/libs/evtchn/freebsd.c index 30eaa70..ba82f06 100644 --- a/tools/libs/evtchn/freebsd.c +++ b/tools/libs/evtchn/freebsd.c @@ -47,6 +47,12 @@ int osdep_evtchn_close(xenevtchn_handle *xce) return close(xce->fd); } +int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) +{ + errno = -EOPNOTSUPP; + return -1; +} + int xenevtchn_fd(xenevtchn_handle *xce) { return xce->fd; diff --git a/tools/libs/evtchn/include/xenevtchn.h b/tools/libs/evtchn/include/xenevtchn.h index 93b80cb..91821ee 100644 --- a/tools/libs/evtchn/include/xenevtchn.h +++ b/tools/libs/evtchn/include/xenevtchn.h @@ -151,6 +151,16 @@ xenevtchn_pending(xenevtchn_handle *xce); */ int xenevtchn_unmask(xenevtchn_handle *xce, evtchn_port_t port); +/** + * This function restricts the use of this handle to the specified + * domain. + * + * @parm xce handle to the open evtchn interface + * @parm domid the domain id + * @return 0 on success, -1 on failure with errno set appropriately. + */ +int xenevtchn_restrict(xenevtchn_handle *xce, domid_t domid); + #endif /* diff --git a/tools/libs/evtchn/libxenevtchn.map b/tools/libs/evtchn/libxenevtchn.map index 625a1e2..33a38f9 100644 --- a/tools/libs/evtchn/libxenevtchn.map +++ b/tools/libs/evtchn/libxenevtchn.map @@ -17,3 +17,7 @@ VERS_1.0 { xenevtchn_pending; local: *; /* Do not expose anything by default */ }; +VERS_1.1 { + global: + xenevtchn_restrict; +} VERS_1.0; diff --git a/tools/libs/evtchn/linux.c b/tools/libs/evtchn/linux.c index a581c5d..17e64ae 100644 --- a/tools/libs/evtchn/linux.c +++ b/tools/libs/evtchn/linux.c @@ -21,9 +21,11 @@ #include #include #include +#include #include +#include #include #include "private.h" @@ -49,6 +51,13 @@ int osdep_evtchn_close(xenevtchn_handle *xce) return close(xce->fd); } +int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) +{ + struct ioctl_evtchn_restrict_domid restrict_domid = { domid }; + + return ioctl(xce->fd, IOCTL_EVTCHN_RESTRICT_DOMID, &restrict_domid); +} + int xenevtchn_fd(xenevtchn_handle *xce) { return xce->fd; diff --git a/tools/libs/evtchn/minios.c b/tools/libs/evtchn/minios.c index ccf37f0..414c21b 100644 --- a/tools/libs/evtchn/minios.c +++ b/tools/libs/evtchn/minios.c @@ -82,6 +82,12 @@ int osdep_evtchn_close(xenevtchn_handle *xce) return close(xce->fd); } +int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) +{ + errno = -EOPNOTSUPP; + return -1; +} + void minios_evtchn_close_fd(int fd) { struct evtchn_port_info *port_info, *tmp; diff --git a/tools/libs/evtchn/netbsd.c b/tools/libs/evtchn/netbsd.c index 114c6e6..5ce3a35 100644 --- a/tools/libs/evtchn/netbsd.c +++ b/tools/libs/evtchn/netbsd.c @@ -47,6 +47,12 @@ int osdep_evtchn_close(xenevtchn_handle *xce) return close(xce->fd); } +int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) +{ + errno = -EOPNOTSUPP; + return -1; +} + int xenevtchn_fd(xenevtchn_handle *xce) { return xce->fd; diff --git a/tools/libs/evtchn/private.h b/tools/libs/evtchn/private.h index fcd0e96..3d34862 100644 --- a/tools/libs/evtchn/private.h +++ b/tools/libs/evtchn/private.h @@ -4,6 +4,8 @@ #include #include +#include + struct xenevtchn_handle { xentoollog_logger *logger, *logger_tofree; int fd; @@ -11,6 +13,7 @@ struct xenevtchn_handle { int osdep_evtchn_open(xenevtchn_handle *xce); int osdep_evtchn_close(xenevtchn_handle *xce); +int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid); #endif diff --git a/tools/libs/evtchn/solaris.c b/tools/libs/evtchn/solaris.c index dc249aa..f718989 100644 --- a/tools/libs/evtchn/solaris.c +++ b/tools/libs/evtchn/solaris.c @@ -50,6 +50,12 @@ int osdep_evtchn_close(xenevtchn_handle *xce) return close(xce->fd); } +int osdep_evtchn_restrict(xenevtchn_handle *xce, domid_t domid) +{ + errno = -EOPNOTSUPP; + return -1; +} + int xenevtchn_fd(xenevtchn_handle *xce) { return xce->fd; diff --git a/tools/libvchan/init.c b/tools/libvchan/init.c index e53f3a7..0b3759a 100644 --- a/tools/libvchan/init.c +++ b/tools/libvchan/init.c @@ -40,6 +40,7 @@ #include #include +#include #include #include #include diff --git a/tools/libvchan/libxenvchan.h b/tools/libvchan/libxenvchan.h index 2adbdfe..d6010b1 100644 --- a/tools/libvchan/libxenvchan.h +++ b/tools/libvchan/libxenvchan.h @@ -43,6 +43,7 @@ */ #include +#include #include #include #include