Re: [RFC 03/10] KVM: s390: Convert shifts to gpa_to_gfn()

[Claudio Imbrenda <imbrenda@linux.ibm.com>]

On Mon, 16 Mar 2026 16:23:50 +0000
Janosch Frank <frankja@linux.ibm.com> wrote:

> Not only do we get rid of the ugly shift but we have more chances to
> do static analysis type checking since gpa_to_gfn() returns gfn_t.
> 
> Signed-off-by: Janosch Frank <frankja@linux.ibm.com>

Reviewed-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

> ---
>  arch/s390/kvm/interrupt.c | 4 ++--
>  arch/s390/kvm/priv.c      | 2 +-
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c
> index 03fb477c7527..1b771276415c 100644
> --- a/arch/s390/kvm/interrupt.c
> +++ b/arch/s390/kvm/interrupt.c
> @@ -2771,13 +2771,13 @@ static int adapter_indicators_set(struct kvm *kvm,
>  	bit = get_ind_bit(adapter_int->ind_addr,
>  			  adapter_int->ind_offset, adapter->swap);
>  	set_bit(bit, map);
> -	mark_page_dirty(kvm, adapter_int->ind_gaddr >> PAGE_SHIFT);
> +	mark_page_dirty(kvm, gpa_to_gfn(adapter_int->ind_gaddr));
>  	set_page_dirty_lock(ind_page);
>  	map = page_address(summary_page);
>  	bit = get_ind_bit(adapter_int->summary_addr,
>  			  adapter_int->summary_offset, adapter->swap);
>  	summary_set = test_and_set_bit(bit, map);
> -	mark_page_dirty(kvm, adapter_int->summary_gaddr >> PAGE_SHIFT);
> +	mark_page_dirty(kvm, gpa_to_gfn(adapter_int->summary_gaddr));
>  	set_page_dirty_lock(summary_page);
>  	srcu_read_unlock(&kvm->srcu, idx);
>  
> diff --git a/arch/s390/kvm/priv.c b/arch/s390/kvm/priv.c
> index a90fc0b4fd96..780186eb6037 100644
> --- a/arch/s390/kvm/priv.c
> +++ b/arch/s390/kvm/priv.c
> @@ -1151,7 +1151,7 @@ static inline int __do_essa(struct kvm_vcpu *vcpu, const int orc)
>  	 */
>  
>  	kvm_s390_get_regs_rre(vcpu, &r1, &r2);
> -	gfn = vcpu->run->s.regs.gprs[r2] >> PAGE_SHIFT;
> +	gfn = gpa_to_gfn(vcpu->run->s.regs.gprs[r2]);
>  	entries = (vcpu->arch.sie_block->cbrlo & ~PAGE_MASK) >> 3;
>  
>  	nappended = dat_perform_essa(vcpu->arch.gmap->asce, gfn, orc, &state, &dirtied);