From patchwork Wed May 8 16:15:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 163634 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:81:0:0:0:0 with SMTP id l1csp2885541ilm; Wed, 8 May 2019 09:17:40 -0700 (PDT) X-Google-Smtp-Source: APXvYqyOsLWqrdpW7AV6c5/1+EV1/E1knXTS9n/PjJWUePGPzRHt8ElSoBIC67a/vqZGmoN+heR5 X-Received: by 2002:a24:4315:: with SMTP id s21mr4276217itb.84.1557332260722; Wed, 08 May 2019 09:17:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1557332260; cv=none; d=google.com; s=arc-20160816; b=yacAGjeif4+9GP27+iD74ABe/qG3ZELgj7NMfAPstUTQF23PuzbLf/RLlkv1LTx1ho oVqB08kUgCqPzNaEps6/qJuuNSc88Mi0WdALLBzbK5rkG4ESdsapr2DVqO/yfScWBuLs vUpzgPW9IsbuNAL1mAPzAJ0c4Ud5gd7rVudNSwR/50nme/3Y9f/Dvik3+gPLT+gZLea8 deQ76UcU4ROiTPyMHpXPO2H5wkZf+QySi7ZHsgwbUd17Zjkcs6RiZKjPqinU8SlUIx29 Py7Z8UFRsFWvmavWFmQIpwuDnGzD71hU9Ws18Nhpq/JsFi/MP0uoQTRYGNEd+//e2grd DLQw== 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:cc :list-subscribe:list-help:list-post:list-unsubscribe:list-id :precedence:subject:references:in-reply-to:message-id:date:to:from; bh=3Zh803serRdnZphRTkShksmmdUCxVeuY+ncr1SbSnwQ=; b=opJVeSSFaVniW3+KLi0ROB/ctgl1hyVo7c06S3WVivdt+OB7KhrEWzlxfyQcOCHiQO ScW1sXzladshMcD0wZSYrZs9vB5cskAUrV4/lGvT95bjumHRbUHhwlk6XLBDURBSh15j bw2T07s5Oq2Fk8uD86+CCuth6WwFBQ9OxO1pGgH70Z5t60NA00hh5zAgqgiQc0gJRXuA v34Jkqhh7FHDLwQkSxTVdSeRF/DhpmS7z57a3oHHql4vjfhyeqdLePK+p/DZy8+u/YFv LkUXh5kXLa5QzlBYZ6B1DkWBPMtYneR6eUBT4Unhn9iacZrdhICRXSXQTEjdoSdFJxME TL8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id k195si2281162itb.11.2019.05.08.09.17.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 08 May 2019 09:17:40 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of xen-devel-bounces@lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hOPEq-0008EW-3P; Wed, 08 May 2019 16:16:12 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hOPEo-0008EE-T5 for xen-devel@lists.xenproject.org; Wed, 08 May 2019 16:16:10 +0000 X-Inumbo-ID: 976a1332-71ac-11e9-90eb-eb305858670c Received: from foss.arm.com (unknown [217.140.101.70]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTP id 976a1332-71ac-11e9-90eb-eb305858670c; Wed, 08 May 2019 16:16:10 +0000 (UTC) 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 B64EC80D; Wed, 8 May 2019 09:16:09 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com (e108454-lin.cambridge.arm.com [10.1.196.50]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 830353F238; Wed, 8 May 2019 09:16:08 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xenproject.org Date: Wed, 8 May 2019 17:15:57 +0100 Message-Id: <20190508161603.21964-2-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190508161603.21964-1-julien.grall@arm.com> References: <20190508161603.21964-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH v2 1/7] xen/arm: mm: Consolidate setting SCTLR_EL2.WXN in a single place X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Oleksandr_Tyshchenko@epam.com, Julien Grall , Stefano Stabellini , Andrii Anisov MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The logic to set SCTLR_EL2.WXN is the same for the boot CPU and non-boot CPU. So introduce a function to set the bit and clear TLBs. This new function will help us to document and update the logic in a single place. Signed-off-by: Julien Grall Reviewed-by: Andrii Anisov Reviewed-by: Stefano Stabellini --- Changes in v2: - Fix typo in the commit message - Add Andrii's reviewed-by --- xen/arch/arm/mm.c | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 01ae2cccc0..93ad118183 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -601,6 +601,19 @@ void __init remove_early_mappings(void) flush_xen_data_tlb_range_va(BOOT_FDT_VIRT_START, BOOT_FDT_SLOT_SIZE); } +/* + * After boot, Xen page-tables should not contain mapping that are both + * Writable and eXecutables. + * + * This should be called on each CPU to enforce the policy. + */ +static void xen_pt_enforce_wnx(void) +{ + WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); + /* Flush everything after setting WXN bit. */ + flush_xen_text_tlb_local(); +} + extern void switch_ttbr(uint64_t ttbr); /* Clear a translation table and clean & invalidate the cache */ @@ -702,10 +715,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset) clear_table(boot_second); clear_table(boot_third); - /* From now on, no mapping may be both writable and executable. */ - WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); - /* Flush everything after setting WXN bit. */ - flush_xen_text_tlb_local(); + xen_pt_enforce_wnx(); #ifdef CONFIG_ARM_32 per_cpu(xen_pgtable, 0) = cpu0_pgtable; @@ -777,9 +787,7 @@ int init_secondary_pagetables(int cpu) /* MMU setup for secondary CPUS (which already have paging enabled) */ void mmu_init_secondary_cpu(void) { - /* From now on, no mapping may be both writable and executable. */ - WRITE_SYSREG32(READ_SYSREG32(SCTLR_EL2) | SCTLR_WXN, SCTLR_EL2); - flush_xen_text_tlb_local(); + xen_pt_enforce_wnx(); } #ifdef CONFIG_ARM_32