From patchwork Thu Aug 1 08:16:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Viresh Kumar X-Patchwork-Id: 170361 Delivered-To: patch@linaro.org Received: by 2002:a92:512:0:0:0:0:0 with SMTP id q18csp5088762ile; Thu, 1 Aug 2019 01:23:06 -0700 (PDT) X-Google-Smtp-Source: APXvYqyiAAor7ObrnKc01GBNaXY2ZbjSmI5UMpajGecgZ9DkO20fTEsK7A5qxgn3e+wEc6Y0jud9 X-Received: by 2002:a65:610a:: with SMTP id z10mr118182284pgu.178.1564647629663; Thu, 01 Aug 2019 01:20:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1564647629; cv=none; d=google.com; s=arc-20160816; b=boCpYJn0pDtomX5L70WGnGU5Hm97HijVBPpNwJVYnpFqw3lM6ButQVhbWXZieyHOdJ K114exKSsUDBCB8vYmxARlhWwRfy02GV4lNTryY64TmKFEjtE4WdriN8cALH1wj1se/M V8gX/kd6hl6s168KEtzvOfOyaexUw1ymtIj/gQZdQ3W7KqEAtdG/d0eZYVyBstZQwJEA lWCV5Ndn1bHpUx4cQEhxXk6ow4X5XDAPGn8fIvdaiLiUdQb7XxEsT24AV19YjEPolOUe w8jlt6o/Co5AbeapCA/lnZ4VX7Lb5BP+sytJit9dA7/zmkV8O1aOjLC0yHlzYznLa3n6 +RHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Ws1lkPqBsn87EY7GxNn+AzRrtY/P0vuzwO4T5yjsQK0=; b=cH2VUHJXwCTRh4TpTaAvcotDzziXpy0s7wqMQWiL81QPsNXThvZB7r0pz/3MaJeZO2 35kNqvpd2mR3r3QUk07iKz3FidxJgTjk5k7Qg2HFUkwOJ7EXK7pP1ryyPNCqbvMEZY5i NmBzRhcKdv+aHoohfbgE3I1NyqU/RvB1KSRBz6e9ERWYpZNdMA7El2t/oOGJklnCSFHI xioiNWA/PYH6osTAltSTNtlcElXBuEgdIi37wG3YDAB9YlGAIml2nZPSHaWzaCpqVzAD 0KKCIWEXtsWJOyfIs4L7iNH2f96wFqdD/qtDDgNBsxq1ml5t92DkIpwUmhlIeydR1H4K GNig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vibnYP12; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f10si37407577pfq.194.2019.08.01.01.20.29; Thu, 01 Aug 2019 01:20:29 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=vibnYP12; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729712AbfHAIU3 (ORCPT + 14 others); Thu, 1 Aug 2019 04:20:29 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:42881 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731084AbfHAIU2 (ORCPT ); Thu, 1 Aug 2019 04:20:28 -0400 Received: by mail-pl1-f196.google.com with SMTP id ay6so31902582plb.9 for ; Thu, 01 Aug 2019 01:20:28 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=Ws1lkPqBsn87EY7GxNn+AzRrtY/P0vuzwO4T5yjsQK0=; b=vibnYP12Yj8WtQhINzxmLEByeOMlswC0F2GsMI8dE21QSoRhhqbMo+P7AxcGVojRUA /hT+AkEZH0AS115dCqaaXUuSv0k+4joEOreBP/68Gjb0QidyVKyPg0W89H6SlBkzcfcp +cgas23ax3Ib54qSLu3Dip6Am24mT5q2SQImorxH2sBLXwAJweYLO4iBosEvBRd4DZrN efKdS/jHbZT1/UT+qeOxf/oohBhdIpK1I7/N7ZoMU/QH/q6/zPpQlJjvHkjPsQK66OCr FiBeYSXRrQraypOAvPkKR35SP+Z/gRLeDjKA3IcMFJn1qq0vSD4pyg4aIYuWEK11NbbJ rqEg== 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:mime-version:content-transfer-encoding; bh=Ws1lkPqBsn87EY7GxNn+AzRrtY/P0vuzwO4T5yjsQK0=; b=Cx4aSfdShRcwo/zTFj0J41yeeP+9IedHu6DHT1dyCEpWfNxiXFgbQUOSpcOI80hcgR aQeTpb9VYtoKp6647qX9NAl/4ubCKZcv1+8r2pUi/K+wav0totV94bf9upbcscbNK4pe 69ZwVuf4Czhh+bljHFnLo7mNKAwef/7KEYurKkvyh45/ShEC3QImkgxRfaSztogsB0X0 yUwpo9bKz8OlX/pWYL/+CNtUA1qIG9AP4WohbEKNCEfNfcct0QKF/ReSswJye/zrqXkV mFxXHNTF8oiMgbp4WDA9Dzif5XqhD0rOgaoNadfoDtrYHLcU3vlSBzgwOgjIzD0FpM6X ol2Q== X-Gm-Message-State: APjAAAXC0JeVmHSjU0bDvAQL3p26y5xULN7p7MEt5120VN5RcmLe5Qrm NRAJj3a41CC/b1+9iTDeY6817CRK2ko= X-Received: by 2002:a17:902:7043:: with SMTP id h3mr97891950plt.10.1564647627732; Thu, 01 Aug 2019 01:20:27 -0700 (PDT) Received: from localhost ([122.172.28.117]) by smtp.gmail.com with ESMTPSA id y194sm47237763pfg.116.2019.08.01.01.20.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 01 Aug 2019 01:20:27 -0700 (PDT) From: Viresh Kumar To: stable@vger.kernel.org Cc: Viresh Kumar , Julien Thierry , linux-arm-kernel@lists.infradead.org, Catalin Marinas , Marc Zyngier , Mark Rutland , Will Deacon , Russell King , Vincent Guittot , mark.brown@arm.com, guohanjun@huawei.com Subject: [PATCH ARM32 v4.4 V2 20/47] ARM: spectre-v1: add array_index_mask_nospec() implementation Date: Thu, 1 Aug 2019 13:46:04 +0530 Message-Id: <68b8f200fef6b51b5a140ef541fd4455ef704294.1564646727.git.viresh.kumar@linaro.org> X-Mailer: git-send-email 2.21.0.rc0.269.g1a574e7a288b In-Reply-To: References: MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Russell King Commit 1d4238c56f9816ce0f9c8dbe42d7f2ad81cb6613 upstream. Add an implementation of the array_index_mask_nospec() function for mitigating Spectre variant 1 throughout the kernel. Signed-off-by: Russell King Acked-by: Mark Rutland Boot-tested-by: Tony Lindgren Reviewed-by: Tony Lindgren Signed-off-by: David A. Long Signed-off-by: Viresh Kumar --- arch/arm/include/asm/barrier.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) -- 2.21.0.rc0.269.g1a574e7a288b diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h index edd9e633a84b..744d70e1d202 100644 --- a/arch/arm/include/asm/barrier.h +++ b/arch/arm/include/asm/barrier.h @@ -108,5 +108,24 @@ do { \ #define smp_mb__before_atomic() smp_mb() #define smp_mb__after_atomic() smp_mb() +#ifdef CONFIG_CPU_SPECTRE +static inline unsigned long array_index_mask_nospec(unsigned long idx, + unsigned long sz) +{ + unsigned long mask; + + asm volatile( + "cmp %1, %2\n" + " sbc %0, %1, %1\n" + CSDB + : "=r" (mask) + : "r" (idx), "Ir" (sz) + : "cc"); + + return mask; +} +#define array_index_mask_nospec array_index_mask_nospec +#endif + #endif /* !__ASSEMBLY__ */ #endif /* __ASM_BARRIER_H */