Re: [Qemu-ppc] [PATCH] Enable H_CLEAR_MOD and H_CLEAR_REF hypercalls on KVM/PPC64.

[David Gibson]

On Wed, Sep 21, 2016 at 01:20:57PM +1000, David Gibson wrote:
> On Tue, Aug 30, 2016 at 01:02:47AM +0000, Nathan Whitehorn wrote:
> > These are mandatory per PAPR and available on Linux 4.3 and newer kernels. 
> > The calls in question are required to run FreeBSD guests with reasonable 
> > performance, so enable them if possible.
> > 
> > Signed-off-by: Nathan Whitehorn <address@hidden>
> 
> Applied to ppc-for-2.8, thanks.
> 
> Please CC me directly on patches if you want a faster response - I
> only occasionally have time to look through the lists for things.

Actually, I discovered a bit later that this breaks the build on x86,
because there is no stub version of
kvmppc_enable_clear_ref_mod_hcalls() when (ppc) kvm is not available.

So, I've added that in my tree.

> 
> > ---
> >  hw/ppc/spapr.c       | 3 +++
> >  target-ppc/kvm.c     | 6 ++++++
> >  target-ppc/kvm_ppc.h | 1 +
> >  3 files changed, 10 insertions(+)
> > 
> > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c
> > index 30d6800..d41f1a5 100644
> > --- a/hw/ppc/spapr.c
> > +++ b/hw/ppc/spapr.c
> > @@ -1857,6 +1857,9 @@ static void ppc_spapr_init(MachineState *machine)
> >          /* Enable H_LOGICAL_CI_* so SLOF can talk to in-kernel devices */
> >          kvmppc_enable_logical_ci_hcalls();
> >          kvmppc_enable_set_mode_hcall();
> > +
> > +        /* H_CLEAR_MOD/_REF are mandatory in PAPR, but off by default */
> > +        kvmppc_enable_clear_ref_mod_hcalls();
> >      }
> >  
> >      /* allocate RAM */
> > diff --git a/target-ppc/kvm.c b/target-ppc/kvm.c
> > index dcb68b9..0e64a46 100644
> > --- a/target-ppc/kvm.c
> > +++ b/target-ppc/kvm.c
> > @@ -2055,6 +2055,12 @@ void kvmppc_enable_set_mode_hcall(void)
> >      kvmppc_enable_hcall(kvm_state, H_SET_MODE);
> >  }
> >  
> > +void kvmppc_enable_clear_ref_mod_hcalls(void)
> > +{
> > +    kvmppc_enable_hcall(kvm_state, H_CLEAR_REF);
> > +    kvmppc_enable_hcall(kvm_state, H_CLEAR_MOD);
> > +}
> > +
> >  void kvmppc_set_papr(PowerPCCPU *cpu)
> >  {
> >      CPUState *cs = CPU(cpu);
> > diff --git a/target-ppc/kvm_ppc.h b/target-ppc/kvm_ppc.h
> > index 5461d10..33b7ed2 100644
> > --- a/target-ppc/kvm_ppc.h
> > +++ b/target-ppc/kvm_ppc.h
> > @@ -24,6 +24,7 @@ int kvmppc_get_hypercall(CPUPPCState *env, uint8_t *buf, 
> > int buf_len);
> >  int kvmppc_set_interrupt(PowerPCCPU *cpu, int irq, int level);
> >  void kvmppc_enable_logical_ci_hcalls(void);
> >  void kvmppc_enable_set_mode_hcall(void);
> > +void kvmppc_enable_clear_ref_mod_hcalls(void);
> >  void kvmppc_set_papr(PowerPCCPU *cpu);
> >  int kvmppc_set_compat(PowerPCCPU *cpu, uint32_t cpu_version);
> >  void kvmppc_set_mpic_proxy(PowerPCCPU *cpu, int mpic_proxy);
> 



-- 
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

signature.asc
Description: PGP signature