From patchwork Tue Jun 13 16:13:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 9784271 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 26C27602DC for ; Tue, 13 Jun 2017 16:15:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 04E1C27DCD for ; Tue, 13 Jun 2017 16:15:45 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id EE1B52853A; Tue, 13 Jun 2017 16:15:44 +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 A7ED427DCD for ; Tue, 13 Jun 2017 16:15:44 +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 1dKoS5-000069-Gf; Tue, 13 Jun 2017 16:13:57 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKoS4-0008UT-3d for xen-devel@lists.xen.org; Tue, 13 Jun 2017 16:13:56 +0000 Received: from [193.109.254.147] by server-6.bemta-6.messagelabs.com id A7/2C-03920-34F00495; Tue, 13 Jun 2017 16:13:55 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrILMWRWlGSWpSXmKPExsVysyfVTdeZ3yH S4MFlNoslHxezODB6HN39mymAMYo1My8pvyKBNeP8qqesBXc5K85M3MTewNjB0cXIxSEksJlR 4sjkjYxdjJxAzmlGiVN75EFsNgFNiTufPzGB2CIC0hLXPl8Gq2EWiJBoWrAXLC4sECrxYOlal i5GDg4WAVWJn63lIGFeASuJI6cawMolBOQldrVdZAWxOYHil543Qa2ylGjevZ5pAiP3AkaGVY waxalFZalFuoaWeklFmekZJbmJmTm6hgZmermpxcWJ6ak5iUnFesn5uZsYgd5lAIIdjD+WBRx ilORgUhLl3XLFJlKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBO8OXodIIcGi1PTUirTMHGCYwaQl OHiURHjvswCleYsLEnOLM9MhUqcYdTk2rF7/hUmIJS8/L1VKnPcPyAwBkKKM0jy4EbCQv8QoK yXMywh0lBBPQWpRbmYJqvwrRnEORiVh3hYeoCk8mXklcJteAR3BBHTEdZD7eYtLEhFSUg2MK2 Q9XRdJ7Qy53vcxYkKz4H7R134+O6etnrLQpG/dwiNtKQWTIj2mTVbIdvj+et9X0cUTw4KZmSK rVj51cbZLfjXzRfb9mqTbK6YpLznwsbLUMJItNSVy2luTi1/n5Wj88D9WHsv32nHFzgvrmSsl Qy7+8H14N/TDTwb27XJ1S7/2/L7Ze375OiWW4oxEQy3mouJEAIF2f4x0AgAA X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1497370434!97214937!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.19; banners=-,-,- X-VirusChecked: Checked Received: (qmail 64004 invoked from network); 13 Jun 2017 16:13:54 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-8.tower-27.messagelabs.com with SMTP; 13 Jun 2017 16:13:54 -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 671C51596; Tue, 13 Jun 2017 09:13:54 -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 A31EC3F557; Tue, 13 Jun 2017 09:13:53 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 13 Jun 2017 17:13:21 +0100 Message-Id: <20170613161323.25196-23-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170613161323.25196-1-julien.grall@arm.com> References: <20170613161323.25196-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org, punit.agrawal@arm.com Subject: [Xen-devel] [PATCH 22/24] xen/arm: alternative: Redefine virt_to_mfn to support typesafe 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 The file xen/arch/arm/alternative.c is using typesafe MFN in most of the place. The only caller to virt_to_mfn is using with _mfn(...). To avoid extra _mfn(...), re-define virt_to_mfn within xen/arch/arm/alternative.c to handle typesafe MFN. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/alternative.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xen/arch/arm/alternative.c b/xen/arch/arm/alternative.c index 4d7e5b6155..a3bcda3117 100644 --- a/xen/arch/arm/alternative.c +++ b/xen/arch/arm/alternative.c @@ -32,6 +32,10 @@ #include #include +/* Override macros from asm/page.h to make them work with mfn_t */ +#undef virt_to_mfn +#define virt_to_mfn(va) _mfn(__virt_to_mfn(va)) + extern const struct alt_instr __alt_instructions[], __alt_instructions_end[]; struct alt_region { @@ -154,7 +158,7 @@ static int __apply_alternatives_multi_stop(void *unused) { int ret; struct alt_region region; - mfn_t xen_mfn = _mfn(virt_to_mfn(_start)); + mfn_t xen_mfn = virt_to_mfn(_start); paddr_t xen_size = _end - _start; unsigned int xen_order = get_order_from_bytes(xen_size); void *xenmap;