20794545c1
This reverts commit e5b8d9218951e59df986f627ec93569a0d22149b. Pages mapped in user-space with PROT_MTE have the allocation tags either zeroed or copied/restored to some user values. In order for the kernel to access such pages via page_address(), resetting the tag in page->flags was necessary. This tag resetting was deferred to set_pte_at() -> mte_sync_page_tags() but it can race with another CPU reading the flags (via page_to_virt()): P0 (mte_sync_page_tags): P1 (memcpy from virt_to_page): Rflags!=0xff Wflags=0xff DMB (doesn't help) Wtags=0 Rtags=0 // fault Since now the post_alloc_hook() function resets the page->flags tag when unpoisoning is skipped for user pages (including the __GFP_ZEROTAGS case), revert the arm64 commit calling page_kasan_tag_reset(). Signed-off-by: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will@kernel.org> Cc: Vincenzo Frascino <vincenzo.frascino@arm.com> Cc: Andrey Konovalov <andreyknvl@gmail.com> Cc: Peter Collingbourne <pcc@google.com> Reviewed-by: Vincenzo Frascino <vincenzo.frascino@arm.com> Acked-by: Andrey Konovalov <andreyknvl@gmail.com> Link: https://lore.kernel.org/r/20220610152141.2148929-5-catalin.marinas@arm.com Signed-off-by: Will Deacon <will@kernel.org>
84 lines
1.8 KiB
C
84 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0-only
|
|
|
|
#include <linux/pagemap.h>
|
|
#include <linux/xarray.h>
|
|
#include <linux/slab.h>
|
|
#include <linux/swap.h>
|
|
#include <linux/swapops.h>
|
|
#include <asm/mte.h>
|
|
|
|
static DEFINE_XARRAY(mte_pages);
|
|
|
|
void *mte_allocate_tag_storage(void)
|
|
{
|
|
/* tags granule is 16 bytes, 2 tags stored per byte */
|
|
return kmalloc(MTE_PAGE_TAG_STORAGE, GFP_KERNEL);
|
|
}
|
|
|
|
void mte_free_tag_storage(char *storage)
|
|
{
|
|
kfree(storage);
|
|
}
|
|
|
|
int mte_save_tags(struct page *page)
|
|
{
|
|
void *tag_storage, *ret;
|
|
|
|
if (!test_bit(PG_mte_tagged, &page->flags))
|
|
return 0;
|
|
|
|
tag_storage = mte_allocate_tag_storage();
|
|
if (!tag_storage)
|
|
return -ENOMEM;
|
|
|
|
mte_save_page_tags(page_address(page), tag_storage);
|
|
|
|
/* page_private contains the swap entry.val set in do_swap_page */
|
|
ret = xa_store(&mte_pages, page_private(page), tag_storage, GFP_KERNEL);
|
|
if (WARN(xa_is_err(ret), "Failed to store MTE tags")) {
|
|
mte_free_tag_storage(tag_storage);
|
|
return xa_err(ret);
|
|
} else if (ret) {
|
|
/* Entry is being replaced, free the old entry */
|
|
mte_free_tag_storage(ret);
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
bool mte_restore_tags(swp_entry_t entry, struct page *page)
|
|
{
|
|
void *tags = xa_load(&mte_pages, entry.val);
|
|
|
|
if (!tags)
|
|
return false;
|
|
|
|
mte_restore_page_tags(page_address(page), tags);
|
|
|
|
return true;
|
|
}
|
|
|
|
void mte_invalidate_tags(int type, pgoff_t offset)
|
|
{
|
|
swp_entry_t entry = swp_entry(type, offset);
|
|
void *tags = xa_erase(&mte_pages, entry.val);
|
|
|
|
mte_free_tag_storage(tags);
|
|
}
|
|
|
|
void mte_invalidate_tags_area(int type)
|
|
{
|
|
swp_entry_t entry = swp_entry(type, 0);
|
|
swp_entry_t last_entry = swp_entry(type + 1, 0);
|
|
void *tags;
|
|
|
|
XA_STATE(xa_state, &mte_pages, entry.val);
|
|
|
|
xa_lock(&mte_pages);
|
|
xas_for_each(&xa_state, tags, last_entry.val - 1) {
|
|
__xa_erase(&mte_pages, xa_state.xa_index);
|
|
mte_free_tag_storage(tags);
|
|
}
|
|
xa_unlock(&mte_pages);
|
|
}
|