Commit 0d6da872 authored by Christian Borntraeger's avatar Christian Borntraeger Committed by Martin Schwidefsky
Browse files

s390/mm: Fix cmma unused transfer from pgste into pte 



The last pgtable rework silently disabled the CMMA unused state by
setting a local pte variable (a parameter) instead of propagating it
back into the caller. Fix it.

Fixes: ebde765c ("s390/mm: uninline ptep_xxx functions from pgtable.h")
Cc: stable@vger.kernel.org # v4.6+
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Claudio Imbrenda <imbrenda@linux.vnet.ibm.com>
Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 9dce990d

arch/s390/mm/pgtable.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -202,7 +202,7 @@ static inline pgste_t ptep_xchg_start(struct mm_struct *mm, 
	return pgste;

	return pgste;

}

}





static inline void ptep_xchg_commit(struct mm_struct *mm,

static inline pte_t ptep_xchg_commit(struct mm_struct *mm,

				    unsigned long addr, pte_t *ptep,

				    unsigned long addr, pte_t *ptep,

				    pgste_t pgste, pte_t old, pte_t new)

				    pgste_t pgste, pte_t old, pte_t new)

{

{
@@ -220,6 +220,7 @@ static inline void ptep_xchg_commit(struct mm_struct *mm, 
	} else {

	} else {

		*ptep = new;

		*ptep = new;

	}

	}

	return old;

}

}





pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr,

pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr,
@@ -231,7 +232,7 @@ pte_t ptep_xchg_direct(struct mm_struct *mm, unsigned long addr, 
	preempt_disable();

	preempt_disable();

	pgste = ptep_xchg_start(mm, addr, ptep);

	pgste = ptep_xchg_start(mm, addr, ptep);

	old = ptep_flush_direct(mm, addr, ptep);

	old = ptep_flush_direct(mm, addr, ptep);

	ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	old = ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	preempt_enable();

	preempt_enable();

	return old;

	return old;

}

}
@@ -246,7 +247,7 @@ pte_t ptep_xchg_lazy(struct mm_struct *mm, unsigned long addr, 
	preempt_disable();

	preempt_disable();

	pgste = ptep_xchg_start(mm, addr, ptep);

	pgste = ptep_xchg_start(mm, addr, ptep);

	old = ptep_flush_lazy(mm, addr, ptep);

	old = ptep_flush_lazy(mm, addr, ptep);

	ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	old = ptep_xchg_commit(mm, addr, ptep, pgste, old, new);

	preempt_enable();

	preempt_enable();

	return old;

	return old;

}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE