From: David Gibson <david@gibson.dropbear.id.au>
To: Bharata B Rao <bharata@linux.ibm.com>
Cc: qemu-ppc@nongnu.org, qemu-devel@nongnu.org
Subject: Re: [PATCH v1 2/2] target/ppc: Support for H_RPT_INVALIDATE hcall
Date: Fri, 9 Jul 2021 11:01:22 +1000 [thread overview]
Message-ID: <YOef4q9A6TUMe7vj@yekko> (raw)
In-Reply-To: <20210706112440.1449562-3-bharata@linux.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 9182 bytes --]
On Tue, Jul 06, 2021 at 04:54:40PM +0530, Bharata B Rao wrote:
> If KVM_CAP_RPT_INVALIDATE KVM capability is enabled, then
>
> - indicate the availability of H_RPT_INVALIDATE hcall to the guest via
> ibm,hypertas-functions property.
> - Enable the hcall
>
> Both the above are done only if the new sPAPR machine capability
> cap-rpt-invalidate is set.
>
> Signed-off-by: Bharata B Rao <bharata@linux.ibm.com>
Applied to ppc-for-6.1, but one note below.
> ---
> hw/ppc/spapr.c | 6 ++++++
> hw/ppc/spapr_caps.c | 41 +++++++++++++++++++++++++++++++++++++++++
> include/hw/ppc/spapr.h | 8 ++++++--
> target/ppc/kvm.c | 12 ++++++++++++
> target/ppc/kvm_ppc.h | 12 ++++++++++++
> 5 files changed, 77 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> index 4dd90b75cc..2b96b03673 100644
> --- a/hw/ppc/spapr.c
> +++ b/hw/ppc/spapr.c
> @@ -880,6 +880,10 @@ static void spapr_dt_rtas(SpaprMachineState *spapr, void *fdt)
> add_str(hypertas, "hcall-copy");
> add_str(hypertas, "hcall-debug");
> add_str(hypertas, "hcall-vphn");
> + if (spapr_get_cap(spapr, SPAPR_CAP_RPT_INVALIDATE) == SPAPR_CAP_ON) {
> + add_str(hypertas, "hcall-rpt-invalidate");
> + }
> +
> add_str(qemu_hypertas, "hcall-memop1");
>
> if (!kvm_enabled() || kvmppc_spapr_use_multitce()) {
> @@ -2018,6 +2022,7 @@ static const VMStateDescription vmstate_spapr = {
> &vmstate_spapr_cap_ccf_assist,
> &vmstate_spapr_cap_fwnmi,
> &vmstate_spapr_fwnmi,
> + &vmstate_spapr_cap_rpt_invalidate,
> NULL
> }
> };
> @@ -4573,6 +4578,7 @@ static void spapr_machine_class_init(ObjectClass *oc, void *data)
> smc->default_caps.caps[SPAPR_CAP_LARGE_DECREMENTER] = SPAPR_CAP_ON;
> smc->default_caps.caps[SPAPR_CAP_CCF_ASSIST] = SPAPR_CAP_ON;
> smc->default_caps.caps[SPAPR_CAP_FWNMI] = SPAPR_CAP_ON;
> + smc->default_caps.caps[SPAPR_CAP_RPT_INVALIDATE] = SPAPR_CAP_OFF;
> spapr_caps_add_properties(smc);
> smc->irq = &spapr_irq_dual;
> smc->dr_phb_enabled = true;
> diff --git a/hw/ppc/spapr_caps.c b/hw/ppc/spapr_caps.c
> index d0c419b392..ed7c077a0d 100644
> --- a/hw/ppc/spapr_caps.c
> +++ b/hw/ppc/spapr_caps.c
> @@ -582,6 +582,37 @@ static void cap_fwnmi_apply(SpaprMachineState *spapr, uint8_t val,
> }
> }
>
> +static void cap_rpt_invalidate_apply(SpaprMachineState *spapr,
> + uint8_t val, Error **errp)
> +{
> + ERRP_GUARD();
> +
> + if (!val) {
> + /* capability disabled by default */
> + return;
> + }
> +
> + if (tcg_enabled()) {
> + error_setg(errp, "No H_RPT_INVALIDATE support in TCG");
This will need to be fixed before the default can be changed to on.
> + error_append_hint(errp,
> + "Try appending -machine cap-rpt-invalidate=off\n");
> + } else if (kvm_enabled()) {
> + if (!kvmppc_has_cap_mmu_radix()) {
> + error_setg(errp, "H_RPT_INVALIDATE only supported on Radix");
> + return;
> + }
> +
> + if (!kvmppc_has_cap_rpt_invalidate()) {
> + error_setg(errp,
> + "KVM implementation does not support H_RPT_INVALIDATE");
> + error_append_hint(errp,
> + "Try appending -machine cap-rpt-invalidate=off\n");
> + } else {
> + kvmppc_enable_h_rpt_invalidate();
> + }
> + }
> +}
> +
> SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
> [SPAPR_CAP_HTM] = {
> .name = "htm",
> @@ -690,6 +721,15 @@ SpaprCapabilityInfo capability_table[SPAPR_CAP_NUM] = {
> .type = "bool",
> .apply = cap_fwnmi_apply,
> },
> + [SPAPR_CAP_RPT_INVALIDATE] = {
> + .name = "rpt-invalidate",
> + .description = "Allow H_RPT_INVALIDATE",
> + .index = SPAPR_CAP_RPT_INVALIDATE,
> + .get = spapr_cap_get_bool,
> + .set = spapr_cap_set_bool,
> + .type = "bool",
> + .apply = cap_rpt_invalidate_apply,
> + },
> };
>
> static SpaprCapabilities default_caps_with_cpu(SpaprMachineState *spapr,
> @@ -830,6 +870,7 @@ SPAPR_CAP_MIG_STATE(nested_kvm_hv, SPAPR_CAP_NESTED_KVM_HV);
> SPAPR_CAP_MIG_STATE(large_decr, SPAPR_CAP_LARGE_DECREMENTER);
> SPAPR_CAP_MIG_STATE(ccf_assist, SPAPR_CAP_CCF_ASSIST);
> SPAPR_CAP_MIG_STATE(fwnmi, SPAPR_CAP_FWNMI);
> +SPAPR_CAP_MIG_STATE(rpt_invalidate, SPAPR_CAP_RPT_INVALIDATE);
>
> void spapr_caps_init(SpaprMachineState *spapr)
> {
> diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h
> index f05219f75e..b18d407c1a 100644
> --- a/include/hw/ppc/spapr.h
> +++ b/include/hw/ppc/spapr.h
> @@ -74,8 +74,10 @@ typedef enum {
> #define SPAPR_CAP_CCF_ASSIST 0x09
> /* Implements PAPR FWNMI option */
> #define SPAPR_CAP_FWNMI 0x0A
> +/* Support H_RPT_INVALIDATE */
> +#define SPAPR_CAP_RPT_INVALIDATE 0x0B
> /* Num Caps */
> -#define SPAPR_CAP_NUM (SPAPR_CAP_FWNMI + 1)
> +#define SPAPR_CAP_NUM (SPAPR_CAP_RPT_INVALIDATE + 1)
>
> /*
> * Capability Values
> @@ -542,8 +544,9 @@ struct SpaprMachineState {
> #define H_SCM_UNBIND_MEM 0x3F0
> #define H_SCM_UNBIND_ALL 0x3FC
> #define H_SCM_HEALTH 0x400
> +#define H_RPT_INVALIDATE 0x448
>
> -#define MAX_HCALL_OPCODE H_SCM_HEALTH
> +#define MAX_HCALL_OPCODE H_RPT_INVALIDATE
>
> /* The hcalls above are standardized in PAPR and implemented by pHyp
> * as well.
> @@ -932,6 +935,7 @@ extern const VMStateDescription vmstate_spapr_cap_nested_kvm_hv;
> extern const VMStateDescription vmstate_spapr_cap_large_decr;
> extern const VMStateDescription vmstate_spapr_cap_ccf_assist;
> extern const VMStateDescription vmstate_spapr_cap_fwnmi;
> +extern const VMStateDescription vmstate_spapr_cap_rpt_invalidate;
>
> static inline uint8_t spapr_get_cap(SpaprMachineState *spapr, int cap)
> {
> diff --git a/target/ppc/kvm.c b/target/ppc/kvm.c
> index 104a308abb..dc93b99189 100644
> --- a/target/ppc/kvm.c
> +++ b/target/ppc/kvm.c
> @@ -89,6 +89,7 @@ static int cap_ppc_count_cache_flush_assist;
> static int cap_ppc_nested_kvm_hv;
> static int cap_large_decr;
> static int cap_fwnmi;
> +static int cap_rpt_invalidate;
>
> static uint32_t debug_inst_opcode;
>
> @@ -152,6 +153,7 @@ int kvm_arch_init(MachineState *ms, KVMState *s)
> exit(1);
> }
>
> + cap_rpt_invalidate = kvm_vm_check_extension(s, KVM_CAP_PPC_RPT_INVALIDATE);
> kvm_ppc_register_host_cpu_type();
>
> return 0;
> @@ -2040,6 +2042,11 @@ void kvmppc_enable_h_page_init(void)
> kvmppc_enable_hcall(kvm_state, H_PAGE_INIT);
> }
>
> +void kvmppc_enable_h_rpt_invalidate(void)
> +{
> + kvmppc_enable_hcall(kvm_state, H_RPT_INVALIDATE);
> +}
> +
> void kvmppc_set_papr(PowerPCCPU *cpu)
> {
> CPUState *cs = CPU(cpu);
> @@ -2551,6 +2558,11 @@ int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)
> return 0;
> }
>
> +int kvmppc_has_cap_rpt_invalidate(void)
> +{
> + return cap_rpt_invalidate;
> +}
> +
> PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void)
> {
> uint32_t host_pvr = mfpvr();
> diff --git a/target/ppc/kvm_ppc.h b/target/ppc/kvm_ppc.h
> index 989f61ace0..ee9325bf9a 100644
> --- a/target/ppc/kvm_ppc.h
> +++ b/target/ppc/kvm_ppc.h
> @@ -24,6 +24,7 @@ void kvmppc_enable_logical_ci_hcalls(void);
> void kvmppc_enable_set_mode_hcall(void);
> void kvmppc_enable_clear_ref_mod_hcalls(void);
> void kvmppc_enable_h_page_init(void);
> +void kvmppc_enable_h_rpt_invalidate(void);
> void kvmppc_set_papr(PowerPCCPU *cpu);
> int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t compat_pvr);
> void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
> @@ -71,6 +72,7 @@ bool kvmppc_has_cap_nested_kvm_hv(void);
> int kvmppc_set_cap_nested_kvm_hv(int enable);
> int kvmppc_get_cap_large_decr(void);
> int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable);
> +int kvmppc_has_cap_rpt_invalidate(void);
> int kvmppc_enable_hwrng(void);
> int kvmppc_put_books_sregs(PowerPCCPU *cpu);
> PowerPCCPUClass *kvm_ppc_get_host_cpu_class(void);
> @@ -150,6 +152,11 @@ static inline void kvmppc_enable_h_page_init(void)
> {
> }
>
> +static inline void kvmppc_enable_h_rpt_invalidate(void)
> +{
> + g_assert_not_reached();
> +}
> +
> static inline void kvmppc_set_papr(PowerPCCPU *cpu)
> {
> }
> @@ -381,6 +388,11 @@ static inline int kvmppc_enable_cap_large_decr(PowerPCCPU *cpu, int enable)
> return -1;
> }
>
> +static inline int kvmppc_has_cap_rpt_invalidate(void)
> +{
> + return false;
> +}
> +
> static inline int kvmppc_enable_hwrng(void)
> {
> return -1;
--
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 --]
prev parent reply other threads:[~2021-07-09 1:09 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-06 11:24 [PATCH v1 0/2] Enable support for H_RPT_INVALIDATE hcall Bharata B Rao
2021-07-06 11:24 ` [PATCH v1 1/2] linux-headers: Update Bharata B Rao
2021-07-06 11:24 ` [PATCH v1 2/2] target/ppc: Support for H_RPT_INVALIDATE hcall Bharata B Rao
2021-07-09 1:01 ` David Gibson [this message]
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=YOef4q9A6TUMe7vj@yekko \
--to=david@gibson.dropbear.id.au \
--cc=bharata@linux.ibm.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).