df57721f9a
Convert IBT selftest to asm to fix objtool warning -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEV76QKkVc4xCGURexaDWVMHDJkrAFAmTv1QQACgkQaDWVMHDJ krAUwhAAn6TOwHJK8BSkHeiQhON1nrlP3c5cv0AyZ2NP8RYDrZrSZvhpYBJ6wgKC Cx5CGq5nn9twYsYS3KsktLKDfR3lRdsQ7K9qtyFtYiaeaVKo+7gEKl/K+klwai8/ gninQWHk0zmSCja8Vi77q52WOMkQKapT8+vaON9EVDO8dVEi+CvhAIfPwMafuiwO Rk4X86SzoZu9FP79LcCg9XyGC/XbM2OG9eNUTSCKT40qTTKm5y4gix687NvAlaHR ko5MTsdl0Wfp6Qk0ohT74LnoA2c1g/FluvZIM33ci/2rFpkf9Hw7ip3lUXqn6CPx rKiZ+pVRc0xikVWkraMfIGMJfUd2rhelp8OyoozD7DB7UZw40Q4RW4N5tgq9Fhe9 MQs3p1v9N8xHdRKl365UcOczUxNAmv4u0nV5gY/4FMC6VjldCl2V9fmqYXyzFS4/ Ogg4FSd7c2JyGFKPs+5uXyi+RY2qOX4+nzHOoKD7SY616IYqtgKoz5usxETLwZ6s VtJOmJL0h//z0A7tBliB0zd+SQ5UQQBDC2XouQH2fNX2isJMn0UDmWJGjaHgK6Hh 8jVp6LNqf+CEQS387UxckOyj7fu438hDky1Ggaw4YqowEOhQeqLVO4++x+HITrbp AupXfbJw9h9cMN63Yc0gVxXQ9IMZ+M7UxLtZ3Cd8/PVztNy/clA= =3UUm -----END PGP SIGNATURE----- Merge tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip Pull x86 shadow stack support from Dave Hansen: "This is the long awaited x86 shadow stack support, part of Intel's Control-flow Enforcement Technology (CET). CET consists of two related security features: shadow stacks and indirect branch tracking. This series implements just the shadow stack part of this feature, and just for userspace. The main use case for shadow stack is providing protection against return oriented programming attacks. It works by maintaining a secondary (shadow) stack using a special memory type that has protections against modification. When executing a CALL instruction, the processor pushes the return address to both the normal stack and to the special permission shadow stack. Upon RET, the processor pops the shadow stack copy and compares it to the normal stack copy. For more information, refer to the links below for the earlier versions of this patch set" Link: https://lore.kernel.org/lkml/20220130211838.8382-1-rick.p.edgecombe@intel.com/ Link: https://lore.kernel.org/lkml/20230613001108.3040476-1-rick.p.edgecombe@intel.com/ * tag 'x86_shstk_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (47 commits) x86/shstk: Change order of __user in type x86/ibt: Convert IBT selftest to asm x86/shstk: Don't retry vm_munmap() on -EINTR x86/kbuild: Fix Documentation/ reference x86/shstk: Move arch detail comment out of core mm x86/shstk: Add ARCH_SHSTK_STATUS x86/shstk: Add ARCH_SHSTK_UNLOCK x86: Add PTRACE interface for shadow stack selftests/x86: Add shadow stack test x86/cpufeatures: Enable CET CR4 bit for shadow stack x86/shstk: Wire in shadow stack interface x86: Expose thread features in /proc/$PID/status x86/shstk: Support WRSS for userspace x86/shstk: Introduce map_shadow_stack syscall x86/shstk: Check that signal frame is shadow stack mem x86/shstk: Check that SSP is aligned on sigreturn x86/shstk: Handle signals for shadow stack x86/shstk: Introduce routines modifying shstk x86/shstk: Handle thread shadow stack x86/shstk: Add user-mode shadow stack support ...
302 lines
7.2 KiB
C
302 lines
7.2 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
#ifndef _MCF_PGTABLE_H
|
|
#define _MCF_PGTABLE_H
|
|
|
|
#include <asm/mcfmmu.h>
|
|
#include <asm/page.h>
|
|
|
|
/*
|
|
* MMUDR bits, in proper place. We write these directly into the MMUDR
|
|
* after masking from the pte.
|
|
*/
|
|
#define CF_PAGE_LOCKED MMUDR_LK /* 0x00000002 */
|
|
#define CF_PAGE_EXEC MMUDR_X /* 0x00000004 */
|
|
#define CF_PAGE_WRITABLE MMUDR_W /* 0x00000008 */
|
|
#define CF_PAGE_READABLE MMUDR_R /* 0x00000010 */
|
|
#define CF_PAGE_SYSTEM MMUDR_SP /* 0x00000020 */
|
|
#define CF_PAGE_COPYBACK MMUDR_CM_CCB /* 0x00000040 */
|
|
#define CF_PAGE_NOCACHE MMUDR_CM_NCP /* 0x00000080 */
|
|
|
|
#define CF_CACHEMASK (~MMUDR_CM_CCB)
|
|
#define CF_PAGE_MMUDR_MASK 0x000000fe
|
|
|
|
#define _PAGE_NOCACHE030 CF_PAGE_NOCACHE
|
|
|
|
/*
|
|
* MMUTR bits, need shifting down.
|
|
*/
|
|
#define CF_PAGE_MMUTR_MASK 0x00000c00
|
|
#define CF_PAGE_MMUTR_SHIFT 10
|
|
|
|
#define CF_PAGE_VALID (MMUTR_V << CF_PAGE_MMUTR_SHIFT)
|
|
#define CF_PAGE_SHARED (MMUTR_SG << CF_PAGE_MMUTR_SHIFT)
|
|
|
|
/*
|
|
* Fake bits, not implemented in CF, will get masked out before
|
|
* hitting hardware.
|
|
*/
|
|
#define CF_PAGE_DIRTY 0x00000001
|
|
#define CF_PAGE_ACCESSED 0x00001000
|
|
|
|
#define _PAGE_CACHE040 0x020 /* 68040 cache mode, cachable, copyback */
|
|
#define _PAGE_NOCACHE_S 0x040 /* 68040 no-cache mode, serialized */
|
|
#define _PAGE_NOCACHE 0x060 /* 68040 cache mode, non-serialized */
|
|
#define _PAGE_CACHE040W 0x000 /* 68040 cache mode, cachable, write-through */
|
|
#define _DESCTYPE_MASK 0x003
|
|
#define _CACHEMASK040 (~0x060)
|
|
#define _PAGE_GLOBAL040 0x400 /* 68040 global bit, used for kva descs */
|
|
|
|
/* We borrow bit 7 to store the exclusive marker in swap PTEs. */
|
|
#define _PAGE_SWP_EXCLUSIVE CF_PAGE_NOCACHE
|
|
|
|
/*
|
|
* Externally used page protection values.
|
|
*/
|
|
#define _PAGE_PRESENT (CF_PAGE_VALID)
|
|
#define _PAGE_ACCESSED (CF_PAGE_ACCESSED)
|
|
#define _PAGE_DIRTY (CF_PAGE_DIRTY)
|
|
#define _PAGE_READWRITE (CF_PAGE_READABLE \
|
|
| CF_PAGE_WRITABLE \
|
|
| CF_PAGE_SYSTEM \
|
|
| CF_PAGE_SHARED)
|
|
|
|
/*
|
|
* Compound page protection values.
|
|
*/
|
|
#define PAGE_NONE __pgprot(CF_PAGE_VALID \
|
|
| CF_PAGE_ACCESSED)
|
|
|
|
#define PAGE_SHARED __pgprot(CF_PAGE_VALID \
|
|
| CF_PAGE_ACCESSED \
|
|
| CF_PAGE_SHARED)
|
|
|
|
#define PAGE_INIT __pgprot(CF_PAGE_VALID \
|
|
| CF_PAGE_READABLE \
|
|
| CF_PAGE_WRITABLE \
|
|
| CF_PAGE_EXEC \
|
|
| CF_PAGE_SYSTEM)
|
|
|
|
#define PAGE_KERNEL __pgprot(CF_PAGE_VALID \
|
|
| CF_PAGE_ACCESSED \
|
|
| CF_PAGE_READABLE \
|
|
| CF_PAGE_WRITABLE \
|
|
| CF_PAGE_EXEC \
|
|
| CF_PAGE_SYSTEM \
|
|
| CF_PAGE_SHARED)
|
|
|
|
#define PAGE_COPY __pgprot(CF_PAGE_VALID \
|
|
| CF_PAGE_ACCESSED \
|
|
| CF_PAGE_READABLE \
|
|
| CF_PAGE_DIRTY)
|
|
|
|
#define PTE_MASK PAGE_MASK
|
|
#define CF_PAGE_CHG_MASK (PTE_MASK | CF_PAGE_ACCESSED | CF_PAGE_DIRTY)
|
|
|
|
#ifndef __ASSEMBLY__
|
|
|
|
#define pmd_pgtable(pmd) pfn_to_virt(pmd_val(pmd) >> PAGE_SHIFT)
|
|
|
|
/*
|
|
* Conversion functions: convert a page and protection to a page entry,
|
|
* and a page entry and page directory to the page they refer to.
|
|
*/
|
|
#define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot))
|
|
|
|
static inline pte_t pte_modify(pte_t pte, pgprot_t newprot)
|
|
{
|
|
pte_val(pte) = (pte_val(pte) & CF_PAGE_CHG_MASK) | pgprot_val(newprot);
|
|
return pte;
|
|
}
|
|
|
|
#define pmd_set(pmdp, ptep) do {} while (0)
|
|
|
|
static inline void pgd_set(pgd_t *pgdp, pmd_t *pmdp)
|
|
{
|
|
pgd_val(*pgdp) = virt_to_phys(pmdp);
|
|
}
|
|
|
|
#define __pte_page(pte) ((void *) (pte_val(pte) & PAGE_MASK))
|
|
#define pmd_page_vaddr(pmd) ((unsigned long) (pmd_val(pmd)))
|
|
|
|
static inline int pte_none(pte_t pte)
|
|
{
|
|
return !pte_val(pte);
|
|
}
|
|
|
|
static inline int pte_present(pte_t pte)
|
|
{
|
|
return pte_val(pte) & CF_PAGE_VALID;
|
|
}
|
|
|
|
static inline void pte_clear(struct mm_struct *mm, unsigned long addr,
|
|
pte_t *ptep)
|
|
{
|
|
pte_val(*ptep) = 0;
|
|
}
|
|
|
|
#define pte_page(pte) virt_to_page(__pte_page(pte))
|
|
|
|
static inline int pmd_none2(pmd_t *pmd) { return !pmd_val(*pmd); }
|
|
#define pmd_none(pmd) pmd_none2(&(pmd))
|
|
static inline int pmd_bad2(pmd_t *pmd) { return 0; }
|
|
#define pmd_bad(pmd) pmd_bad2(&(pmd))
|
|
#define pmd_present(pmd) (!pmd_none2(&(pmd)))
|
|
static inline void pmd_clear(pmd_t *pmdp) { pmd_val(*pmdp) = 0; }
|
|
|
|
#define pte_ERROR(e) \
|
|
printk(KERN_ERR "%s:%d: bad pte %08lx.\n", \
|
|
__FILE__, __LINE__, pte_val(e))
|
|
#define pgd_ERROR(e) \
|
|
printk(KERN_ERR "%s:%d: bad pgd %08lx.\n", \
|
|
__FILE__, __LINE__, pgd_val(e))
|
|
|
|
/*
|
|
* The following only work if pte_present() is true.
|
|
* Undefined behaviour if not...
|
|
* [we have the full set here even if they don't change from m68k]
|
|
*/
|
|
static inline int pte_read(pte_t pte)
|
|
{
|
|
return pte_val(pte) & CF_PAGE_READABLE;
|
|
}
|
|
|
|
static inline int pte_write(pte_t pte)
|
|
{
|
|
return pte_val(pte) & CF_PAGE_WRITABLE;
|
|
}
|
|
|
|
static inline int pte_exec(pte_t pte)
|
|
{
|
|
return pte_val(pte) & CF_PAGE_EXEC;
|
|
}
|
|
|
|
static inline int pte_dirty(pte_t pte)
|
|
{
|
|
return pte_val(pte) & CF_PAGE_DIRTY;
|
|
}
|
|
|
|
static inline int pte_young(pte_t pte)
|
|
{
|
|
return pte_val(pte) & CF_PAGE_ACCESSED;
|
|
}
|
|
|
|
static inline pte_t pte_wrprotect(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~CF_PAGE_WRITABLE;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_rdprotect(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~CF_PAGE_READABLE;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_exprotect(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~CF_PAGE_EXEC;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkclean(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~CF_PAGE_DIRTY;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkold(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~CF_PAGE_ACCESSED;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkwrite_novma(pte_t pte)
|
|
{
|
|
pte_val(pte) |= CF_PAGE_WRITABLE;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkread(pte_t pte)
|
|
{
|
|
pte_val(pte) |= CF_PAGE_READABLE;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkexec(pte_t pte)
|
|
{
|
|
pte_val(pte) |= CF_PAGE_EXEC;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkdirty(pte_t pte)
|
|
{
|
|
pte_val(pte) |= CF_PAGE_DIRTY;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkyoung(pte_t pte)
|
|
{
|
|
pte_val(pte) |= CF_PAGE_ACCESSED;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mknocache(pte_t pte)
|
|
{
|
|
pte_val(pte) |= 0x80 | (pte_val(pte) & ~0x40);
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_mkcache(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~CF_PAGE_NOCACHE;
|
|
return pte;
|
|
}
|
|
|
|
#define swapper_pg_dir kernel_pg_dir
|
|
extern pgd_t kernel_pg_dir[PTRS_PER_PGD];
|
|
|
|
/*
|
|
* Encode/decode swap entries and swap PTEs. Swap PTEs are all PTEs that
|
|
* are !pte_none() && !pte_present().
|
|
*
|
|
* Format of swap PTEs:
|
|
*
|
|
* 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1
|
|
* 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0
|
|
* <------------------ offset -------------> 0 0 0 E <-- type --->
|
|
*
|
|
* E is the exclusive marker that is not stored in swap entries.
|
|
*/
|
|
#define __swp_type(x) ((x).val & 0x7f)
|
|
#define __swp_offset(x) ((x).val >> 11)
|
|
#define __swp_entry(typ, off) ((swp_entry_t) { ((typ) & 0x7f) | \
|
|
(off << 11) })
|
|
#define __pte_to_swp_entry(pte) ((swp_entry_t) { pte_val(pte) })
|
|
#define __swp_entry_to_pte(x) (__pte((x).val))
|
|
|
|
static inline int pte_swp_exclusive(pte_t pte)
|
|
{
|
|
return pte_val(pte) & _PAGE_SWP_EXCLUSIVE;
|
|
}
|
|
|
|
static inline pte_t pte_swp_mkexclusive(pte_t pte)
|
|
{
|
|
pte_val(pte) |= _PAGE_SWP_EXCLUSIVE;
|
|
return pte;
|
|
}
|
|
|
|
static inline pte_t pte_swp_clear_exclusive(pte_t pte)
|
|
{
|
|
pte_val(pte) &= ~_PAGE_SWP_EXCLUSIVE;
|
|
return pte;
|
|
}
|
|
|
|
#define PFN_PTE_SHIFT PAGE_SHIFT
|
|
#define pmd_pfn(pmd) (pmd_val(pmd) >> PAGE_SHIFT)
|
|
#define pmd_page(pmd) (pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT))
|
|
|
|
#define pfn_pte(pfn, prot) __pte(((pfn) << PAGE_SHIFT) | pgprot_val(prot))
|
|
#define pte_pfn(pte) (pte_val(pte) >> PAGE_SHIFT)
|
|
|
|
#endif /* !__ASSEMBLY__ */
|
|
#endif /* _MCF_PGTABLE_H */
|