From patchwork Fri Sep 8 14:48:49 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: 9944623 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 8C661604D4 for ; Fri, 8 Sep 2017 16:06:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6B4702881C for ; Fri, 8 Sep 2017 16:06:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6039A28821; Fri, 8 Sep 2017 16:06:04 +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 3D0072881C for ; Fri, 8 Sep 2017 16:06:03 +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 1dqLl9-0005N0-GI; Fri, 08 Sep 2017 16:03:59 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dqLl7-0005LJ-NZ for xen-devel@lists.xenproject.org; Fri, 08 Sep 2017 16:03:57 +0000 Received: from [85.158.139.211] by server-4.bemta-5.messagelabs.com id 23/81-09852-D6FB2B95; Fri, 08 Sep 2017 16:03:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrELMWRWlGSWpSXmKPExsVyuP0Ov27O/k2 RBqeWyll83zKZyYHR4/CHKywBjFGsmXlJ+RUJrBm3JxxgL5jIU7HgJGsD4yauLkZODgkBI4m3 E/8xdTFycQgJLGSUuDt5PiNIgk1AVWLD9VOsILaIgKPE6ralYDazgIPErFlHmUFsYQELiX8b/ 7CB2CxA9d9vzmcHsXkFjCVO73nMBLFAXqLjwGSWLkYODk4BE4nj70tAwkJAJcemX2adwMi9gJ FhFaNGcWpRWWqRrqGhXlJRZnpGSW5iZo6uoYGpXm5qcXFiempOYlKxXnJ+7iZGoG8ZgGAH48p 250OMkhxMSqK8Mj2bIoX4kvJTKjMSizPii0pzUosPMWpwcAj0rVl9gVGKJS8/L1VJgjd4H1Cd YFFqempFWmYOMPhgSiU4eJREeCtA0rzFBYm5xZnpEKlTjMYcxzZd/sPE0XHz7h8mIbBJUuK86 SClAiClGaV5cINgUXGJUVZKmJcR6EwhnoLUotzMElT5V4ziHIxKwry9IFN4MvNK4Pa9AjqFCe iUkucbQE4pSURISTUwVi/5xMF/YeLHTb6HzjPNXJr/4sbai7Etv77Jzb97v8vnyN37npxFbxp zqq1Vby2PzNX7unWaE59e7Ivfmwqe7Qv5eudl9RPz0C3tkT92amoukmR8dvPgzu1B1xjma4cI BboZ6YddPnriGX/RW8Y3PF21R3qEvZJfz713ZVpzzgXH7VaMvTmS1UosxRmJhlrMRcWJAAfNF jWFAgAA X-Env-Sender: jgross@suse.com X-Msg-Ref: server-8.tower-206.messagelabs.com!1504886636!110620664!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 18461 invoked from network); 8 Sep 2017 16:03:56 -0000 Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by server-8.tower-206.messagelabs.com with DHE-RSA-CAMELLIA256-SHA encrypted SMTP; 8 Sep 2017 16:03:56 -0000 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (charybdis-ext.suse.de [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 95D7FAD76; Fri, 8 Sep 2017 16:03:55 +0000 (UTC) From: Juergen Gross To: linux-kernel@vger.kernel.org, xen-devel@lists.xenproject.org Date: Fri, 8 Sep 2017 16:48:49 +0200 Message-Id: <20170908144849.2958-5-jgross@suse.com> X-Mailer: git-send-email 2.12.3 In-Reply-To: <20170908144849.2958-1-jgross@suse.com> References: <20170908144849.2958-1-jgross@suse.com> Cc: Juergen Gross , boris.ostrovsky@oracle.com Subject: [Xen-devel] [PATCH 4/4] xen: select grant interface version 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 Based on the maximum page number of the host select either grant v1 or grant v2. For testing purposes add a way to specify the grant interface version via a boot parameter. Signed-off-by: Juergen Gross Reviewed-by: Boris Ostrovsky --- drivers/xen/grant-table.c | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/xen/grant-table.c b/drivers/xen/grant-table.c index 573af785c425..c8479cb4c0dc 100644 --- a/drivers/xen/grant-table.c +++ b/drivers/xen/grant-table.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include @@ -68,6 +69,8 @@ static int gnttab_free_count; static grant_ref_t gnttab_free_head; static DEFINE_SPINLOCK(gnttab_list_lock); struct grant_frames xen_auto_xlat_grant_frames; +static unsigned int xen_gnttab_version; +module_param_named(version, xen_gnttab_version, uint, 0); static union { struct grant_entry_v1 *v1; @@ -1191,10 +1194,16 @@ static const struct gnttab_ops gnttab_v2_ops = { static void gnttab_request_version(void) { - int rc; + long rc; struct gnttab_set_version gsv; - gsv.version = 1; + rc = HYPERVISOR_memory_op(XENMEM_maximum_ram_page, NULL); + if (rc < 0 || !(rc >> 32)) + gsv.version = 1; + else + gsv.version = 2; + if (xen_gnttab_version >= 1 && xen_gnttab_version <= 2) + gsv.version = xen_gnttab_version; rc = HYPERVISOR_grant_table_op(GNTTABOP_set_version, &gsv, 1); if (rc == 0 && gsv.version == 2)