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=-13.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable 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 B6404C433E3 for ; Tue, 30 Mar 2021 16:49:30 +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 52C6C619B9 for ; Tue, 30 Mar 2021 16:49:30 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 52C6C619B9 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linuxfoundation.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=aFrJTK91locrdJGLVMzb/5o6sGKghoAmpVaPCIiYNpQ=; b=JNNKZ3S4zGH8s7AZToano78KS /cOecw5M+6C4XOuD8vC5aV4uLVOY7gfdPn11rQDz3Dx7GBd42agaDfae51eXhCWhssuH39Mb/sXQb TU4y5CPPzdWdmMAN0KszKxQlF/Zms/UMOKLG6pJZE987eTcTqZGVrz/TNntHteinMRRa64fAfgvUA nsE9KSWT2AjSsEhXSxp6tB2Ajh+TWj3ZFofs91qSN31015L0ZMNPp28wWnAZy1mgkPnm/SeYqLcI7 eJTdXCRKOGgZHdhprTpngQMg0sHijzMw3Xhat3syPQYKaWOY0vCHSSmIoGMXhjzCstnLuEMsRLSPb N0vqhiFmw==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lRHX8-004O5I-EO; Tue, 30 Mar 2021 16:48:02 +0000 Received: from mail.kernel.org ([198.145.29.99]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lRHX3-004O4h-IZ for linux-arm-kernel@lists.infradead.org; Tue, 30 Mar 2021 16:47:59 +0000 Received: by mail.kernel.org (Postfix) with ESMTPSA id 83214619CC; Tue, 30 Mar 2021 16:47:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617122875; bh=KHdICeV1rM9Mb1vyk4HNCW+NjRO4QlezycJ0HLjScfo=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=SPVAcoxLcZywaF/4CUfIl92hsw2AIuUB+TptV2Vf6Lz8JR4+42XDb2TSB6g0sPyB8 NNltxUHwHJwX5kJddk13kPhpTeI5wth35YAcFCIVXupqIQreho71ppZPLb9fA4e1uy mYHnuq9H4bikcys3Nln/+Df8ph/V4o2xI19DrGq8= Date: Tue, 30 Mar 2021 18:47:52 +0200 From: Greg KH To: Mathieu Poirier Cc: Suzuki K Poulose , Marc Zyngier , Catalin Marinas , linux-arm-kernel , Linux Kernel Mailing List , Coresight ML , Mike Leach , Leo Yan , Anshuman Khandual , Will Deacon , Mark Rutland Subject: Re: [PATCH v5 07/19] arm64: kvm: Enable access to TRBE support for host Message-ID: References: <20210323120647.454211-1-suzuki.poulose@arm.com> <20210323120647.454211-8-suzuki.poulose@arm.com> <20210326165550.GC2009902@xps15> <20210330152314.GA2329603@xps15> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210330_174758_053912_9255A613 X-CRM114-Status: GOOD ( 44.06 ) 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 Tue, Mar 30, 2021 at 10:33:51AM -0600, Mathieu Poirier wrote: > On Tue, 30 Mar 2021 at 09:35, Greg KH wrote: > > > > On Tue, Mar 30, 2021 at 09:23:14AM -0600, Mathieu Poirier wrote: > > > On Tue, Mar 30, 2021 at 11:38:18AM +0100, Suzuki K Poulose wrote: > > > > On 26/03/2021 16:55, Mathieu Poirier wrote: > > > > > On Tue, Mar 23, 2021 at 12:06:35PM +0000, Suzuki K Poulose wrote: > > > > > > For a nvhe host, the EL2 must allow the EL1&0 translation > > > > > > regime for TraceBuffer (MDCR_EL2.E2TB == 0b11). This must > > > > > > be saved/restored over a trip to the guest. Also, before > > > > > > entering the guest, we must flush any trace data if the > > > > > > TRBE was enabled. And we must prohibit the generation > > > > > > of trace while we are in EL1 by clearing the TRFCR_EL1. > > > > > > > > > > > > For vhe, the EL2 must prevent the EL1 access to the Trace > > > > > > Buffer. > > > > > > > > > > > > Cc: Will Deacon > > > > > > Cc: Catalin Marinas > > > > > > Cc: Marc Zyngier > > > > > > Cc: Mark Rutland > > > > > > Cc: Anshuman Khandual > > > > > > Acked-by: Mathieu Poirier > > > > > > Signed-off-by: Suzuki K Poulose > > > > > > --- > > > > > > arch/arm64/include/asm/el2_setup.h | 13 +++++++++ > > > > > > arch/arm64/include/asm/kvm_arm.h | 2 ++ > > > > > > arch/arm64/include/asm/kvm_host.h | 2 ++ > > > > > > arch/arm64/kernel/hyp-stub.S | 3 ++- > > > > > > arch/arm64/kvm/debug.c | 6 ++--- > > > > > > arch/arm64/kvm/hyp/nvhe/debug-sr.c | 42 ++++++++++++++++++++++++++++++ > > > > > > arch/arm64/kvm/hyp/nvhe/switch.c | 1 + > > > > > > 7 files changed, 65 insertions(+), 4 deletions(-) > > > > > > > > > > > > > > > > Marc - do you want me to pick up this one? > > > > > > > > I think the kvmarm tree is the best route for this patch, given the amount > > > > of changes the tree is going through, in the areas this patch > > > > touches. Or else there would be conflicts with merging. And this patch > > > > depends on the patches from this series that were queued. > > > > > > > > Here is the depency tree : > > > > > > > > a) kvm-arm fixes for debug (Patch 1, 2) & SPE save-restore fix (queued in > > > > v5.12-rc3) > > > > > > > > b) TRBE defintions and Trace synchronization barrier (Patches 5 & 6) > > > > > > > > c) kvm-arm TRBE host support (Patch 7) > > > > > > > > d) TRBE driver support (and the ETE changes) > > > > > > > > > > > > (c) code merge depends on -> (a) + (b) > > > > (d) build (no conflicts) depends on -> (b) > > > > > > > > > > > > Now (d) has an indirect dependency on (c) for operational correctness at > > > > runtime. > > > > So, if : > > > > > > > > kvmarm tree picks up : b + c > > > > coresight tree picksup : b + d > > > > > > > > and if we could ensure the merge order of the trees are in > > > > kvmarm > > > > greg-kh (device-misc tree) (coresight goes via this tree) > > > > > > > > > > Greg's char-misc tree is based on the rc releases rather than next. As such it > > > is a while before other branches like kvmarm get merged, causing all sort of > > > compilation breakage. > > > > My tree can not be based on -next, and neither can any other > > maintainer's tree, as next is composed of maintainer trees :) > > > > Exactly > > > > > we should be fine. > > > > > > > > Additionally, we could rip out the Kconfig changes from the TRBE patch > > > > and add it only at the rc1, once we verify both the trees are in to make > > > > sure the runtime operation dependency is not triggered. > > > > > > > > > > We could also do that but Greg might frown at the tactic, and rightly so. The > > > usual way to work with complex merge dependencies is to proceed in steps, which > > > would mean that all KVM related patches go in the v5.13 merge window. When that > > > is done we add the ETE/TRBE for the v5.14 merge window. I agree that we waste > > > an entire cycle but it guarantees to avoid breaking builds and follows the > > > conventional way to do things. > > > > Or someone creates a single branch with a signed tag and it gets pulled > > into multiple maintainer's trees and never rebased. We've done that > > lots of time, nothing new there. Or everything goes through one tree, > > or you wait a release cycle. > > > > You have 3 choices, pick one :) > > I'm perfectly happy with getting this entire set merged via Marc's > kvmarm tree, as long as you are fine with it. No objection from me at all for this to go that way. thanks, greg k-h _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel