From patchwork Wed Oct 8 13:00:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 38472 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 62210202E7 for ; Wed, 8 Oct 2014 13:04:19 +0000 (UTC) Received: by mail-lb0-f197.google.com with SMTP id p9sf5243930lbv.4 for ; Wed, 08 Oct 2014 06:04:18 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:mime-version:cc:subject:precedence:list-id :list-unsubscribe:list-post:list-help:list-subscribe:sender :errors-to:x-original-sender:x-original-authentication-results :mailing-list:list-archive:content-type:content-transfer-encoding; bh=uVQhaqKRa3PXbMfxtLLW49ne5lvQNGawf+3jnoik89o=; b=Fb2xAQeD9eVVYUpiF9UWM3PnkbsSL1yGyPpbJe5UrZYjrYS5t+p34+epdush/vrTej Q3S2BHyOhvVpPKcpLLWqMEH/e2vqWgd8WR1Cfscsk9xkZ8HKg8LMHuxIZl7X+oDSgpIu M0T0fTFLFcXf19KaPG4LuDajyvdIxG5+J4atpB73wtGmLgn10Vf1IhIfx+7f+IXcSavJ 3GjYtFwlGrE/KoXD9qPWLeIHrF1SrXcZQX2PBwLl3ZbcBG2jrinO53hPA3TNTqnHcrbf a+2uQUBpJJMWJeUy8jEYo5YIo/pi22AgpFOnlAVW+oEXLDH4jStQb/Gu5xoBeLBxSGCK USgA== X-Gm-Message-State: ALoCoQldVxTBAz9zyvYa6eDi/16Bx6fijrw9POI7eWuvCw7q8K/XJ0CEggRbedqNCRsWJEAwIxDp X-Received: by 10.194.100.3 with SMTP id eu3mr10608wjb.6.1412773458175; Wed, 08 Oct 2014 06:04:18 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.42.212 with SMTP id q20ls57286lal.22.gmail; Wed, 08 Oct 2014 06:04:17 -0700 (PDT) X-Received: by 10.152.43.50 with SMTP id t18mr3784545lal.91.1412773457817; Wed, 08 Oct 2014 06:04:17 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com [209.85.217.182]) by mx.google.com with ESMTPS id i9si12051005lag.115.2014.10.08.06.04.17 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 08 Oct 2014 06:04:17 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by mail-lb0-f182.google.com with SMTP id z11so8135453lbi.13 for ; Wed, 08 Oct 2014 06:04:17 -0700 (PDT) X-Received: by 10.112.62.200 with SMTP id a8mr10645403lbs.34.1412773457673; Wed, 08 Oct 2014 06:04:17 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.84.229 with SMTP id c5csp57571lbz; Wed, 8 Oct 2014 06:04:15 -0700 (PDT) X-Received: by 10.140.28.133 with SMTP id 5mr10777670qgz.102.1412773455347; Wed, 08 Oct 2014 06:04:15 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id i4si6696529qay.79.2014.10.08.06.04.14 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 08 Oct 2014 06:04:15 -0700 (PDT) Received-SPF: none (google.com: xen-devel-bounces@lists.xen.org does not designate permitted sender hosts) client-ip=50.57.142.19; Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xbqti-00010x-TF; Wed, 08 Oct 2014 13:03:18 +0000 Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xbqth-0000zi-41 for xen-devel@lists.xensource.com; Wed, 08 Oct 2014 13:03:17 +0000 Received: from [193.109.254.147:58969] by server-12.bemta-14.messagelabs.com id 71/41-01461-41635345; Wed, 08 Oct 2014 13:03:16 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1412773392!14105614!3 X-Originating-IP: [66.165.176.63] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni42MyA9PiAzMDYwNDg=\n X-StarScan-Received: X-StarScan-Version: 6.12.2; banners=-,-,- X-VirusChecked: Checked Received: (qmail 9622 invoked from network); 8 Oct 2014 13:03:15 -0000 Received: from smtp02.citrix.com (HELO SMTP02.CITRIX.COM) (66.165.176.63) by server-7.tower-27.messagelabs.com with RC4-SHA encrypted SMTP; 8 Oct 2014 13:03:15 -0000 X-IronPort-AV: E=Sophos;i="5.04,677,1406592000"; d="scan'208";a="180482251" Received: from ukmail1.uk.xensource.com (10.80.16.128) by smtprelay.citrix.com (10.13.107.78) with Microsoft SMTP Server id 14.3.181.6; Wed, 8 Oct 2014 09:02:54 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1Xbqt0-0003n2-Tx; Wed, 08 Oct 2014 14:02:34 +0100 From: Stefano Stabellini To: Date: Wed, 8 Oct 2014 14:00:17 +0100 Message-ID: <1412773221-15150-1-git-send-email-stefano.stabellini@eu.citrix.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: References: MIME-Version: 1.0 X-DLP: MIA1 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v3 1/5] xen: introduce two different max_nr_dom0/domU_grant_frames parameters X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: List-Unsubscribe: , List-Post: , List-Help: , List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: stefano.stabellini@eu.citrix.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Archive: Remove max_nr_grant_frames, both variable and preprocessor symbol. Introduce two global variables max_nr_dom0_grant_frames and max_nr_domU_grant_frames, separately configurable via the Xen command line option "gnttab_max_nr_frames". Signed-off-by: Stefano Stabellini --- docs/misc/xen-command-line.markdown | 4 +- xen/arch/arm/domain.c | 2 +- xen/arch/arm/mm.c | 2 +- xen/arch/x86/mm.c | 2 +- xen/common/compat/grant_table.c | 8 ++-- xen/common/grant_table.c | 72 +++++++++++++++++++++-------------- xen/include/asm-arm/grant_table.h | 2 +- xen/include/xen/grant_table.h | 6 +-- 8 files changed, 58 insertions(+), 40 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 389701a..fa10f6c 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -609,7 +609,9 @@ does not provide VM\_ENTRY\_LOAD\_GUEST\_PAT. Specify the serial parameters for the GDB stub. ### gnttab\_max\_nr\_frames -> `= ` +> `= [][,]` + +> Default: `32,32` Specify the maximum number of frames per grant table operation. diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 2b53931..8d60472 100644 --- a/xen/arch/arm/domain.c +++ b/xen/arch/arm/domain.c @@ -409,7 +409,7 @@ struct domain *alloc_domain_struct(void) return NULL; clear_page(d); - d->arch.grant_table_gpfn = xzalloc_array(xen_pfn_t, max_nr_grant_frames); + d->arch.grant_table_gpfn = xzalloc_array(xen_pfn_t, max_nr_domU_grant_frames); return d; } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index c5b48ef..b65c725 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1040,7 +1040,7 @@ int xenmem_add_to_physmap_one( else { if ( (idx >= nr_grant_frames(d->grant_table)) && - (idx < max_nr_grant_frames) ) + (idx < max_nr_grant_frames(d)) ) gnttab_grow_table(d, idx + 1); if ( idx < nr_grant_frames(d->grant_table) ) diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 5b3f06f..f72b23f 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4539,7 +4539,7 @@ int xenmem_add_to_physmap_one( else { if ( (idx >= nr_grant_frames(d->grant_table)) && - (idx < max_nr_grant_frames) ) + (idx < max_nr_grant_frames(d)) ) gnttab_grow_table(d, idx + 1); if ( idx < nr_grant_frames(d->grant_table) ) diff --git a/xen/common/compat/grant_table.c b/xen/common/compat/grant_table.c index 7ebbbc1..6c00b09 100644 --- a/xen/common/compat/grant_table.c +++ b/xen/common/compat/grant_table.c @@ -146,11 +146,11 @@ int compat_grant_table_op(unsigned int cmd, unsigned int max_frame_list_size_in_page = (COMPAT_ARG_XLAT_SIZE - sizeof(*nat.setup)) / sizeof(*nat.setup->frame_list.p); - if ( max_frame_list_size_in_page < max_nr_grant_frames ) + if ( max_frame_list_size_in_page < max_nr_grant_frames(current->domain) ) { gdprintk(XENLOG_WARNING, "max_nr_grant_frames is too large (%u,%u)\n", - max_nr_grant_frames, max_frame_list_size_in_page); + max_nr_grant_frames(current->domain), max_frame_list_size_in_page); rc = -EINVAL; } else @@ -284,11 +284,11 @@ int compat_grant_table_op(unsigned int cmd, break; } if ( max_frame_list_size_in_pages < - grant_to_status_frames(max_nr_grant_frames) ) + grant_to_status_frames(max_nr_grant_frames(current->domain)) ) { gdprintk(XENLOG_WARNING, "grant_to_status_frames(max_nr_grant_frames) is too large (%u,%u)\n", - grant_to_status_frames(max_nr_grant_frames), + grant_to_status_frames(max_nr_grant_frames(current->domain)), max_frame_list_size_in_pages); rc = -EINVAL; break; diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c index 23266c3..a56a1bb 100644 --- a/xen/common/grant_table.c +++ b/xen/common/grant_table.c @@ -24,6 +24,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include #include #include #include @@ -40,10 +41,25 @@ #include #include -#ifndef max_nr_grant_frames -unsigned int max_nr_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES; -integer_param("gnttab_max_nr_frames", max_nr_grant_frames); -#endif +unsigned int max_nr_dom0_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES; +unsigned int max_nr_domU_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES; + +unsigned int max_nr_grant_frames(struct domain *d) +{ + if ( is_hardware_domain(d) ) + return max_nr_dom0_grant_frames; + else + return max_nr_domU_grant_frames; +} + +static void __init parse_gnttab_max_nr_frames(const char *s) +{ + if ( isdigit(*s) ) + max_nr_domU_grant_frames = simple_strtoul(s, &s, 0); + if ( *s == ',' && isdigit(*++s) ) + max_nr_dom0_grant_frames = simple_strtoul(s, &s, 0); +} +custom_param("gnttab_max_nr_frames", parse_gnttab_max_nr_frames); /* The maximum number of grant mappings is defined as a multiplier of the * maximum number of grant table entries. This defines the multiplier used. @@ -102,9 +118,9 @@ nr_maptrack_frames(struct grant_table *t) return t->maptrack_limit / MAPTRACK_PER_PAGE; } -static unsigned inline int max_nr_maptrack_frames(void) +static unsigned inline int max_nr_maptrack_frames(struct domain *d) { - return (max_nr_grant_frames * MAX_MAPTRACK_TO_GRANTS_RATIO); + return (max_nr_grant_frames(d) * MAX_MAPTRACK_TO_GRANTS_RATIO); } #define MAPTRACK_TAIL (~0u) @@ -163,8 +179,8 @@ num_act_frames_from_sha_frames(const unsigned int num) return (num_sha_entries + (ACGNT_PER_PAGE - 1)) / ACGNT_PER_PAGE; } -#define max_nr_active_grant_frames \ - num_act_frames_from_sha_frames(max_nr_grant_frames) +#define max_nr_active_grant_frames(d) \ + num_act_frames_from_sha_frames(max_nr_grant_frames(d)) static inline unsigned int nr_active_grant_frames(struct grant_table *gt) @@ -259,19 +275,20 @@ put_maptrack_handle( static inline int get_maptrack_handle( - struct grant_table *lgt) + struct domain *ld) { int i; grant_handle_t handle; struct grant_mapping *new_mt; unsigned int new_mt_limit, nr_frames; + struct grant_table *lgt = ld->grant_table; spin_lock(&lgt->lock); while ( unlikely((handle = __get_maptrack_handle(lgt)) == -1) ) { nr_frames = nr_maptrack_frames(lgt); - if ( nr_frames >= max_nr_maptrack_frames() ) + if ( nr_frames >= max_nr_maptrack_frames(ld) ) break; new_mt = alloc_xenheap_page(); @@ -567,7 +584,7 @@ __gnttab_map_grant_ref( } lgt = ld->grant_table; - if ( unlikely((handle = get_maptrack_handle(lgt)) == -1) ) + if ( unlikely((handle = get_maptrack_handle(ld)) == -1) ) { rcu_unlock_domain(rd); gdprintk(XENLOG_INFO, "Failed to obtain maptrack handle.\n"); @@ -1265,7 +1282,7 @@ gnttab_grow_table(struct domain *d, unsigned int req_nr_frames) struct grant_table *gt = d->grant_table; unsigned int i; - ASSERT(req_nr_frames <= max_nr_grant_frames); + ASSERT(req_nr_frames <= max_nr_grant_frames(d)); gdprintk(XENLOG_INFO, "Expanding dom (%d) grant table from (%d) to (%d) frames.\n", @@ -1338,15 +1355,6 @@ gnttab_setup_table( return -EFAULT; } - if ( unlikely(op.nr_frames > max_nr_grant_frames) ) - { - gdprintk(XENLOG_INFO, "Xen only supports up to %d grant-table frames" - " per domain.\n", - max_nr_grant_frames); - op.status = GNTST_general_error; - goto out1; - } - if ( !guest_handle_okay(op.frame_list, op.nr_frames) ) return -EFAULT; @@ -1358,6 +1366,15 @@ gnttab_setup_table( goto out2; } + if ( unlikely(op.nr_frames > max_nr_grant_frames(d)) ) + { + gdprintk(XENLOG_INFO, "Xen only supports up to %d grant-table frames" + " per domain.\n", + max_nr_grant_frames(d)); + op.status = GNTST_general_error; + goto out2; + } + if ( xsm_grant_setup(XSM_TARGET, current->domain, d) ) { op.status = GNTST_permission_denied; @@ -1377,7 +1394,7 @@ gnttab_setup_table( { gdprintk(XENLOG_INFO, "Expand grant table to %u failed. Current: %u Max: %u\n", - op.nr_frames, nr_grant_frames(gt), max_nr_grant_frames); + op.nr_frames, nr_grant_frames(gt), max_nr_grant_frames(d)); op.status = GNTST_general_error; goto out3; } @@ -1396,7 +1413,6 @@ gnttab_setup_table( spin_unlock(>->lock); out2: rcu_unlock_domain(d); - out1: if ( unlikely(__copy_field_to_guest(uop, &op, status)) ) return -EFAULT; @@ -1438,7 +1454,7 @@ gnttab_query_size( spin_lock(&d->grant_table->lock); op.nr_frames = nr_grant_frames(d->grant_table); - op.max_nr_frames = max_nr_grant_frames; + op.max_nr_frames = max_nr_grant_frames(d); op.status = GNTST_okay; spin_unlock(&d->grant_table->lock); @@ -2647,7 +2663,7 @@ grant_table_create( /* Active grant table. */ if ( (t->active = xzalloc_array(struct active_grant_entry *, - max_nr_active_grant_frames)) == NULL ) + max_nr_active_grant_frames(d))) == NULL ) goto no_mem_1; for ( i = 0; i < num_act_frames_from_sha_frames(INITIAL_NR_GRANT_FRAMES); i++ ) @@ -2659,7 +2675,7 @@ grant_table_create( /* Tracking of mapped foreign frames table */ if ( (t->maptrack = xzalloc_array(struct grant_mapping *, - max_nr_maptrack_frames())) == NULL ) + max_nr_maptrack_frames(d))) == NULL ) goto no_mem_2; if ( (t->maptrack[0] = alloc_xenheap_page()) == NULL ) goto no_mem_3; @@ -2670,7 +2686,7 @@ grant_table_create( t->maptrack[0][i - 1].ref = MAPTRACK_TAIL; /* Shared grant table. */ - if ( (t->shared_raw = xzalloc_array(void *, max_nr_grant_frames)) == NULL ) + if ( (t->shared_raw = xzalloc_array(void *, max_nr_grant_frames(d))) == NULL ) goto no_mem_3; for ( i = 0; i < INITIAL_NR_GRANT_FRAMES; i++ ) { @@ -2681,7 +2697,7 @@ grant_table_create( /* Status pages for grant table - for version 2 */ t->status = xzalloc_array(grant_status_t *, - grant_to_status_frames(max_nr_grant_frames)); + grant_to_status_frames(max_nr_grant_frames(d))); if ( t->status == NULL ) goto no_mem_4; diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 47147ce..e81c973 100644 --- a/xen/include/asm-arm/grant_table.h +++ b/xen/include/asm-arm/grant_table.h @@ -31,7 +31,7 @@ static inline int replace_grant_supported(void) #define gnttab_shared_gmfn(d, t, i) \ ( ((i >= nr_grant_frames(d->grant_table)) && \ - (i < max_nr_grant_frames)) ? 0 : (d->arch.grant_table_gpfn[i])) + (i < max_nr_grant_frames(d))) ? 0 : (d->arch.grant_table_gpfn[i])) #define gnttab_need_iommu_mapping(d) (is_domain_direct_mapped(d)) diff --git a/xen/include/xen/grant_table.h b/xen/include/xen/grant_table.h index 5941191..7269d90 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -49,10 +49,10 @@ /* Default maximum size of a grant table. [POLICY] */ #define DEFAULT_MAX_NR_GRANT_FRAMES 32 #endif -#ifndef max_nr_grant_frames /* to allow arch to override */ /* The maximum size of a grant table. */ -extern unsigned int max_nr_grant_frames; -#endif +extern unsigned int max_nr_dom0_grant_frames; +extern unsigned int max_nr_domU_grant_frames; +unsigned int max_nr_grant_frames(struct domain *d); /* * Tracks a mapping of another domain's grant reference. Each domain has a