Page MenuHomeFreeBSD

D55956.1795368684.diff
No OneTemporary

Authored By
Unknown
Size
5 KB
Referenced Files
None
Subscribers
None

D55956.1795368684.diff

diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -5511,12 +5511,19 @@
pv_entry_t pv;
vm_paddr_t opa, pa;
vm_page_t mpte, om;
+ vm_memattr_t memattr;
bool nosleep;
int full_lvl, lvl, rv;
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
+ memattr = m->md.pv_memattr;
+ if ((prot & PROT_MTE) != 0) {
+ MPASS(memattr == VM_MEMATTR_DEFAULT);
+ memattr = VM_MEMATTR_TAGGED;
+ }
+
va = trunc_page(va);
if ((m->oflags & VPO_UNMANAGED) == 0)
VM_PAGE_OBJECT_BUSY_ASSERT(m);
@@ -5525,7 +5532,7 @@
pa |= prot_ns_shared_pa;
new_l3 = (pt_entry_t)(PHYS_TO_PTE(pa) | ATTR_AF | pmap_sh_attr |
L3_PAGE);
- new_l3 |= pmap_pte_memattr(pmap, m->md.pv_memattr);
+ new_l3 |= pmap_pte_memattr(pmap, memattr);
new_l3 |= pmap_pte_prot(pmap, prot);
if ((flags & PMAP_ENTER_WIRED) != 0)
new_l3 |= ATTR_SW_WIRED;
@@ -5867,14 +5874,21 @@
struct rwlock **lockp)
{
pd_entry_t new_l2;
+ vm_memattr_t memattr;
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
PMAP_ASSERT_STAGE1(pmap);
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
+ memattr = m->md.pv_memattr;
+ if ((prot & PROT_MTE) != 0) {
+ MPASS(memattr == VM_MEMATTR_DEFAULT);
+ memattr = VM_MEMATTR_TAGGED;
+ }
+
new_l2 = (pd_entry_t)(VM_PAGE_TO_PTE(m) | pmap_sh_attr |
- ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
+ ATTR_S1_IDX(memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
L2_BLOCK);
if ((m->oflags & VPO_UNMANAGED) == 0)
new_l2 |= ATTR_SW_MANAGED;
@@ -6133,14 +6147,21 @@
vm_prot_t prot, struct rwlock **lockp)
{
pt_entry_t l3e;
+ vm_memattr_t memattr;
PMAP_LOCK_ASSERT(pmap, MA_OWNED);
PMAP_ASSERT_STAGE1(pmap);
KASSERT(ADDR_IS_CANONICAL(va),
("%s: Address not in canonical form: %lx", __func__, va));
+ memattr = m->md.pv_memattr;
+ if ((prot & PROT_MTE) != 0) {
+ MPASS(memattr == VM_MEMATTR_DEFAULT);
+ memattr = VM_MEMATTR_TAGGED;
+ }
+
l3e = VM_PAGE_TO_PTE(m) | pmap_sh_attr |
- ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
+ ATTR_S1_IDX(memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) |
ATTR_CONTIGUOUS | L3_PAGE;
if ((m->oflags & VPO_UNMANAGED) == 0)
l3e |= ATTR_SW_MANAGED;
@@ -6447,6 +6468,7 @@
{
pt_entry_t *l1, *l2, *l3, l3_val;
vm_paddr_t pa;
+ vm_memattr_t memattr;
int full_lvl, lvl;
KASSERT(!VA_IS_CLEANMAP(va) ||
@@ -6542,9 +6564,15 @@
*/
pmap_resident_count_inc(pmap, 1);
+ memattr = m->md.pv_memattr;
+ if ((prot & PROT_MTE) != 0) {
+ MPASS(memattr == VM_MEMATTR_DEFAULT);
+ memattr = VM_MEMATTR_TAGGED;
+ }
+
pa = VM_PAGE_TO_PHYS(m);
l3_val = PHYS_TO_PTE(pa) | pmap_sh_attr |
- ATTR_S1_IDX(m->md.pv_memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) | L3_PAGE;
+ ATTR_S1_IDX(memattr) | ATTR_S1_AP(ATTR_S1_AP_RO) | L3_PAGE;
l3_val |= pmap_pte_bti(pmap, va);
if ((prot & VM_PROT_EXECUTE) == 0 ||
m->md.pv_memattr == VM_MEMATTR_DEVICE)
diff --git a/sys/sys/mman.h b/sys/sys/mman.h
--- a/sys/sys/mman.h
+++ b/sys/sys/mman.h
@@ -55,7 +55,8 @@
#if __BSD_VISIBLE
#define PROT_CHERI0 0x08
#define PROT_CHERI1 0x10
-#define _PROT_ALL (PROT_READ | PROT_WRITE | PROT_EXEC)
+#define PROT_MTE 0x20
+#define _PROT_ALL (PROT_READ | PROT_WRITE | PROT_EXEC | PROT_MTE)
#define PROT_EXTRACT(prot) ((prot) & _PROT_ALL)
#define _PROT_MAX_SHIFT 16
diff --git a/sys/vm/vm.h b/sys/vm/vm.h
--- a/sys/vm/vm.h
+++ b/sys/vm/vm.h
@@ -78,10 +78,11 @@
#define VM_PROT_FAULT_LOOKUP VM_PROT_PRIV_FLAG
#define VM_PROT_NO_PROMOTE VM_PROT_PRIV_FLAG
#define VM_PROT_QUICK_NOFAULT VM_PROT_PRIV_FLAG /* same to save bits */
+#define VM_PROT_MTE ((vm_prot_t) 0x20)
-#define VM_PROT_ALL (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE)
+#define VM_PROT_ALL (VM_PROT_READ|VM_PROT_WRITE|VM_PROT_EXECUTE|VM_PROT_MTE)
#define VM_PROT_RW (VM_PROT_READ|VM_PROT_WRITE)
-#define VM_PROT_DEFAULT VM_PROT_ALL
+#define VM_PROT_DEFAULT (VM_PROT_ALL & ~VM_PROT_MTE)
enum obj_type {
OBJT_RESERVED = 0, /* was OBJT_DEFAULT */
diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c
--- a/sys/vm/vm_map.c
+++ b/sys/vm/vm_map.c
@@ -2879,6 +2879,15 @@
check_prot |= new_maxprot;
for (entry = first_entry; entry->start < end;
entry = vm_map_entry_succ(entry)) {
+#if defined(__aarch64__)
+ /* The PROT_MTE protection can't change */
+ if ((flags & VM_MAP_PROTECT_SET_PROT) != 0 &&
+ CONTAINS_BITS(new_prot, PROT_MTE) !=
+ CONTAINS_BITS(entry->protection, PROT_MTE)) {
+ vm_map_unlock(map);
+ return (KERN_PROTECTION_FAILURE);
+ }
+#endif
if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) {
vm_map_unlock(map);
return (KERN_INVALID_ARGUMENT);
diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c
--- a/sys/vm/vm_mmap.c
+++ b/sys/vm/vm_mmap.c
@@ -280,6 +280,12 @@
MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0)) {
return (EXTERROR(EINVAL, "GUARD with wrong parameters"));
}
+#if defined(__aarch64__)
+ /* No support for MTE tags in files so MAP_ANON must be set */
+ if (((prot & PROT_MTE) != 0 || (max_prot & PROT_MTE) == 0) &&
+ (flags & MAP_ANON) == 0)
+ return (EXTERROR(EINVAL, "PROT_MTE needs MAP_ANON"));
+#endif
/*
* Align the file position to a page boundary,

File Metadata

Mime Type
text/plain
Expires
Sun, Nov 22, 5:31 PM (2 h, 56 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41912354
Default Alt Text
D55956.1795368684.diff (5 KB)

Event Timeline