On Wed, Feb 07, 2018 at 12:27:53PM +1100, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the kvm tree got a conflict in:
>
> arch/arm64/include/asm/pgtable-prot.h
>
> between commit:
>
> 41acec624087 ("arm64: kpti: Make use of nG dependent on
> arm64_kernel_unmapped_at_el0()")
>
> from the arm64 tree and commit:
>
> d0e22b4ac3ba ("KVM: arm/arm64: Limit icache invalidation to prefetch
> aborts")
>
> from the kvm tree.
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc arch/arm64/include/asm/pgtable-prot.h
> index 2db84df5eb42,4e12dabd342b..000000000000
> --- a/arch/arm64/include/asm/pgtable-prot.h
> +++ b/arch/arm64/include/asm/pgtable-prot.h
> @@@ -53,24 -47,23 +53,24 @@@
> #define PROT_SECT_NORMAL (PROT_SECT_DEFAULT | PMD_SECT_PXN |
> PMD_SECT_UXN | PMD_ATTRINDX(MT_NORMAL))
> #define PROT_SECT_NORMAL_EXEC (PROT_SECT_DEFAULT | PMD_SECT_UXN |
> PMD_ATTRINDX(MT_NORMAL))
>
> -#define _PAGE_DEFAULT (PROT_DEFAULT | PTE_ATTRINDX(MT_NORMAL))
> +#define _PAGE_DEFAULT (_PROT_DEFAULT |
> PTE_ATTRINDX(MT_NORMAL))
> +#define _HYP_PAGE_DEFAULT _PAGE_DEFAULT
>
> -#define PAGE_KERNEL __pgprot(_PAGE_DEFAULT | PTE_PXN | PTE_UXN |
> PTE_DIRTY | PTE_WRITE)
> -#define PAGE_KERNEL_RO __pgprot(_PAGE_DEFAULT | PTE_PXN |
> PTE_UXN | PTE_DIRTY | PTE_RDONLY)
> -#define PAGE_KERNEL_ROX __pgprot(_PAGE_DEFAULT | PTE_UXN |
> PTE_DIRTY | PTE_RDONLY)
> -#define PAGE_KERNEL_EXEC __pgprot(_PAGE_DEFAULT | PTE_UXN | PTE_DIRTY |
> PTE_WRITE)
> -#define PAGE_KERNEL_EXEC_CONT __pgprot(_PAGE_DEFAULT | PTE_UXN |
> PTE_DIRTY | PTE_WRITE | PTE_CONT)
> +#define PAGE_KERNEL __pgprot(PROT_NORMAL)
> +#define PAGE_KERNEL_RO __pgprot((PROT_NORMAL & ~PTE_WRITE) |
> PTE_RDONLY)
> +#define PAGE_KERNEL_ROX __pgprot((PROT_NORMAL & ~(PTE_WRITE |
> PTE_PXN)) | PTE_RDONLY)
> +#define PAGE_KERNEL_EXEC __pgprot(PROT_NORMAL & ~PTE_PXN)
> +#define PAGE_KERNEL_EXEC_CONT __pgprot((PROT_NORMAL & ~PTE_PXN) |
> PTE_CONT)
>
> -#define PAGE_HYP __pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_HYP_XN)
> -#define PAGE_HYP_EXEC __pgprot(_PAGE_DEFAULT | PTE_HYP |
> PTE_RDONLY)
> -#define PAGE_HYP_RO __pgprot(_PAGE_DEFAULT | PTE_HYP | PTE_RDONLY |
> PTE_HYP_XN)
> +#define PAGE_HYP __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP |
> PTE_HYP_XN)
> +#define PAGE_HYP_EXEC __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP |
> PTE_RDONLY)
> +#define PAGE_HYP_RO __pgprot(_HYP_PAGE_DEFAULT | PTE_HYP |
> PTE_RDONLY | PTE_HYP_XN)
> #define PAGE_HYP_DEVICE __pgprot(PROT_DEVICE_nGnRE | PTE_HYP)
>
> - #define PAGE_S2 __pgprot(_PROT_DEFAULT |
> PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY)
> - #define PAGE_S2_DEVICE __pgprot(_PROT_DEFAULT |
> PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_UXN)
> -#define PAGE_S2 __pgprot(PROT_DEFAULT |
> PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY | PTE_S2_XN)
> -#define PAGE_S2_DEVICE __pgprot(PROT_DEFAULT |
> PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_S2_XN)
> ++#define PAGE_S2 __pgprot(_PROT_DEFAULT |
> PTE_S2_MEMATTR(MT_S2_NORMAL) | PTE_S2_RDONLY | PTE_S2_XN)
> ++#define PAGE_S2_DEVICE __pgprot(_PROT_DEFAULT |
> PTE_S2_MEMATTR(MT_S2_DEVICE_nGnRE) | PTE_S2_RDONLY | PTE_S2_XN)
>
> -#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) |
> PTE_PROT_NONE | PTE_RDONLY | PTE_PXN | PTE_UXN)
> +#define PAGE_NONE __pgprot(((_PAGE_DEFAULT) & ~PTE_VALID) |
> PTE_PROT_NONE | PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN)
> #define PAGE_SHARED __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG |
> PTE_PXN | PTE_UXN | PTE_WRITE)
> #define PAGE_SHARED_EXEC __pgprot(_PAGE_DEFAULT | PTE_USER | PTE_NG |
> PTE_PXN | PTE_WRITE)
> #define PAGE_READONLY __pgprot(_PAGE_DEFAULT | PTE_USER |
> PTE_RDONLY | PTE_NG | PTE_PXN | PTE_UXN)
This looks correct to me.
Thanks,
-Christoffer
