From patchwork Tue Sep 12 10:03:30 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 112273 Delivered-To: patch@linaro.org Received: by 10.80.202.13 with SMTP id d13csp5674393edi; Tue, 12 Sep 2017 03:05:42 -0700 (PDT) X-Google-Smtp-Source: AOwi7QCClZNcjoOioO338HhDsL1zgNZx3yXAxzGUln2lhOhO5E8ZZrqMDd8qDG9XN84Gs631Id9i X-Received: by 10.36.225.75 with SMTP id n72mr278148ith.82.1505210742425; Tue, 12 Sep 2017 03:05:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505210742; cv=none; d=google.com; s=arc-20160816; b=n1fcBBNJMao02HOK/h207y77KHRNNUt/4E+DARtJ7I9llVPlHLyt6Pq4n4yWqT6GzK n+g2M1jnr3J4y1LzJOcHCtyciDqJMMTCaW9XB7DNxWc/gCJNXo9xAbQ6KxSKZ+RmZMQU quA72kdRNv5nL0ZyhjY/IFEKtvrE/mGVqHt7sMkkpWDY7E7JCSgzKqlJ3f5N6+3pcIGA b0ZBsk+qJCeFyYgP86MoMsBk+n8hk26Eqm2WwSPIjraAy4pSjPxo+IXMyXghLF/zeLZx ppjtta1Uk/WGUwXd2xUoocIk42P7L7ofUuTVCX3pOIosoSEiaGUXpNnEsBDv3krkksno 1XUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:cc:references:in-reply-to:message-id:date:to :from:arc-authentication-results; bh=bGoG6jCHetRkyKlamTEcKXmMTx7r7384PeICz6hRI0M=; b=eezKXysigT1bTAh0kYdWehEIRJ6zEzu6ZIvFd2vX3rv11SI5OomrhaZXtMO+m4gHeQ NwbZ7fcZOpjruPZxd3SIsBrJVOuGKv8x/tFtZ9GfyEMP9bb+MmxpiV51iehyNzmwSvmn vOhcr57Tl3LxtSjl+N85He70gh7zEqWDhzHjzMe9AmT0lnGBhhdjukN8AmjA2qktlQVP 07sOzAvdOBKIU1bV234e/3byCPdSHwkGHz+tJtwT/OjwlV5XimAdsNVU8arPEezyFzyQ s2Arp56RotlACwHBGQo7gC5kVbYUz3y8ScP5GONJ/ARSEuVlZPAuBrTbHHHKjqjzHTpY k1mw== ARC-Authentication-Results: i=1; mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id 194si103111itz.55.2017.09.12.03.05.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 12 Sep 2017 03:05:42 -0700 (PDT) Received-SPF: neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.237.175.120 is neither permitted nor denied by best guess record for domain of xen-devel-bounces@lists.xen.org) smtp.mailfrom=xen-devel-bounces@lists.xen.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri3C-0003cJ-Ut; Tue, 12 Sep 2017 10:04:14 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dri3B-0003YS-Kr for xen-devel@lists.xen.org; Tue, 12 Sep 2017 10:04:13 +0000 Received: from [193.109.254.147] by server-4.bemta-6.messagelabs.com id 76/28-03283-D11B7B95; Tue, 12 Sep 2017 10:04:13 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTVdy4/Z Ig1nrpSyWfFzM4sDocXT3b6YAxijWzLyk/IoE1oxZ/xczFmyVqNj85DFzA+MsoS5GLg4hgc2M Eq8XL2CCcE4zSuy49YC5i5GTg01AU+LO509MILaIgLTEtc+XGUGKmAW2M0qcn/ubvYuRg0NYI E3iyyJbkBoWAVWJn3v+gvXyClhK/Ov9wQ5iSwjIS+xqu8gKYnMCxVd8/MUGYgsJWEh8f/mDcQ Ij9wJGhlWMGsWpRWWpRbpGlnpJRZnpGSW5iZk5uoYGZnq5qcXFiempOYlJxXrJ+bmbGIEeZgC CHYwHFgUeYpTkYFIS5T2yfnukEF9SfkplRmJxRnxRaU5q8SFGGQ4OJQlef5CcYFFqempFWmYO MNRg0hIcPEoivHEgad7igsTc4sx0iNQpRl2Ojpt3/zAJseTl56VKifNmgBQJgBRllObBjYCF/ SVGWSlhXkago4R4ClKLcjNLUOVfMYpzMCoJ88aDTOHJzCuB2/QK6AgmoCN4Lm0BOaIkESEl1c AourDp9JeqI1lWco8jP0ZtYzJY033269ZDJR5Rj2P0axuD94bJaF6JUHlnqqrE+0tkukaUl9+ s3kwxlh4Pg76CSZLHJHY5fvoy2c35r7fN8uxq+fbTHscL8rY1Xu6ISX4ftjV/jc7M9SwFHCuk y+yUZj6LEmS5OWfaVI4vd/5XxSs7L7mYdFCJpTgj0VCLuag4EQDnBRq2dgIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-7.tower-27.messagelabs.com!1505210648!111727141!1 X-Originating-IP: [217.140.101.70] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 50082 invoked from network); 12 Sep 2017 10:04:09 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-7.tower-27.messagelabs.com with SMTP; 12 Sep 2017 10:04:09 -0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id B48D71529; Tue, 12 Sep 2017 03:04:08 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.206.53]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6B1703F578; Tue, 12 Sep 2017 03:04:07 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 12 Sep 2017 11:03:30 +0100 Message-Id: <20170912100330.2168-25-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170912100330.2168-1-julien.grall@arm.com> References: <20170912100330.2168-1-julien.grall@arm.com> Cc: andre.przywara@arm.com, Julien Grall , sstabellini@kernel.org, Ross Lagerwall Subject: [Xen-devel] [PATCH v2 24/24] xen/arm: mm: Use memory flags for modify_xen_mappings rather than custom one 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" This will help to consolidate the page-table code and avoid different path depending on the action to perform. Signed-off-by: Julien Grall Reviewed-by: Andre Przywara Reviewed-by: Stefano Stabellini --- Cc: Konrad Rzeszutek Wilk Cc: Ross Lagerwall arch_livepatch_secure is now the same as on x86. It might be possible to combine both, but I left that alone for now. Changes in v2: - Add Andre's reviewed-by --- xen/arch/arm/livepatch.c | 6 +++--- xen/arch/arm/mm.c | 5 ++--- xen/include/asm-arm/page.h | 11 ----------- 3 files changed, 5 insertions(+), 17 deletions(-) diff --git a/xen/arch/arm/livepatch.c b/xen/arch/arm/livepatch.c index 3e53524365..279d52cc6c 100644 --- a/xen/arch/arm/livepatch.c +++ b/xen/arch/arm/livepatch.c @@ -146,15 +146,15 @@ int arch_livepatch_secure(const void *va, unsigned int pages, enum va_type type) switch ( type ) { case LIVEPATCH_VA_RX: - flags = PTE_RO; /* R set, NX clear */ + flags = PAGE_HYPERVISOR_RX; break; case LIVEPATCH_VA_RW: - flags = PTE_NX; /* R clear, NX set */ + flags = PAGE_HYPERVISOR_RW; break; case LIVEPATCH_VA_RO: - flags = PTE_NX | PTE_RO; /* R set, NX set */ + flags = PAGE_HYPERVISOR_RO; break; default: diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index a6b228ba9b..71de68fe0d 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1041,8 +1041,8 @@ static int create_xen_entries(enum xenmap_operation op, else { pte = *entry; - pte.pt.ro = PTE_RO_MASK(flags); - pte.pt.xn = PTE_NX_MASK(flags); + pte.pt.ro = PAGE_RO_MASK(flags); + pte.pt.xn = PAGE_XN_MASK(flags); if ( !pte.pt.ro && !pte.pt.xn ) { printk("%s: Incorrect combination for addr=%lx\n", @@ -1085,7 +1085,6 @@ int destroy_xen_mappings(unsigned long v, unsigned long e) int modify_xen_mappings(unsigned long s, unsigned long e, unsigned int flags) { - ASSERT((flags & (PTE_NX | PTE_RO)) == flags); return create_xen_entries(MODIFY, s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags); } diff --git a/xen/include/asm-arm/page.h b/xen/include/asm-arm/page.h index 814ed126ec..2b9d5e6a5c 100644 --- a/xen/include/asm-arm/page.h +++ b/xen/include/asm-arm/page.h @@ -90,17 +90,6 @@ #define PAGE_HYPERVISOR_WC (_PAGE_DEVICE|MT_NORMAL_NC) /* - * Defines for changing the hypervisor PTE .ro and .nx bits. This is only to be - * used with modify_xen_mappings. - */ -#define _PTE_NX_BIT 0U -#define _PTE_RO_BIT 1U -#define PTE_NX (1U << _PTE_NX_BIT) -#define PTE_RO (1U << _PTE_RO_BIT) -#define PTE_NX_MASK(x) (((x) >> _PTE_NX_BIT) & 0x1U) -#define PTE_RO_MASK(x) (((x) >> _PTE_RO_BIT) & 0x1U) - -/* * Stage 2 Memory Type. * * These are valid in the MemAttr[3:0] field of an LPAE stage 2 page