[RFC] arm: Fix cache inconsistency when using fixmap

Commit Message

Stefan Agner Feb. 25, 2017, 1:06 a.m. UTC

[also added Ard]

On 2017-02-22 07:51, Jon Medhurst (Tixy) wrote:
> Cacheable memory mappings need to be marked as shareable otherwise the
> CPU accessing fixmap memory may end up with local cachelines for that
> memory, resulting in different CPUs in the system seeing different
> values for the same memory location.
> 
> This issue was discovered when investigating failures in the ARM kprobe
> tests. kprobes uses patch_text() to modify the kernel image, which
> when CONFIG_DEBUG_RODATA is enabled makes use of fixmap to map the page
> to be modified. As the shareable attribute wasn't being set in the PTE
> entry for that page, a write to it wasn't being broadcast to other
> caches in the system, which in the the case being investigated was
> CPU's in the other cluster of a big.LITTLE system.
> 
> Fixes: a5f4c561b3b1 ("ARM: 8415/1: early fixmap support for earlycon")
> Cc: [e-mail] # v4.3+
> 
> Signed-off-by: Jon Medhurst <[e-mail]>
> ---
> 
> The fixmap changes in the original commit a5f4c561b3b1 look a bit iffy
> to me, shouldn't it have have made use of PAGE_KERNEL or pgprot_kernel
> or something like that to get PTE attributes suitable for the system
> being run, rather than rolling it's own set of values?

The PAGE_KERNEL points to pgprot_kernel, which in turn is dynamically
setup in build_mem_type_table. This initialization is taking place late
in the boot process, too late for early fixmap...

Early fixmap gets shut down before going SMP, so non shared mappings are
not an issue there. But FIXMAP_PAGE_NORMAL is also used for regular
fixmap, which is essentially the problem. Also, regular fixmap does not
make sure of the cache policy due to that, but just uses the hardcoded
writeback policy...

With that in mind, populating kern_pgprot with a reasonable default
which works for early fixmap might be a reasonable approach. Later
kern_pgprot gets setup with the appropriate shared attribute and cache
policy...




> That's why I'm marking this as an RFC, perhaps the correct fix is to
> rework the code to use the defines from arch/arm/include/asm/pgtable.h
> 
>  arch/arm/include/asm/fixmap.h       | 2 +-
>  arch/arm/probes/kprobes/test-core.h | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/include/asm/fixmap.h b/arch/arm/include/asm/fixmap.h
> index 5c17d2dec777..26d4a4677cd7 100644
> --- a/arch/arm/include/asm/fixmap.h
> +++ b/arch/arm/include/asm/fixmap.h
> @@ -41,7 +41,7 @@ static const enum fixed_addresses __end_of_fixed_addresses =
>  
>  #define FIXMAP_PAGE_COMMON	(L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN |
> L_PTE_DIRTY)
>  
> -#define FIXMAP_PAGE_NORMAL	(FIXMAP_PAGE_COMMON | L_PTE_MT_WRITEBACK)
> +#define FIXMAP_PAGE_NORMAL	(FIXMAP_PAGE_COMMON | L_PTE_SHARED |
> L_PTE_MT_WRITEBACK)
>  #define FIXMAP_PAGE_RO		(FIXMAP_PAGE_NORMAL | L_PTE_RDONLY)
>  
>  /* Used by set_fixmap_(io|nocache), both meant for mapping a device */
> diff --git a/arch/arm/probes/kprobes/test-core.h
> b/arch/arm/probes/kprobes/test-core.h
> index 94285203e9f7..cde2b4e9358a 100644
> --- a/arch/arm/probes/kprobes/test-core.h
> +++ b/arch/arm/probes/kprobes/test-core.h
> @@ -8,7 +8,7 @@
>   * published by the Free Software Foundation.
>   */
>  
> -#define VERBOSE 0 /* Set to '1' for more logging of test cases */
> +#define VERBOSE 1 /* Set to '1' for more logging of test cases */

That seems to be unrelated.

--
Stefan

>  
>  #ifdef CONFIG_THUMB2_KERNEL
>  #define NORMAL_ISA "16"

Patch

diff --git a/arch/arm/include/asm/fixmap.h
b/arch/arm/include/asm/fixmap.h
index 5c17d2dec777..c663e562716c 100644
--- a/arch/arm/include/asm/fixmap.h
+++ b/arch/arm/include/asm/fixmap.h
@@ -39,12 +39,11 @@  static const enum fixed_addresses
__end_of_fixed_addresses =
        __end_of_fixmap_region > __end_of_early_ioremap_region ?
        __end_of_fixmap_region : __end_of_early_ioremap_region;

-#define FIXMAP_PAGE_COMMON     (L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN
| L_PTE_DIRTY)
-
-#define FIXMAP_PAGE_NORMAL     (FIXMAP_PAGE_COMMON |
L_PTE_MT_WRITEBACK)
+#define FIXMAP_PAGE_NORMAL     (pgprot_kernel | L_PTE_XN)
 #define FIXMAP_PAGE_RO         (FIXMAP_PAGE_NORMAL | L_PTE_RDONLY)

 /* Used by set_fixmap_(io|nocache), both meant for mapping a device */
+#define FIXMAP_PAGE_COMMON     (L_PTE_YOUNG | L_PTE_PRESENT | L_PTE_XN
| L_PTE_DIRTY)
 #define FIXMAP_PAGE_IO         (FIXMAP_PAGE_COMMON |
L_PTE_MT_DEV_SHARED | L_PTE_SHARED)
 #define FIXMAP_PAGE_NOCACHE    FIXMAP_PAGE_IO

diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
index 4001dd15818d..9cb7c559263f 100644
--- a/arch/arm/mm/mmu.c
+++ b/arch/arm/mm/mmu.c
@@ -65,7 +65,8 @@  pmdval_t user_pmd_table = _PAGE_USER_TABLE;
 static unsigned int cachepolicy __initdata = CPOLICY_WRITEBACK;
 static unsigned int ecc_mask __initdata = 0;
 pgprot_t pgprot_user;
-pgprot_t pgprot_kernel;
+pgprot_t pgprot_kernel = __pgprot(L_PTE_PRESENT | L_PTE_YOUNG |
+                                 L_PTE_DIRTY | L_PTE_MT_WRITEBACK);
 pgprot_t pgprot_hyp_device;
 pgprot_t pgprot_s2;
 pgprot_t pgprot_s2_device;