From patchwork Tue Jun 13 16:13:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 105384 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp486318qgd; Tue, 13 Jun 2017 09:15:12 -0700 (PDT) X-Received: by 10.36.51.82 with SMTP id k79mr18667977itk.32.1497370512287; Tue, 13 Jun 2017 09:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497370512; cv=none; d=google.com; s=arc-20160816; b=CINxCJV4+bIbjIL/6ENm1uEWiKI3uxbLwvq3Z1hrS/PyJW5yLm5zhjvf0sn+xgXGKa eGy6vSw6ScGqj4MVkJC7FSzqjP6L9NvHzeXIOIY7RQMbWRRBye0uMDgKvFAjmYwAuajo 6xB1qR25QukIUZhaiJjuOwzBzN6X+Q0q2Jg1gX9YCcXWGSu4FH9wYJtCQsmVEMVlpFBM NvQ3MAgBKyO6W+9oaBC+TpdCsK1bwQEig+HbAMcD3H4iWrBOsQIHrCla7YjHS3T+m23z 6RWbPKx0is7ifEl8a4BZf6poaPT85gGuAjBSPw6KvUb/w846M1qId9C4Ult/3NnxQyOl egrQ== 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=lHZ1YsqTxMjvZRyPjzx98dC/nhclGaceWiRnSwh3vck=; b=IROcH3FjWjeZcv4MiNlJvNw+VVEkJeoSnnCb25hAM8hhyWNfwHFyOMGFuHTazYqe/w zagkZ8clD4ZJpN3idC6RfL/31XO7n0DYRwp6YIxmTG9iTl9ui1gurtYnIjmVgM5Ubjrz B2eM2Z8ARL6VS65HR8CC9I0VzjAbulb/b1XoURikP9m+bAnvDmoCTcyIkVVCZE6AVgh5 PDiYDSe/r1BSuyq3qGAJoJJOo28AIBOAbJgtJaZboV4+zoHNPpRbK1IdUMZcyRV3IgzU eO3DQ+OF/AQjyCfHcRw/O3azqzaoprH2ss/304Q6LUz60tysEpGJFsV1N5LvGRs9N4cJ TNsQ== 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 r126si444425itb.13.2017.06.13.09.15.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Jun 2017 09:15:12 -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 1dKoS8-0000C7-1M; Tue, 13 Jun 2017 16:14:00 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dKoS6-00007x-J2 for xen-devel@lists.xen.org; Tue, 13 Jun 2017 16:13:58 +0000 Received: from [85.158.143.35] by server-5.bemta-6.messagelabs.com id B3/C5-03371-54F00495; Tue, 13 Jun 2017 16:13:57 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrOLMWRWlGSWpSXmKPExsVysyfVTdeV3yH SoGuCpMWSj4tZHBg9ju7+zRTAGMWamZeUX5HAmnFg3SS2grWSFTvWb2dpYLwq2MXIxSEksJlR YvmPLawQzmlGie8rjjF3MXJysAloStz5/IkJxBYRkJa49vkyI4jNLBAh0bRgL1hcWMBF4sTBP WwgNouAqsTvaYdYQWxeASuJvTOngNVICMhL7Gq7CBbnBIpfet4ENkdIwFKiefd6pgmM3AsYGV YxahSnFpWlFukaWuolFWWmZ5TkJmbm6BoamOnlphYXJ6an5iQmFesl5+duYgR6mAEIdjD+WBZ wiFGSg0lJlHfLFZtIIb6k/JTKjMTijPii0pzU4kOMMhwcShK8O3gdIoUEi1LTUyvSMnOAoQaT luDgURLhvc8ClOYtLkjMLc5Mh0idYlSUEuf9A9InAJLIKM2Da4OF9yVGWSlhXkagQ4R4ClKLc jNLUOVfMYpzMCoJ87bwAE3hycwrgZv+CmgxE9Di6yA38xaXJCKkpBoYue61qUwJXLj789n3U4 OW9848e+/31hXXl/H0HlD++mKV4T39Nza3lrMdOdHqdWzrzN7+LyfOsa+4JPXudGrMBd5ZmZa pvCwz616dubOV/96TpJ75CzetqDh2Tt2V223zXa2texNuJ1/dmMu3izEyrbmqdDXvupDus1J/ G3Z3u6U/33nnRPBdpd9KLMUZiYZazEXFiQBza9mfagIAAA== X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-3.tower-21.messagelabs.com!1497370436!70195160!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 35258 invoked from network); 13 Jun 2017 16:13:57 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-3.tower-21.messagelabs.com with SMTP; 13 Jun 2017 16:13:57 -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 B0DF015A2; Tue, 13 Jun 2017 09:13:56 -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 EC7AF3F557; Tue, 13 Jun 2017 09:13:55 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Tue, 13 Jun 2017 17:13:23 +0100 Message-Id: <20170613161323.25196-25-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 24/24] xen/arm: create_xen_entries: Use typesafe MFN 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" Add a bit more safety when using create_xen_entries. Also when destroying/modifying mapping, the MFN is currently not used. Rather than passing _mfn(0) use INVALID_MFN to stay consistent with the other usage. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- xen/arch/arm/mm.c | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 2ff1688f3f..8cb0559972 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -980,7 +980,7 @@ enum xenmap_operation { static int create_xen_entries(enum xenmap_operation op, unsigned long virt, - unsigned long mfn, + mfn_t mfn, unsigned long nr_mfns, unsigned int ai) { @@ -989,7 +989,7 @@ static int create_xen_entries(enum xenmap_operation op, lpae_t pte; lpae_t *third = NULL; - for(; addr < addr_end; addr += PAGE_SIZE, mfn++) + for(; addr < addr_end; addr += PAGE_SIZE, mfn = mfn_add(mfn, 1)) { if ( !xen_second[second_linear_offset(addr)].pt.valid || !xen_second[second_linear_offset(addr)].pt.table ) @@ -1010,13 +1010,13 @@ static int create_xen_entries(enum xenmap_operation op, case RESERVE: if ( third[third_table_offset(addr)].pt.valid ) { - printk("create_xen_entries: trying to replace an existing mapping addr=%lx mfn=%lx\n", - addr, mfn); + printk("create_xen_entries: trying to replace an existing mapping addr=%lx mfn=%"PRI_mfn"\n", + addr, mfn_x(mfn)); return -EINVAL; } if ( op == RESERVE ) break; - pte = mfn_to_xen_entry(_mfn(mfn), ai); + pte = mfn_to_xen_entry(mfn, ai); pte.pt.table = 1; write_pte(&third[third_table_offset(addr)], pte); break; @@ -1061,24 +1061,25 @@ int map_pages_to_xen(unsigned long virt, unsigned long nr_mfns, unsigned int flags) { - return create_xen_entries(INSERT, virt, mfn, nr_mfns, flags); + return create_xen_entries(INSERT, virt, _mfn(mfn), nr_mfns, flags); } int populate_pt_range(unsigned long virt, unsigned long mfn, unsigned long nr_mfns) { - return create_xen_entries(RESERVE, virt, mfn, nr_mfns, 0); + return create_xen_entries(RESERVE, virt, _mfn(mfn), nr_mfns, 0); } int destroy_xen_mappings(unsigned long v, unsigned long e) { - return create_xen_entries(REMOVE, v, 0, (e - v) >> PAGE_SHIFT, 0); + return create_xen_entries(REMOVE, v, INVALID_MFN, (e - v) >> PAGE_SHIFT, 0); } 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, 0, (e - s) >> PAGE_SHIFT, flags); + return create_xen_entries(MODIFY, s, INVALID_MFN, (e - s) >> PAGE_SHIFT, + flags); } enum mg { mg_clear, mg_ro, mg_rw, mg_rx };