Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f1a55ce0 authored by Rui Teng's avatar Rui Teng Committed by Michael Ellerman
Browse files

powerpc: Clean up tm_abort duplication in hash_utils_64.c 



The same logic appears twice and should probably be pulled out into a
function.

Suggested-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Signed-off-by: default avatarRui Teng <rui.teng@linux.vnet.ibm.com>
[mpe: Rename to tm_flush_hash_page() and move comment into the function]
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 6060e9ea

arch/powerpc/mm/hash_utils_64.c

+25 −31
Original line number Diff line number Diff line
@@ -1485,6 +1485,29 @@ void hash_preload(struct mm_struct *mm, unsigned long ea, 
	local_irq_restore(flags);

}



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

static inline void tm_flush_hash_page(int local)

{

	/*

	 * Transactions are not aborted by tlbiel, only tlbie. Without, syncing a

	 * page back to a block device w/PIO could pick up transactional data

	 * (bad!) so we force an abort here. Before the sync the page will be

	 * made read-only, which will flush_hash_page. BIG ISSUE here: if the

	 * kernel uses a page from userspace without unmapping it first, it may

	 * see the speculated version.

	 */

	if (local && cpu_has_feature(CPU_FTR_TM) && current->thread.regs &&

	    MSR_TM_ACTIVE(current->thread.regs->msr)) {

		tm_enable();

		tm_abort(TM_CAUSE_TLBI);

	}

}

#else

static inline void tm_flush_hash_page(int local)

{

}

#endif



/* WARNING: This is called from hash_low_64.S, if you change this prototype,

 *          do not forget to update the assembly call site !

 */
@@ -1511,21 +1534,7 @@ void flush_hash_page(unsigned long vpn, real_pte_t pte, int psize, int ssize, 
					     ssize, local);

	} pte_iterate_hashed_end();



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Transactions are not aborted by tlbiel, only tlbie.

	 * Without, syncing a page back to a block device w/ PIO could pick up

	 * transactional data (bad!) so we force an abort here.  Before the

	 * sync the page will be made read-only, which will flush_hash_page.

	 * BIG ISSUE here: if the kernel uses a page from userspace without

	 * unmapping it first, it may see the speculated version.

	 */

	if (local && cpu_has_feature(CPU_FTR_TM) &&

	    current->thread.regs &&

	    MSR_TM_ACTIVE(current->thread.regs->msr)) {

		tm_enable();

		tm_abort(TM_CAUSE_TLBI);

	}

#endif

	tm_flush_hash_page(local);

}



#ifdef CONFIG_TRANSPARENT_HUGEPAGE
@@ -1582,22 +1591,7 @@ void flush_hash_hugepage(unsigned long vsid, unsigned long addr, 
					     MMU_PAGE_16M, ssize, local);

	}

tm_abort:

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Transactions are not aborted by tlbiel, only tlbie.

	 * Without, syncing a page back to a block device w/ PIO could pick up

	 * transactional data (bad!) so we force an abort here.  Before the

	 * sync the page will be made read-only, which will flush_hash_page.

	 * BIG ISSUE here: if the kernel uses a page from userspace without

	 * unmapping it first, it may see the speculated version.

	 */

	if (local && cpu_has_feature(CPU_FTR_TM) &&

	    current->thread.regs &&

	    MSR_TM_ACTIVE(current->thread.regs->msr)) {

		tm_enable();

		tm_abort(TM_CAUSE_TLBI);

	}

#endif

	return;

	tm_flush_hash_page(local);

}

#endif /* CONFIG_TRANSPARENT_HUGEPAGE */