Received: by 2002:a05:6a10:a852:0:0:0:0 with SMTP id d18csp131847pxy; Tue, 4 May 2021 20:56:39 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzu3v+nSNol1QR9AN84mNkMViOMbqzCeFzgE/9wpQLtWs2MyRp2K4yPtFz2vXFotaTKuZfg X-Received: by 2002:a62:7e86:0:b029:28e:5a88:5cfa with SMTP id z128-20020a627e860000b029028e5a885cfamr18407396pfc.70.1620186999763; Tue, 04 May 2021 20:56:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1620186999; cv=none; d=google.com; s=arc-20160816; b=rfHImSf67VwiiF1jxB3o/lfIaHmOer2DTq5ko0Ft1jSysHV/b1PpzwgE4vcrvLI9n0 2WCVJoxaEYxo8l/ujQvjtNeBPyIaoFZO5SFh+w6lpPRO1jMq+5bPo4mKXzRrtG2zHZCV 0HAKBvTHxpQAVI22718gCjYIIs4Nm1u8trw3J4mRvwdDjGOLWwVxYQOeHf3i1vPnFCNC upPt4kEAvCAfA3sl6XMVyWtcnYGxqqLCKCwgSY4IVTEOXDIgYC4oRDx2aLmQkTJZIVUY zfUwx5FDv2YXG+xPeP1VQY+6r0PWc+Gop1m8p/k52SX2RU973vbtJpJd686y+gILRehZ t8BA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/Qv9322Ly+FYXUR3q0hY09kc7Ko7kX6mN8/7VNeBtEc=; b=uM6T4uJlsOBdavl8U2WbseAv5mSzBDdVKMNmvpgB9+Me6yNMGy6EwXeLruPQeggwR2 bT/N42k9eXs/LHsGX7/2qEizqgldQ5tF3VczRWjpsQQJGmk6AVwKBYQWk6wBKCalLFZr CTnRIuBW0dc2IR74VqvYm8tfwP5LO1czXr5q9WBu8mcZA94WusfGsrEfEdvNloDopvtI VcCzYuS/PUl3ivaMrKQk4yee2qsGW7UqZcp3FPzlr1QdemvoBtMjreYzbZPZ1SoRtMno sBAcrCR7wnz+scMOGwlSWJ5940GKX1Nd0JhGCck9Q2HwySaU/e1ooIHMwTQz0nINtDG+ z3Ig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ya1XSilG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id z17si5786211plg.432.2021.05.04.20.56.27; Tue, 04 May 2021 20:56:39 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Ya1XSilG; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231530AbhEEDzz (ORCPT + 99 others); Tue, 4 May 2021 23:55:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:36174 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231508AbhEEDzx (ORCPT ); Tue, 4 May 2021 23:55:53 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1620186897; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=/Qv9322Ly+FYXUR3q0hY09kc7Ko7kX6mN8/7VNeBtEc=; b=Ya1XSilGagzeukZrDXoy0n59NjLJk/4A32dsnE9fgIDQLVaIly0AznHrQa/nv7djJuObw2 sB0ulqt9D2YU2F8kuiSWcqe+DPLL3BMvOONOgoETmZepR9b+SfcgAQIyg979P5kuaCfEtz BOh1cGyadGrTEmj/2B3EoI/DJPWRsYQ= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-347--hSfZWRzNS2kt7EzuuTpAw-1; Tue, 04 May 2021 23:54:55 -0400 X-MC-Unique: -hSfZWRzNS2kt7EzuuTpAw-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C8EF810066E6; Wed, 5 May 2021 03:54:53 +0000 (UTC) Received: from treble.redhat.com (ovpn-115-93.rdu2.redhat.com [10.10.115.93]) by smtp.corp.redhat.com (Postfix) with ESMTP id E54D71002D71; Wed, 5 May 2021 03:54:51 +0000 (UTC) From: Josh Poimboeuf To: Al Viro Cc: x86@kernel.org, linux-kernel@vger.kernel.org, Linus Torvalds , Will Deacon , Dan Williams , Andrea Arcangeli , Waiman Long , Peter Zijlstra , Thomas Gleixner , Andrew Cooper , Andy Lutomirski , Christoph Hellwig , David Laight , Mark Rutland , Borislav Petkov Subject: [PATCH v4 4/4] x86/nospec: Remove barrier_nospec() Date: Tue, 4 May 2021 22:54:32 -0500 Message-Id: <3ea39399a7f5272c2f89fd7ad1386c7abdf31eb5.1620186182.git.jpoimboe@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The barrier_nospec() macro is no longer used. Its uses have been replaced with address and array index masking. Remove it. Signed-off-by: Josh Poimboeuf --- arch/x86/include/asm/barrier.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/x86/include/asm/barrier.h b/arch/x86/include/asm/barrier.h index 4819d5e5a335..88f692d4f4ec 100644 --- a/arch/x86/include/asm/barrier.h +++ b/arch/x86/include/asm/barrier.h @@ -48,9 +48,6 @@ static inline unsigned long array_index_mask_nospec(unsigned long index, /* Override the default implementation from linux/nospec.h. */ #define array_index_mask_nospec array_index_mask_nospec -/* Prevent speculative execution past this barrier. */ -#define barrier_nospec() alternative("", "lfence", X86_FEATURE_LFENCE_RDTSC) - #define dma_rmb() barrier() #define dma_wmb() barrier() -- 2.31.1