Commit 9efcaa7c authored by Paul Burton's avatar Paul Burton Committed by Greg Kroah-Hartman

MIPS: VDSO: Match data page cache colouring when D$ aliases

commit 0f02cfbc upstream.

When a system suffers from dcache aliasing a user program may observe
stale VDSO data from an aliased cache line. Notably this can break the
expectation that clock_gettime(CLOCK_MONOTONIC, ...) is, as its name
suggests, monotonic.

In order to ensure that users observe updates to the VDSO data page as
intended, align the user mappings of the VDSO data page such that their
cache colouring matches that of the virtual address range which the
kernel will use to update the data page - typically its unmapped address
within kseg0.

This ensures that we don't introduce aliasing cache lines for the VDSO
data page, and therefore that userland will observe updates without
requiring cache invalidation.
Signed-off-by: default avatarPaul Burton <>
Reported-by: default avatarHauke Mehrtens <>
Reported-by: default avatarRene Nielsen <>
Reported-by: default avatarAlexandre Belloni <>
Fixes: ebb5e78c ("MIPS: Initial implementation of a VDSO")
Patchwork: default avatarAlexandre Belloni <>
Tested-by: default avatarHauke Mehrtens <>
Cc: James Hogan <>
Cc: # v4.4+
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent 49251910
......@@ -13,6 +13,7 @@
#include <linux/err.h>
#include <linux/init.h>
#include <linux/ioport.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/slab.h>
......@@ -20,6 +21,7 @@
#include <asm/abi.h>
#include <asm/mips-cps.h>
#include <asm/page.h>
#include <asm/vdso.h>
/* Kernel-provided data used by the VDSO. */
......@@ -128,12 +130,30 @@ int arch_setup_additional_pages(struct linux_binprm *bprm, int uses_interp)
vvar_size = gic_size + PAGE_SIZE;
size = vvar_size + image->size;
* Find a region that's large enough for us to perform the
* colour-matching alignment below.
if (cpu_has_dc_aliases)
size += shm_align_mask + 1;
base = get_unmapped_area(NULL, 0, size, 0, 0);
if (IS_ERR_VALUE(base)) {
ret = base;
goto out;
* If we suffer from dcache aliasing, ensure that the VDSO data page
* mapping is coloured the same as the kernel's mapping of that memory.
* This ensures that when the kernel updates the VDSO data userland
* will observe it without requiring cache invalidations.
if (cpu_has_dc_aliases) {
base = __ALIGN_MASK(base, shm_align_mask);
base += ((unsigned long)&vdso_data - gic_size) & shm_align_mask;
data_addr = base + gic_size;
vdso_addr = data_addr + PAGE_SIZE;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment