From patchwork Thu Oct 5 17:42:17 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 114954 Delivered-To: patch@linaro.org Received: by 10.140.22.163 with SMTP id 32csp848238qgn; Thu, 5 Oct 2017 10:44:38 -0700 (PDT) X-Received: by 10.107.131.155 with SMTP id n27mr37239237ioi.200.1507225478390; Thu, 05 Oct 2017 10:44:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1507225478; cv=none; d=google.com; s=arc-20160816; b=oD3hbW3n2X7E2ZL6YpJzGY21SzOGGd5FFgGet5XSAqqydaSVDhfSQUFIdMpquAmkMc ncczx/COu40rRzkVtAf/xJy5NYP6j/46SOAS63FX6BENgu3EG0WipFMwrhMqs9fm6CFv 8Nt5DCWc/pWq0Mh+cgpYepuXNFJl5Gvv87i2vGz8towTHu03GS8926mZkHprHvxrmMAo 5s6Okcaw9J0hWIE3VpliHE6KUFKECHo7NjuWM56eY797lwnZqaTH9lr5JWpuNEgbZjw+ B62ADlLVc79hYvL+hPSbYy939Q/0F1uALhTyJkjLoSJI6ykjgVIUeWZoWXHNcEZAu+0O 0ilA== 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:dkim-signature:arc-authentication-results; bh=jIDrm4B5iAAwrKJqwHGrn8hQeUsbHNrquATJvfdjzP0=; b=ciPoCfRBl1lTIU0jol232Loq3WSvy0wRDEx62AsEQRiPMfx3ZAHowywQXyxjLWZEXe ADKwFIl46JLJZEA0DP0UfnzGTvaQcoBqqXFTOs4LLFXUY4+3tGKPXPnGCdmsP0ziP+/G Kcj3K7tvyYZ72n8k1avCmRsWHWNttjreDU+NHyMLBtfZTrI9ZsAOfawZjhB8Fsdd11wq i1R6rp/Y97OkP8AmumSys2M+Kd9Btm1viOgxRx0dzsU7BfcFzW00M0caue4vH+5p/uYO pNeEvLWkHUhvb0N5oAGKrV3HoyTsvxbCEYB/zxlNKATmflrT4/bbh+ylAgRzulovashI IXRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VO6lhbDS; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org. [192.237.175.120]) by mx.google.com with ESMTPS id y202si15408240ioy.44.2017.10.05.10.44.38 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2017 10:44:38 -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; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=VO6lhbDS; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.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 1e0AAQ-0000z4-Vl; Thu, 05 Oct 2017 17:42:38 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1e0AAP-0000ye-8z for xen-devel@lists.xen.org; Thu, 05 Oct 2017 17:42:37 +0000 Received: from [85.158.137.68] by server-11.bemta-3.messagelabs.com id 1F/FF-01777-C0F66D95; Thu, 05 Oct 2017 17:42:36 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrGIsWRWlGSWpSXmKPExsVyMfTOVl3u/Gu RBr3r1C2WfFzM4sDocXT3b6YAxijWzLyk/IoE1oxdx3eyFeyXrWjsOc7ewHhbvIuRi0NIYDKj xN91y9hBHBaBecwSz5c0gDkSAv2sEn+v/WTrYuQEcvIk3rX+YYaw0ySWPN4EFa+S2Pr9G2MXI wfQKDWJNW+iIKb2MUn8f7uWGSTOJqAjsW5GLUi5iIC0xLXPlxlBbGaBD4wST9+Ig9jCAqkSbz //YQKxWQRUJQ4vvQ42nlfARuLO1XcsEKvkJXa1XWQFsTkFbCXW99xhB7GFgGqWrzjLPIFRcAE jwypG9eLUorLUIl1DvaSizPSMktzEzBxdQwNjvdzU4uLE9NScxKRiveT83E2MwHBjAIIdjMs/ Oh1ilORgUhLl9cq6FinEl5SfUpmRWJwRX1Sak1p8iFGGg0NJgpc/DygnWJSanlqRlpkDDHyYt AQHj5IIrzxImre4IDG3ODMdInWK0ZLjwp1Lf5g4Duy5BSQ7bt79wyTEkpeflyolzrsnF6hBAK QhozQPbhwsOi8xykoJ8zICHSjEU5BalJtZgir/ilGcg1FJmPcPyBSezLwSuK2vgA5iAjpoTtM VkINKEhFSUg2M03+ceh3b91adVdI4ruNtCsN39XUdX299zNC9bq06TXrvc69TUbME7TWCFMqT Pexv67rP2sDwoe7pRAYn7Y/iz1c1vawuzmlbkCf6uzgnpufPpXMLrj6fGDLROdfCa93XjVdFr uckc1g2uzOva0o2OyBlZdi5O8Atk2O1R8zUU4v322b9uhyhxFKckWioxVxUnAgAtxsHSMkCAA A= X-Env-Sender: julien.grall@linaro.org X-Msg-Ref: server-4.tower-31.messagelabs.com!1507225354!60020380!1 X-Originating-IP: [209.85.220.181] X-SpamReason: No, hits=0.0 required=7.0 tests= X-StarScan-Received: X-StarScan-Version: 9.4.45; banners=-,-,- X-VirusChecked: Checked Received: (qmail 38164 invoked from network); 5 Oct 2017 17:42:35 -0000 Received: from mail-qk0-f181.google.com (HELO mail-qk0-f181.google.com) (209.85.220.181) by server-4.tower-31.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 5 Oct 2017 17:42:35 -0000 Received: by mail-qk0-f181.google.com with SMTP id w134so15534241qkb.0 for ; Thu, 05 Oct 2017 10:42:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=XTzhc8+XdhAhVoZpUsKCIQHl8xTiHwlaHDjoVEOUOyE=; b=VO6lhbDSHmOb9PEzUabPjSgiiqbQKkxQojWEtkTd5mOhk8C48DxCKVWwekhVUJpJT0 6bxUjTlLCXRl8AiQXcySlZ+OkSP4WnUlapcaPVTvoyOxX1Y+hIHzSqMnyA046/gBqqUS bJo3swOjVq2ojY9IW4PXmNPQvkmGTpuMf2uis= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=XTzhc8+XdhAhVoZpUsKCIQHl8xTiHwlaHDjoVEOUOyE=; b=eku8DSnVg5gnkaiJTF6ECljVaQ4vI7T+gtJOKI1ahW0SFM0yUSPXwaO1xbUutssirM D12bt5JpZyt88xkazL4+NhG6OMK1U+2lRptzB8D0fXC0P1iztzw5MgWiGQvDFk1l1ytF Jd75Szg+U/ObJTkUnYWpEL2L6aTljpFS9MQ1dD4Izf2uG/vjr4m9/hPfZbUr5tlNe0nP l2yrF2DPym/WC4vJKOUkdYIRXRMq+4zVG0pmjUwJ64gyA/827xFBJWO8zB59r5d8rVow wzogKFtGdmgj0j/RgBOwYRlSNROzVv11xDxnctV/qg/mYQ5XdtjcDW2KhQrhZZ4s2etr yExg== X-Gm-Message-State: AMCzsaWuypIGJKsw704E/282raywOmp2Y21iRj1tRi9daSRsassDKmyT g0YHVD5h0abMgOWHsHWnyDTBp5RhxeM= X-Google-Smtp-Source: AOwi7QA8aAbCusbZ0ooWm4W2jEgNrOsRYOhx+CY5xQg8CzD90ISctO9wCI6ha9xICRcTywliuuSGRg== X-Received: by 10.55.112.65 with SMTP id l62mr26875620qkc.357.1507225354425; Thu, 05 Oct 2017 10:42:34 -0700 (PDT) Received: from e108454-lin.cambridge.arm.com ([2001:41d0:1:6c23::1]) by smtp.gmail.com with ESMTPSA id y63sm11815084qky.75.2017.10.05.10.42.32 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Oct 2017 10:42:34 -0700 (PDT) From: Julien Grall To: xen-devel@lists.xen.org Date: Thu, 5 Oct 2017 18:42:17 +0100 Message-Id: <20171005174222.29161-5-julien.grall@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20171005174222.29161-1-julien.grall@linaro.org> References: <20171005174222.29161-1-julien.grall@linaro.org> Cc: Elena Ufimtseva , George Dunlap , Andrew Cooper , Julien Grall , Tim Deegan , Jan Beulich Subject: [Xen-devel] [PATCH v2 4/9] xen/x86: Use maddr_to_page and maddr_to_mfn to avoid open-coded >> PAGE_SHIFT 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" The constructions _mfn(... > PAGE_SHIFT) and mfn_to_page(... >> PAGE_SHIFT) could respectively be replaced by maddr_to_mfn(...) and maddr_to_page(...). Signed-off-by: Julien Grall Reviewed-by: Andrew Cooper --- Cc: Elena Ufimtseva Cc: Jan Beulich Cc: Andrew Cooper Cc: Tim Deegan Cc: George Dunlap Changes in v2: - Add Andrew's reviewed-by --- xen/arch/x86/debug.c | 2 +- xen/arch/x86/mm/shadow/common.c | 2 +- xen/arch/x86/mm/shadow/multi.c | 6 +++--- xen/common/kimage.c | 6 +++--- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/debug.c b/xen/arch/x86/debug.c index 1c10b84a16..9159f32db4 100644 --- a/xen/arch/x86/debug.c +++ b/xen/arch/x86/debug.c @@ -98,7 +98,7 @@ dbg_pv_va2mfn(dbgva_t vaddr, struct domain *dp, uint64_t pgd3val) l2_pgentry_t l2e, *l2t; l1_pgentry_t l1e, *l1t; unsigned long cr3 = (pgd3val ? pgd3val : dp->vcpu[0]->arch.cr3); - mfn_t mfn = _mfn(cr3 >> PAGE_SHIFT); + mfn_t mfn = maddr_to_mfn(cr3); DBGP2("vaddr:%lx domid:%d cr3:%lx pgd3:%lx\n", vaddr, dp->domain_id, cr3, pgd3val); diff --git a/xen/arch/x86/mm/shadow/common.c b/xen/arch/x86/mm/shadow/common.c index 86186cccdf..f65d2a6523 100644 --- a/xen/arch/x86/mm/shadow/common.c +++ b/xen/arch/x86/mm/shadow/common.c @@ -2640,7 +2640,7 @@ static int sh_remove_shadow_via_pointer(struct domain *d, mfn_t smfn) ASSERT(sh_type_has_up_pointer(d, sp->u.sh.type)); if (sp->up == 0) return 0; - pmfn = _mfn(sp->up >> PAGE_SHIFT); + pmfn = maddr_to_mfn(sp->up); ASSERT(mfn_valid(pmfn)); vaddr = map_domain_page(pmfn); ASSERT(vaddr); diff --git a/xen/arch/x86/mm/shadow/multi.c b/xen/arch/x86/mm/shadow/multi.c index 28030acbf6..1e42e1d8ab 100644 --- a/xen/arch/x86/mm/shadow/multi.c +++ b/xen/arch/x86/mm/shadow/multi.c @@ -2425,7 +2425,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) sp = mfn_to_page(smfn); if ( sp->u.sh.count != 1 || !sp->up ) return 0; - smfn = _mfn(sp->up >> PAGE_SHIFT); + smfn = maddr_to_mfn(sp->up); ASSERT(mfn_valid(smfn)); #if (SHADOW_PAGING_LEVELS == 4) @@ -2434,7 +2434,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) ASSERT(sh_type_has_up_pointer(d, SH_type_l2_shadow)); if ( sp->u.sh.count != 1 || !sp->up ) return 0; - smfn = _mfn(sp->up >> PAGE_SHIFT); + smfn = maddr_to_mfn(sp->up); ASSERT(mfn_valid(smfn)); /* up to l4 */ @@ -2442,7 +2442,7 @@ int sh_safe_not_to_sync(struct vcpu *v, mfn_t gl1mfn) if ( sp->u.sh.count != 1 || !sh_type_has_up_pointer(d, SH_type_l3_64_shadow) || !sp->up ) return 0; - smfn = _mfn(sp->up >> PAGE_SHIFT); + smfn = maddr_to_mfn(sp->up); ASSERT(mfn_valid(smfn)); #endif diff --git a/xen/common/kimage.c b/xen/common/kimage.c index cf624d10fd..ebc71affd1 100644 --- a/xen/common/kimage.c +++ b/xen/common/kimage.c @@ -504,7 +504,7 @@ static void kimage_free_entry(kimage_entry_t entry) { struct page_info *page; - page = mfn_to_page(entry >> PAGE_SHIFT); + page = maddr_to_page(entry); free_domheap_page(page); } @@ -636,8 +636,8 @@ static struct page_info *kimage_alloc_page(struct kexec_image *image, if ( old ) { /* If so move it. */ - mfn_t old_mfn = _mfn(*old >> PAGE_SHIFT); - mfn_t mfn = _mfn(addr >> PAGE_SHIFT); + mfn_t old_mfn = maddr_to_mfn(*old); + mfn_t mfn = maddr_to_mfn(addr); copy_domain_page(mfn, old_mfn); clear_domain_page(old_mfn);