Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 24 Mar 2021 17:40:39 +0000
Message-ID: <877dlwsb54.wl-maz@kernel.org>
From:   Marc Zyngier <maz@kernel.org>
To:     Catalin Marinas <catalin.marinas@arm.com>,
        Suzuki K Poulose <suzuki.poulose@arm.com>
Cc:     Mathieu Poirier <mathieu.poirier@linaro.org>,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        coresight@lists.linaro.org, mike.leach@linaro.org,
        leo.yan@linaro.org, anshuman.khandual@arm.com,
        Will Deacon <will.deacon@arm.com>
Subject: Re: [PATCH v5 05/19] arm64: Add support for trace synchronization barrier
In-Reply-To: <20210324171934.GB3709@arm.com>
References: <20210323120647.454211-1-suzuki.poulose@arm.com>
        <20210323120647.454211-6-suzuki.poulose@arm.com>
        <20210323182142.GA16080@arm.com>
        <7675ab71-c2ff-91e0-5728-fcb216ac1e0d@arm.com>
        <875z1gk6fo.wl-maz@kernel.org>
        <1b5e5bb2-b89f-fa35-0a8b-8c5476cb9ff6@arm.com>
        <871rc4jzn0.wl-maz@kernel.org>
        <17e57b01-840b-dbeb-c09f-1c04becb8749@arm.com>
        <87tup0ikf0.wl-maz@kernel.org>
        <59aec851-e980-0a6d-8ba5-56a35fa5a7a9@arm.com>
        <20210324171934.GB3709@arm.com>
User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI-EPG/1.14.7 (Harue)
 FLIM-LB/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL-LB/10.8 EasyPG/1.0.0 Emacs/27.1
 (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
Precedence: bulk

On Wed, 24 Mar 2021 17:19:36 +0000,
Catalin Marinas <catalin.marinas@arm.com> wrote:
> 
> On Wed, Mar 24, 2021 at 05:06:58PM +0000, Suzuki K Poulose wrote:
> > On 24/03/2021 16:30, Marc Zyngier wrote:
> > >
> > > OK, so we definitely do need these patches, don't we? Both? Just one?
> > > Please have a look at kvmarm/fixes and tell me what I must keep.
> > 
> > Both of them are fixes.
> > 
> > commit "KVM: arm64: Disable guest access to trace filter controls"
> >  - This fixes guest fiddling with the trace filter control as described
> > above.
> > 
> > commit "KVM: arm64: Hide system instruction access to Trace registers"
> >  - Fixes the Hypervisor to advertise what it doesn't support. i.e
> >    stop advertising trace system instruction access to a guest.
> >    Otherwise a guest which trusts the ID registers
> >    (ID_AA64DFR0_EL1.TRACEVER == 1) can crash while trying to access the
> >    trace register as we trap the accesses (CPTR_EL2.TTA == 1). On Linux,
> >    the ETM drivers need a DT explicitly advertising the support. So,
> >    this is not immediately impacted. And this fix goes a long way back
> >    in the history, when the CPTR_EL2.TTA was added.
> > 
> > Now, the reason for asking you to hold on is the way this could create
> > conflicts in merging the rest of the series.
> 
> The way we normally work around this is to either rebase your series on
> top of -rc5 when the fixes go in or, if you want an earlier -rc base,
> Marc can put them on a stable branch somewhere that you can use.

Here's what I've done:

- the two patches are now on a branch[1] based off -rc3 which I
  officially declare stable. Feel free to rebase your series on top.

- the KVM fixes branch now embeds this branch (yes, I've rebased it --
  we'll hopefully survive the outrage).

Thanks,

	M.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git/log/?h=trace-fixes-5.12

-- 
Without deviation from the norm, progress is not possible.