From patchwork Fri Jun 30 15:54: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: 106726 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2507441qge; Fri, 30 Jun 2017 08:57:03 -0700 (PDT) X-Received: by 10.36.48.146 with SMTP id q140mr8074953itq.59.1498838223198; Fri, 30 Jun 2017 08:57:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1498838223; cv=none; d=google.com; s=arc-20160816; b=VvvDAjy6cWcvRa3L0FALGjWvkSKH4cjRh8vQ3pJ4UQCeYBkE3mAkJUy85jxna/qV/0 ucvWbwZFNWEIjRKsH09BoKY97DXHFLhLoZnmVseYhbwRHKkovAWou3bkuQSbtiJNrE39 QV/twC8uu9weLnyNn9/iAEgNIXSfVuVBu7c6If0OzMlF2QxaIB2bMTTTUJ9SvjsIEiTG fiR9gPItMySHaLJNuVW1nGwQZTWu/6RaCfI1HMGudaUP92A4q78hySjTWtshhFCZ/dtq iac/fAWcQjY6NnCrrKN9a2CcRCicELG79t/9eMKspO3Gz0sl0IlCHqzYCxxjwnDu43Kv KgPg== 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=a330b9sTmVWtqdXfbFXpIRARroQlAzQC802gHfQKx2U=; b=RPMcpbsl7qWTK3KM+SQjZluFjNd+RR6K96vRlj/TrAKCVPEnpBal7C+CaQo7Ksf478 BYFQfXSSelTrtMxF6eGRDygk8TK08IUeo4ldIuzCpYtQcVBaWrlQBUlxCVfl2LWeadID 7/nRFKPfuFYUGPZgYw4eRn4dxwyXO89Bv+z/eBfpB2v02zrpZcdFHk0LbMekv8cxk5I5 EGv9Hnk+UoVYFSwKfpnSce9moYCW/20TAPEPKzImBGUtRG/AZeTAW2CocsdxQO452MsP qjdwYWLElR+GzlIlTtUdQV5fTl9z5C9nB6HRLf1BsY6VNSw1PxuVtHojdeZGXAPz2mqg LjIg== 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 v133si4389464itf.8.2017.06.30.08.57.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 08:57:03 -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 1dQyFr-0000Un-RD; Fri, 30 Jun 2017 15:54:47 +0000 Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dQyFp-0000Ru-Tm for xen-devel@lists.xen.org; Fri, 30 Jun 2017 15:54:46 +0000 Received: from [85.158.139.211] by server-6.bemta-5.messagelabs.com id 45/33-02175-54476595; Fri, 30 Jun 2017 15:54:45 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrMLMWRWlGSWpSXmKPExsVysyfVTdelJCz S4O1uY4slHxezODB6HN39mymAMYo1My8pvyKBNePrzaWMBYukKlYvmcHWwLhRqIuRi0NIYBOj xJbFH1ggnNNAzo9ZbF2MnBxsApoSdz5/YgKxRQSkJa59vswIYjMLOEi8+XiPBcQWFnCXuLOvC yzOIqAq0Tj3P1g9r4ClxK22LrAaCQF5iV1tF1lBbE4BK4nj/x6A1QgB1byedZVlAiP3AkaGVY waxalFZalFuoZmeklFmekZJbmJmTm6hgamermpxcWJ6ak5iUnFesn5uZsYgR5mAIIdjOdPex5 ilORgUhLlXXktNFKILyk/pTIjsTgjvqg0J7X4EKMMB4eSBO+aorBIIcGi1PTUirTMHGCowaQl OHiURHhlg4DSvMUFibnFmekQqVOMuhyvJvz/xiTEkpeflyolzpsOMkMApCijNA9uBCzsLzHKS gnzMgIdJcRTkFqUm1mCKv+KUZyDUUmY9yTIFJ7MvBK4Ta+AjmACOkJ4RgjIESWJCCmpBkbGQj n/BVJN958H/mspY5HVEsn4tfSopdW+zaWWXK/UbDwjLWVaWH6IvLlb/EMv++Qk/bhM7rtiinz q3E0zr3yRUVwzSeqjr2+6DFOd2bckh7Ubrijxr+jrOPQx251TS1Frheq3G9FV6q2qzi5TZPXl mM7v7Mzf42FeLMVy6QXv/fg0f92NSizFGYmGWsxFxYkA9GdZZ3YCAAA= X-Env-Sender: julien.grall@arm.com X-Msg-Ref: server-6.tower-206.messagelabs.com!1498838084!100669901!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.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 23156 invoked from network); 30 Jun 2017 15:54:44 -0000 Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by server-6.tower-206.messagelabs.com with SMTP; 30 Jun 2017 15:54:44 -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 14BC080D; Fri, 30 Jun 2017 08:54:44 -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 765943F41F; Fri, 30 Jun 2017 08:54:43 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Fri, 30 Jun 2017 16:54:23 +0100 Message-Id: <20170630155431.23824-9-julien.grall@arm.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170630155431.23824-1-julien.grall@arm.com> References: <20170630155431.23824-1-julien.grall@arm.com> Cc: Julien Grall , sstabellini@kernel.org Subject: [Xen-devel] [PATCH v3 08/16] 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 --- Changes in v2: - Add Stefano's reviewed-by --- 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 1e9e342fd3..c732771444 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 };