From patchwork Fri Sep 8 06:56:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?SsO8cmdlbiBHcm/Dnw==?= X-Patchwork-Id: 9943271 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 EBF5460224 for ; Fri, 8 Sep 2017 07:00:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DD32428531 for ; Fri, 8 Sep 2017 07:00:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id CBD9928542; Fri, 8 Sep 2017 07:00: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 B45A528540 for ; Fri, 8 Sep 2017 07:00: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 1dqDDX-0005bP-No; Fri, 08 Sep 2017 06:56:43 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dqDDW-0005Zj-Ic for xen-devel@lists.xen.org; Fri, 08 Sep 2017 06:56:42 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id 01/55-03874-92F32B95; Fri, 08 Sep 2017 06:56:41 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRWlGSWpSXmKPExsVyuP0Ov66m/aZ Ig7eNMhZLPi5mcWD0OLr7N1MAYxRrZl5SfkUCa0bPQt+C76YVm14sYGxgPKndxcjJISFgJPF2 4j+mLkYuDiGBhYwS0zZcYQNJsAmoSmy4fooVxBYRkJa49vkyI0gRs8AkJokF3evYQRLCAhESR 3tnM4HYLEANFxa0MoPYvALGEuf/f2SG2CAv0XFgMguIzSlgInF8UhdQLwfQNmOJPzMYJzByL2 BkWMWoXpxaVJZapGuql1SUmZ5RkpuYmaNraGCml5taXJyYnpqTmFSsl5yfu4kR6FsGINjBOP2 y/yFGSQ4mJVHehhkbI4X4kvJTKjMSizPii0pzUosPMWpwcAj0rVl9gVGKJS8/L1VJgveh7aZI IcGi1PTUirTMHGDwwZRKcPAoifB+B0nzFhck5hZnpkOkTjEacxzbdPkPE0fHzbt/mITAJkmJ8 5aAlAqAlGaU5sENgkXFJUZZKWFeRqAzhXgKUotyM0tQ5V8xinMwKgnz/gSZwpOZVwK37xXQKU xAp5Q83wBySkkiQkqqgTGWg3/f3xRztyAXJcek7rrP+29OkD4k0fTyhJOUYMCyK/11jC/2bN0 tod1283LZ5iX3KhvltpwRrtO4e+n7Xo0/O4Ne9e+p16j0PrqyoXf5NF5ndZWLs1+KxG/6K305 c7Lxtps10z8VFJ8936ihMzPs4o4WA4MTKjNdLgVLxkS7Kqqd/vL83l8lluKMREMt5qLiRABLW pPehQIAAA== X-Env-Sender: jgross@suse.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1504853801!81841924!1 X-Originating-IP: [195.135.220.15] X-SpamReason: No, hits=0.5 required=7.0 tests=BODY_RANDOM_LONG X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 46310 invoked from network); 8 Sep 2017 06:56:41 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-7.tower-21.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 8 Sep 2017 06:56:41 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 0B8FBAC1A; Fri, 8 Sep 2017 06:56:41 +0000 (UTC) From: Juergen Gross To: xen-devel@lists.xen.org Date: Fri, 8 Sep 2017 08:56:32 +0200 Message-Id: <20170908065634.5420-7-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170908065634.5420-1-jgross@suse.com> References: <20170908065634.5420-1-jgross@suse.com> Cc: Juergen Gross , sstabellini@kernel.org, wei.liu2@citrix.com, George.Dunlap@eu.citrix.com, andrew.cooper3@citrix.com, ian.jackson@eu.citrix.com, tim@xen.org, julien.grall@arm.com, jbeulich@suse.com, dgdegra@tycho.nsa.gov Subject: [Xen-devel] [PATCH v5 6/8] xen: add new domctl hypercall to set grant table resource limits 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: , MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add a domctl hypercall to set the domain's resource limits regarding grant tables. It is accepted only as long as neither gnttab_setup_table() has been called for the domain, nor the domain has started to run. Signed-off-by: Juergen Gross Reviewed-by: Paul Durrant Reviewed-by: Wei Liu --- V5: - add set_gnttab_limits to create_domain_common in xen.if (Daniel De Graaf) V3: - rename *gnttbl* to *gnttab* (Paul Durrant) --- tools/flask/policy/modules/dom0.te | 2 +- tools/flask/policy/modules/xen.if | 2 +- xen/common/domctl.c | 6 ++++++ xen/common/grant_table.c | 26 ++++++++++++++++++++++++++ xen/include/public/domctl.h | 9 +++++++++ xen/include/xen/grant_table.h | 2 ++ xen/xsm/flask/hooks.c | 3 +++ xen/xsm/flask/policy/access_vectors | 2 ++ 8 files changed, 50 insertions(+), 2 deletions(-) diff --git a/tools/flask/policy/modules/dom0.te b/tools/flask/policy/modules/dom0.te index 338caaf41e..1643b400f0 100644 --- a/tools/flask/policy/modules/dom0.te +++ b/tools/flask/policy/modules/dom0.te @@ -39,7 +39,7 @@ allow dom0_t dom0_t:domain { }; allow dom0_t dom0_t:domain2 { set_cpuid gettsc settsc setscheduler set_max_evtchn set_vnumainfo - get_vnumainfo psr_cmt_op psr_cat_op + get_vnumainfo psr_cmt_op psr_cat_op set_gnttab_limits }; allow dom0_t dom0_t:resource { add remove }; diff --git a/tools/flask/policy/modules/xen.if b/tools/flask/policy/modules/xen.if index 912640002e..55437496f6 100644 --- a/tools/flask/policy/modules/xen.if +++ b/tools/flask/policy/modules/xen.if @@ -52,7 +52,7 @@ define(`create_domain_common', ` settime setdomainhandle getvcpucontext set_misc_info }; allow $1 $2:domain2 { set_cpuid settsc setscheduler setclaim set_max_evtchn set_vnumainfo get_vnumainfo cacheflush - psr_cmt_op psr_cat_op soft_reset }; + psr_cmt_op psr_cat_op soft_reset set_gnttab_limits }; allow $1 $2:security check_context; allow $1 $2:shadow enable; allow $1 $2:mmu { map_read map_write adjust memorymap physmap pinpage mmuext_op updatemp }; diff --git a/xen/common/domctl.c b/xen/common/domctl.c index 42658e5744..58381f8fe9 100644 --- a/xen/common/domctl.c +++ b/xen/common/domctl.c @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -1149,6 +1150,11 @@ long do_domctl(XEN_GUEST_HANDLE_PARAM(xen_domctl_t) u_domctl) copyback = 1; break; + case XEN_DOMCTL_set_gnttab_limits: + ret = grant_table_set_limits(d, op->u.set_gnttab_limits.grant_frames, + op->u.set_gnttab_limits.maptrack_frames); + break; + default: ret = arch_do_domctl(op, d, u_domctl); break; diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index c00119f2fe..83f1a9dd34 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -3667,6 +3667,32 @@ void grant_table_init_vcpu(struct vcpu *v) v->maptrack_tail = MAPTRACK_TAIL; } +int grant_table_set_limits(struct domain *d, unsigned int grant_frames, + unsigned int maptrack_frames) +{ + struct grant_table *gt = d->grant_table; + int ret = -EBUSY; + + if ( !gt ) + return -EEXIST; + + grant_write_lock(gt); + + if ( gt->nr_grant_frames ) + goto unlock; + + ret = 0; + if ( grant_frames ) + gt->max_grant_frames = grant_frames; + if ( maptrack_frames ) + gt->max_maptrack_frames = maptrack_frames; + + unlock: + grant_write_unlock(gt); + + return ret; +} + #ifdef CONFIG_HAS_MEM_SHARING int mem_sharing_gref_to_gfn(struct grant_table *gt, grant_ref_t ref, gfn_t *gfn, uint16_t *status) diff --git a/xen/include/public/domctl.h b/xen/include/public/domctl.h index 50ff58f5b9..f7e3509c27 100644 --- a/xen/include/public/domctl.h +++ b/xen/include/public/domctl.h @@ -1163,6 +1163,13 @@ struct xen_domctl_psr_cat_op { typedef struct xen_domctl_psr_cat_op xen_domctl_psr_cat_op_t; DEFINE_XEN_GUEST_HANDLE(xen_domctl_psr_cat_op_t); +struct xen_domctl_set_gnttab_limits { + uint32_t grant_frames; /* IN: if 0, dont change */ + uint32_t maptrack_frames; /* IN: if 0, dont change */ +}; +typedef struct xen_domctl_set_gnttab_limits xen_domctl_set_gnttab_limits_t; +DEFINE_XEN_GUEST_HANDLE(xen_domctl_set_gnttab_limits_t); + struct xen_domctl { uint32_t cmd; #define XEN_DOMCTL_createdomain 1 @@ -1240,6 +1247,7 @@ struct xen_domctl { #define XEN_DOMCTL_monitor_op 77 #define XEN_DOMCTL_psr_cat_op 78 #define XEN_DOMCTL_soft_reset 79 +#define XEN_DOMCTL_set_gnttab_limits 80 #define XEN_DOMCTL_gdbsx_guestmemio 1000 #define XEN_DOMCTL_gdbsx_pausevcpu 1001 #define XEN_DOMCTL_gdbsx_unpausevcpu 1002 @@ -1302,6 +1310,7 @@ struct xen_domctl { struct xen_domctl_psr_cmt_op psr_cmt_op; struct xen_domctl_monitor_op monitor_op; struct xen_domctl_psr_cat_op psr_cat_op; + struct xen_domctl_set_gnttab_limits set_gnttab_limits; uint8_t pad[128]; } u; }; diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 84a8d61616..dd9aa3b9ee 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -40,6 +40,8 @@ int grant_table_init( void grant_table_destroy( struct domain *d); void grant_table_init_vcpu(struct vcpu *v); +int grant_table_set_limits(struct domain *d, unsigned int grant_frames, + unsigned int maptrack_frames); /* * Check if domain has active grants and log first 10 of them. diff --git a/xen/xsm/flask/hooks.c b/xen/xsm/flask/hooks.c index 56dc5b0ab9..7b005af834 100644 --- a/xen/xsm/flask/hooks.c +++ b/xen/xsm/flask/hooks.c @@ -749,6 +749,9 @@ static int flask_domctl(struct domain *d, int cmd) case XEN_DOMCTL_soft_reset: return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SOFT_RESET); + case XEN_DOMCTL_set_gnttab_limits: + return current_has_perm(d, SECCLASS_DOMAIN2, DOMAIN2__SET_GNTTAB_LIMITS); + default: return avc_unknown_permission("domctl", cmd); } diff --git a/xen/xsm/flask/policy/access_vectors b/xen/xsm/flask/policy/access_vectors index da9f3dfb2e..3a2d863b8f 100644 --- a/xen/xsm/flask/policy/access_vectors +++ b/xen/xsm/flask/policy/access_vectors @@ -248,6 +248,8 @@ class domain2 mem_sharing # XEN_DOMCTL_psr_cat_op psr_cat_op +# XEN_DOMCTL_set_gnttab_limits + set_gnttab_limits } # Similar to class domain, but primarily contains domctls related to HVM domains