From patchwork Wed Oct 23 13:58:06 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Andrew Cooper X-Patchwork-Id: 11206879 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A68711747 for ; Wed, 23 Oct 2019 13:59:39 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 82D7E2173B for ; Wed, 23 Oct 2019 13:59:39 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=citrix.com header.i=@citrix.com header.b="CWIMTU3a" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 82D7E2173B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=citrix.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iNH9Z-0004gP-1f; Wed, 23 Oct 2019 13:58:21 +0000 Received: from all-amaz-eas1.inumbo.com ([34.197.232.57] helo=us1-amaz-eas2.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1iNH9X-0004gB-T3 for xen-devel@lists.xenproject.org; Wed, 23 Oct 2019 13:58:19 +0000 X-Inumbo-ID: 2904bbad-f59d-11e9-947f-12813bfff9fa Received: from esa5.hc3370-68.iphmx.com (unknown [216.71.155.168]) by us1-amaz-eas2.inumbo.com (Halon) with ESMTPS id 2904bbad-f59d-11e9-947f-12813bfff9fa; Wed, 23 Oct 2019 13:58:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=citrix.com; s=securemail; t=1571839096; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=jX/kgFmobe5dzr/6/7Ul/Yf4aYGtQ4icBKv6F5BY814=; b=CWIMTU3aiot9EXrr5cwcJ8Z8G9QaqHkdX7UehBguwoaKtgUtFHYgXZ/u jrAdyIGEhYnp+Unv/ehyfaNlhFHdDbNWPCqy4Kmp0QTRVTdd/K0g2sLa6 m8CSnOrH9PIkS9uYQEQNetB1pHasQY5BxujFsnkxKjEuCu9aYySFmiAZx Y=; Authentication-Results: esa5.hc3370-68.iphmx.com; dkim=none (message not signed) header.i=none; spf=None smtp.pra=andrew.cooper3@citrix.com; spf=Pass smtp.mailfrom=Andrew.Cooper3@citrix.com; spf=None smtp.helo=postmaster@mail.citrix.com Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of andrew.cooper3@citrix.com) identity=pra; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="andrew.cooper3@citrix.com"; x-conformance=sidf_compatible Received-SPF: Pass (esa5.hc3370-68.iphmx.com: domain of Andrew.Cooper3@citrix.com designates 162.221.158.21 as permitted sender) identity=mailfrom; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="Andrew.Cooper3@citrix.com"; x-conformance=sidf_compatible; x-record-type="v=spf1"; x-record-text="v=spf1 ip4:209.167.231.154 ip4:178.63.86.133 ip4:195.66.111.40/30 ip4:85.115.9.32/28 ip4:199.102.83.4 ip4:192.28.146.160 ip4:192.28.146.107 ip4:216.52.6.88 ip4:216.52.6.188 ip4:162.221.158.21 ip4:162.221.156.83 ip4:168.245.78.127 ~all" Received-SPF: None (esa5.hc3370-68.iphmx.com: no sender authenticity information available from domain of postmaster@mail.citrix.com) identity=helo; client-ip=162.221.158.21; receiver=esa5.hc3370-68.iphmx.com; envelope-from="Andrew.Cooper3@citrix.com"; x-sender="postmaster@mail.citrix.com"; x-conformance=sidf_compatible IronPort-SDR: TBbo1A6HA6Mw+AUkD4hA8WGNT0bnujUPwkoLPpGk30HJW1D4epUk76tWCoUy/WclKw8GZVjM6T Ff1fHzOBtKB+fxQNUYVX0HT2yeoDBUeeVLUnWI1HlINl6/FhOqIAAP0DNTP68Vkv7jmDucpNn6 m/vwQ0FO/3UXgtQWkTeoUOQyaPuCPdl+16M/pM8DfUcnT3l9MUqxfnOUET0fW4Stq7LLeACiuP 1b+wjJ6sd+vFMzD6F1mdC3zbFYLOZIx293ysjpKtkzEpb5JXpqiF+R5xmKAqpWBw6DohW5+Q/I VKA= X-SBRS: 2.7 X-MesageID: 7627975 X-Ironport-Server: esa5.hc3370-68.iphmx.com X-Remote-IP: 162.221.158.21 X-Policy: $RELAYED X-IronPort-AV: E=Sophos;i="5.68,221,1569297600"; d="scan'208";a="7627975" From: Andrew Cooper To: Xen-devel Date: Wed, 23 Oct 2019 14:58:06 +0100 Message-ID: <20191023135812.21348-2-andrew.cooper3@citrix.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20191023135812.21348-1-andrew.cooper3@citrix.com> References: <20191023135812.21348-1-andrew.cooper3@citrix.com> MIME-Version: 1.0 Subject: [Xen-devel] [PATCH v3 1/7] x86/nospec: Two trivial fixes X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Andrew Cooper , Wei Liu , Jan Beulich , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" The include of asm/cpuid.h in spec_ctrl.c was an artefact of an older version of c/s 3860d5534df, and is not used in its current incarnation. Fix a typo in a comment. Signed-off-by: Andrew Cooper Acked-by: Jan Beulich --- CC: Jan Beulich CC: Wei Liu CC: Roger Pau Monné CC: Juergen Gross v3: * New --- xen/arch/x86/spec_ctrl.c | 1 - xen/include/asm-x86/nospec.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/xen/arch/x86/spec_ctrl.c b/xen/arch/x86/spec_ctrl.c index 731d5a767b..ee5439a371 100644 --- a/xen/arch/x86/spec_ctrl.c +++ b/xen/arch/x86/spec_ctrl.c @@ -21,7 +21,6 @@ #include #include -#include #include #include #include diff --git a/xen/include/asm-x86/nospec.h b/xen/include/asm-x86/nospec.h index 2aa47b3455..427b5ff9df 100644 --- a/xen/include/asm-x86/nospec.h +++ b/xen/include/asm-x86/nospec.h @@ -15,7 +15,7 @@ static always_inline bool barrier_nospec_true(void) return true; } -/* Allow to protect evaluation of conditionasl with respect to speculation */ +/* Allow to protect evaluation of conditionals with respect to speculation */ static always_inline bool evaluate_nospec(bool condition) { return condition ? barrier_nospec_true() : !barrier_nospec_true();