From patchwork Thu Feb 14 14:49:27 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Long X-Patchwork-Id: 158407 Delivered-To: patches@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1462379jaa; Thu, 14 Feb 2019 06:49:50 -0800 (PST) X-Received: by 2002:ac8:68d:: with SMTP id f13mr3443912qth.166.1550155790882; Thu, 14 Feb 2019 06:49:50 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1550155790; cv=none; d=google.com; s=arc-20160816; b=MdAiOT9whWUeaBclm06a7oTvkhtwgCWMWiPwEOQB1vBE31Nuq/ePf2UVNnrpjyPLLI AiiJFsP6NFOUxzfFWMYZKLhvlAav4AHEOr6wkDN7x7yUet3tKAT4qUwRfKciCSyaMQgZ /U5s29vAxgpkCnM4171wj66qTYjTrmZs5/gucBxxZtUmTHnKwKgGtwyUL47rXrGVYJVG eUCveBOIofbYnoF5AvMDPf3EqqVRK0voKVAaTabUiDIGVExDmjOHRCt+CZJPxfavbI9d DmbtiJFxtX9M7tHt16Ma8wQMhiqCcXCpyX+dkTtf7y1gkPU5PM1R60cenfliXX1xPoSM 6ZMg== 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=xJy7kJT4fBiBIJxxTbPYvInu/DuxzxwAzrjcMycc8Po=; b=MekefWz8QPoKvUzQSZO/XPoh3QgQCJ+VN7V7J4mnEBvLpLLaVvKcaUuTRwmz5UQgqU g678Qy22+mJZekwc0IP2H09H8cdNwh0qHsTxLV/Yup0hQR3nyK+bU4vA2Qviq3PipyPf a4IBd/Z6obxDs/4yhVS0xhRn28gyqN5pqpL07oxjkSxZTj9XdGLCPvQrjQkNCJOEsv6O PryrwZaJi6D5YAc8PgBdzV3KR0dKRHPimIM6gXNfiEZ+lMNS5qKnOZf2ddSpAFOU3pF5 Gp1laNEGYJs721p7M85OqBDr7F9YIPvJ4ctEEGsGrO1tsQSfLFFw7ZLUdZabYUagGXLN vAZA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=sCjhpD7i; 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 u7sor2943603qvm.33.2019.02.14.06.49.50 for (Google Transport Security); Thu, 14 Feb 2019 06:49:50 -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=sCjhpD7i; 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=xJy7kJT4fBiBIJxxTbPYvInu/DuxzxwAzrjcMycc8Po=; b=sCjhpD7ifrZCFfat2bEgCm0Dk7L04XJM88o1B6DttO4sqPHuKeb9tv5I+fClnAlngZ 2O7LPYRayzEvvnutfmoCuJ902oO2zjBTLplVlvpPbVwDSLJLqvtchrC8L2TD18B/6kVW +klmS2egDFmhHjRCjTkoWN9pxVKyGg0k9850JPJk9sULAZOtZDjARK4XetRKyZeroZ3Z SBi2PSVBEORPCR7U0pgvgqlhOrAgt2gihl+8w3BOnpyfXlsRgz7K+97iutkicJrdwPcH BQdO0WEAcdxd72x9vCQl52G2EHMQHpalgM1pdzEEMzZGExjWo8CJnA+b70xYsCfNiZj6 MXJg== 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=xJy7kJT4fBiBIJxxTbPYvInu/DuxzxwAzrjcMycc8Po=; b=RAoi0bSEBFSjjVOyc6mjwewf99T7TkF9sJz8FewpzdRJE1knbhOoH0y7seLGmlBvkB lnhJOPLKlYhQQFaUHIukOm1OYTc/dcDLc06hQIveA3XJ631Bb3h6RZdJjHz/hnqgBaXw 7ipCJZcEVciCnv08WjUKWZ3m1Lb2QgOWzieNELE+/rrNd6jBW9WaI2pcum6W5TGgqIee EYoykWrVY60/l7T9gN4+foj9Tuc+6tXWfalLbJ2rl4p/oGLofeBUmBm8ohbKO0WXch2q AAgq44uCQ+f8HIVAUlTI49utx9zEluJe09Mp6dFNCqeV4azcUrwIPnEt81ZJml3mkbdJ wVuQ== X-Gm-Message-State: AHQUAuaSCKufbCvPjZ6V4RfLNwvGAZAj1TCFVZnekCY04uBP+ifoOIco 7UlNH2eMvFdGMQh3m0DjiDrpr9x1 X-Google-Smtp-Source: AHgI3IaB/f2G9aoi9DM9btyfXiwdaUDoZTJfiaLyi5RXcGZh0CKVzVl+oS39dYFfdPGnc8DWA06sEw== X-Received: by 2002:a0c:ab8b:: with SMTP id j11mr701397qvb.28.1550155790606; Thu, 14 Feb 2019 06:49:50 -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 k66sm1498919qkc.25.2019.02.14.06.49.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 14 Feb 2019 06:49:50 -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.9 13/16] ARM: add PROC_VTABLE and PROC_TABLE macros Date: Thu, 14 Feb 2019 09:49:27 -0500 Message-Id: <20190214144930.27539-14-dave.long@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190214144930.27539-1-dave.long@linaro.org> References: <20190214144930.27539-1-dave.long@linaro.org> From: Russell King Commit e209950fdd065d2cc46e6338e47e52841b830cba upstream. Allow the way we access members of the processor vtable to be changed at compile time. We will need to move to per-CPU vtables to fix the Spectre variant 2 issues on big.Little systems. However, we have a couple of calls that do not need the vtable treatment, and indeed cause a kernel warning due to the (later) use of smp_processor_id(), so also introduce the PROC_TABLE macro for these which always use CPU 0's function pointers. Reviewed-by: Julien Thierry Signed-off-by: Russell King Signed-off-by: David A. Long --- arch/arm/include/asm/proc-fns.h | 39 ++++++++++++++++++++++----------- arch/arm/kernel/setup.c | 4 +--- 2 files changed, 27 insertions(+), 16 deletions(-) -- 2.17.1 diff --git a/arch/arm/include/asm/proc-fns.h b/arch/arm/include/asm/proc-fns.h index 19939e88efca..a1a71b068edc 100644 --- a/arch/arm/include/asm/proc-fns.h +++ b/arch/arm/include/asm/proc-fns.h @@ -23,7 +23,7 @@ struct mm_struct; /* * Don't change this structure - ASM code relies on it. */ -extern struct processor { +struct processor { /* MISC * get data abort address/flags */ @@ -79,9 +79,13 @@ extern struct processor { unsigned int suspend_size; void (*do_suspend)(void *); void (*do_resume)(void *); -} processor; +}; #ifndef MULTI_CPU +static inline void init_proc_vtable(const struct processor *p) +{ +} + extern void cpu_proc_init(void); extern void cpu_proc_fin(void); extern int cpu_do_idle(void); @@ -98,18 +102,27 @@ extern void cpu_reset(unsigned long addr) __attribute__((noreturn)); extern void cpu_do_suspend(void *); extern void cpu_do_resume(void *); #else -#define cpu_proc_init processor._proc_init -#define cpu_check_bugs processor.check_bugs -#define cpu_proc_fin processor._proc_fin -#define cpu_reset processor.reset -#define cpu_do_idle processor._do_idle -#define cpu_dcache_clean_area processor.dcache_clean_area -#define cpu_set_pte_ext processor.set_pte_ext -#define cpu_do_switch_mm processor.switch_mm -/* These three are private to arch/arm/kernel/suspend.c */ -#define cpu_do_suspend processor.do_suspend -#define cpu_do_resume processor.do_resume +extern struct processor processor; +#define PROC_VTABLE(f) processor.f +#define PROC_TABLE(f) processor.f +static inline void init_proc_vtable(const struct processor *p) +{ + processor = *p; +} + +#define cpu_proc_init PROC_VTABLE(_proc_init) +#define cpu_check_bugs PROC_VTABLE(check_bugs) +#define cpu_proc_fin PROC_VTABLE(_proc_fin) +#define cpu_reset PROC_VTABLE(reset) +#define cpu_do_idle PROC_VTABLE(_do_idle) +#define cpu_dcache_clean_area PROC_TABLE(dcache_clean_area) +#define cpu_set_pte_ext PROC_TABLE(set_pte_ext) +#define cpu_do_switch_mm PROC_VTABLE(switch_mm) + +/* These two are private to arch/arm/kernel/suspend.c */ +#define cpu_do_suspend PROC_VTABLE(do_suspend) +#define cpu_do_resume PROC_VTABLE(do_resume) #endif extern void cpu_resume(void); diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 8d5c3a118abe..2eebb67fa08b 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -693,9 +693,7 @@ static void __init setup_processor(void) cpu_name = list->cpu_name; __cpu_architecture = __get_cpu_architecture(); -#ifdef MULTI_CPU - processor = *list->proc; -#endif + init_proc_vtable(list->proc); #ifdef MULTI_TLB cpu_tlb = *list->tlb; #endif