From: David Gibson <david@gibson.dropbear.id.au>
To: Nicholas Piggin <npiggin@gmail.com>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH] target/ppc/spapr: Update H_GET_CPU_CHARACTERISTICS bits
Date: Tue, 4 May 2021 10:41:12 +1000 [thread overview]
Message-ID: <YJCYKBF2YgEl8AEA@yekko> (raw)
In-Reply-To: <20210503125833.891752-1-npiggin@gmail.com>
[-- Attachment #1: Type: text/plain, Size: 3304 bytes --]
On Mon, May 03, 2021 at 10:58:33PM +1000, Nicholas Piggin wrote:
> There are several new bits added to the hcall which reflect new issues
> found and new hardware mitigations.
>
> This adds the link stack flush behaviour, link stack flush accelerated
> instruction capability, and several L1D flush type behaviours (which are
> now being specified as negative in order to simplify patched kernel
> compatibility with older firmware).
So, to clarify here, the bits your adding aren't advertising any new
behaviour on qemu/KVM's part, they're just new ways of advertising the
same behaviour?
>
> Signed-off-by: Nicholas Piggin <npiggin@gmail.com>
> ---
> hw/ppc/spapr_hcall.c | 5 +++++
> include/hw/ppc/spapr.h | 6 ++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/hw/ppc/spapr_hcall.c b/hw/ppc/spapr_hcall.c
> index 7275d0bba1..f656620232 100644
> --- a/hw/ppc/spapr_hcall.c
> +++ b/hw/ppc/spapr_hcall.c
> @@ -1878,6 +1878,9 @@ static target_ulong h_get_cpu_characteristics(PowerPCCPU *cpu,
> behaviour |= H_CPU_BEHAV_L1D_FLUSH_PR;
> break;
> case SPAPR_CAP_FIXED:
> + behaviour |= H_CPU_BEHAV_NO_L1D_FLUSH_ENTRY;
> + behaviour |= H_CPU_BEHAV_NO_L1D_FLUSH_UACCESS;
> + behaviour |= H_CPU_BEHAV_NO_STF_BARRIER;
> break;
> default: /* broken */
> assert(safe_cache == SPAPR_CAP_BROKEN);
> @@ -1909,9 +1912,11 @@ static target_ulong h_get_cpu_characteristics(PowerPCCPU *cpu,
> break;
> case SPAPR_CAP_WORKAROUND:
> behaviour |= H_CPU_BEHAV_FLUSH_COUNT_CACHE;
> + behaviour |= H_CPU_BEHAV_FLUSH_LINK_STACK;
> if (count_cache_flush_assist) {
> characteristics |= H_CPU_CHAR_BCCTR_FLUSH_ASSIST;
> }
> + /* Should have a way to enable BCCTR_LINK_FLUSH_ASSIST */
Do we need a new spapr capability for this link flush thing?
> break;
> default: /* broken */
> assert(safe_indirect_branch == SPAPR_CAP_BROKEN);
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index 7f40a158f4..883ac1db3c 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -395,10 +395,16 @@ struct SpaprMachineState {
> #define H_CPU_CHAR_THR_RECONF_TRIG PPC_BIT(6)
> #define H_CPU_CHAR_CACHE_COUNT_DIS PPC_BIT(7)
> #define H_CPU_CHAR_BCCTR_FLUSH_ASSIST PPC_BIT(9)
> +#define H_CPU_CHAR_BCCTR_LINK_FLUSH_ASSIST PPC_BIT(11)
> +
> #define H_CPU_BEHAV_FAVOUR_SECURITY PPC_BIT(0)
> #define H_CPU_BEHAV_L1D_FLUSH_PR PPC_BIT(1)
> #define H_CPU_BEHAV_BNDS_CHK_SPEC_BAR PPC_BIT(2)
> #define H_CPU_BEHAV_FLUSH_COUNT_CACHE PPC_BIT(5)
> +#define H_CPU_BEHAV_FLUSH_LINK_STACK PPC_BIT(6)
> +#define H_CPU_BEHAV_NO_L1D_FLUSH_ENTRY PPC_BIT(7)
> +#define H_CPU_BEHAV_NO_L1D_FLUSH_UACCESS PPC_BIT(8)
> +#define H_CPU_BEHAV_NO_STF_BARRIER PPC_BIT(9)
>
> /* Each control block has to be on a 4K boundary */
> #define H_CB_ALIGNMENT 4096
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
next prev parent reply other threads:[~2021-05-04 0:47 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 12:58 [PATCH] target/ppc/spapr: Update H_GET_CPU_CHARACTERISTICS bits Nicholas Piggin
2021-05-04 0:41 ` David Gibson [this message]
2021-05-04 8:50 ` Nicholas Piggin
2021-05-05 4:20 ` David Gibson
2021-06-15 4:40 ` Nicholas Piggin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=YJCYKBF2YgEl8AEA@yekko \
--to=david@gibson.dropbear.id.au \
--cc=npiggin@gmail.com \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).