From patchwork Thu Oct 16 14:45:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Stabellini X-Patchwork-Id: 38823 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f199.google.com (mail-lb0-f199.google.com [209.85.217.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id ABC5A20973 for ; Thu, 16 Oct 2014 14:50:11 +0000 (UTC) Received: by mail-lb0-f199.google.com with SMTP id w7sf2004073lbi.10 for ; Thu, 16 Oct 2014 07:50:10 -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=mp48GDBKBBxHACtldW9DDAktNtwHrtLHuoiv/lfF6ac=; b=fHrqW8tHoJ6bghpwq3V8nUxd0J48rYW3ZPqQ/ZWIeS4yWsOepOrlmKpklQOABtatTh sUl2VvqxVoh7nJhrBb1GlR9gp93kedGFRl2TvyuRNPJd6U2CjVHqPlvhVqyErd67GowH CNVdKr9TVZbN1oLOIyZrw0bv9+MfOfnQbwxDAjycplu4TyOBkXsiPST6HLaL6gWh9c/7 3hn/jYhP2mr34c0QsUErJuAvCMAHelPSC83gm78YW/K2I6Z4e4/ZsjzEpubQbMBXyqs6 UOmKslobS3Mwq68S8t8tVbqQsMwZtY9T77536Sb2iuGfdbp/8uiwJeghSMgX8cgFNLwK bj2A== X-Gm-Message-State: ALoCoQnEIScDvXTpsnXuatDnEbwnm3kM2n3Ps182i13qDXXT3Y0tWd7jsr7H/xRI7pq6ReY4s5x8 X-Received: by 10.112.159.199 with SMTP id xe7mr31519lbb.21.1413471010138; Thu, 16 Oct 2014 07:50:10 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.8.194 with SMTP id t2ls163251laa.14.gmail; Thu, 16 Oct 2014 07:50:09 -0700 (PDT) X-Received: by 10.152.4.132 with SMTP id k4mr2169498lak.1.1413471009957; Thu, 16 Oct 2014 07:50:09 -0700 (PDT) Received: from mail-lb0-f171.google.com (mail-lb0-f171.google.com [209.85.217.171]) by mx.google.com with ESMTPS id c10si35112947lab.76.2014.10.16.07.50.09 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 16 Oct 2014 07:50:09 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.171 as permitted sender) client-ip=209.85.217.171; Received: by mail-lb0-f171.google.com with SMTP id z12so2968424lbi.16 for ; Thu, 16 Oct 2014 07:50:09 -0700 (PDT) X-Received: by 10.152.36.103 with SMTP id p7mr2207585laj.44.1413471009796; Thu, 16 Oct 2014 07:50:09 -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 c5csp53248lbz; Thu, 16 Oct 2014 07:50:09 -0700 (PDT) X-Received: by 10.229.106.68 with SMTP id w4mr2939770qco.18.1413471008426; Thu, 16 Oct 2014 07:50:08 -0700 (PDT) Received: from lists.xen.org (lists.xen.org. [50.57.142.19]) by mx.google.com with ESMTPS id s7si40692742qak.65.2014.10.16.07.50.07 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Thu, 16 Oct 2014 07:50:08 -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 1XemM1-0002UV-MI; Thu, 16 Oct 2014 14:48:37 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1XemM0-0002Tj-FI for xen-devel@lists.xensource.com; Thu, 16 Oct 2014 14:48:36 +0000 Received: from [85.158.139.211:32939] by server-3.bemta-5.messagelabs.com id 7B/34-00307-3CADF345; Thu, 16 Oct 2014 14:48:35 +0000 X-Env-Sender: Stefano.Stabellini@citrix.com X-Msg-Ref: server-4.tower-206.messagelabs.com!1413470910!11661640!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n X-StarScan-Received: X-StarScan-Version: 6.12.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 11849 invoked from network); 16 Oct 2014 14:48:34 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-206.messagelabs.com with RC4-SHA encrypted SMTP; 16 Oct 2014 14:48:34 -0000 X-IronPort-AV: E=Sophos;i="5.04,732,1406592000"; d="scan'208";a="181975788" 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; Thu, 16 Oct 2014 10:48:22 -0400 Received: from kaball.uk.xensource.com ([10.80.2.59]) by ukmail1.uk.xensource.com with esmtp (Exim 4.69) (envelope-from ) id 1XemLh-00040J-0f; Thu, 16 Oct 2014 15:48:17 +0100 From: Stefano Stabellini To: Date: Thu, 16 Oct 2014 15:45:48 +0100 Message-ID: <1413470755-30991-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: MIA2 Cc: julien.grall@citrix.com, Ian.Campbell@citrix.com, Stefano Stabellini Subject: [Xen-devel] [PATCH v6 1/8] xen: introduce gnttab_max_frames and gnttab_max_maptrack_frames command line options 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.171 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: Introduce gnttab_max_maptrack_frames: a new Xen command line option to specify the max number of maptrack frames per domain. Deprecate the old gnttab_max_nr_frames and introduce gnttab_max_frames instead, that doesn't affect the maptrack. Keep gnttab_max_nr_frames for compatibility. Rename internally max_nr_grant_frames to max_grant_frames to avoid confusions. Signed-off-by: Stefano Stabellini --- Changes in v6: - change ordering of options in xen-command-line.markdown; - initialize all options to 0, then set the defaults on an initcall depending on what options are used. Changes in v5: - /max_nr_maptrack_frames/max_maptrack_frames/g; - deprecate gnttab_max_nr_frames; - introduce gnttab_max_frames; - rename the max_nr_grant_frames variable to max_grant_frames. --- docs/misc/xen-command-line.markdown | 17 ++++++++++- xen/arch/arm/domain.c | 2 +- xen/arch/arm/mm.c | 2 +- xen/arch/x86/mm.c | 2 +- xen/common/compat/grant_table.c | 12 ++++---- xen/common/grant_table.c | 55 +++++++++++++++++++++++++---------- xen/include/asm-arm/grant_table.h | 2 +- xen/include/xen/grant_table.h | 2 +- 8 files changed, 66 insertions(+), 28 deletions(-) diff --git a/docs/misc/xen-command-line.markdown b/docs/misc/xen-command-line.markdown index 28bbaaf..00416af 100644 --- a/docs/misc/xen-command-line.markdown +++ b/docs/misc/xen-command-line.markdown @@ -608,11 +608,26 @@ does not provide VM\_ENTRY\_LOAD\_GUEST\_PAT. Specify the serial parameters for the GDB stub. -### gnttab\_max\_nr\_frames +### gnttab\_max\_frames > `= ` Specify the maximum number of frames per grant table operation. +### gnttab\_max\_maptrack\_frames +> `= ` + +Specify the maximum number of maptrack frames domain. +The default value is 8 times gnttab_max_frames. + +### gnttab\_max\_nr\_frames +> `= ` + +*Deprecated* +Use gnttab\_max\_frames and gnttab\_max\_maptrack\_frames instead. + +Specify the maximum number of frames per grant table operation and the +maximum number of maptrack frames domain. + ### guest\_loglvl > `= [/]` where level is `none | error | warning | info | debug | all` diff --git a/xen/arch/arm/domain.c b/xen/arch/arm/domain.c index 2b53931..57f09c3 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_grant_frames); return d; } diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 97e5bc39..dd70d81 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1054,7 +1054,7 @@ int xenmem_add_to_physmap_one( else { if ( (idx >= nr_grant_frames(d->grant_table)) && - (idx < max_nr_grant_frames) ) + (idx < max_grant_frames) ) 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 6cd7f45..edd1923 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -4564,7 +4564,7 @@ int xenmem_add_to_physmap_one( else { if ( (idx >= nr_grant_frames(d->grant_table)) && - (idx < max_nr_grant_frames) ) + (idx < max_grant_frames) ) 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..2dc1e44 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_grant_frames ) { gdprintk(XENLOG_WARNING, - "max_nr_grant_frames is too large (%u,%u)\n", - max_nr_grant_frames, max_frame_list_size_in_page); + "max_grant_frames is too large (%u,%u)\n", + max_grant_frames, 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_grant_frames) ) { 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_grant_frames) is too large (%u,%u)\n", + grant_to_status_frames(max_grant_frames), 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..345be82 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,17 +41,26 @@ #include #include +/* this option is deprecated, use gnttab_max_frames and + * gnttab_max_maptrack_frames instead */ #ifndef max_nr_grant_frames -unsigned int max_nr_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES; +unsigned int max_nr_grant_frames = 0; integer_param("gnttab_max_nr_frames", max_nr_grant_frames); #endif +unsigned int max_grant_frames = 0; +integer_param("gnttab_max_frames", max_grant_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. * Pretty arbitrary. [POLICY] */ #define MAX_MAPTRACK_TO_GRANTS_RATIO 8 +static unsigned int max_maptrack_frames = 0; +integer_param("gnttab_max_maptrack_frames", max_maptrack_frames); + + /* * The first two members of a grant entry are updated as a combined pair. * The following union allows that to happen in an endian-neutral fashion. @@ -102,11 +112,6 @@ nr_maptrack_frames(struct grant_table *t) return t->maptrack_limit / MAPTRACK_PER_PAGE; } -static unsigned inline int max_nr_maptrack_frames(void) -{ - return (max_nr_grant_frames * MAX_MAPTRACK_TO_GRANTS_RATIO); -} - #define MAPTRACK_TAIL (~0u) #define SHGNT_PER_PAGE_V1 (PAGE_SIZE / sizeof(grant_entry_v1_t)) @@ -164,7 +169,7 @@ num_act_frames_from_sha_frames(const unsigned int num) } #define max_nr_active_grant_frames \ - num_act_frames_from_sha_frames(max_nr_grant_frames) + num_act_frames_from_sha_frames(max_grant_frames) static inline unsigned int nr_active_grant_frames(struct grant_table *gt) @@ -271,7 +276,7 @@ get_maptrack_handle( 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_maptrack_frames ) break; new_mt = alloc_xenheap_page(); @@ -1265,7 +1270,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_grant_frames); gdprintk(XENLOG_INFO, "Expanding dom (%d) grant table from (%d) to (%d) frames.\n", @@ -1338,11 +1343,11 @@ gnttab_setup_table( return -EFAULT; } - if ( unlikely(op.nr_frames > max_nr_grant_frames) ) + if ( unlikely(op.nr_frames > max_grant_frames) ) { gdprintk(XENLOG_INFO, "Xen only supports up to %d grant-table frames" " per domain.\n", - max_nr_grant_frames); + max_grant_frames); op.status = GNTST_general_error; goto out1; } @@ -1377,7 +1382,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_grant_frames); op.status = GNTST_general_error; goto out3; } @@ -1438,7 +1443,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_grant_frames; op.status = GNTST_okay; spin_unlock(&d->grant_table->lock); @@ -2659,7 +2664,7 @@ grant_table_create( /* Tracking of mapped foreign frames table */ if ( (t->maptrack = xzalloc_array(struct grant_mapping *, - max_nr_maptrack_frames())) == NULL ) + max_maptrack_frames)) == NULL ) goto no_mem_2; if ( (t->maptrack[0] = alloc_xenheap_page()) == NULL ) goto no_mem_3; @@ -2670,7 +2675,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_grant_frames)) == NULL ) goto no_mem_3; for ( i = 0; i < INITIAL_NR_GRANT_FRAMES; i++ ) { @@ -2681,7 +2686,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_grant_frames)); if ( t->status == NULL ) goto no_mem_4; @@ -2930,6 +2935,24 @@ static struct keyhandler gnttab_usage_print_all_keyhandler = { static int __init gnttab_usage_init(void) { + if ( max_nr_grant_frames ) + { + printk(XENLOG_WARNING "gnttab_max_nr_frames is deprecated, use gnttab_max_frames instead\n"); + if ( !max_grant_frames && !max_maptrack_frames ) + { + max_grant_frames = max_nr_grant_frames; + max_maptrack_frames = max_nr_grant_frames * MAX_MAPTRACK_TO_GRANTS_RATIO; + } else { + printk(XENLOG_WARNING "dropping gnttab_max_nr_frames as superseding options are present\n"); + } + } + + if ( !max_grant_frames ) + max_grant_frames = DEFAULT_MAX_NR_GRANT_FRAMES; + + if ( !max_maptrack_frames ) + max_maptrack_frames = MAX_MAPTRACK_TO_GRANTS_RATIO * max_grant_frames; + register_keyhandler('g', &gnttab_usage_print_all_keyhandler); return 0; } diff --git a/xen/include/asm-arm/grant_table.h b/xen/include/asm-arm/grant_table.h index 47147ce..e798880 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_grant_frames)) ? 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..9f3a1f3 100644 --- a/xen/include/xen/grant_table.h +++ b/xen/include/xen/grant_table.h @@ -51,7 +51,7 @@ #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; +extern unsigned int max_grant_frames; #endif /*