From patchwork Wed Feb 13 21:32:21 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158269 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp561069jaa; Wed, 13 Feb 2019 13:32:46 -0800 (PST) X-Received: by 2002:ac8:3f98:: with SMTP id d24mr206961qtk.219.1550093566687; Wed, 13 Feb 2019 13:32:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550093566; cv=none; d=google.com; s=arc-20160816; b=XeputWnZaBNVhjTQzfprPcDAg4y/Popg0ing2IHh8h3zqm08cCF6Xr2KVYtMmsloJ3 +QdapD8RAwDMmlWwUAA4Gv/MSA/FGwdoWntqln+40o1v2QnYWL/bkq+OrGyHG54sj85J /zbKUvRkfl1sK/Bt7dxeJcOJkxRh5IZqWtJIajUL/pQCSa5XYQyWLR9HOi5FhoPYXOuq E71D+D7PPAED9Eni/lua087UKwHSdLLPEovDxE3bIfj5rLHPadtVtVlHjy9ORJluBP/y JXs97S3cmVftoJmGiYSZvVhnlgjTC9ovPtk8ObpPWmZGqO0YKV3GslWdOJTqbEPpZ1n8 Rk7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=htX5NCY6rOuOTIoyhKI12TDdwsc2R7Wa3vlE0kAtWZo=; b=UOJ0HMVRTt4mJCkVKd4UpId6+H/dOB21gkSQM6EXaSKbcV/0WFloP0zJsN1D9Et8uE hwyXk2SZLbnUEk2W+1cuvDxB6+lB//tDnOl5IX2QGy/4epoYfJDFA1eOSYaIVdobv8Bj T+SS3jR9Ri+e9lMBqcEK6WoVdaOuxyJ4ORKZ1B+ULdZf1E2fPxDOVB4Od2g3NgaGckCW zXVKXY2RpsoyOSIvf4SO6H0wdTvVhV9vCHrx6LdxiF1Bb7jZVJnWEi2+nNgi0HM4FgT9 +Mvj1d4/026BSQbvGO2TXTjQsuw73eECSDSYb2s996wAeTkZIWU5A1ixYr5/Jt4XtB0D 0ogQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Bd3rc/oc"; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id u81sor271075qki.141.2019.02.13.13.32.46 for (Google Transport Security); Wed, 13 Feb 2019 13:32:46 -0800 (PST) Received-SPF: pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b="Bd3rc/oc"; spf=pass (google.com: domain of dave.long@linaro.org designates 209.85.220.65 as permitted sender) smtp.mailfrom=dave.long@linaro.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=htX5NCY6rOuOTIoyhKI12TDdwsc2R7Wa3vlE0kAtWZo=; b=Bd3rc/oc98TZa70pugFF+4ZUCyk8cxClQU86pT/koqvumVajD83tjjtey5nmv+Xzeu vak5qd2Ml06tok0It+6AzVyXa8KvcgReAmTl/drALNkWQ2jGEKyWZ09X4vHTkOW2n6c0 RKC0JmAbi97WQVpqxXSkTEDPF7pJ5gjCKnrVp1wjXUobPpHup1guR6AbmwD0K/51II4I Eqe4F6OiYqLjAhIopLv13n+gEA2h1r9ULVTzvl73tU6UUzm/lPurLiHGepviX0XmEdHW lMmdylw0pA7aob7qxQKu/6H0/yiBepd2+oTFnpFrGjcDR5Oo4s0tRrSaslngYBCh/LH4 bvhg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=htX5NCY6rOuOTIoyhKI12TDdwsc2R7Wa3vlE0kAtWZo=; b=PfumEurD9uPLGI9GIKhxK4XPHF3RFiR9mvz+mMLp3VTaYueFV05ni+6f4mw97kfJPJ Xgv6GO4cwVFfnNsrnBLmKukpyXoSq4SU2Aiq1XkPoWuJ1nxwepc4gL8CruKREZr7nzuf fPuy/ZNjXUk1vYt/mOgQgpkVR96ixo5WJQPInLyt51Q9CtcsTYbGu/AxKMd5KZU/Dp6D c1Vi1VQ+HeiUdYrG0cOUnQcr7UQb/dMgNiUQYjiuk1cU1Zc+m7cvefpSzXItHyajwPBG Wa07+YT+g6rKmZk2170tgUv0j332GQmvVmepQ6tQ7AhD35V7OLooOungfm6A8Nj1tJnp eA0A== X-Gm-Message-State: AHQUAuYiwKpYrAEgjsjID5q31Z0OS/f2xk5QXFzpZoO0prehgBzblZVH rhuIqtkd9Ql5Oxf3n1WwqeMkppiD X-Google-Smtp-Source: AHgI3IZScYOCy2t3ydPZHF1R1hDVF+QJh+/5VQnYtvZcJHcSfN4VkZcPSm0RrxICXc1ht/aeja48Sw== X-Received: by 2002:a37:5b47:: with SMTP id p68mr180434qkb.299.1550093566329; Wed, 13 Feb 2019 13:32:46 -0800 (PST) Return-Path: Received: from localhost.localdomain (pool-72-71-243-63.cncdnh.fast00.myfairpoint.net. [72.71.243.63]) by smtp.googlemail.com with ESMTPSA id 8sm382675qtr.7.2019.02.13.13.32.45 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 13 Feb 2019 13:32:45 -0800 (PST) From: David Long To: stable@vger.kernel.org, Russell King - ARM Linux , Florian Fainelli , Julien Thierry , Tony Lindgren , Marc Zyngier , Greg KH , Mark Rutland Cc: Will Deacon , Mark Brown , linux-kernel@vger.kernel.org Subject: [PATCH 4.19 15/17] ARM: spectre-v2: per-CPU vtables to work around big.Little systems Date: Wed, 13 Feb 2019 16:32:21 -0500 Message-Id: <20190213213223.916-16-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190213213223.916-1-dave.long@linaro.org> References: <20190213213223.916-1-dave.long@linaro.org> From: Russell King Commit 383fb3ee8024d596f488d2dbaf45e572897acbdb upstream. In big.Little systems, some CPUs require the Spectre workarounds in paths such as the context switch, but other CPUs do not. In order to handle these differences, we need per-CPU vtables. We are unable to use the kernel's per-CPU variables to support this as per-CPU is not initialised at times when we need access to the vtables, so we have to use an array indexed by logical CPU number. We use an array-of-pointers to avoid having function pointers in the kernel's read/write .data section. Reviewed-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/include/asm/proc-fns.h | 23 +++++++++++++++++++++++ arch/arm/kernel/setup.c | 5 +++++ arch/arm/kernel/smp.c | 31 +++++++++++++++++++++++++++++++ arch/arm/mm/proc-v7-bugs.c | 17 ++--------------- 4 files changed, 61 insertions(+), 15 deletions(-) -- 2.17.1 diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h index c259cc49c641..e1b6f280ab08 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h @@ -104,12 +104,35 @@ extern void cpu_do_resume(void *); #else extern struct processor processor; +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) +#include +/* + * This can't be a per-cpu variable because we need to access it before + * per-cpu has been initialised. We have a couple of functions that are + * called in a pre-emptible context, and so can't use smp_processor_id() + * there, hence PROC_TABLE(). We insist in init_proc_vtable() that the + * function pointers for these are identical across all CPUs. + */ +extern struct processor *cpu_vtable[]; +#define PROC_VTABLE(f) cpu_vtable[smp_processor_id()]->f +#define PROC_TABLE(f) cpu_vtable[0]->f +static inline void init_proc_vtable(const struct processor *p) +{ + unsigned int cpu = smp_processor_id(); + *cpu_vtable[cpu] = *p; + WARN_ON_ONCE(cpu_vtable[cpu]->dcache_clean_area != + cpu_vtable[0]->dcache_clean_area); + WARN_ON_ONCE(cpu_vtable[cpu]->set_pte_ext != + cpu_vtable[0]->set_pte_ext); +} +#else #define PROC_VTABLE(f) processor.f #define PROC_TABLE(f) processor.f static inline void init_proc_vtable(const struct processor *p) { processor = *p; } +#endif #define cpu_proc_init PROC_VTABLE(_proc_init) #define cpu_check_bugs PROC_VTABLE(check_bugs) diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index f269f4440496..7bbaa293a38c 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -115,6 +115,11 @@ EXPORT_SYMBOL(elf_hwcap2); #ifdef MULTI_CPU struct processor processor __ro_after_init; +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) +struct processor *cpu_vtable[NR_CPUS] = { + [0] = &processor, +}; +#endif #endif #ifdef MULTI_TLB struct cpu_tlb_fns cpu_tlb __ro_after_init; diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index f574a5e0d589..3bf82232b1be 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c @@ -42,6 +42,7 @@ #include #include #include +#include #include #include #include @@ -102,6 +103,30 @@ static unsigned long get_arch_pgd(pgd_t *pgd) #endif } +#if defined(CONFIG_BIG_LITTLE) && defined(CONFIG_HARDEN_BRANCH_PREDICTOR) +static int secondary_biglittle_prepare(unsigned int cpu) +{ + if (!cpu_vtable[cpu]) + cpu_vtable[cpu] = kzalloc(sizeof(*cpu_vtable[cpu]), GFP_KERNEL); + + return cpu_vtable[cpu] ? 0 : -ENOMEM; +} + +static void secondary_biglittle_init(void) +{ + init_proc_vtable(lookup_processor(read_cpuid_id())->proc); +} +#else +static int secondary_biglittle_prepare(unsigned int cpu) +{ + return 0; +} + +static void secondary_biglittle_init(void) +{ +} +#endif + int __cpu_up(unsigned int cpu, struct task_struct *idle) { int ret; @@ -109,6 +134,10 @@ int __cpu_up(unsigned int cpu, struct task_struct *idle) if (!smp_ops.smp_boot_secondary) return -ENOSYS; + ret = secondary_biglittle_prepare(cpu); + if (ret) + return ret; + /* * We need to tell the secondary core where to find * its stack and the page tables. @@ -359,6 +388,8 @@ asmlinkage void secondary_start_kernel(void) struct mm_struct *mm = &init_mm; unsigned int cpu; + secondary_biglittle_init(); + /* * The identity mapping is uncached (strongly ordered), so * switch away from it before attempting any exclusive accesses. diff --git a/arch/arm/mm/proc-v7-bugs.c b/arch/arm/mm/proc-v7-bugs.c index 5544b82a2e7a..9a07916af8dd 100644 --- a/arch/arm/mm/proc-v7-bugs.c +++ b/arch/arm/mm/proc-v7-bugs.c @@ -52,8 +52,6 @@ static void cpu_v7_spectre_init(void) case ARM_CPU_PART_CORTEX_A17: case ARM_CPU_PART_CORTEX_A73: case ARM_CPU_PART_CORTEX_A75: - if (processor.switch_mm != cpu_v7_bpiall_switch_mm) - goto bl_error; per_cpu(harden_branch_predictor_fn, cpu) = harden_branch_predictor_bpiall; spectre_v2_method = "BPIALL"; @@ -61,8 +59,6 @@ static void cpu_v7_spectre_init(void) case ARM_CPU_PART_CORTEX_A15: case ARM_CPU_PART_BRAHMA_B15: - if (processor.switch_mm != cpu_v7_iciallu_switch_mm) - goto bl_error; per_cpu(harden_branch_predictor_fn, cpu) = harden_branch_predictor_iciallu; spectre_v2_method = "ICIALLU"; @@ -88,11 +84,9 @@ static void cpu_v7_spectre_init(void) ARM_SMCCC_ARCH_WORKAROUND_1, &res); if ((int)res.a0 != 0) break; - if (processor.switch_mm != cpu_v7_hvc_switch_mm && cpu) - goto bl_error; per_cpu(harden_branch_predictor_fn, cpu) = call_hvc_arch_workaround_1; - processor.switch_mm = cpu_v7_hvc_switch_mm; + cpu_do_switch_mm = cpu_v7_hvc_switch_mm; spectre_v2_method = "hypervisor"; break; @@ -101,11 +95,9 @@ static void cpu_v7_spectre_init(void) ARM_SMCCC_ARCH_WORKAROUND_1, &res); if ((int)res.a0 != 0) break; - if (processor.switch_mm != cpu_v7_smc_switch_mm && cpu) - goto bl_error; per_cpu(harden_branch_predictor_fn, cpu) = call_smc_arch_workaround_1; - processor.switch_mm = cpu_v7_smc_switch_mm; + cpu_do_switch_mm = cpu_v7_smc_switch_mm; spectre_v2_method = "firmware"; break; @@ -119,11 +111,6 @@ static void cpu_v7_spectre_init(void) if (spectre_v2_method) pr_info("CPU%u: Spectre v2: using %s workaround\n", smp_processor_id(), spectre_v2_method); - return; - -bl_error: - pr_err("CPU%u: Spectre v2: incorrect context switching function, system vulnerable\n", - cpu); } #else static void cpu_v7_spectre_init(void)