From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07513C388F9 for ; Fri, 20 Nov 2020 01:47:19 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7158B22201 for ; Fri, 20 Nov 2020 01:47:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="sd1Gr4I/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7158B22201 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from list by lists.xenproject.org with outflank-mailman.31521.61951 (Exim 4.92) (envelope-from ) id 1kfvW0-0005H7-CR; Fri, 20 Nov 2020 01:47:08 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 31521.61951; Fri, 20 Nov 2020 01:47:08 +0000 X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kfvW0-0005H0-9P; Fri, 20 Nov 2020 01:47:08 +0000 Received: by outflank-mailman (input) for mailman id 31521; Fri, 20 Nov 2020 01:47:07 +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.92) (envelope-from ) id 1kfvVz-0005Gv-3B for xen-devel@lists.xenproject.org; Fri, 20 Nov 2020 01:47:07 +0000 Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 85333ba6-9336-427c-9421-d097d67f3bba; Fri, 20 Nov 2020 01:47:06 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s (c-24-130-65-46.hsd1.ca.comcast.net [24.130.65.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1901C22201; Fri, 20 Nov 2020 01:47:05 +0000 (UTC) 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.92) (envelope-from ) id 1kfvVz-0005Gv-3B for xen-devel@lists.xenproject.org; Fri, 20 Nov 2020 01:47:07 +0000 X-Inumbo-ID: 85333ba6-9336-427c-9421-d097d67f3bba Received: from mail.kernel.org (unknown [198.145.29.99]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 85333ba6-9336-427c-9421-d097d67f3bba; Fri, 20 Nov 2020 01:47:06 +0000 (UTC) Received: from sstabellini-ThinkPad-T480s (c-24-130-65-46.hsd1.ca.comcast.net [24.130.65.46]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 1901C22201; Fri, 20 Nov 2020 01:47:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1605836825; bh=qROvm2bLrbiiLZMKfpPsHkFHej1lCqcjjt1J3RD7VyE=; h=Date:From:To:cc:Subject:In-Reply-To:References:From; b=sd1Gr4I/cB1aODykbJKgwlXtoA1DJY2/Ew9p4bcoux/lQgRJQwznFLcBObVSn6spt gaMV07KxgNl79YW/UiLjg7q7MIi+ijai+UsEx5s2H7UkXpbeM4YY//mO7IQNhIbv18 J6fJ/zUsmZM8u8/EXkIvSkDLKYFyNHSvAWYgJO+A= Date: Thu, 19 Nov 2020 17:47:04 -0800 (PST) From: Stefano Stabellini X-X-Sender: sstabellini@sstabellini-ThinkPad-T480s To: Julien Grall cc: xen-devel@lists.xenproject.org, bertrand.marquis@arm.com, Julien Grall , Stefano Stabellini , Volodymyr Babchuk , Julien Grall Subject: Re: [PATCH RFC 5/6] xen/arm: mm: Don't open-code Xen PT update in remove_early_mappings In-Reply-To: <20201119190751.22345-6-julien@xen.org> Message-ID: References: <20201119190751.22345-1-julien@xen.org> <20201119190751.22345-6-julien@xen.org> User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII On Thu, 19 Nov 2020, Julien Grall wrote: > From: Julien Grall > > Now that xen_pt_update_entry() is able to deal with different mapping > size, we can replace the open-coding of the page-tables update by a call > to modify_xen_mappings(). > > As the function is not meant to fail, a BUG_ON is added to check the > return. > > Signed-off-by: Julien Grall > Signed-off-by: Julien Grall Acked-by: Stefano Stabellini > --- > xen/arch/arm/mm.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index af0f12b6e6d3..aee6d410ac4f 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -598,11 +598,11 @@ void * __init early_fdt_map(paddr_t fdt_paddr) > > void __init remove_early_mappings(void) > { > - lpae_t pte = {0}; > - write_pte(xen_second + second_table_offset(BOOT_FDT_VIRT_START), pte); > - write_pte(xen_second + second_table_offset(BOOT_FDT_VIRT_START + SZ_2M), > - pte); > - flush_xen_tlb_range_va(BOOT_FDT_VIRT_START, BOOT_FDT_SLOT_SIZE); > + int rc; > + > + rc = modify_xen_mappings(BOOT_FDT_VIRT_START, BOOT_FDT_VIRT_END, > + _PAGE_BLOCK); > + BUG_ON(rc); > } > > /* > -- > 2.17.1 >