From mboxrd@z Thu Jan 1 00:00:00 1970 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=-15.7 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 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 40D23C433E0 for ; Mon, 15 Mar 2021 16:35:20 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (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 B81E164F26 for ; Mon, 15 Mar 2021 16:35:19 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B81E164F26 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=FZODojD8lqIUmi0kkdS5wN/T62N/9IL6+jB5uPDFilk=; b=NjRfgDDJn9sof/Dd32Gosebod q46oGxO3iMpHnEgL/Q7U7w+KlLUW8Pe6BdSDyI6Q0psuzMkwJCQFrkbryWo5zCcD97uEf7K87o1D7 QEkAJZBpAuL/igh90d6X24v4AuhniWyu8OSaMxvmENDb4Wa702YsokTEavg+mTCKC6zQTKZYNd362 jY49vekhaMu7tg6CW0Yka2AiYOcHd7hk1UVLyY+vuyaphZ+adRZJVzxTJXLh+nNUfC91FOcd8vN50 6kKxw0UGsx1fjG0ZkF6h6WLwgR1fwsQkgO2jnNXyJaD275Bw9KqHEaWhoUFn0sQ2q9uapXudCJNqp vGX539RTQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lLqA5-00GMfb-Qa; Mon, 15 Mar 2021 16:33:45 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lLq9q-00GMaR-E5 for linux-arm-kernel@lists.infradead.org; Mon, 15 Mar 2021 16:33:33 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id E1A4664E42; Mon, 15 Mar 2021 16:33:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1615826008; bh=f4K1PQi5GoA8DyancBzvuA/NuLTUjdftl7M7gxwy1No=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=EjR/pS1cN3N97EsHHqVbRHIBpoeGPaSsRmHGYdei+80OM7tDfbC1i28OhSuN6mh3e el0hMbHrqnIr7uMJfvqUWvkl6ZWIsYs7xuEvtZA+virmRuz8lnOTQDvyi4Bz3iB1PU sb8UCVALUTP17F3wvYYCzD/GfJpxTi3tiPShtzvB6jKwi/GJFp0fGwRvOzacFJQWLG cdwk6YxVlVYVtn0c6AaW99h4Ccx0UvP4R40QO03FMjcwqYHdvXusB5yWCemYBotqCy fJQHP4Wd7rrcs6Rjfqp7Xc9Gb2uKyN1H1ckKf1Lf4Y86ol/YwKwUZisOzJy3fPZ/uP wsfFBPi3b+O2A== Date: Mon, 15 Mar 2021 16:33:23 +0000 From: Will Deacon To: Quentin Perret Cc: catalin.marinas@arm.com, maz@kernel.org, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, android-kvm@google.com, seanjc@google.com, mate.toth-pal@arm.com, linux-kernel@vger.kernel.org, robh+dt@kernel.org, linux-arm-kernel@lists.infradead.org, kernel-team@android.com, kvmarm@lists.cs.columbia.edu, tabba@google.com, ardb@kernel.org, mark.rutland@arm.com, dbrazdil@google.com Subject: Re: [PATCH v5 14/36] KVM: arm64: Provide __flush_dcache_area at EL2 Message-ID: <20210315163322.GE3430@willie-the-truck> References: <20210315143536.214621-1-qperret@google.com> <20210315143536.214621-15-qperret@google.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20210315143536.214621-15-qperret@google.com> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210315_163330_698834_5D28E1A5 X-CRM114-Status: GOOD ( 18.76 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Mon, Mar 15, 2021 at 02:35:14PM +0000, Quentin Perret wrote: > We will need to do cache maintenance at EL2 soon, so compile a copy of > __flush_dcache_area at EL2, and provide a copy of arm64_ftr_reg_ctrel0 > as it is needed by the read_ctr macro. > > Signed-off-by: Quentin Perret > --- > arch/arm64/include/asm/kvm_cpufeature.h | 2 ++ > arch/arm64/kvm/hyp/nvhe/Makefile | 3 ++- > arch/arm64/kvm/hyp/nvhe/cache.S | 13 +++++++++++++ > arch/arm64/kvm/sys_regs.c | 1 + > 4 files changed, 18 insertions(+), 1 deletion(-) > create mode 100644 arch/arm64/kvm/hyp/nvhe/cache.S > > diff --git a/arch/arm64/include/asm/kvm_cpufeature.h b/arch/arm64/include/asm/kvm_cpufeature.h > index 3fd9f60d2180..efba1b89b8a4 100644 > --- a/arch/arm64/include/asm/kvm_cpufeature.h > +++ b/arch/arm64/include/asm/kvm_cpufeature.h > @@ -13,3 +13,5 @@ > #define KVM_HYP_CPU_FTR_REG(name) extern struct arm64_ftr_reg kvm_nvhe_sym(name) > #endif > #endif > + > +KVM_HYP_CPU_FTR_REG(arm64_ftr_reg_ctrel0); I still think this is a bit weird. If you really want to macro-ise stuff, then why not follow the sort of thing we do for e.g. per-cpu variables and have separate DECLARE_HYP_CPU_FTR_REG and DEFINE_HYP_CPU_FTR_REG macros. That way kvm_cpufeature.h can have header guards like a normal header and we can drop the '#ifndef KVM_HYP_CPU_FTR_REG' altogether. I don't think the duplication of the symbol name really matters -- it should fail at build time if something is missing. Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel