From nobody Thu Apr 25 14:42:19 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1557837153; cv=none; d=zoho.com; s=zohoarc; b=XB0Gj827DW3ZRcbPTkyAxLwapp+pRzo9/xwnGF8xzn3lTY290hVCqOGqntaThH6MZ9SzmDaiUNg0eFLSsQx4MVx6FgcB2YiigD4jxVd6sLAuEV2/3dn8RWxUZUbeWYaIDcGBm7Fghz/Qmiy04aJ1y70cEOScyLTHIVPh/opNv/8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1557837153; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To:ARC-Authentication-Results; bh=NYceLMcH0dnOtniPH4yWjGE7uP2ifN97Cb0B1oVMZOo=; b=IT+3hv03rKdiDG+3KsJdkZDZ9+DXCsMf87ylqxv9RL8dLXG6arUJerV3AxBq90vDPAl0hHjicot9gwhgZLuMZ6l7W/yWqduByeyHSdBbbbxxu1umeWhdCEXfWFV9smxFN5gDPjcrjOwoK5gfav933OPQzXADGpKLG4WTRkc7izc= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1557837153760519.564166791131; Tue, 14 May 2019 05:32:33 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQWb2-0005YQ-H5; Tue, 14 May 2019 12:31:52 +0000 Received: from us1-rack-dfw2.inumbo.com ([104.130.134.6]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1hQWb0-0005WX-OY for xen-devel@lists.xenproject.org; Tue, 14 May 2019 12:31:50 +0000 Received: from foss.arm.com (unknown [217.140.101.70]) by us1-rack-dfw2.inumbo.com (Halon) with ESMTP id 3e86e24d-7644-11e9-8980-bc764e045a96; Tue, 14 May 2019 12:31:49 +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 CF7E115AD; Tue, 14 May 2019 05:31:48 -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 9BE8A3F71E; Tue, 14 May 2019 05:31:47 -0700 (PDT) X-Inumbo-ID: 3e86e24d-7644-11e9-8980-bc764e045a96 From: Julien Grall To: xen-devel@lists.xenproject.org Date: Tue, 14 May 2019 13:31:25 +0100 Message-Id: <20190514123125.29086-13-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190514123125.29086-1-julien.grall@arm.com> References: <20190514123125.29086-1-julien.grall@arm.com> Subject: [Xen-devel] [PATCH MM-PART3 v2 12/12] xen/arm: mm: Remove set_pte_flags_on_range() 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 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" set_pte_flags_on_range() is yet another function that will open-code update to a specific range in the Xen page-tables. It can be completely dropped by using either modify_xen_mappings() or destroy_xen_mappings(). Signed-off-by: Julien Grall Reviewed-by: Andrii Anisov --- Changes in v2: - Add missing newline in panic - Add Andrii's reviewed-by --- xen/arch/arm/mm.c | 58 ++++++++++-----------------------------------------= ---- 1 file changed, 10 insertions(+), 48 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 23ca61e8f0..d74101bcd2 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -1277,52 +1277,6 @@ int modify_xen_mappings(unsigned long s, unsigned lo= ng e, unsigned int flags) return xen_pt_update(s, INVALID_MFN, (e - s) >> PAGE_SHIFT, flags); } =20 -enum mg { mg_clear, mg_ro, mg_rw, mg_rx }; -static void set_pte_flags_on_range(const char *p, unsigned long l, enum mg= mg) -{ - lpae_t pte; - int i; - - ASSERT(is_kernel(p) && is_kernel(p + l)); - - /* Can only guard in page granularity */ - ASSERT(!((unsigned long) p & ~PAGE_MASK)); - ASSERT(!(l & ~PAGE_MASK)); - - for ( i =3D (p - _start) / PAGE_SIZE;=20 - i < (p + l - _start) / PAGE_SIZE;=20 - i++ ) - { - pte =3D xen_xenmap[i]; - switch ( mg ) - { - case mg_clear: - pte.pt.valid =3D 0; - break; - case mg_ro: - pte.pt.valid =3D 1; - pte.pt.pxn =3D 1; - pte.pt.xn =3D 1; - pte.pt.ro =3D 1; - break; - case mg_rw: - pte.pt.valid =3D 1; - pte.pt.pxn =3D 1; - pte.pt.xn =3D 1; - pte.pt.ro =3D 0; - break; - case mg_rx: - pte.pt.valid =3D 1; - pte.pt.pxn =3D 0; - pte.pt.xn =3D 0; - pte.pt.ro =3D 1; - break; - } - write_pte(xen_xenmap + i, pte); - } - flush_xen_tlb_local(); -} - /* Release all __init and __initdata ranges to be reused */ void free_init_memory(void) { @@ -1331,8 +1285,12 @@ void free_init_memory(void) uint32_t insn; unsigned int i, nr =3D len / sizeof(insn); uint32_t *p; + int rc; =20 - set_pte_flags_on_range(__init_begin, len, mg_rw); + rc =3D modify_xen_mappings((unsigned long)__init_begin, + (unsigned long)__init_end, PAGE_HYPERVISOR_RW= ); + if ( rc ) + panic("Unable to map RW the init section (rc =3D %d)\n", rc); =20 /* * From now on, init will not be used for execution anymore, @@ -1350,7 +1308,11 @@ void free_init_memory(void) for ( i =3D 0; i < nr; i++ ) *(p + i) =3D insn; =20 - set_pte_flags_on_range(__init_begin, len, mg_clear); + rc =3D destroy_xen_mappings((unsigned long)__init_begin, + (unsigned long)__init_end); + if ( rc ) + panic("Unable to remove the init section (rc =3D %d)\n", rc); + init_domheap_pages(pa, pa + len); printk("Freed %ldkB init memory.\n", (long)(__init_end-__init_begin)>>= 10); } --=20 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel