From patchwork Fri Jan 12 00:46:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 124243 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp1432860qgn; Thu, 11 Jan 2018 16:54:57 -0800 (PST) X-Google-Smtp-Source: ACJfBosbCsmbKmEUaT8W4bEFv3jmfWSl1Sz3EetxBq19Yp4Vmh2C8G3Ofct1MWTtmjp9Z+BEBteY X-Received: by 10.98.60.132 with SMTP id b4mr17178798pfk.120.1515718497274; Thu, 11 Jan 2018 16:54:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515718497; cv=none; d=google.com; s=arc-20160816; b=sqwi//QdLMG4KRYFLz1zmuLCFrYw6u2w6h0AGuQavf0ajSM+hwVCGGyPxTiLaLiwSU /iOBZAtrKvD/bB/ZwCTEUMIhl7OJ8g0RFfCj3TfKIV4hWfX0wZjhibJHGCwphsnVxUza 4Z1mkBiaUS8Ygo2bKUv6wICbRBrYAgRsAzzUW0fFP2qpAymuXWno7CabsS8xFH5nRl6i QzGo0b83r6G8Rnn09Pzrf4EzGlVre0etWUu2Ub4xYLuLVxfVd27eZWaBYFDGD72k4jBu Qet3VM3JvuT0e8C1QusfZPxf/A5nLvWvnnnjTwpUi+GtKFx6wyblOvqg35p91NaRWwya tNwQ== 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=CAzMmmBJMECbvTfGzAhTC3lRFGGz5Wt2cghVThC75dA=; b=PttKhes/QS7PCuoxHk9viECmLNDN/vjYDRseEmpYdY/IQ/ZN/PUvOvlQ+DducMquBj 7Yz807kMotNvusSGrvL/jcN9YKmK76rorS9EmFePJBPHoiUTmGpvjGIKweLeXmm3jIpw s4TPnnEilE7R28zxz4V3aqGJ6vYaGoCW7X4mRHJzSJ2YWAOUD9nkmA+Prn9ji6/Mj5SX x7SVKTaT7Z/pMCcz9RouvdCVW1FsCL5aygYHr2mB45cfi3hpOJ8qJXOTxmR9nXtjiC3l ZrHdari+ID6VKDhjuOeQDyOj9tSWhJoaZ4Zx8FiFJxAdbxDd0GfA4kTw7t8tSdDZAeKR rlHw== 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 n8si2706537pgr.519.2018.01.11.16.54.57; Thu, 11 Jan 2018 16:54:57 -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 S932783AbeALAyz (ORCPT + 28 others); Thu, 11 Jan 2018 19:54:55 -0500 Received: from mga01.intel.com ([192.55.52.88]:23328 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932148AbeALAyv (ORCPT ); Thu, 11 Jan 2018 19:54:51 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga101.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 11 Jan 2018 16:54:49 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,346,1511856000"; d="scan'208";a="10599391" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by orsmga006.jf.intel.com with ESMTP; 11 Jan 2018 16:54:49 -0800 Subject: [PATCH v2 02/19] arm64: 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, Peter Zijlstra , Will Deacon , tglx@linutronix.de, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@linux.intel.com Date: Thu, 11 Jan 2018 16:46:35 -0800 Message-ID: <151571799562.27429.4130452417520177349.stgit@dwillia2-desk3.amr.corp.intel.com> In-Reply-To: <151571798296.27429.7166552848688034184.stgit@dwillia2-desk3.amr.corp.intel.com> References: <151571798296.27429.7166552848688034184.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 arm64, using an LDR+CSEL+CSDB sequence to inhibit speculative use of the returned value. Signed-off-by: Mark Rutland Signed-off-by: Will Deacon Cc: Peter Zijlstra Signed-off-by: Dan Williams --- arch/arm64/include/asm/barrier.h | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/arch/arm64/include/asm/barrier.h b/arch/arm64/include/asm/barrier.h index 77651c49ef44..74ffcddb26e6 100644 --- a/arch/arm64/include/asm/barrier.h +++ b/arch/arm64/include/asm/barrier.h @@ -40,6 +40,30 @@ #define dma_rmb() dmb(oshld) #define dma_wmb() dmb(oshst) +#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" \ + " b.cs 1f\n" \ + " ldr %[p], %[pp]\n" \ + "1: csel %[p], %[p], xzr, cc\n" \ + " hint #0x14 // 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() dmb(ishld) #define __smp_wmb() dmb(ishst)