From patchwork Thu Jul 29 13:28:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Quentin Perret X-Patchwork-Id: 12408779 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC2FAC4338F for ; Thu, 29 Jul 2021 13:48:57 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 7AC556023F for ; Thu, 29 Jul 2021 13:48:57 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 7AC556023F Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.infradead.org 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=EcEBg71o0zFzh4WBFXFVsjpAe0risgMkETNji8aYshI=; b=oJABoWpynqa2OaYASAKmF27mZK NBG+ljMYGkQv/q8367yLLEzGjPJcm4+WcBjeGfmwI6+CKzIhg5SmoGu+BDgx/QWUsgYzOdtUVorbL tGfvLvOuax/0NfR1gR2wtm2g7kts9lil4ohw/GGZrB09irNQPxnw6HA2tSfKcytuwGeM5UE0uT32t VJF+13DNZ/Gfh0V6n8co2cTBH3IpIVQR+YVt0kv3BDt0SBWPghmr10OI9msbuC42E9ABMNG6Xz3XG pyH6vTnmFlfVccZ12hXZXQfeB3WSOheD41lSd9XXKH/Cf1bEiovAD3y2K6w2vzP5gt46jTdi7MEic CuldzGeA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1m96Mh-004L93-B8; Thu, 29 Jul 2021 13:46:24 +0000 Received: from mail-qv1-xf4a.google.com ([2607:f8b0:4864:20::f4a]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1m9664-004Eov-2Y for linux-arm-kernel@lists.infradead.org; Thu, 29 Jul 2021 13:29:13 +0000 Received: by mail-qv1-xf4a.google.com with SMTP id a2-20020a0562141302b02903303839b843so3916001qvv.13 for ; Thu, 29 Jul 2021 06:29:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=vQtosGJFAOrUOiBl4clG9WDMUZRQZWton/qwil1k0+Q=; b=dXygFS4MzHesaeMqbwJ0+cZ0afNQ4/u5vTF/RgsqUpPCSvO1FUb9yuOtobHsreJWqr dUqlIAu7Fvz+I43aDHKZyp8VKGAJcvdmKnnkeHIjZqt8EhOzaHANhcXh8RtV0Ilxlnt9 4Pl/Gc+kDSrSP77EuPnHl91zLmkSkct+Gl67dPohs9YPPdMJ8ph+HGp8BjrsrKxaXVEy OoSuN3lBXk7s1yZPSllQnVPCpAnlYGI91eJ1m/mdcSbcCE+Z2qNsccfX2HfuY/+rJJcM noOMmdViiMNvT23lNHKkf8AZYFmTtkC55+7rWH4afynTCCzcjLC8ILshwjJH8cojfSWr oXXg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=vQtosGJFAOrUOiBl4clG9WDMUZRQZWton/qwil1k0+Q=; b=YI5pxhY/kFocnfb3MVyum9V7AH9d56JwueIElgnWcc/mj5wSw/wNJkgZs7a6d5f2v5 iU/ifugkazIMmV5RdK/hT3+Gb4qYXEaOqD79VMoZ8TI/ku7tqrtTs9NUoorUilirHGrO VGaFGCdHKWfTV7uulqfbq7kpsJgC4TOWjjjBavPIpAFmGf6qiwchFkKfI58Nlm5y+fmy MQ07++jgbaP35WqZXJihbnz5YSe3WUXF/N+plO27j65c0tHO4RkTa+JEnblLDzYKoov1 S6U1WQomR0PKtSLDTInV9I+681ZRsy2BTb5xs3wOVHTap88SzGCj953KRELqgo42aidp yP9w== X-Gm-Message-State: AOAM531rb1RiB2sPsDwjWatv+2lKdjcfyCr8p07046TMWMjovkgdOBsG fCZGGd9MW2dc5tvnAa2jgJMnacHHXVTy X-Google-Smtp-Source: ABdhPJzMM++UNzruvJmyLbB/7mURxGlTSkGbvn6rPkDW6SXHchtq4/8ma0IIMxLOdpKM8oJyuuW51EsCRzfk X-Received: from luke.lon.corp.google.com ([2a00:79e0:d:210:293a:bc89:7514:5218]) (user=qperret job=sendgmr) by 2002:a05:6214:104b:: with SMTP id l11mr5321061qvr.40.1627565350559; Thu, 29 Jul 2021 06:29:10 -0700 (PDT) Date: Thu, 29 Jul 2021 14:28:18 +0100 In-Reply-To: <20210729132818.4091769-1-qperret@google.com> Message-Id: <20210729132818.4091769-22-qperret@google.com> Mime-Version: 1.0 References: <20210729132818.4091769-1-qperret@google.com> X-Mailer: git-send-email 2.32.0.432.gabb21c7263-goog Subject: [PATCH v3 21/21] KVM: arm64: Make __pkvm_create_mappings static From: Quentin Perret To: maz@kernel.org, james.morse@arm.com, alexandru.elisei@arm.com, suzuki.poulose@arm.com, catalin.marinas@arm.com, will@kernel.org Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, linux-kernel@vger.kernel.org, ardb@kernel.org, qwandor@google.com, tabba@google.com, dbrazdil@google.com, kernel-team@android.com, Quentin Perret X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210729_062912_183944_18344A0C X-CRM114-Status: GOOD ( 10.72 ) 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 The __pkvm_create_mappings() function is no longer used outside of nvhe/mm.c, make it static. Signed-off-by: Quentin Perret --- arch/arm64/kvm/hyp/include/nvhe/mm.h | 2 -- arch/arm64/kvm/hyp/nvhe/mm.c | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm64/kvm/hyp/include/nvhe/mm.h b/arch/arm64/kvm/hyp/include/nvhe/mm.h index c76d7136ed9b..c9a8f535212e 100644 --- a/arch/arm64/kvm/hyp/include/nvhe/mm.h +++ b/arch/arm64/kvm/hyp/include/nvhe/mm.h @@ -24,8 +24,6 @@ int hyp_back_vmemmap(phys_addr_t phys, unsigned long size, phys_addr_t back); int pkvm_cpu_set_vector(enum arm64_hyp_spectre_vector slot); int pkvm_create_mappings(void *from, void *to, enum kvm_pgtable_prot prot); int pkvm_create_mappings_locked(void *from, void *to, enum kvm_pgtable_prot prot); -int __pkvm_create_mappings(unsigned long start, unsigned long size, - unsigned long phys, enum kvm_pgtable_prot prot); unsigned long __pkvm_create_private_mapping(phys_addr_t phys, size_t size, enum kvm_pgtable_prot prot); diff --git a/arch/arm64/kvm/hyp/nvhe/mm.c b/arch/arm64/kvm/hyp/nvhe/mm.c index 6fbe8e8030f6..2fabeceb889a 100644 --- a/arch/arm64/kvm/hyp/nvhe/mm.c +++ b/arch/arm64/kvm/hyp/nvhe/mm.c @@ -23,8 +23,8 @@ u64 __io_map_base; struct memblock_region hyp_memory[HYP_MEMBLOCK_REGIONS]; unsigned int hyp_memblock_nr; -int __pkvm_create_mappings(unsigned long start, unsigned long size, - unsigned long phys, enum kvm_pgtable_prot prot) +static int __pkvm_create_mappings(unsigned long start, unsigned long size, + unsigned long phys, enum kvm_pgtable_prot prot) { int err;