From patchwork Sat Jan 13 18:17:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 124426 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp183795lje; Sat, 13 Jan 2018 10:26:02 -0800 (PST) X-Google-Smtp-Source: ACJfBot/idAIUbishx9YX0NZtuvqjmoPlIbyGMS/JZYhg7ivr71LtWgZ3jrM8xu4V4yZvbBNIKWh X-Received: by 10.159.230.16 with SMTP id u16mr15185107plq.401.1515867962462; Sat, 13 Jan 2018 10:26:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515867962; cv=none; d=google.com; s=arc-20160816; b=KdYPazhvoDHX/eLaQNC1PbmZMLg99+WfGRtXSncTbBTbRyP+j+LK49ThJn23lkYVYU 2auVfBxU6ryMyfIxpJhMcrHb9APb5sazgQDbZsEBp3/Zy7qIYrWRC0ZcPp3Urtl1SFZa jUh9uo7HZY5oZEIqYxTpT6SbnkZBo2EmWAD88MPw2WeVccQA81rg5vZfhQyKd9s7jJn6 +JTYRafhGe3bu14D0ZTQ58DP3S8+nNIOw3zgJus50gKGzwOPD9te3M7A8LZm+qy0Fu0n l9A9KCXPGFhqAPG7F73NiB1a8f9+5yjZHDWCcFi3qA5T2IZQgGgV/XyYBvieCuKSWMhe wK7g== 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 :user-agent:references:in-reply-to:message-id:date:cc:to:from :subject:arc-authentication-results; bh=7heKRSmbm1Mik3I27Nwqvw1y/PuUZqBJeKZO72FALwc=; b=kNwk1fMtGvYKnDk3S2R0OJqZC1OCf4hzziHVHlykmD/AkU1cEpNv47PZ1qWoDqwQ4c SZFhq89EQaV7zw866/1wOu//1oapqgWYe4UDnzoryxElR1pYGU+Kw6Nu2PVpZrhxrYHK /mR5QXjJa2Z+Axan0Tccnmq/X5hD4Yid24tyjABS5K8CYQyV59yJU1ilznv6QxlFKMz0 nGEyE0M0WsIyePKK3uwvFxkeqOfFsfIbLIy8cFRUxSe3VlT681uu5NfcZN9RqE9L69dB x7Um71Z5AuRbvlgL7s94yb2IG5LCprgtEPKeEnPH+ZLqLBNfnbO4OLfdKtBTAvPAj9wQ 2S3g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r59si5226108plb.314.2018.01.13.10.26.02; Sat, 13 Jan 2018 10:26:02 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754862AbeAMSZ7 (ORCPT + 28 others); Sat, 13 Jan 2018 13:25:59 -0500 Received: from mga12.intel.com ([192.55.52.136]:52578 "EHLO mga12.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754485AbeAMSZz (ORCPT ); Sat, 13 Jan 2018 13:25:55 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2018 10:25:54 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,354,1511856000"; d="scan'208";a="194788599" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by fmsmga005.fm.intel.com with ESMTP; 13 Jan 2018 10:25:54 -0800 Subject: [PATCH v3 3/9] arm: implement ifence_array_ptr() From: Dan Williams To: linux-kernel@vger.kernel.org Cc: Mark Rutland , linux-arch@vger.kernel.org, kernel-hardening@lists.openwall.com, gregkh@linuxfoundation.org, Russell King , tglx@linutronix.de, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@linux.intel.com Date: Sat, 13 Jan 2018 10:17:40 -0800 Message-ID: <151586745989.5820.17196364421122234994.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <151586744180.5820.13215059696964205856.stgit@dwillia2-desk3.amr.corp.intel.com> References: <151586744180.5820.13215059696964205856.stgit@dwillia2-desk3.amr.corp.intel.com> User-Agent: StGit/0.17.1-9-g687f MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mark Rutland This patch implements ifence_array_ptr() for arm, using an LDR+MOVCS+CSDB sequence to inhibit speculative use of the returned value. Cc: Russell King Signed-off-by: Mark Rutland Signed-off-by: Dan Williams --- arch/arm/include/asm/barrier.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm/include/asm/barrier.h b/arch/arm/include/asm/barrier.h index 40f5c410fd8c..919235ed6e68 100644 --- a/arch/arm/include/asm/barrier.h +++ b/arch/arm/include/asm/barrier.h @@ -59,6 +59,30 @@ extern void arm_heavy_mb(void); #define dma_wmb() barrier() #endif +#define ifence_array_ptr(arr, idx, sz) \ +({ \ + typeof(&(arr)[0]) __nap_arr = (arr); \ + typeof(idx) __nap_idx = (idx); \ + typeof(sz) __nap_sz = (sz); \ + \ + unsigned long __nap_ptr = (unsigned long)__nap_arr + \ + sizeof(__nap_arr[0]) * idx; \ + \ + asm volatile( \ + " cmp %[i], %[s]\n" \ + " bcs 1f\n" \ + " ldr %[p], %[pp]\n" \ + "1: movcs %[p], #0\n" \ + " .inst 0xe320f018 @ CSDB\n" \ + : [p] "=&r" (__nap_ptr) \ + : [pp] "m" (__nap_ptr), \ + [i] "r" ((unsigned long)__nap_idx), \ + [s] "r" ((unsigned long)__nap_sz) \ + : "cc"); \ + \ + (typeof(&(__nap_arr)[0]))__nap_ptr; \ +}) + #define __smp_mb() dmb(ish) #define __smp_rmb() __smp_mb() #define __smp_wmb() dmb(ishst)