lkml.org 
[lkml]   [2021]   [May]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.14 136/323] KVM: s390: split kvm_s390_real_to_abs
    Date
    From: Claudio Imbrenda <imbrenda@linux.ibm.com>

    commit c5d1f6b531e68888cbe6718b3f77a60115d58b9c upstream.

    A new function _kvm_s390_real_to_abs will apply prefixing to a real address
    with a given prefix value.

    The old kvm_s390_real_to_abs becomes now a wrapper around the new function.

    This is needed to avoid code duplication in vSIE.

    Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>
    Reviewed-by: David Hildenbrand <david@redhat.com>
    Reviewed-by: Thomas Huth <thuth@redhat.com>
    Cc: stable@vger.kernel.org
    Link: https://lore.kernel.org/r/20210322140559.500716-2-imbrenda@linux.ibm.com
    Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    arch/s390/kvm/gaccess.h | 23 +++++++++++++++++------
    1 file changed, 17 insertions(+), 6 deletions(-)

    --- a/arch/s390/kvm/gaccess.h
    +++ b/arch/s390/kvm/gaccess.h
    @@ -21,17 +21,14 @@

    /**
    * kvm_s390_real_to_abs - convert guest real address to guest absolute address
    - * @vcpu - guest virtual cpu
    + * @prefix - guest prefix
    * @gra - guest real address
    *
    * Returns the guest absolute address that corresponds to the passed guest real
    - * address @gra of a virtual guest cpu by applying its prefix.
    + * address @gra of by applying the given prefix.
    */
    -static inline unsigned long kvm_s390_real_to_abs(struct kvm_vcpu *vcpu,
    - unsigned long gra)
    +static inline unsigned long _kvm_s390_real_to_abs(u32 prefix, unsigned long gra)
    {
    - unsigned long prefix = kvm_s390_get_prefix(vcpu);
    -
    if (gra < 2 * PAGE_SIZE)
    gra += prefix;
    else if (gra >= prefix && gra < prefix + 2 * PAGE_SIZE)
    @@ -40,6 +37,20 @@ static inline unsigned long kvm_s390_rea
    }

    /**
    + * kvm_s390_real_to_abs - convert guest real address to guest absolute address
    + * @vcpu - guest virtual cpu
    + * @gra - guest real address
    + *
    + * Returns the guest absolute address that corresponds to the passed guest real
    + * address @gra of a virtual guest cpu by applying its prefix.
    + */
    +static inline unsigned long kvm_s390_real_to_abs(struct kvm_vcpu *vcpu,
    + unsigned long gra)
    +{
    + return _kvm_s390_real_to_abs(kvm_s390_get_prefix(vcpu), gra);
    +}
    +
    +/**
    * _kvm_s390_logical_to_effective - convert guest logical to effective address
    * @psw: psw of the guest
    * @ga: guest logical address

    \
     
     \ /
      Last update: 2021-05-20 12:44    [W:4.110 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site