From patchwork Sat Jan 13 18:17:34 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dan Williams X-Patchwork-Id: 124425 Delivered-To: patch@linaro.org Received: by 10.46.64.148 with SMTP id r20csp183772lje; Sat, 13 Jan 2018 10:25:54 -0800 (PST) X-Google-Smtp-Source: ACJfBovTvU31NSWH8lHITKmStM5VyclKfUa1kPH+TXfZj+AWvqHiFA6IPLG8z6mb7oWnJIOtGWSG X-Received: by 10.84.131.74 with SMTP id 68mr4353372pld.276.1515867954209; Sat, 13 Jan 2018 10:25:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515867954; cv=none; d=google.com; s=arc-20160816; b=mgRjQmBUNzSW1JiHcgUcRQbWx0Qi8oQvEihBIAHoQuM5qWJ0qwvW4br+NIXemP4sjz s9nZ8Lt2qtL8mBNMZadCTJDeGlwdVz1cczt9jXuaU4BE71wbCR2hrhdqyOLf1ez+99O1 ctYkbx6FpJvE178442I0foqWzT3BS6lgdy7MTCYbkr+ZalwQEWm71aoWKZUdbZjcmixi 02zdmqNQiq7KdpHZPDN2aT4pZ98F3s1zykraaqC4dwIvtr+4GFWcZfWOjhEZFLsgdi7U Yfg9tPi6mA3HHg6SjNHBgppCjre6YBrt5pv9Q3rDWtMQD6BVVun3ZuOkuK+4EcRbfKFE QkDA== 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=wFn1bJYf9vgHH8VwGPizYnG7j7lYqtvoZghpJo0jL9U=; b=twHBgn2IDG+5THRH8BGlw2sCBYUulDW4tT2k9bObULMIJ4/QPh5RJJmUsill/aqW5F VJOkKNSQz4G8juzLGrpTVkGQN0Cy7o6HwYi+nGKcoGG+uLGxIlms3A+BcbIik75rgEWP roSRmYcouO30tQk3eOMtIXPxLPeqlVVLj91V5K4ZFY6AdDVZ3FXhGHWlQNdBfZttGEhr nJK8MuQ8nQx++f25GpdHZkaaUnpIfxOyUS4VNysyAOAJflQeNz0btTvJbp3vaPHTPoSu Zn3eUgtGqCkknhKNmRnAwCZKHHsngRsbxh3DtPZ+DDzUoY6NiiJSjYEeDo9PQWlzl87B mvRg== 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 c23si6589700pli.135.2018.01.13.10.25.53; Sat, 13 Jan 2018 10:25:54 -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 S1754455AbeAMSZw (ORCPT + 28 others); Sat, 13 Jan 2018 13:25:52 -0500 Received: from mga11.intel.com ([192.55.52.93]:26623 "EHLO mga11.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751475AbeAMSZt (ORCPT ); Sat, 13 Jan 2018 13:25:49 -0500 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 13 Jan 2018 10:25:48 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.46,354,1511856000"; d="scan'208";a="19110113" Received: from dwillia2-desk3.jf.intel.com (HELO dwillia2-desk3.amr.corp.intel.com) ([10.54.39.16]) by FMSMGA003.fm.intel.com with ESMTP; 13 Jan 2018 10:25:48 -0800 Subject: [PATCH v3 2/9] 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 , Catalin Marinas , Will Deacon , gregkh@linuxfoundation.org, tglx@linutronix.de, torvalds@linux-foundation.org, akpm@linux-foundation.org, alan@linux.intel.com Date: Sat, 13 Jan 2018 10:17:34 -0800 Message-ID: <151586745407.5820.16345523612044599487.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 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: Catalin Marinas 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)