Re: [PATCH v1 01/24] fixup! KVM: s390: Remove non-atomic dat_crstep_xchg()

Matthew Rosato
2026-03-25T21:30:24Z

On 3/25/26 5:00 PM, Anthony Krowiak wrote:
> From: Claudio Imbrenda <imbrenda@linux.ibm.com>
>
> Signed-off-by: Claudio Imbrenda <imbrenda@linux.ibm.com>

Tony/Claudio, I suspect this was included on accident and will be
handled separately and dropped from this series? I don't even see it
mentioned in the cover letter.

If intentional and intended to be part of this series, then please add a
proper commit message.

> ---
> arch/s390/kvm/gmap.h | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/s390/kvm/gmap.h b/arch/s390/kvm/gmap.h
> index 967a280b3235..19379d162777 100644
> --- a/arch/s390/kvm/gmap.h
> +++ b/arch/s390/kvm/gmap.h
> @@ -198,7 +198,7 @@ static inline bool __must_check _gmap_crstep_xchg_atomic(struct gmap *gmap, unio
> union crste oldcrste, union crste newcrste,
> gfn_t gfn, bool needs_lock)
> {
> - unsigned long align = 8 + (is_pmd(*crstep) ? 0 : 11);
> + unsigned long align = is_pmd(*crstep) ? _PAGE_ENTRIES : _PAGE_ENTRIES * _CRST_ENTRIES;
>
> lockdep_assert_held(&gmap->kvm->mmu_lock);
> if (!needs_lock)