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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS 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 81389C433E0 for ; Sun, 5 Jul 2020 12:00:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5806B20720 for ; Sun, 5 Jul 2020 12:00:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593950415; bh=Hrki0NWbQnR7mFDJ86LIf/24cbRDX0SnjCAQfKCMf88=; h=Date:From:To:Cc:Subject:In-Reply-To:References:List-ID:From; b=APnKKbtHpEsSN8jUmg6XDGBNro2NO0EuKZiw3MLDgCxG9gfmxwdJ6EJb+UJ5kNENH FgXuvjVLSoC1OOHMFjTpFoCFM9sQwBcOGgr50ZNDU/cLeS0MwpomxZ8H6mmhBH5YN4 3kGTIpAzmbkeeCWINLAGo/M+ONA/yMFzxDCvP9LI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727005AbgGEMAO (ORCPT ); Sun, 5 Jul 2020 08:00:14 -0400 Received: from mail.kernel.org ([198.145.29.99]:58326 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726454AbgGEMAN (ORCPT ); Sun, 5 Jul 2020 08:00:13 -0400 Received: from disco-boy.misterjones.org (disco-boy.misterjones.org [51.254.78.96]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id B4C4720708; Sun, 5 Jul 2020 12:00:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1593950412; bh=Hrki0NWbQnR7mFDJ86LIf/24cbRDX0SnjCAQfKCMf88=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=qUDLk+TioO8qTy6bLwzuhK91dy/Jhc9T383RiyVLYx5MZpH3sY8Kdq2JlP1BAQf1B NDMyjsOkTIdBD38VpLqV/rjb17LE0W8VQWGhV43kMpjRLO0O0GFEe/FLnpS3zO7duQ G30D2gqEmI+J8C3FkfYibJHLOvfWTzYozou6/G50= Received: from 78.163-31-62.static.virginmediabusiness.co.uk ([62.31.163.78] helo=wait-a-minute.misterjones.org) by disco-boy.misterjones.org with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1js3Jb-009AjB-3s; Sun, 05 Jul 2020 13:00:11 +0100 Date: Sun, 05 Jul 2020 13:00:10 +0100 Message-ID: <87r1tqdved.wl-maz@kernel.org> From: Marc Zyngier To: David Brazdil Cc: Will Deacon , Catalin Marinas , James Morse , Julien Thierry , Suzuki K Poulose , kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, kernel-team@android.com Subject: Re: [PATCH v4 08/15] arm64: kvm: Duplicate hyp/tlb.c for VHE/nVHE In-Reply-To: <20200625131420.71444-9-dbrazdil@google.com> References: <20200625131420.71444-1-dbrazdil@google.com> <20200625131420.71444-9-dbrazdil@google.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 EasyPG/1.0.0 Emacs/26.3 (x86_64-pc-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Content-Type: text/plain; charset=US-ASCII X-SA-Exim-Connect-IP: 62.31.163.78 X-SA-Exim-Rcpt-To: dbrazdil@google.com, will@kernel.org, catalin.marinas@arm.com, james.morse@arm.com, julien.thierry.kdev@gmail.com, suzuki.poulose@arm.com, kvmarm@lists.cs.columbia.edu, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, android-kvm@google.com, kernel-team@android.com X-SA-Exim-Mail-From: maz@kernel.org X-SA-Exim-Scanned: No (on disco-boy.misterjones.org); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 25 Jun 2020 14:14:13 +0100, David Brazdil wrote: > > tlb.c contains code for flushing the TLB, with code shared between VHE/nVHE. > Because common code is small, duplicate tlb.c and specialize each copy for > VHE/nVHE. > > Signed-off-by: David Brazdil > --- > arch/arm64/kernel/image-vars.h | 14 +-- > arch/arm64/kvm/hyp/Makefile | 2 +- > arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- > arch/arm64/kvm/hyp/{ => nvhe}/tlb.c | 94 +--------------- > arch/arm64/kvm/hyp/vhe/Makefile | 2 +- > arch/arm64/kvm/hyp/vhe/tlb.c | 162 ++++++++++++++++++++++++++++ > 6 files changed, 178 insertions(+), 98 deletions(-) > rename arch/arm64/kvm/hyp/{ => nvhe}/tlb.c (62%) > create mode 100644 arch/arm64/kvm/hyp/vhe/tlb.c [...] > diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/nvhe/tlb.c > similarity index 62% > rename from arch/arm64/kvm/hyp/tlb.c > rename to arch/arm64/kvm/hyp/nvhe/tlb.c > index d063a576d511..9513ad41db9a 100644 > --- a/arch/arm64/kvm/hyp/tlb.c > +++ b/arch/arm64/kvm/hyp/nvhe/tlb.c > @@ -4,8 +4,6 @@ > * Author: Marc Zyngier > */ > > -#include > - > #include > #include > #include > @@ -16,52 +14,8 @@ struct tlb_inv_context { > u64 sctlr; > }; nit: You seem to have overlooked that some of the tlb_inv_context fields are now unused. I plan to squash the following patch in: diff --git a/arch/arm64/kvm/hyp/nvhe/tlb.c b/arch/arm64/kvm/hyp/nvhe/tlb.c index 6fe190bb930a..d4475f8340c4 100644 --- a/arch/arm64/kvm/hyp/nvhe/tlb.c +++ b/arch/arm64/kvm/hyp/nvhe/tlb.c @@ -9,9 +9,7 @@ #include struct tlb_inv_context { - unsigned long flags; u64 tcr; - u64 sctlr; }; static void __tlb_switch_to_guest(struct kvm *kvm, struct tlb_inv_context *cxt) Otherwise, this looks good to me. Thanks, M. -- Without deviation from the norm, progress is not possible.