From patchwork Sun Mar 22 16:14:11 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Grall X-Patchwork-Id: 11451905 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AFA2E17D4 for ; Sun, 22 Mar 2020 16:16:30 +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 95D6A20724 for ; Sun, 22 Mar 2020 16:16:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 95D6A20724 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=xen.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1jG3Fa-0004tZ-S6; Sun, 22 Mar 2020 16:14:58 +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.89) (envelope-from ) id 1jG3FZ-0004rK-89 for xen-devel@lists.xenproject.org; Sun, 22 Mar 2020 16:14:57 +0000 X-Inumbo-ID: 38c696b4-6c58-11ea-8134-12813bfff9fa Received: from mail-ed1-f67.google.com (unknown [209.85.208.67]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 38c696b4-6c58-11ea-8134-12813bfff9fa; Sun, 22 Mar 2020 16:14:35 +0000 (UTC) Received: by mail-ed1-f67.google.com with SMTP id w26so7148397edu.7 for ; Sun, 22 Mar 2020 09:14:35 -0700 (PDT) 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=iAgcocLWJa/thTf8SxekVYdlKQsuyCse0uToobp5LkM=; b=ZlSMfy0JI9jNDjfv8XbrIm8Ujbp/XNpyDis9qA/9sItD6tsK491Hi0AaZoZof+eTSv ZVookV5cCnBggW+3nNMI1Ru7Xe/OdlgkbFhyBh3X+zl1PvNButN3oybZM15LTaq426q2 vzfCqhgPNbY/DryPeQrlCThp6/Djd0g6Hq77LLpqLG9ABpFJVK/Y7rPEfrMng8o5Rupa WhBpWunxjzggXXETHK+tgIO+JJupQHKZNsPvKxftftajPVahpoiEmYgnbPd0NV39IUj7 0JyQ0gBI9B9icaiaz0vd+f0EcArCuaBZ5n48OHYfLJR/YXu+9VxI/QfVZsGPQTA7llea LZSA== X-Gm-Message-State: ANhLgQ1KYRWooMMBl42nHxink+hf3rVYNU5yT4EeboKvwhc/Z0CNiHxQ cdWUYHNUYVB2YjPEFiAFzoAHEXMN3jV/jQ== X-Google-Smtp-Source: ADFU+vtexKJQoP1o5dsMumo0E9vKS9kBg35/4qaOwxPd5C8lvf5cAFaKMC9T3UyBSG9Qp5xI6aIfiQ== X-Received: by 2002:a17:906:2455:: with SMTP id a21mr16168678ejb.11.1584893674710; Sun, 22 Mar 2020 09:14:34 -0700 (PDT) Received: from ufe34d9ed68d054.ant.amazon.com (54-240-197-235.amazon.com. [54.240.197.235]) by smtp.gmail.com with ESMTPSA id v13sm106693edj.62.2020.03.22.09.14.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 22 Mar 2020 09:14:34 -0700 (PDT) From: julien@xen.org To: xen-devel@lists.xenproject.org Date: Sun, 22 Mar 2020 16:14:11 +0000 Message-Id: <20200322161418.31606-11-julien@xen.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200322161418.31606-1-julien@xen.org> References: <20200322161418.31606-1-julien@xen.org> Subject: [Xen-devel] [PATCH 10/17] xen/x86: pv: Use maddr_to_mfn(...) instead of the open-coding version X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: julien@xen.org, Wei Liu , Andrew Cooper , Julien Grall , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= MIME-Version: 1.0 Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" From: Julien Grall _mfn(addr >> PAGE_SHIFT) is equivalent to maddr_to_mfn(addr). Signed-off-by: Julien Grall Acked-by: Jan Beulich --- xen/arch/x86/pv/grant_table.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/pv/grant_table.c b/xen/arch/x86/pv/grant_table.c index 0325618c98..f80e233621 100644 --- a/xen/arch/x86/pv/grant_table.c +++ b/xen/arch/x86/pv/grant_table.c @@ -72,7 +72,7 @@ int create_grant_pv_mapping(uint64_t addr, mfn_t frame, goto out; } - gl1mfn = _mfn(addr >> PAGE_SHIFT); + gl1mfn = maddr_to_mfn(addr); page = get_page_from_mfn(gl1mfn, currd); if ( !page ) @@ -228,7 +228,7 @@ int replace_grant_pv_mapping(uint64_t addr, mfn_t frame, goto out; } - gl1mfn = _mfn(addr >> PAGE_SHIFT); + gl1mfn = maddr_to_mfn(addr); page = get_page_from_mfn(gl1mfn, currd); if ( !page )