lkml.org 
[lkml]   [2020]   [Apr]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    SubjectRe: [PATCH v4 1/7] KVM: s390: clean up redundant 'kvm_run' parameters
    Date
    Tianjia Zhang <tianjia.zhang@linux.alibaba.com> writes:

    > In the current kvm version, 'kvm_run' has been included in the 'kvm_vcpu'
    > structure. For historical reasons, many kvm-related function parameters
    > retain the 'kvm_run' and 'kvm_vcpu' parameters at the same time. This
    > patch does a unified cleanup of these remaining redundant parameters.
    >
    > Signed-off-by: Tianjia Zhang <tianjia.zhang@linux.alibaba.com>
    > ---
    > arch/s390/kvm/kvm-s390.c | 23 +++++++++++++++--------
    > 1 file changed, 15 insertions(+), 8 deletions(-)
    >
    > diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c
    > index e335a7e5ead7..c0d94eaa00d7 100644
    > --- a/arch/s390/kvm/kvm-s390.c
    > +++ b/arch/s390/kvm/kvm-s390.c
    > @@ -4176,8 +4176,9 @@ static int __vcpu_run(struct kvm_vcpu *vcpu)
    > return rc;
    > }
    >
    > -static void sync_regs_fmt2(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > +static void sync_regs_fmt2(struct kvm_vcpu *vcpu)
    > {
    > + struct kvm_run *kvm_run = vcpu->run;
    > struct runtime_instr_cb *riccb;
    > struct gs_cb *gscb;
    >
    > @@ -4243,8 +4244,10 @@ static void sync_regs_fmt2(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > /* SIE will load etoken directly from SDNX and therefore kvm_run */
    > }
    >
    > -static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > +static void sync_regs(struct kvm_vcpu *vcpu)
    > {
    > + struct kvm_run *kvm_run = vcpu->run;
    > +
    > if (kvm_run->kvm_dirty_regs & KVM_SYNC_PREFIX)
    > kvm_s390_set_prefix(vcpu, kvm_run->s.regs.prefix);
    > if (kvm_run->kvm_dirty_regs & KVM_SYNC_CRS) {
    > @@ -4273,7 +4276,7 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    >
    > /* Sync fmt2 only data */
    > if (likely(!kvm_s390_pv_cpu_is_protected(vcpu))) {
    > - sync_regs_fmt2(vcpu, kvm_run);
    > + sync_regs_fmt2(vcpu);
    > } else {
    > /*
    > * In several places we have to modify our internal view to
    > @@ -4292,8 +4295,10 @@ static void sync_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > kvm_run->kvm_dirty_regs = 0;
    > }
    >
    > -static void store_regs_fmt2(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > +static void store_regs_fmt2(struct kvm_vcpu *vcpu)
    > {
    > + struct kvm_run *kvm_run = vcpu->run;
    > +
    > kvm_run->s.regs.todpr = vcpu->arch.sie_block->todpr;
    > kvm_run->s.regs.pp = vcpu->arch.sie_block->pp;
    > kvm_run->s.regs.gbea = vcpu->arch.sie_block->gbea;
    > @@ -4313,8 +4318,10 @@ static void store_regs_fmt2(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > /* SIE will save etoken directly into SDNX and therefore kvm_run */
    > }
    >
    > -static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > +static void store_regs(struct kvm_vcpu *vcpu)
    > {
    > + struct kvm_run *kvm_run = vcpu->run;
    > +
    > kvm_run->psw_mask = vcpu->arch.sie_block->gpsw.mask;
    > kvm_run->psw_addr = vcpu->arch.sie_block->gpsw.addr;
    > kvm_run->s.regs.prefix = kvm_s390_get_prefix(vcpu);
    > @@ -4333,7 +4340,7 @@ static void store_regs(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run)
    > current->thread.fpu.fpc = vcpu->arch.host_fpregs.fpc;
    > current->thread.fpu.regs = vcpu->arch.host_fpregs.regs;
    > if (likely(!kvm_s390_pv_cpu_is_protected(vcpu)))
    > - store_regs_fmt2(vcpu, kvm_run);
    > + store_regs_fmt2(vcpu);
    > }
    >
    > int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
    > @@ -4371,7 +4378,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
    > goto out;
    > }
    >
    > - sync_regs(vcpu, kvm_run);
    > + sync_regs(vcpu);
    > enable_cpu_timer_accounting(vcpu);
    >
    > might_fault();
    > @@ -4393,7 +4400,7 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu)
    > }
    >
    > disable_cpu_timer_accounting(vcpu);
    > - store_regs(vcpu, kvm_run);
    > + store_regs(vcpu);
    >
    > kvm_sigset_deactivate(vcpu);

    Haven't tried to compile this but the change itself looks obviously
    correct, so

    Reviewed-by: Vitaly Kuznetsov <vkuznets@redhat.com>

    --
    Vitaly

    \
     
     \ /
      Last update: 2020-04-29 14:04    [W:3.701 / U:0.092 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site