From patchwork Wed Dec 1 17:03:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12694352 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C2114C433F5 for ; Wed, 1 Dec 2021 17:07:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Cc:To:From:Subject:References: Mime-Version:Message-Id:In-Reply-To:Date:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=L99OajAd1Wsvq8/yrYoXE260B9SPvCqucUnCLxSpqA4=; b=p79f/DQNwYtKU7nDEO96tiTYkP rzejDuJRG8zEo449+zFOG43bzwKQO4JmRVWTGC5sOMC/q7TruSOS5qFgAfdyPsZMLbwgcYiiHR1KT 5FRi6qGhO6G9NT10hInPZTemLWS0/YgRJ3f/9ozbdfslrQX4MjBS7yfmWjZxYWtA28tIGi2mzuaKI 29FoB1rWKxisEBmtXBw3drmw1cYA8ZBMhdHThzn0Dmn3XPzONuYv4BdqpTi/jtNg5K+9e1wbnszgT SeE5pZLB2yTKgYTl8j6SbOwBDh2RtV2srn5Hj4JsAS5mrIBNYmOIVnOeyTy1HZQa3qYWhxIoThQE1 dR472DMg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1msT2s-009SEZ-E2; Wed, 01 Dec 2021 17:05:26 +0000 Received: from mail-wm1-x34a.google.com ([2a00:1450:4864:20::34a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1msT23-009Rsh-7k for linux-arm-kernel@lists.infradead.org; Wed, 01 Dec 2021 17:04:36 +0000 Received: by mail-wm1-x34a.google.com with SMTP id g11-20020a1c200b000000b003320d092d08so12564646wmg.9 for ; Wed, 01 Dec 2021 09:04:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=R4aAsZuEycX7jTv8i7SIMGlzcxlZQ+O2BggkYaTuEjA=; b=plQ5ysBljc0xG5cfba5Qiw3VOO5L5djBwH2KOMSeq2bRcSiUiqowbYb2+TW5TZ1dcR cZWPWJlgzX7jmmLaQ4ByFFTPnDp+JrwbYmQ0pJu3qL0LL5Eo+xr1+5IlSuQo/beLH3qI JiGvDzHNZtcTCeCYXNMRt2Eu49Ss2ylezV25kVj0ijXktXiPryN7T1mPUMkDLUYRtoQ9 g5ziLntuM1OC00Zp1xER7Mdxpwh5cZbTWq+fg+F47gsCCyqUZ4vYXt6mWjWGzETLnuhs TFuCujebbXw0EIIYAgEOWZZVUNMrvnHiz1yf1Alt6UryT32jt7vGzOKDYq+Al4/E+S/J tosQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=R4aAsZuEycX7jTv8i7SIMGlzcxlZQ+O2BggkYaTuEjA=; b=BcGKgYzs+yyrCNGEAFZkkl/BiT5TozUyaLQCR9kiooZQAKMFGaaDgG7/mfbFYh1zAY oKwYVLCTOWkF+xuD9PiHV6UgPWR2JNtsDYkksDtefLpExFgzRxg+J/+73T7rY4ah9wlK VeTPgWIRBfRcX2HDeMIHt5oi48NNTSxWHXBlHpz/5C7qKEX5Ua0e2DDBNAOotyzaZ1Db SyzBDMQ0fL0Vvcv4HBGHAHAMYbrODIAukX8wlCSahodACSLqjGivJBW+sub8Ydy/rX/s NgouYehF58o6Zk3olXNGFNFQil4l7EpTPQZb5DHE0OE1+e9Xf13gvAQCLkzusrtJjeJ9 U+DQ== X-Gm-Message-State: AOAM531dqOzeDuGFYqaG1gJe14+n5ZgF6atjskzGzHbiBRLyCHlVJkuY Xz0GVHyESGmJ65Y27XY5vRju2kvZ64tC X-Google-Smtp-Source: ABdhPJzQigV4hbaNpX4iucPZvGwYvAo/hfN1TJ3QONjwQcFMPn8kkHe0dIUY1NGAIghVVqO5zssHeXhuINPH X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:1cab:1a20:2ef1:ddde]) (user=qperret job=sendgmr) by 2002:a05:600c:4e02:: with SMTP id b2mr8493849wmq.105.1638378273705; Wed, 01 Dec 2021 09:04:33 -0800 (PST) Date: Wed, 1 Dec 2021 17:03:59 +0000 In-Reply-To: <20211201170411.1561936-1-qperret@google.com> Message-Id: <20211201170411.1561936-6-qperret@google.com> Mime-Version: 1.0 References: <20211201170411.1561936-1-qperret@google.com> X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog Subject: [PATCH v3 05/15] KVM: arm64: Hook up ->page_count() for hypervisor stage-1 page-table From: Quentin Perret To: Marc Zyngier , James Morse , Alexandru Elisei , Suzuki K Poulose , Catalin Marinas , Will Deacon Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, kernel-team@android.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20211201_090435_314771_52FB6EB1 X-CRM114-Status: UNSURE ( 9.62 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org From: Will Deacon kvm_pgtable_hyp_unmap() relies on the ->page_count() function callback being provided by the memory-management operations for the page-table. Wire up this callback for the hypervisor stage-1 page-table. Signed-off-by: Will Deacon Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/nvhe/setup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/kvm/hyp/nvhe/setup.c b/arch/arm64/kvm/hyp/nvhe/setup.c index 875b5174342f..855a19056627 100644 --- a/arch/arm64/kvm/hyp/nvhe/setup.c +++ b/arch/arm64/kvm/hyp/nvhe/setup.c @@ -257,6 +257,7 @@ void __noreturn __pkvm_init_finalise(void) .virt_to_phys = hyp_virt_to_phys, .get_page = hpool_get_page, .put_page = hpool_put_page, + .page_count = hyp_page_count, }; pkvm_pgtable.mm_ops = &pkvm_pgtable_mm_ops;