f4b0b5a0f3
commit f222ab83df92acf72691a2021e1f0d99880dcdf1 upstream. set_memory_attr() was implemented by commit4d1755b6a7("powerpc/mm: implement set_memory_attr()") because the set_memory_xx() couldn't be used at that time to modify memory "on the fly" as explained it the commit. But set_memory_attr() uses set_pte_at() which leads to warnings when CONFIG_DEBUG_VM is selected, because set_pte_at() is unexpected for updating existing page table entries. The check could be bypassed by using __set_pte_at() instead, as it was the case before commitc988cfd38e("powerpc/32: use set_memory_attr()") but since commit9f7853d760("powerpc/mm: Fix set_memory_*() against concurrent accesses") it is now possible to use set_memory_xx() functions to update page table entries "on the fly" because the update is now atomic. For DEBUG_PAGEALLOC we need to clear and set back _PAGE_PRESENT. Add set_memory_np() and set_memory_p() for that. Replace all uses of set_memory_attr() by the relevant set_memory_xx() and remove set_memory_attr(). Fixes:c988cfd38e("powerpc/32: use set_memory_attr()") Cc: stable@vger.kernel.org Reported-by: Maxime Bizon <mbizon@freebox.fr> Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu> Tested-by: Maxime Bizon <mbizon@freebox.fr> Reviewed-by: Russell Currey <ruscur@russell.cc> Depends-on:9f7853d760("powerpc/mm: Fix set_memory_*() against concurrent accesses") Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/cda2b44b55c96f9ac69fa92e68c01084ec9495c5.1640344012.git.christophe.leroy@csgroup.eu Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
105 lines
2.4 KiB
C
105 lines
2.4 KiB
C
// SPDX-License-Identifier: GPL-2.0
|
|
|
|
/*
|
|
* MMU-generic set_memory implementation for powerpc
|
|
*
|
|
* Copyright 2019-2021, IBM Corporation.
|
|
*/
|
|
|
|
#include <linux/mm.h>
|
|
#include <linux/vmalloc.h>
|
|
#include <linux/set_memory.h>
|
|
|
|
#include <asm/mmu.h>
|
|
#include <asm/page.h>
|
|
#include <asm/pgtable.h>
|
|
|
|
|
|
/*
|
|
* Updates the attributes of a page in three steps:
|
|
*
|
|
* 1. take the page_table_lock
|
|
* 2. install the new entry with the updated attributes
|
|
* 3. flush the TLB
|
|
*
|
|
* This sequence is safe against concurrent updates, and also allows updating the
|
|
* attributes of a page currently being executed or accessed.
|
|
*/
|
|
static int change_page_attr(pte_t *ptep, unsigned long addr, void *data)
|
|
{
|
|
long action = (long)data;
|
|
pte_t pte;
|
|
|
|
spin_lock(&init_mm.page_table_lock);
|
|
|
|
pte = ptep_get(ptep);
|
|
|
|
/* modify the PTE bits as desired, then apply */
|
|
switch (action) {
|
|
case SET_MEMORY_RO:
|
|
pte = pte_wrprotect(pte);
|
|
break;
|
|
case SET_MEMORY_RW:
|
|
pte = pte_mkwrite(pte_mkdirty(pte));
|
|
break;
|
|
case SET_MEMORY_NX:
|
|
pte = pte_exprotect(pte);
|
|
break;
|
|
case SET_MEMORY_X:
|
|
pte = pte_mkexec(pte);
|
|
break;
|
|
case SET_MEMORY_NP:
|
|
pte_update(&init_mm, addr, ptep, _PAGE_PRESENT, 0, 0);
|
|
break;
|
|
case SET_MEMORY_P:
|
|
pte_update(&init_mm, addr, ptep, 0, _PAGE_PRESENT, 0);
|
|
break;
|
|
default:
|
|
WARN_ON_ONCE(1);
|
|
break;
|
|
}
|
|
|
|
pte_update(&init_mm, addr, ptep, ~0UL, pte_val(pte), 0);
|
|
|
|
/* See ptesync comment in radix__set_pte_at() */
|
|
if (radix_enabled())
|
|
asm volatile("ptesync": : :"memory");
|
|
|
|
flush_tlb_kernel_range(addr, addr + PAGE_SIZE);
|
|
|
|
spin_unlock(&init_mm.page_table_lock);
|
|
|
|
return 0;
|
|
}
|
|
|
|
int change_memory_attr(unsigned long addr, int numpages, long action)
|
|
{
|
|
unsigned long start = ALIGN_DOWN(addr, PAGE_SIZE);
|
|
unsigned long size = numpages * PAGE_SIZE;
|
|
|
|
if (!numpages)
|
|
return 0;
|
|
|
|
if (WARN_ON_ONCE(is_vmalloc_or_module_addr((void *)addr) &&
|
|
is_vm_area_hugepages((void *)addr)))
|
|
return -EINVAL;
|
|
|
|
#ifdef CONFIG_PPC_BOOK3S_64
|
|
/*
|
|
* On hash, the linear mapping is not in the Linux page table so
|
|
* apply_to_existing_page_range() will have no effect. If in the future
|
|
* the set_memory_* functions are used on the linear map this will need
|
|
* to be updated.
|
|
*/
|
|
if (!radix_enabled()) {
|
|
int region = get_region_id(addr);
|
|
|
|
if (WARN_ON_ONCE(region != VMALLOC_REGION_ID && region != IO_REGION_ID))
|
|
return -EINVAL;
|
|
}
|
|
#endif
|
|
|
|
return apply_to_existing_page_range(&init_mm, start, size,
|
|
change_page_attr, (void *)action);
|
|
}
|